Packman Build Service PMBS

Changes of Revision 16

LiVES.changes Changed

@@ -1,3 +1,80 @@
+-------------------------------------------------------------------
+Wed Apr 10 15:03:13 UTC 2013 - pascal.bleser@opensuse.org
+
+- update to 2.0.3:
+  * Fix rounding error in multitrack audio insert.
+  * Uncomment URL line in ogg_decoder.c
+  * enable LADSPA and GLee support
+
+- changes from 2.0.0:
+  * Fix crash in recording external audio with pulse player (regression)
+  * Minor widget fixes with startup dialogs and labels (regression)
+  * Refactor timeline drawing in multitrack
+  * Enable compilation with gtk+ 3
+  * Prevent some audio being dropped when re-entering multitrack
+  * Fixes for beat_detector plugin
+  * Various optimisations and minor bugfixes
+
+- changes from 1.8.2:
+  * Allow renaming of tracks in multitrack window
+
+- changes from 1.8.1:
+  * Fix various bugs with the RFX builder menus.
+  * Fix compilation for GTK+ < 2.24
+  * Fix regression error in Resize All Frames.
+  * Fix regression in Append Audio.
+  * Fix crash in audio previews (open/append new audio).
+  * Fix regression in encoding (after resample).
+  * Add experimental neural_net compound effect.
+  * Add motion_analyser compound effect.
+  * Add mini tracker player in LiVES (fourKlives).
+  * Various widget updates.
+  * Make preview in fileselector more responsive.
+  * Add new interface in RTE window for making/showing data connections.
+
+- changes from 1.8.0:
+  * Fix breakage in multitrack effects (regression).
+  * Fix crash when re-entering multitrack mode (regression).
+  * Fix a crash in text parameter entry (regression).
+  * Add support for compound filters.
+  * Add new realtime effect - shift.
+  * Add new data processing filters: alpha_means, data_processing.
+  * Add new compound effect - image_stabilizer (requires openCV).
+
+- changes from 1.6.4:
+  * Updates to decoder plugins to work with current libav.
+  * Fix crash in paramwindow textbuffers.
+  * Add preference for internal/external audio.
+  * Render audio with audio effects.
+  * Allow use of audio effects in multitrack.
+  * Fix crash after adding a new track with an existing event list.
+  * Update youtube downloader to recognise youtu.be links.
+  * Fix regression for number of channels dropdown box in audio resampling.
+  * Fix possible crash when remapping a filter with key defaults set.
+  * Fix flickering preferences dialog on some window managers.
+
+- changes from 1.6.3:
+  * Fix GUI exposure crash in multitrack window.
+  * Prevent truncation of longer filenames in plugin interfaces.
+  * Add support for audio analyser plugins.
+  * Add support for audio processing plugins.
+  * Add support for LADSPA plugins.
+  * Add beat detector plugin.
+  * Fixes for rare crashes/bugs in plugin interface windows.
+  * Group effects by package in the effect mapper window and defaults menu.
+  * Add OSC commands for out channels, out parameters and data chaining. 
+
+- changes from 1.6.2:
+  * support was added for fast opening of MPEG TS (HDV) clips
+  * backup and restore is now much faster
+  * bugs were fixed for rendered effect triggers, undo cut, file open preview,
+    and pad audio
+  * the timer code was cleaned up
+  * experimental support was added for video analyzer, data processing, and
+    audio generating plugins
+  * a hang in preferences when the image type was set to JPEG was fixed
+
+-------------------------------------------------------------------
 Mon May 28 00:00:00 UTC 2012 - Manfred.Tremmel@iiv.de
 
 - changes to make it compile against ffmpeg 0.11, it's realy bad to

LiVES.spec Changed

@@ -1,16 +1,30 @@
 # vim: set ts=4 sw=4 et:
 
+# Copyright (c) 2010-2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2007-2010 Andrea Florio <andrea@links2linux.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+
 Name:           LiVES
-Version:        1.6.1
+Version:        2.0.3
 %define soname 0
 Release:        1
 Summary:        Video Editor and VJ Tool
-License:        GNU General Public License version 2 or later (GPLv2 or later)
+License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Source0:        http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-%{version}.tar.bz2
 Source99:       LiVES-rpmlintrc
 Patch1:         LiVES-fix_missing_return.patch
-Patch2:         lives-ffmpeg011.patch
+Patch2:         lives-glee-gl.patch
 URL:            http://lives.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: gtk1-compat-devel
@@ -39,7 +53,10 @@
 BuildRequires:  sox MPlayer cdrkit-cdrtools-compat dvgrab
 BuildRequires:  jack-devel
 BuildRequires:  libGLee-devel
-Requires:       libvisual libvisual-plugins
+BuildRequires:  ladspa-devel
+Requires:       libvisual
+Requires:       libvisual-plugins
+Requires:       ladspa
 Requires:       sox MPlayer cdrkit-cdrtools-compat dvgrab
 Requires:       libweed%{soname} = %{version}
 %if 0%{?suse_version} < 1200
@@ -74,7 +91,7 @@
 %prep
 %setup -q -n lives-%{version}
 %patch1
-%patch2 -p1
+%patch2
 
 # fix wrong EOL
 %__sed -i 's/\r$//' weed-docs/*.txt
@@ -86,10 +103,13 @@
 popd #libweed
 
 %build
+autoreconf -fiv
+
 export CFLAGS="%{optflags} -fno-strict-aliasing -I$PWD/libweed/"
 export CPPFLAGS="$CFLAGS"
 export CXXFLAGS="$CFLAGS"
 %configure \
+    --libdir="%{_libdir}" \
     --disable-doxygen
 
 %__make %{?_smp_mflags}
@@ -163,6 +183,10 @@
 %{_datadir}/lives/themes/*
 %dir %{_datadir}/lives/plugins
 %dir %{_datadir}/lives/plugins/effects
+%dir %{_datadir}/lives/plugins/effects/compound
+%{_datadir}/lives/plugins/effects/compound/image_stabilizer
+%{_datadir}/lives/plugins/effects/compound/motion_analyser
+%{_datadir}/lives/plugins/effects/compound/neural_net
 %dir %{_datadir}/lives/plugins/effects/RFXscripts
 %{_datadir}/lives/plugins/effects/RFXscripts/*.script
 %dir %{_datadir}/lives/resources
@@ -182,15 +206,21 @@
 %{_libdir}/lives/plugins/decoders/ogg_decoder.la
 %{_libdir}/lives/plugins/decoders/flv_decoder.so
 %{_libdir}/lives/plugins/decoders/flv_decoder.la
+%{_libdir}/lives/plugins/decoders/mpegts_decoder.so
+%{_libdir}/lives/plugins/decoders/mpegts_decoder.la
 %dir %{_libdir}/lives/plugins/effects
 %dir %{_libdir}/lives/plugins/effects/realtime
 %dir %{_libdir}/lives/plugins/effects/realtime/weed
 %{_libdir}/lives/plugins/effects/realtime/weed/alien_overlay.so
 %{_libdir}/lives/plugins/effects/realtime/weed/alien_overlay.la
+%{_libdir}/lives/plugins/effects/realtime/weed/alpha_means.so
+%{_libdir}/lives/plugins/effects/realtime/weed/alpha_means.la
 %{_libdir}/lives/plugins/effects/realtime/weed/audio_transition.so
 %{_libdir}/lives/plugins/effects/realtime/weed/audio_transition.la
 %{_libdir}/lives/plugins/effects/realtime/weed/audio_volume.so
 %{_libdir}/lives/plugins/effects/realtime/weed/audio_volume.la
+%{_libdir}/lives/plugins/effects/realtime/weed/blank_frame_detector.so
+%{_libdir}/lives/plugins/effects/realtime/weed/blank_frame_detector.la
 %{_libdir}/lives/plugins/effects/realtime/weed/blurzoom.so
 %{_libdir}/lives/plugins/effects/realtime/weed/blurzoom.la
 %{_libdir}/lives/plugins/effects/realtime/weed/bump2d.so
@@ -203,6 +233,10 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/comic.la
 %{_libdir}/lives/plugins/effects/realtime/weed/compositor.so
 %{_libdir}/lives/plugins/effects/realtime/weed/compositor.la
+%{_libdir}/lives/plugins/effects/realtime/weed/data_processor.so
+%{_libdir}/lives/plugins/effects/realtime/weed/data_processor.la
+%{_libdir}/lives/plugins/effects/realtime/weed/data_unpacker.so
+%{_libdir}/lives/plugins/effects/realtime/weed/data_unpacker.la
 %{_libdir}/lives/plugins/effects/realtime/weed/deinterlace.so
 %{_libdir}/lives/plugins/effects/realtime/weed/deinterlace.la
 %{_libdir}/lives/plugins/effects/realtime/weed/edge.so
@@ -211,16 +245,24 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/fg_bg_removal.la
 %{_libdir}/lives/plugins/effects/realtime/weed/fireTV.so
 %{_libdir}/lives/plugins/effects/realtime/weed/fireTV.la
+%{_libdir}/lives/plugins/effects/realtime/weed/fourKlives.so
+%{_libdir}/lives/plugins/effects/realtime/weed/fourKlives.la
 %{_libdir}/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
 %{_libdir}/lives/plugins/effects/realtime/weed/gdk_fast_resize.la
+%{_libdir}/lives/plugins/effects/realtime/weed/haar_analyser.so
+%{_libdir}/lives/plugins/effects/realtime/weed/haar_analyser.la
 %{_libdir}/lives/plugins/effects/realtime/weed/haip.so
 %{_libdir}/lives/plugins/effects/realtime/weed/haip.la
+%{_libdir}/lives/plugins/effects/realtime/weed/ladspa.so
+%{_libdir}/lives/plugins/effects/realtime/weed/ladspa.la
 %{_libdir}/lives/plugins/effects/realtime/weed/layout_blends.so
 %{_libdir}/lives/plugins/effects/realtime/weed/layout_blends.la
 %{_libdir}/lives/plugins/effects/realtime/weed/lifeTV.so
 %{_libdir}/lives/plugins/effects/realtime/weed/lifeTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/livetext.so
 %{_libdir}/lives/plugins/effects/realtime/weed/livetext.la
+%{_libdir}/lives/plugins/effects/realtime/weed/log_sig.so
+%{_libdir}/lives/plugins/effects/realtime/weed/log_sig.la
 %{_libdir}/lives/plugins/effects/realtime/weed/mask_overlay.so
 %{_libdir}/lives/plugins/effects/realtime/weed/mask_overlay.la
 %{_libdir}/lives/plugins/effects/realtime/weed/mirrors.so
@@ -231,6 +273,8 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/multi_transitions.la
 %{_libdir}/lives/plugins/effects/realtime/weed/negate.so
 %{_libdir}/lives/plugins/effects/realtime/weed/negate.la
+%{_libdir}/lives/plugins/effects/realtime/weed/nn_programmer.so
+%{_libdir}/lives/plugins/effects/realtime/weed/nn_programmer.la
 %{_libdir}/lives/plugins/effects/realtime/weed/noise.so
 %{_libdir}/lives/plugins/effects/realtime/weed/noise.la
 %{_libdir}/lives/plugins/effects/realtime/weed/onedTV.so
@@ -251,6 +295,8 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/rotozoom.la
 %{_libdir}/lives/plugins/effects/realtime/weed/scribbler.so
 %{_libdir}/lives/plugins/effects/realtime/weed/scribbler.la
+%{_libdir}/lives/plugins/effects/realtime/weed/shift.so
+%{_libdir}/lives/plugins/effects/realtime/weed/shift.la
 %{_libdir}/lives/plugins/effects/realtime/weed/simple_blend.so
 %{_libdir}/lives/plugins/effects/realtime/weed/simple_blend.la
 %{_libdir}/lives/plugins/effects/realtime/weed/slide_over.so
@@ -261,8 +307,12 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/targeted_zoom.la
 %{_libdir}/lives/plugins/effects/realtime/weed/textfun.so
 %{_libdir}/lives/plugins/effects/realtime/weed/textfun.la
+%{_libdir}/lives/plugins/effects/realtime/weed/tone_gen.so
+%{_libdir}/lives/plugins/effects/realtime/weed/tone_gen.la
 %{_libdir}/lives/plugins/effects/realtime/weed/tvpic.so
 %{_libdir}/lives/plugins/effects/realtime/weed/tvpic.la
+%{_libdir}/lives/plugins/effects/realtime/weed/vector_visualiser.so
+%{_libdir}/lives/plugins/effects/realtime/weed/vector_visualiser.la
 %{_libdir}/lives/plugins/effects/realtime/weed/vertigo.so
 %{_libdir}/lives/plugins/effects/realtime/weed/vertigo.la
 %{_libdir}/lives/plugins/effects/realtime/weed/videowall.so
@@ -271,6 +321,8 @@
 %{_libdir}/lives/plugins/effects/realtime/weed/warpTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/xeffect.so
 %{_libdir}/lives/plugins/effects/realtime/weed/xeffect.la
+%dir %{_libdir}/lives/plugins/effects/realtime/weed/data
+%{_libdir}/lives/plugins/effects/realtime/weed/data/*
 %dir %{_libdir}/lives/plugins/effects/realtime/weed/frei0r
 %{_libdir}/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
 %{_libdir}/lives/plugins/effects/realtime/weed/frei0r/frei0r.la
@@ -358,6 +410,8 @@
 %{_libdir}/lives/plugins/playback/video/oggstream.la
 %{_libdir}/lives/plugins/playback/video/openGL.so
 %{_libdir}/lives/plugins/playback/video/openGL.la
+%{_libdir}/lives/plugins/playback/video/openGL_trickery.so
+%{_libdir}/lives/plugins/playback/video/openGL_trickery.la
 %{_libdir}/lives/plugins/playback/video/vloopback.so
 %{_libdir}/lives/plugins/playback/video/vloopback.la
 %{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.so
@@ -371,6 +425,8 @@
 %defattr(-,root,root)
 %{_libdir}/libweed.so.%{soname}
 %{_libdir}/libweed.so.%{soname}.*
+%{_libdir}/libweed-utils.so.%{soname}
+%{_libdir}/libweed-utils.so.%{soname}.*
 %{_libdir}/libweed_slice.so.%{soname}
 %{_libdir}/libweed_slice.so.%{soname}.*
 
@@ -378,9 +434,8 @@
 %defattr(-,root,root)
 %{_includedir}/weed
 %{_libdir}/libweed.so
+%{_libdir}/libweed-utils.so
 %{_libdir}/libweed_slice.so
-%{_libdir}/libweed-utils.a
-%{_libdir}/libweed-plugin-utils.a
 %{_libdir}/pkgconfig/libweed.pc
 %{_libdir}/pkgconfig/libweed_slice.pc
 %{_libdir}/pkgconfig/libweed-utils.pc

lives-ffmpeg011.patch Deleted

lives-glee-gl.patch Added

LiVES-1.6.1.tar.bz2/libweed/weed-plugin-utils.c Deleted

@@ -1,659 +0,0 @@
-/* WEED is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   Weed is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this source code; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-
-
-   Weed is developed by:
-
-   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
-
-
-   mainly based on LiViDO, which is developed by:
-
-
-   Niels Elburg - http://veejay.sf.net
-
-   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
-
-   Denis "Jaromil" Rojo - http://freej.dyne.org
-
-   Tom Schouten - http://zwizwa.fartit.com
-
-   Andraz Tori - http://cvs.cinelerra.org
-
-   reviewed with suggestions and contributions from:
-
-   Silvano "Kysucix" Galliani - http://freej.dyne.org
-
-   Kentaro Fukuchi - http://megaui.net/fukuchi
-
-   Jun Iio - http://www.malib.net
-
-   Carlo Prelz - http://www2.fluido.as:8080/
-
-*/
-
-/* (C) Gabriel "Salsaman" Finch, 2005 - 2010 */
-
-
-
-#include <string.h>
-#include <stdio.h>
-
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed.h>
-#include <weed/weed-palettes.h>
-#include <weed/weed-effects.h>
-#else
-#include "weed.h"
-#include "weed-palettes.h"
-#include "weed-effects.h"
-#endif
-
-
-
-extern weed_leaf_get_f weed_leaf_get;
-extern weed_leaf_set_f weed_leaf_set;
-extern weed_plant_new_f weed_plant_new;
-extern weed_plant_list_leaves_f weed_plant_list_leaves;
-extern weed_leaf_num_elements_f weed_leaf_num_elements;
-extern weed_leaf_element_size_f weed_leaf_element_size;
-extern weed_leaf_seed_type_f weed_leaf_seed_type;
-extern weed_leaf_get_flags_f weed_leaf_get_flags;
-
-extern weed_malloc_f weed_malloc;
-extern weed_free_f weed_free;
-extern weed_memcpy_f weed_memcpy;
-extern weed_memset_f weed_memset;
-
-
-///////////////////////////////////////////////////////////
-inline int _leaf_exists (weed_plant_t *plant, const char *key) {
-  if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return 0;
-  return 1;
-}
-
-
-weed_plant_t *weed_plugin_info_init (weed_bootstrap_f weed_boot, int num_versions, int *api_versions) {
-  /////////////////////////////////////////////////////////
-  // get our bootstrap values
-  int api_version;
-
-  weed_default_getter_f weed_default_get;
-  weed_leaf_get_f *wlg;
-  weed_leaf_set_f *wls;
-  weed_plant_new_f *wpn;
-  weed_plant_list_leaves_f *wpll;
-  weed_leaf_num_elements_f *wlne;
-  weed_leaf_element_size_f *wles;
-  weed_leaf_seed_type_f *wlst;
-  weed_leaf_get_flags_f *wlgf;
-  weed_malloc_f *weedmalloc;
-  weed_free_f *weedfree;
-  weed_memset_f *weedmemset;
-  weed_memcpy_f *weedmemcpy;
-
-  weed_plant_t *host_info=weed_boot((weed_default_getter_f *)&weed_default_get,num_versions,api_versions),*plugin_info;
-  if (host_info==NULL) return NULL; // matching version was not found
-
-
-  //////////// get api version /////////
-  weed_default_get(host_info,"api_version",0,&api_version);
-
-
-  // depending on the api version we could have different functions
-
-  // we must use the default getter to get our API functions
-
-  weed_default_get(host_info,"weed_malloc_func",0,(void *)&weedmalloc);
-  weed_malloc=weedmalloc[0];
-
-  weed_default_get(host_info,"weed_free_func",0,(void *)&weedfree);
-  weed_free=weedfree[0];
-
-  weed_default_get(host_info,"weed_memset_func",0,(void *)&weedmemset);
-  weed_memset=weedmemset[0];
-
-  weed_default_get(host_info,"weed_memcpy_func",0,(void *)&weedmemcpy);
-  weed_memcpy=weedmemcpy[0];
-
-  weed_default_get(host_info,"weed_leaf_get_func",0,(void *)&wlg);
-  weed_leaf_get=wlg[0];
-
-  weed_default_get(host_info,"weed_leaf_set_func",0,(void *)&wls);
-  weed_leaf_set=wls[0];
-
-  weed_default_get(host_info,"weed_plant_new_func",0,(void *)&wpn);
-  weed_plant_new=wpn[0];
-
-  weed_default_get(host_info,"weed_plant_list_leaves_func",0,(void *)&wpll);
-  weed_plant_list_leaves=wpll[0];
-
-  weed_default_get(host_info,"weed_leaf_num_elements_func",0,(void *)&wlne);
-  weed_leaf_num_elements=wlne[0];
-
-  weed_default_get(host_info,"weed_leaf_element_size_func",0,(void *)&wles);
-  weed_leaf_element_size=wles[0];
-
-  weed_default_get(host_info,"weed_leaf_seed_type_func",0,(void *)&wlst);
-  weed_leaf_seed_type=wlst[0];
-
-  weed_default_get(host_info,"weed_leaf_get_flags_func",0,(void *)&wlgf);
-  weed_leaf_get_flags=wlgf[0];
-
-
-  // get any additional functions for higher API versions ////////////
-
-
-
-  //////////////////////////////////////////////////////////////////////
-
-  // we can now use the normal API functions
-
-
-  plugin_info=weed_plant_new(WEED_PLANT_PLUGIN_INFO);
-
-  weed_leaf_set(plugin_info,"host_info",WEED_SEED_PLANTPTR,1,&host_info);
-
-  return plugin_info;
-}
-
-
-int weed_get_api_version(weed_plant_t *plugin_info) {
-  // return api version selected by host
-  int api_version;
-  weed_plant_t *host_info;
-  weed_leaf_get(plugin_info,"host_info",0,&host_info);
-  weed_leaf_get(host_info,"api_version",0,&api_version);
-  return api_version;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-weed_plant_t *weed_channel_template_init (const char *name, int flags, int *palettes) {
-  int i;
-  weed_plant_t *chantmpl=weed_plant_new(WEED_PLANT_CHANNEL_TEMPLATE);
-
-  weed_leaf_set(chantmpl,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(chantmpl,"flags",WEED_SEED_INT,1,&flags);
-
-  for (i=0;palettes[i]!=WEED_PALETTE_END;i++);
-  if (i==0) weed_leaf_set(chantmpl,"palette_list",WEED_SEED_INT,0,NULL);
-  else weed_leaf_set(chantmpl,"palette_list",WEED_SEED_INT,i,palettes);
-  return chantmpl;
-}
-
-
-weed_plant_t *weed_audio_channel_template_init (const char *name, int flags) {
-  int wtrue=WEED_TRUE;
-  weed_plant_t *chantmpl=weed_plant_new(WEED_PLANT_CHANNEL_TEMPLATE);
-
-  weed_leaf_set(chantmpl,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(chantmpl,"flags",WEED_SEED_INT,1,&flags);
-  weed_leaf_set(chantmpl,"is_audio",WEED_SEED_BOOLEAN,1,&wtrue);
-  return chantmpl;
-}
-
-
-weed_plant_t *weed_filter_class_init (const char *name, const char *author, int version, int flags, weed_init_f init_func, weed_process_f process_func, weed_deinit_f deinit_func, weed_plant_t **in_chantmpls, weed_plant_t **out_chantmpls, weed_plant_t **in_paramtmpls, weed_plant_t **out_paramtmpls) {
-  int i;
-  weed_plant_t *filter_class=weed_plant_new(WEED_PLANT_FILTER_CLASS);
-
-  weed_leaf_set(filter_class,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(filter_class,"author",WEED_SEED_STRING,1,&author);
-  weed_leaf_set(filter_class,"version",WEED_SEED_INT,1,&version);
-  weed_leaf_set(filter_class,"flags",WEED_SEED_INT,1,&flags);
-
-  if (init_func!=NULL) {
-    weed_init_f *fn_ptr_ptr=(weed_init_f *)weed_malloc(sizeof(weed_init_f));
-    *fn_ptr_ptr=init_func;
-    weed_leaf_set(filter_class,"init_func",WEED_SEED_VOIDPTR,1,&fn_ptr_ptr);
-  }
-  if (process_func!=NULL) {
-    weed_process_f *fn_ptr_ptr=(weed_process_f *)weed_malloc(sizeof(weed_process_f));
-    *fn_ptr_ptr=process_func;
-    weed_leaf_set(filter_class,"process_func",WEED_SEED_VOIDPTR,1,&fn_ptr_ptr);
-  }
-  if (deinit_func!=NULL) {
-    weed_deinit_f *fn_ptr_ptr=(weed_deinit_f *)weed_malloc(sizeof(weed_deinit_f));
-    *fn_ptr_ptr=deinit_func;
-    weed_leaf_set(filter_class,"deinit_func",WEED_SEED_VOIDPTR,1,&fn_ptr_ptr);
-  }
-
-  if (in_chantmpls==NULL||in_chantmpls[0]==NULL) weed_leaf_set(filter_class,"in_channel_templates",WEED_SEED_VOIDPTR,0,NULL);
-  else {
-    for (i=0;in_chantmpls[i]!=NULL;i++);
-    weed_leaf_set(filter_class,"in_channel_templates",WEED_SEED_PLANTPTR,i,in_chantmpls);
-
-  }
-
-  if (out_chantmpls==NULL||out_chantmpls[0]==NULL) weed_leaf_set(filter_class,"out_channel_templates",WEED_SEED_VOIDPTR,0,NULL);
-  else {
-    for (i=0;out_chantmpls[i]!=NULL;i++);
-    weed_leaf_set(filter_class,"out_channel_templates",WEED_SEED_PLANTPTR,i,out_chantmpls);
-  }
-
-  if (in_paramtmpls==NULL||in_paramtmpls[0]==NULL) weed_leaf_set(filter_class,"in_parameter_templates",WEED_SEED_VOIDPTR,0,NULL);
-  else {
-    for (i=0;in_paramtmpls[i]!=NULL;i++);
-    weed_leaf_set(filter_class,"in_parameter_templates",WEED_SEED_PLANTPTR,i,in_paramtmpls);
-  }
-
-  if (out_paramtmpls==NULL||out_paramtmpls[0]==NULL) weed_leaf_set(filter_class,"out_parameter_templates",WEED_SEED_VOIDPTR,0,NULL);
-  else {
-    for (i=0;out_paramtmpls[i]!=NULL;i++);
-    weed_leaf_set(filter_class,"out_parameter_templates",WEED_SEED_PLANTPTR,i,out_paramtmpls);
-  }
-  
-  return filter_class;
-} 
-
-
-void weed_plugin_info_add_filter_class (weed_plant_t *plugin_info, weed_plant_t *filter_class) {
-  int num_filters=0,i;
-  weed_plant_t **filters;
-
-  if (_leaf_exists(plugin_info,"filters")) num_filters=weed_leaf_num_elements(plugin_info,"filters");
-  filters=(weed_plant_t **)weed_malloc((num_filters+1)*sizeof(weed_plant_t *));
-  for (i=0;i<num_filters;i++) weed_leaf_get(plugin_info,"filters",i,&filters[i]);
-  filters[i]=filter_class;
-  weed_leaf_set(plugin_info,"filters",WEED_SEED_PLANTPTR,i+1,filters);
-  weed_leaf_set(filter_class,"plugin_info",WEED_SEED_PLANTPTR,1,&plugin_info);
-  weed_free(filters);
-}
-
-
-weed_plant_t *weed_parameter_template_get_gui (weed_plant_t *paramt) {
-  weed_plant_t *gui;
-
-  if (_leaf_exists(paramt,"gui")) {
-    weed_leaf_get(paramt,"gui",0,&gui);
-    return gui;
-  }
-
-  gui=weed_plant_new(WEED_PLANT_GUI);
-  weed_leaf_set(paramt,"gui",WEED_SEED_PLANTPTR,1,&gui);
-  return gui;
-}
-
-
-weed_plant_t *weed_filter_class_get_gui (weed_plant_t *filter) {
-  weed_plant_t *gui;
-
-  if (_leaf_exists(filter,"gui")) {
-    weed_leaf_get(filter,"gui",0,&gui);
-    return gui;
-  }
-
-  gui=weed_plant_new(WEED_PLANT_GUI);
-  weed_leaf_set(filter,"gui",WEED_SEED_PLANTPTR,1,&gui);
-  return gui;
-}
-  
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////
-
-weed_plant_t *weed_integer_init (const char *name, const char *label, int def, int min, int max) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_INTEGER;
-  weed_plant_t *gui;
-  int wtrue=WEED_TRUE;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_INT,1,&def);
-  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
-
-  gui=weed_parameter_template_get_gui(paramt);
-  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
-  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
-
-  return paramt;
-}
-
-
-weed_plant_t *weed_string_list_init (const char *name, const char *label, int def, const char ** const list) {
-  int i=0;
-  weed_plant_t *paramt,*gui;
-  int min=0;
-
-  while (list[i]!=NULL) i++;
-  i--;
-
-  if (def<=-1) min=def=-1;
-
-  paramt=weed_integer_init(name,label,def,min,i);
-  gui=weed_parameter_template_get_gui(paramt);
-
-  weed_leaf_set(gui,"choices",WEED_SEED_STRING,i+1,list);
-
-  return paramt;
-}
-
-
-weed_plant_t *weed_switch_init (const char *name, const char *label, int def) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_SWITCH;
-  weed_plant_t *gui;
-  int wtrue=WEED_TRUE;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_BOOLEAN,1,&def);
-
-  gui=weed_parameter_template_get_gui(paramt);
-  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
-  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
-
-  return paramt;
-}
-
-weed_plant_t *weed_radio_init (const char *name, const char *label, int def, int group) {
-  weed_plant_t *paramt=weed_switch_init(name,label,def);
-  weed_leaf_set(paramt,"group",WEED_SEED_INT,1,&group);
-  return paramt;
-}
-
-
-
-weed_plant_t *weed_float_init (const char *name, const char *label, double def, double min, double max) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_FLOAT;
-  weed_plant_t *gui;
-  int wtrue=WEED_TRUE;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,1,&def);
-  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
-
-  gui=weed_parameter_template_get_gui(paramt);
-  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
-  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
-
-  return paramt;
-}
-
-
-weed_plant_t *weed_text_init (const char *name, const char *label, const char *def) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_TEXT;
-  weed_plant_t *gui;
-  int wtrue=WEED_TRUE;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_STRING,1,&def);
-
-  gui=weed_parameter_template_get_gui(paramt);
-  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
-  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
-
-  return paramt;
-}
-
-
-weed_plant_t *weed_colRGBi_init (const char *name, const char *label, int red, int green, int blue) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_COLOR;
-  int cspace=WEED_COLORSPACE_RGB;
-  int def[3]={red,green,blue};
-  int min=0;
-  int max=255;
-  weed_plant_t *gui;
-  int wtrue=WEED_TRUE;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
-
-  weed_leaf_set(paramt,"default",WEED_SEED_INT,3,def);
-  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
-
-  gui=weed_parameter_template_get_gui(paramt);
-  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
-  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
-
-  return paramt;
-}
-
-
-weed_plant_t *weed_colRGBd_init (const char *name, const char *label, double red, double green, double blue) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_COLOR;
-  int cspace=WEED_COLORSPACE_RGB;
-  double def[3]={red,green,blue};
-  double min=0.;
-  double max=1.;
-  weed_plant_t *gui;
-  int wtrue=WEED_TRUE;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
-
-  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,3,def);
-  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
-
-  gui=weed_parameter_template_get_gui(paramt);
-  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
-  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
-
-  return paramt;
-}
-
-
-weed_plant_t *weed_out_param_integer_init (const char *name, int def, int min, int max) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_INTEGER;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_INT,1,&def);
-  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
-  return paramt;
-}
-
-
-weed_plant_t *weed_out_param_switch_init (const char *name, int def) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_SWITCH;
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_BOOLEAN,1,&def);
-  return paramt;
-}
-
-
-
-weed_plant_t *weed_out_param_float_init (const char *name, double def, double min, double max) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_FLOAT;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
-
-  return paramt;
-}
-
-
-
-weed_plant_t *weed_out_param_text_init (const char *name, const char *def) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_TEXT;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"default",WEED_SEED_STRING,1,&def);
-
-  return paramt;
-}
-
-
-
-weed_plant_t *weed_out_param_colRGBi_init (const char *name, int red, int green, int blue) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_COLOR;
-  int cspace=WEED_COLORSPACE_RGB;
-  int def[3]={red,green,blue};
-  int min=0;
-  int max=255;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
-
-  weed_leaf_set(paramt,"default",WEED_SEED_INT,3,def);
-  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
-
-  return paramt;
-}
-
-
-
-weed_plant_t *weed_out_param_colRGBd_init (const char *name, double red, double green, double blue) {
-  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
-  int hint=WEED_HINT_COLOR;
-  int cspace=WEED_COLORSPACE_RGB;
-  double def[3]={red,green,blue};
-  double min=0.;
-  double max=1.;
-
-  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
-  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
-  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
-
-  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,3,def);
-  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
-  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
-
-  return paramt;
-}
-
-
-
-///////////////////////////////////////////////////////////////////////
-
-static void _weed_clone_leaf (weed_plant_t *from, const char *key, weed_plant_t *to) {
-  int i,num=weed_leaf_num_elements(from,key);
-
-  int *datai;
-  double *datad;
-  char **datac;
-  int64_t *datai6;
-  void **datav;
-  weed_plant_t **datap;
-  size_t stlen;
-
-  int seed_type=weed_leaf_seed_type(from,key);
-
-  if (num==0) weed_leaf_set(to,key,seed_type,0,NULL);
-  else {
-    switch (seed_type) {
-    case WEED_SEED_INT:
-      datai=(int *)weed_malloc(num*sizeof(int));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai[i]);
-      weed_leaf_set(to,key,WEED_SEED_INT,num,datai);
-      weed_free(datai);
-      break;
-    case WEED_SEED_INT64:
-      datai6=(int64_t *)weed_malloc(num*sizeof(int64_t));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai6[i]);
-      weed_leaf_set(to,key,WEED_SEED_INT64,num,datai6);
-      weed_free(datai6);
-      break;
-    case WEED_SEED_BOOLEAN:
-      datai=(int *)weed_malloc(num*sizeof(int));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai[i]);
-      weed_leaf_set(to,key,WEED_SEED_BOOLEAN,num,datai);
-      weed_free(datai);
-      break;
-    case WEED_SEED_DOUBLE:
-      datad=(double *)weed_malloc(num*sizeof(double));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datad[i]);
-      weed_leaf_set(to,key,WEED_SEED_DOUBLE,num,datad);
-      weed_free(datad);
-      break;
-    case WEED_SEED_VOIDPTR:
-      datav=(void **)weed_malloc(num*sizeof(void *));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datav[i]);
-      weed_leaf_set(to,key,WEED_SEED_VOIDPTR,num,datav);
-      weed_free(datav);
-      break;
-    case WEED_SEED_PLANTPTR:
-      datap=(weed_plant_t **)weed_malloc(num*sizeof(weed_plant_t *));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datap[i]);
-      weed_leaf_set(to,key,WEED_SEED_PLANTPTR,num,datap);
-      weed_free(datap);
-      break;
-    case WEED_SEED_STRING:
-      datac=(char **)weed_malloc(num*sizeof(char *));
-      for (i=0;i<num;i++) {
-	stlen=weed_leaf_element_size(from,key,i);
-	datac[i]=(char *)weed_malloc(stlen+1);
-	weed_leaf_get(from,key,i,&datac[i]);
-	weed_memset(datac[i]+stlen,0,1);
-      }
-      weed_leaf_set(to,key,WEED_SEED_STRING,num,datac);
-      for (i=0;i<num;i++) weed_free(datac[i]);
-      weed_free(datac);
-      break;
-    }
-  }
-}
-
-
-weed_plant_t **weed_clone_plants (weed_plant_t **plants) {
-  //plants must be a NULL terminated array
-  int i,j,k,type,num_plants;
-  weed_plant_t **ret,*gui,*gui2;
-  char **leaves,**leaves2;
-  for (i=0;plants[i]!=NULL;i++);
-  num_plants=i;
-  ret=(weed_plant_t **)weed_malloc((num_plants+1)*sizeof(weed_plant_t *));
-
-  for (i=0;i<num_plants;i++) {
-    weed_leaf_get(plants[i],"type",0,&type);
-    ret[i]=weed_plant_new(type);
-
-    leaves=weed_plant_list_leaves(plants[i]);
-    for (j=0;leaves[j]!=NULL;j++) {
-      if (!strcmp(leaves[j],"gui")) {
-	weed_leaf_get(plants[i],"gui",0,&gui);
-	gui2=weed_plant_new(WEED_PLANT_GUI);
-	weed_leaf_set(ret[i],"gui",WEED_SEED_PLANTPTR,1,&gui2);
-	leaves2=weed_plant_list_leaves(gui);
-	for (k=0;leaves2[k]!=NULL;k++) {
-	  _weed_clone_leaf(gui,leaves2[k],gui2);
-	  weed_free(leaves2[k]);
-	}
-	weed_free(leaves2);
-      }
-      else _weed_clone_leaf(plants[i],leaves[j],ret[i]);
-      weed_free(leaves[j]);
-    }
-    weed_free(leaves);
-  }
-  ret[i]=NULL;
-  return ret;
-}

LiVES-1.6.1.tar.bz2/libweed/weed-plugin-utils.h Deleted

@@ -1,96 +0,0 @@
-/* WEED is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   Weed is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this source code; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-
-
-   Weed is developed by:
-
-   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
-
-   mainly based on LiViDO, which is developed by:
-
-
-   Niels Elburg - http://veejay.sf.net
-
-   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
-
-   Denis "Jaromil" Rojo - http://freej.dyne.org
-
-   Tom Schouten - http://zwizwa.fartit.com
-
-   Andraz Tori - http://cvs.cinelerra.org
-
-   reviewed with suggestions and contributions from:
-
-   Silvano "Kysucix" Galliani - http://freej.dyne.org
-
-   Kentaro Fukuchi - http://megaui.net/fukuchi
-
-   Jun Iio - http://www.malib.net
-
-   Carlo Prelz - http://www2.fluido.as:8080/
-
-*/
-
-/* (C) Gabriel "Salsaman" Finch, 2005 - 2007 */
-
-#ifndef __WEED_PLUGIN_UTILS_H__
-#define __WEED_PLUGIN_UTILS_H__
-
-#ifndef __WEED_H__
-#include <weed/weed.h>
-#endif
-
-#ifndef __WEED_PALETTES_H__
-#include <weed/weed-palettes.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-  weed_plant_t *weed_plugin_info_init (weed_bootstrap_f weed_boot, int num_versions, int *api_versions);
-  int weed_get_api_version(weed_plant_t *plugin_info);
-  weed_plant_t *weed_channel_template_init (const char *name, int flags, int *palettes);
-  weed_plant_t *weed_audio_channel_template_init (const char *name, int flags);
-  weed_plant_t *weed_filter_class_init (const char *name, const char *author, int version, int flags, weed_init_f init_func, weed_process_f process_func, weed_deinit_f deinit_func, weed_plant_t **in_chantmpls, weed_plant_t **out_chantmpls, weed_plant_t **in_paramtmpls, weed_plant_t **out_paramtmpls);
-  void weed_plugin_info_add_filter_class (weed_plant_t *plugin_info, weed_plant_t *filter_class);
-  weed_plant_t *weed_parameter_template_get_gui (weed_plant_t *paramt);
-  weed_plant_t *weed_filter_class_get_gui (weed_plant_t *filter);
-  
-  weed_plant_t *weed_integer_init (const char *name, const char *label, int def, int min, int max);
-  weed_plant_t *weed_string_list_init (const char *name, const char *label, int def, const char ** const list);
-  weed_plant_t *weed_switch_init (const char *name, const char *label, int def);
-  weed_plant_t *weed_radio_init (const char *name, const char *label, int def, int group);
-  weed_plant_t *weed_float_init (const char *name, const char *label, double def, double min, double max);
-  weed_plant_t *weed_text_init (const char *name, const char *label, const char *def);
-  weed_plant_t *weed_colRGBi_init (const char *name, const char *label, int red, int green, int blue);
-  weed_plant_t *weed_colRGBd_init (const char *name, const char *label, double red, double green, double blue);
-
-  weed_plant_t *weed_out_param_integer_init (const char *name, int def, int min, int max);
-  weed_plant_t *weed_out_param_switch_init (const char *name, int def);
-  weed_plant_t *weed_out_param_float_init (const char *name, double def, double min, double max);
-  weed_plant_t *weed_out_param_text_init (const char *name, const char *def);
-  weed_plant_t *weed_out_param_colRGBi_init (const char *name, int red, int green, int blue);
-  weed_plant_t *weed_out_param_colRGBd_init (const char *name, double red, double green, double blue);
-
-  weed_plant_t **weed_clone_plants (weed_plant_t **plants);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif // #ifndef __WEED_PLUGIN_UTILS_H__
-
-

LiVES-1.6.1.tar.bz2/tools/lives-glc-play-norun~ Deleted

LiVES-1.6.1.tar.bz2/tools/lives-glc-play~ Deleted

LiVES-1.6.1.tar.bz2/tools/lives-play-norun~ Deleted

LiVES-1.6.1.tar.bz2/tools/lives-play~ Deleted

LiVES-1.6.1.tar.bz2/tools/lives-rte-test.pl~ Deleted

@@ -1,365 +0,0 @@
-#!/usr/bin/perl
-
-# syntax is lives-frei0rtest.pl host cmd_port status_port
-# e.g. autolives.pl localhost 49999 49998
-# or just lives-frie0rtest.pl to use defaults 
-
-if (&location("sendOSC") eq "") {
-    print "You must have sendOSC installed to run this.\n";
-    exit 1;
-}
-
-
-use IO::Socket::UNIX;
-
-
-$remote_host="localhost";
-$remote_port=49999; #command port to app
-$local_port=49998; #status port from app
-
-if (defined($ARGV[0])) {
-    $remote_host=$ARGV[0];
-}
-
-if (defined($ARGV[1])) {
-    $remote_port=$ARGV[1];
-}
-
-if (defined($ARGV[2])) {
-    $local_port=$ARGV[2];
-}
-
-$sendOMC="sendOSC -h $remote_host $remote_port";
-
-
-###################
-# ready our listener
-use IO::Socket;
-use IO::Select;
-
-my $s=new IO::Select;
-
-chop($hostname = `hostname`);  
-(undef,undef,undef,undef,$myaddr) = gethostbyname($hostname);
- 
-@my_ip = unpack("C4", $myaddr);
-$my_ip_addr  = join(".", @my_ip);
-
-if ($remote_host eq "localhost") {
-    $my_ip_addr="localhost";
-}
-
-
-my $ip1=IO::Socket::INET->new(LocalPort => $local_port, Proto=>'udp',
-        LocalAddr => $my_ip_addr)
-    or die "error creating UDP listener for $my_ip_addr  $@\n";
-$s->add($ip1);
-
-
-$timeout=10;
-
-
-
-#################################################################
-# start sending OMC commands
-
-`$sendOMC /lives/open_status_socket,$my_ip_addr,$local_port`;
-
-`$sendOMC /lives/ping`;
-my $retmsg=&get_newmsg;
-
-unless ($retmsg eq "pong") {
-    print "Could not connect to LiVES\n";
-    exit 2;
-}
-
-print "got $retmsg\n";
-
-# reset and clear fx map
-`$sendOMC /effect_key/reset`;
-`$sendOMC /effect_key/map/clear`;
-
-
-# play in loop cont mode
-`$sendOMC /lives/constant/value/get,"LIVES_LOOP_CONT"`;
-
-$loopcont=&get_newmsg;
-
-`$sendOMC /video/loop/set,$loopcont`;
-`$sendOMC /clip/select,1`;
-`$sendOMC /video/play`;
-
-$ready=0;
-
-for ($j=0;;$j++) {
-    # get next fx name
-    `$sendOMC /effects/realtime/name/get,$j`;
-
-    $retmsg=&get_newmsg;
-    if ($retmsg eq "") {
-	last;
-    }
-    else {
-#	next if ($retmsg eq "compositorcompositor");
-
-#	$ready=0;
-#	if ($retmsg eq "colorkeycolour key") {
-	    $ready=1;
-#	}
-
-	next if (!$ready);
-
-	if (1||$retmsg=~ /^frei0rFrei0r:/) {
-	    print "testing $retmsg\n";
-
-	    # map to key 1 and enable it
-	    `$sendOMC /effect_key/map/clear`;
-	    `$sendOMC /effect_key/map,1,"$retmsg"`;
-	    `$sendOMC /effect_key/enable,1`;
-	    
-	    #if trans, set bg
-	    `$sendOMC /effect_key/inchannels/active/get,1`;
-	    $nchans=&get_newmsg;
-	    if ($nchans==2) {
-		`$sendOMC /clip/background/select,2`;
-	    }
-
-	    #print("number of active in channels is $nchans\n");
-
-
-	    #test each parameter in turn - get value, set to min, max, default
-	    `$sendOMC /effect_key/parameter/count,1`;
-	    $nparms=&get_newmsg;
-
-	    #print "Effect has $nparms params\n";
-
-	    if ($nparms>20) {
-		$nparms=20;
-	    }
-
-#	    &sleep200;
-
-	    for ($i=0;$i<$nparms;$i++) {
-		`$sendOMC /effect_key/parameter/name/get,1,$i`;
-		$pname=&get_newmsg;
-		print ("Testing param $i, $pname\n");
-
-		`$sendOMC /effect_key/parameter/type/get,1,$i`;
-		$ptype=&get_newmsg;
-		if ($ptype==1) {
-		    $ptname="int";
-		}
-		if ($ptype==2) {
-		    $ptname="float";
-		}
-		if ($ptype==3) {
-		    $ptname="bool";
-		}
-		if ($ptype==4) {
-		    $ptname="string";
-		}
-		if ($ptype==5) {
-		    $ptname="colour";
-		}
-
-		print("param type is $ptname\n");
-
-		`$sendOMC /effect_key/parameter/default/get,1,$i`;
-		$pdef=&get_newmsg;
-
-		print("default value is $pdef\n");
-
-		# set to min, max, def; bool on/off; text "LiVES test"
-
-		if ($ptype != 3 && $ptype != 4) {
-		    `$sendOMC /effect_key/parameter/min/get,1,$i`;
-		    $pmin=&get_newmsg;
-		    
-		    print("min value is $pmin\n");
-
-		    `$sendOMC /effect_key/parameter/max/get,1,$i`;
-		    $pmax=&get_newmsg;
-		    
-		    print("max value is $pmax\n");
-
-		    if ($pdef<$pmin || $pdef > $pmax) {
-			#print ("DEFAULT OUT OF RANGE ($pdef) $retmsg: $pname\n");
-		    }
-
-
-		    #set to min
-
-
-
-		}
-
-		#check nvalues in param
-		`$sendOMC /effect_key/parameter/value/count,1,$i`;
-		$pnvals=&get_newmsg;
-		print("nvalues is $pnvals\n");
-
-		if ($pnvals!=1) {
-		    print "not testing ARRAY\n";
-		    exit 0;
-		    next;
-
-		}
-
-
-		if ($ptype==5) {
-		    #colour
-		    `$sendOMC /effect_key/parameter/colorspace/get,1,$i`;
-		    $csp=&get_newmsg;
-		    print("CSP is $csp\n");
-
-		    $test=(split/,/,$pmin)[1];
-
-		    if ($test eq "") {
-			print "min needs expand\n";
-
-			if ($csp==1) {
-			    $pmin="$pmin,$pmin,$pmin";
-			}
-			else {
-			    $pmin="$pmin,$pmin,$pmin,$pmin";
-			}
-
-		    }
-
-		    $test=(split/,/,$pmax)[1];
-
-		    if ($test eq "") {
-			print "max needs expand\n";
-
-			if ($csp==1) {
-			    $pmax="$pmax,$pmax,$pmax";
-			}
-			else {
-			    $pmax="$pmax,$pmax,$pmax,$pmax";
-			}
-
-		    }
-
-		    $test=(split/,/,$pdef)[1];
-
-		    if ($test eq "") {
-			print "def needs expand\n";
-
-			if ($csp==1) {
-			    $pdef="$pdef,$pdef,$pdef";
-			}
-			else {
-			    $pdef="$pdef,$pdef,$pdef,$pdef";
-			}
-
-		    }
-
-		}
-
-
-		# set to first value
-		if ($ptype==3) {
-		    #bool
-		    $pmin=!$pdef;
-		}
-
-		if ($ptype==4) {
-		    #string
-		    $pmin="\"hello \\\"world\\\"!\"";
-		    if ($pdef eq "") {
-			$pdef="\" \"";
-		    }
-		}
-
-
-		`$sendOMC /effect_key/parameter/value/set,1,$i,$pmin`;
-
-		`$sendOMC /effect_key/parameter/value/get,1,$i`;
-		$pval=&get_newmsg;
-		    
-		print("set to first value: $pval\n");
-
-
-		# set to second value
-
-		if ($ptype==1||$ptype==2||$ptype==5) {
-		    `$sendOMC /effect_key/parameter/value/set,1,$i,$pmax`;
-		    
-
-		    `$sendOMC /effect_key/parameter/value/get,1,$i`;
-		    $pval=&get_newmsg;
-		    
-		    print("set to second value: $pval\n");
-		}
-
-
-
-
-		# reset to def. value
-
-		`$sendOMC /effect_key/parameter/value/set,1,$i,$pdef`;
-
-		`$sendOMC /effect_key/parameter/value/get,1,$i`;
-		$pval=&get_newmsg;
-		    
-		print("reset to def value: $pval\n");
-
-
-		# sleep 0.2 seconds
-	    }
-
-
-	    #deactivate fx
-	    `$sendOMC /effect_key/disable,1`;
-
-	}
-    }
-}
-
-
-#clear mapping
-`$sendOMC /effect_key/map/clear`;
-
-`$sendOMC /video/stop`;
-
-
-
-exit 0;
-
-#####################################################################
-
-
-
-
-
-sub get_newmsg {
-    my $newmsg;
-    foreach $server($s->can_read($timeout)){
-	$server->recv($newmsg,1024);
-	my ($rport,$ripaddr) = sockaddr_in($server->peername);
-	
-	# TODO - check from address is our host
-	#print "FROM : ".inet_ntoa($ripaddr)."($rport)  ";
-	
-	last;
-    }
-    # remove terminating NULL
-    $newmsg=substr($newmsg,0,length($newmsg)-1);
-    chomp ($newmsg);
-    return $newmsg;
-}
-
-
-sub location {
-    # return the location of an executable
-    my ($command)=@_;
-    my ($location)=`which $command 2>/dev/null`;
-    chomp($location);
-    $location;
-}
-
-
-sub sleep200 {
-# sleep for 200 ms
-    select(undef, undef, undef, 2.);
-}

LiVES-1.6.1.tar.bz2/ChangeLog -> LiVES-2.0.3.tar.bz2/ChangeLog Changed

@@ -1,5 +1,177 @@
-Version 1.6.1
--------------
+Version 2.0.3 (10 April 2013)
+
+-----------------------------
+Fix rounding error in multitrack audio insert.
+Uncomment URL line in ogg_decoder.c
+
+
+
+
+
+Version 2.0.2 (07 April 2013)
+-----------------------------
+Fix compilation error in widget-helper.h
+Fix compilation error in composite.c
+
+
+
+
+Version 2.0.1 (07 April 2013)
+-----------------------------
+Fix compilation error.
+
+
+
+
+Version 2.0.0 (07 April 2013)
+-----------------------------
+Fix crash in recording external audio with pulse player (regression).
+Minor widget fixes with startup dialogs and labels (regression).
+Refactor timeline drawing in multitrack.
+Enable compilation with gtk+ 3.
+Implement new timeline widget for gtk+ 3.
+Prevent some audio being dropped when re-entering multitrack.
+Fixes for beat_detector plugin.
+Various optimisations and minor bugfixes.
+Updates to all language translations (added translator credits).
+
+
+
+
+
+
+
+Version 1.8.2 (27 January 2013)
+-------------------------------
+Add (another) fix for double typedef compilation error.
+Allow renaming of tracks in multitrack window.
+Fix weed_plugin_utils lib versioning issue.
+
+
+
+
+
+
+
+
+Version 1.8.1 (26 January 2013)
+------------------------------
+Fix various bugs with the RFX builder menus.
+Fix compilation error (double typedef).
+Fix compilation for GTK+ < 2.24
+Fix regression error in Resize All Frames.
+Fix regression in Append Audio.
+Fix crash in audio previews (open/append new audio).
+Fix regression in encoding (after resample).
+Add experimental neural_net compound effect.
+Add motion_analyser compound effect.
+Add mini tracker player in LiVES (fourKlives).
+Various widget updates.
+Make preview in fileselector more responsive.
+Add new interface in RTE window for making/showing data connections.
+Updated translations for German, Russian and Ukranian.
+
+
+
+
+
+
+
+
+
+Version 1.8.0 (15 December 2012)
+-------------------------------
+Fix breakage in multitrack effects (regression).
+Fix crash when re-entering multitrack mode (regression).
+Fix a crash in text parameter entry (regression).
+Add support for compound filters.
+Add new realtime effect - shift.
+Add new data processing filters: alpha_means, data_processing.
+Add new compound effect - image_stabilizer (requires openCV).
+
+
+
+
+
+
+
+
+
+
+Version 1.6.4 (21 October 2012)
+-------------------------------
+Updates to decoder plugins to work with current libav.
+Fix crash in paramwindow textbuffers.
+Add preference for internal/external audio.
+Render audio with audio effects.
+Allow use of audio effects in multitrack.
+Fix crash after adding a new track with an existing event list.
+Update youtube downloader to recognise youtu.be links.
+Fix regression for number of channels dropdown box in audio resampling.
+Fix possible crash when remapping a filter with key defaults set.
+Fix flickering preferences dialog on some window managers.
+Updates to Spanish and German translations.
+
+
+
+
+
+
+
+Version 1.6.3 (15 August 2012)
+------------------------------
+Fix regression in file open/enough.
+Fix installation problem when pulseaudio is not installed.
+Fix GUI exposure crash in multitrack window.
+Prevent truncation of longer filenames in plugin interfaces.
+Add support for audio analyser plugins.
+Add support for audio processing plugins.
+Add support for LADSPA plugins.
+Add beat detector plugin.
+Fixes for rare crashes/bugs in plugin interface windows.
+Group effects by package in the effect mapper window and defaults menu.
+Add OSC commands for out channels, out parameters and data chaining. 
+
+
+
+
+
+
+
+
+
+Version 1.6.2 (24 June 2012)
+----------------------------
+Clean up timer code.
+Show more accurate progress for rendering after recording.
+Call init triggers for rendered transitions.
+Fix triggers for rendered effects (regression).
+Fix regression in file open preview.
+Add workaround for breakage in mplayer/ffmpeg (see http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071)
+Fix hang in Preferences open when image type is set to jpeg (regression).
+Fix regression in undo cut.
+Fix regression for pad audio.
+Quick opening of mpegts files.
+Faster backup/restore.
+Enable exchange of layouts between 32 bit and 64 bit systems.
+Add support for video analyser plugins.
+Add support for data processing plugins.
+Add support for audio generator plugins.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Version 1.6.1 (04 February 2012)
+--------------------------------
 Optimise playback by tweaking audio settings.
 Fix regression in backup.
 Fix floating point fps bug for mkv decoder. *

LiVES-1.6.1.tar.bz2/LiVES.doxygen -> LiVES-2.0.3.tar.bz2/LiVES.doxygen Changed

LiVES-1.6.1.tar.bz2/Makefile.am -> LiVES-2.0.3.tar.bz2/Makefile.am Changed

LiVES-1.6.1.tar.bz2/Makefile.in -> LiVES-2.0.3.tar.bz2/Makefile.in Changed

LiVES-1.6.1.tar.bz2/README -> LiVES-2.0.3.tar.bz2/README Changed

@@ -4,7 +4,7 @@
 -     -    -     -       -
 
 
-Original author: salsaman (salsaman@xs4all.nl,salsaman@gmail.com) and others (see file AUTHORS)
+Original author: salsaman (salsaman@gmail.com) and others (see file AUTHORS)
 
 
 Released under the GNU PUBLIC LICENSE, version 3 or later.
@@ -64,16 +64,16 @@
 If you got LiVES as a tar.gz or tar.bz2, at a terminal prompt, enter the following:
 
 
-          bzip2 -d LiVES-1.6.1.tar.bz2
+          bzip2 -d LiVES-2.0.3.tar.bz2
 or,
-          gzip -d LiVES-1.6.1.tar.gz
+          gzip -d LiVES-2.0.3.tar.gz
 
 depending on which version you have. Then:
 
 
-          tar xvf LIVES-1.6.1.tar
+          tar xvf LIVES-2.0.3.tar
 
-          cd lives-1.6.1
+          cd lives-2.0.3
 
 
 
@@ -84,7 +84,7 @@
 and making any adjustments you may wish - such as installing optional libraries.
 
 If you are happy with the output from configure, then compile the source with:
-
+y
 	make
 
 
@@ -104,11 +104,6 @@
 
 Finally, you should make sure your system can find the new libraries installed by LiVES:
 
-
-	ldconfig
-
-(or as root -
-
 	sudo ldconfig
 
 }

LiVES-1.6.1.tar.bz2/RFX/LiVES-Perl.odt -> LiVES-2.0.3.tar.bz2/RFX/LiVES-Perl.odt Changed

LiVES-1.6.1.tar.bz2/RFX/RFX.spec -> LiVES-2.0.3.tar.bz2/RFX/RFX.spec Changed

@@ -1,9 +1,9 @@
 The RFX (Rendered Effects System)
 ---------------------------------
 
-Author: salsaman@xs4all.nl
-Date: 21/01/2008
-API Version: 1.7 GPL
+Author: salsaman@gmail.com
+Date: 3/3/2013
+API Version: 1.8 GPL
 
 Changes
 1.0 First version salsaman@xs4all.nl
@@ -12,8 +12,9 @@
 1.3 Added "<define>" section
 1.4 Added string support, made line delimiter fixed (\n)
 1.5 Added note about LC_NUMERIC
-1.6 Added string_list parameter type
+d1.6 Added string_list parameter type
 1.7 Updates for compatibility with realtime effects
+1.8 Add special multirect, deprecate multrect, and remove audiochannel.
 
 --- API Version frozen ---
 
@@ -27,9 +28,10 @@
 - Add "special|fileread"
 - Added note about differing input image types
 - Add "special|password"
+- Fix text errors, add note about "$fps"
+- Clarify max length for fileread special keyword.
 
-TODO: 	- change rectdemask to use proportion, to match other framedraws
-	- split into RFX layout and RFX plugin components
+TODO: 	- split into RFX layout and RFX plugin components (?)
 
 
 
@@ -37,7 +39,8 @@
 
 
 Note:
-This license documents a standard. The license of this document is the GNU FDL (GNU Free Documentation License) version 1.3 or higher. The standard itself is released under the GPL v3 or higher.
+This license documents a standard. The license of this document is the GNU FDL (GNU Free Documentation License) version 1.3 or higher. 
+The standard itself is released under the GPL v3 or higher.
 
 See: http://www.gnu.org/copyleft/fdl.html
      http://www.gnu.org/licenses/gpl-3.0.html
@@ -58,7 +61,8 @@
 
 
 Note: RFX layout is now intended to be a standalone component which can be used for passing parameter window descriptions 
-between applications. It consists only of the sections <define>, <params>, <language_code> (and optionally <param_window> and <onchange>). The <name> section is also required, but can be generated ad-hoc by the host.
+between applications. It consists only of the sections <define>, <params>, <language_code> (and optionally <param_window> and <onchange>). 
+The <name> section is also required, but can be generated ad-hoc by the host.
 
 
 
@@ -72,7 +76,7 @@
 processing easier.
 
 The following section describes a script file, and the rules which must be 
-implemented in order to comply with the RFX script version 1.7
+implemented in order to comply with the RFX script version 1.8
 
 
 NOTE: for RFX, the shell variable LC_NUMERIC should be set to "C"; that implies the radix character for 
@@ -160,7 +164,7 @@
 E.g.:
 
 <define>
-|1.7
+|1.8
 </define>
 
 As noted, the following assumes the default field delimiter of |.
@@ -439,41 +443,41 @@
 special|framedraw|rectdemask|1|2|3|4
 
 It is up to individual host authors how they visually interpret the special keyword.
-For benefit of hosts, only one special widget of each type should be used.
+For benefit of hosts, only one special widget with "framedraw" type should be used per plugin.
 
 
 Special widgets
 ---------------
 Suggested interpretation:
 
-  If multi-valued parameters are allowed, each linked parameter can have n values, where n matches the current number of in_channels (including "disabled" channels) to the filter
+  If multi-valued parameters are allowed, each linked parameter can have n values, 
+  where n matches the current number of in_channels (including "disabled" channels) to the filter
   In this case it is up to the host how the currently selected index [n] is chosen.
 
-  If a linked parameter is a float, then the value represents a ratio (e.g. 1.0 = full frame width). If a linked 
-  parameter is an int, then the value is in pixels. In the latter case, the host should set the maximum value as 
-  appropriate.
-
 
 Special type "framedraw" - allows user drawing on a preview frame to control some parameters and vice-versa; origin is top-left
 
+	If a linked parameter has 0 decimal places, then the value is in pixels. If more than 0 decimal places, the value is a ratio 
+	where {1.0,1.0} is the bottom right of the image [as of version 1.8]
+
   Subtype "rectdemask" - >= 4 numeric parameters : demask (only show) a region on the preview frame, from position p0[n],p1[n] to 
                                            p2[n],p3[n]
 
-  Subtype "multrect" - >= 4 numeric parameters : draw a rectangle (outline) on preview frame, offset p0[n]*out_channel1_width,p1[n]*out_channel1_height, scaled by p2[n]*out_channel_width,p3[n]*out_channel_width;
+  Subtype "multrect" - >= 4 numeric parameters : draw a rectangle (outline) on preview frame, offset p0[n]*out_channel1_width,p1[n]*out_channel1_height, scaled by p2[n]*out_channel_width,p3[n]*out_channel_width; [deprecated as of version 1.8]
+
+  Subtype "multirect" - >= 4 numeric parameters : draw a rectangle (outline) on preview frame, position p0[n],p1[n], to position p2[n],p3[n]
 
   Subtype "singlepoint" - >= 2 numeric parameters : draw a "target" point (e.g. crosshair) on the frame, at offset 
-                                            p0[n]*out_channel1_width,p1[n]*out_channel1_height
+                                            p0[n],p1[n]
 
 
 Special type "aspect" - 2 numeric parameters : p0 and p1 may optionally be aspect ratio locked to the corresponding in channel 
                                        width and height; host should provide a way to select/deselect this
 
-Special type "audiochannel" - >=1 any parameters : a parameter marked with this type should have 1 value for each audio channel
-
 Special type "mergealign" – 2 parameters
 The mergealign special widget links together two num type parameters. It has two states. In one state it will set the first parameter to its minimum value and the second parameter to its maximum value. In the second state it will do the opposite, set the first parameter to its maximum, and the second parameter to its minimum.
 
-Special type "fileread" - 1 string parameter : the linked string parameter should point to a file to which the user has read permissions 
+Special type "fileread" - 1 string parameter : the linked string parameter should point to a file to which the user has read permissions. In this case the maximum string length may be ignored by the host to avoid truncating longer filenames.
 
 Special type "password" - 1 string parameter : the host may hide/obscure the input to this string
 
@@ -594,6 +598,8 @@
 
 
 
+Plugins with no in channels (generators) may also set $fps to inform the host of the framerate of the 
+generated clip.
 
 
 
@@ -633,7 +639,7 @@
 e.g. (in LiVES-perl):
 
 <onchange>
-init|$p0_min=-$width+1;$p0_max=$width-1;$p0_min=-$height+1;$p1_max=$height-1;
+init|$p0_min=-$width+1;$p0_max=$width-1;$p1_min=-$height+1;$p1_max=$height-1;
 0|if ($p0) {$p3=$p4*$p5;} elsif ($p1&&$p5>0.) {$p4=$p3/$p5;} elsif ($p4>0.) {$p5=$p3/$p4;}
 </onchange>

LiVES-1.6.1.tar.bz2/aclocal.m4 -> LiVES-2.0.3.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -177,12 +178,15 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -192,7 +196,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -208,7 +212,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -237,12 +241,14 @@
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -347,14 +353,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -394,6 +400,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -458,7 +465,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -523,10 +530,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -748,12 +758,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -793,8 +806,8 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -814,7 +827,7 @@
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -960,12 +973,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -988,13 +1004,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -1002,13 +1019,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1084,12 +1101,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -1112,13 +1131,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -1127,13 +1146,13 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1155,10 +1174,11 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])

LiVES-1.6.1.tar.bz2/build-lives-rfx-plugin -> LiVES-2.0.3.tar.bz2/build-lives-rfx-plugin Changed

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# build-lives-rfx-plugin - Copyright G. Finch (salsaman) 2005 - 2009
+# build-lives-rfx-plugin - Copyright G. Finch (salsaman) 2005 - 2012
 # Released under the GPL 3 or later - see file COPYING or www.gnu.org for details
 
 #usage : build-lives-rfx-plugin <script_file> <output_directory>
@@ -11,7 +11,7 @@
 ########################################################
 # this will auto-generate a LiVES-Perl plugin from the info in $file
 
-$rfx_version="1.7";
+$rfx_version="1.8";
 
 
 if ($ARGV[0] eq "-get") {
@@ -35,7 +35,7 @@
 
 my $version=substr($define,1);
 
-unless ($version eq $rfx_version) {
+unless (&make_ver_hash($version) <= &make_ver_hash($rfx_version)) {
     print "\n\n  - Invalid script RFX version $version, this builder is for $rfx_version\n";
     exit 4;
 }
@@ -78,7 +78,7 @@
 }
 
 
-$builder_version="1.6.1";
+$builder_version="2.0.3";
 
 if ($in_channels==0&&$properties&0x0004) {
     #batch mode generator
@@ -100,13 +100,22 @@
 # LiVES will call this to generate in plugins/effects/rendered/test
 
 if (!defined($ARGV[1])) {
-    $prefix_dir="/tmp";
+    if ($^O eq "MSWin32") {
+	$prefix_dir="C:\\";
+    } else {
+	$prefix_dir="/tmp";
+    }
 }
 else {
     $prefix_dir=$ARGV[1];
 }
 
-my $plugin_file="$prefix_dir/$plugin_name";
+if ($^O eq "MSWin32") {
+    $plugin_file="$prefix_dir\\$plugin_name";
+}
+else {
+    $plugin_file="$prefix_dir/$plugin_name";
+}
 
 if (defined($DEBUG)) {
     print "Creating plugin file $plugin_file\n";
@@ -114,7 +123,7 @@
 
 ########################################################
 
-open OUT,"> $plugin_file";
+open OUT,">","$plugin_file";
 
 print OUT "#!/usr/bin/perl\n\n";
 print OUT "#######################################################################\n";
@@ -259,7 +268,13 @@
 }
 
 if ($in_channels==2) {
-    print OUT "        \$nwidth=\$width;\n\$nheight=\$height;\n";
+    print OUT "   \$nwidth=\$width;\n\$nheight=\$height;\n\n";
+    print OUT "    if (\$img_ext2 eq \".png\") {\n";
+    print OUT "        \$img_prefix2=\"PNG32:\";\n";
+    print OUT "    } else {\n";
+    print OUT "        \$img_prefix2=\"\";\n";
+    print OUT "    }\n";
+
 }
 
 
@@ -267,25 +282,64 @@
 
 if ($in_channels==0&&!$is_batch_gen) {
     # script writer MUST set this themselves
-    print OUT "    \$end=0;\n";
+    print OUT "    \$end=0;\n\n";
 }
 
+print OUT "   if (\$img_ext eq \".png\") {\n";
+print OUT "        \$img_prefix=\"PNG32:\";\n";
+print OUT "   } else {\n";
+print OUT "        \$img_prefix=\"\";\n";
+print OUT "   }\n\n";
+
+print OUT "   if (\$out_ext eq \".png\") {\n";
+print OUT "        \$out_prefix=\"PNG32:\";\n";
+print OUT "   } else {\n";
+print OUT "        \$out_prefix=\"\";\n";
+print OUT "   }\n\n";
+
+
 if (@pre) {
-    &gen_pre; 
+    &gen_pre;
 }
 
+print OUT "\n";
+print OUT "    if (\$start==0) {\$start = 1;}\n";
+print OUT "\n";
+
 unless ($is_batch_gen) {
     print OUT "\n################# loop through frames #################\n";
+
+    print OUT "   if (\$img_ext eq \".png\") {\n";
+    print OUT "        \$img_prefix=\"PNG32:\";\n";
+    print OUT "   } else {\n";
+    print OUT "        \$img_prefix=\"\";\n";
+    print OUT "   }\n\n";
+
+    print OUT "   if (\$out_ext eq \".png\") {\n";
+    print OUT "        \$out_prefix=\"PNG32:\";\n";
+    print OUT "   } else {\n";
+    print OUT "        \$out_prefix=\"\";\n";
+    print OUT "   }\n\n";
+
+
 	if ($in_channels==2) {
 	    print OUT "    \$frame2=\$start2;\n";
 	    print OUT "    unless (defined(\$img_ext2)) {\n";
 	    print OUT "        \$img_ext2=\$img_ext;\n";
-	    print OUT "    }\n";
+	    print OUT "    }\n\n";
 
 	    print OUT "    if (!(\$img_ext2 eq \$img_ext) && &location(\"convert\") eq \"\") {\n";
 	    print OUT "         &sig_error(\"'convert' is required by this plugin.\",\"Please install imagemagick and try again.\");\n";
 	    print OUT "         exit 1;\n";
-	    print OUT "    }\n";
+	    print OUT "    }\n\n";
+
+
+	    print OUT "    if (\$img_ext2 eq \".png\") {\n";
+	    print OUT "        \$img_prefix2=\"PNG32:\";\n";
+	    print OUT "    } else {\n";
+	    print OUT "        \$img_prefix2=\"\";\n";
+	    print OUT "    }\n\n";
+
 
 	}
 
@@ -294,7 +348,11 @@
     print OUT "	\$name=&mkname(\$frame);\n";
 
     unless ($in_channels==0) {
-	print OUT "	\$in=\"\$name\$img_ext\";\n";
+	print OUT "	\$in=\"\$name\$img_ext\";\n\n";
+	print OUT "     if (!defined(\$end) || \$end==0) {\n";
+	print OUT "         print STDERR \"WARNING: generator plugin did not set \$end !\";\n";
+	print OUT "         &sig_error(\"Generator plugin did not set \$end.\");\n";
+	print OUT "     }\n";
     }
     
     if ($in_channels==2) {
@@ -303,7 +361,7 @@
 	print OUT "        \$in2=\"\$clipboard/\$name2\$img_ext2\";\n";
 
 
-	print OUT "        unless (-f \$in2) {\n";
+	print OUT "        unless (-f \$in2f) {\n";
 	print OUT "            # end of clipboard reached, loop back to start\n";
 	print OUT "            \$frame2=\$start2;\n";
 	print OUT "            \$name2=&mkname(\$frame2);\n";
@@ -312,8 +370,8 @@
 
 
 	print OUT "        unless (\$img_ext2 eq \$img_ext) {\n";
-	print OUT "            system(\"\$convert_command \$in2 \$clipboard/\$name2\$img_ext\");\n";
-	print OUT "            \$in2=\"\$clipboard/\$name2\$img_ext\";\n";
+	print OUT "            system(\"\$convert_command \$img_prefix2\\\"\$in2\\\" \$img_prefix\\\"\$clipboard/\$name2\$img_ext\\\"\");\n";
+	print OUT "            \$img_prefix2=\$img_prefix;\n";
 	print OUT "        }\n";
 
 
@@ -350,8 +408,8 @@
     
     print OUT "        \$opfailed=0;\n";
     print OUT "        if (! -f \$out) {\n";
-    print OUT "            print STDERR \"Warning: effect plugin $plugin_name skipped frame \$frame !\n\";\n";
-    print OUT "            print STDERR \"Retrying\n\";\n";
+    print OUT "            print STDERR \"Warning: effect plugin $plugin_name skipped frame \$frame !\\n\";\n";
+    print OUT "            print STDERR \"Retrying\\n\";\n";
 
     print OUT "            \$frame--;\n";
     print OUT "            \$opfailed=1;\n";
@@ -411,6 +469,7 @@
 if (@post) {
     &gen_post;
 }
+print OUT "    exit 0;\n";
 print OUT "}\n";
 
 
@@ -421,7 +480,7 @@
 
 close OUT;
 
-system ("chmod 755 $plugin_file");
+system ("chmod 755 \"$plugin_file\"");
 
 ####################################3
 
@@ -497,7 +556,11 @@
 
 #use POSIX::strtod to account for locales LC_NUMERIC
 
-		print OUT "    \$p$i=int(POSIX::strtod(\$p$i)*$fix+.5)/$fix;\n";
+		print OUT "    if (\$p$i>=0) {\n";
+		print OUT "        \$p$i=int(POSIX::strtod(\$p$i)*$fix+.5)/$fix;\n";
+		print OUT "    } else {\n";
+		print OUT "        \$p$i=int(POSIX::strtod(\$p$i)*$fix-.5)/$fix;\n";
+		print OUT "    }\n";
 		print OUT "    if (\$p$i<$min) {\n";
 		print OUT "       &sig_error(\"$pname must be >= $min\");\n";
 		print OUT "       exit 1;\n";
@@ -705,3 +768,19 @@
 	}
     }
 }
+
+
+sub make_ver_hash {
+    # turn a version like
+    # a.b.c into an integer
+    # a * 1,000,000 plus b * 1,000 plus c
+    # eg. 1.4.6 becomes 10004006
+
+    my ($string)=shift;
+    if ($string eq "") {
+	return 0;
+    }
+    my ($ver_major,$ver_minor,$ver_micro)=split (/[.]/, $string,3);
+    my $version_hash=($ver_major*1000+$ver_minor)*1000;
+    $version_hash;
+}

LiVES-1.6.1.tar.bz2/build-lives-rfx-plugin-multi -> LiVES-2.0.3.tar.bz2/build-lives-rfx-plugin-multi Changed

@@ -1,16 +1,35 @@
 #!/usr/bin/perl
 
 
-# build-lives-rfx-plugin-multi - Copyright G. Finch (salsaman) 2005
+# build-lives-rfx-plugin-multi - Copyright G. Finch (salsaman) 2005 - 2013
 # Released under the GPL 3 or later - see file COPYING or www.gnu.org for details
 
 
 #########################################################
 
-my ($dir_extra)="/lives/plugins/effects/";
-my ($home_dir_extra)="/.lives-dir/plugins/effects/";
-my ($builder)="build-lives-rfx-plugin";
-my ($type)="builtin"; # default
+if ($^O eq "MSWin32") {
+    use File::Path qw(mkpath);
+
+
+    $installdir="C:\\Program Files\\LiVES";
+
+    $login = getlogin;
+    $home="C:\\users\\$login\\Application Data\\LiVES";
+
+    $smogcmd="perl \"$installdir\\smogrify\"";
+    $home_dir_extra="\\Config\\Plugins\\effects\\";
+    $dir_extra="\\Plugins\\effects\\";
+    $builder="$installdir\\build-lives-rfx-plugin";
+}
+else {
+    $smogcmd="smogrify";
+    $home_dir_extra="/.lives-dir/plugins/effects/";
+    $dir_extra="/lives/plugins/effects/";
+    $builder="build-lives-rfx-plugin";
+}
+
+
+my $type="builtin"; # default
 
 #########################################################
 
@@ -22,21 +41,25 @@
     $type=$ARGV[0];
 }
 
-if (defined $ARGV[1]) {
+
+if (defined $ARGV[1] && $ARGV[1] ne "") {
     $scripts_dir=$ARGV[1];
 }
 
-if (defined $ARGV[2]) {
+if (defined $ARGV[2] && $ARGV[2] ne "") {
     $exec_dir=$ARGV[2];
 }
 
-if (defined $ARGV[3]) {
+if (defined $ARGV[3] && $ARGV[3] ne "") {
     $build_bindir=$ARGV[3];
 }
 
 if (!defined($scripts_dir)) {
+    if ($^O ne "MSWin32") {
+
+
 #get <tempdir>
-    `smogrify get_tempdir rfx_builder`;
+    `\"$smogcmd\" get_tempdir rfx_builder`;
     open IN,"< /tmp/.smogrify.rfx_builder";
     read IN,$tmpdir,512;
     close IN;
@@ -48,7 +71,7 @@
     
     
 # check we have the plugin builder
-    `smogrify get_location $builder rfx builder`;
+    `\"$smogcmd\" get_location $builder rfx builder`;
     open IN,"< $tmpdir/.smogval.rfx.builder";
     read IN,$builder_location,512;
     close IN;
@@ -59,10 +82,11 @@
 	exit 3;
     }
     
-    
+    }
+
     if ($type eq "builtin") {
 # get the prefix_dir from ~/.lives
-	`smogrify get_pref prefix_dir rfx builder`;
+	`\"$smogcmd\" get_pref prefix_dir rfx builder`;
 	open IN,"< $tmpdir/.smogval.rfx.builder";
 	read IN,$dir,512;
 	close IN;
@@ -70,41 +94,45 @@
 	chomp($dir);
 	$scripts_dir="$dir/share";
 	$exec_dir="$dir/lib";  # guessing
-   }
+    }
     else {
-	$scripts_dir=$ENV{"HOME"};
+	if ($^O eq "MSWin32") {
+	    $login = getlogin;
+	    $scripts_dir=$home;
+	}
+	else {
+	    $scripts_dir=$ENV{"HOME"};
+	}
 	chomp($scripts_dir);
 	$exec_dir=$scripts_dir;
     }
 }
 
-
-
 if ($type eq "builtin") {
     $scripts_dir.=$dir_extra;
     $indir=$scripts_dir."RFXscripts/";
-    unlink <$indir/*~>;
+    unlink glob "$indir/*~";
     $exec_dir.=$dir_extra;
     $outdir=$exec_dir."rendered/";
 }
 elsif ($type eq "custom") {
     $scripts_dir.=$home_dir_extra;
     $indir=$scripts_dir."RFXscripts/custom/";
-    unlink <$indir/*~>;
+    unlink glob "$indir/*~";
     $exec_dir.=$home_dir_extra;
     $outdir=$exec_dir."rendered/custom/";
 }
 elsif ($type eq "test") {
     $scripts_dir.=$home_dir_extra;
     $indir=$scripts_dir."RFXscripts/test/";
-    unlink <$indir/*~>;
+    unlink glob "$indir/*~";
     $exec_dir.=$home_dir_extra;
     $outdir=$exec_dir."rendered/test/";
 }
 elsif ($type eq "builtinx") {
     $indir=$scripts_dir;
     $outdir=$exec_dir;
-    unlink <$indir/*~>;
+    unlink glob "$indir/*~";
 }
 
 else {
@@ -117,23 +145,38 @@
 
 print "Building all in $indir\n";
 
-
-`/bin/mkdir -p $outdir`;
+if ($^O eq "MSWin32") {
+    mkpath("$outdir");
+} else {
+    `/bin/mkdir -p $outdir`;
+}
 
 opendir DIR,$indir;
 while ($plugin=readdir(DIR)) {
     unless ($plugin =~ /^\./) {
 	print "building $indir$plugin \n";
 	if (defined $build_bindir) {
-	    system("$build_bindir/build-lives-rfx-plugin $indir$plugin $outdir");
+	    if ($^O eq "MSWin32") {
+		system("perl \"$build_bindir\\$builder\" \"$indir$plugin\" \"$outdir\"");
+	    } else {
+		system("\"$build_bindir/$builder\" \"$indir$plugin\" \"$outdir\"");
+	    }
 	}
 	else {
-	    system("build-lives-rfx-plugin $indir$plugin $outdir");
+	    if ($^O eq "MSWin32") {
+		system("perl \"$builder\" \"$indir$plugin\" \"$outdir\"");
+	    } else {
+		system("$builder \"$indir$plugin\" \"$outdir\"");
+	    }
 	}
     }
 }
 close DIR;
 
+if ($type eq "test" || $type eq "custom") {
+    rmdir $outdir;
+}
+
 exit 0;
 
 ######################################################################
@@ -141,13 +184,29 @@
 sub remove_scripted_plugins {
     # remove only plugins with properties&0x8000, and "broken" plugins
     my ($outdir)=@_;
-    my ($file);
+    my $file;
+    my $cmd;
+
+    if ($^O eq "MSWin32") {
+	# filter by file ext
+	my $ext=&get_ext("$plugin");
+	if ($ext eq ".py") {
+	    $cmd="python";
+	}
+	else {
+	    $cmd="perl";
+	}
+    }
+    else {
+	$cmd="";
+    }
+
     opendir DIR,$outdir;
     while ($file=readdir(DIR)) {
 	unless ($file =~ /^\./) {
-	    if (-x "$outdir$file") {
-		my ($fx_caps)=`$outdir$file get_capabilities`;
-		if ($fx_caps&0x8000||$fx_caps eq "") {
+	    if (-x "$outdir$file" || $^O eq "MSWin32") {
+		my ($fx_caps)=`$cmd \"$outdir$file\" get_capabilities`;
+		if ($fx_caps&0x8000||$fx_caps eq ""||$? != 0) {
 		    unlink "$outdir$file";
 		}
 	    }
@@ -160,7 +219,25 @@
 sub location {
     # return the location of an executable
     my ($command)=@_;
+    if ($^O eq "MSWin32") {
+	return "$command.exe";
+    }
     my ($location)=`which $command 2>/dev/null`;
     chomp($location);
     $location;
 }
+
+
+sub get_ext {
+    my $fname=shift;
+
+    my $ext=(split(/\./,$fname))[-1];
+
+    if ($ext=~/(.*)\"$/) {
+	$ext=$1;
+    }
+
+    return ".".$ext;
+}
+
+

LiVES-1.6.1.tar.bz2/compile -> LiVES-2.0.3.tar.bz2/compile Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,219 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -53,11 +251,13 @@
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
@@ -66,8 +266,8 @@
   else
     case $1 in
       -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -94,10 +294,10 @@
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -106,7 +306,7 @@
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d

LiVES-1.6.1.tar.bz2/config.guess -> LiVES-2.0.3.tar.bz2/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -56,8 +54,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +179,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +222,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +396,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +482,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +496,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +553,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +596,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +732,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +771,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,13 +790,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -803,15 +804,18 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -857,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -866,7 +877,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,20 +889,29 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -933,7 +953,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -959,7 +979,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,14 +987,17 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1006,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1042,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1070,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1111,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1155,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1184,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1230,6 +1253,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1275,13 +1301,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1299,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1321,11 +1350,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif

LiVES-1.6.1.tar.bz2/config.sub -> LiVES-2.0.3.tar.bz2/config.sub Changed

LiVES-1.6.1.tar.bz2/configure -> LiVES-2.0.3.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for LiVES 1.6.1.
+# Generated by GNU Autoconf 2.68 for LiVES 2.0.3.
 #
 # Report bugs to <http://www.sourceforge.net/tracker/?group_id=64341&atid=507139>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='LiVES'
 PACKAGE_TARNAME='lives'
-PACKAGE_VERSION='1.6.1'
-PACKAGE_STRING='LiVES 1.6.1'
+PACKAGE_VERSION='2.0.3'
+PACKAGE_STRING='LiVES 2.0.3'
 PACKAGE_BUGREPORT='http://www.sourceforge.net/tracker/?group_id=64341&atid=507139'
 PACKAGE_URL=''
 
@@ -620,6 +620,8 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+BUILD_EXPERIMENTAL_FALSE
+BUILD_EXPERIMENTAL_TRUE
 HAVE_SYSTEM_WEED_PLUGIN_UTILS_FALSE
 HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE
 WEED_PLUGIN_UTILS_LIBS
@@ -691,6 +693,8 @@
 HAVE_UNICAP_TRUE
 UNICAP_LIBS
 UNICAP_CFLAGS
+HAVE_LADSPA_FALSE
+HAVE_LADSPA_TRUE
 CONFIG_BZLIB_FALSE
 CONFIG_BZLIB_TRUE
 LIBBZ_LIBS
@@ -707,6 +711,10 @@
 HAVE_MJPEGTOOLS_TRUE
 MJPEGTOOLS_LIBS
 MJPEGTOOLS_CFLAGS
+HAVE_GLU_FALSE
+HAVE_GLU_TRUE
+GLU_LIBS
+GLU_CFLAGS
 HAVE_GLEE_FALSE
 HAVE_GLEE_TRUE
 GLEE_LIBS
@@ -715,6 +723,15 @@
 HAVE_OPENGL_TRUE
 GL_LIBS
 GL_CFLAGS
+HAVE_FFTW3F_FALSE
+HAVE_FFTW3F_TRUE
+FFTW3F_LIBS
+FFTW3F_CFLAGS
+HAVE_OPENCV_FALSE
+HAVE_OPENCV_TRUE
+OPENCV_LIBS_ONLY_L
+OPENCV_LIBS
+OPENCV_CFLAGS
 HAVE_SWSCALE_FALSE
 HAVE_SWSCALE_TRUE
 HAVE_AVUTIL_FALSE
@@ -742,10 +759,6 @@
 ENABLE_GIW_TRUE
 DISABLE_GLSLICE_FALSE
 DISABLE_GLSLICE_TRUE
-HAVE_GTK_VERSION214_FALSE
-HAVE_GTK_VERSION214_TRUE
-HAVE_GTK_VERSION216_FALSE
-HAVE_GTK_VERSION216_TRUE
 GLIB_LIBS
 GLIB_CFLAGS
 GTK_LIBS_NODYNAMIC
@@ -773,6 +786,8 @@
 HAVE_DOXYGEN_TRUE
 DOXYGEN
 PKG_CONFIG
+ENABLE_PROFILING_FALSE
+ENABLE_PROFILING_TRUE
 PERL
 HAVE_LIBdl_FALSE
 HAVE_LIBdl_TRUE
@@ -824,6 +839,8 @@
 GETTEXT_MACRO_VERSION
 USE_NLS
 GETTEXT_PACKAGE
+IS_MINGW_FALSE
+IS_MINGW_TRUE
 IS_SOLARIS_FALSE
 IS_SOLARIS_TRUE
 IS_LINUX_GNU_FALSE
@@ -873,6 +890,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -982,11 +1000,13 @@
 with_libiconv_prefix
 with_included_gettext
 with_libintl_prefix
+enable_profiling
 enable_doxygen
 enable_OSC
 enable_jack
 enable_jack_transport
 enable_vjack
+enable_gtk3
 enable_glib_slice_allocator
 enable_sdl
 enable_ffmpeg
@@ -994,6 +1014,7 @@
 enable_libpng
 enable_libz
 enable_libbz
+enable_ladspa
 enable_unicap
 enable_libvisual
 enable_liboil
@@ -1036,8 +1057,14 @@
 LIBAVUTIL_LIBS
 LIBSWSCALE_CFLAGS
 LIBSWSCALE_LIBS
+OPENCV_CFLAGS
+OPENCV_LIBS
+FFTW3F_CFLAGS
+FFTW3F_LIBS
 GL_CFLAGS
 GL_LIBS
+GLU_CFLAGS
+GLU_LIBS
 MJPEGTOOLS_CFLAGS
 MJPEGTOOLS_LIBS
 PNG_CFLAGS
@@ -1616,7 +1643,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures LiVES 1.6.1 to adapt to many kinds of systems.
+\`configure' configures LiVES 2.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1687,7 +1714,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LiVES 1.6.1:";;
+     short | recursive ) echo "Configuration of LiVES 2.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1710,11 +1737,13 @@
                           specify multithreading API
   --disable-threads       build without multithread safety
   --disable-rpath         do not hardcode runtime library paths
+  --enable-profiling     Enable profiling with gmon.
   --disable-doxygen     Disable doxygen documentation.
   --disable-OSC            Disable OSC support.
   --disable-jack     Disable jack support.
   --disable-jack-transport     Disable jack transport support.
   --enable-vjack            Enable video jack integration. Experimental.
+  --disable-gtk3     Disable gtk+ 3.x and compile with gtk+ 2.x
   --disable-glib-slice-allocator           Disable the glib slice allocator (not recommended).
   --disable-GIW            Disable GTK+ Instrument Widgets.
   --enable-sdl             Enable SDL playback plugin support without checking for it.
@@ -1724,6 +1753,7 @@
   --disable-libpng    Disable direct libpng support.
   --disable-libz    Disable libz support.
   --disable-libbz    Disable libbz support.
+  --disable-ladspa    Disable LADSPA support.
   --disable-unicap    Disable unicap support.
   --disable-libvisual     Disable libvisual support.
   --disable-liboil     Disable liboil support.
@@ -1733,7 +1763,7 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1794,8 +1824,16 @@
               C compiler flags for LIBSWSCALE, overriding pkg-config
   LIBSWSCALE_LIBS
               linker flags for LIBSWSCALE, overriding pkg-config
+  OPENCV_CFLAGS
+              C compiler flags for OPENCV, overriding pkg-config
+  OPENCV_LIBS linker flags for OPENCV, overriding pkg-config
+  FFTW3F_CFLAGS
+              C compiler flags for FFTW3F, overriding pkg-config
+  FFTW3F_LIBS linker flags for FFTW3F, overriding pkg-config
   GL_CFLAGS   C compiler flags for GL, overriding pkg-config
   GL_LIBS     linker flags for GL, overriding pkg-config
+  GLU_CFLAGS  C compiler flags for GLU, overriding pkg-config
+  GLU_LIBS    linker flags for GLU, overriding pkg-config
   MJPEGTOOLS_CFLAGS
               C compiler flags for MJPEGTOOLS, overriding pkg-config
   MJPEGTOOLS_LIBS
@@ -1916,7 +1954,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LiVES configure 1.6.1
+LiVES configure 2.0.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2638,7 +2676,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by LiVES $as_me 1.6.1, which was
+It was created by LiVES $as_me 2.0.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3570,7 +3608,7 @@
 
 # Define the identity of the package.
  PACKAGE='lives'
- VERSION='1.6.1'
+ VERSION='2.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3600,11 +3638,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -3688,6 +3726,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4501,6 +4540,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4560,7 +4600,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -5672,6 +5712,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -5731,7 +5772,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -6056,6 +6097,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -6115,7 +6157,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -6185,8 +6227,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6830,6 +6872,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6869,7 +6916,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -7298,7 +7345,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7938,13 +7985,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -8091,6 +8138,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
@@ -8479,7 +8527,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -8490,7 +8538,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -9130,7 +9191,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -9141,6 +9208,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -9173,6 +9241,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -9194,7 +9263,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -9341,7 +9412,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -9419,6 +9505,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9878,7 +9968,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9969,18 +10061,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -10342,7 +10449,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10592,8 +10698,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10972,6 +11077,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -11017,6 +11123,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -11045,10 +11152,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -11061,7 +11164,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -11100,7 +11203,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11724,11 +11826,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11818,7 +11915,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11827,7 +11924,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11892,7 +11989,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -12031,7 +12128,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -12039,10 +12136,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -12050,7 +12143,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -12068,7 +12161,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -12088,17 +12181,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -12159,7 +12253,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -12175,7 +12269,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -12212,9 +12306,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12300,7 +12394,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -12369,7 +12463,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12394,7 +12488,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12418,7 +12512,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -12449,7 +12543,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12459,7 +12553,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -13384,7 +13478,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -13968,6 +14061,7 @@
   hardcode_shlibpath_var_CXX=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec_CXX=''
   fi
@@ -14012,7 +14106,7 @@
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -14688,6 +14782,7 @@
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -15477,7 +15572,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -15630,8 +15727,6 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15657,7 +15752,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15666,7 +15761,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15731,7 +15826,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15868,7 +15963,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -15876,10 +15971,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -15887,7 +15978,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -15905,7 +15996,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -15925,17 +16016,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -15996,7 +16088,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -16012,7 +16104,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -16049,9 +16141,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16137,7 +16229,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -16206,7 +16298,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16231,7 +16323,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16255,7 +16347,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -16286,7 +16378,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16296,7 +16388,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16435,6 +16527,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -16996,6 +17090,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -17055,7 +17150,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -17916,6 +18011,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -17973,7 +18069,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -18032,6 +18128,7 @@
 
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18364,37 +18461,11 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lives-plugins/Makefile.am" >&5
-$as_echo_n "checking for lives-plugins/Makefile.am... " >&6; }
-if ${ac_cv_file_lives_plugins_Makefile_am+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "lives-plugins/Makefile.am"; then
-  ac_cv_file_lives_plugins_Makefile_am=yes
-else
-  ac_cv_file_lives_plugins_Makefile_am=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_lives_plugins_Makefile_am" >&5
-$as_echo "$ac_cv_file_lives_plugins_Makefile_am" >&6; }
-if test "x$ac_cv_file_lives_plugins_Makefile_am" = xyes; then :
-
-else
-
-echo "LiVES plugins were not found. Please make sure you have checked them out."
-echo
-echo
-exit
-
-fi
-
-
 IS_DARWIN="false"
 IS_IRIX="false"
 IS_SOLARIS="false"
 IS_LINUX_GNU="false"
+IS_MINGW="false"
 
 case "{$target_os}" in
  *darwin*)
@@ -18409,6 +18480,9 @@
  *solaris*)
    IS_SOLARIS="true"
   ;;
+ *mingw*)
+   IS_MINGW="true"
+  ;;
  *)
   ;;
 esac
@@ -18445,6 +18519,44 @@
   IS_SOLARIS_FALSE=
 fi
 
+ if $IS_MINGW; then
+  IS_MINGW_TRUE=
+  IS_MINGW_FALSE='#'
+else
+  IS_MINGW_TRUE='#'
+  IS_MINGW_FALSE=
+fi
+
+
+if test "$IS_MINGW" = "false"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lives-plugins/Makefile.am" >&5
+$as_echo_n "checking for lives-plugins/Makefile.am... " >&6; }
+if ${ac_cv_file_lives_plugins_Makefile_am+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "lives-plugins/Makefile.am"; then
+  ac_cv_file_lives_plugins_Makefile_am=yes
+else
+  ac_cv_file_lives_plugins_Makefile_am=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_lives_plugins_Makefile_am" >&5
+$as_echo "$ac_cv_file_lives_plugins_Makefile_am" >&6; }
+if test "x$ac_cv_file_lives_plugins_Makefile_am" = xyes; then :
+
+else
+
+echo "LiVES plugins were not found. Please make sure you have checked them out."
+echo
+echo
+exit
+
+fi
+
+fi
+
 
 GETTEXT_PACKAGE=lives
 
@@ -23380,7 +23492,6 @@
 
 
 
-
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
   *[\ \	]-Wall[\ \	]*) ;;
@@ -23502,7 +23613,73 @@
 done
 
 
-# Check for pkg-config
+
+
+
+
+# Check whether --enable-profiling was given.
+if test "${enable_profiling+set}" = set; then :
+  enableval=$enable_profiling; profiling=yes
+else
+  profiling=no
+fi
+
+
+ if test $profiling != no; then
+  ENABLE_PROFILING_TRUE=
+  ENABLE_PROFILING_FALSE='#'
+else
+  ENABLE_PROFILING_TRUE='#'
+  ENABLE_PROFILING_FALSE=
+fi
+
+
+
+
+
+if test "$IS_MINGW" = "true"; then
+# Extract the first word of "i686-pc-mingw32-pkg-config", so it can be a program name with args.
+set dummy i686-pc-mingw32-pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+else
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -23544,11 +23721,12 @@
 fi
 
 
+fi
+
 if test x$PKG_CONFIG = xno; then
    as_fn_error $? "Cannot find pkg-config, make sure it is installed and in your PATH" "$LINENO" 5
 fi
 
-# Check for doxygen
 
 # Check whether --enable-doxygen was given.
 if test "${enable_doxygen+set}" = set; then :
@@ -23644,8 +23822,6 @@
 
 
 
-
-
 for ac_header in linux/joystick.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "linux/joystick.h" "ac_cv_header_linux_joystick_h" "$ac_includes_default"
@@ -24086,6 +24262,134 @@
 fi
 
 
+HAVE_GTK_VERSION3=false
+
+# Check whether --enable-gtk3 was given.
+if test "${enable_gtk3+set}" = set; then :
+  enableval=$enable_gtk3; disable_gtk3=yes
+fi
+
+
+if test "x$disable_gtk3" != "xyes" ; then
+
+echo -n "checking for GTK+ >= 3.0.0... "
+
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  HAVE_GTK_VERSION3=true
+else
+  HAVE_GTK_VERSION3=false
+fi
+
+if test "x$HAVE_GTK_VERSION3" = "xfalse"; then
+echo "no"
+else
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= 3.0.0" 2>&1`
+        else
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= 3.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0.0) were not met:
+
+$GTK_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+
+else
+	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+	GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+fi
+
+else
+
+echo "Not checking for gtk+ 3.x"
+
+fi
+
+if test "x$HAVE_GTK_VERSION3" = "xfalse"; then
+
+echo -n "checking for GTK+ >= 2.4.0... "
 
 
 pkg_failed=no
@@ -24179,8 +24483,6 @@
 
 fi
 
-
-
 if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16.0") 2>&5
@@ -24191,16 +24493,7 @@
 else
   HAVE_GTK_VERSION216=false
 fi
-if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  HAVE_GTK_VERSION214=true
-else
-  HAVE_GTK_VERSION214=false
-fi
+
 if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
@@ -24212,6 +24505,20 @@
   HAVE_GTK_VERSION206=false
 fi
 
+echo "- Compiling with gtk+ 2.x -"
+
+else
+
+echo "- Compiling with gtk+ 3.x -"
+
+HAVE_GTK_VERSION216=true
+HAVE_GTK_VERSION206=true
+
+fi
+
+
+
+
 GTK_LIBS_NODYNAMIC=`echo "$GTK_LIBS" | sed 's/-Wl,--export-dynamic//g'`
 
 
@@ -24455,23 +24762,6 @@
 
 
 
- if $HAVE_GTK_VERSION216; then
-  HAVE_GTK_VERSION216_TRUE=
-  HAVE_GTK_VERSION216_FALSE='#'
-else
-  HAVE_GTK_VERSION216_TRUE='#'
-  HAVE_GTK_VERSION216_FALSE=
-fi
-
- if $HAVE_GTK_VERSION214; then
-  HAVE_GTK_VERSION214_TRUE=
-  HAVE_GTK_VERSION214_FALSE='#'
-else
-  HAVE_GTK_VERSION214_TRUE='#'
-  HAVE_GTK_VERSION214_FALSE=
-fi
-
-
  if $DISABLE_GLSLICE; then
   DISABLE_GLSLICE_TRUE=
   DISABLE_GLSLICE_FALSE='#'
@@ -24551,7 +24841,6 @@
 
 
 
-#if AM_PATH_SDL fails, try pkg-config
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
@@ -25003,12 +25292,180 @@
 
 
 
+HAVE_OPENCV=false
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENCV" >&5
+$as_echo_n "checking for OPENCV... " >&6; }
+
+if test -n "$OPENCV_CFLAGS"; then
+    pkg_cv_OPENCV_CFLAGS="$OPENCV_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv >= 2.3.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "opencv >= 2.3.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_OPENCV_CFLAGS=`$PKG_CONFIG --cflags "opencv >= 2.3.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$OPENCV_LIBS"; then
+    pkg_cv_OPENCV_LIBS="$OPENCV_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opencv >= 2.3.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "opencv >= 2.3.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_OPENCV_LIBS=`$PKG_CONFIG --libs "opencv >= 2.3.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        OPENCV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "opencv >= 2.3.1" 2>&1`
+        else
+	        OPENCV_PKG_ERRORS=`$PKG_CONFIG --print-errors "opencv >= 2.3.1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$OPENCV_PKG_ERRORS" >&5
+
+	HAVE_OPENCV=false
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_OPENCV=false
+else
+	OPENCV_CFLAGS=$pkg_cv_OPENCV_CFLAGS
+	OPENCV_LIBS=$pkg_cv_OPENCV_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_OPENCV=true
+fi
+
+if test "HAVE_OPENCV" = "true" ; then
+OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
+fi
+
 
 
 
 
+ if $HAVE_OPENCV; then
+  HAVE_OPENCV_TRUE=
+  HAVE_OPENCV_FALSE='#'
+else
+  HAVE_OPENCV_TRUE='#'
+  HAVE_OPENCV_FALSE=
+fi
 
 
+HAVE_FFTW3F=false
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFTW3F" >&5
+$as_echo_n "checking for FFTW3F... " >&6; }
+
+if test -n "$FFTW3F_CFLAGS"; then
+    pkg_cv_FFTW3F_CFLAGS="$FFTW3F_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fftw3f") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_FFTW3F_CFLAGS=`$PKG_CONFIG --cflags "fftw3f" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$FFTW3F_LIBS"; then
+    pkg_cv_FFTW3F_LIBS="$FFTW3F_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fftw3f\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "fftw3f") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_FFTW3F_LIBS=`$PKG_CONFIG --libs "fftw3f" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        FFTW3F_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fftw3f" 2>&1`
+        else
+	        FFTW3F_PKG_ERRORS=`$PKG_CONFIG --print-errors "fftw3f" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$FFTW3F_PKG_ERRORS" >&5
+
+	HAVE_FFTW3F=false
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_FFTW3F=false
+else
+	FFTW3F_CFLAGS=$pkg_cv_FFTW3F_CFLAGS
+	FFTW3F_LIBS=$pkg_cv_FFTW3F_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_FFTW3F=true
+fi
+
+
+
+
+ if $HAVE_FFTW3F; then
+  HAVE_FFTW3F_TRUE=
+  HAVE_FFTW3F_FALSE='#'
+else
+  HAVE_FFTW3F_TRUE='#'
+  HAVE_FFTW3F_FALSE=
+fi
+
 
 
 
@@ -25228,6 +25685,85 @@
 
 
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU" >&5
+$as_echo_n "checking for GLU... " >&6; }
+
+if test -n "$GLU_CFLAGS"; then
+    pkg_cv_GLU_CFLAGS="$GLU_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glu\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glu") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLU_CFLAGS=`$PKG_CONFIG --cflags "glu" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLU_LIBS"; then
+    pkg_cv_GLU_LIBS="$GLU_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glu\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glu") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLU_LIBS=`$PKG_CONFIG --libs "glu" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GLU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glu" 2>&1`
+        else
+	        GLU_PKG_ERRORS=`$PKG_CONFIG --print-errors "glu" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GLU_PKG_ERRORS" >&5
+
+	HAVE_GLU=false
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_GLU=false
+else
+	GLU_CFLAGS=$pkg_cv_GLU_CFLAGS
+	GLU_LIBS=$pkg_cv_GLU_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_GLU=true
+fi
+
+
+
+ if $HAVE_GLU; then
+  HAVE_GLU_TRUE=
+  HAVE_GLU_FALSE='#'
+else
+  HAVE_GLU_TRUE='#'
+  HAVE_GLU_FALSE=
+fi
+
 
 
 
@@ -25550,6 +26086,40 @@
 
 
 
+HAVE_LADSPA=false
+# Check whether --enable-ladspa was given.
+if test "${enable_ladspa+set}" = set; then :
+  enableval=$enable_ladspa; disable_ladspa=yes
+fi
+
+if test "x$disable_ladspa" != "xyes" ; then
+
+for ac_header in ladspa.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "ladspa.h" "ac_cv_header_ladspa_h" "$ac_includes_default"
+if test "x$ac_cv_header_ladspa_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LADSPA_H 1
+_ACEOF
+ HAVE_LADSPA=true
+else
+  HAVE_LADSPA=false
+fi
+
+done
+
+fi
+
+ if $HAVE_LADSPA; then
+  HAVE_LADSPA_TRUE=
+  HAVE_LADSPA_FALSE='#'
+else
+  HAVE_LADSPA_TRUE='#'
+  HAVE_LADSPA_FALSE=
+fi
+
+
+
 HAVE_UNICAP=false
 # Check whether --enable-unicap was given.
 if test "${enable_unicap+set}" = set; then :
@@ -26730,6 +27300,10 @@
 	HAVE_SYSTEM_WEED=true
 fi
 
+if test "$HAVE_SYSTEM_WEED" = "false"; then
+echo "...this is not a problem if we have WEED_SLICE"
+fi
+
 
 
 
@@ -26815,6 +27389,8 @@
 
 if test "$HAVE_SYSTEM_WEED_SLICE" = "true"; then
 HAVE_SYSTEM_WEED=true
+else
+echo "...will try to build from included sources"
 fi
 
 
@@ -26828,9 +27404,6 @@
 fi
 
 
-if test "$HAVE_SYSTEM_WEED" = "false"; then
-WEED_MAKEFILES=libweed/Makefile
-fi
 
 
 pkg_failed=no
@@ -26902,6 +27475,10 @@
 	HAVE_SYSTEM_WEED_UTILS=true
 fi
 
+if test "$HAVE_SYSTEM_WEED_UTILS" = "false"; then
+echo "...will try to build from included sources"
+fi
+
 
 
 
@@ -26997,6 +27574,10 @@
 fi
 
 
+if test "$HAVE_SYSTEM_WEED_COMPAT" = "false"; then
+echo "...will try to build from included sources"
+fi
+
 
 
 pkg_failed=no
@@ -27007,12 +27588,12 @@
     pkg_cv_WEED_PLUGIN_UTILS_CFLAGS="$WEED_PLUGIN_UTILS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-plugin-utils >= 0.7.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed-plugin-utils >= 0.7.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-plugin-utils >= 0.13.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed-plugin-utils >= 0.13.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_PLUGIN_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-plugin-utils >= 0.7.0" 2>/dev/null`
+  pkg_cv_WEED_PLUGIN_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-plugin-utils >= 0.13.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -27023,12 +27604,12 @@
     pkg_cv_WEED_PLUGIN_UTILS_LIBS="$WEED_PLUGIN_UTILS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-plugin-utils >= 0.7.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed-plugin-utils >= 0.7.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-plugin-utils >= 0.13.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed-plugin-utils >= 0.13.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_PLUGIN_UTILS_LIBS=`$PKG_CONFIG --libs "libweed-plugin-utils >= 0.7.0" 2>/dev/null`
+  pkg_cv_WEED_PLUGIN_UTILS_LIBS=`$PKG_CONFIG --libs "libweed-plugin-utils >= 0.13.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -27048,9 +27629,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WEED_PLUGIN_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libweed-plugin-utils >= 0.7.0" 2>&1`
+	        WEED_PLUGIN_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libweed-plugin-utils >= 0.13.0" 2>&1`
         else
-	        WEED_PLUGIN_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libweed-plugin-utils >= 0.7.0" 2>&1`
+	        WEED_PLUGIN_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libweed-plugin-utils >= 0.13.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WEED_PLUGIN_UTILS_PKG_ERRORS" >&5
@@ -27071,6 +27652,10 @@
 
 
 
+if test "$HAVE_SYSTEM_WEED_PLUGIN_UTILS" = "false"; then
+echo "...will try to build from included sources"
+fi
+
  if $HAVE_SYSTEM_WEED_PLUGIN_UTILS; then
   HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE=
   HAVE_SYSTEM_WEED_PLUGIN_UTILS_FALSE='#'
@@ -27081,11 +27666,17 @@
 
 
 
+ if false; then
+  BUILD_EXPERIMENTAL_TRUE=
+  BUILD_EXPERIMENTAL_FALSE='#'
+else
+  BUILD_EXPERIMENTAL_TRUE='#'
+  BUILD_EXPERIMENTAL_FALSE=
+fi
 
 
 
-# find -name Makefile.am | sed "s/\.\///g" | sed "s/\.am//g" >> configure.in
-ac_config_files="$ac_config_files libOSC/Makefile libOSC/client/Makefile libOSC/sendOSC/Makefile po/Makefile.in Makefile intl/Makefile m4/Makefile libweed/Makefile src/Makefile resources/Makefile lives-plugins/Makefile lives-plugins/plugins/effects/RFXscripts/Makefile lives-plugins/plugins/effects/Makefile lives-plugins/plugins/encoders/Makefile lives-plugins/plugins/decoders/Makefile lives-plugins/plugins/Makefile lives-plugins/plugins/playback/video/Makefile lives-plugins/plugins/playback/audiostream/Makefile lives-plugins/plugins/playback/Makefile lives-plugins/icons/Makefile lives-plugins/themes/cutting_room/Makefile lives-plugins/themes/pinks/Makefile lives-plugins/themes/camera/Makefile lives-plugins/themes/editor/Makefile lives-plugins/themes/crayons/Makefile lives-plugins/themes/crayons-bright/Makefile lives-plugins/themes/Makefile $WEED_MAKEFILES lives-plugins/weed-plugins/Makefile lives-plugins/weed-plugins/gdk/Makefile lives-plugins/marcos-encoders/Makefile"
+ac_config_files="$ac_config_files libweed/Makefile libOSC/Makefile libOSC/client/Makefile libOSC/sendOSC/Makefile po/Makefile.in Makefile intl/Makefile m4/Makefile src/Makefile resources/Makefile lives-plugins/Makefile lives-plugins/plugins/effects/RFXscripts/Makefile lives-plugins/plugins/effects/compound/Makefile lives-plugins/plugins/effects/Makefile lives-plugins/plugins/encoders/Makefile lives-plugins/plugins/decoders/Makefile lives-plugins/plugins/Makefile lives-plugins/plugins/playback/video/Makefile lives-plugins/plugins/playback/audiostream/Makefile lives-plugins/plugins/playback/Makefile lives-plugins/icons/Makefile lives-plugins/themes/cutting_room/Makefile lives-plugins/themes/pinks/Makefile lives-plugins/themes/camera/Makefile lives-plugins/themes/editor/Makefile lives-plugins/themes/crayons/Makefile lives-plugins/themes/crayons-bright/Makefile lives-plugins/themes/Makefile lives-plugins/weed-plugins/Makefile lives-plugins/weed-plugins/gdk/Makefile lives-plugins/weed-plugins/cairo/Makefile lives-plugins/marcos-encoders/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -27285,10 +27876,18 @@
   as_fn_error $? "conditional \"IS_SOLARIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${IS_MINGW_TRUE}" && test -z "${IS_MINGW_FALSE}"; then
+  as_fn_error $? "conditional \"IS_MINGW\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LIBdl_TRUE}" && test -z "${HAVE_LIBdl_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LIBdl\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_PROFILING_TRUE}" && test -z "${ENABLE_PROFILING_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_PROFILING\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27317,14 +27916,6 @@
   as_fn_error $? "conditional \"HAVE_XRENDER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_GTK_VERSION216_TRUE}" && test -z "${HAVE_GTK_VERSION216_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GTK_VERSION216\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GTK_VERSION214_TRUE}" && test -z "${HAVE_GTK_VERSION214_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GTK_VERSION214\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DISABLE_GLSLICE_TRUE}" && test -z "${DISABLE_GLSLICE_FALSE}"; then
   as_fn_error $? "conditional \"DISABLE_GLSLICE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27357,6 +27948,14 @@
   as_fn_error $? "conditional \"HAVE_SWSCALE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_OPENCV_TRUE}" && test -z "${HAVE_OPENCV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_OPENCV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_FFTW3F_TRUE}" && test -z "${HAVE_FFTW3F_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_FFTW3F\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_OPENGL_TRUE}" && test -z "${HAVE_OPENGL_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_OPENGL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27365,6 +27964,10 @@
   as_fn_error $? "conditional \"HAVE_GLEE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_GLU_TRUE}" && test -z "${HAVE_GLU_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GLU\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_MJPEGTOOLS_TRUE}" && test -z "${HAVE_MJPEGTOOLS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_MJPEGTOOLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27381,6 +27984,10 @@
   as_fn_error $? "conditional \"CONFIG_BZLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_LADSPA_TRUE}" && test -z "${HAVE_LADSPA_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LADSPA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_UNICAP_TRUE}" && test -z "${HAVE_UNICAP_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_UNICAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27461,6 +28068,10 @@
   as_fn_error $? "conditional \"HAVE_SYSTEM_WEED_PLUGIN_UTILS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_EXPERIMENTAL_TRUE}" && test -z "${BUILD_EXPERIMENTAL_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_EXPERIMENTAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -27870,7 +28481,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LiVES $as_me 1.6.1, which was
+This file was extended by LiVES $as_me 2.0.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27927,7 +28538,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LiVES config.status 1.6.1
+LiVES config.status 2.0.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -28053,6 +28664,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -28135,7 +28747,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -28207,7 +28818,6 @@
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -28246,6 +28856,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -28296,7 +28907,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -28330,7 +28940,6 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -28432,6 +29041,7 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "libweed/Makefile") CONFIG_FILES="$CONFIG_FILES libweed/Makefile" ;;
     "libOSC/Makefile") CONFIG_FILES="$CONFIG_FILES libOSC/Makefile" ;;
     "libOSC/client/Makefile") CONFIG_FILES="$CONFIG_FILES libOSC/client/Makefile" ;;
     "libOSC/sendOSC/Makefile") CONFIG_FILES="$CONFIG_FILES libOSC/sendOSC/Makefile" ;;
@@ -28439,11 +29049,11 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
-    "libweed/Makefile") CONFIG_FILES="$CONFIG_FILES libweed/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "resources/Makefile") CONFIG_FILES="$CONFIG_FILES resources/Makefile" ;;
     "lives-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/Makefile" ;;
     "lives-plugins/plugins/effects/RFXscripts/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/plugins/effects/RFXscripts/Makefile" ;;
+    "lives-plugins/plugins/effects/compound/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/plugins/effects/compound/Makefile" ;;
     "lives-plugins/plugins/effects/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/plugins/effects/Makefile" ;;
     "lives-plugins/plugins/encoders/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/plugins/encoders/Makefile" ;;
     "lives-plugins/plugins/decoders/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/plugins/decoders/Makefile" ;;
@@ -28459,9 +29069,9 @@
     "lives-plugins/themes/crayons/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/themes/crayons/Makefile" ;;
     "lives-plugins/themes/crayons-bright/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/themes/crayons-bright/Makefile" ;;
     "lives-plugins/themes/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/themes/Makefile" ;;
-    "$WEED_MAKEFILES") CONFIG_FILES="$CONFIG_FILES $WEED_MAKEFILES" ;;
     "lives-plugins/weed-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/weed-plugins/Makefile" ;;
     "lives-plugins/weed-plugins/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/weed-plugins/gdk/Makefile" ;;
+    "lives-plugins/weed-plugins/cairo/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/weed-plugins/cairo/Makefile" ;;
     "lives-plugins/marcos-encoders/Makefile") CONFIG_FILES="$CONFIG_FILES lives-plugins/marcos-encoders/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -29008,8 +29618,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -29063,6 +29673,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -29364,10 +29977,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -29710,10 +30319,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
@@ -29942,6 +30547,7 @@
 
 
 
+
 if test "$HAVE_JACK" != "true"; then
 echo
 echo "*******************************************************************"
@@ -29976,3 +30582,12 @@
 echo "*******************************************************************"
 echo
 fi
+
+
+echo "*******************************************************************"
+echo "LiVES is now configured and ready for building."
+echo "If you are building for MULTILIBS on a 64 bit system, "
+echo "you may wish to re-run this, e.g.: ./configure --libdir=/usr/lib64"
+echo "In this case you MUST first manually update the library paths in libweed/*.pc files."
+echo  "*******************************************************************"
+

LiVES-1.6.1.tar.bz2/configure.in -> LiVES-2.0.3.tar.bz2/configure.in Changed

@@ -6,7 +6,7 @@
       [m4_pattern_allow([^AC_.*])])
 
 dnl IMPORTANT !! $version must also be set to exactly the same string in smogrify
-AC_INIT(LiVES,1.6.1,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139)
+AC_INIT(LiVES,2.0.3,http://www.sourceforge.net/tracker/?group_id=64341&atid=507139)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
@@ -37,19 +37,16 @@
 
 AM_PROG_AS
 
-ACX_PTHREAD(PTHREAD_OK=true,PTHREAD_OK=false)
+dnl AC_DEFINE([LiVES_VERSION],[],[Description])
+dnl AC_CONFIG_HEADERS(config.h)
 
-AC_CHECK_FILE(lives-plugins/Makefile.am,,[
-echo "LiVES plugins were not found. Please make sure you have checked them out."
-echo
-echo
-exit
-])
+ACX_PTHREAD(PTHREAD_OK=true,PTHREAD_OK=false)
 
 IS_DARWIN="false"
 IS_IRIX="false"
 IS_SOLARIS="false"
 IS_LINUX_GNU="false"
+IS_MINGW="false"
 
 case "{$target_os}" in
  *darwin*)
@@ -64,6 +61,9 @@
  *solaris*)
    IS_SOLARIS="true"
   ;;
+ *mingw*)
+   IS_MINGW="true"
+  ;;
  *)
   ;;
 esac
@@ -72,6 +72,17 @@
 AM_CONDITIONAL(IS_IRIX,$IS_IRIX)
 AM_CONDITIONAL(IS_LINUX_GNU,$IS_LINUX_GNU)
 AM_CONDITIONAL(IS_SOLARIS,$IS_SOLARIS)
+AM_CONDITIONAL(IS_MINGW,$IS_MINGW)
+
+if test "$IS_MINGW" = "false"; then
+AC_CHECK_FILE(lives-plugins/Makefile.am,,[
+echo "LiVES plugins were not found. Please make sure you have checked them out."
+echo
+echo
+exit
+])
+fi
+
 
 GETTEXT_PACKAGE=lives
 AC_SUBST(GETTEXT_PACKAGE)
@@ -88,7 +99,6 @@
 AM_GNU_GETTEXT_VERSION(0.17)
 
 
-
 dnl Use -Wall if we have gcc.
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
@@ -110,13 +120,30 @@
 
 AC_PATH_PROGS(PERL, perl perl5)
 
-# Check for pkg-config
+
+dnl check for profiling
+
+
+
+AC_ARG_ENABLE( profiling, [  --enable-profiling     Enable profiling with gmon.] , profiling=yes, profiling=no)
+
+AM_CONDITIONAL(ENABLE_PROFILING, test $profiling != no)
+
+
+
+dnl Check for pkg-config
+
+if test "$IS_MINGW" = "true"; then
+AC_PATH_PROG(PKG_CONFIG, i686-pc-mingw32-pkg-config, no)
+else
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+
 if test x$PKG_CONFIG = xno; then
    AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
 fi
 
-# Check for doxygen
+dnl Check for doxygen
 
 AC_ARG_ENABLE( doxygen, [  --disable-doxygen     Disable doxygen documentation.] , disable_doxygen=yes)
 
@@ -149,8 +176,6 @@
 AM_CONDITIONAL(ENABLE_OSC,$HAVE_OSC)
 
 
-
-
 dnl js_header
 AC_CHECK_HEADERS(linux/joystick.h, HAVE_JS_HEADER=true, HAVE_JS_HEADER=false)
 
@@ -212,15 +237,52 @@
 
 AM_CONDITIONAL(HAVE_XRENDER,$HAVE_XRENDER)
 
+HAVE_GTK_VERSION3=false
 
-PKG_CHECK_MODULES(GTK,gtk+-2.0 >= 2.4.0)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+AC_ARG_ENABLE( gtk3, [  --disable-gtk3     Disable gtk+ 3.x and compile with gtk+ 2.x] , disable_gtk3=yes)
+
+if test "x$disable_gtk3" != "xyes" ; then
+
+echo -n "checking for GTK+ >= 3.0.0... "
+
+PKG_CHECK_EXISTS([gtk+-3.0 >= 3.0.0],[HAVE_GTK_VERSION3=true],[HAVE_GTK_VERSION3=false])
+
+if test "x$HAVE_GTK_VERSION3" = "xfalse"; then
+echo "no"
+else
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.0)
+fi
+
+else
+
+echo "Not checking for gtk+ 3.x"
+
+fi
+
+if test "x$HAVE_GTK_VERSION3" = "xfalse"; then
+
+echo -n "checking for GTK+ >= 2.4.0... "
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0)
 
 PKG_CHECK_EXISTS([gtk+-2.0 >= 2.16.0],[HAVE_GTK_VERSION216=true],[HAVE_GTK_VERSION216=false])
-PKG_CHECK_EXISTS([gtk+-2.0 >= 2.14.0],[HAVE_GTK_VERSION214=true],[HAVE_GTK_VERSION214=false])
+
 PKG_CHECK_EXISTS([gtk+-2.0 >= 2.6.0],[HAVE_GTK_VERSION206=true],[HAVE_GTK_VERSION206=false])
 
+echo "- Compiling with gtk+ 2.x -"
+
+else
+
+echo "- Compiling with gtk+ 3.x -"
+
+HAVE_GTK_VERSION216=true
+HAVE_GTK_VERSION206=true
+
+fi
+
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
 GTK_LIBS_NODYNAMIC=`echo "$GTK_LIBS" | sed 's/-Wl,--export-dynamic//g'`
 AC_SUBST(GTK_LIBS_NODYNAMIC)
 
@@ -262,9 +324,6 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-AM_CONDITIONAL(HAVE_GTK_VERSION216,$HAVE_GTK_VERSION216)
-AM_CONDITIONAL(HAVE_GTK_VERSION214,$HAVE_GTK_VERSION214)
-
 AM_CONDITIONAL(DISABLE_GLSLICE,$DISABLE_GLSLICE)
 
 
@@ -325,7 +384,7 @@
 
 [
 
-#if AM_PATH_SDL fails, try pkg-config
+dnl if AM_PATH_SDL fails, try pkg-config
 PKG_CHECK_MODULES(SDL,sdl >= 1.2,HAVE_SDL=true,HAVE_SDL=false)
 
 
@@ -392,21 +451,32 @@
 AM_CONDITIONAL(HAVE_SWSCALE,$HAVE_SWSCALE)
 
 
-dnl HAVE_OPENCV=false
+HAVE_OPENCV=false
 
 dnl check for opencv
 
-dnl PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
+PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, HAVE_OPENCV=true, HAVE_OPENCV=false)
+
+if test "HAVE_OPENCV" = "true" ; then
+OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
+fi
+
+
+AC_SUBST(OPENCV_CFLAGS)
+AC_SUBST(OPENCV_LIBS_ONLY_L)
 
-dnl if test "HAVE_OPENCV" = "true" ; then
-dnl OPENCV_LIBS_ONLY_L = `pkg-config opencv --libs-only-L`
-dnl fi
+AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
 
+HAVE_FFTW3F=false
 
-dnl AC_SUBST(OPENCV_CFLAGS)
-dnl AC_SUBST(OPENCV_LIBS_ONLY_L)
+dnl check for fftw3f
 
-dnl AM_CONDITIONAL(HAVE_OPENCV,$HAVE_OPENCV)
+PKG_CHECK_MODULES(FFTW3F, fftw3f, HAVE_FFTW3F=true, HAVE_FFTW3F=false)
+
+AC_SUBST(FFTW3F_CFLAGS)
+AC_SUBST(FFTW3F_LIBS)
+
+AM_CONDITIONAL(HAVE_FFTW3F,$HAVE_FFTW3F)
 
 
 dnl check for openGL
@@ -451,11 +521,11 @@
 
 
 dnl check for GLU
-dnl PKG_CHECK_MODULES(GLU,glu,HAVE_GLU=true,HAVE_GLU=false)
-dnl AC_SUBST(GLU_CFLAGS)
-dnl AC_SUBST(GLU_LIBS)
+PKG_CHECK_MODULES(GLU,glu,HAVE_GLU=true,HAVE_GLU=false)
+AC_SUBST(GLU_CFLAGS)
+AC_SUBST(GLU_LIBS)
 
-dnl AM_CONDITIONAL(HAVE_GLU,$HAVE_GLU)
+AM_CONDITIONAL(HAVE_GLU,$HAVE_GLU)
 
 
 
@@ -521,6 +591,17 @@
 AM_CONDITIONAL(CONFIG_BZLIB,$HAVE_LIBBZ)
 
 
+HAVE_LADSPA=false
+AC_ARG_ENABLE( ladspa, [  --disable-ladspa    Disable LADSPA support.] , disable_ladspa=yes)
+if test "x$disable_ladspa" != "xyes" ; then
+
+dnl check for libz
+AC_CHECK_HEADERS(ladspa.h,HAVE_LADSPA=true,HAVE_LADSPA=false)
+fi
+
+AM_CONDITIONAL(HAVE_LADSPA,$HAVE_LADSPA)
+
+
 HAVE_UNICAP=false
 AC_ARG_ENABLE( unicap, [  --disable-unicap    Disable unicap support.] , disable_unicap=yes)
 if test "x$disable_unicap" != "xyes" ; then
@@ -682,6 +763,10 @@
 
 PKG_CHECK_MODULES(WEED, libweed >= 0.7.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
 
+if test "$HAVE_SYSTEM_WEED" = "false"; then
+echo "...this is not a problem if we have WEED_SLICE"
+fi
+
 AC_SUBST(WEED_CFLAGS)
 AC_SUBST(WEED_LIBS)
 
@@ -692,6 +777,8 @@
 
 if test "$HAVE_SYSTEM_WEED_SLICE" = "true"; then
 HAVE_SYSTEM_WEED=true
+else
+echo "...will try to build from included sources"
 fi
 
 dnl CFLAGS will be the same
@@ -699,12 +786,13 @@
 
 AM_CONDITIONAL(HAVE_SYSTEM_WEED_SLICE,$HAVE_SYSTEM_WEED_SLICE)
 
-if test "$HAVE_SYSTEM_WEED" = "false"; then
-WEED_MAKEFILES=libweed/Makefile
-fi
 
 PKG_CHECK_MODULES(WEED_UTILS, libweed-utils >= 0.6.0, HAVE_SYSTEM_WEED_UTILS=true, HAVE_SYSTEM_WEED_UTILS=false)
 
+if test "$HAVE_SYSTEM_WEED_UTILS" = "false"; then
+echo "...will try to build from included sources"
+fi
+
 AC_SUBST(WEED_UTILS_CFLAGS)
 AC_SUBST(WEED_UTILS_LIBS)
 
@@ -718,20 +806,29 @@
 
 AM_CONDITIONAL(HAVE_SYSTEM_WEED_COMPAT,$HAVE_SYSTEM_WEED_COMPAT)
 
+if test "$HAVE_SYSTEM_WEED_COMPAT" = "false"; then
+echo "...will try to build from included sources"
+fi
+
 
-PKG_CHECK_MODULES(WEED_PLUGIN_UTILS, libweed-plugin-utils >= 0.7.0, HAVE_SYSTEM_WEED_PLUGIN_UTILS=true, HAVE_SYSTEM_WEED_PLUGIN_UTILS=false)
+PKG_CHECK_MODULES(WEED_PLUGIN_UTILS, libweed-plugin-utils >= 0.13.0, HAVE_SYSTEM_WEED_PLUGIN_UTILS=true, HAVE_SYSTEM_WEED_PLUGIN_UTILS=false)
 
 AC_SUBST(WEED_PLUGIN_UTILS_CFLAGS)
 AC_SUBST(WEED_PLUGIN_UTILS_LIBS)
 
-AM_CONDITIONAL(HAVE_SYSTEM_WEED_PLUGIN_UTILS,$HAVE_SYSTEM_WEED_PLUGIN_UTILS)
+if test "$HAVE_SYSTEM_WEED_PLUGIN_UTILS" = "false"; then
+echo "...will try to build from included sources"
+fi
 
+AM_CONDITIONAL(HAVE_SYSTEM_WEED_PLUGIN_UTILS,$HAVE_SYSTEM_WEED_PLUGIN_UTILS)
 
 
+AM_CONDITIONAL(BUILD_EXPERIMENTAL,false)
 
 
-# find -name Makefile.am | sed "s/\.\///g" | sed "s/\.am//g" >> configure.in
-AC_OUTPUT([ 
+dnl find -name Makefile.am | sed "s/\.\///g" | sed "s/\.am//g" >> configure.in
+AC_CONFIG_FILES([
+libweed/Makefile
 libOSC/Makefile
 libOSC/client/Makefile
 libOSC/sendOSC/Makefile
@@ -739,11 +836,11 @@
 Makefile
 intl/Makefile
 m4/Makefile
-libweed/Makefile
 src/Makefile
 resources/Makefile
 lives-plugins/Makefile
 lives-plugins/plugins/effects/RFXscripts/Makefile
+lives-plugins/plugins/effects/compound/Makefile
 lives-plugins/plugins/effects/Makefile
 lives-plugins/plugins/encoders/Makefile
 lives-plugins/plugins/decoders/Makefile
@@ -759,11 +856,15 @@
 lives-plugins/themes/crayons/Makefile
 lives-plugins/themes/crayons-bright/Makefile
 lives-plugins/themes/Makefile
-$WEED_MAKEFILES
 lives-plugins/weed-plugins/Makefile
 lives-plugins/weed-plugins/gdk/Makefile
+lives-plugins/weed-plugins/cairo/Makefile
 lives-plugins/marcos-encoders/Makefile
 ])
+AC_OUTPUT
+
+dnl lives-plugins/weed-plugins/supercollider/Makefile
+dnl lives-plugins/weed-plugins/experimental/Makefile
 
 
 if test "$HAVE_JACK" != "true"; then
@@ -799,4 +900,13 @@
 echo "2.10.0 of gtk+-2.0 to ensure problem free running of LiVES"
 echo "*******************************************************************"
 echo
-fi
\ No newline at end of file
+fi
+
+
+echo "*******************************************************************"
+echo "LiVES is now configured and ready for building."
+echo "If you are building for MULTILIBS on a 64 bit system, "
+echo "you may wish to re-run this, e.g.: ./configure --libdir=/usr/lib64"
+echo "In this case you MUST first manually update the library paths in libweed/*.pc files."
+echo  "*******************************************************************"
+

LiVES-1.6.1.tar.bz2/depcomp -> LiVES-2.0.3.tar.bz2/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +40,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +57,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +96,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +168,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +214,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +234,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -249,12 +274,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +289,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +317,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -334,7 +367,7 @@
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -349,9 +382,9 @@
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -397,14 +430,59 @@
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/'"$tab"'\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -422,7 +500,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,15 +520,14 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -503,9 +580,10 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -525,7 +603,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -594,8 +672,8 @@
   sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;

LiVES-1.6.1.tar.bz2/install-sh -> LiVES-2.0.3.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

LiVES-1.6.1.tar.bz2/libOSC/Makefile.am -> LiVES-2.0.3.tar.bz2/libOSC/Makefile.am Changed

LiVES-1.6.1.tar.bz2/libOSC/Makefile.in -> LiVES-2.0.3.tar.bz2/libOSC/Makefile.in Changed

LiVES-1.6.1.tar.bz2/libOSC/NetworkUDP.h -> LiVES-2.0.3.tar.bz2/libOSC/NetworkUDP.h Changed

LiVES-1.6.1.tar.bz2/libOSC/OSC-common.c -> LiVES-2.0.3.tar.bz2/libOSC/OSC-common.c Changed

LiVES-1.6.1.tar.bz2/libOSC/OSC-receive.c -> LiVES-2.0.3.tar.bz2/libOSC/OSC-receive.c Changed

LiVES-1.6.1.tar.bz2/libOSC/OSC-receive.h -> LiVES-2.0.3.tar.bz2/libOSC/OSC-receive.h Changed

LiVES-1.6.1.tar.bz2/libOSC/OSC-struct.h -> LiVES-2.0.3.tar.bz2/libOSC/OSC-struct.h Changed

LiVES-1.6.1.tar.bz2/libOSC/client/Makefile.am -> LiVES-2.0.3.tar.bz2/libOSC/client/Makefile.am Changed

LiVES-1.6.1.tar.bz2/libOSC/client/Makefile.in -> LiVES-2.0.3.tar.bz2/libOSC/client/Makefile.in Changed

LiVES-1.6.1.tar.bz2/libOSC/client/OSC-client.c -> LiVES-2.0.3.tar.bz2/libOSC/client/OSC-client.c Changed

LiVES-1.6.1.tar.bz2/libOSC/sendOSC/Makefile.am -> LiVES-2.0.3.tar.bz2/libOSC/sendOSC/Makefile.am Changed

LiVES-1.6.1.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-2.0.3.tar.bz2/libOSC/sendOSC/Makefile.in Changed

LiVES-1.6.1.tar.bz2/libOSC/sendOSC/htmsocket.c -> LiVES-2.0.3.tar.bz2/libOSC/sendOSC/htmsocket.c Changed

@@ -38,22 +38,51 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#include <sys/param.h>
+
+#ifndef IS_MINGW
 #include <netinet/in.h>
+#include <sys/time.h>
 
 #include <rpc/rpc.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/times.h>
-#include <sys/param.h>
-#include <sys/time.h>
 #include <sys/ioctl.h>
-
-#include <ctype.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <pwd.h>
-#include <signal.h>
 #include <grp.h>
+
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+
+#include <fcntl.h>
+#undef _S_IREAD
+#undef _S_IWRITE
+
+#define _S_IREAD 256
+#define _S_IWRITE 128
+int mkstemp(char *tmpl)
+{
+  int ret=-1;
+  mktemp(tmpl);
+  ret=open(tmpl,O_RDWR|O_BINARY|O_CREAT|O_EXCL|_O_SHORT_LIVED, _S_IREAD|_S_IWRITE);
+  return ret;
+}
+
+#endif
+
+#if IS_SOLARIS
+#include <sys/filio.h>
+#endif
+
+
+#include <ctype.h>
+#include <signal.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/time.h>
@@ -64,142 +93,159 @@
 #define UNIXDG_PATH "/tmp/htm"
 #define UNIXDG_TMP "/tmp/htm.XXXXXX"
 #include "htmsocket.h"                          
+
+
 typedef struct
 {
-	float srate;
-
-	struct sockaddr_in serv_addr; /* udp socket */
-        struct sockaddr_un     userv_addr; /* UNIX socket */
-	int sockfd;		/* socket file descriptor */
-	int index, len,uservlen;
-	void *addr;
-	int id;
+  float srate;
+
+  struct sockaddr_in serv_addr; /* udp socket */
+#ifndef IS_MINGW
+  struct sockaddr_un userv_addr; /* UNIX socket */
+#endif
+  int sockfd;		/* socket file descriptor */
+  int index, len,uservlen;
+  void *addr;
+  int id;
 } desc;
 
+
 /* open a socket for HTM communication to given  host on given portnumber */
 /* if host is 0 then UNIX protocol is used (i.e. local communication */
-void *OpenHTMSocket(char *host, int portnumber)
-{
-	int sockfd;
-	struct sockaddr_in  cl_addr;
-	struct sockaddr_un  ucl_addr;
-	desc *o;
-	o = malloc(sizeof(*o));
-	if(!o)
-		return 0;
-	if(!host)
-	{
-		int clilen;
-		  o->len = sizeof(ucl_addr);
-		/*
-		         * Fill in the structure "userv_addr" with the address of the
-		         * server that we want to send to.
-		*/
-		
-		bzero((char *) &o->userv_addr, sizeof(o->userv_addr));
-		       o->userv_addr.sun_family = AF_UNIX;
-		strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
-			sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
-	        o->uservlen = sizeof(o->userv_addr.sun_family) + strlen(o->userv_addr.sun_path);
-		o->addr = &(o->userv_addr);
-		/*
-		* Open a socket (a UNIX domain datagram socket).
-		*/
+
+void *OpenHTMSocket(char *host, int portnumber) {
+  //#ifndef IS_MINGW
+  int sockfd;
+  struct sockaddr_in  cl_addr;
+#ifndef IS_MINGW
+  struct sockaddr_un  ucl_addr;
+#endif
+  desc *o;
+  o = malloc(sizeof(*o));
+  if(!o)
+    return 0;
+#ifdef IS_MINGW
+  if (!host) host="localhost";
+#else
+  if(!host)
+    {
+      int clilen;
+      o->len = sizeof(ucl_addr);
+      /*
+       * Fill in the structure "userv_addr" with the address of the
+       * server that we want to send to.
+       */
 		
-		if ( (sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0)
-		{
-			/*
-			 * Bind a local address for us.
-			 * In the UNIX domain we have to choose our own name (that
-			 * should be unique).  We'll use mktemp() to create a unique
-			 * pathname, based on our process id.
-			 */
-		  int dummy;
-
-			bzero((char *) &ucl_addr, sizeof(ucl_addr));    /* zero out */
-			ucl_addr.sun_family = AF_UNIX;
-			strcpy(ucl_addr.sun_path, UNIXDG_TMP);
-
-			dummy=mkstemp(ucl_addr.sun_path);
-			clilen = sizeof(ucl_addr.sun_family) + strlen(ucl_addr.sun_path);
+      memset((char *) &o->userv_addr, 0, sizeof(o->userv_addr));
+      o->userv_addr.sun_family = AF_UNIX;
+      strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
+      sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
+      o->uservlen = sizeof(o->userv_addr.sun_family) + strlen(o->userv_addr.sun_path);
+      o->addr = &(o->userv_addr);
+      /*
+       * Open a socket (a UNIX domain datagram socket).
+       */
 		
-			if (bind(sockfd, (struct sockaddr *) &ucl_addr, clilen) < 0)
-			{
-				perror("client: can't bind local address");
-				close(sockfd);
-				sockfd = -1;
-			}
-		}
-		else
-			perror("unable to make socket\n");
-
-	}else
+      if ( (sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0)
 	{
-		/*
-		         * Fill in the structure "serv_addr" with the address of the
-		         * server that we want to send to.
-		*/
-		o->len = sizeof(cl_addr);
-		bzero((char *)&o->serv_addr, sizeof(o->serv_addr));
-		o->serv_addr.sin_family = AF_INET;
-
-	    /* MW 6/6/96: Call gethostbyname() instead of inet_addr(),
-	       so that host can be either an Internet host name (e.g.,
-	       "les") or an Internet address in standard dot notation 
-	       (e.g., "128.32.122.13") */
-	    {
-		struct hostent *hostsEntry;
-		unsigned long address;
-
-		hostsEntry = gethostbyname(host);
-		if (hostsEntry == NULL) {
-		    fprintf(stderr, "Couldn't decipher host name \"%s\"\n",
-			    host);
-		    herror(NULL);
-		    return 0;
-		}
+	  /*
+	   * Bind a local address for us.
+	   * In the UNIX domain we have to choose our own name (that
+	   * should be unique).  We'll use mktemp() to create a unique
+	   * pathname, based on our process id.
+	   */
+	  int dummy;
+
+	  memset((char *) &ucl_addr, 0, sizeof(ucl_addr));    /* zero out */
+	  ucl_addr.sun_family = AF_UNIX;
+	  strcpy(ucl_addr.sun_path, UNIXDG_TMP);
+
+	  dummy=mkstemp(ucl_addr.sun_path);
+	  dummy=dummy;
+	  clilen = sizeof(ucl_addr.sun_family) + strlen(ucl_addr.sun_path);
 		
-		address = *((unsigned long *) hostsEntry->h_addr_list[0]);
-		o->serv_addr.sin_addr.s_addr = address;
+	  if (bind(sockfd, (struct sockaddr *) &ucl_addr, clilen) < 0)
+	    {
+	      perror("client: can't bind local address");
+	      close(sockfd);
+	      sockfd = -1;
 	    }
+	}
+      else
+	perror("unable to make socket\n");
 
-	    /* was: o->serv_addr.sin_addr.s_addr = inet_addr(host); */
-
-	    /* End MW changes */
-
-			o->serv_addr.sin_port = htons(portnumber);
-		o->addr = &(o->serv_addr);
-		/*
-		* Open a socket (a UDP domain datagram socket).
-		*/
-		if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0)
-		{
-			bzero((char *)&cl_addr, sizeof(cl_addr));
-			cl_addr.sin_family = AF_INET;
-			cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-			cl_addr.sin_port = htons(0);
-			
-			if(bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0)
-			{
-				perror("could not bind\n");
-				close(sockfd);
-				sockfd = -1;
-			}
-		}
-		else
-		{
-			perror("unable to make socket\n");
-		}
+    }else
+    {
+#endif
+      /*
+       * Fill in the structure "serv_addr" with the address of the
+       * server that we want to send to.
+       */
+      o->len = sizeof(cl_addr);
+      memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
+      o->serv_addr.sin_family = AF_INET;
+
+      /* MW 6/6/96: Call gethostbyname() instead of inet_addr(),
+	 so that host can be either an Internet host name (e.g.,
+	 "les") or an Internet address in standard dot notation 
+	 (e.g., "128.32.122.13") */
+      {
+	struct hostent *hostsEntry;
+	unsigned long address;
+
+	hostsEntry = gethostbyname(host);
+	if (hostsEntry == NULL) {
+	  fprintf(stderr, "Couldn't decipher host name \"%s\"\n",
+		  host);
+	  return 0;
+	}
 		
+	address = *((unsigned long *) hostsEntry->h_addr_list[0]);
+	o->serv_addr.sin_addr.s_addr = address;
+      }
+
+      /* was: o->serv_addr.sin_addr.s_addr = inet_addr(host); */
+
+      /* End MW changes */
+
+      o->serv_addr.sin_port = htons(portnumber);
+      o->addr = &(o->serv_addr);
+      /*
+       * Open a socket (a UDP domain datagram socket).
+       */
+      if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0)
+	{
+	  memset((char *)&cl_addr, 0, sizeof(cl_addr));
+	  cl_addr.sin_family = AF_INET;
+	  cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	  cl_addr.sin_port = htons(0);
+			
+	  if(bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0)
+	    {
+	      perror("could not bind\n");
+	      close(sockfd);
+	      sockfd = -1;
+	    }
 	}
-	if(sockfd<0)
+      else
 	{
-		free(o); o = 0;
+	  perror("unable to make socket\n");
 	}
-	else
-		o->sockfd = sockfd;
-	return o;
+#ifndef IS_MINGW		
+    }
+#endif
+  if(sockfd<0)
+    {
+      free(o); o = 0;
+    }
+  else
+    o->sockfd = sockfd;
+  return o;
+  //#endif
+    return NULL;
 }
+
+
 #include <errno.h>
 
 static  bool sendudp(const struct sockaddr *sp, int sockfd,int length, int count, void  *b)
@@ -215,12 +261,17 @@
 }
 bool SendHTMSocket(void *htmsendhandle, int length_in_bytes, void *buffer)
 {
+  //#ifndef IS_MINGW
 	desc *o = (desc *)htmsendhandle;
 	return sendudp(o->addr, o->sockfd, o->len, length_in_bytes, buffer);
+	//#endif
+	return FALSE;
 }
 void CloseHTMSocket(void *htmsendhandle)
 {
+  //#ifndef IS_MINGW
 	desc *o = (desc *)htmsendhandle;
 	close(o->sockfd);
 	free(o);
+	//#endif
 }

LiVES-1.6.1.tar.bz2/libOSC/sendOSC/sendOSC.c -> LiVES-2.0.3.tar.bz2/libOSC/sendOSC/sendOSC.c Changed

@@ -56,12 +56,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#ifndef IS_MINGW
 #include <netinet/in.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
 #include <string.h>
 #include <inttypes.h>
 
 typedef struct {
-    enum {INT, FLOAT, STRING} type;
+    enum {INTx, FLOATx, STRINGx} type;
     union {
         int i;
         float f;
@@ -93,9 +98,23 @@
 static int useTypeTags = 1;
 
 int main(int argc, char *argv[]) {
-    int portnumber;
-    char *hostname = 0;
-    void *htmsocket;
+#ifdef IS_MINGW
+  WSADATA wsaData;
+  int iResult;
+#endif
+
+  int portnumber;
+  char *hostname = 0;
+  void *htmsocket;
+
+#ifdef IS_MINGW
+  // Initialize Winsock
+  iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
+  if (iResult != 0) {
+    printf("WSAStartup failed: %d\n", iResult);
+    exit (1);
+  }
+#endif
 
     argc--;
     argv++;
@@ -147,6 +166,11 @@
         InteractiveMode(htmsocket);
     }
     CloseHTMSocket(htmsocket);
+
+#ifdef IS_MINGW
+    WSACleanup();
+#endif
+    
     exit(exitStatus);
 
 
@@ -288,13 +312,13 @@
 	while (isspace(*p)) p++;
 
 	arg = ParseToken(p);
-	if (arg.type == STRING) {
+	if (arg.type == STRINGx) {
 	    complain("warning: inscrutable time tag request: %s\n", s);
 	    return OSCTT_Immediately();
-	} else if (arg.type == INT) {
+	} else if (arg.type == INTx) {
 	    return OSCTT_PlusSeconds(OSCTT_CurrentTime(),
 				     (float) arg.datum.i);
-	} else if (arg.type == FLOAT) {
+	} else if (arg.type == FLOATx) {
 	    return OSCTT_PlusSeconds(OSCTT_CurrentTime(), arg.datum.f);
 	} else {
 	    fatal_error("This can't happen!");
@@ -308,7 +332,7 @@
 	    complain("warning: couldn't parse time tag %s\n", s);
 	    return OSCTT_Immediately();
 	}
-#ifndef	HAS8BYTEINT
+#ifndef	HAS8BYTEINTx
 	if (ntohl(1) != 1) {
 	    /* tt is a struct of seconds and fractional part,
 	       and this machine is little-endian, so sscanf
@@ -348,11 +372,11 @@
 	    return;
 	}
 
-	arg.type = INT;
+	arg.type = INTx;
 	arg.datum.i = 0;
 	WriteMessage(buf, "/voices/0/tp/timbre_index", 1, &arg);
 
-	arg.type = FLOAT;
+	arg.type = FLOATx;
 	arg.datum.i = 0.0f;
 	WriteMessage(buf, "/voices/0/tm/goto", 1, &arg);
 
@@ -378,7 +402,7 @@
         if (*p == '"') {
             /* A string argument: scan for close quotes */
             p++;
-            args[thisArg].type = STRING;
+            args[thisArg].type = STRINGx;
             args[thisArg].datum.s = p;
 
             while (*p != '"') {
@@ -423,7 +447,7 @@
     if (isdigit(*p) || *p == '.') {
         while (isdigit(*p)) p++;
         if (*p == '\0') {
-            returnVal.type = INT;
+            returnVal.type = INTx;
             returnVal.datum.i = atoi(token);
             return returnVal;
         }
@@ -431,14 +455,14 @@
             p++;
             while (isdigit(*p)) p++;
             if (*p == '\0') {
-                returnVal.type = FLOAT;
+                returnVal.type = FLOATx;
                 returnVal.datum.f = atof(token);
                 return returnVal;
             }
         }
     }
 
-    returnVal.type = STRING;
+    returnVal.type = STRINGx;
     returnVal.datum.s = token;
     return returnVal;
 }
@@ -453,15 +477,15 @@
 
      for (j = 0; j < numArgs; j++) {
         switch (args[j].type) {
-            case INT:
+            case INTx:
 	    printf("%d ", args[j].datum.i);
             break;
 
-            case FLOAT:
+            case FLOATx:
 	    printf("%f ", args[j].datum.f);
             break;
 
-            case STRING:
+            case STRINGx:
 	    printf("%s ", args[j].datum.s);
             break;
 
@@ -487,15 +511,15 @@
 
 	for (i = 0; i < numArgs; ++i) {
 	    switch (args[i].type) {
-		case INT:
+		case INTx:
 		typeTags[i+1] = 'i';
 		break;
 
-		case FLOAT:
+		case FLOATx:
 		typeTags[i+1] = 'f';
 		break;
 
-		case STRING:
+		case STRINGx:
 		typeTags[i+1] = 's';
 		break;
 
@@ -514,19 +538,19 @@
 
      for (j = 0; j < numArgs; j++) {
         switch (args[j].type) {
-            case INT:
+            case INTx:
             if ((returnVal = OSC_writeIntArg(buf, args[j].datum.i)) != 0) {
 		return returnVal;
 	    }
             break;
 
-            case FLOAT:
+            case FLOATx:
             if ((returnVal = OSC_writeFloatArg(buf, args[j].datum.f)) != 0) {
 		return returnVal;
 	    }
             break;
 
-            case STRING:
+            case STRINGx:
             if ((returnVal = OSC_writeStringArg(buf, args[j].datum.s)) != 0) {
 		return returnVal;
 	    }
@@ -583,11 +607,11 @@
 
     for (j = 0; j < numArgs; j++) {
         switch (args[j].type) {
-            case INT: case FLOAT:
+            case INTx: case FLOATx:
             size += 4;
             break;
 
-            case STRING:
+            case STRINGx:
             size += SynthControl_effectiveStringLength(args[j].datum.s);
             break;

LiVES-1.6.1.tar.bz2/libweed/Makefile.am -> LiVES-2.0.3.tar.bz2/libweed/Makefile.am Changed

@@ -25,7 +25,7 @@
 endif
 
 WEED_SO_VERSION = 0:6:0
-WEED_PSO_VERSION = 0:7:0
+WEED_PSO_VERSION = 0:12:0
 
 LIBS =
 
@@ -41,7 +41,7 @@
 
 EXTRA_DIST = libweed.doxygen libweed.pc libweed-plugin-utils.pc libweed_slice.pc libweed-utils.pc libweed-compat.pc
 
-lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la libweed-plugin-utils.la
+lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la
 
 libweed_la_SOURCES = weed.c
 
@@ -49,34 +49,27 @@
 
 libweed_utils_la_SOURCES = weed-utils.c 
 
-libweed_plugin_utils_la_SOURCES = weed-plugin-utils.c
 
 libweedinclude_HEADERS = weed.h weed-host.h weed-plugin.h weed-utils.h weed-events.h weed-palettes.h weed-effects.h \
-	weed-plugin-utils.h weed-compat.h
+	weed-compat.h
 
 libweedincludedir = "$(includedir)/weed"
 
 libweed_ladir = "$(libdir)/weed"
 
-libweed_la_LDFLAGS = -version-info $(WEED_SO_VERSION) -shared --tag=disable-static
+libweed_la_CFLAGS = -fvisibility=hidden
 
-libweed_slice_la_CFLAGS = @GLIB_CFLAGS@ 
+shared_LDFLAGS = -shared --tag=disable-static
 
-libweed_slice_la_LDFLAGS = @GLIB_LIBS@ -version-info $(WEED_SO_VERSION) -shared --tag=disable-static
+libweed_la_LDFLAGS = -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 
-libweed_utils_la_CFLAGS = $(extra_cflags)
+libweed_slice_la_CFLAGS = @GLIB_CFLAGS@ -fvisibility=hidden
 
-##########################################################################################
-# -DO NOT- REMOVE THE -static, -DO NOT- add --tag=disable-static. You have been warned ! #
-libweed_utils_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_SO_VERSION) -static     #
-##########################################################################################
+libweed_slice_la_LDFLAGS = @GLIB_LIBS@ -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 
-libweed_plugin_utils_la_CFLAGS = $(extra_cflags)
+libweed_utils_la_CFLAGS = $(extra_cflags)
 
-#################################################################################################
-# -DO NOT- REMOVE THE -static, -DO NOT- add --tag=disable-static. You have been warned !        #
-libweed_plugin_utils_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_PSO_VERSION) -static     #
-#################################################################################################
+libweed_utils_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 
 
 uninstall-local:

LiVES-1.6.1.tar.bz2/libweed/Makefile.in -> LiVES-2.0.3.tar.bz2/libweed/Makefile.in Changed

LiVES-1.6.1.tar.bz2/libweed/libweed-plugin-utils.pc -> LiVES-2.0.3.tar.bz2/libweed/libweed-plugin-utils.pc Changed

LiVES-1.6.1.tar.bz2/libweed/weed-effects.h -> LiVES-2.0.3.tar.bz2/libweed/weed-effects.h Changed

LiVES-1.6.1.tar.bz2/libweed/weed-gslice.c -> LiVES-2.0.3.tar.bz2/libweed/weed-gslice.c Changed

LiVES-1.6.1.tar.bz2/libweed/weed-host.h -> LiVES-2.0.3.tar.bz2/libweed/weed-host.h Changed

LiVES-1.6.1.tar.bz2/libweed/weed-plugin.h -> LiVES-2.0.3.tar.bz2/libweed/weed-plugin.h Changed

@@ -42,7 +42,7 @@
 
 */
 
-/* (C) Gabriel "Salsaman" Finch, 2005 - 2010 */
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2013 */
 
 #ifndef __WEED_PLUGIN_H__
 #define __WEED_PLUGIN_H__
@@ -56,19 +56,40 @@
 {
 #endif /* __cplusplus */
 
-weed_leaf_set_f weed_leaf_set;
-weed_leaf_get_f weed_leaf_get;
-weed_plant_new_f weed_plant_new;
-weed_plant_list_leaves_f weed_plant_list_leaves;
-weed_leaf_num_elements_f weed_leaf_num_elements;
-weed_leaf_element_size_f weed_leaf_element_size;
-weed_leaf_seed_type_f weed_leaf_seed_type;
-weed_leaf_get_flags_f weed_leaf_get_flags;
-
-weed_malloc_f weed_malloc;
-weed_free_f weed_free;
-weed_memcpy_f weed_memcpy;
-weed_memset_f weed_memset;
+#ifndef __WEED_INTERNAL__
+ /// functions defined as static so as not to overwrite the host versions
+
+static weed_leaf_set_f weed_leaf_set;
+static weed_leaf_get_f weed_leaf_get;
+static weed_plant_new_f weed_plant_new;
+static weed_plant_list_leaves_f weed_plant_list_leaves;
+static weed_leaf_num_elements_f weed_leaf_num_elements;
+static weed_leaf_element_size_f weed_leaf_element_size;
+static weed_leaf_seed_type_f weed_leaf_seed_type;
+static weed_leaf_get_flags_f weed_leaf_get_flags;
+
+static weed_malloc_f weed_malloc;
+static weed_free_f weed_free;
+static weed_memcpy_f weed_memcpy;
+static weed_memset_f weed_memset;
+
+#else
+/// weed libs which #include this should use the plugin's version
+
+extern weed_leaf_set_f weed_leaf_set;
+extern weed_leaf_get_f weed_leaf_get;
+extern weed_plant_new_f weed_plant_new;
+extern weed_plant_list_leaves_f weed_plant_list_leaves;
+extern weed_leaf_num_elements_f weed_leaf_num_elements;
+extern weed_leaf_element_size_f weed_leaf_element_size;
+extern weed_leaf_seed_type_f weed_leaf_seed_type;
+extern weed_leaf_get_flags_f weed_leaf_get_flags;
+
+extern weed_malloc_f weed_malloc;
+extern weed_free_f weed_free;
+extern weed_memcpy_f weed_memcpy;
+extern weed_memset_f weed_memset;
+#endif
 
 #ifdef __cplusplus
 }

LiVES-1.6.1.tar.bz2/libweed/weed.c -> LiVES-2.0.3.tar.bz2/libweed/weed.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/icons/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/icons/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_avi_encoder Changed

@@ -2,7 +2,7 @@
 
 
 import locale
-locale.setlocale(locale.LC_NUMERIC,"")
+locale.setlocale(locale.LC_NUMERIC,"C")
 
 """
 avi_encoder.py
@@ -25,12 +25,19 @@
 
 See my vids at http://amv.reimeika.ca !
 """
-
 version = '0.0.10'
-convert = 'convert'
-mencoder = 'mencoder'
-lameenc = 'lame'
-sox = 'sox'
+
+import os
+if os.name == 'nt':
+    convert = 'convert.exe'
+    mencoder = 'mencoder.exe'
+    lameenc = 'lame.exe'
+    sox = 'sox.exe'
+else:
+    convert = 'convert'
+    mencoder = 'mencoder'
+    lameenc = 'lame'
+    sox = 'sox'
 
 usage = \
       """
@@ -464,16 +471,29 @@
     all_vars.update(locals())
 
     if not quiet: print 'Encoding and multiplexing...'
-    if vtype[-1] == 's':
-        command = """cd %(source_dir)s ; \\
-%(mencoder)s %(aviopts)s %(avimp3)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s -o "%(vidname)s" %(std)s""" % all_vars
-        run(command)
+    if os.name == 'nt':
+
+        if vtype[-1] == 's':
+            command = """cd %(source_dir)s ; \\
+%(mencoder.exe)s %(aviopts)s %(avimp3)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s -o "%(vidname)s" %(std)s""" % all_vars
+            run(command)
+        else:
+            command = """cd %(source_dir)s ; \\
+%(mencoder.exe)s %(aviopts)s -nosound "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\
+%(mencoder.exe)s %(aviopts)s %(avimp3)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s2 -o "%(vidname)s" %(std)s
+""" % all_vars
+            run(command)
     else:
-        command = """cd %(source_dir)s ; \\
+        if vtype[-1] == 's':
+            command = """cd %(source_dir)s ; \\
+%(mencoder)s %(aviopts)s %(avimp3)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s -o "%(vidname)s" %(std)s""" % all_vars
+            run(command)
+        else:
+            command = """cd %(source_dir)s ; \\
 %(mencoder)s %(aviopts)s -nosound "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\
 %(mencoder)s %(aviopts)s %(avimp3)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s2 -o "%(vidname)s" %(std)s
 """ % all_vars
-        run(command)
+            run(command)
 
     if os.path.exists(os.path.join(source_dir, 'divx2pass.log')):
         os.remove(os.path.join(source_dir, 'divx2pass.log'))

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_dirac_encoder Changed

@@ -36,10 +36,17 @@
 """
 
 version = '0.1'
-convert = 'convert'
-mencoder = 'mencoder'
-dirac_encoder = 'dirac_encoder'
-identify = 'identify'
+import os
+if os.name == 'nt':
+	convert = 'convert.exe'
+	mencoder = 'mencoder.exe'
+	dirac_encoder = 'dirac_encoder.exe'
+	identify = 'identify.exe'
+else:
+	convert = 'convert'
+	mencoder = 'mencoder'
+	dirac_encoder = 'dirac_encoder'
+	identify = 'identify'
 
 usage = \
       """
@@ -434,14 +441,25 @@
     if not quiet:
         print('Creating "%s"-quality Dirac file' % vtype)
 
-    yuvcommand = """cd %(source_dir)s ; \\
+    if os.name == 'nt':
+	    yuvcommand = """cd %(source_dir)s ; \\
+%(mencoder.exe)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s
+    """ % all_vars
+	    run(yuvcommand)
+	    command = """cd %(source_dir)s ; \\
+%(dirac_encoder.exe)s -width %(fx)s -height %(fy)s -fr %(ffps)s %(be_verbose)s %(dirac_opts)s %(yuvv)s %(dyuvv)s.drc %(std)s
+""" % all_vars
+	    run(command)
+    else:
+	    yuvcommand = """cd %(source_dir)s ; \\
 %(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s
     """ % all_vars
-    run(yuvcommand)
-    command = """cd %(source_dir)s ; \\
+	    run(yuvcommand)
+	    command = """cd %(source_dir)s ; \\
 %(dirac_encoder)s -width %(fx)s -height %(fy)s -fr %(ffps)s %(be_verbose)s %(dirac_opts)s %(yuvv)s %(dyuvv)s.drc %(std)s
 """ % all_vars
-    run(command)
+	    run(command)
+
     os.remove(yuvv)
 
     for tfile in [dyuvv, dyuvv + '.yuv', dyuvv + '.imt']:

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder Changed

@@ -29,7 +29,11 @@
 """
 
 version = '0.0.7'
-convert = 'convert'
+import os
+if os.name == 'nt':
+    convert = 'convert.exe'
+else:
+    convert = 'convert'
 
 usage = \
       """
@@ -288,10 +292,15 @@
             run(command)
         else:
             if os.path.exists(rimg_fname): os.remove(rimg_fname)
-	    try:
-            	os.symlink(eimg_fname, rimg_fname)
-	    except (IOError, OSError):
+
+            if os.name == 'nt':
 		shutil.copy(eimg_fname, rimg_fname)
+            else:
+                try:
+                    os.symlink(eimg_fname, rimg_fname)
+                except (IOError, OSError):
+                    shutil.copy(eimg_fname, rimg_fname)
+
         iframe+=1
 
 
@@ -323,10 +332,15 @@
             frfile = os.path.join(source_dir, iframe)
             frlink = os.path.join(source_dir, syml + iframe)
             if os.path.islink(frlink): os.remove(frlink)
-	    try:
-            	os.symlink(frfile, frlink)
-	    except (IOError, OSError):
-		shutil.copy(frfile, frlink)
+
+            if os.name == 'nt':
+                shutil.copy(frfile, frlink)
+            else:
+                try:
+                    os.symlink(frfile, frlink)
+                except (IOError, OSError):
+                    shutil.copy(frfile, frlink)
+
     else:
         syml = ''
         numframes = len(glob.glob(os.path.join(source_dir, \
@@ -345,8 +359,9 @@
         print 'Creating GIF file'
 
     command = """cd %(source_dir)s ; \\
-%(convert)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(gifv)s
+%(convert)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s \"%(gifv)s\"
 """ % all_vars
+
     run(command)
 
     shutil.move(gifv, vidname)
@@ -478,12 +493,28 @@
     img_dir = opts.get('-d', '.')
     img_dir = os.path.abspath(img_dir)
     if ' ' in img_dir:
-        temp_dir = tempfile.mkdtemp('', '.lives-', '/tmp/')
-        try:
-            os.symlink(img_dir, temp_dir + '/img_dir')
-        except (IOError, OSError):
-            shutil.copy(img_dir, temp_dir + '/img_dir')
-        img_dir = temp_dir + '/img_dir'
+
+        if os.name == 'nt':
+            temp_dir = tempfile.mkdtemp('', 'lives-')
+            os.makedirs(temp_dir + '\\img_dir')
+            names = os.listdir(img_dir)
+            for name in names:
+                srcname = os.path.join(img_dir, name)
+                dstname = os.path.join(temp_dir, 'img_dir', name)
+                try:
+                    shutil.copy(srcname,dstname)
+                except:
+                    pass
+            img_dir = temp_dir + '\\img_dir'
+
+
+        else:
+            temp_dir = tempfile.mkdtemp('', '.lives-')
+            try:
+                os.symlink(img_dir, temp_dir + '/img_dir')
+            except (IOError, OSError):
+                shutil.copytree(img_dir, temp_dir + '/img_dir')
+                img_dir = temp_dir + '/img_dir'
 
     if not os.path.isdir(img_dir):
         print 'The image source directory: '  + img_dir + \
@@ -599,6 +630,7 @@
         ext = '.png'
     else:
         print 'Cannot find any appropriate %s or %s files!' % ('.jpg','.png')
+        print 'I checked ' + test_file+'.png'
         raise SystemExit, 1
     first_frame = test_file + ext
     last_frame = os.path.join(img_dir, img_pre + last_frame_num + ext)
@@ -618,12 +650,31 @@
             raise SystemExit, 1
     if ' ' in work_dir:
         if temp_dir == '':
-            temp_dir = tempfile.mkdtemp('', '.lives-', '/tmp/')
-        try:
-            os.symlink(work_dir, temp_dir + '/work_dir')
-        except (IOError, OSError):
-            shutil.copy(work_dir, temp_dir + '/work_dir')
-        work_dir = temp_dir + '/work_dir'
+
+
+            if os.name == 'nt':
+                temp_dir = tempfile.mkdtemp('', 'lives-')
+                os.makedirs(temp_dir + '\\work_dir')
+                names = os.listdir(work_dir)
+                for name in names:
+                    srcname = os.path.join(work_dir, name)
+                    dstname = os.path.join(temp_dir, 'work_dir', name)
+                    try:
+                        shutil.copy(srcname,dstname)
+                    except:
+                        pass
+                    work_dir = temp_dir + '\\work_dir'
+
+
+                else:
+                    temp_dir = tempfile.mkdtemp('', '.lives-')
+                    try:
+                        os.symlink(work_dir, temp_dir + '/work_dir')
+                    except (IOError, OSError):
+                        shutil.copytree(work_dir, temp_dir + '/work_dir')
+                        work_dir = temp_dir + '/work_dir'
+
+
 
     # Audio is not used
     sndf = opts.get('-s', os.path.join(img_dir, 'audio'))

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_mkv_encoder Changed

@@ -23,13 +23,24 @@
 """
 
 version = '0.1.7'
-convert = 'convert'
-mencoder = 'mencoder'
-x264 = 'x264'
-oggenc = 'oggenc'
-sox = 'sox'
-mkvplex = 'mkvmerge'
-identify = 'identify'
+
+import os
+if os.name == 'nt':
+    convert = 'convert.exe'
+    mencoder = 'mencoder.exe'
+    x264 = 'x264.exe'
+    oggenc = 'oggenc.exe'
+    sox = 'sox.exe'
+    mkvplex = 'mkvmerge.exe'
+    identify = 'identify.exe'
+else:
+    convert = 'convert'
+    mencoder = 'mencoder'
+    x264 = 'x264'
+    oggenc = 'oggenc'
+    sox = 'sox'
+    mkvplex = 'mkvmerge'
+    identify = 'identify'
 
 usage = \
       """
@@ -469,30 +480,61 @@
     all_vars.update(locals())
 
 
-    if vtype[-1] == 'h':
-        yuvcommand = """cd %(source_dir)s ; \\
+
+    if os.name == 'nt':
+
+        if vtype[-1] == 'h':
+            yuvcommand = """cd %(source_dir)s ; \\
+mkfifo.exe /m 0600 %(yuvv)s ; \\
+%(mencoder.exe)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s &
+    """ % all_vars
+            run(yuvcommand)
+            command = """cd %(source_dir)s ; \\
+%(x264.exe)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s
+    """ % all_vars
+            run(command)
+            os.remove(yuvv)
+            run(yuvcommand)
+            command = """cd %(source_dir)s ; \\
+%(x264.exe)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s
+    """ % all_vars
+            run(command)
+            os.remove(yuvv)
+            os.remove(x264log)
+        else:
+            command = """cd %(source_dir)s ; \\
+%(mencoder.exe)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\
+%(mencoder.exe)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s2 -o %(vidv)s %(std)s
+    """ % all_vars
+            run(command)
+            
+    else:
+
+        if vtype[-1] == 'h':
+            yuvcommand = """cd %(source_dir)s ; \\
 mkfifo -m 0600 %(yuvv)s ; \\
 %(mencoder)s mf://%(syml)s%(img_pre)s*%(ext)s %(mencoder_opts)s%(yuvv)s %(std)s &
     """ % all_vars
-        run(yuvcommand)
-        command = """cd %(source_dir)s ; \\
+            run(yuvcommand)
+            command = """cd %(source_dir)s ; \\
 %(x264)s --stats "%(x264log)s" %(cpass1opts)s %(x264_opts)s1 -o /dev/null %(yuvv)s %(fx)sx%(fy)s %(std)s
     """ % all_vars
-        run(command)
-        os.remove(yuvv)
-        run(yuvcommand)
-        command = """cd %(source_dir)s ; \\
+            run(command)
+            os.remove(yuvv)
+            run(yuvcommand)
+            command = """cd %(source_dir)s ; \\
 %(x264)s --stats "%(x264log)s" %(cpass2opts)s %(x264_opts)s2 -o "%(vidv)s" %(yuvv)s %(fx)sx%(fy)s %(std)s
     """ % all_vars
-        run(command)
-        os.remove(yuvv)
-        os.remove(x264log)
-    else:
-        command = """cd %(source_dir)s ; \\
+            run(command)
+            os.remove(yuvv)
+            os.remove(x264log)
+        else:
+            command = """cd %(source_dir)s ; \\
 %(mencoder)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\
 %(mencoder)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s2 -o %(vidv)s %(std)s
     """ % all_vars
-        run(command)
+            run(command)
+
 
     if os.path.exists(os.path.join(source_dir, 'divx2pass.log')):
         os.remove(os.path.join(source_dir, 'divx2pass.log'))

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_mpeg_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_ogm_encoder Changed

@@ -23,11 +23,19 @@
 """
 
 version = '0.1.6'
-convert = 'convert'
-mencoder = 'mencoder'
-oggenc = 'oggenc'
-sox = 'sox'
-ogmplex = 'ogmmerge'
+import os
+if os.name == 'nt':
+    convert = 'convert.exe'
+    mencoder = 'mencoder.exe'
+    oggenc = 'oggenc.exe'
+    sox = 'sox.exe'
+    ogmplex = 'ogmmerge.exe'
+else:
+    convert = 'convert'
+    mencoder = 'mencoder'
+    oggenc = 'oggenc'
+    sox = 'sox'
+    ogmplex = 'ogmmerge'
 
 usage = \
       """
@@ -419,10 +427,18 @@
     all_vars.update(globals())
     all_vars.update(locals())
 
-    command = """cd %(source_dir)s ; \\
+    if os.name == 'nt':
+        command = """cd %(source_dir)s ; \\
+%(mencoder.exe)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\
+%(mencoder.exe)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s2 -o %(mpegv)s %(std)s
+""" % all_vars
+    else:
+        command = """cd %(source_dir)s ; \\
 %(mencoder)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s1 -o /dev/null %(std)s ; \\
 %(mencoder)s "mf://%(syml)s%(img_pre)s*%(ext)s" %(mencoder_opts)s2 -o %(mpegv)s %(std)s
 """ % all_vars
+
+
     run(command)
     if os.path.exists(os.path.join(source_dir, 'divx2pass.log')):
         os.remove(os.path.join(source_dir, 'divx2pass.log'))

LiVES-1.6.1.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder Changed

@@ -23,14 +23,24 @@
 """
 
 version = '0.1.7'
-convert = 'convert'
-mplayer = 'mplayer'
-theora_encoder  = 'encoder_example'
-theora_encoder2 = 'theora_encoder_example'
-theora_encoder3 = 'theora_encode'
-    
-sox = 'sox'
-identify = 'identify'
+import os
+if os.name == 'nt':
+    convert = 'convert.exe'
+    mplayer = 'mplayer.exe'
+    theora_encoder  = 'encoder_example.exe'
+    theora_encoder2 = 'theora_encoder_example.exe'
+    theora_encoder3 = 'theora_encode.exe'
+    sox = 'sox.exe'
+    identify = 'identify.exe'
+
+else:
+    convert = 'convert'
+    mplayer = 'mplayer'
+    theora_encoder  = 'encoder_example'
+    theora_encoder2 = 'theora_encoder_example'
+    theora_encoder3 = 'theora_encode'
+    sox = 'sox'
+    identify = 'identify'
 
 usage = \
       """
@@ -451,15 +461,29 @@
 
     # mplayer with "-vo yuv4mpeg" always outputs to "stream.yuv"
     # maybe create the pipe pythonically?
-    command = """cd %(source_dir)s ; \\
+
+    if os.name == 'nt':
+        command = """cd %(source_dir)s ; \\
+mkfifo.exe /m 0600 stream.yuv ; \\
+%(mplayer.exe)s mf://%(syml)s%(img_pre)s*%(ext)s %(mplayer_opts)s %(std)s &
+""" % all_vars
+        run(command)
+        command = """cd %(source_dir)s ; \\
+%(theora_encoder.exe)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s
+""" % all_vars
+        run(command)
+    else:
+        command = """cd %(source_dir)s ; \\
 mkfifo -m 0600 stream.yuv ; \\
 %(mplayer)s mf://%(syml)s%(img_pre)s*%(ext)s %(mplayer_opts)s %(std)s &
 """ % all_vars
-    run(command)
-    command = """cd %(source_dir)s ; \\
+        run(command)
+        command = """cd %(source_dir)s ; \\
 %(theora_encoder)s %(theora_opts)s -o "%(vidname)s" %(wav)s stream.yuv %(std)s
 """ % all_vars
-    run(command)
+        run(command)
+
+
 
     if os.path.exists(os.path.join(source_dir, 'stream.yuv')):
         os.remove(os.path.join(source_dir, 'stream.yuv'))

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/Makefile.am Changed

@@ -8,12 +8,19 @@
 
 if IS_DARWIN
 shared_ldflags =  -dynamiclib -module -avoid-version --tag=disable-static
-shared_cflags = -fno-common
+shared_cflags = -fno-common -DIS_DARWIN=1 -I /sw/include
 else
 shared_ldflags =  -shared -fPIC -DPIC -module -avoid-version --tag=disable-static
 shared_cflags =  -fPIC -DPIC
 endif
 
+
+if IS_MINGW
+shared_cflags =  -DIS_MINGW -I /usr/include/ffmpeg -I /usr/i686-pc-mingw32/sys-root/mingw/include
+shared_ldflags += -no-undefined -Wl,/home/gabriel/lives-wine-test/ffmpeg/avcodec-54.dll -Wl,/home/gabriel/lives-wine-test/ffmpeg/avformat-54.dll -Wl,/home/gabriel/lives-wine-test/ffmpeg/avutil-51.dll
+endif
+
+
 if HAVE_SYSTEM_WEED
 weed_cflags = -DHAVE_SYSTEM_WEED=1
 else
@@ -47,11 +54,27 @@
 endif
 endif
 
+if IS_MINGW
+
+HAVE_AVFORMAT = true
+HAVE_AVCODEC = true
+HAVE_AVUTIL = true
+
+ogg_decoder_la_LDFLAGS = $(shared_ldflags) -Wl,/usr/i686-pc-mingw32/sys-root/mingw/lib/libogg.dll.a
+
+endif
+
+# TODO - at least  mpegps, mp4, mov, mng
+# provided they support frame accurate seeking
 
+# avi is broken and needs a patch for decoding
 
-if HAVE_AVFORMAT
-if HAVE_AVCODEC
-if HAVE_AVUTIL
+# h264 does not work and needs a patch
+
+
+#if HAVE_AVFORMAT
+#if HAVE_AVCODEC
+#if HAVE_AVUTIL
 flv_libs = flv_decoder.la
 FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
@@ -76,7 +99,16 @@
 mkv_decoder_la_LDFLAGS = $(shared_ldflags) $(MKVDEC_LIBS)
 
 
-#in progress
+
+mpegts_libs = mpegts_decoder.la
+MPEGTSDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@
+MPEGTSDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ \
+	-Wno-deprecated-declarations
+mpegts_decoder_la_SOURCES = mpegts_decoder.c mpegts_decoder.h
+mpegts_decoder_la_CFLAGS = $(shared_cflags) $(weed_cflags) $(MPEGTSDEC_CFLAGS)
+mpegts_decoder_la_LDFLAGS = $(shared_ldflags) $(MPEGTSDEC_LIBS)
+
+
 
 #does not work - unable to parse video packets (patch would be very nice...)
 
@@ -88,12 +120,12 @@
 #avi_decoder_la_LDFLAGS = $(shared_ldflags) $(AVIDEC_LIBS)
 
 
-endif
-endif
-endif
+#endif
+#endif
+#endif
 
 
 
-decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) $(mkv_libs) #$(avi_libs)
+decoderpluginslib_LTLIBRARIES = $(ogg_libs) $(dv_libs) $(flv_libs) $(asf_libs) $(mkv_libs) $(mpegts_libs) #$(avi_libs)
 
 EXTRA_DIST = decplugin.h

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c Changed

@@ -30,7 +30,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+#ifndef IS_MINGW
+#ifndef IS_SOLARIS
 #include <endian.h>
+#endif
+#endif
 #include <sys/stat.h>
 
 const char *plugin_version="LiVES asf/wmv decoder version 1.0";
@@ -253,7 +257,9 @@
     fprintf(stderr, "asf_decoder: Unsupported value type %d len %d in tag %s.\n", type, len, key);
     return TRUE;
   }
-  av_metadata_set2(&s->metadata, key, value, 0);
+
+  av_dict_set(&s->metadata, key, value, 0);
+
   free(value);
   return TRUE;
 }
@@ -865,6 +871,10 @@
     return FALSE;
   }
 
+#ifdef IS_MINGW
+  setmode(priv->fd,O_BINARY);
+#endif
+
   if (read (priv->fd, header, ASF_PROBE_SIZE) < ASF_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
@@ -898,7 +908,7 @@
   cdata->arate=0;
   cdata->achans=0;
   cdata->asamps=0;
-  sprintf(cdata->audio_name,"none");
+  sprintf(cdata->audio_name,"%s","");
 
   priv->idx=NULL;
 
@@ -1208,7 +1218,6 @@
 
       if (type == LIVES_MEDIA_TYPE_AUDIO) {
 	priv->st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-	snprintf(cdata->audio_name,16,"unknown");
 
       } else if (type == LIVES_MEDIA_TYPE_VIDEO) {
 	priv->st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
@@ -1319,19 +1328,25 @@
 
 	if (!got_vidst) {
 	  if (priv->st->codec->extradata_size && (priv->st->codec->bits_per_coded_sample <= 8)) {
-	    priv->st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
 
+
+#ifndef IS_MINGW
 # if __BYTE_ORDER == __BIG_ENDIAN
-	    for (i = 0; i < FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
-	      
-	      priv->st->codec->palctrl->palette[i] = get_le32int((uint8_t *)(((uint32_t*)&priv->st->codec->extradata)[i]));
+            int i;
+            for (i = 0; i < FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
+                priv->asf_st->palette[i] = av_bswap32(((uint32_t*)priv->st->codec->extradata)[i]);
 #else
-	    memcpy(priv->st->codec->palctrl->palette, priv->st->codec->extradata,
-		   FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE));
+            memcpy(priv->asf_st->palette, priv->st->codec->extradata,
+                   FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE));
 #endif
-	    priv->st->codec->palctrl->palette_changed = 1;
-	  }
-	  
+#else
+            memcpy(priv->asf_st->palette, priv->st->codec->extradata,
+                   FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE));
+#endif
+
+            priv->asf_st->palette_changed = 1;
+        }
+
 	  priv->st->codec->codec_tag = tag1;
 	  priv->st->codec->codec_id = ff_codec_get_id((const AVCodecTag*)(codec_bmp_tags), tag1);
 
@@ -1935,7 +1950,7 @@
 	      const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any
 	      const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL);
 	      if (iso6392)
-	      av_metadata_set2(&priv->stmetadata, "language", iso6392, 0);
+	      av_dict_set(&priv->stmetadata, "language", iso6392, 0);
 	      }
 	      }*/
     }
@@ -2137,6 +2152,9 @@
     if (fps!=1000.) cdata->fps=fps;
   }
 
+
+#ifndef IS_MINGW
+
   if (cdata->fps==0.||cdata->fps==1000.) {
     // use mplayer to get fps if we can...it seems to have some magical way
     char cmd[1024];
@@ -2164,6 +2182,8 @@
     }
   }
 
+#endif
+
   if (cdata->fps==0.&&ctx->time_base.num==0) {
     if (ctx->time_base.den==1) cdata->fps=25.;
   }
@@ -2203,7 +2223,6 @@
 
 
 const char *module_check_init(void) {
-  avcodec_init();
   avcodec_register_all();
   return NULL;
 }
@@ -2230,6 +2249,8 @@
 
   cdata->palettes=NULL;
   
+  cdata->sync_hint=0;
+
   return cdata;
 }

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/decplugin.h -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/decplugin.h Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c Changed

@@ -58,6 +58,7 @@
 
 #include <libavformat/avformat.h>
 #include <libavutil/avstring.h>
+#include <libavcodec/avcodec.h>
 
 #include "decplugin.h"
 #include "flv_decoder.h"
@@ -541,6 +542,10 @@
     return FALSE;
   }
 
+#ifdef IS_MINGW
+  setmode(priv->fd,O_BINARY);
+#endif
+
   if (read (priv->fd, header, FLV_PROBE_SIZE) < FLV_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
@@ -751,7 +756,7 @@
 
   priv->ctx=ctx = avcodec_alloc_context();
 
-  sprintf(cdata->audio_name,"none");
+  sprintf(cdata->audio_name,"%s","");
 
   // now we get the stream data
   while (!got_astream || !got_vstream) {
@@ -804,7 +809,7 @@
       case 11:
 	sprintf(cdata->audio_name,"%s","speex"); break;
       default:
-	sprintf(cdata->audio_name,"%s","unknown"); break;
+	break;
       }
 
       if (cdata->arate==0) {
@@ -1124,6 +1129,7 @@
     if (fps!=1000.) cdata->fps=fps;
   }
 
+#ifndef IS_MINGW
   if (cdata->fps==0.||cdata->fps==1000.) {
     // use mplayer to get fps if we can...it seems to have some magical way
     char cmd[1024];
@@ -1150,6 +1156,7 @@
       unlink(tmpfname);
     }
   }
+#endif
 
   if (cdata->fps==0.&&ctx->time_base.num==0) {
     // not sure about this
@@ -1202,7 +1209,6 @@
 
 
 const char *module_check_init(void) {
-  avcodec_init();
   avcodec_register_all();
   return NULL;
 }

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.c Changed

@@ -69,13 +69,11 @@
 
 #include "mkv_decoder.h"
 
-//#include "mkv_decoder.h"
+#include <libavutil/intfloat_readwrite.h>
+#include <libavutil/intreadwrite.h>
+#include <libavutil/lzo.h>
+#include <libavutil/dict.h>
 
-#include "libavutil/intfloat_readwrite.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/avstring.h"
-#include "libavutil/lzo.h"
-#include "libavutil/dict.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
@@ -635,7 +633,7 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////
-
+/*
 void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
 {
   int i;
@@ -648,7 +646,7 @@
 			     st->time_base.num * (int64_t)ref_st->time_base.den);
   }
 }
-
+*/
 
 /*
  * Autodetecting...
@@ -1373,7 +1371,6 @@
 
     } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
       priv->has_audio=TRUE;
-      sprintf(cdata->audio_name,"unknown");
     }
     if (encodings_list->nb_elem > 1) {
       fprintf(stderr,"mkv_decoder: Multiple combined encodings not supported\n");
@@ -1649,13 +1646,14 @@
   AVCodec *codec=NULL;
   AVCodecContext *ctx;
 
+  int err;
+
   boolean got_picture=FALSE;
 
   struct stat sb;
-
   //#define DEBUG
 #ifdef DEBUG
-  fprintf(stderr,"\n");
+  fprintf(stderr,"\n\n\n\nDEBUG MKV");
 #endif
 
   priv->has_audio=priv->has_video=FALSE;
@@ -1667,10 +1665,15 @@
     return FALSE;
   }
 
-  if (read (priv->fd, header, MKV_PROBE_SIZE) < MKV_PROBE_SIZE) {
+#ifdef IS_MINGW
+  setmode(priv->fd,O_BINARY);
+#endif
+
+  if ((err=read (priv->fd, header, MKV_PROBE_SIZE)) < MKV_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
-    fprintf(stderr, "mkv_decoder: unable to read header for %s\n",cdata->URI);
+    fprintf(stderr, "mkv_decoder: unable to read header %d %d for %s\n",err,MKV_PROBE_SIZE,cdata->URI);
+    if (err==0)  fprintf(stderr,"err was %s %d\n",strerror(errno),priv->filesize);
 #endif
     close(priv->fd);
     return FALSE;
@@ -1700,7 +1703,10 @@
   priv->idxhh=NULL;
   priv->idxht=NULL;
 
-  sprintf(cdata->audio_name,"none");
+  fstat(priv->fd,&sb);
+  priv->filesize=sb.st_size;
+
+  sprintf(cdata->audio_name,"%s","");
 
   priv->s = avformat_alloc_context();
 
@@ -1712,15 +1718,11 @@
   priv->avpkt.data=NULL;
   priv->ctx=NULL;
 
-  fstat(priv->fd,&sb);
-  priv->filesize=sb.st_size;
-
   if (lives_mkv_read_header(cdata)) {
     close(priv->fd);
     return FALSE;
   }
 
-
   cdata->seek_flag=LIVES_SEEK_FAST|LIVES_SEEK_NEEDS_CALCULATION;
 
   cdata->offs_x=0;
@@ -1749,7 +1751,7 @@
   priv->ctx = ctx = avcodec_alloc_context();
 
   if (avcodec_open(ctx, codec) < 0) {
-    fprintf(stderr, "mkv_decoder: Could not open avcodec context\n");
+    fprintf(stderr, "mkv_decoder: Could not open avcodec context for codec\n");
     detach_stream(cdata);
     return FALSE;
   }
@@ -1764,7 +1766,6 @@
 
   matroska_read_seek(cdata,0);
 
-
   while (!got_picture&&!got_eof) {
     matroska_read_packet(cdata,&priv->avpkt);
     
@@ -1804,6 +1805,12 @@
   }
   else pts=dts=0;
 
+  if (priv->avpkt.data!=NULL) {
+    free(priv->avpkt.data);
+    priv->avpkt.data=NULL;
+    priv->avpkt.size=0;
+  }
+
   cdata->YUV_clamping=WEED_YUV_CLAMPING_UNCLAMPED;
   if (ctx->color_range==AVCOL_RANGE_MPEG) cdata->YUV_clamping=WEED_YUV_CLAMPING_CLAMPED;
 
@@ -1861,27 +1868,34 @@
     // use mplayer to get fps if we can...it seems to have some magical way
     char cmd[1024];
     char tmpfname[32];
-    int ofd;
+    int res;
 
-    sprintf(tmpfname,"/tmp/mkvdec=XXXXXX");
-    ofd=mkstemp(tmpfname);
-    if (ofd!=-1) {
-      int res;
-      snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
-      
-      res=system(cmd);
+    sprintf(tmpfname,"mkvdec=XXXXXX");
+#ifndef IS_MINGW
+    snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
+#else
+    snprintf(cmd,1024,"mplayer.exe \"%s\" -identify -frames 0 2>NUL | grep.exe ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
+#endif 
+    res=system(cmd);
       
-      if (!res) {
-	char buffer[1024];
-	ssize_t bytes=read(ofd,buffer,1024);
+    if (!res) {
+      char buffer[1024];
+      ssize_t bytes;
+      int ofd=open(tmpfname,O_RDONLY);
+      if (ofd>-1) {
+
+#ifdef IS_MINGW
+	setmode(ofd,O_BINARY);
+#endif
+	bytes=read(ofd,buffer,1024);
 	memset(buffer+bytes,0,1);
 	if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
 	  cdata->fps=strtod (buffer+13,NULL);
 	}
+	close(ofd);
       }
-      close(ofd);
-      unlink(tmpfname);
     }
+    unlink(tmpfname);
   }
 
   if (cdata->fps==0.||cdata->fps==1000.) {
@@ -1941,7 +1955,6 @@
 
 
 const char *module_check_init(void) {
-  avcodec_init();
   avcodec_register_all();
   av_log_set_level(AV_LOG_ERROR);
   return NULL;
@@ -1976,6 +1989,8 @@
 
   cdata->nframes=0;
 
+  cdata->sync_hint=0;
+
   got_eof=FALSE;
   errval=0;
   
@@ -2459,8 +2474,10 @@
 
   if (!priv->idxhh) return NULL;
 
-  timestamp = FFMIN(timestamp, frame_to_dts(cdata,cdata->nframes));
-  timestamp = FFMAX(timestamp, priv->idxhh->dts);
+  if (timestamp!=0) {
+    timestamp = FFMIN(timestamp, frame_to_dts(cdata,cdata->nframes));
+    timestamp = FFMAX(timestamp, priv->idxhh->dts);
+  }
 
   idx=get_idx_for_pts(cdata,timestamp);
 
@@ -2481,7 +2498,7 @@
   matroska->skip_to_timecode = idx->dts;
   matroska->done = 0;
 
-  ff_update_cur_dts(s, st, idx->dts);
+  //ff_update_cur_dts(s, st, idx->dts);
 
   return idx;
 }

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c Added

@@ -0,0 +1,3788 @@
+// LiVES - mpegts decoder plugin
+// (c) G. Finch 2012 <salsaman@gmail.com>
+
+/*
+ * This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * LiVES is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with LiVES; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* based on code from libavformat
+ * Copyright (c) 2002-2003 Fabrice Bellard
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#ifndef IS_MINGW
+#include <endian.h>
+#endif
+
+const char *plugin_version="LiVES mpegts decoder version 1.0";
+
+#ifdef HAVE_AV_CONFIG_H
+#undef HAVE_AV_CONFIG_H
+#endif
+
+#ifndef HAVE_SYSTEM_WEED
+#include "../../../libweed/weed-palettes.h"
+#endif
+
+#define HAVE_AVCODEC
+#define HAVE_AVUTIL
+
+#ifdef HAVE_SYSTEM_WEED_COMPAT
+#include <weed/weed-compat.h>
+#else
+#include "../../../libweed/weed-compat.h"
+#endif
+
+
+#include "decplugin.h"
+
+#include <libavformat/avformat.h>
+#include <libavutil/opt.h>
+#include <libavutil/crc.h>
+#include <libavutil/avstring.h>
+#include <libavutil/mem.h>
+#include <libavcodec/avcodec.h>
+
+#include "mpegts_decoder.h"
+
+
+#ifndef offsetof
+#    define offsetof(T, F) ((unsigned int)((char *)&((T *)0)->F))
+#endif
+
+#ifndef AV_OPT_TYPE_INT
+#define AV_OPT_TYPE_INT FF_OPT_TYPE_INT
+#endif
+
+
+
+
+
+/**
+ * Read 1-25 bits.
+ */
+static inline unsigned int get_bits(GetBitContext *s, int n){
+  register int tmp;
+  OPEN_READER(re, s);
+  UPDATE_CACHE(re, s);
+  tmp = SHOW_UBITS(re, s, n);
+  LAST_SKIP_BITS(re, s, n);
+  CLOSE_READER(re, s);
+  return tmp;
+}
+
+
+
+static inline unsigned int get_bits1(GetBitContext *s){
+#ifdef ALT_BITSTREAM_READER
+  unsigned int index = s->index;
+  uint8_t result = s->buffer[index>>3];
+#ifdef ALT_BITSTREAM_READER_LE
+  result >>= index & 7;
+  result &= 1;
+#else
+  result <<= index & 7;
+  result >>= 8 - 1;
+#endif
+  index++;
+  s->index = index;
+
+  return result;
+#else
+  return get_bits(s, 1);
+#endif
+}
+
+
+
+static inline void skip_bits(GetBitContext *s, int n){
+  //Note gcc seems to optimize this to s->index+=n for the ALT_READER :))
+  OPEN_READER(re, s);
+  UPDATE_CACHE(re, s);
+  LAST_SKIP_BITS(re, s, n);
+  CLOSE_READER(re, s);
+}
+
+
+/**
+ * init GetBitContext.
+ * @param buffer bitstream buffer, must be FF_INPUT_BUFFER_PADDING_SIZE bytes larger than the actual read bits
+ * because some optimized bitstream readers read 32 or 64 bit at once and could read over the end
+ * @param bit_size the size of the buffer in bits
+ *
+ * While GetBitContext stores the buffer size, for performance reasons you are
+ * responsible for checking for the buffer end yourself (take advantage of the padding)!
+ */
+static inline void init_get_bits(GetBitContext *s,
+				 const uint8_t *buffer, int bit_size)
+{
+  int buffer_size = (bit_size+7)>>3;
+  if (buffer_size < 0 || bit_size < 0) {
+    buffer_size = bit_size = 0;
+    buffer = NULL;
+  }
+
+  s->buffer       = buffer;
+  s->size_in_bits = bit_size;
+  s->buffer_end   = buffer + buffer_size;
+#ifdef ALT_BITSTREAM_READER
+  s->index        = 0;
+#elif defined A32_BITSTREAM_READER
+  s->buffer_ptr   = (uint32_t*)((intptr_t)buffer & ~3);
+  s->bit_count    = 32 +     8*((intptr_t)buffer &  3);
+  skip_bits_long(s, 0);
+#endif
+}
+
+
+
+static void index_free(index_entry *idx) {
+  index_entry *cidx=idx,*next;
+
+  while (cidx!=NULL) {
+    next=cidx->next;
+    free(cidx);
+    cidx=next;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+/// here we assume that pts of interframes > pts of previous keyframe
+// should be true for most formats (except eg. dirac)
+
+// we further assume that pts == dts for all frames
+
+
+static index_entry *index_walk(index_entry *idx, uint32_t pts) {
+  index_entry *xidx=idx;
+  while(xidx!=NULL) {
+    if (xidx->next==NULL || (pts>=xidx->dts && pts<xidx->next->dts)) return xidx;
+    xidx=xidx->next;
+  }
+  /// oops. something went wrong
+  return NULL; 
+}
+
+
+index_entry *lives_add_idx(const lives_clip_data_t *cdata, uint64_t offset, int64_t pts) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  index_entry *nidx=priv->idxht;
+  index_entry *nentry;
+
+  nentry=malloc(sizeof(index_entry));
+
+  nentry->dts=pts;
+  nentry->offs=offset;
+  nentry->next=NULL;
+
+  if (nidx==NULL) {
+    // first entry in list
+    priv->idxhh=priv->idxht=nentry;
+    return nentry;
+  }
+
+  if (nidx->dts < pts) {
+    // last entry in list
+    nidx->next=nentry;
+    priv->idxht=nentry;
+    return nentry;
+  }
+
+  if (priv->idxhh->dts>pts) {
+    // before head
+    nentry->next=priv->idxhh;
+    priv->idxhh=nentry;
+    return nentry;
+  }
+
+  nidx=index_walk(priv->idxhh,pts);
+
+  // after nidx in list
+
+  nentry->next=nidx->next;
+  nidx->next=nentry;
+
+  return nentry;
+}
+
+
+
+static index_entry *get_idx_for_pts(const lives_clip_data_t *cdata, int64_t pts) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  return index_walk(priv->idxhh,pts);
+}
+
+
+//////////////////////////////////////////////
+
+
+static boolean check_for_eof(lives_clip_data_t *cdata) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  if (priv->input_position>priv->filesize) {
+    priv->got_eof=TRUE;
+    return TRUE;
+  }
+  return FALSE;
+}
+
+
+/* maximum size in which we look for synchronisation if
+   synchronisation is lost */
+#define MAX_RESYNC_SIZE 65536
+
+#define MAX_PES_PAYLOAD 200*1024
+
+#define MAX_MP4_DESCR_COUNT 16
+
+enum MpegTSFilterType {
+  MPEGTS_PES,
+  MPEGTS_SECTION,
+};
+
+typedef struct MpegTSFilter MpegTSFilter;
+
+typedef int PESCallback(lives_clip_data_t *cdata, MpegTSFilter *f, const uint8_t *buf, int len, int is_start, int64_t pos);
+
+typedef struct MpegTSPESFilter {
+  PESCallback *pes_cb;
+  void *opaque;
+} MpegTSPESFilter;
+
+typedef void SectionCallback(lives_clip_data_t *cdata, MpegTSFilter *f, const uint8_t *buf, int len);
+
+typedef void SetServiceCallback(void *opaque, int ret);
+
+typedef struct MpegTSSectionFilter {
+  int section_index;
+  int section_h_size;
+  uint8_t *section_buf;
+  unsigned int check_crc:1;
+  unsigned int end_of_section_reached:1;
+  SectionCallback *section_cb;
+  void *opaque;
+} MpegTSSectionFilter;
+
+struct MpegTSFilter {
+  int pid;
+  int es_id;
+  int last_cc; /* last cc code (-1 if first packet) */
+  enum MpegTSFilterType type;
+  union {
+    MpegTSPESFilter pes_filter;
+    MpegTSSectionFilter section_filter;
+  } u;
+};
+
+#define MAX_PIDS_PER_PROGRAM 64
+struct Program {
+  unsigned int id; //program id/service id
+  unsigned int nb_pids;
+  unsigned int pids[MAX_PIDS_PER_PROGRAM];
+};
+
+struct MpegTSContext {
+  const AVClass *class;
+  /* user data */
+  AVFormatContext *stream;
+  /** raw packet size, including FEC if present            */
+  int raw_packet_size;
+
+  int pos47;
+
+  /** if true, all pids are analyzed to find streams       */
+  int auto_guess;
+
+  /** compute exact PCR for each transport stream packet   */
+  int mpeg2ts_compute_pcr;
+
+  int64_t cur_pcr;    /**< used to estimate the exact PCR  */
+  int pcr_incr;       /**< used to estimate the exact PCR  */
+
+  /* data needed to handle file based ts */
+  /** stop parsing loop                                    */
+  int stop_parse;
+  /** packet containing Audio/Video data                   */
+  AVPacket *pkt;
+  /** to detect seek                                       */
+  int64_t last_pos;
+
+  /******************************************/
+  /* private mpegts data */
+  /* scan context */
+  /** structure to keep track of Program->pids mapping     */
+  unsigned int nb_prg;
+  struct Program *prg;
+
+
+  /** filters for various streams specified by PMT + for the PAT and PMT */
+  MpegTSFilter *pids[NB_PID_MAX];
+};
+
+static const AVOption options[] = {
+  {"compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT,
+   {.dbl = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+  { NULL },
+};
+
+/* TS stream handling */
+
+enum MpegTSState {
+  MPEGTS_HEADER = 0,
+  MPEGTS_PESHEADER,
+  MPEGTS_PESHEADER_FILL,
+  MPEGTS_PAYLOAD,
+  MPEGTS_SKIP,
+};
+
+/* enough for PES header + length */
+#define PES_START_SIZE  6
+#define PES_HEADER_SIZE 9
+#define MAX_PES_HEADER_SIZE (9 + 255)
+
+typedef struct PESContext {
+  int pid;
+  int pcr_pid; /**< if -1 then all packets containing PCR are considered */
+  int stream_type;
+  MpegTSContext *ts;
+  AVFormatContext *stream;
+  AVStream *st;
+  AVStream *sub_st; /**< stream for the embedded AC3 stream in HDMV TrueHD */
+  enum MpegTSState state;
+  /* used to get the format */
+  int data_index;
+  int flags; /**< copied to the AVPacket flags */
+  int total_size;
+  int pes_header_size;
+  int extended_stream_id;
+  int64_t pts, dts;
+  int64_t ts_packet_pos; /**< position of first TS packet of this PES packet */
+  uint8_t header[MAX_PES_HEADER_SIZE];
+  uint8_t *buffer;
+  SLConfigDescr sl;
+} PESContext;
+
+//extern AVInputFormat ff_mpegts_demuxer;
+
+static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
+{
+  int i;
+  for(i=0; tags[i].id != CODEC_ID_NONE;i++) {
+    if(tag == tags[i].tag)
+      return tags[i].id;
+  }
+  for(i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if(   toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
+	  && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
+	  && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
+	  && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
+      return tags[i].id;
+  }
+  return CODEC_ID_NONE;
+}
+
+
+static boolean lives_seek(lives_clip_data_t *cdata, int fd, off_t pos) {
+  // seek
+
+  lives_mpegts_priv_t *priv=cdata->priv;
+  if (fd==priv->fd) {
+    priv->input_position = pos;
+    check_for_eof(cdata);
+    if (lseek(priv->fd, priv->input_position, SEEK_SET)==-1) {
+      return FALSE;
+    }
+  }
+  else {
+    struct stat sb;
+    fstat(fd,&sb);
+    if (pos>sb.st_size) priv->got_eof=TRUE;
+    if (lseek(fd, pos, SEEK_SET)==-1) return FALSE;
+  }
+  return TRUE;
+}
+
+
+static boolean lives_skip(lives_clip_data_t *cdata, int fd, off_t offs) {
+  // skip
+
+  lives_mpegts_priv_t *priv=cdata->priv;
+  if (fd==priv->fd) {
+    priv->input_position += offs;
+    check_for_eof(cdata);
+    if (lseek(priv->fd, priv->input_position, SEEK_SET)==-1) {
+      return FALSE;
+    }
+  }
+  else {
+    off_t pos=lseek(fd,0,SEEK_CUR)+offs;
+    return lives_seek(cdata,fd,pos);
+  }
+  return TRUE;
+}
+
+
+
+ssize_t lives_read(lives_clip_data_t *cdata, int fd, void *data, size_t len) {
+  // read fd
+
+  lives_mpegts_priv_t *priv=cdata->priv;
+  ssize_t bytes=read(fd,data,len);
+  if (bytes>=0 && fd==priv->fd) priv->input_position+=len;
+  check_for_eof(cdata);
+  return bytes;
+}
+
+
+static inline uint16_t lives_r8(const uint8_t *x) {
+  return x[0];
+}
+
+
+static uint8_t lives_rf8(lives_clip_data_t *cdata, int fd) {
+  uint8_t buf;
+  lives_read(cdata,fd,&buf,1);
+  return buf;
+}
+
+
+
+static inline uint16_t lives_rb16(const uint8_t *x) {
+  return (x[0]<<8) + x[1];
+}
+
+static uint16_t lives_rbf16(lives_clip_data_t *cdata, int fd) {
+  uint8_t buf[2];
+  lives_read(cdata,fd,&buf,2);
+  return lives_rb16(buf);
+}
+
+
+static inline uint16_t lives_rb24(const uint8_t *x) {
+  return (((x[0]<<8) + x[1])<<8) + x[2];
+}
+
+
+static inline uint16_t lives_rb32(const uint8_t *x) {
+  return (((((x[0]<<8) + x[1])<<8) + x[2])<<8) + x[3];
+}
+
+
+static uint16_t lives_rbf32(lives_clip_data_t *cdata, int fd) {
+  uint8_t buf[4];
+  lives_read(cdata,fd,&buf,4);
+  return lives_rb32(buf);
+}
+
+
+static inline uint16_t lives_rl32(const char *x) {
+  return (((((x[3]<<8) + x[2])<<8) + x[1])<<8) + x[0];
+}
+
+
+
+
+/**
+ * Parse MPEG-PES five-byte timestamp
+ */
+static inline int64_t ff_parse_pes_pts(const uint8_t *buf) {
+  return (int64_t)(*buf & 0x0e) << 29 |
+    (lives_rb16(buf+1) >> 1) << 15 |
+    lives_rb16(buf+3) >> 1;
+}
+
+
+int ff_find_stream_index(AVFormatContext *s, int id) {
+  int i;
+  for (i = 0; i < s->nb_streams; i++) {
+    if (s->streams[i]->id == id)
+      return i;
+  }
+  return -1;
+}
+
+
+void ff_mp4_parse_es_descr(lives_clip_data_t *cdata, int fd, int *es_id) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  int flags;
+
+  if (es_id) *es_id = lives_rbf16(cdata,fd);
+  else                lives_rbf16(cdata,fd);
+  flags = lives_rf8(cdata,fd);
+  if (flags & 0x80) //streamDependenceFlag
+    lives_rbf16(cdata,fd);
+  if (flags & 0x40) { //URL_Flag
+    int len = lives_rf8(cdata,fd);
+    lives_skip(cdata, fd, len);
+  }
+  if (flags & 0x20) //OCRstreamFlag
+    lives_rbf16(cdata,priv->fd);
+}
+
+
+static void clear_program(MpegTSContext *ts, unsigned int programid) {
+  int i;
+
+  for(i=0; i<ts->nb_prg; i++)
+    if(ts->prg[i].id == programid)
+      ts->prg[i].nb_pids = 0;
+}
+
+static void clear_programs(MpegTSContext *ts) {
+  av_freep(&ts->prg);
+  ts->nb_prg=0;
+}
+
+static void add_pat_entry(MpegTSContext *ts, unsigned int programid) {
+  struct Program *p;
+  void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program));
+  if(!tmp)
+    return;
+  ts->prg = tmp;
+  p = &ts->prg[ts->nb_prg];
+  p->id = programid;
+  p->nb_pids = 0;
+  ts->nb_prg++;
+}
+
+static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
+{
+  int i;
+  struct Program *p = NULL;
+  for(i=0; i<ts->nb_prg; i++) {
+    if(ts->prg[i].id == programid) {
+      p = &ts->prg[i];
+      break;
+    }
+  }
+  if(!p)
+    return;
+
+  if(p->nb_pids >= MAX_PIDS_PER_PROGRAM)
+    return;
+  
+  //fprintf(stderr,"adding pid %d\n",pid);
+  p->pids[p->nb_pids++] = pid;
+}
+
+static void set_pcr_pid(AVFormatContext *s, unsigned int programid, unsigned int pid)
+{
+  int i;
+  for(i=0; i<s->nb_programs; i++) {
+    if(s->programs[i]->id == programid) {
+      //s->programs[i]->pcr_pid = pid;
+      break;
+    }
+  }
+}
+
+/**
+ * @brief discard_pid() decides if the pid is to be discarded according
+ *                      to caller's programs selection
+ * @param ts    : - TS context
+ * @param pid   : - pid
+ * @return 1 if the pid is only comprised in programs that have .discard=AVDISCARD_ALL
+ *         0 otherwise
+ */
+static int discard_pid(MpegTSContext *ts, unsigned int pid)
+{
+  int i, j, k;
+  int used = 0, discarded = 0;
+  struct Program *p;
+  for(i=0; i<ts->nb_prg; i++) {
+    p = &ts->prg[i];
+    for(j=0; j<p->nb_pids; j++) {
+      if(p->pids[j] != pid)
+	continue;
+      //is program with id p->id set to be discarded?
+      for(k=0; k<ts->stream->nb_programs; k++) {
+	if(ts->stream->programs[k]->id == p->id) {
+	  if(ts->stream->programs[k]->discard == AVDISCARD_ALL)
+	    discarded++;
+	  else
+	    used++;
+	}
+      }
+    }
+  }
+
+  return !used && discarded;
+}
+
+/**
+ *  Assemble PES packets out of TS packets, and then call the "section_cb"
+ *  function when they are complete.
+ */
+static void write_section_data(lives_clip_data_t *cdata, AVFormatContext *s, MpegTSFilter *tss1,
+                               const uint8_t *buf, int buf_size, int is_start)
+{
+  MpegTSSectionFilter *tss = &tss1->u.section_filter;
+  int len;
+
+  //fprintf(stderr,"pt a123\n");
+
+  if (is_start) {
+    memcpy(tss->section_buf, buf, buf_size);
+    tss->section_index = buf_size;
+    tss->section_h_size = -1;
+    tss->end_of_section_reached = 0;
+  } else {
+    if (tss->end_of_section_reached)
+      return;
+    len = 4096 - tss->section_index;
+    if (buf_size < len)
+      len = buf_size;
+    memcpy(tss->section_buf + tss->section_index, buf, len);
+    tss->section_index += len;
+  }
+
+  /* compute section length if possible */
+  if (tss->section_h_size == -1 && tss->section_index >= 3) {
+    len = (lives_rb16(tss->section_buf + 1) & 0xfff) + 3;
+    if (len > 4096)
+      return;
+    tss->section_h_size = len;
+  }
+
+  if (tss->section_h_size != -1 && tss->section_index >= tss->section_h_size) {
+    tss->end_of_section_reached = 1;
+    if (!tss->check_crc ||
+	av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1,
+	       tss->section_buf, tss->section_h_size) == 0)
+      tss->section_cb(cdata, tss1, tss->section_buf, tss->section_h_size);
+  }
+}
+
+static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid,
+						SectionCallback *section_cb, void *opaque,
+						int check_crc)
+
+{
+  MpegTSFilter *filter;
+  MpegTSSectionFilter *sec;
+
+  if (pid >= NB_PID_MAX || ts->pids[pid])
+    return NULL;
+  filter = av_mallocz(sizeof(MpegTSFilter));
+  if (!filter)
+    return NULL;
+
+  //fprintf(stderr,"adding filter %d %p\n",pid,filter);
+  ts->pids[pid] = filter;
+  filter->type = MPEGTS_SECTION;
+  filter->pid = pid;
+  filter->es_id = -1;
+  filter->last_cc = -1;
+  sec = &filter->u.section_filter;
+  sec->section_cb = section_cb;
+  sec->opaque = opaque;
+  sec->section_buf = av_malloc(MAX_SECTION_SIZE);
+  sec->check_crc = check_crc;
+  if (!sec->section_buf) {
+    av_free(filter);
+    return NULL;
+  }
+  return filter;
+}
+
+static MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid,
+					    PESCallback *pes_cb,
+					    void *opaque)
+{
+  MpegTSFilter *filter;
+  MpegTSPESFilter *pes;
+
+  if (pid >= NB_PID_MAX || ts->pids[pid])
+    return NULL;
+  filter = av_mallocz(sizeof(MpegTSFilter));
+  if (!filter)
+    return NULL;
+  //fprintf(stderr,"2adding filter %p\n",filter);
+  ts->pids[pid] = filter;
+  filter->type = MPEGTS_PES;
+  filter->pid = pid;
+  filter->es_id = -1;
+  filter->last_cc = -1;
+  pes = &filter->u.pes_filter;
+  pes->pes_cb = pes_cb;
+  pes->opaque = opaque;
+  return filter;
+}
+
+static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
+{
+  int pid;
+
+  pid = filter->pid;
+  if (filter->type == MPEGTS_SECTION)
+    av_freep(&filter->u.section_filter.section_buf);
+  else if (filter->type == MPEGTS_PES) {
+    PESContext *pes = filter->u.pes_filter.opaque;
+    av_freep(&pes->buffer);
+    /* referenced private data will be freed later in
+     * av_close_input_stream */
+    if (!((PESContext *)filter->u.pes_filter.opaque)->st) {
+      av_freep(&filter->u.pes_filter.opaque);
+    }
+  }
+
+  av_free(filter);
+  ts->pids[pid] = NULL;
+}
+
+static int analyze(const uint8_t *buf, int size, int packet_size, int *index){
+  int stat[TS_MAX_PACKET_SIZE];
+  int i;
+  int x=0;
+  int best_score=0;
+
+  memset(stat, 0, packet_size*sizeof(int));
+
+  for(x=i=0; i<size-3; i++) {
+    if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && buf[i+3] != 0x47) {
+      stat[x]++;
+      if(stat[x] > best_score) {
+	best_score= stat[x];
+	if(index) *index= x;
+      }
+    }
+
+    x++;
+    if (x == packet_size) x= 0;
+  }
+
+  return best_score;
+}
+
+/* autodetect fec presence. Must have at least 1024 bytes  */
+static int get_packet_size(const uint8_t *buf, int size)
+{
+  int score, fec_score, dvhs_score;
+
+  if (size < (TS_FEC_PACKET_SIZE * 5 + 1))
+    return -1;
+
+  score    = analyze(buf, size, TS_PACKET_SIZE, NULL);
+  dvhs_score    = analyze(buf, size, TS_DVHS_PACKET_SIZE, NULL);
+  fec_score= analyze(buf, size, TS_FEC_PACKET_SIZE, NULL);
+  //    av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
+
+  if     (score > fec_score && score > dvhs_score) return TS_PACKET_SIZE;
+  else if(dvhs_score > score && dvhs_score > fec_score) return TS_DVHS_PACKET_SIZE;
+  else if(score < fec_score && dvhs_score < fec_score) return TS_FEC_PACKET_SIZE;
+  else                       return -1;
+}
+
+typedef struct SectionHeader {
+  uint8_t tid;
+  uint16_t id;
+  uint8_t version;
+  uint8_t sec_num;
+  uint8_t last_sec_num;
+} SectionHeader;
+
+static inline int get8(const uint8_t **pp, const uint8_t *p_end)
+{
+  const uint8_t *p;
+  int c;
+
+  p = *pp;
+  if (p >= p_end)
+    return -1;
+  c = *p++;
+  *pp = p;
+  return c;
+}
+
+static inline int get16(const uint8_t **pp, const uint8_t *p_end)
+{
+  const uint8_t *p;
+  int c;
+
+  p = *pp;
+  if ((p + 1) >= p_end)
+    return -1;
+  c = lives_rb16(p);
+  p += 2;
+  *pp = p;
+  return c;
+}
+
+/* read and allocate a DVB string preceded by its length */
+static char *getstr8(const uint8_t **pp, const uint8_t *p_end)
+{
+  int len;
+  const uint8_t *p;
+  char *str;
+
+  p = *pp;
+  len = get8(&p, p_end);
+  if (len < 0)
+    return NULL;
+  if ((p + len) > p_end)
+    return NULL;
+  str = av_malloc(len + 1);
+  if (!str)
+    return NULL;
+  memcpy(str, p, len);
+  str[len] = '\0';
+  p += len;
+  *pp = p;
+  return str;
+}
+
+static int parse_section_header(SectionHeader *h,
+                                const uint8_t **pp, const uint8_t *p_end)
+{
+  int val;
+
+  val = get8(pp, p_end);
+  if (val < 0)
+    return -1;
+  h->tid = val;
+  *pp += 2;
+  val = get16(pp, p_end);
+  if (val < 0)
+    return -1;
+  h->id = val;
+  val = get8(pp, p_end);
+  if (val < 0)
+    return -1;
+  h->version = (val >> 1) & 0x1f;
+  val = get8(pp, p_end);
+  if (val < 0)
+    return -1;
+  h->sec_num = val;
+  val = get8(pp, p_end);
+  if (val < 0)
+    return -1;
+  h->last_sec_num = val;
+  return 0;
+}
+
+typedef struct {
+  uint32_t stream_type;
+  enum AVMediaType codec_type;
+  enum CodecID codec_id;
+} StreamType;
+
+static const StreamType ISO_types[] = {
+  { 0x01, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO },
+  { 0x02, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO },
+  { 0x03, AVMEDIA_TYPE_AUDIO,        CODEC_ID_MP3 },
+  { 0x04, AVMEDIA_TYPE_AUDIO,        CODEC_ID_MP3 },
+  { 0x0f, AVMEDIA_TYPE_AUDIO,        CODEC_ID_AAC },
+  { 0x10, AVMEDIA_TYPE_VIDEO,      CODEC_ID_MPEG4 },
+  /* Makito encoder sets stream type 0x11 for AAC,
+   * so auto-detect LOAS/LATM instead of hardcoding it. */
+  //  { 0x11, AVMEDIA_TYPE_AUDIO,   CODEC_ID_AAC_LATM }, /* LATM syntax */
+  { 0x1b, AVMEDIA_TYPE_VIDEO,       CODEC_ID_H264 },
+  { 0xd1, AVMEDIA_TYPE_VIDEO,      CODEC_ID_DIRAC },
+  { 0xea, AVMEDIA_TYPE_VIDEO,        CODEC_ID_VC1 },
+  { 0 },
+};
+
+static const StreamType HDMV_types[] = {
+  { 0x80, AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_BLURAY },
+  { 0x81, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 },
+  { 0x82, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS },
+  { 0x83, AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD },
+  { 0x84, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 },
+  { 0x85, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS HD */
+  { 0x86, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS }, /* DTS HD MASTER*/
+  { 0xa1, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 }, /* E-AC3 Secondary Audio */
+  { 0xa2, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS },  /* DTS Express Secondary Audio */
+  { 0x90, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE },
+  { 0 },
+};
+
+/* ATSC ? */
+static const StreamType MISC_types[] = {
+  { 0x81, AVMEDIA_TYPE_AUDIO,   CODEC_ID_AC3 },
+  { 0x8a, AVMEDIA_TYPE_AUDIO,   CODEC_ID_DTS },
+  { 0 },
+};
+
+static const StreamType REGD_types[] = {
+  { MKTAG('d','r','a','c'), AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC },
+  { MKTAG('A','C','-','3'), AVMEDIA_TYPE_AUDIO,   CODEC_ID_AC3 },
+  { MKTAG('B','S','S','D'), AVMEDIA_TYPE_AUDIO, CODEC_ID_S302M },
+  { MKTAG('D','T','S','1'), AVMEDIA_TYPE_AUDIO,   CODEC_ID_DTS },
+  { MKTAG('D','T','S','2'), AVMEDIA_TYPE_AUDIO,   CODEC_ID_DTS },
+  { MKTAG('D','T','S','3'), AVMEDIA_TYPE_AUDIO,   CODEC_ID_DTS },
+  { MKTAG('V','C','-','1'), AVMEDIA_TYPE_VIDEO,   CODEC_ID_VC1 },
+  { 0 },
+};
+
+/* descriptor present */
+static const StreamType DESC_types[] = {
+  { 0x6a, AVMEDIA_TYPE_AUDIO,             CODEC_ID_AC3 }, /* AC-3 descriptor */
+  { 0x7a, AVMEDIA_TYPE_AUDIO,            CODEC_ID_EAC3 }, /* E-AC-3 descriptor */
+  { 0x7b, AVMEDIA_TYPE_AUDIO,             CODEC_ID_DTS },
+  { 0x56, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_TELETEXT },
+  { 0x59, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */
+  { 0 },
+};
+
+static void mpegts_find_stream_type(AVStream *st,
+                                    uint32_t stream_type, const StreamType *types)
+{
+  for (; types->stream_type; types++) {
+    if (stream_type == types->stream_type) {
+      st->codec->codec_type = types->codec_type;
+      st->codec->codec_id   = types->codec_id;
+      return;
+    }
+  }
+}
+
+static int mpegts_set_stream_info(lives_clip_data_t *cdata, AVStream *st, PESContext *pes,
+                                  uint32_t stream_type, uint32_t prog_reg_desc) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  int old_codec_type= st->codec->codec_type;
+  int old_codec_id  = st->codec->codec_id;
+  av_set_pts_info(st, 33, 1, 90000);
+  st->priv_data = pes;
+  st->codec->codec_type = AVMEDIA_TYPE_DATA;
+  st->codec->codec_id   = CODEC_ID_NONE;
+  st->need_parsing = AVSTREAM_PARSE_FULL;
+  pes->st = st;
+  pes->stream_type = stream_type;
+  
+  /*  fprintf(stderr,
+	  "stream=%d stream_type=%x pid=%x prog_reg_desc=%.4s\n",
+	  st->index, pes->stream_type, pes->pid, (char*)&prog_reg_desc);*/
+  
+  st->codec->codec_tag = pes->stream_type;
+  
+  if (st->codec->codec_tag==STREAM_TYPE_VIDEO_MPEG1||
+      st->codec->codec_tag==STREAM_TYPE_VIDEO_MPEG2||
+      st->codec->codec_tag==STREAM_TYPE_VIDEO_MPEG4||
+      st->codec->codec_tag==STREAM_TYPE_VIDEO_H264||
+      st->codec->codec_tag==STREAM_TYPE_VIDEO_VC1||
+      st->codec->codec_tag==STREAM_TYPE_VIDEO_DIRAC) {
+    //    fprintf(stderr,"got our vidst %d %p\n",st->codec->codec_tag,st);
+    priv->vidst=st;
+  }
+
+  if (st->codec->codec_tag==STREAM_TYPE_AUDIO_MPEG1) sprintf(cdata->audio_name,"%s","mpeg1");
+  else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_MPEG2) sprintf(cdata->audio_name,"%s","mpeg2");
+  else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_AAC) sprintf(cdata->audio_name,"%s","aac");
+  else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_AAC_LATM) sprintf(cdata->audio_name,"%s","aac_latm");
+  else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_AC3) sprintf(cdata->audio_name,"%s","ac3");
+  else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_DTS) sprintf(cdata->audio_name,"%s","dts");
+ 
+  mpegts_find_stream_type(st, pes->stream_type, ISO_types);
+  
+  
+  if ((prog_reg_desc == lives_rl32("HDMV") ||
+       prog_reg_desc == lives_rl32("HDPR")) &&
+      st->codec->codec_id == CODEC_ID_NONE) {
+    mpegts_find_stream_type(st, pes->stream_type, HDMV_types);
+    if (pes->stream_type == 0x83) {
+      // HDMV TrueHD streams also contain an AC3 coded version of the
+      // audio track - add a second stream for this
+      AVStream *sub_st;
+      // priv_data cannot be shared between streams
+      PESContext *sub_pes = av_malloc(sizeof(*sub_pes));
+      if (!sub_pes)
+	return AVERROR(ENOMEM);
+      memcpy(sub_pes, pes, sizeof(*sub_pes));
+
+      sub_st = av_new_stream(pes->stream, pes->pid);
+      if (!sub_st) {
+	av_free(sub_pes);
+	return AVERROR(ENOMEM);
+      }
+
+      sub_st->id = pes->pid;
+      av_set_pts_info(sub_st, 33, 1, 90000);
+      sub_st->priv_data = sub_pes;
+      sub_st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+      sub_st->codec->codec_id   = CODEC_ID_AC3;
+      sub_st->need_parsing = AVSTREAM_PARSE_FULL;
+      sub_pes->sub_st = pes->sub_st = sub_st;
+    }
+  }
+  if (st->codec->codec_id == CODEC_ID_NONE)
+    mpegts_find_stream_type(st, pes->stream_type, MISC_types);
+  if (st->codec->codec_id == CODEC_ID_NONE){
+    st->codec->codec_id  = old_codec_id;
+    st->codec->codec_type= old_codec_type;
+  }
+
+  return 0;
+}
+
+static void new_pes_packet(PESContext *pes, AVPacket *pkt)
+{
+  av_init_packet(pkt);
+
+  pkt->destruct = av_destruct_packet;
+  pkt->data = pes->buffer;
+  pkt->size = pes->data_index;
+
+  if(pes->total_size != MAX_PES_PAYLOAD &&
+     pes->pes_header_size + pes->data_index != pes->total_size + 6) {
+    fprintf(stderr, "mpegts_decoder: PES packet size mismatch\n");
+    //pes->flags |= AV_PKT_FLAG_CORRUPT;
+  }
+  memset(pkt->data+pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+  // Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID
+  if (pes->sub_st && pes->stream_type == 0x83 && pes->extended_stream_id == 0x76)
+    pkt->stream_index = pes->sub_st->index;
+  else
+    pkt->stream_index = pes->st->index;
+  pkt->pts = pes->pts;
+  pkt->dts = pes->dts;
+  /* store position of first TS packet of this PES packet */
+  pkt->pos = pes->ts_packet_pos;
+  pkt->flags = pes->flags;
+
+  /* reset pts values */
+  pes->pts = AV_NOPTS_VALUE;
+  pes->dts = AV_NOPTS_VALUE;
+  pes->buffer = NULL;
+  pes->data_index = 0;
+  pes->flags = 0;
+}
+
+static uint64_t get_bits64(GetBitContext *gb, int bits)
+{
+  uint64_t ret = 0;
+  while (bits > 17) {
+    ret <<= 17;
+    ret |= get_bits(gb, 17);
+    bits -= 17;
+  }
+  ret <<= bits;
+  ret |= get_bits(gb, bits);
+  return ret;
+}
+
+static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf, int buf_size)
+{
+  GetBitContext gb;
+  int au_start_flag = 0, au_end_flag = 0, ocr_flag = 0, idle_flag = 0;
+  int padding_flag = 0, padding_bits = 0, inst_bitrate_flag = 0;
+  int dts_flag = -1, cts_flag = -1;
+  int64_t dts = AV_NOPTS_VALUE, cts = AV_NOPTS_VALUE;
+  init_get_bits(&gb, buf, buf_size*8);
+
+  if (sl->use_au_start)
+    au_start_flag = get_bits1(&gb);
+  if (sl->use_au_end)
+    au_end_flag = get_bits1(&gb);
+  if (!sl->use_au_start && !sl->use_au_end)
+    au_start_flag = au_end_flag = 1;
+  if (sl->ocr_len > 0)
+    ocr_flag = get_bits1(&gb);
+  if (sl->use_idle)
+    idle_flag = get_bits1(&gb);
+  if (sl->use_padding)
+    padding_flag = get_bits1(&gb);
+  if (padding_flag)
+    padding_bits = get_bits(&gb, 3);
+
+  if (!idle_flag && (!padding_flag || padding_bits != 0)) {
+    if (sl->packet_seq_num_len)
+      skip_bits_long(&gb, sl->packet_seq_num_len);
+    if (sl->degr_prior_len)
+      if (get_bits1(&gb))
+	skip_bits(&gb, sl->degr_prior_len);
+    if (ocr_flag)
+      skip_bits_long(&gb, sl->ocr_len);
+    if (au_start_flag) {
+      if (sl->use_rand_acc_pt)
+	get_bits1(&gb);
+      if (sl->au_seq_num_len > 0)
+	skip_bits_long(&gb, sl->au_seq_num_len);
+      if (sl->use_timestamps) {
+	dts_flag = get_bits1(&gb);
+	cts_flag = get_bits1(&gb);
+      }
+    }
+    if (sl->inst_bitrate_len)
+      inst_bitrate_flag = get_bits1(&gb);
+    if (dts_flag == 1)
+      dts = get_bits64(&gb, sl->timestamp_len);
+    if (cts_flag == 1)
+      cts = get_bits64(&gb, sl->timestamp_len);
+    if (sl->au_len > 0)
+      skip_bits_long(&gb, sl->au_len);
+    if (inst_bitrate_flag)
+      skip_bits_long(&gb, sl->inst_bitrate_len);
+  }
+
+  if (dts != AV_NOPTS_VALUE)
+    pes->dts = dts;
+  if (cts != AV_NOPTS_VALUE)
+    pes->pts = cts;
+
+  av_set_pts_info(pes->st, sl->timestamp_len, 1, sl->timestamp_res);
+
+  return (get_bits_count(&gb) + 7) >> 3;
+}
+
+/* return non zero if a packet could be constructed */
+static int mpegts_push_data(lives_clip_data_t *cdata, MpegTSFilter *filter,
+                            const uint8_t *buf, int buf_size, int is_start,
+                            int64_t pos) {
+  PESContext *pes = filter->u.pes_filter.opaque;
+  MpegTSContext *ts = pes->ts;
+  const uint8_t *p;
+  int len, code;
+
+  if(!ts->pkt)
+    return 0;
+
+  if (is_start) {
+    if (pes->state == MPEGTS_PAYLOAD && pes->data_index > 0) {
+      new_pes_packet(pes, ts->pkt);
+      ts->stop_parse = 1;
+    }
+    pes->state = MPEGTS_HEADER;
+    pes->data_index = 0;
+    pes->ts_packet_pos = pos;
+  }
+  p = buf;
+  while (buf_size > 0) {
+    switch(pes->state) {
+    case MPEGTS_HEADER:
+      len = PES_START_SIZE - pes->data_index;
+      if (len > buf_size)
+	len = buf_size;
+      memcpy(pes->header + pes->data_index, p, len);
+      pes->data_index += len;
+      p += len;
+      buf_size -= len;
+      if (pes->data_index == PES_START_SIZE) {
+	/* we got all the PES or section header. We can now
+	   decide */
+	if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
+	    pes->header[2] == 0x01) {
+	  /* it must be an mpeg2 PES stream */
+	  code = pes->header[3] | 0x100;
+	  //av_dlog(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
+
+	  if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
+	      code == 0x1be) /* padding_stream */
+	    goto skip;
+
+	  /* stream not present in PMT */
+	  if (!pes->st) {
+	    pes->st = av_new_stream(ts->stream, pes->pid);
+	    if (!pes->st)
+	      return AVERROR(ENOMEM);
+	    pes->st->id = pes->pid;
+	    mpegts_set_stream_info(cdata, pes->st, pes, 0, 0);
+	  }
+
+	  pes->total_size = lives_rb16(pes->header + 4);
+	  /* NOTE: a zero total size means the PES size is
+	     unbounded */
+	  if (!pes->total_size)
+	    pes->total_size = MAX_PES_PAYLOAD;
+
+	  /* allocate pes buffer */
+	  pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+	  if (!pes->buffer)
+	    return AVERROR(ENOMEM);
+
+	  if (code != 0x1bc && code != 0x1bf && /* program_stream_map, private_stream_2 */
+	      code != 0x1f0 && code != 0x1f1 && /* ECM, EMM */
+	      code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */
+	      code != 0x1f8) {                  /* ITU-T Rec. H.222.1 type E stream */
+	    pes->state = MPEGTS_PESHEADER;
+	  } else {
+	    pes->state = MPEGTS_PAYLOAD;
+	    pes->data_index = 0;
+	  }
+	} else {
+	  /* otherwise, it should be a table */
+	  /* skip packet */
+	skip:
+	  pes->state = MPEGTS_SKIP;
+	  continue;
+	}
+      }
+      break;
+      /**********************************************/
+      /* PES packing parsing */
+    case MPEGTS_PESHEADER:
+      len = PES_HEADER_SIZE - pes->data_index;
+      if (len < 0)
+	return -1;
+      if (len > buf_size)
+	len = buf_size;
+      memcpy(pes->header + pes->data_index, p, len);
+      pes->data_index += len;
+      p += len;
+      buf_size -= len;
+      if (pes->data_index == PES_HEADER_SIZE) {
+	pes->pes_header_size = pes->header[8] + 9;
+	pes->state = MPEGTS_PESHEADER_FILL;
+      }
+      break;
+    case MPEGTS_PESHEADER_FILL:
+      len = pes->pes_header_size - pes->data_index;
+      if (len < 0)
+	return -1;
+      if (len > buf_size)
+	len = buf_size;
+      memcpy(pes->header + pes->data_index, p, len);
+      pes->data_index += len;
+      p += len;
+      buf_size -= len;
+      if (pes->data_index == pes->pes_header_size) {
+	const uint8_t *r;
+	unsigned int flags, pes_ext, skip;
+
+	flags = pes->header[7];
+	r = pes->header + 9;
+	pes->pts = AV_NOPTS_VALUE;
+	pes->dts = AV_NOPTS_VALUE;
+	if ((flags & 0xc0) == 0x80) {
+	  pes->dts = pes->pts = ff_parse_pes_pts(r);
+	  r += 5;
+	} else if ((flags & 0xc0) == 0xc0) {
+	  pes->pts = ff_parse_pes_pts(r);
+	  r += 5;
+	  pes->dts = ff_parse_pes_pts(r);
+	  r += 5;
+	}
+	pes->extended_stream_id = -1;
+	if (flags & 0x01) { /* PES extension */
+	  pes_ext = *r++;
+	  /* Skip PES private data, program packet sequence counter and P-STD buffer */
+	  skip = (pes_ext >> 4) & 0xb;
+	  skip += skip & 0x9;
+	  r += skip;
+	  if ((pes_ext & 0x41) == 0x01 &&
+	      (r + 2) <= (pes->header + pes->pes_header_size)) {
+	    /* PES extension 2 */
+	    if ((r[0] & 0x7f) > 0 && (r[1] & 0x80) == 0)
+	      pes->extended_stream_id = r[1];
+	  }
+	}
+
+	/* we got the full header. We parse it and get the payload */
+	pes->state = MPEGTS_PAYLOAD;
+	pes->data_index = 0;
+	if (pes->stream_type == 0x12) {
+	  int sl_header_bytes = read_sl_header(pes, &pes->sl, p, buf_size);
+	  pes->pes_header_size += sl_header_bytes;
+	  p += sl_header_bytes;
+	  buf_size -= sl_header_bytes;
+	}
+      }
+      break;
+    case MPEGTS_PAYLOAD:
+      if (buf_size > 0 && pes->buffer) {
+	if (pes->data_index > 0 && pes->data_index+buf_size > pes->total_size) {
+	  new_pes_packet(pes, ts->pkt);
+	  pes->total_size = MAX_PES_PAYLOAD;
+	  pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+	  if (!pes->buffer)
+	    return AVERROR(ENOMEM);
+	  ts->stop_parse = 1;
+	} else if (pes->data_index == 0 && buf_size > pes->total_size) {
+	  // pes packet size is < ts size packet and pes data is padded with 0xff
+	  // not sure if this is legal in ts but see issue #2392
+	  buf_size = pes->total_size;
+	}
+	memcpy(pes->buffer+pes->data_index, p, buf_size);
+	pes->data_index += buf_size;
+      }
+      buf_size = 0;
+      /* emit complete packets with known packet size
+       * decreases demuxer delay for infrequent packets like subtitles from
+       * a couple of seconds to milliseconds for properly muxed files.
+       * total_size is the number of bytes following pes_packet_length
+       * in the pes header, i.e. not counting the first 6 bytes */
+      if (!ts->stop_parse && pes->total_size < MAX_PES_PAYLOAD &&
+	  pes->pes_header_size + pes->data_index == pes->total_size + 6) {
+	ts->stop_parse = 1;
+	new_pes_packet(pes, ts->pkt);
+      }
+      break;
+    case MPEGTS_SKIP:
+      buf_size = 0;
+      break;
+    }
+  }
+
+  return 0;
+}
+
+static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid)
+{
+  MpegTSFilter *tss;
+  PESContext *pes;
+
+  /* if no pid found, then add a pid context */
+  pes = av_mallocz(sizeof(PESContext));
+  if (!pes)
+    return 0;
+  pes->ts = ts;
+  pes->stream = ts->stream;
+  pes->pid = pid;
+  pes->pcr_pid = pcr_pid;
+  pes->state = MPEGTS_SKIP;
+  pes->pts = AV_NOPTS_VALUE;
+  pes->dts = AV_NOPTS_VALUE;
+  tss = mpegts_open_pes_filter(ts, pid, mpegts_push_data, pes);
+  if (!tss) {
+    av_free(pes);
+    return 0;
+  }
+  return pes;
+}
+
+#define MAX_LEVEL 4
+typedef struct {
+  AVFormatContext *s;
+  int fd;
+  Mp4Descr *descr;
+  Mp4Descr *active_descr;
+  int descr_count;
+  int max_descr_count;
+  int level;
+} MP4DescrParseContext;
+
+
+static int init_MP4DescrParseContext(lives_clip_data_t *cdata,
+				     MP4DescrParseContext *d, AVFormatContext *s, const uint8_t *buf,
+				     unsigned size, Mp4Descr *descr, int max_descr_count)
+{
+  //    int ret;
+  if (size > (1<<30))
+    return -2;
+
+  if ((d->fd=open(cdata->URI,O_RDONLY))==-1) {
+    return d->fd;
+  }
+  d->s = s;
+  d->level = 0;
+  d->descr_count = 0;
+  d->descr = descr;
+  d->active_descr = NULL;
+  d->max_descr_count = max_descr_count;
+
+  return 0;
+}
+
+
+int ff_mp4_read_descr_len(uint8_t *p) {
+  int len = 0;
+  int count = 4;
+  while (count--) {
+    int c = lives_r8(p);
+    p++;
+    len = (len << 7) | (c & 0x7f);
+    if (!(c & 0x80))
+      break;
+  }
+  return len;
+}
+
+
+int ff_mp4_read_descr(lives_clip_data_t *cdata, AVFormatContext *fc, uint8_t *p, int *tag) {
+  int len;
+  *tag = lives_r8(p);
+  p++;
+  len = ff_mp4_read_descr_len(p);
+  //av_dlog(fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
+  return len;
+}
+
+
+
+
+int ff_mp4_read_descr_lenf(lives_clip_data_t *cdata, int fd) {
+  int len = 0;
+  int count = 4;
+  while (count--) {
+    int c = lives_rf8(cdata,fd);
+    len = (len << 7) | (c & 0x7f);
+    if (!(c & 0x80))
+      break;
+  }
+  return len;
+}
+
+
+int ff_mp4_read_descrf(lives_clip_data_t *cdata, AVFormatContext *fc, int fd, int *tag) {
+  int len;
+  *tag = lives_rf8(cdata,fd);
+  len = ff_mp4_read_descr_lenf(cdata,fd);
+  //av_dlog(fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
+  return len;
+}
+
+
+
+
+
+
+
+int ff_mp4_read_dec_config_descr(lives_clip_data_t *cdata, AVFormatContext *fc, AVStream *st, uint8_t *p) {
+  int len, tag;
+  int object_type_id = lives_r8(p);
+  p++;
+  lives_r8(p); /* stream type */
+  p++;
+  lives_rb24(p); /* buffer size db */
+  p+=3;
+  lives_rb32(p); /* max bitrate */
+  p+=4;
+  lives_rb32(p); /* avg bitrate */
+  p+=4;
+
+  st->codec->codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id);
+  //fprintf(stderr, "esds object type id 0x%02x\n", object_type_id);
+
+  len = ff_mp4_read_descr(cdata, fc, p, &tag);
+
+  if (tag == MP4DecSpecificDescrTag) {
+    //av_dlog(fc, "Specific MPEG4 header len=%d\n", len);
+    if (!len || (uint64_t)len > (1<<30))
+      return -1;
+    av_free(st->codec->extradata);
+    st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!st->codec->extradata)
+      return AVERROR(ENOMEM);
+    memcpy(st->codec->extradata, p, len);
+    st->codec->extradata_size = len;
+    
+    // audio
+    
+  }
+  return 0;
+}
+
+
+static void update_offsets(int fd, int64_t *off, int *len) {
+  int64_t new_off = lseek(fd,0,SEEK_CUR);
+  (*len) -= new_off - *off;
+  *off = new_off;
+}
+
+static int parse_mp4_descr(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len, int target_tag);
+
+
+static int parse_mp4_descr_arr(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len) {
+  while (len > 0) {
+    if (parse_mp4_descr(cdata, d, off, len, 0) < 0)
+      return -1;
+    update_offsets(d->fd, &off, &len);
+  }
+  return 0;
+}
+
+static int parse_MP4IODescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len) {
+  lives_rbf16(cdata,d->fd); // ID
+  lives_rf8(cdata,d->fd);
+  lives_rf8(cdata,d->fd);
+  lives_rf8(cdata,d->fd);
+  lives_rf8(cdata,d->fd);
+  lives_rf8(cdata,d->fd);
+  update_offsets(d->fd, &off, &len);
+  return parse_mp4_descr_arr(cdata, d, off, len);
+}
+
+
+static int parse_MP4ODescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len) {
+  int id_flags;
+  if (len < 2)
+    return 0;
+  id_flags = lives_rbf16(cdata,d->fd);
+  if (!(id_flags & 0x0020)) { //URL_Flag
+    update_offsets(d->fd, &off, &len);
+    return parse_mp4_descr_arr(cdata, d, off, len); //ES_Descriptor[]
+  } else {
+    return 0;
+  }
+}
+
+static int parse_MP4ESDescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len) {
+  int es_id = 0;
+  if (d->descr_count >= d->max_descr_count)
+    return -1;
+  ff_mp4_parse_es_descr(cdata, d->fd, &es_id);
+  d->active_descr = d->descr + (d->descr_count++);
+  
+  d->active_descr->es_id = es_id;
+  update_offsets(d->fd, &off, &len);
+  parse_mp4_descr(cdata, d, off, len, MP4DecConfigDescrTag);
+  update_offsets(d->fd, &off, &len);
+  if (len > 0)
+    parse_mp4_descr(cdata, d, off, len, MP4SLDescrTag);
+  d->active_descr = NULL;
+  return 0;
+}
+
+static int parse_MP4DecConfigDescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len) {
+  Mp4Descr *descr = d->active_descr;
+  if (!descr)
+    return -1;
+  d->active_descr->dec_config_descr = av_malloc(len);
+  if (!descr->dec_config_descr)
+    return AVERROR(ENOMEM);
+  descr->dec_config_descr_len = len;
+
+  lives_read(cdata, d->fd, descr->dec_config_descr, len);
+
+  return 0;
+}
+
+static int parse_MP4SLDescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len)
+{
+  Mp4Descr *descr = d->active_descr;
+  int predefined;
+  if (!descr)
+    return -1;
+
+  predefined = lives_rf8(cdata,d->fd);
+  if (!predefined) {
+    int lengths;
+    int flags = lives_rf8(cdata,d->fd);
+    descr->sl.use_au_start       = !!(flags & 0x80);
+    descr->sl.use_au_end         = !!(flags & 0x40);
+    descr->sl.use_rand_acc_pt    = !!(flags & 0x20);
+    descr->sl.use_padding        = !!(flags & 0x08);
+    descr->sl.use_timestamps     = !!(flags & 0x04);
+    descr->sl.use_idle           = !!(flags & 0x02);
+    descr->sl.timestamp_res      = lives_rbf32(cdata,d->fd);
+    lives_rbf32(cdata,d->fd);
+    descr->sl.timestamp_len      = lives_rf8(cdata,d->fd);
+    descr->sl.ocr_len            = lives_rf8(cdata,d->fd);
+    descr->sl.au_len             = lives_rf8(cdata,d->fd);
+    descr->sl.inst_bitrate_len   = lives_rf8(cdata,d->fd);
+    lengths                      = lives_rbf16(cdata,d->fd);
+    descr->sl.degr_prior_len     = lengths >> 12;
+    descr->sl.au_seq_num_len     = (lengths >> 7) & 0x1f;
+    descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f;
+  } //else {
+    
+    //av_log_missing_feature(d->s, "Predefined SLConfigDescriptor\n", 0);
+  //}
+  return 0;
+}
+
+
+
+
+
+static int parse_mp4_descr(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len,
+                           int target_tag) {
+  int tag;
+
+  int len1 = ff_mp4_read_descrf(cdata, d->s, d->fd, &tag);
+
+  update_offsets(d->fd, &off, &len);
+  if (len < 0 || len1 > len || len1 <= 0) {
+    fprintf(stderr, "mpegts_decoder: Tag %x length violation new length %d bytes remaining %d\n", tag, len1, len);
+    return -1;
+  }
+
+  if (d->level++ >= MAX_LEVEL) {
+    fprintf(stderr, "mpegts_decoder: Maximum MP4 descriptor level exceeded\n");
+    goto done;
+  }
+  
+  if (target_tag && tag != target_tag) {
+    fprintf(stderr, "mpegts_decoder: Found tag %x expected %x\n", tag, target_tag);
+    goto done;
+  }
+  
+  switch (tag) {
+  case MP4IODescrTag:
+    parse_MP4IODescrTag(cdata, d, off, len1);
+    break;
+  case MP4ODescrTag:
+    parse_MP4ODescrTag(cdata, d, off, len1);
+    break;
+  case MP4ESDescrTag:
+    parse_MP4ESDescrTag(cdata, d, off, len1);
+    break;
+  case MP4DecConfigDescrTag:
+    parse_MP4DecConfigDescrTag(cdata, d, off, len1);
+    break;
+  case MP4SLDescrTag:
+    parse_MP4SLDescrTag(cdata, d, off, len1);
+    break;
+  }
+
+ done:
+  d->level--;
+  lives_seek(cdata, d->fd, off + len1);
+  return 0;
+}
+
+
+
+static int mp4_read_iods(lives_clip_data_t *cdata, AVFormatContext *s, const uint8_t *buf, unsigned size,
+                         Mp4Descr *descr, int *descr_count, int max_descr_count)
+{
+  MP4DescrParseContext d;
+  if (init_MP4DescrParseContext(cdata, &d, s, buf, size, descr, max_descr_count) < 0)
+    return -1;
+
+  parse_mp4_descr(cdata, &d, lseek(d.fd,0,SEEK_CUR), size, MP4IODescrTag);
+
+  *descr_count = d.descr_count;
+
+  close(d.fd);
+
+  return 0;
+}
+
+static int mp4_read_od(lives_clip_data_t *cdata, AVFormatContext *s, const uint8_t *buf, unsigned size,
+                       Mp4Descr *descr, int *descr_count, int max_descr_count)
+{
+  MP4DescrParseContext d;
+  if (init_MP4DescrParseContext(cdata, &d, s, buf, size, descr, max_descr_count) < 0)
+    return -1;
+
+  parse_mp4_descr_arr(cdata, &d, lseek(d.fd,0,SEEK_CUR), size);
+
+  *descr_count = d.descr_count;
+
+  close(d.fd);
+
+  return 0;
+}
+
+static void m4sl_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len) {
+  MpegTSContext *ts = filter->u.section_filter.opaque;
+  SectionHeader h;
+  const uint8_t *p, *p_end;
+  Mp4Descr mp4_descr[MAX_MP4_DESCR_COUNT] = {{ 0 }};
+  int mp4_descr_count = 0;
+  int i, pid;
+  AVFormatContext *s = ts->stream;
+  
+  p_end = section + section_len - 4;
+  p = section;
+  if (parse_section_header(&h, &p, p_end) < 0)
+    return;
+  if (h.tid != M4OD_TID)
+    return;
+  
+  mp4_read_od(cdata, s, p, (unsigned)(p_end - p), mp4_descr, &mp4_descr_count, MAX_MP4_DESCR_COUNT);
+  
+  for (pid = 0; pid < NB_PID_MAX; pid++) {
+    if (!ts->pids[pid])
+      continue;
+    for (i = 0; i < mp4_descr_count; i++) {
+      PESContext *pes;
+      AVStream *st;
+      if (ts->pids[pid]->es_id != mp4_descr[i].es_id)
+	continue;
+      if (!(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES)) {
+	//av_log(s, AV_LOG_ERROR, "pid %x is not PES\n", pid);
+	continue;
+      }
+      pes = ts->pids[pid]->u.pes_filter.opaque;
+      st = pes->st;
+      if (!st) {
+	continue;
+      }
+      
+      pes->sl = mp4_descr[i].sl;
+
+      ff_mp4_read_dec_config_descr(cdata, s, st, mp4_descr[i].dec_config_descr);
+
+      if (st->codec->codec_id == CODEC_ID_AAC &&
+	  st->codec->extradata_size > 0)
+	st->need_parsing = 0;
+      if (st->codec->codec_id == CODEC_ID_H264 &&
+	  st->codec->extradata_size > 0)
+	st->need_parsing = 0;
+
+      if (st->codec->codec_id <= CODEC_ID_NONE) {
+      } else if (st->codec->codec_id < CODEC_ID_FIRST_AUDIO) {
+	st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+      } else if (st->codec->codec_id < CODEC_ID_FIRST_SUBTITLE) {
+	st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+      } else if (st->codec->codec_id < CODEC_ID_FIRST_UNKNOWN) {
+	st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+      }
+    }
+  }
+  for (i = 0; i < mp4_descr_count; i++)
+    av_free(mp4_descr[i].dec_config_descr);
+}
+
+
+
+
+int ff_parse_mpeg2_descriptor(lives_clip_data_t *cdata, AVFormatContext *fc, AVStream *st, int stream_type,
+                              const uint8_t **pp, const uint8_t *desc_list_end,
+                              Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
+                              MpegTSContext *ts)
+{
+  const uint8_t *desc_end;
+  int desc_len, desc_tag, desc_es_id;
+  char language[252];
+  int i;
+
+  desc_tag = get8(pp, desc_list_end);
+  if (desc_tag < 0)
+    return -1;
+  desc_len = get8(pp, desc_list_end);
+  if (desc_len < 0)
+    return -1;
+  desc_end = *pp + desc_len;
+  if (desc_end > desc_list_end)
+    return -1;
+
+  //fprintf(stderr, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
+
+  if (st->codec->codec_id == CODEC_ID_NONE &&
+      stream_type == STREAM_TYPE_PRIVATE_DATA)
+    mpegts_find_stream_type(st, desc_tag, DESC_types);
+
+  switch(desc_tag) {
+  case 0x1E: /* SL descriptor */
+    desc_es_id = get16(pp, desc_end);
+    if (ts && ts->pids[pid])
+      ts->pids[pid]->es_id = desc_es_id;
+    for (i = 0; i < mp4_descr_count; i++)
+      if (mp4_descr[i].dec_config_descr_len &&
+	  mp4_descr[i].es_id == desc_es_id) {
+ 
+	ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr[i].dec_config_descr);
+ 
+	if (st->codec->codec_id == CODEC_ID_AAC &&
+	    st->codec->extradata_size > 0)
+	  st->need_parsing = 0;
+	if (st->codec->codec_id == CODEC_ID_MPEG4SYSTEMS)
+	  mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1);
+      }
+    break;
+  case 0x1F: /* FMC descriptor */
+    get16(pp, desc_end);
+    if (mp4_descr_count > 0 && (st->codec->codec_id == CODEC_ID_AAC_LATM) &&
+	mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) {
+      ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr->dec_config_descr);
+      if (st->codec->codec_id == CODEC_ID_AAC &&
+	  st->codec->extradata_size > 0){
+	st->need_parsing = 0;
+	st->codec->codec_type= AVMEDIA_TYPE_AUDIO;
+      }
+    }
+    break;
+  case 0x56: /* DVB teletext descriptor */
+    language[0] = get8(pp, desc_end);
+    language[1] = get8(pp, desc_end);
+    language[2] = get8(pp, desc_end);
+    language[3] = 0;
+    av_dict_set(&st->metadata, "language", language, 0);
+    break;
+  case 0x59: /* subtitling descriptor */
+    language[0] = get8(pp, desc_end);
+    language[1] = get8(pp, desc_end);
+    language[2] = get8(pp, desc_end);
+    language[3] = 0;
+    /* hearing impaired subtitles detection */
+    switch(get8(pp, desc_end)) {
+    case 0x20: /* DVB subtitles (for the hard of hearing) with no monitor aspect ratio criticality */
+    case 0x21: /* DVB subtitles (for the hard of hearing) for display on 4:3 aspect ratio monitor */
+    case 0x22: /* DVB subtitles (for the hard of hearing) for display on 16:9 aspect ratio monitor */
+    case 0x23: /* DVB subtitles (for the hard of hearing) for display on 2.21:1 aspect ratio monitor */
+    case 0x24: /* DVB subtitles (for the hard of hearing) for display on a high definition monitor */
+    case 0x25: /* DVB subtitles (for the hard of hearing) with plano-stereoscopic disparity for display on a high definition monitor */
+      st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED;
+      break;
+    }
+    if (st->codec->extradata) {
+      //if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4))
+      //av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
+      //} else {
+      st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
+      if (st->codec->extradata) {
+	st->codec->extradata_size = 4;
+	memcpy(st->codec->extradata, *pp, 4);
+      }
+    }
+    *pp += 4;
+    av_dict_set(&st->metadata, "language", language, 0);
+    break;
+  case 0x0a: /* ISO 639 language descriptor */
+    for (i = 0; i + 4 <= desc_len; i += 4) {
+      language[i + 0] = get8(pp, desc_end);
+      language[i + 1] = get8(pp, desc_end);
+      language[i + 2] = get8(pp, desc_end);
+      language[i + 3] = ',';
+      switch (get8(pp, desc_end)) {
+      case 0x01: st->disposition |= AV_DISPOSITION_CLEAN_EFFECTS; break;
+      case 0x02: st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED; break;
+      case 0x03: st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED; break;
+      }
+    }
+    if (i) {
+      language[i - 1] = 0;
+      av_dict_set(&st->metadata, "language", language, 0);
+    }
+    break;
+  case 0x05: /* registration descriptor */
+    st->codec->codec_tag = lives_rl32((const char *)*pp);
+    *pp+=4;
+    //av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
+    if (st->codec->codec_id == CODEC_ID_NONE &&
+	stream_type == STREAM_TYPE_PRIVATE_DATA)
+      mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
+    break;
+  case 0x52: /* stream identifier descriptor */
+    //    st->stream_identifier = 1 + get8(pp, desc_end);
+    break;
+  default:
+    break;
+  }
+  *pp = desc_end;
+  return 0;
+}
+
+
+void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx) {
+  int i, j;
+  AVProgram *program=NULL;
+  void *tmp;
+  
+  if (idx >= ac->nb_streams) {
+    fprintf(stderr, "mpegts_decoder: stream index %d is not valid\n", idx);
+    return;
+  }
+
+  for(i=0; i<ac->nb_programs; i++){
+    if(ac->programs[i]->id != progid)
+      continue;
+    program = ac->programs[i];
+    for(j=0; j<program->nb_stream_indexes; j++)
+      if(program->stream_index[j] == idx)
+	return;
+    
+    tmp = av_realloc(program->stream_index, sizeof(unsigned int)*(program->nb_stream_indexes+1));
+    if(!tmp)
+      return;
+    program->stream_index = tmp;
+    program->stream_index[program->nb_stream_indexes++] = idx;
+    return;
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+static void pmt_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len) {
+  MpegTSContext *ts = filter->u.section_filter.opaque;
+  SectionHeader h1, *h = &h1;
+  PESContext *pes;
+  AVStream *st;
+  const uint8_t *p, *p_end, *desc_list_end;
+  int program_info_length, pcr_pid, pid, stream_type;
+  int desc_list_len;
+  uint32_t prog_reg_desc = 0; /* registration descriptor */
+  
+  Mp4Descr mp4_descr[MAX_MP4_DESCR_COUNT] = {{ 0 }};
+  int mp4_descr_count = 0;
+  int i;
+
+  //fprintf(stderr, "PMT: len %i\n", section_len);
+  //hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+  
+  p_end = section + section_len - 4;
+  p = section;
+  if (parse_section_header(h, &p, p_end) < 0)
+    return;
+  
+  // av_dlog(ts->stream, "sid=0x%x sec_num=%d/%d\n",
+  //	  h->id, h->sec_num, h->last_sec_num);
+  
+  if (h->tid != PMT_TID)
+    return;
+  
+  clear_program(ts, h->id);
+  pcr_pid = get16(&p, p_end) & 0x1fff;
+  if (pcr_pid < 0)
+    return;
+  add_pid_to_pmt(ts, h->id, pcr_pid);
+  set_pcr_pid(ts->stream, h->id, pcr_pid);
+  
+  // av_dlog(ts->stream, "pcr_pid=0x%x\n", pcr_pid);
+  
+  program_info_length = get16(&p, p_end) & 0xfff;
+  if (program_info_length < 0)
+    return;
+  while(program_info_length >= 2) {
+    uint8_t tag, len;
+    tag = get8(&p, p_end);
+    len = get8(&p, p_end);
+    
+    //av_dlog(ts->stream, "program tag: 0x%02x len=%d\n", tag, len);
+    
+    if(len > program_info_length - 2)
+      //something else is broken, exit the program_descriptors_loop
+      break;
+    program_info_length -= len + 2;
+    if (tag == 0x1d) { // IOD descriptor
+      get8(&p, p_end); // scope
+      get8(&p, p_end); // label
+      len -= 2;
+      mp4_read_iods(cdata, ts->stream, p, len, mp4_descr + mp4_descr_count,
+		    &mp4_descr_count, MAX_MP4_DESCR_COUNT);
+    } else if (tag == 0x05 && len >= 4) { // registration descriptor
+      prog_reg_desc = lives_rl32((const char *)p);
+      p+=4;
+      len -= 4;
+    }
+    p += len;
+  }
+  p += program_info_length;
+  if (p >= p_end)
+    goto out;
+  
+  // stop parsing after pmt, we found header
+  if (!ts->stream->nb_streams)
+    ts->stop_parse = 2;
+  
+  for(;;) {
+    st = 0;
+    pes = NULL;
+    stream_type = get8(&p, p_end);
+    if (stream_type < 0)
+      break;
+    pid = get16(&p, p_end) & 0x1fff;
+    if (pid < 0)
+      break;
+
+    /* now create stream */
+    if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) {
+      pes = ts->pids[pid]->u.pes_filter.opaque;
+      if (!pes->st) {
+	pes->st = av_new_stream(pes->stream, pes->pid);
+	pes->st->id = pes->pid;
+      }
+      st = pes->st;
+    } else if (stream_type != 0x13) {
+      if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably
+      pes = add_pes_stream(ts, pid, pcr_pid);
+      if (pes) {
+	st = av_new_stream(pes->stream, pes->pid);
+	st->id = pes->pid;
+      }
+    } else {
+      int idx = ff_find_stream_index(ts->stream, pid);
+      if (idx >= 0) {
+	st = ts->stream->streams[idx];
+      } else {
+	st = av_new_stream(pes->stream, pid);
+	st->id = pid;
+	st->codec->codec_type = AVMEDIA_TYPE_DATA;
+      }
+    }
+
+    if (!st)
+      goto out;
+
+    if (pes && !pes->stream_type)
+      mpegts_set_stream_info(cdata, st, pes, stream_type, prog_reg_desc);
+
+    add_pid_to_pmt(ts, h->id, pid);
+
+    ff_program_add_stream_index(ts->stream, h->id, st->index);
+
+    desc_list_len = get16(&p, p_end) & 0xfff;
+    if (desc_list_len < 0)
+      break;
+    desc_list_end = p + desc_list_len;
+    if (desc_list_end > p_end)
+      break;
+    for(;;) {
+      if (ff_parse_mpeg2_descriptor(cdata, ts->stream, st, stream_type, &p, desc_list_end,
+				    mp4_descr, mp4_descr_count, pid, ts) < 0)
+	break;
+
+      if (pes && prog_reg_desc == lives_rl32("HDMV") && stream_type == 0x83 && pes->sub_st) {
+	ff_program_add_stream_index(ts->stream, h->id, pes->sub_st->index);
+	pes->sub_st->codec->codec_tag = st->codec->codec_tag;
+      }
+    }
+    p = desc_list_end;
+  }
+
+ out:
+  for (i = 0; i < mp4_descr_count; i++)
+    av_free(mp4_descr[i].dec_config_descr);
+}
+
+static void pat_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len)
+{
+  MpegTSContext *ts = filter->u.section_filter.opaque;
+  SectionHeader h1, *h = &h1;
+  const uint8_t *p, *p_end;
+  int sid, pmt_pid;
+  //  AVProgram *program;
+
+  //fprintf(stderr, "PAT:\n");
+  //hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+
+  p_end = section + section_len - 4;
+  p = section;
+  if (parse_section_header(h, &p, p_end) < 0)
+    return;
+  if (h->tid != PAT_TID)
+    return;
+
+  //  ts->stream->ts_id = h->id;
+
+  clear_programs(ts);
+  for(;;) {
+    sid = get16(&p, p_end);
+    if (sid < 0)
+      break;
+    pmt_pid = get16(&p, p_end) & 0x1fff;
+    if (pmt_pid < 0)
+      break;
+
+    //av_dlog(ts->stream, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
+
+    if (sid == 0x0000) {
+      /* NIT info */
+    } else {
+      //      program = av_new_program(ts->stream, sid);
+      //      program->program_num = sid;
+      //program->pmt_pid = pmt_pid;
+      if (ts->pids[pmt_pid])
+	mpegts_close_filter(ts, ts->pids[pmt_pid]);
+      mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
+      add_pat_entry(ts, sid);
+      add_pid_to_pmt(ts, sid, 0); //add pat pid to program
+      add_pid_to_pmt(ts, sid, pmt_pid);
+    }
+  }
+}
+
+static void sdt_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len)
+{
+  MpegTSContext *ts = filter->u.section_filter.opaque;
+  SectionHeader h1, *h = &h1;
+  const uint8_t *p, *p_end, *desc_list_end, *desc_end;
+  int onid, val, sid, desc_list_len, desc_tag, desc_len, service_type;
+  char *name, *provider_name;
+
+  //av_dlog(ts->stream, "SDT:\n");
+  //hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+
+  p_end = section + section_len - 4;
+  p = section;
+  if (parse_section_header(h, &p, p_end) < 0)
+    return;
+  if (h->tid != SDT_TID)
+    return;
+  onid = get16(&p, p_end);
+  if (onid < 0)
+    return;
+  val = get8(&p, p_end);
+  if (val < 0)
+    return;
+  for(;;) {
+    sid = get16(&p, p_end);
+    if (sid < 0)
+      break;
+    val = get8(&p, p_end);
+    if (val < 0)
+      break;
+    desc_list_len = get16(&p, p_end) & 0xfff;
+    if (desc_list_len < 0)
+      break;
+    desc_list_end = p + desc_list_len;
+    if (desc_list_end > p_end)
+      break;
+    for(;;) {
+      desc_tag = get8(&p, desc_list_end);
+      if (desc_tag < 0)
+	break;
+      desc_len = get8(&p, desc_list_end);
+      desc_end = p + desc_len;
+      if (desc_end > desc_list_end)
+	break;
+
+      //av_dlog(ts->stream, "tag: 0x%02x len=%d\n",
+      //      desc_tag, desc_len);
+
+      switch(desc_tag) {
+      case 0x48:
+	service_type = get8(&p, p_end);
+	if (service_type < 0)
+	  break;
+	provider_name = getstr8(&p, p_end);
+	if (!provider_name)
+	  break;
+	name = getstr8(&p, p_end);
+	if (name) {
+	  AVProgram *program = av_new_program(ts->stream, sid);
+	  if(program) {
+	    av_dict_set(&program->metadata, "service_name", name, 0);
+	    av_dict_set(&program->metadata, "service_provider", provider_name, 0);
+	  }
+	}
+	av_free(name);
+	av_free(provider_name);
+	break;
+      default:
+	break;
+      }
+      p = desc_end;
+    }
+    p = desc_list_end;
+  }
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+
+/* handle one TS packet */
+static int handle_packet(lives_clip_data_t *cdata, const uint8_t *packet) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  AVFormatContext *s=priv->s;
+  MpegTSContext *ts = s->priv_data;
+
+  MpegTSFilter *tss;
+  int len, pid, cc, expected_cc, cc_ok, afc, is_start, is_discontinuity,
+    has_adaptation, has_payload;
+  const uint8_t *p, *p_end;
+  int64_t pos;
+
+  PESContext *pes;
+  AVStream *st;
+
+  pid = lives_rb16(packet + 1) & 0x1fff;
+  if(pid && discard_pid(ts, pid))
+    return 0;
+  is_start = packet[1] & 0x40;
+  tss = ts->pids[pid];
+
+  // TODO - if tss is NULL,  most likely these are invalid after EOF frames - drop them
+
+  if (ts->auto_guess && tss == NULL && is_start) {
+    add_pes_stream(ts, pid, -1);
+    tss = ts->pids[pid];
+  }
+  if (!tss) {
+    return 0;
+  }
+
+
+  pes = tss->u.pes_filter.opaque;
+  st = pes->st;
+
+  if (priv->vidst!=NULL&&st!=priv->vidst) return 0;
+
+  afc = (packet[3] >> 4) & 3;
+  if (afc == 0) /* reserved value */
+    return 0;
+
+  has_adaptation = afc & 2;
+  has_payload = afc & 1;
+  is_discontinuity = has_adaptation
+    && packet[4] != 0 /* with length > 0 */
+    && (packet[5] & 0x80); /* and discontinuity indicated */
+  
+  /* continuity check (currently not used) */
+  cc = (packet[3] & 0xf);
+  expected_cc = has_payload ? (tss->last_cc + 1) & 0x0f : tss->last_cc;
+  cc_ok = pid == 0x1FFF // null packet PID
+    || is_discontinuity
+    || tss->last_cc < 0
+    || expected_cc == cc;
+  
+  tss->last_cc = cc;
+  if (!cc_ok) {
+    fprintf(stderr,
+	    "mpegts_decoder: Continuity check failed for pid %d expected %d got %d\n",
+	    pid, expected_cc, cc);
+    if(tss->type == MPEGTS_PES) {
+      //PESContext *pc = tss->u.pes_filter.opaque;
+      //pc->flags |= AV_PKT_FLAG_CORRUPT;
+    }
+  }
+
+  if (!has_payload)
+    return 0;
+
+  // skip stream packet
+  p = packet + 4;
+  if (has_adaptation) {
+    uint8_t xflags,spc;
+    if ((xflags=p[1])&4) { 
+      // get splice distance
+      size_t sploffs=1; // skip pcr
+      if (xflags & 8) sploffs+=48; // skip opcr
+
+      spc=p[sploffs];
+      if (spc==0) {
+	//fprintf (stderr,"XXX:  Keyframe ?");
+      }
+
+    }
+    /* skip adaptation field */
+    p += p[0] + 1;
+  }
+  /* if past the end of packet, ignore */
+  p_end = packet + TS_PACKET_SIZE;
+  if (p >= p_end)
+    return 0;
+  
+  pos = priv->input_position;
+  ts->pos47= pos % ts->raw_packet_size;
+
+
+  if (tss->type == MPEGTS_SECTION) {
+    if (is_start) {
+      /* pointer field present */
+      len = *p++;
+      if (p + len > p_end)
+	return 0;
+      if (len && cc_ok) {
+	/* write remaining section bytes */
+	write_section_data(cdata, s, tss,
+			   p, len, 0);
+	/* check whether filter has been closed */
+	if (!ts->pids[pid])
+	  return 0;
+      }
+      p += len;
+      if (p < p_end) {
+	write_section_data(cdata, s, tss,
+			   p, p_end - p, 1);
+      }
+    } else {
+      if (cc_ok) {
+	write_section_data(cdata, s, tss,
+			   p, p_end - p, 0);
+      }
+    }
+  } else {
+    int ret;
+    // Note: The position here points actually behind the current packet.
+    if ((ret = tss->u.pes_filter.pes_cb(cdata, tss, p, p_end - p, is_start,
+					pos - ts->raw_packet_size)) < 0)
+      return ret;
+  }
+ 
+  
+  return 0;
+}
+
+
+/* XXX: try to find a better synchro over several packets (use
+   get_packet_size() ?) */
+static int mpegts_resync(lives_clip_data_t *cdata) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  int pb=priv->fd;
+  int c, i;
+  
+  for(i = 0;i < MAX_RESYNC_SIZE; i++) {
+    c = lives_rf8(cdata,pb);
+    if (check_for_eof(cdata))
+      return -1;
+    if (c == 0x47) {
+      priv->input_position--;
+      lseek(pb, priv->input_position, SEEK_SET);
+      return 0;
+    }
+  }
+  fprintf(stderr, "mpegts_Decoder: max resync size reached, could not find sync byte\n");
+  /* no sync found */
+  return -1;
+}
+
+
+/* return -1 if error or EOF. Return 0 if OK. */
+static int read_packet(lives_clip_data_t *cdata, uint8_t *buf, int raw_packet_size) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  int pb = priv->fd;
+
+  int skip, len;
+
+  for(;;) {
+    len = read(pb, buf, TS_PACKET_SIZE);
+    if (len != TS_PACKET_SIZE) {
+      priv->input_position+=len;
+      return len < 0 ? len : -1;
+    }
+    priv->input_position+=len;
+
+
+    /* check packet sync byte */
+    if (buf[0] != 0x47) {
+      /* find a new packet start */
+      priv->input_position-=TS_PACKET_SIZE;
+      lseek(pb, priv->input_position, SEEK_SET);
+      if (mpegts_resync(cdata) < 0)
+	return -1;
+      else
+	continue;
+    } else {
+      skip = raw_packet_size - TS_PACKET_SIZE;
+      if (skip > 0) {
+	lives_seek(cdata, pb, priv->input_position+skip);
+      }
+      break;
+    }
+  }
+  return 0;
+}
+
+
+
+
+static int handle_packets(lives_clip_data_t *cdata, int nb_packets) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  AVFormatContext *s=priv->s;
+  MpegTSContext *ts = s->priv_data;
+
+  uint8_t packet[TS_PACKET_SIZE];
+  int packet_num, ret = 0;
+
+  if (priv->input_position != ts->last_pos) {
+    int i;
+#ifdef DEBUG
+    fprintf(stderr, "mpegts_decoder: Skipping after seek\n");
+#endif
+    /* seek detected, flush pes buffer */
+    for (i = 0; i < NB_PID_MAX; i++) {
+      if (ts->pids[i]) {
+
+	if (ts->pids[i]->type == MPEGTS_PES) {
+
+	  PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
+	  av_freep(&pes->buffer);
+	  pes->data_index = 0;
+	  pes->state = MPEGTS_SKIP; /* skip until pes header */
+	}
+	ts->pids[i]->last_cc = -1;
+      }
+    }
+  }
+
+  ts->stop_parse = 0;
+  packet_num = 0;
+  for(;;) {
+    packet_num++;
+    if ((nb_packets != 0 && packet_num >= nb_packets) ||
+	ts->stop_parse > 1) {
+      ret = -1;
+      break;
+    }
+    if (ts->stop_parse > 0)
+      break;
+    
+    ret = read_packet(cdata, packet, ts->raw_packet_size);
+    if (ret != 0)
+      break;
+
+    ret = handle_packet(cdata, packet);
+
+    if (ret != 0)
+      break;
+  }
+  ts->last_pos = priv->input_position;
+  return ret;
+}
+
+
+#define MPEGTS_PROBE_SIZE 16384
+
+static boolean lives_mpegts_probe(const lives_clip_data_t *cdata, unsigned char *p) {
+
+  const int size= MPEGTS_PROBE_SIZE;
+  int score, fec_score, dvhs_score;
+  int check_count= size / TS_FEC_PACKET_SIZE;
+#define CHECK_COUNT 10
+  
+  if (check_count < CHECK_COUNT) return FALSE;
+  
+  score      = analyze(p, TS_PACKET_SIZE     *check_count, TS_PACKET_SIZE     , NULL)*CHECK_COUNT/check_count;
+  dvhs_score = analyze(p, TS_DVHS_PACKET_SIZE*check_count, TS_DVHS_PACKET_SIZE, NULL)*CHECK_COUNT/check_count;
+  fec_score  = analyze(p, TS_FEC_PACKET_SIZE *check_count, TS_FEC_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
+  
+  if (score > fec_score && score > dvhs_score && score > 6) return TRUE;
+  else if (dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return TRUE;
+  else if (fec_score > 6) return TRUE;
+  else return FALSE;
+}
+
+
+/* return the 90kHz PCR and the extension for the 27MHz PCR. return
+   (-1) if not available */
+static int parse_pcr(int64_t *ppcr_high, int *ppcr_low, const uint8_t *packet) {
+  int afc, len, flags;
+  const uint8_t *p;
+  unsigned int v;
+  
+  afc = (packet[3] >> 4) & 3;
+  if (afc <= 1)
+    return -1;
+  p = packet + 4;
+  len = p[0];
+  p++;
+  if (len == 0)
+    return -1;
+  flags = *p++;
+  len--;
+  if (!(flags & 0x10))
+    return -1;
+  if (len < 6)
+    return -1;
+  v = lives_rb32(p);
+  *ppcr_high = ((int64_t)v << 1) | (p[4] >> 7);
+  *ppcr_low = ((p[4] & 1) << 8) | p[5];
+  return 0;
+}
+
+
+static int lives_mpegts_read_header(lives_clip_data_t *cdata) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  AVFormatContext *s=priv->s;
+  MpegTSContext *ts = s->priv_data;
+  int pb = priv->fd;
+  uint8_t buf[8*1024];
+  int len;
+  int64_t pos;
+  
+  /* read the first 8192 bytes to get packet size */
+  pos = priv->input_position;
+  len = read(pb, buf, sizeof(buf));
+
+  if (len != sizeof(buf)) {
+    if (len>0) priv->input_position+=len;
+    goto fail;
+  }
+
+  priv->input_position+=len;
+
+  ts->raw_packet_size = get_packet_size(buf, sizeof(buf));
+  if (ts->raw_packet_size <= 0) {
+    fprintf(stderr, "mpegts_decoder: Could not detect TS packet size, defaulting to non-FEC/DVHS\n");
+    ts->raw_packet_size = TS_PACKET_SIZE;
+  }
+
+  ts->stream = s;
+  ts->auto_guess = 0;
+
+  if (1) {//s->iformat == &ff_mpegts_demuxer) {
+    /* normal demux */
+
+    /* first do a scanning to get all the services */
+    /* NOTE: We attempt to seek on non-seekable files as well, as the
+     * probe buffer usually is big enough. Only warn if the seek failed
+     * on files where the seek should work. */
+    if (lseek(pb, pos, SEEK_SET) < 0)
+      fprintf(stderr, "mpegts_decoder: Unable to seek back to the start\n");
+    
+    mpegts_open_section_filter(ts, SDT_PID, sdt_cb, ts, 1);
+
+    mpegts_open_section_filter(ts, PAT_PID, pat_cb, ts, 1);
+
+    handle_packets(cdata, s->probesize / ts->raw_packet_size);
+    /* if could not find service, enable auto_guess */
+
+    ts->auto_guess = 1;
+    
+    //av_dlog(ts->stream, "tuning done\n");
+
+    s->ctx_flags |= AVFMTCTX_NOHEADER;
+  } else {
+    AVStream *st;
+    int pcr_pid, pid, nb_packets, nb_pcrs, ret, pcr_l;
+    int64_t pcrs[2], pcr_h;
+    int packet_count[2];
+    uint8_t packet[TS_PACKET_SIZE];
+    
+    /* only read packets */
+    
+    st = av_new_stream(s, 0);
+    if (!st)
+      goto fail;
+    av_set_pts_info(st, 60, 1, 27000000);
+    st->codec->codec_type = AVMEDIA_TYPE_DATA;
+    st->codec->codec_id = CODEC_ID_MPEG2TS;
+    
+    if (priv->vidst==NULL) {
+      priv->vidst=st;
+      //fprintf(stderr,"mpegts_decoder: got video stream\n");
+    }
+
+
+    /* we iterate until we find two PCRs to estimate the bitrate */
+    pcr_pid = -1;
+    nb_pcrs = 0;
+    nb_packets = 0;
+    for(;;) {
+      ret = read_packet(cdata, packet, ts->raw_packet_size);
+      if (ret < 0)
+	return -1;
+      pid = lives_rb16(packet + 1) & 0x1fff;
+      if ((pcr_pid == -1 || pcr_pid == pid) &&
+	  parse_pcr(&pcr_h, &pcr_l, packet) == 0) {
+	pcr_pid = pid;
+	packet_count[nb_pcrs] = nb_packets;
+	pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
+	nb_pcrs++;
+	if (nb_pcrs >= 2)
+	  break;
+      }
+      nb_packets++;
+    }
+    
+    /* NOTE1: the bitrate is computed without the FEC */
+    /* NOTE2: it is only the bitrate of the start of the stream */
+    ts->pcr_incr = (pcrs[1] - pcrs[0]) / (packet_count[1] - packet_count[0]);
+    ts->cur_pcr = pcrs[0] - ts->pcr_incr * packet_count[0];
+    s->bit_rate = (TS_PACKET_SIZE * 8) * 27e6 / ts->pcr_incr;
+    st->codec->bit_rate = s->bit_rate;
+    st->start_time = ts->cur_pcr;
+    //av_dlog(ts->stream, "start=%0.3f pcr=%0.3f incr=%d\n",
+    //	    st->start_time / 1000000.0, pcrs[0] / 27e6, ts->pcr_incr);
+  }
+  
+  lseek(pb, pos, SEEK_SET);
+  return 0;
+ fail:
+  return -1;
+}
+
+
+static boolean mpegts_read_packet(lives_clip_data_t *cdata, AVPacket *pkt) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  AVFormatContext *s=priv->s;
+  MpegTSContext *ts = s->priv_data;
+  int ret, i;
+  
+  ts->pkt = pkt;
+  ret = handle_packets(cdata, 0);
+  if (ret < 0) {
+    /* flush pes data left */
+    for (i = 0; i < NB_PID_MAX; i++) {
+      if (ts->pids[i] && ts->pids[i]->type == MPEGTS_PES) {
+	PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
+	if (pes->state == MPEGTS_PAYLOAD && pes->data_index > 0) {
+	  new_pes_packet(pes, pkt);
+	  pes->state = MPEGTS_SKIP;
+	  ret = 0;
+	  break;
+	}
+      }
+    }
+  }
+  
+  return ret;
+}
+
+
+
+static int mpegts_read_close(lives_clip_data_t *cdata) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  AVFormatContext *s=priv->s;
+
+  MpegTSContext *ts = s->priv_data;
+  int i;
+
+  clear_programs(ts);
+
+  for(i=0;i<NB_PID_MAX;i++)
+    if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);
+  
+  return 0;
+}
+
+
+
+/* XXX: suppress the packet queue */
+static void flush_packet_queue(AVFormatContext *s)
+{
+  AVPacketList *pktl;
+
+  for(;;) {
+    pktl = s->packet_buffer;
+    if (!pktl)
+      break;
+    s->packet_buffer = pktl->next;
+    av_free_packet(&pktl->pkt);
+    av_free(pktl);
+  }
+  while(s->raw_packet_buffer){
+    pktl = s->raw_packet_buffer;
+    s->raw_packet_buffer = pktl->next;
+    av_free_packet(&pktl->pkt);
+    av_free(pktl);
+  }
+  s->packet_buffer_end=
+    s->raw_packet_buffer_end= NULL;
+  s->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE;
+}
+
+
+
+
+
+/**
+ * Flush the frame reader.
+ */
+void ff_read_frame_flush(AVFormatContext *s)
+{
+  AVStream *st;
+  int i, j;
+
+  flush_packet_queue(s);
+
+  /* for each stream, reset read state */
+  for(i = 0; i < s->nb_streams; i++) {
+    st = s->streams[i];
+
+    if (st->parser) {
+      av_parser_close(st->parser);
+      st->parser = NULL;
+      //av_free_packet(&st->cur_pkt);
+    }
+    st->last_IP_pts = AV_NOPTS_VALUE;
+    if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = 0;
+    else                                st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
+    st->reference_dts = AV_NOPTS_VALUE;
+    /* fail safe */
+    //st->cur_ptr = NULL;
+    //st->cur_len = 0;
+
+    st->probe_packets = MAX_PROBE_PACKETS;
+
+    for(j=0; j<MAX_REORDER_DELAY+1; j++)
+      st->pts_buffer[j]= AV_NOPTS_VALUE;
+  }
+}
+
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////
+
+
+
+
+static int64_t dts_to_frame(const lives_clip_data_t *cdata, int64_t dts) {
+  // use ADJUSTED dts (subtract priv->start_dts from it)
+  return (int64_t)((double)dts/90000.*cdata->fps+.5);
+}
+
+static int64_t frame_to_dts(const lives_clip_data_t *cdata, int64_t frame) {
+  // returns UNADJUSTED dts : add priv->start_dts to it
+  return (int64_t)((double)frame*90000./cdata->fps+.5);
+}
+
+
+
+
+
+
+
+
+const char *module_check_init(void) {
+  avcodec_register_all();
+  av_log_set_level(0);
+  return NULL;
+}
+
+
+const char *version(void) {
+  return plugin_version;
+}
+
+
+
+static lives_clip_data_t *init_cdata (void) {
+  lives_mpegts_priv_t *priv;
+  lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
+
+  cdata->URI=NULL;
+  
+  cdata->priv=priv=malloc(sizeof(lives_mpegts_priv_t));
+
+  cdata->seek_flag=0;
+
+  priv->ctx=NULL;
+  priv->codec=NULL;
+  priv->picture=NULL;
+
+  priv->expect_eof=FALSE;
+
+  cdata->palettes=NULL;
+
+  cdata->interlace=LIVES_INTERLACE_NONE;
+
+  cdata->nframes=0;
+
+  //errval=0;
+  
+  return cdata;
+}
+
+static index_entry * mpegts_read_seek(const lives_clip_data_t *cdata, uint32_t timestamp) {
+  // use unadj timestamp
+
+  lives_mpegts_priv_t *priv=cdata->priv;
+
+  index_entry *idx;
+
+  if (!priv->idxhh) return NULL;
+
+  timestamp = FFMIN(timestamp, frame_to_dts(cdata,cdata->nframes));
+  timestamp = FFMAX(timestamp, priv->idxhh->dts);
+
+  idx=get_idx_for_pts(cdata,timestamp);
+
+  priv->input_position=idx->offs;
+  lseek(priv->fd,priv->input_position,SEEK_SET);
+
+  if (priv->avpkt.data!=NULL) {
+    free(priv->avpkt.data);
+    priv->avpkt.data=NULL;
+    priv->avpkt.size=0;
+  }
+
+  avcodec_flush_buffers (priv->ctx);
+
+  return idx;
+}
+
+
+
+
+
+static void detach_stream (lives_clip_data_t *cdata) {
+  // close the file, free the decoder
+  lives_mpegts_priv_t *priv=cdata->priv;
+
+  cdata->seek_flag=0;
+
+  if (priv->s) mpegts_read_close(cdata);
+
+  if (priv->ctx!=NULL) {
+    avcodec_close(priv->ctx);
+    av_free(priv->ctx);
+  }
+
+  if (priv->s!=NULL) {
+    av_free(priv->s);
+  }
+
+  if (priv->picture!=NULL) av_free(priv->picture);
+
+  priv->ctx=NULL;
+  priv->codec=NULL;
+  priv->picture=NULL;
+
+  if (priv->idxhh!=NULL) index_free(priv->idxhh);
+
+  priv->idxhh=NULL;
+  priv->idxht=NULL;
+
+  if (cdata->palettes!=NULL) free(cdata->palettes);
+
+  if (priv->avpkt.data!=NULL) {
+    free(priv->avpkt.data);
+    priv->avpkt.data=NULL;
+    priv->avpkt.size=0;
+  }
+
+  close(priv->fd);
+}
+
+static int64_t mpegts_load_index(lives_clip_data_t *cdata);
+
+int64_t get_last_video_dts(lives_clip_data_t *cdata) {
+  lives_mpegts_priv_t *priv=cdata->priv;
+  boolean got_picture=FALSE;
+  int len;
+  int64_t dts,last_dts=-1;
+  int64_t idxpos,idxpos_data=0;
+
+  // see if we have a file from previous open
+  if ((dts=mpegts_load_index(cdata))>0) return dts+priv->start_dts;
+
+  priv->input_position=priv->data_start;
+  lseek(priv->fd,priv->input_position,SEEK_SET);
+  avcodec_flush_buffers (priv->ctx);
+  mpegts_read_packet(cdata,&priv->avpkt);
+  priv->got_eof=FALSE;
+
+  idxpos=priv->input_position;
+
+  // get each packet and decode just the first frame
+
+  while (1) {
+    got_picture=FALSE;
+
+    while (!got_picture) {
+
+#if LIBAVCODEC_VERSION_MAJOR >= 52
+      len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
+#else 
+      len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+#endif
+
+      if (got_picture) {
+	idxpos_data=idxpos;
+	dts=priv->avpkt.dts-priv->start_dts;
+	lives_add_idx(cdata,idxpos,dts);
+	avcodec_flush_buffers (priv->ctx);
+	idxpos=priv->input_position;
+      }
+
+      if (len<0||len==priv->avpkt.size||got_picture) {
+	if (priv->avpkt.data!=NULL) {
+	  free(priv->avpkt.data);
+	  priv->avpkt.data=NULL;
+	  priv->avpkt.size=0;
+	}
+	if (priv->input_position==priv->filesize) goto vts_next;
+	mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
+	if (priv->got_eof) goto vts_next;
+      }
+
+    }
+  }
+
+ vts_next:
+
+  // rewind back to last pos, and decode up to end now
+
+  priv->input_position=idxpos_data;
+  lseek(priv->fd,priv->input_position,SEEK_SET);
+  priv->got_eof=FALSE;
+  avcodec_flush_buffers (priv->ctx);
+  mpegts_read_packet(cdata,&priv->avpkt);
+
+  while (1) {
+
+#if LIBAVCODEC_VERSION_MAJOR >= 52
+    len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
+#else 
+    len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+#endif
+
+    if (got_picture) last_dts=priv->avpkt.dts;
+
+    if (len==priv->avpkt.size) {
+      if (priv->avpkt.data!=NULL) {
+	free(priv->avpkt.data);
+	priv->avpkt.data=NULL;
+	priv->avpkt.size=0;
+      }
+      if (priv->input_position==priv->filesize) goto vts_done;
+      mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
+      if (priv->got_eof) goto vts_done;
+    }
+    
+  }
+
+ vts_done:
+
+  priv->got_eof=FALSE;
+  return last_dts;
+
+}
+
+
+
+static boolean attach_stream(lives_clip_data_t *cdata) {
+  // open the file and get a handle
+  lives_mpegts_priv_t *priv=cdata->priv;
+  unsigned char header[MPEGTS_PROBE_SIZE];
+  int64_t ldts,dts,pts;
+  double fps;
+
+  int len;
+
+  AVCodec *codec=NULL;
+  AVCodecContext *ctx;
+
+  boolean got_picture=FALSE;
+
+  struct stat sb;
+
+  //#define DEBUG
+#ifdef DEBUG
+  fprintf(stderr,"\n");
+#endif
+
+  priv->has_audio=priv->has_video=FALSE;
+  priv->vidst=NULL;
+  priv->vididx=-1;
+
+  priv->got_eof=FALSE;
+
+  if ((priv->fd=open(cdata->URI,O_RDONLY))==-1) {
+    fprintf(stderr, "mpegts_decoder: unable to open %s\n",cdata->URI);
+    return FALSE;
+  }
+
+#ifdef IS_MINGW
+  setmode(priv->fd,O_BINARY);
+#endif
+
+
+  fstat(priv->fd,&sb);
+  priv->filesize=sb.st_size;
+
+  if (read (priv->fd, header, MPEGTS_PROBE_SIZE) < MPEGTS_PROBE_SIZE) {
+    // for example, might be a directory
+#ifdef DEBUG
+    fprintf(stderr, "mpegts_decoder: unable to read header for %s\n",cdata->URI);
+#endif
+    close(priv->fd);
+    return FALSE;
+  }
+
+  priv->input_position+=MPEGTS_PROBE_SIZE;
+
+  if (!lives_mpegts_probe(cdata, header)) {
+#ifdef DEBUG
+    fprintf(stderr, "mpegts_decoder: unable to parse header for %s\n",cdata->URI);
+#endif
+    close(priv->fd);
+    return FALSE;
+  }
+  
+  priv->input_position=0;
+  lseek(priv->fd,priv->input_position,SEEK_SET);
+
+  cdata->fps=0.;
+  cdata->width=cdata->frame_width=cdata->height=cdata->frame_height=0;
+  cdata->offs_x=cdata->offs_y=0;
+
+  cdata->arate=0;
+  cdata->achans=0;
+  cdata->asamps=16;
+
+  cdata->sync_hint=SYNC_HINT_AUDIO_TRIM_START;
+
+  priv->idxhh=NULL;
+  priv->idxht=NULL;
+
+  sprintf(cdata->audio_name,"%s","");
+
+  priv->s = avformat_alloc_context();
+
+  priv->ts=malloc(sizeof( MpegTSContext));
+  memset(priv->ts,0,sizeof( MpegTSContext));
+
+  priv->ts->raw_packet_size = TS_PACKET_SIZE;
+  //ts->stream = s;
+  priv->ts->auto_guess = 1;
+  priv->s->priv_data = priv->ts;
+
+  av_init_packet(&priv->avpkt);
+  priv->avpkt.data=NULL;
+  priv->ctx=NULL;
+
+  if (lives_mpegts_read_header(cdata)) {
+    close(priv->fd);
+    return FALSE;
+  }
+
+  if (priv->vidst==NULL) {
+    fprintf(stderr, "mpegts_decoder: Got no video stream !\n");
+    detach_stream(cdata);
+    return FALSE;
+  }
+
+  cdata->seek_flag=LIVES_SEEK_FAST|LIVES_SEEK_NEEDS_CALCULATION;
+
+  cdata->offs_x=0;
+  cdata->offs_y=0;
+
+  priv->data_start=priv->input_position;
+
+  switch (priv->vidst->codec->codec_id) {
+  case CODEC_ID_DIRAC: sprintf(cdata->video_name,"%s","dirac"); break;
+  case CODEC_ID_H264: sprintf(cdata->video_name,"%s","h264"); break;
+  case CODEC_ID_MPEG1VIDEO: sprintf(cdata->video_name,"%s","mpeg1"); break;
+  case CODEC_ID_MPEG2VIDEO: sprintf(cdata->video_name,"%s","mpeg2"); break;
+  case CODEC_ID_MPEG4: sprintf(cdata->video_name,"%s","mpeg2"); break;
+  case CODEC_ID_VC1: sprintf(cdata->video_name,"%s","vc1"); break;
+  default: sprintf(cdata->video_name,"%s","unknown"); break;
+  }
+
+  //#define DEBUG
+#ifdef DEBUG
+  fprintf(stderr,"video type is %f %s %d x %d (%d x %d +%d +%d)\n",duration,cdata->video_name,
+	  cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
+#endif
+
+  codec = avcodec_find_decoder(priv->vidst->codec->codec_id);
+
+  if (!codec) {
+    if (strlen(cdata->video_name)>0) 
+      fprintf(stderr, "mpegts_decoder: Could not find avcodec codec for video type %s\n",cdata->video_name);
+    detach_stream(cdata);
+    return FALSE;
+  }
+
+  priv->ctx = ctx = avcodec_alloc_context();
+
+  if (avcodec_open(ctx, codec) < 0) {
+    fprintf(stderr, "mpegts_decoder: Could not open avcodec context\n");
+    detach_stream(cdata);
+    return FALSE;
+  }
+
+  priv->codec=codec;
+
+  if(codec->capabilities&CODEC_CAP_TRUNCATED)
+    ctx->flags|= CODEC_FLAG_TRUNCATED;
+
+  // re-scan with avcodec; priv->data_start holds video data start position
+
+  av_init_packet(&priv->avpkt);
+
+  priv->picture = avcodec_alloc_frame();
+
+  //mpegts_read_seek(cdata,0);
+
+  priv->input_position=priv->data_start;
+  lseek(priv->fd,priv->input_position,SEEK_SET);
+  avcodec_flush_buffers (priv->ctx);
+  mpegts_read_packet(cdata,&priv->avpkt);
+
+
+  while (!got_picture&&!priv->got_eof) {
+
+  
+#if LIBAVCODEC_VERSION_MAJOR >= 52
+    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
+#else 
+    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+#endif
+
+    if (len<0||len==priv->avpkt.size) {
+      if (priv->avpkt.data!=NULL) {
+	free(priv->avpkt.data);
+	priv->avpkt.data=NULL;
+	priv->avpkt.size=0;
+      }
+      mpegts_read_packet(cdata,&priv->avpkt);
+    }
+
+
+  }
+
+  if (!got_picture) {
+    fprintf(stderr,"mpegts_decoder: could not get picture.\n PLEASE SEND A PATCH FOR %s FORMAT.\n",cdata->video_name);
+    detach_stream(cdata);
+    return FALSE;
+  }
+
+  pts=priv->avpkt.pts;
+  dts=priv->avpkt.dts;
+
+  priv->start_dts=dts;
+
+  //fprintf(stderr,"got dts %ld pts %ld\n",dts,pts);
+
+  got_picture=0;
+
+  while (!got_picture&&!priv->got_eof) {
+
+#if LIBAVCODEC_VERSION_MAJOR >= 52
+    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
+#else 
+    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+#endif
+
+    if (len==priv->avpkt.size) {
+      if (priv->avpkt.data!=NULL) {
+	free(priv->avpkt.data);
+	priv->avpkt.data=NULL;
+	priv->avpkt.size=0;
+      }
+      mpegts_read_packet(cdata,&priv->avpkt);
+    }
+
+  }
+
+  if (got_picture) {
+    pts=priv->avpkt.pts-pts;
+    dts=priv->avpkt.dts-dts;
+    //fprintf(stderr,"got second picture %ld %ld\n",pts,dts);
+  }
+  else pts=dts=0;
+
+  if (priv->avpkt.data!=NULL) {
+    free(priv->avpkt.data);
+    priv->avpkt.data=NULL;
+    priv->avpkt.size=0;
+  }
+
+  cdata->YUV_clamping=WEED_YUV_CLAMPING_UNCLAMPED;
+  if (ctx->color_range==AVCOL_RANGE_MPEG) cdata->YUV_clamping=WEED_YUV_CLAMPING_CLAMPED;
+
+  cdata->YUV_sampling=WEED_YUV_SAMPLING_DEFAULT;
+  if (ctx->chroma_sample_location!=AVCHROMA_LOC_LEFT) cdata->YUV_sampling=WEED_YUV_SAMPLING_MPEG;
+
+  cdata->YUV_subspace=WEED_YUV_SUBSPACE_YCBCR;
+  if (ctx->colorspace==AVCOL_SPC_BT709) cdata->YUV_subspace=WEED_YUV_SUBSPACE_BT709;
+
+  cdata->palettes=(int *)malloc(2*sizeof(int));
+
+  cdata->palettes[0]=avi_pix_fmt_to_weed_palette(ctx->pix_fmt,
+						 &cdata->YUV_clamping);
+  cdata->palettes[1]=WEED_PALETTE_END;
+
+  if (cdata->palettes[0]==WEED_PALETTE_END) {
+    fprintf(stderr, "mpegts_decoder: Could not find a usable palette for (%d) %s\n",ctx->pix_fmt,cdata->URI);
+    detach_stream(cdata);
+    return FALSE;
+  }
+
+  cdata->current_palette=cdata->palettes[0];
+
+  // re-get fps, width, height, nframes - actually avcodec is pretty useless at getting this
+  // so we fall back on the values we obtained ourselves
+
+  if (cdata->width==0) cdata->width=ctx->width-cdata->offs_x*2;
+  if (cdata->height==0) cdata->height=ctx->height-cdata->offs_y*2;
+  
+  if (cdata->width*cdata->height==0) {
+    fprintf(stderr, "mpegts_decoder: invalid width and height (%d X %d)\n",cdata->width,cdata->height);
+    detach_stream(cdata);
+    return FALSE;
+  }
+  //#define DEBUG
+#ifdef DEBUG
+  fprintf(stderr,"using palette %d, size %d x %d\n",
+	  cdata->current_palette,cdata->width,cdata->height);
+#endif
+
+  cdata->par=(double)ctx->sample_aspect_ratio.num/(double)ctx->sample_aspect_ratio.den;
+  if (cdata->par==0.) cdata->par=1.;
+
+  if (ctx->time_base.den>0&&ctx->time_base.num>0) {
+    fps=(double)ctx->time_base.den/(double)ctx->time_base.num;
+    if (fps!=1000.) cdata->fps=fps;
+  }
+
+  if (cdata->fps==0.) {
+    if (pts!=0) cdata->fps=180000./(double)pts;
+    else if (dts!=0) cdata->fps=180000./(double)dts;
+  }
+
+#ifndef IS_MINGW
+
+  if (cdata->fps==0.||cdata->fps==1000.) {
+    // use mplayer to get fps if we can...it seems to have some magical way
+    char cmd[1024];
+    char tmpfname[32];
+    int ofd;
+
+    sprintf(tmpfname,"/tmp/mpegtsdec=XXXXXX");
+    ofd=mkstemp(tmpfname);
+    if (ofd!=-1) {
+      int res;
+      snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",
+	       cdata->URI,tmpfname);
+      
+      res=system(cmd);
+      
+      if (!res) {
+	char buffer[1024];
+	ssize_t bytes=read(ofd,buffer,1024);
+	memset(buffer+bytes,0,1);
+	if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
+	  cdata->fps=strtod (buffer+13,NULL);
+	}
+      }
+      close(ofd);
+      unlink(tmpfname);
+    }
+  }
+
+#endif
+
+  if (cdata->fps==0.||cdata->fps==1000.) {
+    // if mplayer fails, count the frames between index entries
+    //dts=calc_dts_delta(cdata);
+    //if (dts!=0) cdata->fps=1000./(double)dts;
+  }
+
+  if (cdata->fps==0.||cdata->fps==1000.) {
+    fprintf(stderr, "mpegts_decoder: invalid framerate %.4f (%d / %d)\n",
+	    cdata->fps,ctx->time_base.den,ctx->time_base.num);
+    detach_stream(cdata);
+    return FALSE;
+  }
+  
+  if (ctx->ticks_per_frame==2) {
+    // TODO - needs checking
+    cdata->fps/=2.;
+    cdata->interlace=LIVES_INTERLACE_BOTTOM_FIRST;
+  }
+
+  priv->last_frame=-1;
+
+  ldts=get_last_video_dts(cdata);
+
+  if (ldts==-1) {
+    fprintf(stderr, "mpegts_decoder: could not read last dts\n");
+    detach_stream(cdata);
+    return FALSE;
+  }
+
+  ldts-=priv->start_dts;
+  
+  cdata->nframes=dts_to_frame(cdata,ldts)+2;
+
+  // double check, sometimes we can be out by one or two frames
+  while (1) {
+    priv->expect_eof=TRUE;
+    priv->got_eof=FALSE;
+    get_frame(cdata,cdata->nframes-1,NULL,0,NULL);
+    if (!priv->got_eof) break;
+    cdata->nframes--;
+  }
+  priv->expect_eof=FALSE;
+
+
+#ifdef DEBUG
+  fprintf(stderr,"fps is %.4f %ld %ld %ld\n",cdata->fps,cdata->nframes,ldts,priv->start_dts);
+#endif
+
+  return TRUE;
+}
+
+
+
+
+
+
+lives_clip_data_t *get_clip_data(const char *URI, lives_clip_data_t *cdata) {
+  // the first time this is called, caller should pass NULL as the cdata
+  // subsequent calls to this should re-use the same cdata
+
+  // if the host wants a different current_clip, this must be called again with the same
+  // cdata as the second parameter
+
+  // value returned should be freed with clip_data_free() when no longer required
+
+  // should be thread-safe
+
+  lives_mpegts_priv_t *priv;
+
+  //errval=0;
+
+  if (cdata!=NULL&&cdata->current_clip>0) {
+    // currently we only support one clip per container
+
+    //clip_data_free(cdata);
+    return NULL;
+  }
+
+  if (cdata==NULL) {
+    cdata=init_cdata();
+  }
+
+  if (cdata->URI==NULL||strcmp(URI,cdata->URI)) {
+    if (cdata->URI!=NULL) {
+      detach_stream(cdata);
+      free(cdata->URI);
+    }
+    cdata->URI=strdup(URI);
+    if (!attach_stream(cdata)) {
+      free(cdata->URI);
+      cdata->URI=NULL;
+      //clip_data_free(cdata);
+      return NULL;
+    }
+    cdata->current_palette=cdata->palettes[0];
+    cdata->current_clip=0;
+  }
+
+  cdata->nclips=1;
+
+  ///////////////////////////////////////////////////////////
+
+  sprintf(cdata->container_name,"%s","mpegts");
+
+  // cdata->height was set when we attached the stream
+
+  if (cdata->frame_width==0||cdata->frame_width<cdata->width) cdata->frame_width=cdata->width;
+  else {
+    cdata->offs_x=(cdata->frame_width-cdata->width)/2;
+  }
+
+  if (cdata->frame_height==0||cdata->frame_height<cdata->height) cdata->frame_height=cdata->height;
+  else {
+    cdata->offs_y=(cdata->frame_height-cdata->height)/2;
+  }
+
+  cdata->frame_width=cdata->width+cdata->offs_x*2;
+  cdata->frame_height=cdata->height+cdata->offs_y*2;
+
+  priv=cdata->priv;
+
+  if (priv->ctx->width==cdata->frame_width) cdata->offs_x=0;
+  if (priv->ctx->height==cdata->frame_height) cdata->offs_y=0;
+
+  ////////////////////////////////////////////////////////////////////
+
+  cdata->asigned=TRUE;
+  cdata->ainterleaf=TRUE;
+
+  return cdata;
+}
+
+static size_t write_black_pixel(unsigned char *idst, int pal, int npixels, int y_black) {
+  unsigned char *dst=idst;
+  register int i;
+
+  for (i=0;i<npixels;i++) {
+    switch (pal) {
+    case WEED_PALETTE_RGBA32:
+    case WEED_PALETTE_BGRA32:
+      dst[0]=dst[1]=dst[2]=0;
+      dst[3]=255;
+      dst+=4;
+      break;
+    case WEED_PALETTE_ARGB32:
+      dst[1]=dst[2]=dst[3]=0;
+      dst[0]=255;
+      dst+=4;
+      break;
+    case WEED_PALETTE_UYVY8888:
+      dst[1]=dst[3]=y_black;
+      dst[0]=dst[2]=128;
+      dst+=4;
+      break;
+    case WEED_PALETTE_YUYV8888:
+      dst[0]=dst[2]=y_black;
+      dst[1]=dst[3]=128;
+      dst+=4;
+      break;
+    case WEED_PALETTE_YUV888:
+      dst[0]=y_black;
+      dst[1]=dst[2]=128;
+      dst+=3;
+      break;
+    case WEED_PALETTE_YUVA8888:
+      dst[0]=y_black;
+      dst[1]=dst[2]=128;
+      dst[3]=255;
+      dst+=4;
+      break;
+    case WEED_PALETTE_YUV411:
+      dst[0]=dst[3]=128;
+      dst[1]=dst[2]=dst[4]=dst[5]=y_black;
+      dst+=6;
+    default: break;
+    }
+  }
+  return idst-dst;
+}
+
+
+
+
+
+boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, int *rowstrides, int height, void **pixel_data) {
+  // seek to frame,
+  int len;
+  int64_t target_pts=frame_to_dts(cdata,tframe);
+  int64_t nextframe=0;
+  lives_mpegts_priv_t *priv=cdata->priv;
+  int xheight=cdata->frame_height,pal=cdata->current_palette,nplanes=1,dstwidth=cdata->width,psize=1;
+  int btop=cdata->offs_y,bbot=xheight-1-btop;
+  int bleft=cdata->offs_x,bright=cdata->frame_width-cdata->width-bleft;
+  int rescan_limit=16;  // pick some arbitrary value
+  int y_black=(cdata->YUV_clamping==WEED_YUV_CLAMPING_CLAMPED)?16:0;
+  boolean got_picture=FALSE;
+  unsigned char *dst,*src;//,flags;
+  unsigned char black[4]={0,0,0,255};
+  index_entry *idx;
+  register int i,p;
+
+
+  //#define DEBUG_KFRAMES
+#ifdef DEBUG_KFRAMES
+    fprintf(stderr,"vals %ld %ld\n",tframe,priv->last_frame);
+#endif
+
+    priv->got_eof=FALSE;
+
+    // calc frame width and height, including any border
+
+    if (pixel_data!=NULL) {
+      if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) {
+	nplanes=3;
+	black[0]=y_black;
+	black[1]=black[2]=128;
+      }
+      else if (pal==WEED_PALETTE_YUVA4444P) {
+	nplanes=4;
+	black[0]=y_black;
+	black[1]=black[2]=128;
+	black[3]=255;
+      }
+    
+      if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
+    
+      if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||
+	  pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||
+	  pal==WEED_PALETTE_YUVA8888) psize=4;
+    
+      if (pal==WEED_PALETTE_YUV411) psize=6;
+    
+      if (pal==WEED_PALETTE_A1) dstwidth>>=3;
+    
+      dstwidth*=psize;
+    
+      if (cdata->frame_height > cdata->height && height == cdata->height) {
+	// host ignores vertical border
+	btop=0;
+	xheight=cdata->height;
+	bbot=xheight-1;
+      }
+    
+      if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
+	// host ignores horizontal border
+	bleft=bright=0;
+      }
+    }
+    ////////////////////////////////////////////////////////////////////
+
+    if (tframe!=priv->last_frame) {
+
+      if (priv->last_frame==-1 || (tframe<priv->last_frame) || (tframe - priv->last_frame > rescan_limit)) {
+	idx=mpegts_read_seek(cdata,target_pts);
+
+	nextframe=dts_to_frame(cdata,idx->dts);
+
+	if (priv->input_position==priv->filesize) return FALSE;
+	mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
+	if (priv->got_eof) return FALSE;
+
+	//#define DEBUG_KFRAMES
+#ifdef DEBUG_KFRAMES
+	  if (idx!=NULL) printf("got kframe %ld for frame %ld\n",nextframe,tframe);
+#endif
+      }
+      else {
+	nextframe=priv->last_frame+1;
+      }
+
+      //priv->ctx->skip_frame=AVDISCARD_NONREF;
+
+      priv->last_frame=tframe;
+
+      // do this until we reach target frame //////////////
+
+      do {
+
+	got_picture=FALSE;
+
+	while (!got_picture) {
+
+#if LIBAVCODEC_VERSION_MAJOR >= 52
+	  len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
+#else 
+	  len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+#endif
+
+	  if (len==priv->avpkt.size) {
+	    if (priv->avpkt.data!=NULL) {
+	      free(priv->avpkt.data);
+	      priv->avpkt.data=NULL;
+	      priv->avpkt.size=0;
+	    }
+
+	    if (priv->input_position==priv->filesize) return FALSE;
+	    mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
+	    if (priv->got_eof) return FALSE;
+	
+	  }
+	}
+
+	nextframe++;
+	if (nextframe>cdata->nframes) return FALSE;
+      } while (nextframe<=tframe);
+
+      /////////////////////////////////////////////////////
+
+    }
+
+    if (pixel_data==NULL) return TRUE;
+
+    for (p=0;p<nplanes;p++) {
+      dst=pixel_data[p];
+      src=priv->picture->data[p];
+
+      for (i=0;i<xheight;i++) {
+	if (i<btop||i>bbot) {
+	  // top or bottom border, copy black row
+	  if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P
+	      ||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24
+	      ||pal==WEED_PALETTE_BGR24) {
+	    memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+	    dst+=dstwidth+(bleft+bright)*psize;
+	  }
+	  else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+	  continue;
+	}
+
+	if (bleft>0) {
+	  if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
+	      pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24
+	      ||pal==WEED_PALETTE_BGR24) {
+	    memset(dst,black[p],bleft*psize);
+	    dst+=bleft*psize;
+	  }
+	  else dst+=write_black_pixel(dst,pal,bleft,y_black);
+	}
+
+	memcpy(dst,src,dstwidth);
+	dst+=dstwidth;
+
+	if (bright>0) {
+	  if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P
+	      ||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||
+	      pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+	    memset(dst,black[p],bright*psize);
+	    dst+=bright*psize;
+	  }
+	  else dst+=write_black_pixel(dst,pal,bright,y_black);
+	}
+
+	src+=priv->picture->linesize[p];
+      }
+      if (p==0&&(pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P)) {
+	dstwidth>>=1;
+	bleft>>=1;
+	bright>>=1;
+      }
+      if (p==0&&(pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P)) {
+	xheight>>=1;
+	btop>>=1;
+	bbot>>=1;
+      }
+    }
+  
+    return TRUE;
+}
+
+#ifndef IS_MINGW
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+
+static void reverse_bytes(uint8_t *out, const uint8_t *in, size_t count) {
+  register int i;
+  for (i=0;i<count;i++) {
+    out[i]=in[count-i-1];
+  }
+}
+
+#endif 
+
+#endif
+
+static ssize_t lives_write_le(int fd, const void *buf, size_t count) {
+#ifndef IS_MINGW
+# if __BYTE_ORDER == __BIG_ENDIAN
+    uint8_t xbuf[count];
+    reverse_bytes(xbuf,(const uint8_t *)buf,count);
+    return write(fd,xbuf,count);
+# else
+    return write(fd,buf,count);
+# endif
+#else
+    return write(fd,buf,count);
+#endif
+
+}
+
+
+ssize_t lives_read_le(int fd, void *buf, size_t count) {
+#ifndef IS_MINGW
+# if __BYTE_ORDER == __BIG_ENDIAN
+    uint8_t xbuf[count];
+    ssize_t retval=read(fd,buf,count);
+    if (retval<count) return retval;
+    reverse_bytes((uint8_t *)buf,(const uint8_t *)xbuf,count);
+    return retval;
+#else
+    return read(fd,buf,count);
+#endif
+#else
+    return read(fd,buf,count);
+#endif
+}
+
+
+
+
+
+static void mpegts_save_index(lives_clip_data_t *cdata) {
+
+  lives_mpegts_priv_t *priv=cdata->priv;
+  index_entry *idx=priv->idxhh;
+
+  int fd;
+
+
+  int64_t max_dts=frame_to_dts(cdata,cdata->nframes);
+
+  const char ver[4]="V1.0";
+
+  if (idx==NULL) return;
+
+  if ((fd=open("sync_index",O_CREAT|O_TRUNC|O_WRONLY,S_IRUSR|S_IWUSR))==-1) return;
+
+  if (write(fd,ver,4)<4) goto donewr;
+  
+  if (lives_write_le(fd,&max_dts,8)<8) goto failwr;
+
+
+  // dump index to file in le format
+
+  while (idx!=NULL) {
+    if (lives_write_le(fd,&idx->dts,8)<8) goto failwr;
+    if (lives_write_le(fd,&idx->offs,8)<8) goto failwr;
+    idx=idx->next;
+  }
+
+ donewr:
+  close(fd);
+  return;
+
+ failwr:
+  close(fd);
+  unlink("sync_index");
+  return;
+
+}
+
+
+
+
+static int64_t mpegts_load_index(lives_clip_data_t *cdata) {
+  // returns max_dts
+  char hdr[4];
+
+  lives_mpegts_priv_t *priv=cdata->priv;
+
+  int64_t dts,last_dts=0,max_dts=0;
+  uint64_t offs,last_offs=0;
+
+  int fd;
+  int count=0;
+
+  ssize_t bytes;
+
+  if ((fd=open("sync_index",O_RDONLY))==-1) return 0;
+
+  if (read(fd,hdr,4)<4) goto donerd;
+
+  if (strncmp(hdr,"V1.0",4)) goto donerd;
+
+  bytes=lives_read_le(fd,&max_dts,8);
+  if (bytes<8) goto failrd;
+
+  if (max_dts<last_dts) goto failrd;
+
+  while (1) {
+    bytes=lives_read_le(fd,&dts,8);
+    if (bytes<8) break;
+
+    if (dts<last_dts) goto failrd;
+    if (dts>max_dts) goto failrd;
+
+    bytes=lives_read_le(fd,&offs,8);
+    if (bytes<8) break;
+
+    if (offs<last_offs) goto failrd;
+    if (offs>=priv->filesize) goto failrd;
+
+    lives_add_idx(cdata,offs,dts);
+
+    last_dts=dts;
+    last_offs=offs;
+
+    count++;
+  }
+
+ donerd:
+  close (fd);
+  return max_dts;
+
+ failrd:
+  if (priv->idxhh!=NULL) index_free(priv->idxhh);
+
+  priv->idxhh=NULL;
+  priv->idxht=NULL;
+
+  close (fd);
+  return 0;
+
+}
+
+
+void clip_data_free(lives_clip_data_t *cdata) {
+
+  if (cdata->URI!=NULL) {
+    mpegts_save_index(cdata);
+    detach_stream(cdata);
+    free(cdata->URI);
+  }
+
+  free(cdata->priv);
+  free(cdata);
+}
+
+
+void module_unload(void) {
+
+}
+

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.h Added

@@ -0,0 +1,374 @@
+/*
+ * MPEG2 transport stream defines
+ * Copyright (c) 2003 Fabrice Bellard
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIVES_MPEGTS_H
+#define LIVES_MPEGTS_H
+
+#define TS_FEC_PACKET_SIZE 204
+#define TS_DVHS_PACKET_SIZE 192
+#define TS_PACKET_SIZE 188
+#define TS_MAX_PACKET_SIZE 204
+
+#define NB_PID_MAX 8192
+#define MAX_SECTION_SIZE 4096
+
+/* pids */
+#define PAT_PID                 0x0000
+#define SDT_PID                 0x0011
+
+/* table ids */
+#define PAT_TID   0x00
+#define PMT_TID   0x02
+#define M4OD_TID  0x05
+#define SDT_TID   0x42
+
+#define STREAM_TYPE_VIDEO_MPEG1     0x01
+#define STREAM_TYPE_VIDEO_MPEG2     0x02
+#define STREAM_TYPE_AUDIO_MPEG1     0x03
+#define STREAM_TYPE_AUDIO_MPEG2     0x04
+#define STREAM_TYPE_PRIVATE_SECTION 0x05
+#define STREAM_TYPE_PRIVATE_DATA    0x06
+#define STREAM_TYPE_AUDIO_AAC       0x0f
+#define STREAM_TYPE_AUDIO_AAC_LATM  0x11
+#define STREAM_TYPE_VIDEO_MPEG4     0x10
+#define STREAM_TYPE_VIDEO_H264      0x1b
+#define STREAM_TYPE_VIDEO_VC1       0xea
+#define STREAM_TYPE_VIDEO_DIRAC     0xd1
+
+#define STREAM_TYPE_AUDIO_AC3       0x81
+#define STREAM_TYPE_AUDIO_DTS       0x8a
+
+typedef struct MpegTSContext MpegTSContext;
+
+MpegTSContext *ff_mpegts_parse_open(AVFormatContext *s);
+void ff_mpegts_parse_close(MpegTSContext *ts);
+
+int ff_mpegts_parse_packet(lives_clip_data_t *cdata, MpegTSContext *ts, AVPacket *pkt,
+			   const uint8_t *buf, int len);
+
+typedef struct {
+    int use_au_start;
+    int use_au_end;
+    int use_rand_acc_pt;
+    int use_padding;
+    int use_timestamps;
+    int use_idle;
+    int timestamp_res;
+    int timestamp_len;
+    int ocr_len;
+    int au_len;
+    int inst_bitrate_len;
+    int degr_prior_len;
+    int au_seq_num_len;
+    int packet_seq_num_len;
+} SLConfigDescr;
+
+typedef struct {
+    int es_id;
+    int dec_config_descr_len;
+    uint8_t *dec_config_descr;
+    SLConfigDescr sl;
+} Mp4Descr;
+
+/**
+ * Parse an MPEG-2 descriptor
+ * @param[in] fc                    Format context (used for logging only)
+ * @param st                        Stream
+ * @param stream_type               STREAM_TYPE_xxx
+ * @param pp                        Descriptor buffer pointer
+ * @param desc_list_end             End of buffer
+ * @param mp4_dec_config_descr_len  Length of 'mp4_dec_config_descr', or zero if not present
+ * @param mp4_es_id
+ * @param pid
+ * @param mp4_dec_config_descr
+ * @return <0 to stop processing
+ */
+int ff_parse_mpeg2_descriptor(lives_clip_data_t *cdata, AVFormatContext *fc, AVStream *st, int stream_type,
+                              const uint8_t **pp, const uint8_t *desc_list_end,
+                              Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
+                              MpegTSContext *ts);
+
+
+
+// get_bits.h
+
+
+
+#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)
+#   define ALT_BITSTREAM_READER
+#endif
+
+#if !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER)
+#   if ARCH_ARM && !HAVE_FAST_UNALIGNED
+#       define A32_BITSTREAM_READER
+#   else
+#       define ALT_BITSTREAM_READER
+//#define A32_BITSTREAM_READER
+#   endif
+#endif
+
+
+
+
+/* bit input */
+/* buffer, buffer_end and size_in_bits must be present and used by every reader */
+typedef struct GetBitContext {
+    const uint8_t *buffer, *buffer_end;
+#ifdef ALT_BITSTREAM_READER
+    int index;
+#elif defined A32_BITSTREAM_READER
+    uint32_t *buffer_ptr;
+    uint32_t cache0;
+    uint32_t cache1;
+    int bit_count;
+#endif
+    int size_in_bits;
+} GetBitContext;
+
+
+static uint16_t lives_rb32(const uint8_t *x);
+
+
+
+#ifdef ALT_BITSTREAM_READER
+#   define MIN_CACHE_BITS 25
+
+#   define OPEN_READER(name, gb)                \
+    unsigned int name##_index = (gb)->index;    \
+    av_unused unsigned int name##_cache
+
+#   define CLOSE_READER(name, gb) (gb)->index = name##_index
+
+# ifdef ALT_BITSTREAM_READER_LE
+#   define UPDATE_CACHE(name, gb) \
+    name##_cache = AV_RL32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) >> (name##_index&0x07)
+
+#   define SKIP_CACHE(name, gb, num) name##_cache >>= (num)
+# else
+#   define UPDATE_CACHE(name, gb) \
+    name##_cache = lives_rb32(((const uint8_t *)(gb)->buffer)+(name##_index>>3)) << (name##_index&0x07)
+
+#   define SKIP_CACHE(name, gb, num) name##_cache <<= (num)
+# endif
+
+// FIXME name?
+#   define SKIP_COUNTER(name, gb, num) name##_index += (num)
+
+#   define SKIP_BITS(name, gb, num) do {        \
+        SKIP_CACHE(name, gb, num);              \
+        SKIP_COUNTER(name, gb, num);            \
+    } while (0)
+
+#   define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
+#   define LAST_SKIP_CACHE(name, gb, num)
+
+# ifdef ALT_BITSTREAM_READER_LE
+#   define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
+
+#   define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
+# else
+#   define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache, num)
+
+#   define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache, num)
+# endif
+
+#   define GET_CACHE(name, gb) ((uint32_t)name##_cache)
+
+static inline int get_bits_count(const GetBitContext *s){
+    return s->index;
+}
+
+static inline void skip_bits_long(GetBitContext *s, int n){
+    s->index += n;
+}
+
+#elif defined A32_BITSTREAM_READER
+
+#   define MIN_CACHE_BITS 32
+
+#   define OPEN_READER(name, gb)                        \
+    int name##_bit_count        = (gb)->bit_count;      \
+    uint32_t name##_cache0      = (gb)->cache0;         \
+    uint32_t name##_cache1      = (gb)->cache1;         \
+    uint32_t *name##_buffer_ptr = (gb)->buffer_ptr
+
+#   define CLOSE_READER(name, gb) do {          \
+        (gb)->bit_count  = name##_bit_count;    \
+        (gb)->cache0     = name##_cache0;       \
+        (gb)->cache1     = name##_cache1;       \
+        (gb)->buffer_ptr = name##_buffer_ptr;   \
+    } while (0)
+
+#   define UPDATE_CACHE(name, gb) do {                                  \
+        if(name##_bit_count > 0){                                       \
+            const uint32_t next = av_be2ne32(*name##_buffer_ptr);       \
+            name##_cache0 |= NEG_USR32(next, name##_bit_count);         \
+            name##_cache1 |= next << name##_bit_count;                  \
+            name##_buffer_ptr++;                                        \
+            name##_bit_count -= 32;                                     \
+        }                                                               \
+    } while (0)
+
+#if ARCH_X86
+#   define SKIP_CACHE(name, gb, num)                            \
+    __asm__("shldl %2, %1, %0          \n\t"                    \
+            "shll  %2, %1              \n\t"                    \
+            : "+r" (name##_cache0), "+r" (name##_cache1)        \
+            : "Ic" ((uint8_t)(num)))
+#else
+#   define SKIP_CACHE(name, gb, num) do {               \
+        name##_cache0 <<= (num);                        \
+        name##_cache0 |= NEG_USR32(name##_cache1,num);  \
+        name##_cache1 <<= (num);                        \
+    } while (0)
+#endif
+
+#   define SKIP_COUNTER(name, gb, num) name##_bit_count += (num)
+
+#   define SKIP_BITS(name, gb, num) do {        \
+        SKIP_CACHE(name, gb, num);              \
+        SKIP_COUNTER(name, gb, num);            \
+    } while (0)
+
+#   define LAST_SKIP_BITS(name, gb, num)  SKIP_BITS(name, gb, num)
+#   define LAST_SKIP_CACHE(name, gb, num) SKIP_CACHE(name, gb, num)
+
+#   define SHOW_UBITS(name, gb, num) NEG_USR32(name##_cache0, num)
+
+#   define SHOW_SBITS(name, gb, num) NEG_SSR32(name##_cache0, num)
+
+#   define GET_CACHE(name, gb) name##_cache0
+
+
+
+#endif
+
+
+
+
+#ifndef NEG_SSR32
+#   define NEG_SSR32(a,s) ((( int32_t)(a))>>(32-(s)))
+#endif
+
+#ifndef NEG_USR32
+#   define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
+#endif
+
+
+
+
+
+#define MP4ODescrTag                    0x01
+#define MP4IODescrTag                   0x02
+#define MP4ESDescrTag                   0x03
+#define MP4DecConfigDescrTag            0x04
+#define MP4DecSpecificDescrTag          0x05
+#define MP4SLDescrTag                   0x06
+
+
+#define CODEC_ID_MPEG4SYSTEMS 0x20001
+
+/* http://www.mp4ra.org */
+/* ordered by muxing preference */
+const AVCodecTag ff_mp4_obj_type[] = {
+    { CODEC_ID_MOV_TEXT  , 0x08 },
+    { CODEC_ID_MPEG4     , 0x20 },
+    { CODEC_ID_H264      , 0x21 },
+    { CODEC_ID_AAC       , 0x40 },
+    { CODEC_ID_MP4ALS    , 0x40 }, /* 14496-3 ALS */
+    { CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
+    { CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
+    { CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */
+    { CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */
+    { CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */
+    { CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */
+    { CODEC_ID_AAC       , 0x66 }, /* MPEG2 AAC Main */
+    { CODEC_ID_AAC       , 0x67 }, /* MPEG2 AAC Low */
+    { CODEC_ID_AAC       , 0x68 }, /* MPEG2 AAC SSR */
+    { CODEC_ID_MP3       , 0x69 }, /* 13818-3 */
+    { CODEC_ID_MP2       , 0x69 }, /* 11172-3 */
+    { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
+    { CODEC_ID_MP3       , 0x6B }, /* 11172-3 */
+    { CODEC_ID_MJPEG     , 0x6C }, /* 10918-1 */
+    { CODEC_ID_PNG       , 0x6D },
+    { CODEC_ID_JPEG2000  , 0x6E }, /* 15444-1 */
+    { CODEC_ID_VC1       , 0xA3 },
+    { CODEC_ID_DIRAC     , 0xA4 },
+    { CODEC_ID_AC3       , 0xA5 },
+    { CODEC_ID_DTS       , 0xA9 }, /* mp4ra.org */
+    { CODEC_ID_VORBIS    , 0xDD }, /* non standard, gpac uses it */
+    { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
+    { CODEC_ID_QCELP     , 0xE1 },
+    { CODEC_ID_MPEG4SYSTEMS, 0x01 },
+    { CODEC_ID_MPEG4SYSTEMS, 0x02 },
+    { CODEC_ID_NONE      ,    0 },
+};
+
+
+#define CODEC_ID_FIRST_AUDIO 0x10000
+#define CODEC_ID_FIRST_SUBTITLE 0x17000
+#define CODEC_ID_FIRST_UNKNOWN 0x18000
+
+
+
+typedef struct _index_entry index_entry;
+
+struct _index_entry {
+  index_entry *next; ///< ptr to next entry
+  int64_t dts; ///< dts of keyframe
+  uint64_t offs;  ///< offset in file
+};
+
+
+typedef struct {
+  int fd;
+  boolean has_video;
+  boolean has_audio;
+  int vididx;
+  AVStream *vidst;
+  int64_t input_position;
+  int64_t data_start;
+  off_t filesize;
+
+  int64_t start_dts;
+
+  MpegTSContext *ts;
+
+  AVFormatContext *s;
+  AVCodec *codec;
+  AVCodecContext *ctx;
+  AVFrame *picture;
+  AVPacket avpkt;
+  int64_t last_frame; ///< last frame displayed
+
+  index_entry *idxhh;  ///< head of head list
+  index_entry *idxht; ///< tail of head list
+
+  boolean got_eof;
+  boolean expect_eof;
+} lives_mpegts_priv_t;
+
+
+
+
+
+
+
+
+
+#endif /* LIVES_MPEGTS_H */

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/Makefile.am -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/Makefile.am Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/blank_frames.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/blank_frames.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/blur.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/blur.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/brightness_change.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/brightness_change.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/charcoal.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/charcoal.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/colorize.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/colorize.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/colour_filter.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/colour_filter.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/colour_replace.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/colour_replace.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/contrast.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/contrast.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/cycle.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/cycle.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/deinterlace.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/deinterlace.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/despekle.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/despekle.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/dream.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/dream.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/edge_detect.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/edge_detect.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/emboss.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/emboss.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/enhance.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/enhance.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/fade_in_out.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/fade_in_out.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/flip.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/flip.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/flop.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/flop.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gamma_change.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gamma_change.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_blank_frames.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_blank_frames.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_clip_from_image.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_clip_from_image.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_coloured_frames.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_coloured_frames.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_text.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/gen_text.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/hue_change.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/hue_change.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/image_overlay.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/image_overlay.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/modulate.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/modulate.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/monochrome.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/monochrome.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/negate.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/negate.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/noisify.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/noisify.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/normalize.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/normalize.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/photo_still.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/photo_still.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/pixilate.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/pixilate.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/posterize.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/posterize.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/randomzoom.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/randomzoom.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/resize.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/resize.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/rotate.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/rotate.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/saturation_change.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/saturation_change.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/sepia.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/sepia.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/shift_horizontal.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/shift_horizontal.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/shift_vertical.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/shift_vertical.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/shrink_expand.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/shrink_expand.script Changed

@@ -30,7 +30,7 @@
 ffinal|Fina_l frame|num2|100.00|0.00|1000.00|
 xcen|_X Center|num0|-100000|0|100000|
 ycen|_Y Center|num0|-100000|0|100000|
-top|_Top|bool|0|1|
+top| _Top  |bool|0|1|
 left|L_eft|bool|0|1|
 middle|_Middle|bool|1|1|
 right|_Right|bool|0|1|
@@ -67,6 +67,9 @@
 
 # this is for resize_frame
 $resize_ext=".mgk2";
+$resize_prefix=$out_prefix;
+$input_ext=$img_ext;
+$input_prefix=$img_prefix;
 
 $factor=$width;
 if ($height>$width) {
@@ -76,7 +79,7 @@
 $rstep=($p1-$p0)/($end-$start)/100.;
 
 # make a background frame
-system("$convert_command -size $width!x$height! xc:$cstring blank$img_ext");
+system("$convert_command -size $width!x$height! xc:$cstring $img_prefix"."blank$img_ext");
 
 
 if ($p4) {
@@ -130,7 +133,7 @@
 	&resize_frame($name,$hsize,$vsize);
 
         # composite does not recognise -antialias
-        system("$composite_command -compose plus -dissolve 100 -geometry +$x!+$y! $name$resize_ext blank$img_ext $out >/dev/null 2>&1");
+        system("$composite_command -compose plus -dissolve 100 -geometry +$x!+$y! $resize_prefix$name$resize_ext $img_prefix"."blank$img_ext $out_prefix$out >/dev/null 2>&1");
 	unlink "$name$resize_ext";
     }
     else {
@@ -140,6 +143,9 @@
 else {
     if ($rscale>1.) {
        $resize_ext=$out_ext;
+       $resize_prefix=$out_prefix;
+       $input_ext=$img_ext;
+       $input_prefix=$img_prefix;
        &zoom_frame($name,$center_x,$center_y,$width,$height,$rscale);
     }
     else {

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/skip_forwards.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/skip_forwards.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/solarize.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/solarize.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/spin.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/spin.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/spread.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/spread.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/swirl.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/swirl.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/textover.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/textover.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_bwthresh.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_bwthresh.script Changed

@@ -74,24 +74,24 @@
 <loop>
 if ($p3) {
                 # transparent over
-        	system("$convert_command +antialias $in2 -scale $rwidth!x$rheight! resize.png");
+        	system("$convert_command +antialias $img_prefix2$in2 -scale $rwidth!x$rheight! resize.png");
                 if (!$p2) {
                     system("$convert_command resize.png -threshold $p0 -monochrome mask.png");
                 }
                 else {
                     system("$convert_command resize.png -threshold ".(65535-$p0)." -negate -monochrome mask.png");
                 }
-                system("$composite_command -compose over -geometry $rwidth!x$rheight! resize.png -geometry +$xoff!+$yoff! -size $width!x$height! $in mask.png $frame.tmp");
+                system("$composite_command -compose over -geometry $rwidth!x$rheight! resize.png -geometry +$xoff!+$yoff! -size $width!x$height! $img_prefix$in mask.png $frame.tmp");
         }
         else {
         	#transparent under
                 if ($antialias eq "false") {
-                    system("$convert_command +antialias $in2 -scale $width!x$height! resize.png");
+                    system("$convert_command +antialias $img_prefix2$in2 -scale $width!x$height! resize.png");
                 }
                 else {
-                    system("$convert_command $in2 -resize $width!x$height! resize.png");
+                    system("$convert_command $img_prefix2$in2 -resize $width!x$height! resize.png");
                 }
-                system("$convert_command $in -resize $rwidth!x$rheight! resize2.png");
+                system("$convert_command $img_prefix$in -resize $rwidth!x$rheight! resize2.png");
                 if (!$p2) {
                     system("$convert_command -threshold ".($p0)." resize2.png -monochrome mask.png");
                 }
@@ -101,7 +101,7 @@
         	system("$composite_command -compose over -geometry $rwidth!x$rheight! resize2.png -geometry +$xoff!+$yoff! -size $width!x$height! resize.png mask.png $frame.tmp");
         }
         
-        system("$convert_command +matte $frame.tmp $out");
+        system("$convert_command +matte $frame.tmp $out_prefix$out");
         unlink "$frame.tmp";
 </loop>

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_checkerboard.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_checkerboard.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_fade.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_fade.script Changed

@@ -33,10 +33,12 @@
 cx|Centre _X|num0|0|0|10000|
 cy|Centre _Y|num0|0|0|10000|
 finf|Frame _in frame position of clipboard...|bool|0|
+env|Envelope length|num0|2|2|100000|
 </params>
 
 <param_window>
 layout|p0|"%"|p1|"%"|
+layout|p7|"frames"|
 layout|hseparator|
 layout|p6|
 layout|p2|p3|
@@ -66,16 +68,20 @@
     $p3=$height;
     $x=$y=0;
 }
-$step=0.;
+$mystep=0.;
 if ($end>$start) {
-    $step=($p1-$p0)/($end-$start);
+    $mystep=($p1-$p0)/($end-$start);
 }
+$mystep*=($end-$start+1.)/$p7;
+$myorig_val=$p0;
+$mycount=0;
 </pre>
 
 <loop>
-system("$composite_command -compose plus -dissolve ".int($p0)." -geometry $p2!x$p3!+$x!+$y! $in2 -size $width!x$height! $in $out");
-$p0+=$step;
+system("$composite_command -compose plus -dissolve ".int($p0)." -geometry $p2!x$p3!+$x!+$y! $img_prefix2$in2 -size $width!x$height! $in $out_prefix$out");
+$p0+=$mystep;
 if (($p1>0&&$p0>$p1*1.)||($p1<0&&$p0<$p1*1.)) {$p0=$p1*1.;}
+if (++$mycount==$p7) {$p0=$myorig_val; $mycount=0;}
 </loop>
 
 <post>
@@ -86,6 +92,7 @@
 init|$p3=$height2; $p3_max=$height;
 init|$p4=int($width/2+.5);
 init|$p5=int($height/2+.5);
+init|$p7=($end-$start+1); $p7_max=$p7;
 2|$p4_max=$width-1-int($p2/2+.5);$p4_min=int($p2/2+.5);
 3|$p5_max=$height-1-int($p3/2+.5);$p5_min=int($p3/2+.5);
 6|if ($p6) {$p4_max=$width-1-int($p2/2+.5);$p4_min=int($p2/2+.5);$p5_max=$height-1-int($p3/2+.5);$p5_min=int($p3/2+.5);}

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_splice.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/transition_splice.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/trim_frames.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/trim_frames.script Changed

@@ -39,12 +39,12 @@
 </params>
 
 <param_window>
-layout|p0|p1|
-layout|p2|p3|
+layout|p0|fill|p1|
+layout|p2|fill|p3|
 layout|p4|
 special|framedraw|rectdemask|0|1|2|3|
 layout|hseparator|
-layout|p7|p5|p6|
+layout|p7|p5|fill|p6|
 layout|"Offset of frame within border"|p8|p9|
 special|aspect|5|6|
 </param_window>
@@ -60,6 +60,9 @@
 <pre>
 $antialias=&rc_get("antialias");
 $resize_ext=$out_ext;
+$resize_prefix=$out_prefix;
+$input_ext=$img_ext;
+$input_prefix=$img_prefix;
 $xwidth=$nwidth=$p2-$p0+1;
 $xheight=$nheight=$p3-$p1+1;
 if ($nwidth<1||$nwidth>$width) {
@@ -71,7 +74,7 @@
 
 if ($p7) {
     $cstring1=&RGB24_to_string($p10_red,$p10_green,$p10_blue);
-    system("$convert_command -size $p5!x$p6! xc:$cstring1 blank$img_ext");
+    system("$convert_command -size $p5!x$p6! xc:$cstring1 $img_prefix"."blank$img_ext");
     $nwidth=$p5;
     $nheight=$p6;
 }
@@ -80,7 +83,7 @@
 <loop>
 &trim_frame($name,$width,$height,$p0,$p1,$nwidth,$nheight);
 if ($p7) {	
-    system("$composite_command -compose plus -dissolve 100 -geometry $xwidth!x$xheight!+$p8!+$p9! $out -size $p5!x$p6! blank$img_ext $out");
+    system("$composite_command -compose plus -dissolve 100 -geometry $xwidth!x$xheight!+$p8!+$p9! $out_prefix$out -size $p5!x$p6! $img_prefix"."blank$img_ext $out");
 }
 </loop>
 
@@ -91,8 +94,8 @@
 </post>
 
 <onchange>
-init|$p0_max=$p2_max=$width-1;
-init|$p1_max=$p3_max=$height-1;
+init|$p0_max=$p2_max=$width-1;$p2=$width-1;$p0=0;
+init|$p1_max=$p3_max=$height-1;$p3=$height-1;$p1=0;
 init|$p5=$width;$p6=$height;
 0|$p8_max=$p5-$p2+$p0-1;
 0|if ($p4) {$p2=$width-1-$p0;$p8=int(($p5-$p0_max)/2.+$p0);}

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/tunnel.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/tunnel.script Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/effects/RFXscripts/wave.script -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/RFXscripts/wave.script Changed

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound Added

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/Makefile.am Added

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/Makefile.in Added

@@ -0,0 +1,604 @@
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = lives-plugins/plugins/effects/compound
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/mk/autoconf/acx_pthread.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(compoundscriptsdir)"
+DATA = $(compoundscripts_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRAC_CFLAGS = @DIRAC_CFLAGS@
+DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FFTW3F_CFLAGS = @FFTW3F_CFLAGS@
+FFTW3F_LIBS = @FFTW3F_LIBS@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLEE_CFLAGS = @GLEE_CFLAGS@
+GLEE_LIBS = @GLEE_LIBS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GLU_CFLAGS = @GLU_CFLAGS@
+GLU_LIBS = @GLU_LIBS@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_LIBS_NODYNAMIC = @GTK_LIBS_NODYNAMIC@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@
+LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@
+LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@
+LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@
+LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@
+LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@
+LIBBZ_CFLAGS = @LIBBZ_CFLAGS@
+LIBBZ_LIBS = @LIBBZ_LIBS@
+LIBDV_CFLAGS = @LIBDV_CFLAGS@
+LIBDV_LIBS = @LIBDV_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIBZ_CFLAGS = @LIBZ_CFLAGS@
+LIBZ_LIBS = @LIBZ_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
+MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OIL_CFLAGS = @OIL_CFLAGS@
+OIL_LIBS = @OIL_LIBS@
+OPENCV_CFLAGS = @OPENCV_CFLAGS@
+OPENCV_LIBS = @OPENCV_LIBS@
+OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
+RANLIB = @RANLIB@
+SDL_CFLAGS = @SDL_CFLAGS@
+SDL_LIBS = @SDL_LIBS@
+SDL_PREFIX = @SDL_PREFIX@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+THEORA_CFLAGS = @THEORA_CFLAGS@
+THEORA_LIBS = @THEORA_LIBS@
+UNICAP_CFLAGS = @UNICAP_CFLAGS@
+UNICAP_LIBS = @UNICAP_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VISUAL_CFLAGS = @VISUAL_CFLAGS@
+VISUAL_LIBS = @VISUAL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WEED_CFLAGS = @WEED_CFLAGS@
+WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@
+WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@
+WEED_LIBS = @WEED_LIBS@
+WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@
+WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
+WEED_SLICE_CFLAGS = @WEED_SLICE_CFLAGS@
+WEED_SLICE_LIBS = @WEED_SLICE_LIBS@
+WEED_UTILS_CFLAGS = @WEED_UTILS_CFLAGS@
+WEED_UTILS_LIBS = @WEED_UTILS_LIBS@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XRENDER_CFLAGS = @XRENDER_CFLAGS@
+XRENDER_LIBS = @XRENDER_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+acx_pthread_config = @acx_pthread_config@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+v4l1_INCFILE = @v4l1_INCFILE@
+compoundscriptsdir = "$(datadir)/$(PACKAGE)/plugins/effects/compound"
+compoundscripts_DATA = image_stabilizer motion_analyser neural_net
+EXTRA_DIST = $(compoundscripts_DATA) data icons
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/plugins/effects/compound/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lives-plugins/plugins/effects/compound/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-compoundscriptsDATA: $(compoundscripts_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(compoundscripts_DATA)'; test -n "$(compoundscriptsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(compoundscriptsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(compoundscriptsdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(compoundscriptsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(compoundscriptsdir)" || exit $$?; \
+	done
+
+uninstall-compoundscriptsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(compoundscripts_DATA)'; test -n "$(compoundscriptsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(compoundscriptsdir)'; $(am__uninstall_files_from_dir)
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(compoundscriptsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-compoundscriptsDATA install-data-local
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-compoundscriptsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-compoundscriptsDATA install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-compoundscriptsDATA
+
+
+install-data-local:
+	cp -rf icons/ "$(DESTDIR)$(compoundscriptsdir)"
+	$(MAKE) -i install-data-local-remove-vcs-files
+
+install-data-local-remove-vcs-files:
+	rm -rf "$(DESTDIR)$(compoundscriptsdir)/icons/".*
+	rm -rf "$(DESTDIR)$(compoundscriptsdir)/data/".*
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/data Added

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/icons Added

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/image_stabilizer Added

@@ -0,0 +1,294 @@
+salsaman
+1
+
+farneback_analyserfarneback_analysersalsaman1
+alpha_meansalpha_meanssalsaman1
+alpha_meansalpha_meanssalsaman1
+data_processordata_processorsalsaman1
+shiftshiftsalsaman1
+
+1|0|1
+1|1|1
+1|2|1
+1|3|0
+2|0|1
+2|1|1
+2|2|0
+2|2|1
+3|256|s[0]=(s[0]+i[0]*8.)/2.
+3|257|s[1]=(s[1]+i[1]*8.)/2.
+3|258|o[0]=s[0]
+3|259|o[1]=s[1]
+
+-1|0|0|1|0
+-1|0|0|1|1
+-1|0|0|1|2
+-1|0|0|1|3
+-1|0|0|1|4
+-1|0|0|1|5
+-1|0|0|2|0
+-1|0|0|2|1
+-1|0|0|2|2
+-1|0|0|2|3
+-1|0|0|2|4
+-1|0|0|2|5
+-1|0|0|3|260
+-1|0|0|3|261
+-1|0|0|3|262
+-1|0|0|3|263
+-1|0|0|3|264
+-1|0|0|3|265
+-1|0|0|3|266
+-1|0|0|3|267
+-1|0|0|3|268
+-1|0|0|3|269
+-1|0|0|3|270
+-1|0|0|3|271
+-1|0|0|3|272
+-1|0|0|3|273
+-1|0|0|3|274
+-1|0|0|3|275
+-1|0|0|3|276
+-1|0|0|3|277
+-1|0|0|3|278
+-1|0|0|3|279
+-1|0|0|3|280
+-1|0|0|3|281
+-1|0|0|3|282
+-1|0|0|3|283
+-1|0|0|3|284
+-1|0|0|3|285
+-1|0|0|3|286
+-1|0|0|3|287
+-1|0|0|3|288
+-1|0|0|3|289
+-1|0|0|3|290
+-1|0|0|3|291
+-1|0|0|3|292
+-1|0|0|3|293
+-1|0|0|3|294
+-1|0|0|3|295
+-1|0|0|3|296
+-1|0|0|3|297
+-1|0|0|3|298
+-1|0|0|3|299
+-1|0|0|3|300
+-1|0|0|3|301
+-1|0|0|3|302
+-1|0|0|3|303
+-1|0|0|3|304
+-1|0|0|3|305
+-1|0|0|3|306
+-1|0|0|3|307
+-1|0|0|3|308
+-1|0|0|3|309
+-1|0|0|3|310
+-1|0|0|3|311
+-1|0|0|3|312
+-1|0|0|3|313
+-1|0|0|3|314
+-1|0|0|3|315
+-1|0|0|3|316
+-1|0|0|3|317
+-1|0|0|3|318
+-1|0|0|3|319
+-1|0|0|3|320
+-1|0|0|3|321
+-1|0|0|3|322
+-1|0|0|3|323
+-1|0|0|3|324
+-1|0|0|3|325
+-1|0|0|3|326
+-1|0|0|3|327
+-1|0|0|3|328
+-1|0|0|3|329
+-1|0|0|3|330
+-1|0|0|3|331
+-1|0|0|3|332
+-1|0|0|3|333
+-1|0|0|3|334
+-1|0|0|3|335
+-1|0|0|3|336
+-1|0|0|3|337
+-1|0|0|3|338
+-1|0|0|3|339
+-1|0|0|3|340
+-1|0|0|3|341
+-1|0|0|3|342
+-1|0|0|3|343
+-1|0|0|3|344
+-1|0|0|3|345
+-1|0|0|3|346
+-1|0|0|3|347
+-1|0|0|3|348
+-1|0|0|3|349
+-1|0|0|3|350
+-1|0|0|3|351
+-1|0|0|3|352
+-1|0|0|3|353
+-1|0|0|3|354
+-1|0|0|3|355
+-1|0|0|3|356
+-1|0|0|3|357
+-1|0|0|3|358
+-1|0|0|3|359
+-1|0|0|3|360
+-1|0|0|3|361
+-1|0|0|3|362
+-1|0|0|3|363
+-1|0|0|3|364
+-1|0|0|3|365
+-1|0|0|3|366
+-1|0|0|3|367
+-1|0|0|3|368
+-1|0|0|3|369
+-1|0|0|3|370
+-1|0|0|3|371
+-1|0|0|3|372
+-1|0|0|3|373
+-1|0|0|3|374
+-1|0|0|3|375
+-1|0|0|3|376
+-1|0|0|3|377
+-1|0|0|3|378
+-1|0|0|3|379
+-1|0|0|3|380
+-1|0|0|3|381
+-1|0|0|3|382
+-1|0|0|3|383
+-1|0|0|3|384
+-1|0|0|3|385
+-1|0|0|3|386
+-1|0|0|3|387
+-1|0|0|3|388
+-1|0|0|3|389
+-1|0|0|3|390
+-1|0|0|3|391
+-1|0|0|3|392
+-1|0|0|3|393
+-1|0|0|3|394
+-1|0|0|3|395
+-1|0|0|3|396
+-1|0|0|3|397
+-1|0|0|3|398
+-1|0|0|3|399
+-1|0|0|3|400
+-1|0|0|3|401
+-1|0|0|3|402
+-1|0|0|3|403
+-1|0|0|3|404
+-1|0|0|3|405
+-1|0|0|3|406
+-1|0|0|3|407
+-1|0|0|3|408
+-1|0|0|3|409
+-1|0|0|3|410
+-1|0|0|3|411
+-1|0|0|3|412
+-1|0|0|3|413
+-1|0|0|3|414
+-1|0|0|3|415
+-1|0|0|3|416
+-1|0|0|3|417
+-1|0|0|3|418
+-1|0|0|3|419
+-1|0|0|3|420
+-1|0|0|3|421
+-1|0|0|3|422
+-1|0|0|3|423
+-1|0|0|3|424
+-1|0|0|3|425
+-1|0|0|3|426
+-1|0|0|3|427
+-1|0|0|3|428
+-1|0|0|3|429
+-1|0|0|3|430
+-1|0|0|3|431
+-1|0|0|3|432
+-1|0|0|3|433
+-1|0|0|3|434
+-1|0|0|3|435
+-1|0|0|3|436
+-1|0|0|3|437
+-1|0|0|3|438
+-1|0|0|3|439
+-1|0|0|3|440
+-1|0|0|3|441
+-1|0|0|3|442
+-1|0|0|3|443
+-1|0|0|3|444
+-1|0|0|3|445
+-1|0|0|3|446
+-1|0|0|3|447
+-1|0|0|3|448
+-1|0|0|3|449
+-1|0|0|3|450
+-1|0|0|3|451
+-1|0|0|3|452
+-1|0|0|3|453
+-1|0|0|3|454
+-1|0|0|3|455
+-1|0|0|3|456
+-1|0|0|3|457
+-1|0|0|3|458
+-1|0|0|3|459
+-1|0|0|3|460
+-1|0|0|3|461
+-1|0|0|3|462
+-1|0|0|3|463
+-1|0|0|3|464
+-1|0|0|3|465
+-1|0|0|3|466
+-1|0|0|3|467
+-1|0|0|3|468
+-1|0|0|3|469
+-1|0|0|3|470
+-1|0|0|3|471
+-1|0|0|3|472
+-1|0|0|3|473
+-1|0|0|3|474
+-1|0|0|3|475
+-1|0|0|3|476
+-1|0|0|3|477
+-1|0|0|3|478
+-1|0|0|3|479
+-1|0|0|3|480
+-1|0|0|3|481
+-1|0|0|3|482
+-1|0|0|3|483
+-1|0|0|3|484
+-1|0|0|3|485
+-1|0|0|3|486
+-1|0|0|3|487
+-1|0|0|3|488
+-1|0|0|3|489
+-1|0|0|3|490
+-1|0|0|3|491
+-1|0|0|3|492
+-1|0|0|3|493
+-1|0|0|3|494
+-1|0|0|3|495
+-1|0|0|3|496
+-1|0|0|3|497
+-1|0|0|3|498
+-1|0|0|3|499
+-1|0|0|3|500
+-1|0|0|3|501
+-1|0|0|3|502
+-1|0|0|3|503
+-1|0|0|3|504
+-1|0|0|3|505
+-1|0|0|3|506
+-1|0|0|3|507
+-1|0|0|3|508
+-1|0|0|3|509
+-1|0|0|3|510
+-1|0|0|3|511
+1|0|0|3|0
+2|0|0|3|1
+3|0|0|4|0
+3|1|0|4|1
+
+0|0|1|0
+0|1|2|0
+

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/motion_analyser Added

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/effects/compound/neural_net Added

@@ -0,0 +1,778 @@
+salsaman
+1
+
+data_unpackerdata_unpackersalsaman1
+nn_programmernn_programmersalsaman1
+data_processordata_processorsalsaman1
+log_siglog_sigsalsaman1
+
+
+0|0|0|2|0
+0|1|0|2|1
+0|2|0|2|2
+0|3|0|2|3
+0|4|0|2|4
+0|5|0|2|5
+0|6|0|2|6
+0|7|0|2|7
+0|8|0|2|8
+0|9|0|2|9
+0|10|0|2|10
+0|11|0|2|11
+0|12|0|2|12
+0|13|0|2|13
+0|14|0|2|14
+0|15|0|2|15
+0|16|0|2|16
+0|17|0|2|17
+0|18|0|2|18
+0|19|0|2|19
+0|20|0|2|20
+0|21|0|2|21
+0|22|0|2|22
+0|23|0|2|23
+0|24|0|2|24
+0|25|0|2|25
+0|26|0|2|26
+0|27|0|2|27
+0|28|0|2|28
+0|29|0|2|29
+0|30|0|2|30
+0|31|0|2|31
+0|32|0|2|32
+0|33|0|2|33
+0|34|0|2|34
+0|35|0|2|35
+0|36|0|2|36
+0|37|0|2|37
+0|38|0|2|38
+0|39|0|2|39
+0|40|0|2|40
+0|41|0|2|41
+0|42|0|2|42
+0|43|0|2|43
+0|44|0|2|44
+0|45|0|2|45
+0|46|0|2|46
+0|47|0|2|47
+0|48|0|2|48
+0|49|0|2|49
+0|50|0|2|50
+0|51|0|2|51
+0|52|0|2|52
+0|53|0|2|53
+0|54|0|2|54
+0|55|0|2|55
+0|56|0|2|56
+0|57|0|2|57
+0|58|0|2|58
+0|59|0|2|59
+0|60|0|2|60
+0|61|0|2|61
+0|62|0|2|62
+0|63|0|2|63
+0|64|0|2|64
+0|65|0|2|65
+0|66|0|2|66
+0|67|0|2|67
+0|68|0|2|68
+0|69|0|2|69
+0|70|0|2|70
+0|71|0|2|71
+0|72|0|2|72
+0|73|0|2|73
+0|74|0|2|74
+0|75|0|2|75
+0|76|0|2|76
+0|77|0|2|77
+0|78|0|2|78
+0|79|0|2|79
+0|80|0|2|80
+0|81|0|2|81
+0|82|0|2|82
+0|83|0|2|83
+0|84|0|2|84
+0|85|0|2|85
+0|86|0|2|86
+0|87|0|2|87
+0|88|0|2|88
+0|89|0|2|89
+0|90|0|2|90
+0|91|0|2|91
+0|92|0|2|92
+0|93|0|2|93
+0|94|0|2|94
+0|95|0|2|95
+0|96|0|2|96
+0|97|0|2|97
+0|98|0|2|98
+0|99|0|2|99
+0|100|0|2|100
+0|101|0|2|101
+0|102|0|2|102
+0|103|0|2|103
+0|104|0|2|104
+0|105|0|2|105
+0|106|0|2|106
+0|107|0|2|107
+0|108|0|2|108
+0|109|0|2|109
+0|110|0|2|110
+0|111|0|2|111
+0|112|0|2|112
+0|113|0|2|113
+0|114|0|2|114
+0|115|0|2|115
+0|116|0|2|116
+0|117|0|2|117
+0|118|0|2|118
+0|119|0|2|119
+0|120|0|2|120
+0|121|0|2|121
+0|122|0|2|122
+0|123|0|2|123
+0|124|0|2|124
+0|125|0|2|125
+0|126|0|2|126
+0|127|0|2|127
+0|128|0|2|128
+0|129|0|2|129
+0|130|0|2|130
+0|131|0|2|131
+0|132|0|2|132
+0|133|0|2|133
+0|134|0|2|134
+0|135|0|2|135
+0|136|0|2|136
+0|137|0|2|137
+0|138|0|2|138
+0|139|0|2|139
+0|140|0|2|140
+0|141|0|2|141
+0|142|0|2|142
+0|143|0|2|143
+0|144|0|2|144
+0|145|0|2|145
+0|146|0|2|146
+0|147|0|2|147
+0|148|0|2|148
+0|149|0|2|149
+0|150|0|2|150
+0|151|0|2|151
+0|152|0|2|152
+0|153|0|2|153
+0|154|0|2|154
+0|155|0|2|155
+0|156|0|2|156
+0|157|0|2|157
+0|158|0|2|158
+0|159|0|2|159
+0|160|0|2|160
+0|161|0|2|161
+0|162|0|2|162
+0|163|0|2|163
+0|164|0|2|164
+0|165|0|2|165
+0|166|0|2|166
+0|167|0|2|167
+0|168|0|2|168
+0|169|0|2|169
+0|170|0|2|170
+0|171|0|2|171
+0|172|0|2|172
+0|173|0|2|173
+0|174|0|2|174
+0|175|0|2|175
+0|176|0|2|176
+0|177|0|2|177
+0|178|0|2|178
+0|179|0|2|179
+0|180|0|2|180
+0|181|0|2|181
+0|182|0|2|182
+0|183|0|2|183
+0|184|0|2|184
+0|185|0|2|185
+0|186|0|2|186
+0|187|0|2|187
+0|188|0|2|188
+0|189|0|2|189
+0|190|0|2|190
+0|191|0|2|191
+0|192|0|2|192
+0|193|0|2|193
+0|194|0|2|194
+0|195|0|2|195
+0|196|0|2|196
+0|197|0|2|197
+0|198|0|2|198
+0|199|0|2|199
+0|200|0|2|200
+0|201|0|2|201
+0|202|0|2|202
+0|203|0|2|203
+0|204|0|2|204
+0|205|0|2|205
+0|206|0|2|206
+0|207|0|2|207
+0|208|0|2|208
+0|209|0|2|209
+0|210|0|2|210
+0|211|0|2|211
+0|212|0|2|212
+0|213|0|2|213
+0|214|0|2|214
+0|215|0|2|215
+0|216|0|2|216
+0|217|0|2|217
+0|218|0|2|218
+0|219|0|2|219
+0|220|0|2|220
+0|221|0|2|221
+0|222|0|2|222
+0|223|0|2|223
+0|224|0|2|224
+0|225|0|2|225
+0|226|0|2|226
+0|227|0|2|227
+0|228|0|2|228
+0|229|0|2|229
+0|230|0|2|230
+0|231|0|2|231
+0|232|0|2|232
+0|233|0|2|233
+0|234|0|2|234
+0|235|0|2|235
+0|236|0|2|236
+0|237|0|2|237
+0|238|0|2|238
+0|239|0|2|239
+0|240|0|2|240
+0|241|0|2|241
+0|242|0|2|242
+0|243|0|2|243
+0|244|0|2|244
+0|245|0|2|245
+0|246|0|2|246
+0|247|0|2|247
+0|248|0|2|248
+0|249|0|2|249
+0|250|0|2|250
+0|251|0|2|251
+0|252|0|2|252
+0|253|0|2|253
+0|254|0|2|254
+0|255|0|2|255
+1|0|0|2|256
+1|1|0|2|257
+1|2|0|2|258
+1|3|0|2|259
+1|4|0|2|260
+1|5|0|2|261
+1|6|0|2|262
+1|7|0|2|263
+1|8|0|2|264
+1|9|0|2|265
+1|11|0|2|266
+1|11|0|2|267
+1|12|0|2|268
+1|13|0|2|269
+1|14|0|2|270
+1|15|0|2|271
+1|16|0|2|272
+1|17|0|2|273
+1|18|0|2|274
+1|19|0|2|275
+1|21|0|2|276
+1|21|0|2|277
+1|22|0|2|278
+1|23|0|2|279
+1|24|0|2|280
+1|25|0|2|281
+1|26|0|2|282
+1|27|0|2|283
+1|28|0|2|284
+1|29|0|2|285
+1|31|0|2|286
+1|31|0|2|287
+1|32|0|2|288
+1|33|0|2|289
+1|34|0|2|290
+1|35|0|2|291
+1|36|0|2|292
+1|37|0|2|293
+1|38|0|2|294
+1|39|0|2|295
+1|41|0|2|296
+1|41|0|2|297
+1|42|0|2|298
+1|43|0|2|299
+1|44|0|2|300
+1|45|0|2|301
+1|46|0|2|302
+1|47|0|2|303
+1|48|0|2|304
+1|49|0|2|305
+1|51|0|2|306
+1|51|0|2|307
+1|52|0|2|308
+1|53|0|2|309
+1|54|0|2|310
+1|55|0|2|311
+1|56|0|2|312
+1|57|0|2|313
+1|58|0|2|314
+1|59|0|2|315
+1|61|0|2|316
+1|61|0|2|317
+1|62|0|2|318
+1|63|0|2|319
+1|64|0|2|320
+1|65|0|2|321
+1|66|0|2|322
+1|67|0|2|323
+1|68|0|2|324
+1|69|0|2|325
+1|71|0|2|326
+1|71|0|2|327
+1|72|0|2|328
+1|73|0|2|329
+1|74|0|2|330
+1|75|0|2|331
+1|76|0|2|332
+1|77|0|2|333
+1|78|0|2|334
+1|79|0|2|335
+1|81|0|2|336
+1|81|0|2|337
+1|82|0|2|338
+1|83|0|2|339
+1|84|0|2|340
+1|85|0|2|341
+1|86|0|2|342
+1|87|0|2|343
+1|88|0|2|344
+1|89|0|2|345
+1|91|0|2|346
+1|91|0|2|347
+1|92|0|2|348
+1|93|0|2|349
+1|94|0|2|350
+1|95|0|2|351
+1|96|0|2|352
+1|97|0|2|353
+1|98|0|2|354
+1|99|0|2|355
+1|101|0|2|356
+1|101|0|2|357
+1|102|0|2|358
+1|103|0|2|359
+1|104|0|2|360
+1|105|0|2|361
+1|106|0|2|362
+1|107|0|2|363
+1|108|0|2|364
+1|109|0|2|365
+1|111|0|2|366
+1|111|0|2|367
+1|112|0|2|368
+1|113|0|2|369
+1|114|0|2|370
+1|115|0|2|371
+1|116|0|2|372
+1|117|0|2|373
+1|118|0|2|374
+1|119|0|2|375
+1|121|0|2|376
+1|121|0|2|377
+1|122|0|2|378
+1|123|0|2|379
+1|124|0|2|380
+1|125|0|2|381
+1|126|0|2|382
+1|127|0|2|383
+1|128|0|2|384
+1|129|0|2|385
+1|131|0|2|386
+1|131|0|2|387
+1|132|0|2|388
+1|133|0|2|389
+1|134|0|2|390
+1|135|0|2|391
+1|136|0|2|392
+1|137|0|2|393
+1|138|0|2|394
+1|139|0|2|395
+1|141|0|2|396
+1|141|0|2|397
+1|142|0|2|398
+1|143|0|2|399
+1|144|0|2|400
+1|145|0|2|401
+1|146|0|2|402
+1|147|0|2|403
+1|148|0|2|404
+1|149|0|2|405
+1|151|0|2|406
+1|151|0|2|407
+1|152|0|2|408
+1|153|0|2|409
+1|154|0|2|410
+1|155|0|2|411
+1|156|0|2|412
+1|157|0|2|413
+1|158|0|2|414
+1|159|0|2|415
+1|161|0|2|416
+1|161|0|2|417
+1|162|0|2|418
+1|163|0|2|419
+1|164|0|2|420
+1|165|0|2|421
+1|166|0|2|422
+1|167|0|2|423
+1|168|0|2|424
+1|169|0|2|425
+1|171|0|2|426
+1|171|0|2|427
+1|172|0|2|428
+1|173|0|2|429
+1|174|0|2|430
+1|175|0|2|431
+1|176|0|2|432
+1|177|0|2|433
+1|178|0|2|434
+1|179|0|2|435
+1|181|0|2|436
+1|181|0|2|437
+1|182|0|2|438
+1|183|0|2|439
+1|184|0|2|440
+1|185|0|2|441
+1|186|0|2|442
+1|187|0|2|443
+1|188|0|2|444
+1|189|0|2|445
+1|191|0|2|446
+1|191|0|2|447
+1|192|0|2|448
+1|193|0|2|449
+1|194|0|2|450
+1|195|0|2|451
+1|196|0|2|452
+1|197|0|2|453
+1|198|0|2|454
+1|199|0|2|455
+1|201|0|2|456
+1|201|0|2|457
+1|202|0|2|458
+1|203|0|2|459
+1|204|0|2|460
+1|205|0|2|461
+1|206|0|2|462
+1|207|0|2|463
+1|208|0|2|464
+1|209|0|2|465
+1|211|0|2|466
+1|211|0|2|467
+1|212|0|2|468
+1|213|0|2|469
+1|214|0|2|470
+1|215|0|2|471
+1|216|0|2|472
+1|217|0|2|473
+1|218|0|2|474
+1|219|0|2|475
+1|221|0|2|476
+1|221|0|2|477
+1|222|0|2|478
+1|223|0|2|479
+1|224|0|2|480
+1|225|0|2|481
+1|226|0|2|482
+1|227|0|2|483
+1|228|0|2|484
+1|229|0|2|485
+1|231|0|2|486
+1|231|0|2|487
+1|232|0|2|488
+1|233|0|2|489
+1|234|0|2|490
+1|235|0|2|491
+1|236|0|2|492
+1|237|0|2|493
+1|238|0|2|494
+1|239|0|2|495
+1|241|0|2|496
+1|241|0|2|497
+1|242|0|2|498
+1|243|0|2|499
+1|244|0|2|500
+1|245|0|2|501
+1|246|0|2|502
+1|247|0|2|503
+1|248|0|2|504
+1|249|0|2|505
+1|251|0|2|506
+1|251|0|2|507
+1|252|0|2|508
+1|253|0|2|509
+1|254|0|2|510
+1|255|0|2|511
+2|0|0|3|0
+2|1|0|3|1
+2|2|0|3|2
+2|3|0|3|3
+2|4|0|3|4
+2|5|0|3|5
+2|6|0|3|6
+2|7|0|3|7
+2|8|0|3|8
+2|9|0|3|9
+2|10|0|3|10
+2|11|0|3|11
+2|12|0|3|12
+2|13|0|3|13
+2|14|0|3|14
+2|15|0|3|15
+2|16|0|3|16
+2|17|0|3|17
+2|18|0|3|18
+2|19|0|3|19
+2|20|0|3|20
+2|21|0|3|21
+2|22|0|3|22
+2|23|0|3|23
+2|24|0|3|24
+2|25|0|3|25
+2|26|0|3|26
+2|27|0|3|27
+2|28|0|3|28
+2|29|0|3|29
+2|30|0|3|30
+2|31|0|3|31
+2|32|0|3|32
+2|33|0|3|33
+2|34|0|3|34
+2|35|0|3|35
+2|36|0|3|36
+2|37|0|3|37
+2|38|0|3|38
+2|39|0|3|39
+2|40|0|3|40
+2|41|0|3|41
+2|42|0|3|42
+2|43|0|3|43
+2|44|0|3|44
+2|45|0|3|45
+2|46|0|3|46
+2|47|0|3|47
+2|48|0|3|48
+2|49|0|3|49
+2|50|0|3|50
+2|51|0|3|51
+2|52|0|3|52
+2|53|0|3|53
+2|54|0|3|54
+2|55|0|3|55
+2|56|0|3|56
+2|57|0|3|57
+2|58|0|3|58
+2|59|0|3|59
+2|60|0|3|60
+2|61|0|3|61
+2|62|0|3|62
+2|63|0|3|63
+2|64|0|3|64
+2|65|0|3|65
+2|66|0|3|66
+2|67|0|3|67
+2|68|0|3|68
+2|69|0|3|69
+2|70|0|3|70
+2|71|0|3|71
+2|72|0|3|72
+2|73|0|3|73
+2|74|0|3|74
+2|75|0|3|75
+2|76|0|3|76
+2|77|0|3|77
+2|78|0|3|78
+2|79|0|3|79
+2|80|0|3|80
+2|81|0|3|81
+2|82|0|3|82
+2|83|0|3|83
+2|84|0|3|84
+2|85|0|3|85
+2|86|0|3|86
+2|87|0|3|87
+2|88|0|3|88
+2|89|0|3|89
+2|90|0|3|90
+2|91|0|3|91
+2|92|0|3|92
+2|93|0|3|93
+2|94|0|3|94
+2|95|0|3|95
+2|96|0|3|96
+2|97|0|3|97
+2|98|0|3|98
+2|99|0|3|99
+2|100|0|3|100
+2|101|0|3|101
+2|102|0|3|102
+2|103|0|3|103
+2|104|0|3|104
+2|105|0|3|105
+2|106|0|3|106
+2|107|0|3|107
+2|108|0|3|108
+2|109|0|3|109
+2|110|0|3|110
+2|111|0|3|111
+2|112|0|3|112
+2|113|0|3|113
+2|114|0|3|114
+2|115|0|3|115
+2|116|0|3|116
+2|117|0|3|117
+2|118|0|3|118
+2|119|0|3|119
+2|120|0|3|120
+2|121|0|3|121
+2|122|0|3|122
+2|123|0|3|123
+2|124|0|3|124
+2|125|0|3|125
+2|126|0|3|126
+2|127|0|3|127
+2|128|0|3|128
+2|129|0|3|129
+2|130|0|3|130
+2|131|0|3|131
+2|132|0|3|132
+2|133|0|3|133
+2|134|0|3|134
+2|135|0|3|135
+2|136|0|3|136
+2|137|0|3|137
+2|138|0|3|138
+2|139|0|3|139
+2|140|0|3|140
+2|141|0|3|141
+2|142|0|3|142
+2|143|0|3|143
+2|144|0|3|144
+2|145|0|3|145
+2|146|0|3|146
+2|147|0|3|147
+2|148|0|3|148
+2|149|0|3|149
+2|150|0|3|150
+2|151|0|3|151
+2|152|0|3|152
+2|153|0|3|153
+2|154|0|3|154
+2|155|0|3|155
+2|156|0|3|156
+2|157|0|3|157
+2|158|0|3|158
+2|159|0|3|159
+2|160|0|3|160
+2|161|0|3|161
+2|162|0|3|162
+2|163|0|3|163
+2|164|0|3|164
+2|165|0|3|165
+2|166|0|3|166
+2|167|0|3|167
+2|168|0|3|168
+2|169|0|3|169
+2|170|0|3|170
+2|171|0|3|171
+2|172|0|3|172
+2|173|0|3|173
+2|174|0|3|174
+2|175|0|3|175
+2|176|0|3|176
+2|177|0|3|177
+2|178|0|3|178
+2|179|0|3|179
+2|180|0|3|180
+2|181|0|3|181
+2|182|0|3|182
+2|183|0|3|183
+2|184|0|3|184
+2|185|0|3|185
+2|186|0|3|186
+2|187|0|3|187
+2|188|0|3|188
+2|189|0|3|189
+2|190|0|3|190
+2|191|0|3|191
+2|192|0|3|192
+2|193|0|3|193
+2|194|0|3|194
+2|195|0|3|195
+2|196|0|3|196
+2|197|0|3|197
+2|198|0|3|198
+2|199|0|3|199
+2|200|0|3|200
+2|201|0|3|201
+2|202|0|3|202
+2|203|0|3|203
+2|204|0|3|204
+2|205|0|3|205
+2|206|0|3|206
+2|207|0|3|207
+2|208|0|3|208
+2|209|0|3|209
+2|210|0|3|210
+2|211|0|3|211
+2|212|0|3|212
+2|213|0|3|213
+2|214|0|3|214
+2|215|0|3|215
+2|216|0|3|216
+2|217|0|3|217
+2|218|0|3|218
+2|219|0|3|219
+2|220|0|3|220
+2|221|0|3|221
+2|222|0|3|222
+2|223|0|3|223
+2|224|0|3|224
+2|225|0|3|225
+2|226|0|3|226
+2|227|0|3|227
+2|228|0|3|228
+2|229|0|3|229
+2|230|0|3|230
+2|231|0|3|231
+2|232|0|3|232
+2|233|0|3|233
+2|234|0|3|234
+2|235|0|3|235
+2|236|0|3|236
+2|237|0|3|237
+2|238|0|3|238
+2|239|0|3|239
+2|240|0|3|240
+2|241|0|3|241
+2|242|0|3|242
+2|243|0|3|243
+2|244|0|3|244
+2|245|0|3|245
+2|246|0|3|246
+2|247|0|3|247
+2|248|0|3|248
+2|249|0|3|249
+2|250|0|3|250
+2|251|0|3|251
+2|252|0|3|252
+2|253|0|3|253
+2|254|0|3|254
+2|255|0|3|255
+

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/encodedv_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/encodedv_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder Changed

@@ -15,12 +15,22 @@
 # v 2.5 add threading support and experimental webm encoding
 # v 2.6 made threading support optional because of instability problems; versioning string changed in ffmpeg
 # v 2.7 fixed webm encoding support, removed asf format
+# v 2.8 always prompt for threads
+# v 2.9 check for avconv, change -quality to -qscale
 #######################################################################
 
 if (!defined($standalone)) {
-    my $smogrify=`which smogrify`;
-    chomp($smogrify);
-    require $smogrify;
+    my $smogrify;
+    if ($^O eq "MSWin32") {
+	$smogrify="smogrify";
+    }
+    else {
+	$smogrify=`which smogrify`;
+	chomp($smogrify);
+    }
+    if ($smogrify ne "") {
+	require $smogrify;
+    }
 }
 else {
     $command=$ARGV[0];
@@ -28,7 +38,7 @@
 
 
 if ($command eq "version") {
-    print "ffmpeg encoder plugin v2.7\n";
+    print "ffmpeg encoder plugin v2.9\n";
     exit 0;
 }
 
@@ -109,13 +119,57 @@
 	    
 	    # optional section
 	    print "<params>\n";
+	    print "threads|Number of threads|num0|1|1|16|\n";
 	    print "mp3|Use _mp3 audio codec|bool|1|1\n";
 	    print "mp3lame|Use mp3_lame audio codec|bool|0|1\n";
-	    print "threads|Number of threads (>1 may cause instability)|num0|1|1|16|";
 	    print "</params>\n";
 
+	    print "<param_window>\n";
+	    print "layout|\$p0|\n";
+	    print "</param_window>\n";
+	}
+	else {
+	    # mandatory section
+	    print "<define>\n";
+	    print "|1.7\n";
+	    print "</define>\n";
+	    
+	    # mandatory section
+	    print "<language_code>\n";
+	    print "0xF0\n";
+	    print "</language_code>\n";
+	    
+	    # optional section
+	    print "<params>\n";
+	    print "threads|Number of threads|num0|1|1|16|\n";
+	    print "</params>\n";
+
+	    print "<param_window>\n";
+	    print "layout|\$p0|\n";
+	    print "</param_window>\n";
 	}
     }
+    else {
+	# mandatory section
+	print "<define>\n";
+	print "|1.7\n";
+	print "</define>\n";
+	
+	# mandatory section
+	print "<language_code>\n";
+	print "0xF0\n";
+	print "</language_code>\n";
+	
+	# optional section
+	print "<params>\n";
+	print "threads|Number of threads|num0|1|1|16|\n";
+	print "</params>\n";
+
+	print "<param_window>\n";
+	print "layout|\$p0|\n";
+	print "</param_window>\n";
+	
+    }
 }
 
 
@@ -126,17 +180,36 @@
 
 if ($command eq "encode") {
     # encode
-    $encoder_command="ffmpeg";
 
-    $ffver=`ffmpeg 2>&1|grep libavformat | grep -v configuration`;
+    if ($^O eq "MSWin32") {
+	$nulfile="NUL";
+	$exe=".exe";
+    } else {
+	$nulfile="/dev/null";
+	$exe="";
+    }
+
+    # test first for avconv; otherwise Ubuntu complains
+    $encoder_command="avconv$exe";
+    system("$encoder_command -version >testfile 2>$nulfile");
+
+    if (-z "testfile") {
+	$encoder_command="ffmpeg$exe";
+	system("$encoder_command -version >testfile 2>$nulfile");
+    }
+
+    $ffver=`grep libavformat testfile | grep -v configuration`;
 
     $ffver=(split(/\./,$ffver))[0];
 
     $ffver=(split(" ",$ffver))[-1];
 
-    $usemp3=$ARGV[13];
-    $usemp3lame=$ARGV[14];
-    $nthreads=$ARGV[15];
+    unlink "testfile";
+
+    $nthreads=$ARGV[13];
+
+    $usemp3=$ARGV[14];
+    $usemp3lame=$ARGV[15];
 
     $vid_length=($end-$start+1)/$fps;
 
@@ -168,13 +241,13 @@
 	$vcodec="-f flv";
     }
     elsif ($otype eq "webmh") {
-	$vcodec="-f webm -vcodec libvpx -g 60 -quality best -b 1G";
+	$vcodec="-f webm -vcodec libvpx -g 60 -qscale 1 -b 1G";
     }
     elsif ($otype eq "webmm") {
-	$vcodec="-f webm -vcodec libvpx -g 60 -quality good";
+	$vcodec="-f webm -vcodec libvpx -g 60 -qscale 1 -b 500M";
     }
     elsif ($otype eq "webml") {
-	$vcodec="-f webm -vcodec libvpx -g 60 -quality realtime";
+	$vcodec="-f webm -vcodec libvpx -g 60 -qscale 31";
     }
 
     if ($otype eq "flv-youtube"||$otype eq "flv-youtubex") {
@@ -341,3 +414,18 @@
     $result=(split (/: /,$result))[1];
     return ++$result;
 }
+
+
+sub location {
+    # return the location of an executable
+    my ($command)=shift;
+
+    if ($^O eq "MSWin32") {
+	return "$command.exe";
+    }
+
+    my ($location)=smog_system_direct("which \"$command\" 2>$nulfile");
+    chomp($location);
+
+    $location;
+}

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/mencoder_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/mjpegtools_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/multi_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/multi_encoder Changed

@@ -37,6 +37,9 @@
 
 
 version = '0.2.14'
+
+import os
+
 mpeg = 'lives_mpeg_encoder'
 ogm = 'lives_ogm_encoder'
 mkv = 'lives_mkv_encoder'
@@ -177,11 +180,11 @@
 
     if found:
 	if hassubproc:	
-		p = subprocess.Popen([prog, '-C'],stdout=subprocess.PIPE)
+		p = subprocess.Popen(['python', prog, '-C'],stdout=subprocess.PIPE)
 		std_out_err=p.stdout
 
 	else:
-        	(std_in, std_out_err) = os.popen4(prog  + ' -C')
+        	(std_in, std_out_err) = os.popen4('python ' + prog  + ' -C')
         	std_in.close()
 	
 
@@ -484,11 +487,25 @@
             quiet = '-q'
             tonull = '2> /dev/null'
 
-        encode_command = ' '.join(['lives_' + prog + '_encoder', '-o', \
-                                   outfile, '-w', tempdir, '-a', arc, \
-                                   '-f', fpsc, quiet, '-t', \
-                                   type, '-s ./audiodump.wav', \
-                                   start, end, tonull])
+        if os.name == 'nt':
+            xenc = 'lives_' + prog + '_encoder'
+            rxenc = which(xenc)
+
+            encode_command = ' '.join(['python','"' + rxenc + '"', '-o', \
+                                           outfile, '-w', '"' + tempdir + '"', '-a', arc, \
+                                           '-f', fpsc, quiet, '-t', \
+                                           type, '-s ./audiodump.wav', \
+                                           start, end, tonull])
+
+        else:
+            encode_command = ' '.join(['lives_' + prog + '_encoder', '-o', \
+                                           outfile, '-w', '"' + tempdir + '"', '-a', arc, \
+                                           '-f', fpsc, quiet, '-t', \
+                                           type, '-s ./audiodump.wav', \
+                                           start, end, tonull])
+
+
+
 
         message = """
         I got the following arguments:
@@ -523,7 +540,10 @@
             print >> sys.stderr, message
 
         os.system(encode_command)
-        os.chmod(outfile_orig,stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH)
+
+        
+        if os.name != 'nt':
+            os.chmod(outfile_orig,stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH)
 
         raise SystemExit

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/pdf_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/pdf_encoder Changed

@@ -6,18 +6,28 @@
 # see file COPYING or www.gnu.org for details
 
 #######################################################################
-# LiVES pdf plugin v1.0
+# LiVES pdf plugin v1.2
 
 # version 1.0 original - salsaman
 # version 1.1 - add support for png, correct requires error text
+# version 1.2 - add support for Win32
 
 #######################################################################
 
 if (!defined($standalone)) {
-    my $smogrify=`which smogrify`;
-    chomp($smogrify);
-    require $smogrify;
+    my $smogrify;
+    if ($^O eq "MSWin32") {
+	$smogrify="smogrify";
+    }
+    else {
+	$smogrify=`which smogrify`;
+	chomp($smogrify);
+    }
+    if ($smogrify ne "") {
+	require $smogrify;
+    }
 }
+
 else {
     $command=$ARGV[0];
 }
@@ -27,7 +37,7 @@
 
 
 if ($command eq "version") {
-    print "pdf encoder plugin v1.1\n";
+    print "pdf encoder plugin v1.2\n";
     exit 0;
 }
 
@@ -41,7 +51,7 @@
 	print "Convert was not found. Please install imagemagick and try again.";
 	exit 1;
     }
-    if (&location("gs") eq "") {
+    if (($^O ne "MSWin32" && &location("gs") eq "") || ($^O eq "MSWin32" && &location("gswin32.exe") eq "")) {
 	print "Ghostscript was not found. Please install ghostscript and try again.";
 	exit 1;
     }
@@ -84,7 +94,15 @@
 	$name=&mkname($i);
 	`convert $name$img_ext $name.pdf`;
     }
-    $syscom="gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=\"$nfile\" *.pdf";
+
+    if ($^O eq "MSWin32") {
+	$gscom="gswin32.exe";
+    }
+    else {
+	$gscom="gs";
+    }
+    
+    $syscom="$gscom -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=\"$nfile\" *.pdf";
 
     if (defined($DEBUG_ENCODERS)) {
 	print STDERR "Debug: pdf_encoder command is $syscom\n";

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/qtutils_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/qtutils_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/sswf_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/sswf_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/transcode_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/transcode_encoder Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/encoders/x264_encoder -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/encoders/x264_encoder Changed

@@ -17,15 +17,24 @@
 #######################################################################
 
 if (!defined($standalone)) {
-    my $smogrify=`which smogrify`;
-    chomp($smogrify);
-    require $smogrify;
+    my $smogrify;
+    if ($^O eq "MSWin32") {
+	$smogrify="smogrify";
+    }
+    else {
+	$smogrify=`which smogrify`;
+	chomp($smogrify);
+    }
+    if ($smogrify ne "") {
+	require $smogrify;
+    }
 }
 else {
     $command=$ARGV[0];
 }
 
 
+
 #######################################################################
 
 
@@ -182,7 +191,7 @@
 	system("$syscom $err");
 
 	if ($otype ne "divx+" && $otype ne "divxh+") {
-	    $syscom="MP4Box -fps $fps -add $ofile -add temp.aac \"$nfile\"";
+	    $syscom="MP4Box -fps $fps -tmp $curtmpdir -add $ofile -add temp.aac \"$nfile\"";
 	}
 	else {
 	    $syscom="mkvmerge --default-duration 0:$fps"."fps --title \"$title\" $ofile temp.aac -o \"$nfile\"";
@@ -195,7 +204,7 @@
     }
     else {
 	if ($otype ne "divx+" && $otype ne "divxh+") {
-	    $syscom="MP4Box -fps $fps -add $ofile -add temp.aac \"$nfile\"";
+	    $syscom="MP4Box -fps $fps -tmp $curtmpdir -add $ofile \"$nfile\"";
 	}
 	else {
 	    $syscom="mkvmerge --default-duration 0:$fps"."fps --title \"$title\" $ofile -o \"$nfile\"";

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/audiostream/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/Makefile.am Changed

@@ -6,16 +6,26 @@
 
 if IS_DARWIN
 shared_ldflags =  -dynamiclib -module -avoid-version --tag=disable-static
-shared_cflags = -fno-common
+shared_cflags = -fno-common -DIS_DARWIN=1
 else
 shared_ldflags =  -shared -fPIC -DPIC -module -avoid-version --tag=disable-static
 shared_cflags =  -fPIC -DPIC
 endif
 
-if HAVE_SYSTEM_WEED
-weed_cflags = -DHAVE_SYSTEM_WEED=1
+
+
+if IS_IRIX
+shared_cflags +=-DIS_IRIX=1
 endif
 
+if IS_MINGW
+shared_cflags += -DIS_MINGW=1
+shared_ldflags += -no-undefined -Wl,/usr/i686-pc-mingw32/sys-root/mingw/lib/libSDL.dll.a -Wl,/usr/i686-pc-mingw32/sys-root/mingw/lib/libSDLmain.a -mwindows -Wl,/usr/i686-pc-mingw32/sys-root/mingw/lib/libmingw32.a
+SDL_libs = SDL.la
+CFLAGS_SDL = @SDL_CFLAGS@
+
+else
+
 if HAVE_SDL
 SDL_libs = SDL.la
 CFLAGS_SDL = @SDL_CFLAGS@
@@ -29,6 +39,13 @@
 endif
 endif
 
+endif
+
+if HAVE_SYSTEM_WEED
+weed_cflags = -DHAVE_SYSTEM_WEED=1
+endif
+
+
 if HAVE_MJPEGTOOLS
 YUV4MPEG_libs = yuv4mpeg_stream.la
 oggstream_libs = oggstream.la
@@ -50,21 +67,41 @@
 openGL_la_CPPFLAGS = $(shared_cflags) $(weed_cflags) @X11_CFLAGS@ @XRENDER_CFLAGS@ @GL_CFLAGS@ @GLEE_CFLAGS@
 openGL_la_LDFLAGS = $(shared_ldflags) @X11_LIBS@ @XRENDER_LIBS@ @GL_LIBS@ @GLEE_LIBS@
 
-#if HAVE_GLU
-#openGL_trickery_libs = openGL_trickery.la
-#openGL_trickery_la_SOURCES = openGL_trickery.cpp
-#openGL_trickery_la_CPPFLAGS = $(shared_cflags) $(weed_cflags) @X11_CFLAGS@ @XRENDER_CFLAGS@ @GL_CFLAGS@ @GLEE_CFLAGS@ \
+if HAVE_GLU
+openGL_trickery_libs = openGL_trickery.la
+openGL_trickery_la_SOURCES = openGL_trickery.cpp
+openGL_trickery_la_CPPFLAGS = $(shared_cflags) $(weed_cflags) @X11_CFLAGS@ @XRENDER_CFLAGS@ @GL_CFLAGS@ @GLEE_CFLAGS@ \
 	@GLU_CFLAGS@
-#openGL_trickery_la_LDFLAGS = $(shared_ldflags) @X11_LIBS@ @XRENDER_LIBS@ @GL_LIBS@ @GLEE_LIBS@ @GLU_LIBS@
-#endif
+openGL_trickery_la_LDFLAGS = $(shared_ldflags) @X11_LIBS@ @XRENDER_LIBS@ @GL_LIBS@ @GLEE_LIBS@ @GLU_LIBS@
+
+
+
+if HAVE_SYSTEM_WEED
+openGL_trickery_la_CPPFLAGS += -DHAVE_SYSTEM_WEED
+else
+openGL_trickery_la_LDFLAGS += $(shared_ldflags)
+endif
+
+if HAVE_SYSTEM_WEED_PLUGIN_UTILS
+openGL_trickery_la_CPPFLAGS += -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
+endif
+
+
+
+
+endif
 
 endif
 endif
 endif
 endif
 
+if IS_MINGW
+else
+lives2lives_stream_libs = lives2lives_stream.la 
 lives2lives_stream_la_CFLAGS = $(shared_cflags) $(weed_cflags)
 lives2lives_stream_la_LDFLAGS = $(shared_ldflags)
+endif
 
 yuv4mpeg_stream_la_CFLAGS = @MJPEGTOOLS_CFLAGS@ $(shared_cflags) $(weed_cflags)
 yuv4mpeg_stream_la_LDFLAGS = $(shared_ldflags) @MJPEGTOOLS_LIBS@
@@ -91,6 +128,8 @@
 vloopback2_la_LDFLAGS = $(shared_ldflags)
 endif
 
-videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) $(vjack_output_libs) lives2lives_stream.la $(vloopback_libs) $(vloopback2_libs) $(openGL_libs) $(openGL_trickery_libs)
+videopluginslib_LTLIBRARIES = $(SDL_libs) $(YUV4MPEG_libs) $(oggstream_libs) $(icecast_output_libs) \
+	$(vjack_output_libs) $(lives2lives_stream_libs) $(vloopback_libs) $(vloopback2_libs) \
+	$(openGL_libs) $(openGL_trickery_libs)
 
 EXTRA_DIST = videoplugin.h

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/SDL.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/SDL.c Changed

@@ -3,6 +3,10 @@
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
 
+#if IS_MINGW
+#include <windows.h>
+#endif
+
 #include "videoplugin.h"
 
 #include <stdlib.h>
@@ -12,10 +16,10 @@
 static char plugin_version[64]="LiVES SDL playback engine version 1.2";
 static char error[256];
 
-static int (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
-static boolean render_frame_rgb (int hsize, int vsize, void **pixel_data, void **return_data);
-static boolean render_frame_yuv (int hsize, int vsize, void **pixel_data, void **return_data);
-static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
+static boolean render_frame_rgb (int hsize, int vsize, void **pixel_data);
+static boolean render_frame_yuv (int hsize, int vsize, void **pixel_data);
+static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
 
 static int palette_list[6];
 static int mypalette;
@@ -40,6 +44,28 @@
 //////////////////////////////////////////////
 
 
+static boolean my_setenv(const char *name, const char *value) {
+  // ret TRUE on success
+#if IS_MINGW
+  return SetEnvironmentVariable(name,value);
+#else
+#if IS_IRIX
+  int len  = strlen(name) + strlen(value) + 2;
+  char *env = malloc(len);
+  if (env != NULL) {
+    strcpy(env, name);
+    strcat(env, "=");
+    strcat(env, val);
+    return !putenv(env);
+  }
+}
+#else
+  return !setenv(name,value,1);
+#endif
+#endif
+}
+
+
 const char *module_check_init(void) {
   if (getenv ("HAVE_SDL")==NULL&&system ("which sdl-config >/dev/null 2>&1")==256) {
     snprintf (error,256,"\n\nUnable to find sdl-config in your path.\nPlease make sure you have SDL installed correctly to use this plugin.\nYou can override this with 'export HAVE_SDL=1'\n");
@@ -75,7 +101,7 @@
   return VPP_LOCAL_DISPLAY;
 }
 
-const char *get_rfx (void) {
+const char *get_init_rfx (void) {
   return \
 "<define>\\n\
 |1.7\\n\
@@ -167,13 +193,13 @@
   }
 
   snprintf(tmp,32,"%d",yuvdir);
-  setenv ("SDL_VIDEO_YUV_DIRECT", tmp, 1);
+  my_setenv ("SDL_VIDEO_YUV_DIRECT", tmp);
 
   snprintf(tmp,32,"%d",yuvhwa);
-  setenv ("SDL_VIDEO_YUV_HWACCEL", tmp, 1);
+  my_setenv ("SDL_VIDEO_YUV_HWACCEL", tmp);
 
   snprintf(tmp,32,"%"PRIu64,window_id);
-  if (!fullscreen) setenv ("SDL_WINDOWID", tmp, 1);
+  if (!fullscreen) my_setenv ("SDL_WINDOWID", tmp);
 
   if (fsover) fullscreen=FALSE;
 
@@ -214,12 +240,12 @@
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data,return_data);
+  return render_fn (hsize,vsize,pixel_data);
 }
 
-boolean render_frame_rgb (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_rgb (int hsize, int vsize, void **pixel_data) {
   // broken - crashes
   // hsize and vsize are in pixels (n-byte)
   SDL_LockSurface(RGBimage);
@@ -232,7 +258,7 @@
 }
 
 
-boolean render_frame_yuv (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_yuv (int hsize, int vsize, void **pixel_data) {
   // hsize may be in uyvy-macropixels (2 real pixels per 4 byte macropixel !)
   uint32_t ovtype=SDL_IYUV_OVERLAY;
 
@@ -274,7 +300,7 @@
 }
 
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
   fprintf(stderr,"SDL plugin error: No palette was set !\n");
   return FALSE;
 }

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c Changed

@@ -21,9 +21,9 @@
 
 static char plugin_version[64]="LiVES ogg/theora/vorbis stream engine version 1.0";
 
-static boolean (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data);
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data);
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
 
 static int ov_vsize,ov_hsize;
 
@@ -186,7 +186,7 @@
 }
 
 
-const char *get_rfx (void) {
+const char *get_init_rfx (void) {
   return \
 "<define>\\n\
 |1.7\\n\
@@ -359,12 +359,12 @@
  }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data,return_data);
+  return render_fn (hsize,vsize,pixel_data);
 }
 
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data) {
   int i,z;
   size_t fsize;
   register int j;
@@ -446,7 +446,7 @@
   return TRUE;
 }
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"ogg_stream plugin error: No palette was set !\n");
   }

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c Changed

@@ -17,9 +17,9 @@
 
 static char plugin_version[64]="LiVES to LiVES streaming engine version 1.1";
 
-static boolean (*render_fn)(int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data);
-boolean render_frame_stream (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data);
-boolean render_frame_unknown (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data);
+static boolean (*render_fn)(int hsize, int vsize, int64_t tc, void **pixel_data);
+boolean render_frame_stream (int hsize, int vsize, int64_t tc, void **pixel_data);
+boolean render_frame_unknown (int hsize, int vsize, int64_t tc, void **pixel_data);
 
 /////////////////////////////////////////////////////////////////////////
 
@@ -217,7 +217,7 @@
   return FALSE;
 }
 
-const char *get_rfx (void) {
+const char *get_init_rfx (void) {
   return \
 "<define>\\n\
 |1.7\\n\
@@ -238,7 +238,7 @@
 layout|\\\"You are advised to start with a small frame size and low framerate,\\\"| \\n\
 layout|\\\"and increase this if your network bandwidth allows it.\\\"| \\n\
 layout|p0|\\\".\\\"|p1|\\\".\\\"|p2|\\\".\\\"|p3|fill|fill|fill|fill| \\n\
-layout|fill|p4| \\n\
+layout|p4|fill\\n\
 </param_window> \\n\
 <onchange> \\n\
 </onchange> \\n\
@@ -280,12 +280,12 @@
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,tc,pixel_data,return_data);
+  return render_fn (hsize,vsize,tc,pixel_data);
 }
 
-boolean render_frame_stream (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame_stream (int hsize, int vsize, int64_t tc, void **pixel_data) {
   char hdrstr[128];
   size_t hdrstrlen;
   int mcount;
@@ -338,7 +338,7 @@
 }
 
 
-boolean render_frame_unknown (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame_unknown (int hsize, int vsize, int64_t tc, void **pixel_data) {
   if (lstream->palette==WEED_PALETTE_END) {
     fprintf(stderr,"lives2lives_stream plugin error: No palette was set !\n");
     return 0;

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c Changed

@@ -21,9 +21,9 @@
 
 static char plugin_version[64]="LiVES ogg/theora/vorbis stream engine version 1.0";
 
-static boolean (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data);
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data);
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
 
 static int ov_vsize,ov_hsize;
 
@@ -185,7 +185,7 @@
 }
 
 
-const char *get_rfx (void) {
+const char *get_init_rfx (void) {
   return \
 "<define>\\n\
 |1.7\\n\
@@ -350,12 +350,12 @@
  }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data,return_data);
+  return render_fn (hsize,vsize,pixel_data);
 }
 
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data) {
   int i,z;
   size_t fsize;
   register int j;
@@ -444,7 +444,7 @@
   return TRUE;
 }
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"ogg_stream plugin error: No palette was set !\n");
   }

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/openGL.cpp -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/openGL.cpp Changed

@@ -17,9 +17,9 @@
 static char plugin_version[64]="LiVES openGL playback engine version 1.0";
 static char error[256];
 
-static int (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
-static boolean render_frame_rgba (int hsize, int vsize, void **pixel_data, void **return_data);
-static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
+static boolean render_frame_rgba (int hsize, int vsize, void **pixel_data);
+static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
 
 static int palette_list[5];
 static int mypalette;
@@ -126,7 +126,7 @@
   return VPP_CAN_RESIZE|VPP_LOCAL_DISPLAY;
 }
 
-const char *get_rfx (void) {
+const char *get_init_rfx (void) {
   return \
 "<define>\\n\
 |1.7\\n\
@@ -585,37 +585,24 @@
 }
 
 
-static boolean render_frame_rgba (int hsize, int vsize, void **pixel_data, void **return_data) {
+static boolean render_frame_rgba (int hsize, int vsize, void **pixel_data) {
 
   Upload((uint8_t *)pixel_data[0], hsize, vsize, type);
-
-  if (return_data!=NULL) {
-    glPushAttrib(GL_PIXEL_MODE_BIT);
-    glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
-  
-    glReadBuffer(swapFlag?GL_BACK:GL_FRONT);
-    glPixelStorei(GL_PACK_ALIGNMENT, 1);
-    glReadPixels(0, 0, hsize, vsize, type, GL_UNSIGNED_BYTE, return_data[0]);
-  
-    glPopClientAttrib();
-    glPopAttrib();
-  }
-
   if (swapFlag) glXSwapBuffers( dpy, glxWin );
 
   return TRUE;
 }
 
 
-static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data) {
+static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
   fprintf(stderr,"openGL plugin error: No palette was set !\n");
   return FALSE;
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data,return_data);
+  return render_fn (hsize,vsize,pixel_data);
 }
 
 
@@ -661,7 +648,8 @@
     pthread_mutex_lock(&dpy_mutex);
     if ((volatile Display *)dpy!=NULL) {
       if (XCheckWindowEvent( dpy, xWin, KeyPressMask | KeyReleaseMask, &xEvent ) ) {
-	keySymbol = XKeycodeToKeysym( dpy, xEvent.xkey.keycode, 0 );
+	int keysyms_per_keycode_return;
+	keySymbol = (KeySym)XGetKeyboardMapping(dpy,xEvent.xkey.keycode,0,&keysyms_per_keycode_return);
 	mod_mask=xEvent.xkey.state;
 	pthread_mutex_unlock(&dpy_mutex);

LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/openGL_trickery.cpp Added

@@ -0,0 +1,2189 @@
+// LiVES - openGL playback engine
+// (c) G. Finch 2012 <salsaman@gmail.com>
+// (c) OpenGL effects by Antti Silvast, 2012 <antti.silvast@iki.fi>
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#include "videoplugin.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <assert.h>
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../../../libweed/weed.h"
+#include "../../../../libweed/weed-effects.h"
+#include "../../../../libweed/weed-palettes.h"
+#endif
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h>
+#else
+#include "../../../../libweed/weed-plugin.h"
+#endif
+
+#include "../../../../lives-plugins/weed-plugins/weed-utils-code.c"
+#include "../../../../lives-plugins/weed-plugins/weed-plugin-utils.c"
+
+
+////////////////////////////////////////////////////////////////////////////////////
+
+static char plugin_version[64]="LiVES openGL trickery playback engine version 1.0";
+static char error[256];
+
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean render_frame_rgba (int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+
+static int palette_list[5];
+static int mypalette;
+
+#include <math.h> // for sin and cos
+
+#include <sys/time.h> // added to sync to ticks! -AS
+#include <time.h> // added to sync to ticks! -AS
+
+#include <pthread.h>
+
+/////////////////////////////////////////////
+#include <X11/extensions/Xrender.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+
+#include <GLee.h>
+
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <GL/glu.h>
+
+typedef struct {
+  unsigned long flags;
+  unsigned long functions;
+  unsigned long decorations;
+  long input_mode;
+  unsigned long status;
+} MotifWmHints, MwmHints;
+
+#define MWM_HINTS_FUNCTIONS     (1L << 0)
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+
+static Atom XA_NET_WM_STATE;
+static Atom XA_NET_WM_STATE_ADD;
+static Atom XA_NET_WM_STATE_MAXIMIZED_VERT;
+static Atom XA_NET_WM_STATE_MAXIMIZED_HORZ;
+static Atom XA_NET_WM_STATE_FULLSCREEN;
+static Atom XA_WIN_LAYER;
+
+static Display *dpy;
+
+static Window xWin;
+static GLXWindow glxWin;
+static GLXContext context;
+
+
+static boolean swapFlag = TRUE;
+static boolean is_direct;
+static boolean pbo_available;
+static boolean is_ext;
+
+static volatile boolean playing;
+static volatile boolean rthread_ready;
+static volatile boolean has_texture;
+static volatile boolean has_new_texture;
+static volatile boolean return_ready;
+
+static volatile uint8_t *texturebuf;
+static volatile uint8_t *retdata;
+static volatile uint8_t *retbuf;
+
+static int m_WidthFS;
+static int m_HeightFS;
+
+static int window_width;
+static int window_height;
+
+static int mode=0;
+static int dblbuf=1;
+static int nbuf=32;
+static boolean fsover=FALSE;
+static boolean use_pbo=FALSE;
+
+static float rquad;
+
+static pthread_t rthread;
+static pthread_mutex_t rthread_mutex;
+static pthread_mutex_t dpy_mutex;
+
+static volatile uint32_t imgWidth;
+static volatile uint32_t imgHeight;
+
+static void *render_thread_func(void *data);
+
+static boolean WaitForNotify( Display *dpy, XEvent *event, XPointer arg ) {
+  return (event->type == MapNotify) && (event->xmap.window == (Window) arg);
+}
+
+static GLenum m_TexTarget=GL_TEXTURE_2D;
+
+static float tfps;
+
+static int num_versions=2; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin
+static weed_plant_t *plugin_info;
+
+static weed_plant_t *params[7];
+static int zmode;
+static float zfft0;
+static char *zsubtitles;
+
+
+typedef struct {
+  int width;
+  int height;
+  boolean fullscreen;
+  uint64_t window_id;
+  int argc;
+  char **argv;
+} _xparms;
+
+
+typedef struct {
+  int width;
+  int height;
+  uint32_t type;
+  uint32_t typesize;
+} _texture;
+
+static int ntextures;
+static int ctexture;
+
+static _texture *textures;
+
+static GLuint *texID;
+static GLuint video_pbo;
+
+static int type;
+static int typesize;
+
+//////////////////////////////////////////////
+
+static int get_real_tnum(int tnum, bool do_assert) {
+  tnum=ctexture-1-tnum;
+  if (tnum<0) tnum+=nbuf;
+  assert(tnum>=0);
+  if (do_assert) assert (tnum<ntextures);
+  return tnum;
+}
+
+static int get_texture_width(int tnum) {
+  tnum=get_real_tnum(tnum,TRUE);
+  return textures[tnum].width;
+}
+
+
+static int get_texture_height(int tnum) {
+  tnum=get_real_tnum(tnum,TRUE);
+  return textures[tnum].height;
+}
+
+
+static int get_texture_texID(int tnum) {
+  tnum=get_real_tnum(tnum,FALSE);
+  return texID[tnum];
+}
+
+
+static int get_texture_type(int tnum) {
+  tnum=get_real_tnum(tnum,TRUE);
+  return textures[tnum].type;
+}
+
+
+static int get_texture_typesize(int tnum) {
+  tnum=get_real_tnum(tnum,TRUE);
+  return textures[tnum].type;
+}
+
+///////////////////////////////////////////////
+
+const char *module_check_init(void) {
+  if( !GL_ARB_texture_non_power_of_two) {
+    snprintf (error,256,"\n\nGL_ARB_texture_non_power_of_two unavailable.\nCannot use plugin.\n");
+    return error;
+  }
+
+  pbo_available=FALSE;
+
+  if (GL_ARB_pixel_buffer_object) {
+    pbo_available=TRUE;
+    use_pbo=TRUE;
+  }
+
+  render_fn=&render_frame_unknown;
+
+  glShadeModel(GL_SMOOTH);  
+
+  glClearDepth( 1.0f );
+  glEnable( GL_DEPTH_TEST );
+
+  glDepthFunc( GL_LEQUAL );
+  glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+
+  glPixelStorei( GL_PACK_ALIGNMENT,   1 );
+  glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+  glClearColor( 0.0, 0.0, 0.0, 0.0 );
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+  mypalette=WEED_PALETTE_END;
+
+  zsubtitles=NULL;
+  plugin_info=NULL;
+
+  return NULL;
+}
+
+
+
+const char *version (void) {
+  return plugin_version;
+}
+
+const char *get_description (void) {
+  return "The openGL plugin allows faster playback.\n";
+}
+
+uint64_t get_capabilities (int palette) {
+  return VPP_CAN_RESIZE|VPP_CAN_RETURN|VPP_LOCAL_DISPLAY;
+}
+
+const char *get_init_rfx (void) {
+  return \
+    "<define>\\n\
+|1.7\\n\
+</define>\\n\
+<language_code>\\n\
+0xF0\\n\
+</language_code>\\n\
+<params> \\n\
+mode|_Mode|string_list|0|Flat|Triangle|Rotating|Wobbler|Landscape|Insider|Cube|Turning|Tunnel|Particles|Dissolve\\n\
+tfps|Target _Framerate|num2|50.|1.|200.\\n\
+nbuf|Number of _buffered frames|num0|32|1|256\\n\
+dbuf|Use _double buffering|bool|1|0 \\n\
+fsover|Over-ride _fullscreen setting (for debugging)|bool|0|0 \\n\
+</params> \\n\
+<param_window> \\n\
+</param_window> \\n\
+<onchange> \\n\
+</onchange> \\n\
+";
+}
+
+
+const void **get_play_params (func_ptr weed_bootd) {
+  weed_bootstrap_f weed_boot=(weed_bootstrap_f)weed_bootd;
+
+  weed_plant_t *gui;
+
+  int api,error;
+
+  if (plugin_info==NULL) {
+    plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+
+    // play params
+    params[0]=weed_integer_init ("mode", "Playback _mode", -1, -1, 10);
+    weed_set_int_value(weed_parameter_template_get_gui(params[0]),"hidden",WEED_TRUE);
+
+    params[1]=weed_float_init ("fft0", "fft value 0", -1., 0., 1.);
+    weed_set_int_value(weed_parameter_template_get_gui(params[1]),"hidden",WEED_TRUE);
+
+    params[2]=weed_float_init ("fft1", "fft value 1", -1., 0., 1.);
+    weed_set_int_value(weed_parameter_template_get_gui(params[2]),"hidden",WEED_TRUE);
+
+    params[3]=weed_float_init ("fft2", "fft value 2", -1., 0., 1.);
+    weed_set_int_value(weed_parameter_template_get_gui(params[3]),"hidden",WEED_TRUE);
+
+    params[4]=weed_float_init ("fft3", "fft value 3", -1., 0., 1.);
+    weed_set_int_value(weed_parameter_template_get_gui(params[4]),"hidden",WEED_TRUE);
+
+    params[5]=weed_text_init ("subtitles", "_Subtitles", "");
+    weed_set_int_value(weed_parameter_template_get_gui(params[5]),"hidden",WEED_TRUE);
+
+    params[6]=NULL;
+  }
+
+  return (const void **)params;
+}
+
+
+const int *get_palette_list(void) {
+  // return palettes in order of preference, ending with WEED_PALETTE_END
+  palette_list[0]=WEED_PALETTE_RGB24;
+  palette_list[1]=WEED_PALETTE_BGR24;
+  palette_list[2]=WEED_PALETTE_RGBA32;
+  palette_list[3]=WEED_PALETTE_BGRA32;
+  palette_list[4]=WEED_PALETTE_END;
+  return palette_list;
+}
+
+
+boolean set_palette (int palette) {
+  if (palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_RGB24||
+      palette==WEED_PALETTE_BGR24||palette==WEED_PALETTE_BGRA32) {
+    render_fn=&render_frame_rgba;
+    mypalette=palette;
+    return TRUE;
+  }
+  // invalid palette
+  return FALSE;
+}
+
+
+
+static void setWindowDecorations(void) {
+  unsigned char* pucData;
+  int iFormat;
+  unsigned long ulItems;
+  unsigned long ulBytesAfter;
+  Atom typeAtom;
+  MotifWmHints newHints;
+
+  Atom WM_HINTS;
+  boolean set=FALSE;
+
+  WM_HINTS = XInternAtom(dpy, "_MOTIF_WM_HINTS", True);
+  if (WM_HINTS != None) {
+
+    XGetWindowProperty (dpy, xWin, WM_HINTS, 0,
+			sizeof (MotifWmHints) / sizeof (long),
+			False, AnyPropertyType, &typeAtom,
+			&iFormat, &ulItems, &ulBytesAfter, &pucData);
+  
+    newHints.flags = MWM_HINTS_DECORATIONS;
+    newHints.decorations = 0;
+  
+    XChangeProperty (dpy, xWin, WM_HINTS, WM_HINTS,
+		     32, PropModeReplace, (unsigned char *) &newHints,
+		     sizeof (MotifWmHints) / sizeof (long));
+
+    set = TRUE;
+  }
+
+  /* Now try to set KWM hints */
+  WM_HINTS = XInternAtom(dpy, "KWM_WIN_DECORATION", True);
+  if (WM_HINTS != None) {
+    long KWMHints = 0;
+
+    XChangeProperty(dpy, xWin, WM_HINTS, WM_HINTS, 32,
+		    PropModeReplace,
+		    (unsigned char *) &KWMHints,
+		    sizeof(KWMHints) / 4);
+    set = TRUE;
+  }
+  /* Now try to set GNOME hints */
+  WM_HINTS = XInternAtom(dpy, "_WIN_HINTS", True);
+  if (WM_HINTS != None) {
+    long GNOMEHints = 0;
+
+    XChangeProperty(dpy, xWin, WM_HINTS, WM_HINTS, 32,
+		    PropModeReplace,
+		    (unsigned char *) &GNOMEHints,
+		    sizeof(GNOMEHints) / 4);
+    set = TRUE;
+  }
+  /* Finally set the transient hints if necessary */
+  if (!set) {
+    XSetTransientForHint(dpy, xWin, RootWindow(dpy, DefaultScreen(dpy)));
+  }
+
+}
+
+
+static void toggleVSync() {
+  if( GLX_SGI_swap_control ) {
+    if (1)
+      glXSwapIntervalSGI(1);
+    else
+      glXSwapIntervalSGI(2);
+  }
+}
+
+
+static void alwaysOnTop() {
+  long propvalue = 12;
+  XChangeProperty( dpy, xWin, XA_WIN_LAYER, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&propvalue, 1 );
+  XRaiseWindow(dpy, xWin);
+}
+
+
+
+
+static boolean
+isWindowMapped(void)
+{
+  XWindowAttributes attr;
+
+  XGetWindowAttributes(dpy, xWin, &attr);
+  if (attr.map_state != IsUnmapped) {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+
+
+static void setFullScreen(void) {
+  XWindowChanges changes;
+  unsigned int valueMask = CWX | CWY | CWWidth | CWHeight;
+  
+  setWindowDecorations();
+
+  XA_NET_WM_STATE = XInternAtom(dpy, "_NET_WM_STATE", False);
+  XA_NET_WM_STATE_ADD = XInternAtom(dpy, "_NET_WM_STATE_ADD", False);
+
+  XA_NET_WM_STATE_MAXIMIZED_VERT = XInternAtom(dpy, "_NET_WM_STATE_MAXIMIZED_VERT",False);
+  XA_NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom(dpy,"_NET_WM_STATE_MAXIMIZED_HORZ",False);
+  XA_NET_WM_STATE_FULLSCREEN = XInternAtom(dpy,"_NET_WM_STATE_FULLSCREEN",False);
+  
+
+  if (isWindowMapped()) {
+    XEvent e;
+
+    memset(&e,0,sizeof(e));
+    e.xany.type = ClientMessage; 
+    e.xclient.message_type = XA_NET_WM_STATE;
+    e.xclient.format = 32;
+    e.xclient.window = xWin;
+    e.xclient.data.l[0] = XA_NET_WM_STATE_ADD;
+    e.xclient.data.l[1] = XA_NET_WM_STATE_FULLSCREEN;
+    e.xclient.data.l[3] = 0l;
+
+    XSendEvent(dpy, RootWindow(dpy, 0), 0,
+	       SubstructureNotifyMask | SubstructureRedirectMask, &e);
+  } else {
+    int count = 0;
+    Atom atoms[3];
+
+    atoms[count++] = XA_NET_WM_STATE_FULLSCREEN;
+    atoms[count++] = XA_NET_WM_STATE_MAXIMIZED_VERT;
+    atoms[count++] = XA_NET_WM_STATE_MAXIMIZED_HORZ;
+    XChangeProperty(dpy, xWin, XA_NET_WM_STATE, XA_ATOM, 32,
+		    PropModeReplace, (unsigned char *)atoms, count);
+  }
+
+  changes.x = 0;
+  changes.y = 0;
+  changes.width = m_WidthFS;
+  changes.height = m_HeightFS;
+  changes.stack_mode = Above;
+  valueMask |= CWStackMode;
+  
+  XMapRaised(dpy, xWin);
+  XConfigureWindow(dpy, xWin, valueMask, &changes);
+  XResizeWindow(dpy, xWin, m_WidthFS, m_HeightFS);
+
+  alwaysOnTop();
+}
+
+
+
+
+
+static int get_size_for_type(int type) {
+  switch (type) {
+  case GL_RGBA:
+  case GL_BGRA:
+    return 4;
+  case GL_RGB:
+  case GL_BGR:
+    return 3;
+  default:
+    assert(0);
+  }
+}
+
+
+static volatile uint8_t *buffer_free(volatile uint8_t *retbuf) {
+  if (retbuf==NULL) return NULL;
+  if (use_pbo) {
+    GLint binding;
+    glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING_ARB, &binding);
+    glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, video_pbo);
+    glUnmapBuffer(GL_PIXEL_PACK_BUFFER_ARB);
+    glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, binding);
+  }
+  else {
+    free((void *)retbuf);
+  }
+  return NULL;
+}
+
+
+static uint8_t *render_to_mainmem(int type) {
+  // copy GL drawing buffer to main mem
+
+  uint8_t *xretbuf;
+
+  glFlush();
+
+  glPushAttrib(GL_PIXEL_MODE_BIT);
+  glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+
+  glReadBuffer(swapFlag?GL_BACK:GL_FRONT);
+  glPixelStorei(GL_PACK_ALIGNMENT, 1);
+  glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+  
+  if (!use_pbo) {
+    xretbuf=(uint8_t *)malloc(window_width*window_height*get_size_for_type(type));
+    if (!xretbuf) {
+      glPopClientAttrib();
+      glPopAttrib();
+      return NULL;
+    }
+    glReadPixels(0, 0, window_width, window_height, type, GL_UNSIGNED_BYTE, xretbuf);
+  }
+  else {
+    GLint binding;
+
+    glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING_ARB, &binding);
+    glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, video_pbo);
+
+    // read pixels into pbo buffer
+    glReadPixels(0, 0, window_width, window_height, type, GL_UNSIGNED_BYTE, NULL);
+
+    // map pbo to main memory
+    xretbuf = (uint8_t *)glMapBuffer(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY);
+
+    glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, binding);
+  }
+
+  return xretbuf;
+}
+
+
+
+
+static void render_to_gpumem_inner(int tnum, int width, int height, int type, int typesize, volatile uint8_t *texturebuf) {
+  int mipMapLevel=0;
+  int texID=get_texture_texID(tnum);
+  
+  glEnable( m_TexTarget );
+  
+  glBindTexture( m_TexTarget, texID );
+  
+  glTexImage2D( m_TexTarget, mipMapLevel, type, width, height, 0, type, GL_UNSIGNED_BYTE, (const GLvoid*)texturebuf );
+  glGenerateMipmap(m_TexTarget);
+  
+  glDisable( m_TexTarget );
+  
+  tnum=get_real_tnum(tnum,FALSE);
+
+  textures[tnum].width=width;
+  textures[tnum].height=height;
+  
+  textures[tnum].type=type;
+  textures[tnum].typesize=typesize;
+
+}
+
+
+
+
+static void render_to_gpumem(int tnum, uint8_t *texturebuf) {
+  render_to_gpumem_inner(get_real_tnum(tnum,TRUE),get_texture_width(tnum),get_texture_height(tnum),
+			 get_texture_type(tnum),get_size_for_type(get_texture_type(tnum)),texturebuf);
+}
+
+
+
+
+boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+  _xparms xparms;
+
+  register int i;
+
+  if (mypalette==WEED_PALETTE_END) {
+    fprintf(stderr,"openGL plugin error: No palette was set !\n");
+    return FALSE;
+  }
+
+  xparms.width=width;
+  xparms.height=height;
+  xparms.fullscreen=fullscreen;
+  xparms.window_id=window_id;
+  xparms.argc=argc;
+  xparms.argv=argv;
+
+  mode=0;
+  tfps=50.;
+  nbuf=32;
+  dblbuf=1;
+  fsover=FALSE;
+
+  if (argc>0) {
+    mode=atoi(argv[0]);
+    if (argc>1) {
+      tfps=atof(argv[1]);
+      if (argc>2) {
+	nbuf=atoi(argv[2]);
+	if (argc>3) {
+	  dblbuf=atoi(argv[3]);
+	  if (argc>4) {
+	    fsover=atoi(argv[4]);
+	  }}}}}
+
+  texID=(GLuint *)malloc(nbuf * sizeof(GLuint));
+
+  glGenTextures(nbuf, texID);
+
+  textures=(_texture *)malloc(nbuf*sizeof(_texture));
+
+  for (i=0;i<nbuf;i++) {
+    textures[i].width=textures[i].height=0;
+  }
+
+  ntextures=ctexture=0;
+
+  playing=TRUE;
+
+  rthread_ready=FALSE;
+  has_texture=FALSE;
+  has_new_texture=FALSE;
+  texturebuf=NULL;
+
+  pthread_create(&rthread,NULL,render_thread_func,&xparms);
+
+  // wait for render thread to start up
+  while (!rthread_ready) usleep(1000);
+
+  if (!playing) {
+    fprintf(stderr,"openGL plugin error: Failed to start render thread\n");
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+
+
+
+static boolean init_screen_inner (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+
+  // screen size is in RGB pixels
+  char tmp[32];
+
+  uint32_t modeopts=0;
+
+  int renderEventBase;
+  int renderErrorBase;
+  int error;
+
+  int numElements;
+
+  Cursor invisibleCursor;
+  Pixmap bitmapNoData;
+  XColor black;
+  static char noData[] = { 0,0,0,0,0,0,0,0 };
+
+  Atom wmDelete;
+  
+  int singleBufferAttributess[] = {
+    GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+    GLX_RENDER_TYPE,   GLX_RGBA_BIT,
+    GLX_RED_SIZE,      1,			//	Request a single buffered color buffer
+    GLX_GREEN_SIZE,    1,			//	with the maximum number of color bits
+    GLX_BLUE_SIZE,     1,			//	for each component.
+    GLX_ALPHA_SIZE,    1,
+    None
+  };
+  
+  int doubleBufferAttributes[] = {
+    GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+    GLX_RENDER_TYPE,   GLX_RGBA_BIT,
+    GLX_DOUBLEBUFFER,  True,		//	Request a double-buffered color buffer with
+    GLX_RED_SIZE,      1,			//	the maximum number of bits per component.
+    GLX_GREEN_SIZE,    1,
+    GLX_BLUE_SIZE,     1,
+    GLX_ALPHA_SIZE,    1,
+    None
+  };
+
+  XVisualInfo          *vInfo;
+  GLXFBConfig          *fbConfigs;
+  XEvent                event;
+  XSetWindowAttributes  swa;
+  int                   swaMask;
+  int                   numReturned;
+
+  if (fsover) fullscreen=FALSE;
+
+  /* Open a connection to the X server */
+  dpy = XOpenDisplay( NULL );
+
+  if ( dpy == NULL ) {
+    fprintf(stderr, "Unable to open a connection to the X server\n" );
+    return FALSE;
+  }
+
+  m_WidthFS = WidthOfScreen(DefaultScreenOfDisplay(dpy));
+  m_HeightFS = HeightOfScreen(DefaultScreenOfDisplay(dpy));
+
+  XA_WIN_LAYER = XInternAtom(dpy, "_WIN_LAYER", False);
+
+  if( !XRenderQueryExtension( dpy, &renderEventBase, &renderErrorBase ) ) {
+    fprintf(stderr, "No RENDER extension found!" );
+    return FALSE;
+  }
+
+  swa.event_mask = StructureNotifyMask | ButtonPressMask | KeyPressMask | KeyReleaseMask;
+
+  if (window_id) {
+    XVisualInfo *xvis;
+    XVisualInfo xvtmpl;
+    XWindowAttributes attr;
+
+    xWin = (Window) window_id;
+    XGetWindowAttributes(dpy, xWin, &attr);
+    glxWin = xWin;
+
+    xvtmpl.visual=attr.visual;
+    xvtmpl.visualid=XVisualIDFromVisual(attr.visual);
+
+    xvis=XGetVisualInfo(dpy,VisualIDMask,&xvtmpl,&numReturned);
+
+    if (numReturned==0) {
+      fprintf(stderr,"openGL plugin error: No xvis could be set !\n");
+      return FALSE;
+    }
+
+    context = glXCreateContext ( dpy, &xvis[0], 0, GL_TRUE);
+
+    width=window_width=attr.width;
+    height=window_height=attr.height;
+    glXGetConfig(dpy, xvis, GLX_DOUBLEBUFFER, &swapFlag);
+    is_ext=TRUE;
+  }
+  else {
+    width=window_width=fullscreen?m_WidthFS:width;
+    height=window_height=fullscreen?m_HeightFS:height; 
+
+    if (dblbuf) {
+      /* Request a suitable framebuffer configuration - try for a double 
+      ** buffered configuration first */
+      fbConfigs = glXChooseFBConfig( dpy, DefaultScreen(dpy),
+				     doubleBufferAttributes, &numReturned );
+    }
+    
+    if ( fbConfigs == NULL ) {  /* no double buffered configs available */
+      fbConfigs = glXChooseFBConfig( dpy, DefaultScreen(dpy),
+				     singleBufferAttributess, &numReturned );
+      swapFlag = FALSE;
+    }
+    
+    if (!fbConfigs) {
+      fprintf(stderr,"openGL plugin error: No config could be set !\n");
+      return FALSE;
+    }
+    
+    /* Create an X colormap and window with a visual matching the first
+    ** returned framebuffer config */
+    vInfo = glXGetVisualFromFBConfig( dpy, fbConfigs[0] );
+    
+    if (!vInfo) {
+      fprintf(stderr,"openGL plugin error: No vInfo could be got !\n");
+      return FALSE;
+    }
+
+    swa.colormap = XCreateColormap( dpy, RootWindow(dpy, vInfo->screen),
+				    vInfo->visual, AllocNone );
+    
+    if (!swa.colormap) {
+      fprintf(stderr,"openGL plugin error: No colormap could be set !\n");
+      return FALSE;
+    }
+    
+    swaMask = CWBorderPixel | CWColormap | CWEventMask;
+    
+    swa.border_pixel = 0;
+
+    xWin = XCreateWindow( dpy, RootWindow(dpy, vInfo->screen), 0, 0,
+			  width,height,
+			  0, vInfo->depth, InputOutput, vInfo->visual,
+			  swaMask, &swa );
+
+    if (fullscreen) setFullScreen();
+
+    XMapRaised( dpy, xWin );
+    if (fullscreen) XIfEvent( dpy, &event, WaitForNotify, (XPointer) xWin );
+
+    if (fullscreen) setFullScreen();
+
+    /* Create a GLX context for OpenGL rendering */
+    context = glXCreateNewContext( dpy, fbConfigs[0], GLX_RGBA_TYPE,
+				   NULL, True );
+
+    /* Create a GLX window to associate the frame buffer configuration
+    ** with the created X window */
+    glxWin = glXCreateWindow( dpy, fbConfigs[0], xWin, NULL );
+    
+    XFree (vInfo);
+
+    black.red = black.green = black.blue = 0;
+    
+    bitmapNoData = XCreateBitmapFromData( dpy, xWin, noData, 8, 8 );
+    invisibleCursor = XCreatePixmapCursor( dpy, bitmapNoData, bitmapNoData, 
+					   &black, &black, 0, 0 );
+    XDefineCursor( dpy, xWin, invisibleCursor );
+    XFreeCursor( dpy, invisibleCursor );
+
+    is_ext=FALSE;
+  }
+
+  glXMakeCurrent( dpy, glxWin, context );
+
+  toggleVSync();
+
+  error = glGetError();
+  if( error != GL_NO_ERROR ) {
+    char *msg = "";
+      
+    if( error == GL_INVALID_ENUM )	msg = "GL_INVALID_ENUM";
+    else if( error == GL_INVALID_VALUE ) msg = "GL_INVALID_VALUE";
+    else if( error ==    GL_INVALID_OPERATION) msg = "GL_INVALID_OPERATION";
+    else if( error ==    GL_STACK_OVERFLOW)	msg = "GL_STACK_OVERFLOW";
+    else if( error ==    GL_STACK_UNDERFLOW)	msg = "GL_STACK_UNDERFLOW";
+    else if( error ==    GL_OUT_OF_MEMORY)	msg = "GL_OUT_OF_MEMORY";
+    else if( error ==    GL_INVALID_FRAMEBUFFER_OPERATION_EXT)	msg = "GL_INVALID_FRAMEBUFFER_OPERATION_EXT";
+    else msg = "Unrecognized OpenGL error";
+    
+    fprintf(stderr, "%s in %s(%d)", msg, __FILE__, __LINE__ );
+    return FALSE;
+  }
+
+
+  /* OpenGL rendering ... */
+  glClearColor( 0.0, 0.0, 0.0, 0.0 );
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+
+  if (use_pbo) {
+    GLint binding;
+    glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING_ARB, &binding);
+    glPushAttrib(GL_ALL_ATTRIB_BITS);
+    
+    glGenBuffers(1, &video_pbo);
+
+    glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, video_pbo);
+
+    // create a buffer the size of the window
+    glBufferData(GL_PIXEL_PACK_BUFFER_ARB, window_width * window_height * 4, NULL, GL_DYNAMIC_READ );
+    
+    glPopAttrib();
+    glBindBuffer(GL_PIXEL_PACK_BUFFER_ARB, binding);
+  }
+
+  glFlush();
+  if ( swapFlag ) glXSwapBuffers( dpy, glxWin );
+
+  type=GL_RGBA;
+  if (mypalette==WEED_PALETTE_RGB24) type=GL_RGB;
+  else if (mypalette==WEED_PALETTE_BGR24) type=GL_BGR;
+  else if (mypalette==WEED_PALETTE_BGRA32) type=GL_BGRA;
+
+  typesize=get_size_for_type(type);
+
+
+  rquad=0.;
+
+  if (glXIsDirect(dpy, context)) 
+    is_direct=TRUE;
+  else
+    is_direct=FALSE;
+
+  return TRUE;
+}
+
+
+
+static void set_priorities(void) {
+  // prioritise textures so the most recent ones have highest priority
+  // GL should swap oldest out memory and swap newst in memory
+
+  float pri=1.;
+  GLclampf *prios=(GLclampf *)malloc(nbuf * sizeof(GLclampf));
+  int idx=ctexture;
+
+  register int i;
+
+  for (i=0;i<nbuf;i++) {
+    prios[i]=0.;
+  }
+
+  for (i=0;i<nbuf;i++) {
+    prios[idx]=pri;
+    idx--;
+    if (idx<0) idx+=nbuf;
+    if (idx>ntextures) break;
+    pri-=1./(float)nbuf;
+    if (pri<0.) pri=0.;
+  }
+
+  glPrioritizeTextures(nbuf,texID,prios);
+  
+  free(prios);
+
+}
+
+
+static void resize_buffer(uint8_t *out, int owidth, int oheight, uint8_t *in, int iwidth, int iheight, int type) {
+  int xi,xj;
+  int typesize=get_size_for_type(type);
+  float scalex,scaley;
+
+  register int i,j;
+
+  uint8_t *ptr, *dst;
+
+  scalex=(float)iwidth/(float)owidth;
+  scaley=(float)iheight/(float)oheight;
+
+  dst=out;
+
+  for (i=0;i<oheight;i++) {
+    xi=(float)i*scaley;
+    ptr=in+xi*iwidth*typesize;
+    for (j=0;j<owidth;j++) {
+      xj=(float)j*scaley;
+      memcpy(dst,ptr+xj*typesize,typesize);
+      dst+=typesize;
+    }
+    
+  }
+}
+
+
+
+static boolean Upload(int width, int height) {
+  int imgWidth=width;
+  int imgHeight=height;
+
+  int texID;
+
+  if (zmode!=-1) mode=zmode;
+
+  if (has_new_texture) {
+    ctexture++;
+    if (ctexture==nbuf) ctexture=0;
+    if (ntextures<nbuf) ntextures++;
+
+    has_new_texture=FALSE;
+
+    render_to_gpumem_inner(0,width,height,type,typesize,texturebuf);
+  
+    set_priorities();
+
+  }
+
+  pthread_mutex_unlock(&rthread_mutex); // re-enable texture thread
+
+  if (!return_ready&&retbuf!=NULL) {
+    retbuf=buffer_free(retbuf);
+  }
+
+  texID=get_texture_texID(0);
+
+
+
+  ////////////////////////////////////////////////////////////
+  // modes
+
+
+  switch (mode) {
+  case 0:
+    {
+      // flat:
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+      
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.);
+      
+      glEnable( m_TexTarget );
+      
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+      
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+      
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+
+      glBindTexture( m_TexTarget, texID );
+      
+      glBegin (GL_QUADS);
+      
+      glTexCoord2f (0.0, 0.0);
+      glVertex3f (-1.0, 1.1, 0.0);
+      
+      glTexCoord2f (1.0, 0.0);
+      glVertex3f (1.0, 1.1, 0.0);
+      
+      glTexCoord2f (1.0, 1.0);
+      glVertex3f (1.0, -1.0, 0.0);
+      
+      glTexCoord2f (0.0, 1.0);
+      glVertex3f (-1.0, -1.0, 0.0);
+      
+      glEnd ();
+      
+      glDisable( m_TexTarget );
+    }
+    break;
+
+  case 1:
+    {
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      //gluPerspective(60.0f,(GLfloat)window_width/(GLfloat)window_height,0.1f,100.0f);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.0);
+
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glBegin(GL_TRIANGLES);                      // Drawing Using Triangles
+
+      glTexCoord2f (0.5, 0.0);
+      glVertex3f( 0.0f, 1.0f, 0.0f);              // Top
+      
+      glTexCoord2f (0.0, 1.0);
+      glVertex3f(-1.0f,-1.0f, 0.0f);              // Bottom Left
+      
+      glTexCoord2f (1.0, 1.0);
+      glVertex3f( 1.0f,-1.0f, 0.0f);              // Bottom Right
+      glEnd();     
+      
+      glTranslatef(-1.5f,0.0f,-6.0f);
+      glEnd();
+
+      glDisable( m_TexTarget );
+    }
+    break;
+
+  case 2:
+    {
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.);
+
+      // rotations
+      glMatrixMode(GL_PROJECTION);                // Select The Projection Matrix
+      //glLoadIdentity();
+      //gluPerspective(45.0f,(GLfloat)window_width/(GLfloat)window_height,0.1f,100.0f);
+ 
+      glRotatef(rquad,0.0f,0.0f,1.0f);            // Rotate The Quad On The Z axis
+      
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      rquad-=0.5f;                       // Decrease The Rotation Variable For The Quad 
+
+      glBegin (GL_QUADS);
+      
+      glTexCoord2f (0.0, 0.0);
+      glVertex3f (-1.0, 1.1, 0.0);
+      
+      glTexCoord2f (1.0, 0.0);
+      glVertex3f (1.0, 1.1, 0.0);
+      
+      glTexCoord2f (1.0, 1.0);
+      glVertex3f (1.0, -1.0, 0.0);
+      
+      glTexCoord2f (0.0, 1.0);
+      glVertex3f (-1.0, -1.0, 0.0);
+      
+      glEnd ();
+      
+      glDisable( m_TexTarget );
+    }
+    break;
+
+  case 3:
+    {
+      // wobbler:
+
+      // sync to the clock with the clock_gettime function
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.1);
+
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+
+      glEnable(GL_DEPTH_TEST);
+
+      // parameters of the wobbler grid: the larger the width and height, the more detailed the effect is
+#define WX 160 // grid width
+#define WY 160 // grid height
+	
+      // precalculate the gaps between grid points
+#define VX_PLUS (2.0/WX)
+#define VY_PLUS (2.0/WY)
+#define TX_PLUS (1.0/WX)
+#define TY_PLUS (1.0/WY)
+
+      // parameters for the sin waves
+#define TSPD1 0.003 	// speed (in msec)
+#define XSPD1 0.01 	// speed (along grid X)
+#define YSPD1 0.2 	// speed (along grid Y)
+#define A1 0.13 	// amplitute
+
+#define TSPD2 0.004	// speed (in msec)
+#define XSPD2 0.15	// speed (along grid X)
+#define YSPD2 0.03	// speed (along grid Y)
+#define A2 0.04		// amplitude
+
+      float vx=-1.0,vy=1.0;
+      float tx=0.0,ty=sin(ticks*0.001)*0.2;
+
+      float vz;
+
+      for (int j=0; j<WY; j++) {
+	vx=-1.0; tx=0.0;
+	for (int i=0; i<WX; i++) {
+	  glBegin (GL_QUADS);
+      
+	  float col=1.0-sin(i*0.05+j*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  vz=sin(ticks*TSPD1+i*XSPD1+j*YSPD1)*A1+cos(ticks*TSPD2+i*XSPD2+j*YSPD2)*A2;
+	  glTexCoord2f (tx,ty);
+	  glVertex3f (vx,vy, vz);
+      
+	  vz=sin(ticks*TSPD1+(i+1)*XSPD1+j*YSPD1)*A1+cos(ticks*TSPD2+(i+1)*XSPD2+j*YSPD2)*A2;
+	  col=1.0-sin((i+1)*0.05+j*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  glTexCoord2f (tx+TX_PLUS, ty);
+	  glVertex3f (vx+VX_PLUS, vy, vz);
+      
+	  vz=sin(ticks*TSPD1+(i+1)*XSPD1+(j+1)*YSPD1)*A1+cos(ticks*TSPD2+(i+1)*XSPD2+(j+1)*YSPD2)*A2;
+	  col=1.0-sin((i+1)*0.05+(j+1)*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  glTexCoord2f (tx+TX_PLUS, ty+TY_PLUS);
+	  glVertex3f (vx+VX_PLUS, vy-VY_PLUS, vz);
+      
+	  vz=sin(ticks*TSPD1+i*XSPD1+(j+1)*YSPD1)*A1+cos(ticks*TSPD2+i*XSPD2+(j+1)*YSPD2)*A2;
+	  col=1.0-sin(i*0.05+(j+1)*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  glTexCoord2f (tx, ty+TY_PLUS);
+	  glVertex3f (vx, vy-VY_PLUS, vz);
+      
+	  glEnd ();
+
+	  vx+=VX_PLUS;
+	  tx+=TX_PLUS;
+
+	}
+	vy-=VY_PLUS;
+	ty+=TY_PLUS;
+
+      }
+      glDisable( m_TexTarget );
+    }
+    break;
+
+  case 4:
+    {
+      // landscape:
+
+      // time sync
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.1);
+
+      // tilt the texture to look like a landscape
+      glRotatef(-60,1,0,0);
+      // add a little bit of rotating movement
+      glRotatef(sin(ticks*0.001)*15,0,1,1);
+
+      glScalef(1.3,1.0,1.0); // make the landscape wide!
+
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+
+      glEnable(GL_DEPTH_TEST);
+
+      // parameters of the landscape grid: the larger the width and height, the more detailed the effect is
+#define WX 160 // grid width
+#define WY 160 // grid height
+	
+      // precalculate the gaps between grid points
+#define VX_PLUS (2.0/WX)
+#define VY_PLUS (2.0/WY)
+#define TX_PLUS (1.0/WX)
+#define TY_PLUS (1.0/WY)
+
+      // sin wave parameters
+#define TSPD1 0.003     // speed (in msecs)
+#define XSPD1 0.01      // speed (along grid X)
+#define YSPD1 0.2       // speed (along grid Y)
+#define A12 0.04         // amplitute
+
+#define TSPD2 0.004     // speed (in msec)
+#define XSPD2 0.15      // speed (along grid X)
+#define YSPD2 0.03      // speed (along grid Y)
+#define A22 0.05         // amplitude
+
+
+      float vx=-1.0,vy=1.0;
+      float tx=0.0,ty=-(ticks % 4000)*0.00025;
+      float vz;
+
+      for (int j=0; j<WY; j++) {
+	vx=-1.0; tx=0.0;
+	for (int i=0; i<WX; i++) {
+	  glBegin (GL_QUADS);
+      
+	  float col=1.0-sin(i*0.05+j*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  vz=sin(ticks*TSPD1+i*XSPD1+j*YSPD1)*A12+cos(ticks*TSPD2+i*XSPD2+j*YSPD2)*A22;
+	  glTexCoord2f (tx,ty);
+	  glVertex3f (vx,vy, vz);
+      
+	  vz=sin(ticks*TSPD1+(i+1)*XSPD1+j*YSPD1)*A12+cos(ticks*TSPD2+(i+1)*XSPD2+j*YSPD2)*A22;
+	  col=1.0-sin((i+1)*0.05+j*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  glTexCoord2f (tx+TX_PLUS, ty);
+	  glVertex3f (vx+VX_PLUS, vy, vz);
+      
+	  vz=sin(ticks*TSPD1+(i+1)*XSPD1+(j+1)*YSPD1)*A12+cos(ticks*TSPD2+(i+1)*XSPD2+(j+1)*YSPD2)*A22;
+	  col=1.0-sin((i+1)*0.05+(j+1)*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  glTexCoord2f (tx+TX_PLUS, ty+TY_PLUS);
+	  glVertex3f (vx+VX_PLUS, vy-VY_PLUS, vz);
+      
+	  vz=sin(ticks*TSPD1+i*XSPD1+(j+1)*YSPD1)*A12+cos(ticks*TSPD2+i*XSPD2+(j+1)*YSPD2)*A22;
+	  col=1.0-sin(i*0.05+(j+1)*0.06)*1.0;
+	  glColor3f(col,col,col);
+
+	  glTexCoord2f (tx, ty+TY_PLUS);
+	  glVertex3f (vx, vy-VY_PLUS, vz);
+      
+	  glEnd ();
+
+	  vx+=VX_PLUS;
+	  tx+=TX_PLUS;
+
+	}
+	vy-=VY_PLUS;
+	ty+=TY_PLUS;
+
+      }
+      glDisable( m_TexTarget );
+    }
+
+    break;
+
+  case 5:
+    {
+      // insider:
+
+      // time sync
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.0);
+
+      // turn the cube
+      glRotatef(ticks*0.07,0,1,0);
+      glRotatef(ticks*0.08,0,0,1);
+      glRotatef(ticks*0.035,1,0,0);
+
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glEnable(GL_DEPTH_TEST);
+
+      // draw the cube with the texture
+      for (int i=0; i<6; i++) {
+	glBegin (GL_QUADS);
+      
+	glTexCoord2f (0.0, 0.0);
+	glVertex3f (-1.0, 1.0, 1.0);
+      
+	glTexCoord2f (1.0, 0.0);
+	glVertex3f (1.0, 1.0, 1.0);
+     
+	glTexCoord2f (1.0, 1.0);
+	glVertex3f (1.0, -1.0, 1.0);
+      
+	glTexCoord2f (0.0, 1.0);
+	glVertex3f (-1.0, -1.0, 1.0);
+      
+	glEnd ();
+	if (i<3) glRotatef(90,0,1,0);
+	else if (i==3) glRotatef(90,1,0,0);
+	else if (i==4) glRotatef(180,1,0,0);
+      }
+
+      glDisable( m_TexTarget );
+    }
+
+    break;
+
+  case 6:
+    {
+      // cube:
+
+      // time sync
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glEnable(GL_DEPTH_TEST);
+
+      // inner + outer cube
+      for (int k=0; k<2; k++) {
+
+	glPushMatrix();
+	glTranslatef(0.0,0.0,-1.0);
+
+	// turn the cube
+	glRotatef(ticks*0.036,0,1,0);
+	glRotatef(ticks*0.07,0,0,1);
+	glRotatef(ticks*0.08,1,0,0);
+
+	glScalef(1.0-k*0.75,1.0-k*0.75,1.0-k*0.75);
+
+	// draw the cube with the texture
+	for (int i=0; i<6; i++) {
+	  glBegin (GL_QUADS);
+	      
+	  glTexCoord2f (0.0, 0.0);
+	  glVertex3f (-1.0, 1.0, 1.0);
+      
+	  glTexCoord2f (1.0, 0.0);
+	  glVertex3f (1.0, 1.0, 1.0);
+     
+	  glTexCoord2f (1.0, 1.0);
+	  glVertex3f (1.0, -1.0, 1.0);
+      
+	  glTexCoord2f (0.0, 1.0);
+	  glVertex3f (-1.0, -1.0, 1.0);
+      
+	  glEnd ();
+	  if (i<3) glRotatef(90,0,1,0);
+	  else if (i==3) glRotatef(90,1,0,0);
+	  else if (i==4) glRotatef(180,1,0,0);
+	}
+
+	glPopMatrix();
+      }
+      glDisable( m_TexTarget );
+    }
+
+    break;
+
+  case 7:
+    {
+      // turning:
+
+      // time sync
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-2.3);
+
+      // turn the cube
+      glRotatef(cos((ticks % 5000)*M_PI/5000.0)*45+45,0,1,0);
+
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glEnable(GL_DEPTH_TEST);
+
+      // draw the cube with the texture
+      for (int i=0; i<6; i++) {
+	glBegin (GL_QUADS);
+      
+	glTexCoord2f (0.0, 0.0);
+	glVertex3f (-1.0, 1.0, 1.0);
+      
+	glTexCoord2f (1.0, 0.0);
+	glVertex3f (1.0, 1.0, 1.0);
+     
+	glTexCoord2f (1.0, 1.0);
+	glVertex3f (1.0, -1.0, 1.0);
+      
+	glTexCoord2f (0.0, 1.0);
+	glVertex3f (-1.0, -1.0, 1.0);
+      
+	glEnd ();
+	if (i<3) glRotatef(90,0,1,0);
+	else if (i==3) glRotatef(90,1,0,0);
+	else if (i==4) glRotatef(180,1,0,0);
+      }
+
+      glDisable( m_TexTarget );
+    }
+
+    break;
+
+  case 8:
+    {
+      // tunnel:
+
+      // sync to the clock
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-1.0);
+
+      glRotatef(5,0,1,0);
+      glRotatef(ticks*0.05,0,0,1);
+      glRotatef(7,1,0,0);
+
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glEnable(GL_DEPTH_TEST);
+
+      // parameters of the tunnel grid: the larger the width and height, the more detailed the effect is
+#define TR 160 // tunnel radius
+#define TD 160 // tunnel depth
+	
+      // size on screen
+#define SR 2.0 // radius
+#define SD 0.4 // depth factor
+
+      // precalculate the gaps between grid points
+#define TX_PLUS2 (1.0/WX)
+#define TY_PLUS2 (1.0/160)
+
+
+      float tx=0.0,ty=(ticks % 2000)*0.0005;
+
+      for (int j=0; j<TD; j++) {
+	tx=0.0;
+	for (int i=0; i<TR; i++) {
+	  float vx=cos(i*2*M_PI/TR)*SR;
+	  float vy=sin(i*2*M_PI/TR)*SR;
+	  float vz=-j*SD;
+
+
+	  float col=2.0-2.0*(float)j/TD;
+
+	  glColor3f(col,col*0.92,col*0.93); 
+	  glBegin (GL_QUADS);
+
+	  glTexCoord2f (tx,ty);
+	  glVertex3f (vx,vy,vz);
+      
+	  vx=cos((i+1)*2*M_PI/TR)*SR;
+	  vy=sin((i+1)*2*M_PI/TR)*SR;
+	  vz=-j*SD;
+	  glTexCoord2f (tx+TX_PLUS2, ty);
+	  glVertex3f (vx, vy, vz);
+      
+	  vx=cos((i+1)*2*M_PI/TR)*SR;
+	  vy=sin((i+1)*2*M_PI/TR)*SR;
+	  vz=-(j+1)*SD;
+	  glTexCoord2f (tx+TX_PLUS2, ty+TY_PLUS2);
+	  glVertex3f (vx, vy, vz);
+      
+	  vx=cos(i*2*M_PI/TR)*SR;
+	  vy=sin(i*2*M_PI/TR)*SR;
+	  vz=-(j+1)*SD;
+	  glTexCoord2f (tx, ty+TY_PLUS2);
+	  glVertex3f (vx, vy, vz);
+      
+	  glEnd ();
+
+	  tx+=TX_PLUS2;
+
+	}
+	ty+=TY_PLUS2;
+
+      }
+      glDisable( m_TexTarget );
+    }
+    break;
+  case 9:
+    {
+      // particles:
+
+      typedef struct {
+	float x,y,z; 	// position coordinate
+	float sx,sy;	// size of the particle square
+	float vx,vy,vz; // speed
+	float tx1,ty1,tx2,ty2; // texture position (color)
+	int start_time; // when was created (tick)
+	int end_time; 	// when will disappear (tick)
+      } PARTICLE;
+
+#define NOT_CREATED -1 	// a flag for a particle that was not created
+#define NOF_PARTS 10000  // the number of particles	
+#define PIXEL_SIZE 1.0	// size of the particle pixels (1.0 = a pixel)
+
+      static PARTICLE parts[NOF_PARTS]; // particle array
+
+      static int parts_init=FALSE; // have been inited?
+
+      if (!parts_init) {
+	for (int i=0; i<NOF_PARTS; i++) parts[i].start_time=NOT_CREATED;
+	parts_init=TRUE;
+      }	
+      // time sync
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-2.3);
+
+      // turn the place
+      float rotx=sin(ticks*M_PI/5000.0)*5-15;
+      float roty=sin(ticks*M_PI/5000.0)*5+45;
+      float rotz=sin(ticks*M_PI/5000.0)*5;
+
+      glRotatef(rotx,1,0,0);
+      glRotatef(roty,0,1,0);
+      glRotatef(rotz,0,0,1);
+
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glEnable(GL_DEPTH_TEST);
+
+      // draw the emitter with the texture
+
+      glBegin (GL_QUADS);
+      glColor3f(1,1,1);      
+      glTexCoord2f (0.0, 0.0);
+      glVertex3f (-1.0, 1.0, 0.0);
+      
+      glTexCoord2f (1.0, 0.0);
+      glVertex3f (1.0, 1.0, 0.0);
+     
+      glTexCoord2f (1.0, 1.0);
+      glVertex3f (1.0, -1.0, 0.0);
+      
+      glTexCoord2f (0.0, 1.0);
+      glVertex3f (-1.0, -1.0, 0.0);
+
+      glEnd ();
+
+      // draw the particles
+
+      for (int i=0; i<NOF_PARTS; i++) {
+
+	int pos;
+	if ((parts[i].start_time==NOT_CREATED) || (ticks>=parts[i].end_time)) {
+	  parts[i].start_time=ticks;
+	  parts[i].x=(rand() % 2000)/1000.0-1.0;
+	  parts[i].y=(rand() % 2000)/1000.0-1.0;
+	  parts[i].z=0.0;
+	  parts[i].vx=0.001*((rand() % 2000)/1000.0-1.0);
+	  parts[i].vy=0.0;
+	  parts[i].vz=0.01;
+	  parts[i].end_time=4000+parts[i].start_time+rand() % 500;
+
+	  parts[i].sx=PIXEL_SIZE*2.0/imgWidth;
+	  parts[i].sy=PIXEL_SIZE*2.0/imgHeight;
+
+	  parts[i].tx1=((parts[i].x+1.0)/2.0);
+	  parts[i].ty1=(1.0-(parts[i].y+1.0)/2.0);
+	  parts[i].tx2=parts[i].tx1+parts[i].sx/2.0;
+	  parts[i].ty2=parts[i].ty1+parts[i].sy/2.0;
+	}
+	glBegin(GL_QUADS);
+
+	glTexCoord2f (parts[i].tx1, parts[i].ty1);	
+	glVertex3f(parts[i].x,parts[i].y,parts[i].z);
+
+	glTexCoord2f (parts[i].tx2, parts[i].ty1);	
+	glVertex3f(parts[i].x+parts[i].sx,parts[i].y,parts[i].z);
+
+	glTexCoord2f (parts[i].tx2, parts[i].ty2);	
+	glVertex3f(parts[i].x+parts[i].sx,parts[i].y-parts[i].sy,parts[i].z);
+
+	glTexCoord2f (parts[i].tx1, parts[i].ty2);	
+	glVertex3f(parts[i].x,parts[i].y-parts[i].sy,parts[i].z);
+	glEnd();
+		
+	parts[i].x+=parts[i].vx;
+	parts[i].y+=parts[i].vy;
+	parts[i].z+=parts[i].vz;
+	parts[i].vy-=0.0001; // adds a small gravity
+
+
+      }
+      glDisable( m_TexTarget );
+
+    }
+
+    break;
+
+  case 10:
+    {
+      // dissolve:
+
+      typedef struct {
+	float x,y,z; 	// position coordinate
+	float sx,sy;	// size of the particle square
+	float vx,vy,vz; // speed
+	float tx1,ty1,tx2,ty2; // texture position (color)
+	int start_time; // when was created (tick)
+	int end_time; 	// when will disappear (tick)
+      } PARTICLE;
+
+#define NOT_CREATED -1 	// a flag for a particle that was not created
+#define NOF_PARTS2 20000  // the number of particles	
+#define PIXEL_SIZE2 4.0	// size of the particle pixels (1.0 = a pixel)
+
+      static PARTICLE parts[NOF_PARTS2]; // particle array
+
+      static int parts_init=FALSE; // have been inited?
+
+      if (!parts_init) {
+	for (int i=0; i<NOF_PARTS2; i++) parts[i].start_time=NOT_CREATED;
+	parts_init=TRUE;
+      }	
+      // time sync
+      struct timespec now;
+      clock_gettime(CLOCK_MONOTONIC,&now);
+      int ticks=now.tv_sec*1000+now.tv_nsec/1000000;
+
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      glMatrixMode (GL_PROJECTION); // use the projection mode
+      glLoadIdentity ();
+      gluPerspective(60.0, (float)imgWidth/(float)imgHeight, 0.01, 1135.0);
+
+      glMatrixMode (GL_MODELVIEW);
+      glLoadIdentity ();
+      glTranslatef(0.0,0.0,-2.3);
+
+      // turn the place
+      float rotx=sin(ticks*M_PI/5000.0)*5+15;
+      float roty=sin(ticks*M_PI/5000.0)*15+15;
+      float rotz=sin(ticks*M_PI/5000.0)*5;
+
+      glRotatef(rotx,1,0,0);
+      glRotatef(roty,0,1,0);
+      glRotatef(rotz,0,0,1);
+
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+      glTexParameteri( m_TexTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+    
+      glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      
+      glBindTexture( m_TexTarget, texID );
+      
+      glEnable( m_TexTarget );
+      
+      glEnable(GL_DEPTH_TEST);
+
+      // draw the emitter with the texture
+      /*
+	glBegin (GL_QUADS);
+	glColor3f(1,1,1);      
+      	glTexCoord2f (0.0, 0.0);
+      	glVertex3f (-1.0, 1.0, 0.0);
+      
+      	glTexCoord2f (1.0, 0.0);
+      	glVertex3f (1.0, 1.0, 0.0);
+     
+      	glTexCoord2f (1.0, 1.0);
+      	glVertex3f (1.0, -1.0, 0.0);
+      
+      	glTexCoord2f (0.0, 1.0);
+      	glVertex3f (-1.0, -1.0, 0.0);
+
+      	glEnd ();
+      */
+      // draw the squares
+
+      glEnable(GL_BLEND);
+      glBlendFunc ( GL_SRC_ALPHA , GL_ONE_MINUS_SRC_ALPHA );
+ 
+      for (int i=0; i<NOF_PARTS2; i++) {
+
+	int pos;
+	if ((parts[i].start_time==NOT_CREATED) || (ticks>=parts[i].end_time)) {
+	  parts[i].start_time=ticks;
+	  parts[i].x=(rand() % 2000)/1000.0-1.0;
+	  parts[i].y=(rand() % 2000)/1000.0-1.0;
+	  parts[i].z=0.0;
+	  parts[i].vx=0.001*((rand() % 2000)/1000.0-1.0);
+	  parts[i].vy=0.001*((rand() % 2000)/1000.0-1.0);
+	  parts[i].vz=0.01;
+	  parts[i].end_time=parts[i].start_time+500+rand() % 500;
+
+	  parts[i].sx=PIXEL_SIZE2*2.0/imgWidth;
+	  parts[i].sy=PIXEL_SIZE2*2.0/imgHeight;
+
+	  parts[i].tx1=((parts[i].x+1.0)/2.0);
+	  parts[i].ty1=(1.0-(parts[i].y+1.0)/2.0);
+	  parts[i].tx2=parts[i].tx1+parts[i].sx/2.0;
+	  parts[i].ty2=parts[i].ty1+parts[i].sy/2.0;
+	}
+	glColor4f(1.0,1.0,1.0,0.5+(float)(parts[i].end_time-ticks)/(parts[i].end_time-parts[i].start_time));
+	glBegin(GL_QUADS);
+
+	glTexCoord2f (parts[i].tx1, parts[i].ty1);	
+	glVertex3f(parts[i].x,parts[i].y,parts[i].z);
+
+	glTexCoord2f (parts[i].tx2, parts[i].ty1);	
+	glVertex3f(parts[i].x+parts[i].sx,parts[i].y,parts[i].z);
+
+	glTexCoord2f (parts[i].tx2, parts[i].ty2);	
+	glVertex3f(parts[i].x+parts[i].sx,parts[i].y-parts[i].sy,parts[i].z);
+
+	glTexCoord2f (parts[i].tx1, parts[i].ty2);	
+	glVertex3f(parts[i].x,parts[i].y-parts[i].sy,parts[i].z);
+	glEnd();
+		
+	parts[i].x+=parts[i].vx;
+	parts[i].y+=parts[i].vy;
+	parts[i].z+=parts[i].vz;
+	parts[i].vy+=0.0004; // adds a small pull up
+
+
+      }
+      glDisable( m_TexTarget );
+      glDisable(GL_BLEND);
+
+    }
+
+    break;
+
+  }
+
+  if (retdata!=NULL) {
+    // copy buffer to retbuf
+
+    if (retbuf!=NULL) {
+      buffer_free(retbuf);
+    }
+
+    retbuf=render_to_mainmem(type);
+    return_ready=TRUE;
+  }
+
+  if (swapFlag) glXSwapBuffers( dpy, glxWin );
+
+  return TRUE;
+}
+
+
+static void *render_thread_func(void *data) {
+  _xparms *xparms=(_xparms *)data;
+
+  retbuf=NULL;
+
+  init_screen_inner (xparms->width, xparms->height, xparms->fullscreen, xparms->window_id, xparms->argc, xparms->argv);
+
+  rthread_ready=TRUE;
+
+  while (playing) {
+    usleep(1000000./tfps);
+    pthread_mutex_lock(&rthread_mutex);
+    if (has_texture&&playing) {
+      Upload(imgWidth,imgHeight);
+    }
+    else pthread_mutex_unlock(&rthread_mutex);
+  }
+
+  if (retbuf!=NULL) {
+    buffer_free(retbuf);
+  }
+
+  retbuf=NULL;
+
+  return NULL;
+}
+
+
+
+
+boolean render_frame_rgba (int hsize, int vsize, void **pixel_data, void **return_data) {
+
+  pthread_mutex_lock(&rthread_mutex); // wait for lockout of render thread
+
+  has_texture=TRUE;
+  has_new_texture=TRUE;
+
+
+  if (return_data!=NULL) {
+    size_t twidth=window_width*typesize;
+    void *dst,*src;
+    register int i;
+
+    if (texturebuf!=NULL) {
+      free((void *)texturebuf);
+    }
+
+    texturebuf=(uint8_t *)pixel_data[0]; // no memcpy needed, as we will not free pixel_data until render_thread has used it
+    return_ready=FALSE;
+    retdata=(uint8_t *)return_data[0]; // host created space for return data
+
+    imgWidth=hsize;
+    imgHeight=vsize;
+
+    pthread_mutex_unlock(&rthread_mutex); // render thread - GO !
+
+    while (!return_ready) usleep(1000); // wait for return data
+    pthread_mutex_lock(&rthread_mutex); // lock render thread while we grab data
+
+    dst=(void *)retdata;
+    retdata=NULL;
+
+    texturebuf=NULL;
+
+    src=(void *)retbuf+(window_height-1)*twidth;
+
+    // texture is upside-down compared to image
+    for (i=0;i<window_height;i++) {
+      memcpy(dst,src,twidth);
+      dst+=twidth;
+      src-=twidth;
+    }
+
+  }
+  else {
+    if (hsize!=imgWidth || vsize!=imgHeight || texturebuf==NULL) {
+      if (texturebuf!=NULL) {
+	free((void *)texturebuf);
+      }
+      texturebuf=(uint8_t *)malloc(hsize*vsize*typesize);
+    }
+    
+    memcpy((void *)texturebuf,pixel_data[0],hsize*vsize*typesize);
+
+    imgWidth=hsize;
+    imgHeight=vsize;
+
+    retdata=NULL;
+  }
+
+  pthread_mutex_unlock(&rthread_mutex); // re-enable render thread
+
+  return TRUE;
+}
+
+
+
+
+
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data) {
+  fprintf(stderr,"openGL plugin error: No palette was set !\n");
+  return FALSE;
+}
+
+
+
+
+void decode_pparams(weed_plant_t **pparams) {
+  register int i;
+  weed_plant_t *ptmpl;
+  char *pname;
+  int error,type;
+
+  zmode=0;
+  zfft0=0.;
+  if (zsubtitles!=NULL) weed_free(zsubtitles);
+  zsubtitles=NULL;
+
+  if (pparams==NULL) return;
+  while (pparams[i]!=NULL) {
+    
+    type=weed_get_int_value(pparams[i],"type",&error);
+
+
+    if (type==WEED_PLANT_PARAMETER) {
+      ptmpl=weed_get_plantptr_value(pparams[i],"template",&error);
+      pname=weed_get_string_value(ptmpl,"name",&error);
+      
+      if (!strcmp(pname,"mode")) {
+	zmode=weed_get_int_value(pparams[i],"value",&error);
+      }
+      else if (!strcmp(pname,"fft0")) {
+	zfft0=(float)weed_get_double_value(pparams[i],"value",&error);
+      }
+      else if (!strcmp(pname,"subtitles")) {
+	zsubtitles=weed_get_string_value(pparams[i],"value",&error);
+      }
+      
+      weed_free(pname);
+    }
+    else {
+      // must be an alpha channel
+
+      
+      
+    }
+    i++;
+  }
+
+
+}
+
+
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data, void **pp) {
+  // call the function which was set in set_palette
+  weed_plant_t **pparams=(weed_plant_t **)pp;
+
+  if (pparams!=NULL) {
+    decode_pparams(pparams);
+  }
+
+  return render_fn (hsize,vsize,pixel_data,return_data);
+}
+
+
+void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+  playing=FALSE;
+
+  pthread_join(rthread,NULL);
+
+  if (texturebuf!=NULL) {
+    free((void *)texturebuf);
+  }
+
+  if (use_pbo) glDeleteBuffers(1, &video_pbo);
+
+  if (ntextures>0) glDeleteTextures(ntextures,texID);
+
+  free(textures);
+
+  free(texID);
+
+  if (!is_ext) {
+    XUnmapWindow (dpy, xWin);
+    XDestroyWindow (dpy, xWin);
+  }
+
+  XFlush(dpy);
+
+  pthread_mutex_lock(&dpy_mutex);
+  glXMakeContextCurrent(dpy, 0, 0, 0);
+  glXDestroyContext(dpy, context);
+  XCloseDisplay (dpy);
+  dpy=NULL;
+  pthread_mutex_unlock(&dpy_mutex);
+
+}
+
+
+
+void module_unload(void) {
+  if (zsubtitles!=NULL) weed_free(zsubtitles);
+}
+
+
+
+
+boolean send_keycodes (keyfunc host_key_fn) {
+  // poll for keyboard events, pass them back to the caller
+  // return FALSE if there are no more codes to return
+  uint16_t mod_mask,scancode=0;
+  XEvent xEvent;
+  KeySym keySymbol;
+
+  if (host_key_fn==NULL || dpy == NULL) return FALSE;
+
+  while ((volatile Display *)dpy!=NULL) {
+    pthread_mutex_lock(&dpy_mutex);
+    if ((volatile Display *)dpy!=NULL) {
+      if (XCheckWindowEvent( dpy, xWin, KeyPressMask | KeyReleaseMask, &xEvent ) ) {
+	int keysyms_per_keycode_return;
+	keySymbol = (KeySym)XGetKeyboardMapping(dpy,xEvent.xkey.keycode,0,&keysyms_per_keycode_return);
+	mod_mask=xEvent.xkey.state;
+	pthread_mutex_unlock(&dpy_mutex);
+
+	host_key_fn (xEvent.type == KeyPress, keySymbol, mod_mask);
+      }
+      else break;
+    }
+  }
+  pthread_mutex_unlock(&dpy_mutex);
+}
+
+

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h Changed

@@ -44,8 +44,11 @@
 # define PRIu64		__PRI64_PREFIX "u"
 #endif // ifndef PRI64d
 
+typedef void * (func_ptr)(void *);
 
+#ifndef IS_MINGW
 typedef int boolean;
+#endif
 #undef TRUE
 #undef FALSE
 
@@ -65,7 +68,10 @@
 const char *module_check_init (void);
 const char *version (void);
 const char *get_description (void);  ///< optional
-const char *get_rfx (void);  ///< optional
+const char *get_init_rfx (void);  ///< optional
+
+///< optional (but should return a weed plantptr array of paramtmpl and chantmpl, NULL terminated)
+const void **get_play_params (func_ptr func); 
 
 /// plugin send list of palettes, in order of preference
 const int *get_palette_list(void);
@@ -92,7 +98,9 @@
 ///
 /// hsize and vsize are width and height of the pixel data (in macropixels)
 /// no extra padding (rowstrides) is allowed
-boolean render_frame (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data);
+/// play_params should be cast to weed_plant_t ** (if the plugin exports get_play_paramtmpls() )
+boolean render_frame (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data, 
+		      void **play_params);
 
 /// destroy the screen, return mouse to original posn., allow the host GUI to take over (optional)
 void exit_screen (int16_t mouse_x, int16_t mouse_y);

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/vloopback2.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/vloopback2.c Changed

@@ -192,7 +192,7 @@
 const char rfx[32768];
 
 
-const char *get_rfx (void) {
+const char *get_init_rfx (void) {
   char **vdevs = get_vloopback2_devices();
   char devstr[30000];
   size_t slen=0;
@@ -286,7 +286,7 @@
 
 boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   int i=0,idx=0,ret_code;
-  int afd,audio;
+  int afd,audio=0;
 
   int mypid=getpid();
 
@@ -294,7 +294,7 @@
 
   char cmd[8192];
 
-  char *audfile;
+  char *audfile=NULL;
 
   char **vdevs;
 
@@ -372,25 +372,25 @@
 
   make_path("livesaudio",mypid,"stream");
 
-  afd=open(xfile,O_RDONLY|O_NONBLOCK);
-  if (afd!=-1) {
-    audio=1;
-    close(afd);
-  }
-  else audio=0;
-
-  if (audio) {
-    snprintf(cmd,8192,"/bin/cat %s > \"%s\" &",xfile,audfile);
-    dummyvar=system(cmd);
+  if (audfile!=NULL) {
+    afd=open(xfile,O_RDONLY|O_NONBLOCK);
+    if (afd!=-1) {
+      audio=1;
+      close(afd);
+    }
+    
+    if (audio) {
+      snprintf(cmd,8192,"/bin/cat %s > \"%s\" &",xfile,audfile);
+      dummyvar=system(cmd);
+    }
+    dummyvar=dummyvar; // keep compiler happy
   }
-  dummyvar=dummyvar; // keep compiler happy
-
   return TRUE;
 }
 
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // hsize and vsize are in [macro]pixels (n-byte)
   size_t frame_size,bytes;

LiVES-1.6.1.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c -> LiVES-2.0.3.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c Changed

@@ -1,5 +1,5 @@
 // LiVES - yuv4mpeg stream engine
-// (c) G. Finch 2004 - 2008 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
 
@@ -14,9 +14,9 @@
 
 static char plugin_version[64]="LiVES yuv4mpeg playback engine version 1.1";
 
-static boolean (*render_fn)(int hsize, int vsize, void **pixel_data, void **return_data);
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data);
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data);
+static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data);
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
 
 static int ov_vsize,ov_hsize;
 
@@ -138,12 +138,12 @@
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data,return_data);
+  return render_fn (hsize,vsize,pixel_data);
 }
 
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data) {
   int i;
 
   if ((ov_hsize!=hsize||ov_vsize!=vsize)) {
@@ -168,7 +168,7 @@
   return TRUE;
 }
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data, void **return_data) {
+boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"yuv4mpeg_stream plugin error: No palette was set !\n");
   }

LiVES-1.6.1.tar.bz2/lives-plugins/themes/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/themes/camera/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/camera/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/crayons-bright/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/themes/crayons/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/crayons/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/cutting_room/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/themes/editor/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/editor/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/themes/pinks/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/themes/pinks/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/Makefile.am -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/Makefile.am Changed

@@ -2,8 +2,8 @@
 
 LIBS =
 
-#NOTE - install-exec-local MUST go in the first subdir !!
-SUBDIRS = gdk
+#NOTE - install-exec-local MUST go in the first subdir ONLY !!
+SUBDIRS = gdk cairo # supercollider experimental
 
 fxpluginslibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
 
@@ -12,25 +12,20 @@
 
 shared_cflags = -fno-common
 else
-shared_ldflags = -shared -fPIC -DPIC -Wl,-Bsymbolic -module -avoid-version --tag=disable-static
+shared_ldflags = -shared -fPIC -DPIC -module -no-undefined -avoid-version --tag=disable-static
 
 shared_cflags = -fPIC -DPIC
 endif
 
+AM_LDFLAGS = $(shared_ldflags)
+weed_CFLAGS =
 
 if HAVE_SYSTEM_WEED
-AM_LDFLAGS = $(shared_ldflags) @WEED_UTILS_LIBS@ 
-weed_CFLAGS = -DHAVE_SYSTEM_WEED
-else
-AM_LDFLAGS = $(shared_ldflags) ../../libweed/libweed-utils.la
-weed_CFLAGS =
+weed_CFLAGS += -DHAVE_SYSTEM_WEED
 endif
 
 if HAVE_SYSTEM_WEED_PLUGIN_UTILS
-AM_LDFLAGS += @WEED_PLUGIN_UTILS_LIBS@
-weed_CFLAGS = -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
-else
-AM_LDFLAGS += ../../libweed/libweed-plugin-utils.la
+weed_CFLAGS += -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
 endif
 
 if HAVE_SYSTEM_WEED_COMPAT
@@ -58,41 +53,64 @@
 endif
 
 
-#if HAVE_OPENCV
-#farneback_analyser_libs = farneback_analyser.la
-#farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
-#farneback_analyser_la_CFLAGS = $(AM_CFLAGS)
-#farneback_analyser_la_SOURCES = farneback_analyser.cpp
+if HAVE_OPENCV
+farneback_analyser_libs = farneback_analyser.la
+farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
+farneback_analyser_la_CFLAGS = $(AM_CFLAGS)
+farneback_analyser_la_SOURCES = farneback_analyser.cpp
+
+opencvlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+opencvlib_LTLIBRARIES = $(farneback_analyser_libs)
+endif
 
-#opencvlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
-#opencvlib_LTLIBRARIES = $(farneback_analyser_libs)
-#endif
 
-#	blank_frame_detector.la 
-#	$(opencv_LIBS) 
+if HAVE_FFTW3F
+audio_fft_libs = audio_fft.la beat_detector.la
+audio_fft_la_LDFLAGS = $(FFTW3F_LIBS) $(AM_LDFLAGS)
+audio_fft_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
+beat_detector_la_LDFLAGS = $(FFTW3F_LIBS) $(AM_LDFLAGS)
+beat_detector_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
+audio_fftlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+audio_fftlib_LTLIBRARIES = $(audio_fft_libs)
+endif
 
+if HAVE_LADSPA
+ladspa_libs = ladspa.la
+ladspa_la_LDFLAGS = $(AM_LDFLAGS)
+ladspa_la_CFLAGS = $(AM_CFLAGS)
+ladspadir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+ladspa_LTLIBRARIES = $(ladspa_libs)
+endif
 
 fxpluginslib_LTLIBRARIES = RGBdelay.la \
+	alpha_means.la \
 	alien_overlay.la \
 	audio_transition.la \
 	audio_volume.la \
 	bump2d.la \
 	blurzoom.la \
+	blank_frame_detector.la \
+	$(opencv_LIBS) \
 	ccorrect.la \
 	colorkey.la \
 	comic.la \
+	data_processor.la \
+	data_unpacker.la \
 	deinterlace.la \
 	edge.la \
 	fg_bg_removal.la \
 	fireTV.la \
+	fourKlives.la \
 	haip.la \
 	layout_blends.la \
 	lifeTV.la \
 	livetext.la \
+	log_sig.la \
 	mirrors.la \
 	multi_blends.la \
 	multi_transitions.la \
 	negate.la \
+	nn_programmer.la \
 	noise.la \
 	onedTV.la \
 	palette_test.la\
@@ -100,22 +118,24 @@
 	posterise.la \
 	rippleTV.la \
 	rotozoom.la \
+	shift.la \
 	simple_blend.la \
 	slide_over.la \
 	softlight.la \
 	targeted_zoom.la \
 	textfun.la \
+	tone_gen.la \
 	tvpic.la \
 	vertigo.la \
 	warpTV.la \
 	xeffect.la
 
-EXTRA_DIST=data icons
+EXTRA_DIST=data icons syna.h weed-utils-code.c weed-plugin-utils.c
 
 install-data-local:
 	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
-	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)"
-	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)"
+	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
 	$(MAKE) -i install-data-local-remove-vcs-files
 
 install-data-local-remove-vcs-files:

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,8 +52,8 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE@am__append_1 = @WEED_PLUGIN_UTILS_LIBS@
-@HAVE_SYSTEM_WEED_PLUGIN_UTILS_FALSE@am__append_2 = ../../libweed/libweed-plugin-utils.la
+@HAVE_SYSTEM_WEED_TRUE@am__append_1 = -DHAVE_SYSTEM_WEED
+@HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE@am__append_2 = -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
 @HAVE_SYSTEM_WEED_COMPAT_TRUE@am__append_3 = -DHAVE_SYSTEM_WEED_COMPAT
 subdir = lives-plugins/weed-plugins
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
@@ -87,23 +104,53 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(frei0rpluginslibdir)" \
-	"$(DESTDIR)$(fxpluginslibdir)" \
-	"$(DESTDIR)$(libvispluginslibdir)"
-LTLIBRARIES = $(frei0rpluginslib_LTLIBRARIES) \
-	$(fxpluginslib_LTLIBRARIES) $(libvispluginslib_LTLIBRARIES)
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(audio_fftlibdir)" \
+	"$(DESTDIR)$(frei0rpluginslibdir)" \
+	"$(DESTDIR)$(fxpluginslibdir)" "$(DESTDIR)$(ladspadir)" \
+	"$(DESTDIR)$(libvispluginslibdir)" "$(DESTDIR)$(opencvlibdir)"
+LTLIBRARIES = $(audio_fftlib_LTLIBRARIES) \
+	$(frei0rpluginslib_LTLIBRARIES) $(fxpluginslib_LTLIBRARIES) \
+	$(ladspa_LTLIBRARIES) $(libvispluginslib_LTLIBRARIES) \
+	$(opencvlib_LTLIBRARIES)
 RGBdelay_la_LIBADD =
 RGBdelay_la_SOURCES = RGBdelay.c
 RGBdelay_la_OBJECTS = RGBdelay.lo
 alien_overlay_la_LIBADD =
 alien_overlay_la_SOURCES = alien_overlay.c
 alien_overlay_la_OBJECTS = alien_overlay.lo
+alpha_means_la_LIBADD =
+alpha_means_la_SOURCES = alpha_means.c
+alpha_means_la_OBJECTS = alpha_means.lo
+audio_fft_la_LIBADD =
+audio_fft_la_SOURCES = audio_fft.c
+audio_fft_la_OBJECTS = audio_fft_la-audio_fft.lo
+audio_fft_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(audio_fft_la_CFLAGS) \
+	$(CFLAGS) $(audio_fft_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_FFTW3F_TRUE@am_audio_fft_la_rpath = -rpath $(audio_fftlibdir)
 audio_transition_la_LIBADD =
 audio_transition_la_SOURCES = audio_transition.c
 audio_transition_la_OBJECTS = audio_transition.lo
 audio_volume_la_LIBADD =
 audio_volume_la_SOURCES = audio_volume.c
 audio_volume_la_OBJECTS = audio_volume.lo
+beat_detector_la_LIBADD =
+beat_detector_la_SOURCES = beat_detector.c
+beat_detector_la_OBJECTS = beat_detector_la-beat_detector.lo
+beat_detector_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(beat_detector_la_CFLAGS) \
+	$(CFLAGS) $(beat_detector_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_FFTW3F_TRUE@am_beat_detector_la_rpath = -rpath \
+@HAVE_FFTW3F_TRUE@	$(audio_fftlibdir)
+blank_frame_detector_la_LIBADD =
+blank_frame_detector_la_SOURCES = blank_frame_detector.c
+blank_frame_detector_la_OBJECTS = blank_frame_detector.lo
 blurzoom_la_LIBADD =
 blurzoom_la_SOURCES = blurzoom.c
 blurzoom_la_OBJECTS = blurzoom.lo
@@ -119,18 +166,37 @@
 comic_la_LIBADD =
 comic_la_SOURCES = comic.c
 comic_la_OBJECTS = comic.lo
+data_processor_la_LIBADD =
+data_processor_la_SOURCES = data_processor.c
+data_processor_la_OBJECTS = data_processor.lo
+data_unpacker_la_LIBADD =
+data_unpacker_la_SOURCES = data_unpacker.c
+data_unpacker_la_OBJECTS = data_unpacker.lo
 deinterlace_la_LIBADD =
 deinterlace_la_SOURCES = deinterlace.c
 deinterlace_la_OBJECTS = deinterlace.lo
 edge_la_LIBADD =
 edge_la_SOURCES = edge.c
 edge_la_OBJECTS = edge.lo
+farneback_analyser_la_LIBADD =
+am__farneback_analyser_la_SOURCES_DIST = farneback_analyser.cpp
+@HAVE_OPENCV_TRUE@am_farneback_analyser_la_OBJECTS =  \
+@HAVE_OPENCV_TRUE@	farneback_analyser.lo
+farneback_analyser_la_OBJECTS = $(am_farneback_analyser_la_OBJECTS)
+farneback_analyser_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(farneback_analyser_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_OPENCV_TRUE@am_farneback_analyser_la_rpath = -rpath \
+@HAVE_OPENCV_TRUE@	$(opencvlibdir)
 fg_bg_removal_la_LIBADD =
 fg_bg_removal_la_SOURCES = fg_bg_removal.c
 fg_bg_removal_la_OBJECTS = fg_bg_removal.lo
 fireTV_la_LIBADD =
 fireTV_la_SOURCES = fireTV.c
 fireTV_la_OBJECTS = fireTV.lo
+fourKlives_la_LIBADD =
+fourKlives_la_SOURCES = fourKlives.c
+fourKlives_la_OBJECTS = fourKlives.lo
 frei0r_la_LIBADD =
 frei0r_la_SOURCES = frei0r.c
 frei0r_la_OBJECTS = frei0r_la-frei0r.lo
@@ -141,6 +207,13 @@
 haip_la_LIBADD =
 haip_la_SOURCES = haip.c
 haip_la_OBJECTS = haip.lo
+ladspa_la_LIBADD =
+ladspa_la_SOURCES = ladspa.c
+ladspa_la_OBJECTS = ladspa_la-ladspa.lo
+ladspa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ladspa_la_CFLAGS) \
+	$(CFLAGS) $(ladspa_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_LADSPA_TRUE@am_ladspa_la_rpath = -rpath $(ladspadir)
 layout_blends_la_LIBADD =
 layout_blends_la_SOURCES = layout_blends.c
 layout_blends_la_OBJECTS = layout_blends.lo
@@ -157,6 +230,9 @@
 livetext_la_LIBADD =
 livetext_la_SOURCES = livetext.c
 livetext_la_OBJECTS = livetext.lo
+log_sig_la_LIBADD =
+log_sig_la_SOURCES = log_sig.c
+log_sig_la_OBJECTS = log_sig.lo
 mirrors_la_LIBADD =
 mirrors_la_SOURCES = mirrors.c
 mirrors_la_OBJECTS = mirrors.lo
@@ -169,6 +245,9 @@
 negate_la_LIBADD =
 negate_la_SOURCES = negate.c
 negate_la_OBJECTS = negate.lo
+nn_programmer_la_LIBADD =
+nn_programmer_la_SOURCES = nn_programmer.c
+nn_programmer_la_OBJECTS = nn_programmer.lo
 noise_la_LIBADD =
 noise_la_SOURCES = noise.c
 noise_la_OBJECTS = noise.lo
@@ -190,6 +269,9 @@
 rotozoom_la_LIBADD =
 rotozoom_la_SOURCES = rotozoom.c
 rotozoom_la_OBJECTS = rotozoom.lo
+shift_la_LIBADD =
+shift_la_SOURCES = shift.c
+shift_la_OBJECTS = shift.lo
 simple_blend_la_LIBADD =
 simple_blend_la_SOURCES = simple_blend.c
 simple_blend_la_OBJECTS = simple_blend.lo
@@ -205,6 +287,9 @@
 textfun_la_LIBADD =
 textfun_la_SOURCES = textfun.c
 textfun_la_OBJECTS = textfun.lo
+tone_gen_la_LIBADD =
+tone_gen_la_SOURCES = tone_gen.c
+tone_gen_la_OBJECTS = tone_gen.lo
 tvpic_la_LIBADD =
 tvpic_la_SOURCES = tvpic.c
 tvpic_la_OBJECTS = tvpic.lo
@@ -230,22 +315,39 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = RGBdelay.c alien_overlay.c audio_transition.c audio_volume.c \
-	blurzoom.c bump2d.c ccorrect.c colorkey.c comic.c \
-	deinterlace.c edge.c fg_bg_removal.c fireTV.c frei0r.c haip.c \
-	layout_blends.c libvis.c lifeTV.c livetext.c mirrors.c \
-	multi_blends.c multi_transitions.c negate.c noise.c onedTV.c \
-	palette_test.c plasma.c posterise.c rippleTV.c rotozoom.c \
-	simple_blend.c slide_over.c softlight.c targeted_zoom.c \
-	textfun.c tvpic.c vertigo.c warpTV.c xeffect.c
-DIST_SOURCES = RGBdelay.c alien_overlay.c audio_transition.c \
-	audio_volume.c blurzoom.c bump2d.c ccorrect.c colorkey.c \
-	comic.c deinterlace.c edge.c fg_bg_removal.c fireTV.c frei0r.c \
-	haip.c layout_blends.c libvis.c lifeTV.c livetext.c mirrors.c \
-	multi_blends.c multi_transitions.c negate.c noise.c onedTV.c \
-	palette_test.c plasma.c posterise.c rippleTV.c rotozoom.c \
-	simple_blend.c slide_over.c softlight.c targeted_zoom.c \
-	textfun.c tvpic.c vertigo.c warpTV.c xeffect.c
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = RGBdelay.c alien_overlay.c alpha_means.c audio_fft.c \
+	audio_transition.c audio_volume.c beat_detector.c \
+	blank_frame_detector.c blurzoom.c bump2d.c ccorrect.c \
+	colorkey.c comic.c data_processor.c data_unpacker.c \
+	deinterlace.c edge.c $(farneback_analyser_la_SOURCES) \
+	fg_bg_removal.c fireTV.c fourKlives.c frei0r.c haip.c ladspa.c \
+	layout_blends.c libvis.c lifeTV.c livetext.c log_sig.c \
+	mirrors.c multi_blends.c multi_transitions.c negate.c \
+	nn_programmer.c noise.c onedTV.c palette_test.c plasma.c \
+	posterise.c rippleTV.c rotozoom.c shift.c simple_blend.c \
+	slide_over.c softlight.c targeted_zoom.c textfun.c tone_gen.c \
+	tvpic.c vertigo.c warpTV.c xeffect.c
+DIST_SOURCES = RGBdelay.c alien_overlay.c alpha_means.c audio_fft.c \
+	audio_transition.c audio_volume.c beat_detector.c \
+	blank_frame_detector.c blurzoom.c bump2d.c ccorrect.c \
+	colorkey.c comic.c data_processor.c data_unpacker.c \
+	deinterlace.c edge.c $(am__farneback_analyser_la_SOURCES_DIST) \
+	fg_bg_removal.c fireTV.c fourKlives.c frei0r.c haip.c ladspa.c \
+	layout_blends.c libvis.c lifeTV.c livetext.c log_sig.c \
+	mirrors.c multi_blends.c multi_transitions.c negate.c \
+	nn_programmer.c noise.c onedTV.c palette_test.c plasma.c \
+	posterise.c rippleTV.c rotozoom.c shift.c simple_blend.c \
+	slide_over.c softlight.c targeted_zoom.c textfun.c tone_gen.c \
+	tvpic.c vertigo.c warpTV.c xeffect.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -253,6 +355,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -327,6 +434,8 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FFTW3F_CFLAGS = @FFTW3F_CFLAGS@
+FFTW3F_LIBS = @FFTW3F_LIBS@
 FGREP = @FGREP@
 GENCAT = @GENCAT@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@@ -337,6 +446,8 @@
 GLIBC21 = @GLIBC21@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
+GLU_CFLAGS = @GLU_CFLAGS@
+GLU_LIBS = @GLU_LIBS@
 GL_CFLAGS = @GL_CFLAGS@
 GL_LIBS = @GL_LIBS@
 GMSGFMT = @GMSGFMT@
@@ -412,6 +523,9 @@
 OGG_LIBS = @OGG_LIBS@
 OIL_CFLAGS = @OIL_CFLAGS@
 OIL_LIBS = @OIL_LIBS@
+OPENCV_CFLAGS = @OPENCV_CFLAGS@
+OPENCV_LIBS = @OPENCV_LIBS@
+OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -534,24 +648,15 @@
 top_srcdir = @top_srcdir@
 v4l1_INCFILE = @v4l1_INCFILE@
 
-#NOTE - install-exec-local MUST go in the first subdir !!
-SUBDIRS = gdk
+#NOTE - install-exec-local MUST go in the first subdir ONLY !!
+SUBDIRS = gdk cairo # supercollider experimental
 fxpluginslibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
-@IS_DARWIN_FALSE@shared_ldflags = -shared -fPIC -DPIC -Wl,-Bsymbolic -module -avoid-version --tag=disable-static
+@IS_DARWIN_FALSE@shared_ldflags = -shared -fPIC -DPIC -module -no-undefined -avoid-version --tag=disable-static
 @IS_DARWIN_TRUE@shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static
 @IS_DARWIN_FALSE@shared_cflags = -fPIC -DPIC
 @IS_DARWIN_TRUE@shared_cflags = -fno-common
-@HAVE_SYSTEM_WEED_FALSE@AM_LDFLAGS = $(shared_ldflags) \
-@HAVE_SYSTEM_WEED_FALSE@	../../libweed/libweed-utils.la \
-@HAVE_SYSTEM_WEED_FALSE@	$(am__append_1) $(am__append_2)
-@HAVE_SYSTEM_WEED_TRUE@AM_LDFLAGS = $(shared_ldflags) \
-@HAVE_SYSTEM_WEED_TRUE@	@WEED_UTILS_LIBS@ $(am__append_1) \
-@HAVE_SYSTEM_WEED_TRUE@	$(am__append_2)
-@HAVE_SYSTEM_WEED_FALSE@weed_CFLAGS = $(am__append_3)
-@HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE@weed_CFLAGS = -DHAVE_SYSTEM_WEED_PLUGIN_UTILS \
-@HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE@	$(am__append_3)
-@HAVE_SYSTEM_WEED_TRUE@weed_CFLAGS = -DHAVE_SYSTEM_WEED \
-@HAVE_SYSTEM_WEED_TRUE@	$(am__append_3)
+AM_LDFLAGS = $(shared_ldflags)
+weed_CFLAGS = $(am__append_1) $(am__append_2) $(am__append_3)
 AM_CFLAGS = $(shared_cflags) $(weed_CFLAGS) -ffast-math
 AM_CPPFLAGS = $(shared_cflags) $(weed_CFLAGS) -ffast-math
 @HAVE_VISUAL_TRUE@libvis_libs = libvis.la
@@ -564,40 +669,53 @@
 @HAVE_FREI0R_TRUE@frei0r_la_CFLAGS = $(AM_CFLAGS)
 @HAVE_FREI0R_TRUE@frei0rpluginslibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed/frei0r"
 @HAVE_FREI0R_TRUE@frei0rpluginslib_LTLIBRARIES = $(frei0r_libs)
-
-#if HAVE_OPENCV
-#farneback_analyser_libs = farneback_analyser.la
-#farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
-#farneback_analyser_la_CFLAGS = $(AM_CFLAGS)
-#farneback_analyser_la_SOURCES = farneback_analyser.cpp
-
-#opencvlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
-#opencvlib_LTLIBRARIES = $(farneback_analyser_libs)
-#endif
-
-#	blank_frame_detector.la 
-#	$(opencv_LIBS) 
+@HAVE_OPENCV_TRUE@farneback_analyser_libs = farneback_analyser.la
+@HAVE_OPENCV_TRUE@farneback_analyser_la_LDFLAGS = $(AM_LDFLAGS) $(OPENCV_LIBS_ONLY_L) -lopencv_core -lopencv_video
+@HAVE_OPENCV_TRUE@farneback_analyser_la_CFLAGS = $(AM_CFLAGS)
+@HAVE_OPENCV_TRUE@farneback_analyser_la_SOURCES = farneback_analyser.cpp
+@HAVE_OPENCV_TRUE@opencvlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+@HAVE_OPENCV_TRUE@opencvlib_LTLIBRARIES = $(farneback_analyser_libs)
+@HAVE_FFTW3F_TRUE@audio_fft_libs = audio_fft.la beat_detector.la
+@HAVE_FFTW3F_TRUE@audio_fft_la_LDFLAGS = $(FFTW3F_LIBS) $(AM_LDFLAGS)
+@HAVE_FFTW3F_TRUE@audio_fft_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
+@HAVE_FFTW3F_TRUE@beat_detector_la_LDFLAGS = $(FFTW3F_LIBS) $(AM_LDFLAGS)
+@HAVE_FFTW3F_TRUE@beat_detector_la_CFLAGS = $(FFTW3F_CFLAGS) $(AM_CFLAGS)
+@HAVE_FFTW3F_TRUE@audio_fftlibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+@HAVE_FFTW3F_TRUE@audio_fftlib_LTLIBRARIES = $(audio_fft_libs)
+@HAVE_LADSPA_TRUE@ladspa_libs = ladspa.la
+@HAVE_LADSPA_TRUE@ladspa_la_LDFLAGS = $(AM_LDFLAGS)
+@HAVE_LADSPA_TRUE@ladspa_la_CFLAGS = $(AM_CFLAGS)
+@HAVE_LADSPA_TRUE@ladspadir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+@HAVE_LADSPA_TRUE@ladspa_LTLIBRARIES = $(ladspa_libs)
 fxpluginslib_LTLIBRARIES = RGBdelay.la \
+	alpha_means.la \
 	alien_overlay.la \
 	audio_transition.la \
 	audio_volume.la \
 	bump2d.la \
 	blurzoom.la \
+	blank_frame_detector.la \
+	$(opencv_LIBS) \
 	ccorrect.la \
 	colorkey.la \
 	comic.la \
+	data_processor.la \
+	data_unpacker.la \
 	deinterlace.la \
 	edge.la \
 	fg_bg_removal.la \
 	fireTV.la \
+	fourKlives.la \
 	haip.la \
 	layout_blends.la \
 	lifeTV.la \
 	livetext.la \
+	log_sig.la \
 	mirrors.la \
 	multi_blends.la \
 	multi_transitions.la \
 	negate.la \
+	nn_programmer.la \
 	noise.la \
 	onedTV.la \
 	palette_test.la\
@@ -605,21 +723,23 @@
 	posterise.la \
 	rippleTV.la \
 	rotozoom.la \
+	shift.la \
 	simple_blend.la \
 	slide_over.la \
 	softlight.la \
 	targeted_zoom.la \
 	textfun.la \
+	tone_gen.la \
 	tvpic.la \
 	vertigo.la \
 	warpTV.la \
 	xeffect.la
 
-EXTRA_DIST = data icons
+EXTRA_DIST = data icons syna.h weed-utils-code.c weed-plugin-utils.c
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -650,9 +770,40 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+install-audio_fftlibLTLIBRARIES: $(audio_fftlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(audio_fftlib_LTLIBRARIES)'; test -n "$(audio_fftlibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(audio_fftlibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(audio_fftlibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(audio_fftlibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(audio_fftlibdir)"; \
+	}
+
+uninstall-audio_fftlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(audio_fftlib_LTLIBRARIES)'; test -n "$(audio_fftlibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(audio_fftlibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(audio_fftlibdir)/$$f"; \
+	done
+
+clean-audio_fftlibLTLIBRARIES:
+	-test -z "$(audio_fftlib_LTLIBRARIES)" || rm -f $(audio_fftlib_LTLIBRARIES)
+	@list='$(audio_fftlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 install-frei0rpluginslibLTLIBRARIES: $(frei0rpluginslib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(frei0rpluginslibdir)" || $(MKDIR_P) "$(DESTDIR)$(frei0rpluginslibdir)"
 	@list='$(frei0rpluginslib_LTLIBRARIES)'; test -n "$(frei0rpluginslibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -660,6 +811,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(frei0rpluginslibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(frei0rpluginslibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(frei0rpluginslibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(frei0rpluginslibdir)"; \
 	}
@@ -683,7 +836,6 @@
 	done
 install-fxpluginslibLTLIBRARIES: $(fxpluginslib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(fxpluginslibdir)" || $(MKDIR_P) "$(DESTDIR)$(fxpluginslibdir)"
 	@list='$(fxpluginslib_LTLIBRARIES)'; test -n "$(fxpluginslibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -691,6 +843,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(fxpluginslibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(fxpluginslibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(fxpluginslibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(fxpluginslibdir)"; \
 	}
@@ -712,9 +866,40 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
+install-ladspaLTLIBRARIES: $(ladspa_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(ladspa_LTLIBRARIES)'; test -n "$(ladspadir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(ladspadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(ladspadir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(ladspadir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(ladspadir)"; \
+	}
+
+uninstall-ladspaLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(ladspa_LTLIBRARIES)'; test -n "$(ladspadir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(ladspadir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(ladspadir)/$$f"; \
+	done
+
+clean-ladspaLTLIBRARIES:
+	-test -z "$(ladspa_LTLIBRARIES)" || rm -f $(ladspa_LTLIBRARIES)
+	@list='$(ladspa_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
 install-libvispluginslibLTLIBRARIES: $(libvispluginslib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libvispluginslibdir)" || $(MKDIR_P) "$(DESTDIR)$(libvispluginslibdir)"
 	@list='$(libvispluginslib_LTLIBRARIES)'; test -n "$(libvispluginslibdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -722,6 +907,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libvispluginslibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libvispluginslibdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libvispluginslibdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libvispluginslibdir)"; \
 	}
@@ -743,83 +930,141 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-RGBdelay.la: $(RGBdelay_la_OBJECTS) $(RGBdelay_la_DEPENDENCIES) 
+install-opencvlibLTLIBRARIES: $(opencvlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(opencvlib_LTLIBRARIES)'; test -n "$(opencvlibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(opencvlibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(opencvlibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(opencvlibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(opencvlibdir)"; \
+	}
+
+uninstall-opencvlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(opencvlib_LTLIBRARIES)'; test -n "$(opencvlibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(opencvlibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(opencvlibdir)/$$f"; \
+	done
+
+clean-opencvlibLTLIBRARIES:
+	-test -z "$(opencvlib_LTLIBRARIES)" || rm -f $(opencvlib_LTLIBRARIES)
+	@list='$(opencvlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+RGBdelay.la: $(RGBdelay_la_OBJECTS) $(RGBdelay_la_DEPENDENCIES) $(EXTRA_RGBdelay_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(RGBdelay_la_OBJECTS) $(RGBdelay_la_LIBADD) $(LIBS)
-alien_overlay.la: $(alien_overlay_la_OBJECTS) $(alien_overlay_la_DEPENDENCIES) 
+alien_overlay.la: $(alien_overlay_la_OBJECTS) $(alien_overlay_la_DEPENDENCIES) $(EXTRA_alien_overlay_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(alien_overlay_la_OBJECTS) $(alien_overlay_la_LIBADD) $(LIBS)
-audio_transition.la: $(audio_transition_la_OBJECTS) $(audio_transition_la_DEPENDENCIES) 
+alpha_means.la: $(alpha_means_la_OBJECTS) $(alpha_means_la_DEPENDENCIES) $(EXTRA_alpha_means_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(alpha_means_la_OBJECTS) $(alpha_means_la_LIBADD) $(LIBS)
+audio_fft.la: $(audio_fft_la_OBJECTS) $(audio_fft_la_DEPENDENCIES) $(EXTRA_audio_fft_la_DEPENDENCIES) 
+	$(audio_fft_la_LINK) $(am_audio_fft_la_rpath) $(audio_fft_la_OBJECTS) $(audio_fft_la_LIBADD) $(LIBS)
+audio_transition.la: $(audio_transition_la_OBJECTS) $(audio_transition_la_DEPENDENCIES) $(EXTRA_audio_transition_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(audio_transition_la_OBJECTS) $(audio_transition_la_LIBADD) $(LIBS)
-audio_volume.la: $(audio_volume_la_OBJECTS) $(audio_volume_la_DEPENDENCIES) 
+audio_volume.la: $(audio_volume_la_OBJECTS) $(audio_volume_la_DEPENDENCIES) $(EXTRA_audio_volume_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(audio_volume_la_OBJECTS) $(audio_volume_la_LIBADD) $(LIBS)
-blurzoom.la: $(blurzoom_la_OBJECTS) $(blurzoom_la_DEPENDENCIES) 
+beat_detector.la: $(beat_detector_la_OBJECTS) $(beat_detector_la_DEPENDENCIES) $(EXTRA_beat_detector_la_DEPENDENCIES) 
+	$(beat_detector_la_LINK) $(am_beat_detector_la_rpath) $(beat_detector_la_OBJECTS) $(beat_detector_la_LIBADD) $(LIBS)
+blank_frame_detector.la: $(blank_frame_detector_la_OBJECTS) $(blank_frame_detector_la_DEPENDENCIES) $(EXTRA_blank_frame_detector_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(blank_frame_detector_la_OBJECTS) $(blank_frame_detector_la_LIBADD) $(LIBS)
+blurzoom.la: $(blurzoom_la_OBJECTS) $(blurzoom_la_DEPENDENCIES) $(EXTRA_blurzoom_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(blurzoom_la_OBJECTS) $(blurzoom_la_LIBADD) $(LIBS)
-bump2d.la: $(bump2d_la_OBJECTS) $(bump2d_la_DEPENDENCIES) 
+bump2d.la: $(bump2d_la_OBJECTS) $(bump2d_la_DEPENDENCIES) $(EXTRA_bump2d_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(bump2d_la_OBJECTS) $(bump2d_la_LIBADD) $(LIBS)
-ccorrect.la: $(ccorrect_la_OBJECTS) $(ccorrect_la_DEPENDENCIES) 
+ccorrect.la: $(ccorrect_la_OBJECTS) $(ccorrect_la_DEPENDENCIES) $(EXTRA_ccorrect_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(ccorrect_la_OBJECTS) $(ccorrect_la_LIBADD) $(LIBS)
-colorkey.la: $(colorkey_la_OBJECTS) $(colorkey_la_DEPENDENCIES) 
+colorkey.la: $(colorkey_la_OBJECTS) $(colorkey_la_DEPENDENCIES) $(EXTRA_colorkey_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(colorkey_la_OBJECTS) $(colorkey_la_LIBADD) $(LIBS)
-comic.la: $(comic_la_OBJECTS) $(comic_la_DEPENDENCIES) 
+comic.la: $(comic_la_OBJECTS) $(comic_la_DEPENDENCIES) $(EXTRA_comic_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(comic_la_OBJECTS) $(comic_la_LIBADD) $(LIBS)
-deinterlace.la: $(deinterlace_la_OBJECTS) $(deinterlace_la_DEPENDENCIES) 
+data_processor.la: $(data_processor_la_OBJECTS) $(data_processor_la_DEPENDENCIES) $(EXTRA_data_processor_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(data_processor_la_OBJECTS) $(data_processor_la_LIBADD) $(LIBS)
+data_unpacker.la: $(data_unpacker_la_OBJECTS) $(data_unpacker_la_DEPENDENCIES) $(EXTRA_data_unpacker_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(data_unpacker_la_OBJECTS) $(data_unpacker_la_LIBADD) $(LIBS)
+deinterlace.la: $(deinterlace_la_OBJECTS) $(deinterlace_la_DEPENDENCIES) $(EXTRA_deinterlace_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(deinterlace_la_OBJECTS) $(deinterlace_la_LIBADD) $(LIBS)
-edge.la: $(edge_la_OBJECTS) $(edge_la_DEPENDENCIES) 
+edge.la: $(edge_la_OBJECTS) $(edge_la_DEPENDENCIES) $(EXTRA_edge_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(edge_la_OBJECTS) $(edge_la_LIBADD) $(LIBS)
-fg_bg_removal.la: $(fg_bg_removal_la_OBJECTS) $(fg_bg_removal_la_DEPENDENCIES) 
+farneback_analyser.la: $(farneback_analyser_la_OBJECTS) $(farneback_analyser_la_DEPENDENCIES) $(EXTRA_farneback_analyser_la_DEPENDENCIES) 
+	$(farneback_analyser_la_LINK) $(am_farneback_analyser_la_rpath) $(farneback_analyser_la_OBJECTS) $(farneback_analyser_la_LIBADD) $(LIBS)
+fg_bg_removal.la: $(fg_bg_removal_la_OBJECTS) $(fg_bg_removal_la_DEPENDENCIES) $(EXTRA_fg_bg_removal_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(fg_bg_removal_la_OBJECTS) $(fg_bg_removal_la_LIBADD) $(LIBS)
-fireTV.la: $(fireTV_la_OBJECTS) $(fireTV_la_DEPENDENCIES) 
+fireTV.la: $(fireTV_la_OBJECTS) $(fireTV_la_DEPENDENCIES) $(EXTRA_fireTV_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(fireTV_la_OBJECTS) $(fireTV_la_LIBADD) $(LIBS)
-frei0r.la: $(frei0r_la_OBJECTS) $(frei0r_la_DEPENDENCIES) 
+fourKlives.la: $(fourKlives_la_OBJECTS) $(fourKlives_la_DEPENDENCIES) $(EXTRA_fourKlives_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(fourKlives_la_OBJECTS) $(fourKlives_la_LIBADD) $(LIBS)
+frei0r.la: $(frei0r_la_OBJECTS) $(frei0r_la_DEPENDENCIES) $(EXTRA_frei0r_la_DEPENDENCIES) 
 	$(frei0r_la_LINK) $(am_frei0r_la_rpath) $(frei0r_la_OBJECTS) $(frei0r_la_LIBADD) $(LIBS)
-haip.la: $(haip_la_OBJECTS) $(haip_la_DEPENDENCIES) 
+haip.la: $(haip_la_OBJECTS) $(haip_la_DEPENDENCIES) $(EXTRA_haip_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(haip_la_OBJECTS) $(haip_la_LIBADD) $(LIBS)
-layout_blends.la: $(layout_blends_la_OBJECTS) $(layout_blends_la_DEPENDENCIES) 
+ladspa.la: $(ladspa_la_OBJECTS) $(ladspa_la_DEPENDENCIES) $(EXTRA_ladspa_la_DEPENDENCIES) 
+	$(ladspa_la_LINK) $(am_ladspa_la_rpath) $(ladspa_la_OBJECTS) $(ladspa_la_LIBADD) $(LIBS)
+layout_blends.la: $(layout_blends_la_OBJECTS) $(layout_blends_la_DEPENDENCIES) $(EXTRA_layout_blends_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(layout_blends_la_OBJECTS) $(layout_blends_la_LIBADD) $(LIBS)
-libvis.la: $(libvis_la_OBJECTS) $(libvis_la_DEPENDENCIES) 
+libvis.la: $(libvis_la_OBJECTS) $(libvis_la_DEPENDENCIES) $(EXTRA_libvis_la_DEPENDENCIES) 
 	$(libvis_la_LINK) $(am_libvis_la_rpath) $(libvis_la_OBJECTS) $(libvis_la_LIBADD) $(LIBS)
-lifeTV.la: $(lifeTV_la_OBJECTS) $(lifeTV_la_DEPENDENCIES) 
+lifeTV.la: $(lifeTV_la_OBJECTS) $(lifeTV_la_DEPENDENCIES) $(EXTRA_lifeTV_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(lifeTV_la_OBJECTS) $(lifeTV_la_LIBADD) $(LIBS)
-livetext.la: $(livetext_la_OBJECTS) $(livetext_la_DEPENDENCIES) 
+livetext.la: $(livetext_la_OBJECTS) $(livetext_la_DEPENDENCIES) $(EXTRA_livetext_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(livetext_la_OBJECTS) $(livetext_la_LIBADD) $(LIBS)
-mirrors.la: $(mirrors_la_OBJECTS) $(mirrors_la_DEPENDENCIES) 
+log_sig.la: $(log_sig_la_OBJECTS) $(log_sig_la_DEPENDENCIES) $(EXTRA_log_sig_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(log_sig_la_OBJECTS) $(log_sig_la_LIBADD) $(LIBS)
+mirrors.la: $(mirrors_la_OBJECTS) $(mirrors_la_DEPENDENCIES) $(EXTRA_mirrors_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(mirrors_la_OBJECTS) $(mirrors_la_LIBADD) $(LIBS)
-multi_blends.la: $(multi_blends_la_OBJECTS) $(multi_blends_la_DEPENDENCIES) 
+multi_blends.la: $(multi_blends_la_OBJECTS) $(multi_blends_la_DEPENDENCIES) $(EXTRA_multi_blends_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(multi_blends_la_OBJECTS) $(multi_blends_la_LIBADD) $(LIBS)
-multi_transitions.la: $(multi_transitions_la_OBJECTS) $(multi_transitions_la_DEPENDENCIES) 
+multi_transitions.la: $(multi_transitions_la_OBJECTS) $(multi_transitions_la_DEPENDENCIES) $(EXTRA_multi_transitions_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(multi_transitions_la_OBJECTS) $(multi_transitions_la_LIBADD) $(LIBS)
-negate.la: $(negate_la_OBJECTS) $(negate_la_DEPENDENCIES) 
+negate.la: $(negate_la_OBJECTS) $(negate_la_DEPENDENCIES) $(EXTRA_negate_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(negate_la_OBJECTS) $(negate_la_LIBADD) $(LIBS)
-noise.la: $(noise_la_OBJECTS) $(noise_la_DEPENDENCIES) 
+nn_programmer.la: $(nn_programmer_la_OBJECTS) $(nn_programmer_la_DEPENDENCIES) $(EXTRA_nn_programmer_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(nn_programmer_la_OBJECTS) $(nn_programmer_la_LIBADD) $(LIBS)
+noise.la: $(noise_la_OBJECTS) $(noise_la_DEPENDENCIES) $(EXTRA_noise_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(noise_la_OBJECTS) $(noise_la_LIBADD) $(LIBS)
-onedTV.la: $(onedTV_la_OBJECTS) $(onedTV_la_DEPENDENCIES) 
+onedTV.la: $(onedTV_la_OBJECTS) $(onedTV_la_DEPENDENCIES) $(EXTRA_onedTV_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(onedTV_la_OBJECTS) $(onedTV_la_LIBADD) $(LIBS)
-palette_test.la: $(palette_test_la_OBJECTS) $(palette_test_la_DEPENDENCIES) 
+palette_test.la: $(palette_test_la_OBJECTS) $(palette_test_la_DEPENDENCIES) $(EXTRA_palette_test_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(palette_test_la_OBJECTS) $(palette_test_la_LIBADD) $(LIBS)
-plasma.la: $(plasma_la_OBJECTS) $(plasma_la_DEPENDENCIES) 
+plasma.la: $(plasma_la_OBJECTS) $(plasma_la_DEPENDENCIES) $(EXTRA_plasma_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(plasma_la_OBJECTS) $(plasma_la_LIBADD) $(LIBS)
-posterise.la: $(posterise_la_OBJECTS) $(posterise_la_DEPENDENCIES) 
+posterise.la: $(posterise_la_OBJECTS) $(posterise_la_DEPENDENCIES) $(EXTRA_posterise_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(posterise_la_OBJECTS) $(posterise_la_LIBADD) $(LIBS)
-rippleTV.la: $(rippleTV_la_OBJECTS) $(rippleTV_la_DEPENDENCIES) 
+rippleTV.la: $(rippleTV_la_OBJECTS) $(rippleTV_la_DEPENDENCIES) $(EXTRA_rippleTV_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(rippleTV_la_OBJECTS) $(rippleTV_la_LIBADD) $(LIBS)
-rotozoom.la: $(rotozoom_la_OBJECTS) $(rotozoom_la_DEPENDENCIES) 
+rotozoom.la: $(rotozoom_la_OBJECTS) $(rotozoom_la_DEPENDENCIES) $(EXTRA_rotozoom_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(rotozoom_la_OBJECTS) $(rotozoom_la_LIBADD) $(LIBS)
-simple_blend.la: $(simple_blend_la_OBJECTS) $(simple_blend_la_DEPENDENCIES) 
+shift.la: $(shift_la_OBJECTS) $(shift_la_DEPENDENCIES) $(EXTRA_shift_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(shift_la_OBJECTS) $(shift_la_LIBADD) $(LIBS)
+simple_blend.la: $(simple_blend_la_OBJECTS) $(simple_blend_la_DEPENDENCIES) $(EXTRA_simple_blend_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(simple_blend_la_OBJECTS) $(simple_blend_la_LIBADD) $(LIBS)
-slide_over.la: $(slide_over_la_OBJECTS) $(slide_over_la_DEPENDENCIES) 
+slide_over.la: $(slide_over_la_OBJECTS) $(slide_over_la_DEPENDENCIES) $(EXTRA_slide_over_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(slide_over_la_OBJECTS) $(slide_over_la_LIBADD) $(LIBS)
-softlight.la: $(softlight_la_OBJECTS) $(softlight_la_DEPENDENCIES) 
+softlight.la: $(softlight_la_OBJECTS) $(softlight_la_DEPENDENCIES) $(EXTRA_softlight_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(softlight_la_OBJECTS) $(softlight_la_LIBADD) $(LIBS)
-targeted_zoom.la: $(targeted_zoom_la_OBJECTS) $(targeted_zoom_la_DEPENDENCIES) 
+targeted_zoom.la: $(targeted_zoom_la_OBJECTS) $(targeted_zoom_la_DEPENDENCIES) $(EXTRA_targeted_zoom_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(targeted_zoom_la_OBJECTS) $(targeted_zoom_la_LIBADD) $(LIBS)
-textfun.la: $(textfun_la_OBJECTS) $(textfun_la_DEPENDENCIES) 
+textfun.la: $(textfun_la_OBJECTS) $(textfun_la_DEPENDENCIES) $(EXTRA_textfun_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(textfun_la_OBJECTS) $(textfun_la_LIBADD) $(LIBS)
-tvpic.la: $(tvpic_la_OBJECTS) $(tvpic_la_DEPENDENCIES) 
+tone_gen.la: $(tone_gen_la_OBJECTS) $(tone_gen_la_DEPENDENCIES) $(EXTRA_tone_gen_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(tone_gen_la_OBJECTS) $(tone_gen_la_LIBADD) $(LIBS)
+tvpic.la: $(tvpic_la_OBJECTS) $(tvpic_la_DEPENDENCIES) $(EXTRA_tvpic_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(tvpic_la_OBJECTS) $(tvpic_la_LIBADD) $(LIBS)
-vertigo.la: $(vertigo_la_OBJECTS) $(vertigo_la_DEPENDENCIES) 
+vertigo.la: $(vertigo_la_OBJECTS) $(vertigo_la_DEPENDENCIES) $(EXTRA_vertigo_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(vertigo_la_OBJECTS) $(vertigo_la_LIBADD) $(LIBS)
-warpTV.la: $(warpTV_la_OBJECTS) $(warpTV_la_DEPENDENCIES) 
+warpTV.la: $(warpTV_la_OBJECTS) $(warpTV_la_DEPENDENCIES) $(EXTRA_warpTV_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(warpTV_la_OBJECTS) $(warpTV_la_LIBADD) $(LIBS)
-xeffect.la: $(xeffect_la_OBJECTS) $(xeffect_la_DEPENDENCIES) 
+xeffect.la: $(xeffect_la_OBJECTS) $(xeffect_la_DEPENDENCIES) $(EXTRA_xeffect_la_DEPENDENCIES) 
 	$(LINK) -rpath $(fxpluginslibdir) $(xeffect_la_OBJECTS) $(xeffect_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -830,27 +1075,38 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RGBdelay.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alien_overlay.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha_means.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_fft_la-audio_fft.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_transition.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_volume.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beat_detector_la-beat_detector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blank_frame_detector.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blurzoom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bump2d.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccorrect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colorkey.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_processor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_unpacker.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deinterlace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/farneback_analyser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fg_bg_removal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fireTV.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fourKlives.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frei0r_la-frei0r.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ladspa_la-ladspa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout_blends.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvis_la-libvis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lifeTV.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/livetext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_sig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mirrors.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi_blends.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multi_transitions.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nn_programmer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noise.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onedTV.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette_test.Plo@am__quote@
@@ -858,11 +1114,13 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posterise.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rippleTV.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rotozoom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shift.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_blend.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slide_over.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/softlight.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/targeted_zoom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textfun.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tone_gen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvpic.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vertigo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/warpTV.Plo@am__quote@
@@ -889,6 +1147,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+audio_fft_la-audio_fft.lo: audio_fft.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(audio_fft_la_CFLAGS) $(CFLAGS) -MT audio_fft_la-audio_fft.lo -MD -MP -MF $(DEPDIR)/audio_fft_la-audio_fft.Tpo -c -o audio_fft_la-audio_fft.lo `test -f 'audio_fft.c' || echo '$(srcdir)/'`audio_fft.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/audio_fft_la-audio_fft.Tpo $(DEPDIR)/audio_fft_la-audio_fft.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='audio_fft.c' object='audio_fft_la-audio_fft.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(audio_fft_la_CFLAGS) $(CFLAGS) -c -o audio_fft_la-audio_fft.lo `test -f 'audio_fft.c' || echo '$(srcdir)/'`audio_fft.c
+
+beat_detector_la-beat_detector.lo: beat_detector.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(beat_detector_la_CFLAGS) $(CFLAGS) -MT beat_detector_la-beat_detector.lo -MD -MP -MF $(DEPDIR)/beat_detector_la-beat_detector.Tpo -c -o beat_detector_la-beat_detector.lo `test -f 'beat_detector.c' || echo '$(srcdir)/'`beat_detector.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/beat_detector_la-beat_detector.Tpo $(DEPDIR)/beat_detector_la-beat_detector.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='beat_detector.c' object='beat_detector_la-beat_detector.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(beat_detector_la_CFLAGS) $(CFLAGS) -c -o beat_detector_la-beat_detector.lo `test -f 'beat_detector.c' || echo '$(srcdir)/'`beat_detector.c
+
 frei0r_la-frei0r.lo: frei0r.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(frei0r_la_CFLAGS) $(CFLAGS) -MT frei0r_la-frei0r.lo -MD -MP -MF $(DEPDIR)/frei0r_la-frei0r.Tpo -c -o frei0r_la-frei0r.lo `test -f 'frei0r.c' || echo '$(srcdir)/'`frei0r.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/frei0r_la-frei0r.Tpo $(DEPDIR)/frei0r_la-frei0r.Plo
@@ -896,6 +1168,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(frei0r_la_CFLAGS) $(CFLAGS) -c -o frei0r_la-frei0r.lo `test -f 'frei0r.c' || echo '$(srcdir)/'`frei0r.c
 
+ladspa_la-ladspa.lo: ladspa.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ladspa_la_CFLAGS) $(CFLAGS) -MT ladspa_la-ladspa.lo -MD -MP -MF $(DEPDIR)/ladspa_la-ladspa.Tpo -c -o ladspa_la-ladspa.lo `test -f 'ladspa.c' || echo '$(srcdir)/'`ladspa.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ladspa_la-ladspa.Tpo $(DEPDIR)/ladspa_la-ladspa.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ladspa.c' object='ladspa_la-ladspa.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ladspa_la_CFLAGS) $(CFLAGS) -c -o ladspa_la-ladspa.lo `test -f 'ladspa.c' || echo '$(srcdir)/'`ladspa.c
+
 libvis_la-libvis.lo: libvis.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvis_la_CFLAGS) $(CFLAGS) -MT libvis_la-libvis.lo -MD -MP -MF $(DEPDIR)/libvis_la-libvis.Tpo -c -o libvis_la-libvis.lo `test -f 'libvis.c' || echo '$(srcdir)/'`libvis.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libvis_la-libvis.Tpo $(DEPDIR)/libvis_la-libvis.Plo
@@ -903,6 +1182,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvis_la_CFLAGS) $(CFLAGS) -c -o libvis_la-libvis.lo `test -f 'libvis.c' || echo '$(srcdir)/'`libvis.c
 
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1076,13 +1376,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1107,7 +1404,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(frei0rpluginslibdir)" "$(DESTDIR)$(fxpluginslibdir)" "$(DESTDIR)$(libvispluginslibdir)"; do \
+	for dir in "$(DESTDIR)$(audio_fftlibdir)" "$(DESTDIR)$(frei0rpluginslibdir)" "$(DESTDIR)$(fxpluginslibdir)" "$(DESTDIR)$(ladspadir)" "$(DESTDIR)$(libvispluginslibdir)" "$(DESTDIR)$(opencvlibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -1120,10 +1417,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1137,9 +1439,12 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-frei0rpluginslibLTLIBRARIES \
-	clean-fxpluginslibLTLIBRARIES clean-generic clean-libtool \
-	clean-libvispluginslibLTLIBRARIES mostlyclean-am
+clean-am: clean-audio_fftlibLTLIBRARIES \
+	clean-frei0rpluginslibLTLIBRARIES \
+	clean-fxpluginslibLTLIBRARIES clean-generic \
+	clean-ladspaLTLIBRARIES clean-libtool \
+	clean-libvispluginslibLTLIBRARIES clean-opencvlibLTLIBRARIES \
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
@@ -1159,10 +1464,11 @@
 
 info-am:
 
-install-data-am: install-data-local \
+install-data-am: install-audio_fftlibLTLIBRARIES install-data-local \
 	install-frei0rpluginslibLTLIBRARIES \
-	install-fxpluginslibLTLIBRARIES \
-	install-libvispluginslibLTLIBRARIES
+	install-fxpluginslibLTLIBRARIES install-ladspaLTLIBRARIES \
+	install-libvispluginslibLTLIBRARIES \
+	install-opencvlibLTLIBRARIES
 
 install-dvi: install-dvi-recursive
 
@@ -1208,41 +1514,47 @@
 
 ps-am:
 
-uninstall-am: uninstall-frei0rpluginslibLTLIBRARIES \
-	uninstall-fxpluginslibLTLIBRARIES \
-	uninstall-libvispluginslibLTLIBRARIES
+uninstall-am: uninstall-audio_fftlibLTLIBRARIES \
+	uninstall-frei0rpluginslibLTLIBRARIES \
+	uninstall-fxpluginslibLTLIBRARIES uninstall-ladspaLTLIBRARIES \
+	uninstall-libvispluginslibLTLIBRARIES \
+	uninstall-opencvlibLTLIBRARIES
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean \
+	all all-am check check-am clean clean-audio_fftlibLTLIBRARIES \
 	clean-frei0rpluginslibLTLIBRARIES \
-	clean-fxpluginslibLTLIBRARIES clean-generic clean-libtool \
-	clean-libvispluginslibLTLIBRARIES ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am \
-	install-frei0rpluginslibLTLIBRARIES \
+	clean-fxpluginslibLTLIBRARIES clean-generic \
+	clean-ladspaLTLIBRARIES clean-libtool \
+	clean-libvispluginslibLTLIBRARIES clean-opencvlibLTLIBRARIES \
+	ctags ctags-recursive distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-audio_fftlibLTLIBRARIES install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-frei0rpluginslibLTLIBRARIES \
 	install-fxpluginslibLTLIBRARIES install-html install-html-am \
-	install-info install-info-am \
-	install-libvispluginslibLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	install-info install-info-am install-ladspaLTLIBRARIES \
+	install-libvispluginslibLTLIBRARIES install-man \
+	install-opencvlibLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-audio_fftlibLTLIBRARIES \
 	uninstall-frei0rpluginslibLTLIBRARIES \
-	uninstall-fxpluginslibLTLIBRARIES \
-	uninstall-libvispluginslibLTLIBRARIES
+	uninstall-fxpluginslibLTLIBRARIES uninstall-ladspaLTLIBRARIES \
+	uninstall-libvispluginslibLTLIBRARIES \
+	uninstall-opencvlibLTLIBRARIES
 
 
 install-data-local:
 	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
-	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)"
-	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)"
+	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
 	$(MAKE) -i install-data-local-remove-vcs-files
 
 install-data-local-remove-vcs-files:

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c Changed

@@ -12,12 +12,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -29,14 +27,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 typedef struct {
@@ -342,7 +341,7 @@
     gui=weed_filter_class_get_gui(filter_class);
     rfx_strings[0]="layout|p0";
     rfx_strings[1]="layout|hseparator|";
-    rfx_strings[2]="layout|\"  R\"|\"           G \"|\"           B \"|fill|\"Blend Strength\"|fill|";
+    rfx_strings[2]="layout|\"  R\"|\"         G \"|\"         B \"|fill|\"Blend Strength\"|fill|";
 
     for(i=3;i<54;i++) {
       rfx_strings[i]=weed_malloc(1024);
@@ -356,7 +355,7 @@
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
 
-    rfx_strings[2]="layout|\"  Y\"|\"           U \"|\"           V \"|fill|\"Blend Strength\"|fill|";
+    rfx_strings[2]="layout|\"  Y\"|\"         U \"|\"         V \"|fill|\"Blend Strength\"|fill|";
 
     filter_class=weed_filter_class_init("YUVdelay","salsaman",1,0,&RGBd_init,&RGBd_process,&RGBd_deinit,in_chantmpls2,out_chantmpls2,(clone=weed_clone_plants(in_params)),NULL);
     weed_free(clone);

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/alpha_means.c Added

@@ -0,0 +1,168 @@
+// alpha_means.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+// calculate n X m mean values for alpha channel
+
+// values are output from left to right and top to bottom, eg. for 2 X 2 grid:
+
+// val 1 | val 2
+// ------+------
+// val 3 | val 4
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+
+int alpham_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t *out_param=weed_get_plantptr_value(inst,"out_parameters",&error);
+
+  float *alpha=(float *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
+
+  int width=weed_get_int_value(in_channel,"width",&error);
+  int height=weed_get_int_value(in_channel,"height",&error);
+
+  int irow=weed_get_int_value(in_channel,"rowstrides",&error)-width*sizeof(float);
+
+
+  int n=weed_get_int_value(in_params[0],"value",&error);
+  int m=weed_get_int_value(in_params[1],"value",&error);
+  int xdiv=weed_get_boolean_value(in_params[2],"value",&error);
+  int ydiv=weed_get_boolean_value(in_params[3],"value",&error);
+  int abs=weed_get_boolean_value(in_params[4],"value",&error);
+  double scale=weed_get_double_value(in_params[5],"value",&error);
+
+  int idx=0,nidx;
+
+  float nf=(float)width/(float)n; // x pixels per quad
+  float mf=(float)height/(float)m; // y pixels per quad
+  float nm=(float)(nf*mf); // pixels per quad
+
+  double *vals;
+
+  register int i,j,x;
+
+  weed_free(in_params);
+
+  vals=(double *)weed_malloc(n*m*sizeof(double));
+
+  if (vals==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+  
+  for (i=0;i<n*m;i++) vals[i]=0.;
+
+  for (i=0;i<height;i++) {
+    for (j=0;j<width;j++) {
+      vals[idx]+=(double)*alpha;
+
+      // check val of idx for next j
+      if (j+1<width) {
+	nidx=(int)((float)(j+1.)/nf+.5);
+	if (nidx>idx+1) {
+	  // too many vals, copy...
+	  for (x=idx+1;x<nidx;x++) {
+	    vals[x]=vals[idx];
+	  }
+
+	}
+	idx=nidx;
+      }
+      alpha++;
+    }
+    alpha+=irow;
+
+    nidx=(int)((float)(m*(i+1))/mf+.5);
+
+    if (nidx>idx+1) {
+      for (x=idx+1;x<nidx;x++) {
+	vals[x]=vals[x-m];
+      }
+    }
+
+    idx=nidx;
+
+  }
+
+  if (nm<1.) nm=1.;
+
+  for (i=0;i<n*m;i++) {
+    vals[i]/=(double)nm; // get average val
+    if (xdiv) vals[i]/=(double)width;
+    if (ydiv) vals[i]/=(double)height;
+    if (abs&&vals[i]<0.) vals[i]=-vals[i];
+    vals[i]*=scale;
+  }
+
+  weed_set_double_array(out_param,"value",n*m,vals);
+
+  weed_free(vals);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+
+    int apalette_list[]={WEED_PALETTE_AFLOAT,WEED_PALETTE_END};
+
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("alpha float",0,apalette_list),NULL};
+
+    weed_plant_t *in_params[]={weed_integer_init("x divisions","_X divisions",1,1,256),weed_integer_init("y divisions","_Y divisions",1,1,256),weed_switch_init("xdiv","Divide by _width",WEED_FALSE),weed_switch_init("ydiv","Divide by _height",WEED_FALSE),weed_switch_init("abs","Return _absolute values",WEED_FALSE),weed_float_init("scale","_Scale by",1.0,0.1,1000000.),NULL};
+
+    weed_plant_t *out_params[]={weed_out_param_float_init("mean values",0.,-1000000000.,1000000000.),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("alpha_means","salsaman",1,0,
+						      NULL,&alpham_process,NULL,
+						      in_chantmpls,NULL,
+						      in_params,out_params);
+
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    //number of output values depends on size of grid
+    weed_set_int_value(out_params[0],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+
+  }
+
+  return plugin_info;
+}
+

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/audio_fft.c Added

@@ -0,0 +1,213 @@
+// audio_fft.c
+// weed plugin to do audio fft sampling
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+#include <string.h>
+
+#include <fftw3.h>
+#include <math.h>
+
+#define MAXPLANS 18
+
+static size_t sizf=sizeof(float);
+
+static float *ins[MAXPLANS];
+static fftwf_complex *outs[MAXPLANS];
+static fftwf_plan plans[MAXPLANS];
+
+static int rndlog2(int i) {
+  // return (int)log2(i) - 1
+  int x=2,val=-1;
+
+  while (x<=i) {
+    x*=2;
+    val++;
+  }
+  return val;
+}
+
+
+static int twopow(int i) {
+  // return 2**(i+1)
+  register int j,x=2;
+
+  for (j=0;j<i;j++) x*=2;
+
+  return x;
+}
+
+
+static int create_plans(void) {
+  register int i,nsamps;
+
+  for (i=0;i<MAXPLANS;i++) {
+    // create fftw plan
+    nsamps=twopow(i);
+
+    ins[i] = (float*) fftwf_malloc(nsamps*sizeof(float));
+    if (ins[i]==NULL) {
+      return WEED_ERROR_MEMORY_ALLOCATION;
+    }
+    
+    outs[i] = (fftwf_complex*) fftwf_malloc(nsamps*sizeof(fftwf_complex));
+    if (outs[i]==NULL) {
+      return WEED_ERROR_MEMORY_ALLOCATION;
+    }
+    
+    plans[i] = fftwf_plan_dft_r2c_1d(nsamps, ins[i], outs[i], i<13?FFTW_MEASURE:FFTW_ESTIMATE);
+  }
+  return WEED_NO_ERROR;
+}
+
+
+
+
+/////////////////////////////////////////////////////////////
+
+
+
+int fftw_process (weed_plant_t *inst, weed_timecode_t tc) {
+
+  int error;
+  int chans,nsamps,onsamps,base,inter,rate,k;
+
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  float *src=(float *)weed_get_voidptr_value(in_channel,"audio_data",&error);
+
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t *out_param=weed_get_plantptr_value(inst,"out_parameters",&error);
+
+  double freq=weed_get_double_value(in_params[0],"value",&error);
+
+  float tot=0.;
+
+  register int i,j;
+
+  weed_free(in_params);
+
+  onsamps=weed_get_int_value(in_channel,"audio_data_length",&error);
+
+  if (onsamps<2) {
+    weed_set_double_value(out_param,"value",0.);
+    weed_set_int64_value(out_param,"timecode",tc);
+    return WEED_NO_ERROR;
+  }
+
+  base=rndlog2(onsamps);
+  nsamps=twopow(base);
+
+  rate=weed_get_int_value(in_channel,"audio_rate",&error);
+
+  // which element do we want for output ?
+  // out array goes from 0 to (nsamps/2 + 1) [div b y 2 rounded down]
+
+  // nyquist freq is rate / 2
+  // so the freq. of the kth element is: f  =  k/nsamps * rate
+  // therefore k = f/rate * nsamps
+
+  k = freq/(double)rate*(double)nsamps;
+
+  if (k>(nsamps>>1)) {
+    weed_set_double_value(out_param,"value",0.);
+    weed_set_int64_value(out_param,"timecode",tc);
+    return WEED_NO_ERROR;
+  }
+
+  chans=weed_get_int_value(in_channel,"audio_channels",&error);
+  inter=weed_get_boolean_value(in_channel,"audio_interleaf",&error);
+
+  for (i=0;i<chans;i++) {
+    // do transform for each channel
+
+    // copy in data to sdata->in
+    if (inter==WEED_FALSE) {
+      // non-interleaved
+      weed_memcpy(ins[base],src,nsamps*sizf);
+      src+=onsamps;
+    }
+    else {
+      // interleaved
+      for (j=0;j<nsamps;j++) {
+	ins[base][j]=src[j*chans];
+      }
+      src++;
+    }
+
+    //fprintf(stderr,"executing plan of size %d\n",sdata->size);
+    fftwf_execute(plans[base]);
+
+    tot+=sqrtf(outs[base][k][0]*outs[base][k][0]+outs[base][k][1]*outs[base][k][1]);
+
+  }
+
+  //fprintf(stderr,"tot is %f\n",tot);
+
+  // average over all audio channels
+  weed_set_double_value(out_param,"value",(double)(tot/(float)chans));
+  weed_set_int64_value(out_param,"timecode",tc);
+
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info;
+
+  if (create_plans()!=WEED_NO_ERROR) return NULL;
+  plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    weed_plant_t *in_chantmpls[]={weed_audio_channel_template_init("in channel 0",0),NULL};
+    weed_plant_t *in_params[]={weed_float_init("freq","_Frequency",2000.,0.0,22000.0),NULL};
+    weed_plant_t *out_params[]={weed_out_param_float_init("value",0.,0.,1.),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("audio fft analyser","salsaman",1,0,NULL,&fftw_process,
+						      NULL,in_chantmpls,NULL,in_params,out_params);
+    
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+
+
+void weed_desetup(void) {
+  register int i;
+  for (i=0;i<MAXPLANS;i++) {
+    fftwf_destroy_plan(plans[i]);
+    fftwf_free(ins[i]);
+    fftwf_free(outs[i]);
+  }
+}

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/audio_transition.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/audio_transition.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/audio_volume.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/audio_volume.c Changed

@@ -10,12 +10,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -27,14 +25,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 
@@ -43,14 +42,23 @@
   weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   int chans=weed_get_int_value(in_channel,"audio_channels",&error);
   weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
   weed_plant_t *paramt=weed_get_plantptr_value(in_params[1],"template",&error);
   weed_plant_t *gui=weed_parameter_template_get_gui(paramt);
+  weed_plant_t *paramt2=weed_get_plantptr_value(in_params[2],"template",&error);
+  weed_plant_t *gui2=weed_parameter_template_get_gui(paramt2);
   
   weed_free(in_params);
 
-  // hide the "pan" control if we are using mono audio
-  if (chans!=2) weed_set_boolean_value(gui,"hidden",WEED_TRUE);
-  else weed_set_boolean_value(gui,"hidden",WEED_FALSE);
+  // hide the "pan" and "swap" controls if we are using mono audio
+  if (chans!=2) {
+    weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+    weed_set_boolean_value(gui2,"hidden",WEED_TRUE);
+  }
+  else {
+    weed_set_boolean_value(gui,"hidden",WEED_FALSE);
+    weed_set_boolean_value(gui2,"hidden",WEED_FALSE);
+  }
 
   return WEED_NO_ERROR;
 }
@@ -62,17 +70,22 @@
   weed_plant_t **in_channels=weed_get_plantptr_array(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
   float *src;
   float *odst=weed_get_voidptr_value(out_channel,"audio_data",&error),*dst=odst;
+
   register int nsamps;
+
   int orig_nsamps;
   int chans;
   int inter;
+
   weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
 
+  double voll,volr;
+
   // this is marked as "is_volume_master" in setup
   // therefore it must linearly adjust volume between 0.0 and 1.0 for all sub-channels
   double *vol=weed_get_double_array(in_params[0],"value",&error);
   double *pan=weed_get_double_array(in_params[1],"value",&error);
-  double voll,volr;
+  int swapchans=weed_get_boolean_value(in_params[2],"value",&error);
 
   int ntracks=weed_leaf_num_elements(inst,"in_channels");
 
@@ -94,14 +107,36 @@
   inter=weed_get_boolean_value(in_channels[0],"audio_interleaf",&error);
 
   if (chans==2) {
-    while (nsamps--) {
-      *(dst++)=voll*(*(src++));
-      if (inter) *(dst++)=volr*(*(src++));
-    }
-    if (!inter) {
-      nsamps=orig_nsamps;
+    if (swapchans==WEED_FALSE) {
       while (nsamps--) {
-	*(dst++)=volr*(*(src++));
+	*(dst++)=voll*(*(src++));
+	if (inter) *(dst++)=volr*(*(src++));
+      }
+      if (!inter) {
+	nsamps=orig_nsamps;
+	while (nsamps--) {
+	  *(dst++)=volr*(*(src++));
+	}
+      }
+    } 
+    else {
+      // swap l/r channels
+      if (!inter) src+=nsamps;
+      else src++;
+      while (nsamps--) {
+	if (inter) {
+	  *(dst++)=voll*(*(src--));
+	  *(dst++)=volr*(*(src++));
+	  src++;
+	}
+	else *(dst++)=voll*(*(src++));
+      }
+      if (!inter) {
+	nsamps=orig_nsamps;
+	src-=nsamps*2;
+	while (nsamps--) {
+	  *(dst++)=volr*(*(src++));
+	}
       }
     }
   }
@@ -121,6 +156,7 @@
     inter=weed_get_boolean_value(in_channels[i],"audio_interleaf",&error);
 
     chans=weed_get_int_value(in_channels[i],"audio_channels",&error);
+
     
     voll=volr=vol[i];
     
@@ -163,7 +199,7 @@
   if (plugin_info!=NULL) {
     weed_plant_t *in_chantmpls[]={weed_audio_channel_template_init("in channel 0",0),NULL};
     weed_plant_t *out_chantmpls[]={weed_audio_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE),NULL};
-    weed_plant_t *in_params[]={weed_float_init("volume","_Volume",1.0,0.0,1.0),weed_float_init("pan","_Pan",0.,-1.,1.),NULL};
+    weed_plant_t *in_params[]={weed_float_init("volume","_Volume",1.0,0.0,1.0),weed_float_init("pan","_Pan",0.,-1.,1.),weed_switch_init("swap","_Swap left and right channels",WEED_FALSE),NULL};
     weed_plant_t *filter_class=weed_filter_class_init("audio volume and pan","salsaman",1,WEED_FILTER_IS_CONVERTER,&avol_init,&avol_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
     int error;
     weed_plant_t *host_info=weed_get_plantptr_value(plugin_info,"host_info",&error);
@@ -176,6 +212,8 @@
     weed_set_double_value(in_params[0],"new_default",1.0);
     weed_set_int_value(in_params[1],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS|WEED_PARAMETER_ELEMENT_PER_CHANNEL);
     weed_set_double_value(in_params[1],"new_default",0.0);
+    weed_set_int_value(in_params[2],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS|WEED_PARAMETER_ELEMENT_PER_CHANNEL);
+    weed_set_double_value(in_params[2],"new_default",WEED_FALSE);
 
     // set is_volume_master from weedaudio spec 110
     weed_set_boolean_value(in_params[0],"is_volume_master",WEED_TRUE);

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/beat_detector.c Added

@@ -0,0 +1,435 @@
+// beat_detector.c
+// weed plugin to do sample and hold beat detection
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+#include <string.h>
+
+#include <fftw3.h>
+#include <math.h>
+
+#define NSLICES 54
+
+#define STIME 1000.f // milliseconds to buffer values for
+
+#define BUFMAX 16384
+
+typedef struct {
+  int totsamps;
+  int bufidx;
+  int bufsize[BUFMAX];
+  double av[NSLICES];
+  float buf[NSLICES][BUFMAX];
+} _sdata;
+
+static size_t sizf=sizeof(float);
+
+float freq[NSLICES]={25.,50.,75.,100.,150.,200.,250.,300.,
+		     400.,500.,600.,
+		     700.,800.,900.,1000.,1100.,1200.,1300.,1400.,
+		     1600.,1800.,2000.,2200.,2400.,2600.,2800.,3000.,
+		     3200.,3600.,4000.,4400.,4800,5200.,5600.,6000.,
+		     6400.,6800.,
+		     7400.,8000.,8600.,9200.,9800.,10400.,11000.,11600.,
+		     12400.,13200,14000.,14800.,15600.,16400.,17600.,18800.,
+		     20000.};
+
+
+#define MAXPLANS 18
+
+#define TWO_PI 2.*M_PI
+
+static float *ins[MAXPLANS];
+static fftwf_complex *outs[MAXPLANS];
+static fftwf_plan plans[MAXPLANS];
+
+static int rndlog2(int i) {
+  // return (int)log2(i) - 1
+  int x=2,val=-1;
+
+  while (x<=i) {
+    x*=2;
+    val++;
+  }
+  return val;
+}
+
+
+static int twopow(int i) {
+  // return 2**(i+1)
+  register int j,x=2;
+
+  for (j=0;j<i;j++) x*=2;
+
+  return x;
+}
+
+
+static int create_plans(void) {
+  register int i,nsamps;
+
+  for (i=0;i<MAXPLANS;i++) {
+    // create fftw plan
+    nsamps=twopow(i);
+
+    ins[i] = (float*) fftwf_malloc(nsamps*sizeof(float));
+    if (ins[i]==NULL) {
+      return WEED_ERROR_MEMORY_ALLOCATION;
+    }
+    
+    outs[i] = (fftwf_complex*) fftwf_malloc(nsamps*sizeof(fftwf_complex));
+    if (outs[i]==NULL) {
+      return WEED_ERROR_MEMORY_ALLOCATION;
+    }
+    
+    plans[i] = fftwf_plan_dft_r2c_1d(nsamps, ins[i], outs[i], i<13?FFTW_MEASURE:FFTW_ESTIMATE);
+  }
+  return WEED_NO_ERROR;
+}
+
+/////////////////////////////////////////////////////////////
+
+
+int beat_init(weed_plant_t *inst) {
+  _sdata *sdata;
+
+  register int i,j;
+
+  sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+  if (sdata==NULL) {
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  for (i=0;i<NSLICES;i++) {
+    sdata->av[i]=0.;
+     for (j=0;j<BUFMAX;j++) {
+      sdata->buf[i][j]=0.;
+    }
+  }
+
+  for (j=0;j<BUFMAX;j++) {
+    sdata->bufsize[j]=0;
+  }
+
+  sdata->totsamps=0;
+  sdata->bufidx=-1;
+
+  weed_set_voidptr_value(inst,"plugin_data",sdata);
+
+  return WEED_NO_ERROR;
+
+}
+
+
+
+int beat_deinit(weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_data",&error);
+
+  if (sdata!=NULL) {
+    weed_free(sdata);
+  }
+
+  return WEED_NO_ERROR;
+
+}
+
+
+
+int beat_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  int chans,nsamps,onsamps,base,inter,rate,k;
+
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  float *src=(float *)weed_get_voidptr_value(in_channel,"audio_data",&error);
+
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+
+  int reset=weed_get_boolean_value(in_params[0],"value",&error);
+  double avlim=weed_get_double_value(in_params[1],"value",&error);
+  double varlim=weed_get_double_value(in_params[2],"value",&error);
+  int hamming=weed_get_boolean_value(in_params[3],"value",&error);
+
+  int beat_pulse=WEED_FALSE,beat_hold=weed_get_boolean_value(out_params[0],"value",&error);
+
+  int has_data=WEED_FALSE;
+
+  int kmin,kmax,okmin,rkmin,rkmax;
+
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_data",&error);
+
+  double var,av;
+
+  float tot=0.,totx;
+
+  register int i,j,s;
+
+  weed_free(in_params);
+
+  if (beat_hold==WEED_TRUE) beat_hold=!reset;
+
+  onsamps=weed_get_int_value(in_channel,"audio_data_length",&error);
+
+  if (onsamps<2) {
+    beat_pulse=beat_hold=WEED_FALSE;
+    goto done;
+  }
+
+
+  rate=weed_get_int_value(in_channel,"audio_rate",&error);
+    
+  chans=weed_get_int_value(in_channel,"audio_channels",&error);
+  inter=weed_get_boolean_value(in_channel,"audio_interleaf",&error);
+
+  // have we buffered enough data ?
+  if ((float)sdata->totsamps/(float)rate*1000.>=STIME) {
+    sdata->totsamps-=sdata->bufsize[0];
+    // shift all values up
+
+    for (i=0;i<NSLICES;i++) {
+      sdata->av[i]=0.;
+
+      for (j=0;j<sdata->bufidx;j++) {
+	sdata->buf[i][j]=sdata->buf[i][j+1];
+	if (sdata->buf[i][j]!=-1.) sdata->av[i]+=(double)sdata->buf[i][j];
+      }
+    }
+
+    has_data=WEED_TRUE;
+  }
+  else {
+    sdata->bufidx++;
+    if (sdata->bufidx==BUFMAX) {
+      //fprintf(stderr,"OVERFLOW\n");
+      sdata->bufidx--;
+    }
+  }
+
+  sdata->totsamps+=onsamps;
+  sdata->bufsize[sdata->bufidx]=onsamps;
+
+  for (s=0;s<NSLICES;s++) {
+    sdata->buf[s][sdata->bufidx]=0.;
+  }
+
+  base=rndlog2(onsamps);
+  nsamps=twopow(base);
+
+  for (i=0;i<chans;i++) {
+    // do transform for each channel
+      
+    // copy in data to sdata->in
+    if (inter==WEED_FALSE) {
+      // non-interleaved
+      if (hamming==WEED_TRUE) {
+	for (j=0;j<nsamps;j++) {
+	  ins[base][j]=src[j]*(0.54f - 0.46f * cosf(TWO_PI*(float)j/(float)(nsamps-1.)));
+	}
+      }
+      else {
+	weed_memcpy(ins[base],src,nsamps*sizf);
+      }
+      src+=onsamps;
+    }
+    else {
+      // interleaved
+      for (j=0;j<nsamps;j++) {
+	if (hamming==WEED_TRUE) {
+	  ins[base][j]=src[j*chans]*(0.54f - 0.46f * cosf(TWO_PI*(float)j/(float)(nsamps-1.)));
+	}
+	else {
+	  ins[base][j]=src[j*chans];
+	}
+      }
+      src++;
+    }
+
+
+
+      
+    //fprintf(stderr,"executing plan of size %d\n",sdata->size);
+    fftwf_execute(plans[base]);
+
+    okmin=kmin=0;
+
+    for (s=0;s<NSLICES;s++) {
+      // which element do we want for output ?
+      // out array goes from 0 to (nsamps/2 + 1) [div b y 2 rounded down]
+	
+      // nyquist freq is rate / 2
+      // so the freq. of the kth element is: f  =  k/nsamps * rate
+      // therefore k = f/rate * nsamps
+      tot=0.;
+
+      kmax = freq[s]/(double)rate*(double)nsamps;
+
+      if (kmax>=(nsamps>>1)) {
+	// frequency invalid - too high for this sample packet
+	tot=-1.;
+	sdata->buf[s][sdata->bufidx]=tot;
+      }
+      else {
+
+	// use an overlap
+	rkmin=kmin-((kmin-okmin)>>1);
+	if (s<NSLICES-1) {
+	  rkmax=kmax+(freq[s+1]-freq[s])/2./(double)rate*(double)nsamps;
+	  if (rkmax>=(nsamps>>1)) {
+	    rkmax=kmax;
+	  }
+	}
+	else rkmax=kmax;
+
+	totx=0.;
+
+	for (k=rkmin;k<=rkmax;k++) {
+	  // sum values over range
+	  // average over range
+	  totx+=sqrtf(outs[base][k][0]*outs[base][k][0]+outs[base][k][1]*outs[base][k][1]);
+	}
+
+	// average over bandwidth
+	totx/=((float)rkmax-(float)rkmin+1.);
+
+	// boost lower freq
+	totx/=((float)rkmax-(float)rkmin+1.);
+
+	// store this value in the buffer
+	sdata->buf[s][sdata->bufidx]+=totx/(float)chans;
+
+	okmin=kmin;
+	kmin=kmax;
+      }
+    } // done for all slices
+  } // done for all channels
+
+
+  if (!has_data) {
+    // need to buffer more data
+    beat_pulse=beat_hold=WEED_FALSE;
+    goto done;
+  }
+
+
+
+  // now we have the current value in sdata->buf, and the buffered total in sdata->av
+  // we can calculate the variance, and then use a formula:
+  // if curr > C * av && curr > V * var : trigger a beat
+
+#define ONSET_WINDOW 5
+
+  var=0.;
+
+  for (i=0;i<NSLICES;i++) {
+    // for the variance:
+    //av=sdata->av[i]/(double)sdata->bufidx;
+
+    if (sdata->bufidx>ONSET_WINDOW) {
+      float val1,val2,varx;
+      for (j=sdata->bufidx-ONSET_WINDOW;j<=sdata->bufidx;j++) {
+	if (
+	    (val1=sdata->buf[i][j])!=-1.&&
+	    (val2=sdata->buf[i][j-1])!=-1.
+	    ) {
+	  varx=(val1-val2);
+	  if (varx<0.) varx=0.;
+	  var+=(double)varx/(double)ONSET_WINDOW;
+	}
+      }
+    }
+  }
+
+
+  //if (i==0) fprintf(stderr,"%f %f %f  ",var,av,sdata->buf[i][sdata->bufidx]);
+
+  var/=(double)NSLICES;
+
+
+  for (i=0;i<NSLICES;i++) {
+    av=sdata->av[i]/(double)sdata->bufidx;
+    if (var>=varlim && sdata->buf[i][sdata->bufidx] >= (avlim*av)) {
+      // got a beat !
+      beat_pulse=beat_hold=WEED_TRUE;
+      //fprintf(stderr,"PULSE !\n");
+      break;
+    }
+
+  }
+
+  //fprintf(stderr,"\n\n");
+
+ done:
+  weed_set_boolean_value(out_params[0],"value",beat_hold);
+  weed_set_int64_value(out_params[0],"timecode",timestamp);
+  weed_set_boolean_value(out_params[1],"value",beat_pulse);
+  weed_set_int64_value(out_params[1],"timecode",timestamp);
+
+  weed_free(out_params);
+  
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info;
+  if (create_plans()!=WEED_NO_ERROR) return NULL;
+  plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    weed_plant_t *in_chantmpls[]={weed_audio_channel_template_init("in channel 0",0),NULL};
+    weed_plant_t *in_params[]={weed_switch_init("reset","_Reset hold",WEED_FALSE),weed_float_init("avlim","_Average threshold",3.,0.,40.),
+			       weed_float_init("varlim","_Variance threshold",0.5,0.,10.),weed_switch_init("hamming","Use _Hamming",WEED_TRUE),NULL};
+    weed_plant_t *out_params[]={weed_out_param_switch_init("beat hold",WEED_FALSE),weed_out_param_switch_init("beat pulse",WEED_FALSE),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("beat detector","salsaman",1,0,&beat_init,&beat_process,
+						      &beat_deinit,in_chantmpls,NULL,in_params,out_params);
+
+    weed_plant_t *gui=weed_parameter_template_get_gui(in_params[0]);
+    weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+
+
+void weed_desetup(void) {
+  register int i;
+  for (i=0;i<MAXPLANS;i++) {
+    fftwf_destroy_plan(plans[i]);
+    fftwf_free(ins[i]);
+    fftwf_free(outs[i]);
+  }
+}

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/blank_frame_detector.c Added

@@ -0,0 +1,217 @@
+// blank_frame_detector.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+
+/////////////////////////////////////////////////////////////
+
+typedef struct {
+  int count;
+} _sdata;
+
+static unsigned short Y_R[256];
+static unsigned short Y_G[256];
+static unsigned short Y_B[256];
+
+static unsigned short unclamp_luma[256];
+
+
+static void init_luma_arrays(void) {
+  register int i;
+
+  for (i=0;i<256;i++) {
+    Y_R[i]=.299*(float)i*256.;
+    Y_G[i]=.587*(float)i*256.;
+    Y_B[i]=.114*(float)i*256.;
+  }
+
+  for (i=0;i<17;i++) {
+    unclamp_luma[i]=0;
+  }
+
+  for (i=17;i<235;i++) {
+    unclamp_luma[i]=(int)((float)(i-16.)/219.*255.+.5);
+  }
+
+  for (i=235;i<256;i++) {
+    unclamp_luma[i]=255;
+  }
+
+}
+
+
+
+int calc_luma(int red, int green, int blue) {
+  return (Y_R[red]+Y_G[green]+Y_B[blue])>>8;
+}
+
+
+////////////////////////////////////////////////////////////
+
+
+int bfd_init (weed_plant_t *inst) {
+  int error;
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+  weed_plant_t *blank=out_params[0];
+  _sdata *sdata;
+
+  weed_set_boolean_value(blank,"value",WEED_FALSE);
+
+  sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  sdata->count=0;
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int bfd_deinit (weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  if (sdata!=NULL) weed_free(sdata);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int bfd_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  unsigned char *src=(unsigned char *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
+  int width=weed_get_int_value(in_channel,"width",&error);
+  int height=weed_get_int_value(in_channel,"height",&error);
+  int pal=weed_get_int_value(in_channel,"current_palette",&error);
+  int irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+  weed_plant_t *blank=out_params[0];
+  int threshold=weed_get_int_value(in_params[0],"value",&error);
+  int fcount=weed_get_int_value(in_params[1],"value",&error);
+  int psize=4;
+  int luma;
+  int clamped=0;
+  int start=0;
+  unsigned char *end=src+height*irowstride;
+  register int i;
+
+  if (pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_YUV422P||
+      pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_UYVY||pal==WEED_PALETTE_YUYV||
+      pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) {
+
+    if (weed_plant_has_leaf(in_channel,"YUV_clamping")&&
+	(weed_get_int_value(in_channel,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED))
+      clamped=1;
+  }
+
+  if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_YUV888) psize=3;
+  if (pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_YUV422P||
+      pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P) psize=1;
+
+  width*=psize;
+
+  // yes this is right to set this here (1 macropixel == 4 bytes == 2 pixels)
+  if (pal==WEED_PALETTE_UYVY||pal==WEED_PALETTE_YUYV) psize=2;
+
+  if (pal==WEED_PALETTE_UYVY) start=1;
+
+  for (;src<end;src+=irowstride) {
+    for (i=start;i<width;i+=psize) {
+      if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_RGBA32) luma=calc_luma(src[i],src[i+1],src[i+2]);
+      else if (pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_BGRA32) luma=calc_luma(src[i+2],src[i+1],src[i]);
+      else if (pal==WEED_PALETTE_ARGB32) luma=calc_luma(src[i+1],src[i+2],src[i+3]);
+      else luma=(clamped?unclamp_luma[src[i]]:src[i]);
+
+      if (luma>threshold) {
+	// is not blank
+	sdata->count=-1;
+	break;
+      }
+      
+    }
+  }
+
+  // is blank, but we need to check count
+
+  sdata->count++;
+
+  if (sdata->count>=fcount) weed_set_boolean_value(blank,"value",WEED_TRUE);
+  else weed_set_boolean_value(blank,"value",WEED_FALSE);
+
+  weed_free(in_params);
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,
+			WEED_PALETTE_ARGB32,WEED_PALETTE_YUVA8888,WEED_PALETTE_YUV888,WEED_PALETTE_YUV444P,
+			WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,
+			WEED_PALETTE_UYVY,WEED_PALETTE_YUYV,
+			WEED_PALETTE_END};
+    weed_plant_t *out_params[]={weed_out_param_switch_init("blank",WEED_FALSE),NULL};
+    weed_plant_t *in_params[]={weed_integer_init("threshold","Luma _threshold",0,0,255),
+			       weed_integer_init("fcount","Frame _count",1,1,1000),NULL};
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("blank_frame_detector","salsaman",1,0,&bfd_init,
+						      &bfd_process,&bfd_deinit,in_chantmpls,NULL,in_params,out_params);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+
+    init_luma_arrays();
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/blurzoom.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/blurzoom.c Changed

@@ -18,12 +18,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -35,14 +33,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #define COLORS 32

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/bump2d.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/bump2d.c Changed

@@ -11,12 +11,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -28,14 +26,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 #include <math.h>

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/cairo Added

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/cairo/Makefile.am Added

@@ -0,0 +1,59 @@
+# Process this with automake to create Makefile.in
+
+LIBS =
+
+fxpluginslibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+
+if IS_DARWIN
+shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static
+shared_cflags = -fno-common
+else
+shared_ldflags = -shared -fPIC -DPIC -no-undefined -module -avoid-version --tag=disable-static
+shared_cflags = -fPIC -DPIC
+endif
+
+
+
+if HAVE_SYSTEM_WEED
+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@
+weed_CFLAGS = -DHAVE_SYSTEM_WEED
+else
+if IS_MINGW
+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -D IS_MINGW=1
+else
+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@
+endif
+weed_CFLAGS =
+endif
+
+if HAVE_SYSTEM_WEED_PLUGIN_UTILS
+weed_CFLAGS = -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
+endif
+
+if HAVE_SYSTEM_WEED_COMPAT
+weed_CFLAGS += -DHAVE_SYSTEM_WEED_COMPAT
+endif
+
+AM_CFLAGS = $(shared_cflags) $(weed_CFLAGS) @GTK_CFLAGS@ -ffast-math
+AM_CXXFLAGS = $(shared_cflags) $(weed_CFLAGS) @GTK_CFLAGS@ -ffast-math
+
+fxpluginslib_LTLIBRARIES = vector_visualiser.la
+
+
+EXTRA_DIST=data icons
+
+install-data-local:
+	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
+	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
+	$(MAKE) -i install-data-local-remove-vcs-files
+
+install-data-local-remove-vcs-files:
+	rm -rf "$(DESTDIR)$(fxpluginslibdir)/data/".*
+	rm -rf "$(DESTDIR)$(fxpluginslibdir)/icons/".*
+
+
+install-exec-local:
+
+
+

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/cairo/Makefile.in Added

@@ -0,0 +1,737 @@
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Process this with automake to create Makefile.in
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@HAVE_SYSTEM_WEED_COMPAT_TRUE@am__append_1 = -DHAVE_SYSTEM_WEED_COMPAT
+subdir = lives-plugins/weed-plugins/cairo
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/mk/autoconf/acx_pthread.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(fxpluginslibdir)"
+LTLIBRARIES = $(fxpluginslib_LTLIBRARIES)
+vector_visualiser_la_LIBADD =
+vector_visualiser_la_SOURCES = vector_visualiser.c
+vector_visualiser_la_OBJECTS = vector_visualiser.lo
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = vector_visualiser.c
+DIST_SOURCES = vector_visualiser.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DIRAC_CFLAGS = @DIRAC_CFLAGS@
+DIRAC_LIBS = @DIRAC_LIBS@
+DLLTOOL = @DLLTOOL@
+DOXYGEN = @DOXYGEN@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FFTW3F_CFLAGS = @FFTW3F_CFLAGS@
+FFTW3F_LIBS = @FFTW3F_LIBS@
+FGREP = @FGREP@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLEE_CFLAGS = @GLEE_CFLAGS@
+GLEE_LIBS = @GLEE_LIBS@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GLU_CFLAGS = @GLU_CFLAGS@
+GLU_LIBS = @GLU_LIBS@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_LIBS_NODYNAMIC = @GTK_LIBS_NODYNAMIC@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBAVCODEC_CFLAGS = @LIBAVCODEC_CFLAGS@
+LIBAVCODEC_LIBS = @LIBAVCODEC_LIBS@
+LIBAVFORMAT_CFLAGS = @LIBAVFORMAT_CFLAGS@
+LIBAVFORMAT_LIBS = @LIBAVFORMAT_LIBS@
+LIBAVUTIL_CFLAGS = @LIBAVUTIL_CFLAGS@
+LIBAVUTIL_LIBS = @LIBAVUTIL_LIBS@
+LIBBZ_CFLAGS = @LIBBZ_CFLAGS@
+LIBBZ_LIBS = @LIBBZ_LIBS@
+LIBDV_CFLAGS = @LIBDV_CFLAGS@
+LIBDV_LIBS = @LIBDV_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = 
+LIBSWSCALE_CFLAGS = @LIBSWSCALE_CFLAGS@
+LIBSWSCALE_LIBS = @LIBSWSCALE_LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIBZ_CFLAGS = @LIBZ_CFLAGS@
+LIBZ_LIBS = @LIBZ_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@
+MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OIL_CFLAGS = @OIL_CFLAGS@
+OIL_LIBS = @OIL_LIBS@
+OPENCV_CFLAGS = @OPENCV_CFLAGS@
+OPENCV_LIBS = @OPENCV_LIBS@
+OPENCV_LIBS_ONLY_L = @OPENCV_LIBS_ONLY_L@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
+RANLIB = @RANLIB@
+SDL_CFLAGS = @SDL_CFLAGS@
+SDL_LIBS = @SDL_LIBS@
+SDL_PREFIX = @SDL_PREFIX@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+THEORA_CFLAGS = @THEORA_CFLAGS@
+THEORA_LIBS = @THEORA_LIBS@
+UNICAP_CFLAGS = @UNICAP_CFLAGS@
+UNICAP_LIBS = @UNICAP_LIBS@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VISUAL_CFLAGS = @VISUAL_CFLAGS@
+VISUAL_LIBS = @VISUAL_LIBS@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WEED_CFLAGS = @WEED_CFLAGS@
+WEED_COMPAT_CFLAGS = @WEED_COMPAT_CFLAGS@
+WEED_COMPAT_LIBS = @WEED_COMPAT_LIBS@
+WEED_LIBS = @WEED_LIBS@
+WEED_PLUGIN_UTILS_CFLAGS = @WEED_PLUGIN_UTILS_CFLAGS@
+WEED_PLUGIN_UTILS_LIBS = @WEED_PLUGIN_UTILS_LIBS@
+WEED_SLICE_CFLAGS = @WEED_SLICE_CFLAGS@
+WEED_SLICE_LIBS = @WEED_SLICE_LIBS@
+WEED_UTILS_CFLAGS = @WEED_UTILS_CFLAGS@
+WEED_UTILS_LIBS = @WEED_UTILS_LIBS@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XRENDER_CFLAGS = @XRENDER_CFLAGS@
+XRENDER_LIBS = @XRENDER_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+acx_pthread_config = @acx_pthread_config@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+v4l1_INCFILE = @v4l1_INCFILE@
+fxpluginslibdir = "$(libdir)/$(PACKAGE)/plugins/effects/realtime/weed"
+@IS_DARWIN_FALSE@shared_ldflags = -shared -fPIC -DPIC -no-undefined -module -avoid-version --tag=disable-static
+@IS_DARWIN_TRUE@shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static
+@IS_DARWIN_FALSE@shared_cflags = -fPIC -DPIC
+@IS_DARWIN_TRUE@shared_cflags = -fno-common
+@HAVE_SYSTEM_WEED_FALSE@@IS_MINGW_FALSE@AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@
+@HAVE_SYSTEM_WEED_FALSE@@IS_MINGW_TRUE@AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -D IS_MINGW=1
+@HAVE_SYSTEM_WEED_TRUE@AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@
+@HAVE_SYSTEM_WEED_FALSE@weed_CFLAGS = $(am__append_1)
+@HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE@weed_CFLAGS = -DHAVE_SYSTEM_WEED_PLUGIN_UTILS \
+@HAVE_SYSTEM_WEED_PLUGIN_UTILS_TRUE@	$(am__append_1)
+@HAVE_SYSTEM_WEED_TRUE@weed_CFLAGS = -DHAVE_SYSTEM_WEED \
+@HAVE_SYSTEM_WEED_TRUE@	$(am__append_1)
+AM_CFLAGS = $(shared_cflags) $(weed_CFLAGS) @GTK_CFLAGS@ -ffast-math
+AM_CXXFLAGS = $(shared_cflags) $(weed_CFLAGS) @GTK_CFLAGS@ -ffast-math
+fxpluginslib_LTLIBRARIES = vector_visualiser.la
+EXTRA_DIST = data icons
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lives-plugins/weed-plugins/cairo/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu lives-plugins/weed-plugins/cairo/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-fxpluginslibLTLIBRARIES: $(fxpluginslib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(fxpluginslib_LTLIBRARIES)'; test -n "$(fxpluginslibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(fxpluginslibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(fxpluginslibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(fxpluginslibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(fxpluginslibdir)"; \
+	}
+
+uninstall-fxpluginslibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(fxpluginslib_LTLIBRARIES)'; test -n "$(fxpluginslibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fxpluginslibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fxpluginslibdir)/$$f"; \
+	done
+
+clean-fxpluginslibLTLIBRARIES:
+	-test -z "$(fxpluginslib_LTLIBRARIES)" || rm -f $(fxpluginslib_LTLIBRARIES)
+	@list='$(fxpluginslib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+vector_visualiser.la: $(vector_visualiser_la_OBJECTS) $(vector_visualiser_la_DEPENDENCIES) $(EXTRA_vector_visualiser_la_DEPENDENCIES) 
+	$(LINK) -rpath $(fxpluginslibdir) $(vector_visualiser_la_OBJECTS) $(vector_visualiser_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_visualiser.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(fxpluginslibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-fxpluginslibLTLIBRARIES clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-data-local install-fxpluginslibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-exec-local
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-fxpluginslibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-fxpluginslibLTLIBRARIES clean-generic clean-libtool \
+	ctags distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-local \
+	install-fxpluginslibLTLIBRARIES install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-fxpluginslibLTLIBRARIES
+
+
+install-data-local:
+	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
+	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -Rf a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
+	$(MAKE) -i install-data-local-remove-vcs-files
+
+install-data-local-remove-vcs-files:
+	rm -rf "$(DESTDIR)$(fxpluginslibdir)/data/".*
+	rm -rf "$(DESTDIR)$(fxpluginslibdir)/icons/".*
+
+install-exec-local:
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/cairo/data Added

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/cairo/icons Added

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/cairo/vector_visualiser.c Added

@@ -0,0 +1,482 @@
+// negate.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../../libweed/weed.h"
+#include "../../../libweed/weed-palettes.h"
+#include "../../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "../weed-utils-code.c" // optional
+#include "../weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+#include <gdk/gdk.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#define MAX_ELEMS 500
+
+typedef struct {
+  float len;
+  int j;
+  int i;
+  float x;
+  float y;
+} list_ent;
+
+
+// TODO - make non-static
+static list_ent xlist[MAX_ELEMS];
+static cairo_user_data_key_t crkey;
+
+
+
+static gboolean is_big_endian() {
+  int testint = 0x12345678;
+  char *pMem=&testint;
+
+  if (pMem[0] == 0x78) {
+    return FALSE;
+  }
+  return TRUE;
+}
+
+
+
+static int unal[256][256];
+static int al[256][256];
+
+static gboolean unal_inited=FALSE;
+
+static void init_unal(void) {
+  // premult to postmult and vice-versa
+
+  register int i,j;
+  
+  for (i=0;i<256;i++) { //alpha val
+    for (j=0;j<256;j++) { // val to be converted
+      unal[i][j]=(float)j*255./(float)i;
+      al[i][j]=(float)j*(float)i/255.;
+    }
+  }
+  unal_inited=TRUE;
+}
+
+
+
+void clear_xlist(void) {
+  register int i;
+
+  for (i=0;i<MAX_ELEMS;i++) {
+    xlist[i].len=0.;
+  }
+}
+
+
+
+void add_to_list(float len, int i, int j, float x, float y) {
+  register int k,l;
+
+  for (k=0;k<MAX_ELEMS;k++) {
+    if (len>xlist[k].len) {
+      // shift existing elements
+      for (l=MAX_ELEMS-1;l<k;l--) {
+	if (xlist[l-1].len>0.) {
+	  xlist[l].len=xlist[l-1].len;
+	  xlist[l].i=xlist[l-1].i;
+	  xlist[l].j=xlist[l-1].j;
+	  xlist[l].x=xlist[l-1].x;
+	  xlist[l].y=xlist[l-1].y;
+	}
+      }
+      xlist[k].len=len;
+      xlist[k].i=i;
+      xlist[k].j=j;
+      xlist[k].x=x;
+      xlist[k].y=y;
+      break;
+    }
+  }
+}
+
+
+
+void alpha_premult(weed_plant_t *channel) {
+  // premultply alpha - this only occurs when going from palette with alpha to one without
+
+  int error;
+  int widthx;
+  int alpha;
+  int flags=0;
+  int width=weed_get_int_value(channel,"width",&error);
+  int height=weed_get_int_value(channel,"height",&error);
+  int rowstride=weed_get_int_value(channel,"rowstrides",&error);
+
+  unsigned char *ptr;
+
+  register int i,j,p;
+
+  if (!unal_inited) init_unal();
+
+  widthx=width*4;
+
+  ptr=(unsigned char *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  for (i=0;i<height;i++) {
+    for (j=0;j<widthx;j+=4) {
+      alpha=ptr[j];
+      for (p=1;p<4;p++) {
+	ptr[j+p]=al[alpha][ptr[j+p]];
+      }
+    }
+    ptr+=rowstride;
+  }
+
+  if (weed_plant_has_leaf(channel,"flags"))
+    flags=weed_get_int_value(channel,"flags",&error);
+
+  flags|=WEED_CHANNEL_ALPHA_PREMULT;
+  weed_set_int_value(channel,"flags",flags);
+}
+
+
+
+static void pdfree(void *data) {
+  weed_free(data);
+}
+
+static cairo_t *channel_to_cairo(weed_plant_t *channel) {
+  // convert a weed channel to cairo
+
+  int irowstride,orowstride;
+  int width,widthx;
+  int height,pal;
+  int error;
+
+  register int i;
+
+  guchar *src,*dst;
+
+  cairo_surface_t *surf;
+  cairo_t *cairo=NULL;
+  cairo_format_t cform;
+
+  void *pixel_data;
+
+  width=weed_get_int_value(channel,"width",&error);
+
+  pal=weed_get_int_value(channel,"current_palette",&error);
+  if (pal==WEED_PALETTE_A8) {
+    cform=CAIRO_FORMAT_A8;
+    widthx=width;
+  }
+  else if (pal==WEED_PALETTE_A1) {
+    cform=CAIRO_FORMAT_A1;
+    widthx=width>>3;
+  }
+  else {
+    cform=CAIRO_FORMAT_ARGB32;
+    widthx=width<<2;
+  }
+
+  height=weed_get_int_value(channel,"height",&error);
+
+  irowstride=weed_get_int_value(channel,"rowstrides",&error);
+
+  orowstride=cairo_format_stride_for_width(cform,width);
+
+  src=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  dst=pixel_data=(guchar *)weed_malloc(height*orowstride);
+  if (pixel_data==NULL) return NULL;
+
+  if (irowstride==orowstride) {
+    weed_memcpy(dst,src,height*irowstride);
+  }
+  else {
+    for (i=0;i<height;i++) {
+      weed_memcpy(dst,src,widthx);
+      weed_memset(dst+widthx,0,widthx-orowstride);
+      dst+=orowstride;
+      src+=irowstride;
+    }
+  }
+
+  if (cform==CAIRO_FORMAT_ARGB32) {
+    int flags=0;
+    if (weed_plant_has_leaf(channel,"flags")) flags=weed_get_int_value(channel,"flags",&error);
+    if (!(flags&WEED_CHANNEL_ALPHA_PREMULT)) {
+      // if we have post-multiplied alpha, pre multiply
+      alpha_premult(channel);
+      flags|=WEED_CHANNEL_ALPHA_PREMULT;
+      weed_set_int_value(channel,"flags",flags);
+    }
+  }
+
+
+  surf=cairo_image_surface_create_for_data(pixel_data,
+					   cform, 
+					   width, height,
+					   orowstride);
+
+  cairo=cairo_create(surf);
+  cairo_surface_destroy(surf);
+
+  cairo_set_user_data(cairo, &crkey, pixel_data, pdfree);
+
+  return cairo;
+}
+
+
+
+
+
+
+static gboolean cairo_to_channel(cairo_t *cairo, weed_plant_t *channel) {
+  // updates a weed_channel from a cairo_t
+  // unlike doing this the other way around
+  // the cairo is not destroyed (data is copied)
+  void *dst,*src;
+
+  int width,height,irowstride,orowstride,widthx,pal;
+  int flags=0,error;
+
+  cairo_surface_t *surface=cairo_get_target(cairo);
+
+  register int i;
+
+  // flush to ensure all writing to the image was done
+  cairo_surface_flush (surface);
+
+  dst=weed_get_voidptr_value(channel,"pixel_data",&error);
+  if (dst==NULL) return FALSE;
+
+  src = cairo_image_surface_get_data (surface);
+  height = cairo_image_surface_get_height (surface);
+  width = cairo_image_surface_get_width (surface);
+  irowstride = cairo_image_surface_get_stride (surface);
+
+  orowstride=weed_get_int_value(channel,"rowstrides",&error);
+  pal=weed_get_int_value(channel,"current_palette",&error);
+
+  if (irowstride==orowstride) {
+    weed_memcpy(dst,src,height*orowstride);
+  }
+  else {
+    widthx=width*4;
+    if (pal==WEED_PALETTE_A8) widthx=width;
+    else if (pal==WEED_PALETTE_A1) widthx=width>>3;
+
+    for (i=0;i<height;i++) {
+      weed_memcpy(dst,src,widthx);
+      weed_memset(dst+widthx,0,widthx-orowstride);
+      dst+=orowstride;
+      src+=irowstride;
+    }
+  }
+
+  if (pal!=WEED_PALETTE_A8 && pal!=WEED_PALETTE_A1) {
+    if (weed_plant_has_leaf(channel,"flags"))
+      flags=weed_get_int_value(channel,"flags",&error);
+    
+    flags|=WEED_CHANNEL_ALPHA_PREMULT;
+    weed_set_int_value(channel,"flags",flags);
+  }
+
+  return TRUE;
+}
+
+
+
+
+/////////////////////////////////////////////////////////////
+
+enum {
+  MD_GRID,
+  MD_LARGEST
+};
+
+
+
+static void draw_arrow(cairo_t *cr, int i, int j, float x, float y) {
+  // draw arrow from point i-x,j-y to i, j
+  int stx=i-(x+.5);
+  int sty=j-(y+.5);
+
+  int len=sqrt(x*x+y*y);
+
+  cairo_set_line_width(cr,4.);
+  cairo_set_source_rgb(cr,1.,0.,0.);
+
+  cairo_move_to(cr,stx,sty);
+  cairo_line_to(cr,i,j);
+
+  cairo_arc(cr,i,j,len/4.,0,M_PI*2.);
+  cairo_stroke(cr);
+
+
+}
+
+
+int vector_visualiser_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  cairo_t *cr;
+
+  int error;
+
+  weed_plant_t **in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+
+  float *alpha0=(float *)weed_get_voidptr_value(in_channels[1],"pixel_data",&error);
+  float *alpha1=(float *)weed_get_voidptr_value(in_channels[2],"pixel_data",&error);
+
+
+  float x,y,scale=1.;
+
+  int mode=MD_GRID;
+
+  int irow0=weed_get_int_value(in_channels[1],"rowstrides",&error)>>2;
+  int irow1=weed_get_int_value(in_channels[2],"rowstrides",&error)>>2;
+
+  int width=weed_get_int_value(out_channel,"width",&error);
+  int height=weed_get_int_value(out_channel,"height",&error);
+
+
+  int enabled=weed_get_boolean_value(in_params[0],"value",&error);
+
+
+  register int i,j;
+
+  weed_free(in_params);
+
+  if (enabled==WEED_FALSE) {
+    return WEED_NO_ERROR;
+  }
+
+  cr=channel_to_cairo(in_channels[0]);
+
+  switch (mode) {
+  case MD_GRID:
+    {
+      int smwidth=width/20;
+      int smheight=height/20;
+
+      if (smwidth<1) smwidth=1;
+      if (smheight<1) smheight=1;
+
+      for (i=smheight;i<height;i+=smheight*2) {
+	for (j=smwidth;j<width;j+=smwidth*2) {
+	  x=alpha0[i*irow0+j];
+	  y=alpha1[i*irow1+j];
+	  draw_arrow(cr,j,i,x*scale,y*scale);
+	}
+      }
+    }
+    break;
+
+  case MD_LARGEST:
+    {
+      float len;
+      clear_xlist();
+
+      for (i=0;i<height;i++) {
+	for (j=0;j<width;j++) {
+	  x=alpha0[i*irow0+j];
+	  y=alpha1[i*irow1+j];
+	  len=sqrt(x*x+y*y);
+	  if (len>xlist[MAX_ELEMS-1].len) add_to_list(len,i,j,x,y);
+	}
+      }
+
+      for (i=0;i<MAX_ELEMS;i++) {
+	if (xlist[i].len>0.) draw_arrow(cr,xlist[i].j,xlist[i].i,xlist[i].x*scale,xlist[i].y*scale);
+      }
+
+    }
+    break;
+
+  default:
+    break;
+
+
+  }
+
+  cairo_to_channel(cr,out_channel);
+  cairo_destroy(cr);
+
+  weed_free(in_channels);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+
+    int apalette_list[]={WEED_PALETTE_AFLOAT,WEED_PALETTE_END};
+
+    int vpalette_list[]={WEED_PALETTE_BGRA32,WEED_PALETTE_END};
+
+    weed_plant_t *in_chantmpls[]={
+      weed_channel_template_init("video in",0,vpalette_list),
+      weed_channel_template_init("X-plane",0,apalette_list),
+      weed_channel_template_init("Y-plane",0,apalette_list),NULL};
+
+    weed_plant_t *out_chantmpls[]={weed_channel_template_init("video out",WEED_CHANNEL_CAN_DO_INPLACE,vpalette_list),NULL};
+
+    weed_plant_t *in_params[]={weed_switch_init("enabled","_Enabled",WEED_TRUE),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("cairo vector visualiser","salsaman",1,0,
+						      NULL,&vector_visualiser_process,NULL,
+						      in_chantmpls,out_chantmpls,
+						      in_params,NULL);
+
+    weed_plant_t *gui=weed_parameter_template_get_gui(in_params[0]);
+    weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    if (is_big_endian()) {
+      weed_set_int_value(in_chantmpls[0],"palette_list",WEED_PALETTE_ARGB32);
+      weed_set_int_value(out_chantmpls[0],"palette_list",WEED_PALETTE_ARGB32);
+    }
+
+    weed_set_int_value(plugin_info,"version",package_version);
+
+  }
+
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/ccorrect.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/ccorrect.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/colorkey.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/colorkey.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/comic.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/comic.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives Added

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives/songs Added

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives/songs/examples.txt Added

@@ -0,0 +1,77 @@
+# Example instruments
+
+bpm: 125
+
+# each instrument has the following parameters: 
+
+# in: waveform, attack, decay, sustain,
+# release,modulation,[sweep],[pan],[interpol],[modulator]
+# 
+# in            i and the number of instrument, e.g. i1
+# waveform      square | kantti, saw | saha, sin | sini, noise | kohina 
+# attack        attack magnitude in samples 
+# decay         decay magnitude in samples 
+# sustain       sustain magnitude in samples 
+# release       release magnitude in samples 
+# modulation    the amount of modulation (positive or negative) 
+# sweep         the amount of sweep (positive or negative) [optional] 
+# pan           stereo panning (0..100) [optional]
+# interpol      amount of sample interpolation (0..100) [optional] 
+# modulator     the waveform of modulation, for options see waveform [optional]
+
+# instruments
+# bass 1
+i1: saha, 2, 6, 1, 4300, -2, 0
+# bass 2
+i2: saha, 2, 10, 1, 3300, 201, 1
+# noise
+i3: saha, 2, 3, 1, 16300, 4001, 0
+# bass 4
+i4: sini, 2, 5,1, 4300, 101,0
+# bass drum
+i5: sini, 2, 16, 1, 4000, 0, -60
+# snare and hi-hat
+i6: kohina, 2,7,1,8100,0,-15
+# melody 1
+i7: saha, 2, 6,1,17000, 2,0
+# melody 2
+i8: kantti, 2, 7,1,17000, 2,0
+# hi-hat 2
+i9: saha, 2, 5,1, 8100,1034334,-10
+# string
+i10: saha, 2, 4, 1, 44000, 101, 0
+
+# patterns
+p1: 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p2: c3,echo1, c2,00, c3,c3,c4,00, c3,c3,00,A2, c2,c3,00,D3
+p3: c4,c3,c2,echo1,c2,c2, 00,c1,g1,c2, 00,A0,c1,c2, c2,A3
+p4: g3,echo1,00,g3,g4,00,00,00, g3,00,g3,00, g4,00,00,g3
+p5: g6,g6,g5,g5,c3,g6,g6,c3,g6,c3,g5,g6,c3,g5,g5,c3
+p6: c2,echo1,00,00, 00,00,00,00, 00,00,00,00,00,00,00,00 
+p7: c3,echo1,00,00, 00,00,00,00, 00,00,00,00,00,00,00,00
+p8: c6,c6,00,c5,c4,c6,c6,c4,c6,c6,c6,c4,c4,c6,c5,c6
+p9: g6,00,g5,00,c3,00,g6,00,g6,00,g5,00,c3,00,g5,00
+p10:c5,f5,g5,c6, g5,f5,c5,f5, g5,c6,g5,f5, c5,f5,g5,c6,c5,f5,g5,c6, g5,f5,c5,f5, g5,c6,g5,f5, c5,f5,g5,c6
+p11:C5,f5,g5,C6, g5,f5,C5,f5, g5,C6,g5,f5, C5,f5,g5,C6,C5,f5,g5,C6, g5,f5,C5,f5, g5,C6,g5,f5, C5,f5,g5,C6
+p12:A4,f5,g5,A5, g5,f5,A4,f5, g5,A5,g5,f5, A4,f5,g5,A5,A4,f5,g5,A5, g5,f5,A4,f5, g5,A5,g5,f5, A4,f5,g5,A5
+p13:C3,echo1, C2,00, C3,C3,C4,00, C3,C3,00,A2, C2,C3,00,D3
+p14:C4,C3,C2,echo1,C2,C2, 00,C1,g1,C2, 00,A0,C1,C2, C2,A3
+p15:A2,echo1, A1,00, A2,A2,A3,00, A2,A2,00,A2, A1,A2,00,D3
+p16:A3,A2,A1,echo1,A1,A1, 00,A0,g1,A1, 00,A0,A0,A1, A1,A3
+p17:c2,echo1,00,00, c2,00,00,00, c2,00,00,00, c2,00,00,00
+p18:C2,echo1,00,00, C2,00,00,00, C2,00,00,00, C2,00,00,00
+p19:A1,echo1,00,00, A1,00,00,00, A1,00,00,00, A1,00,00,00
+p20: echo1,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+
+# tracks
+
+t1: p1, p2, p3, p14,p16,p10,p11,p12
+t2: p1, p2, p3, p14,p16,p10,p11,p12
+t3: p1, p3, p2, p13,p15,p10,p11,p12
+t4: p1, p3, p2, p13,p15,p17,p18,p19
+t5: p1, p4, p4, p4, p4, p1, p1, p1
+t6: p1, p9, p5, p5, p5, p1, p1, p1
+t7: p1, p6, p10,p11,p12,p1, p1, p1
+t8: p1, p1, p10,p11,p12,p1, p1, p1
+t9: p1, p8, p8, p8, p8, p1, p1, p1
+t10:p1, p1, p17,p18,p19,p1, p1, p1

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives/songs/modulations.txt Added

@@ -0,0 +1,82 @@
+# Example instruments
+
+bpm: 125
+
+# each instrument has the following parameters: 
+
+# in: waveform, attack, decay, sustain, 
+# release,modulation,[sweep],[pan],[interpol],[modulator]
+# 
+# in 		i and the number of instrument, e.g. i1 
+# waveform 	square | kantti, saw | saha, sin | sini, noise | kohina 
+# attack 	attack magnitude in samples 
+# decay 	decay magnitude in samples 
+# sustain 	sustain magnitude in samples 
+# release 	release magnitude in samples 
+# modulation 	the amount of modulation (positive or negative) 
+# sweep 	the amount of sweep (positive or negative) [optional] 
+# pan 		stereo panning (0..100) [optional] 
+# interpol 	amount of sample interpolation (0..100) [optional] 
+# modulator 	the waveform of modulation, for options see waveform [optional]
+
+# instruments
+# bass 1
+i1: square, 2, 3, 1, 4300,101, 0, 50, 0, saw
+# bass 2
+i2: saw, 2, 3, 1, 3300,202, 1, 50, 0, sin
+# bass 3
+i3: sin, 2, 6, 1, 6300,101,0, 50, 0, saw
+# bass 4
+i4: saw, 2, 5,1, 4300, 102,1, 50,0, saw
+# bass drum
+i5: sin, 2, 13, 1, 4000, 0, -60
+# snare and hi-hat
+i6: noise, 2,6,1,8100,0,-15
+# melody 1
+i7: saw, 2, 5,1,27000, 101,0, 50, 0, saw
+# melody 2
+i8: sin, 2, 3,1,7000,101,0, 50, 0, sin
+# hi-hat 2
+i9: saw, 2, 4,1, 8100,1034334,-10
+# string
+i10: saw, 2, 4, 1, 44000, 201, 0, 50, 0, saw
+
+# patterns
+p1: 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+
+p2: c3,echo1, c2,c3, c3,c3,c4,c3, c2,c2,c3,c4, c5,c3,c3,A2
+
+p3: c4,c3,c2,echo1,c2,c2, 00,c1,g1,c2, 00,A0,c1,c2, c2,A3
+
+p4: g3,echo1,00,g3,g4,00,00,00, g3,00,g3,00, g4,00,00,g3
+p5: g6,g6,g5,g5,c3,g6,g6,c3,g6,c3,g5,g6,c3,g5,g5,c3
+p6: c2,echo1,00,00, 00,00,00,00, 00,00,00,00,00,00,00,00, 00,echo1,00,00, 00,00,00,00, 00,00,00,00,00,00,00,00
+p7: c3,echo1,00,00, 00,00,00,00, 00,00,00,00,00,00,00,00
+p8: c6,c6,00,c5,c4,c6,c6,c4,c6,c6,c6,c4,c4,c6,c5,c6
+p9: g6,00,g5,00,c3,00,g6,00,g6,00,g5,00,c3,00,g5,00
+p10:c5,f5,g5,c6, g5,f5,c5,f5, g5,c6,g5,f5, c5,f5,g5,c6,c5,f5,g5,c6, g5,f5,c5,f5, g5,c6,g5,f5, c5,f5,g5,c6
+p11:C5,f5,g5,C6, g5,f5,C5,f5, g5,C6,g5,f5, C5,f5,g5,C6,C5,f5,g5,C6, g5,f5,C5,f5, g5,C6,g5,f5, C5,f5,g5,C6
+p12:A4,f5,g5,A5, g5,f5,A4,f5, g5,A5,g5,f5, A4,f5,g5,A5,A4,f5,g5,A5, g5,f5,A4,f5, g5,A5,g5,f5, A4,f5,g5,A5
+
+p13: C3,echo1, C2,C3, C3,C3,C4,C3, C2,C2,C3,C4, C5,C3,C3,A2
+p14:C4,C3,C2,echo1,C2,C2, 00,C1,g1,C2, 00,A0,C1,C2, C2,A3
+
+p15: A2,echo1, A1,A2, A2,A2,A3,A2, A1,A1,A2,A3, A4,A2,A2,A2
+p16:A3,A2,A1,echo1,A1,A1, 00,A0,g1,A1, 00,A0,A0,A1, A1,A3
+p17:c3,echo1,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p18:C3,echo1,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p19:A2,echo1,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p20: echo1,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+
+# tracks
+
+t1: p1, p2, p3, p14,p16,p10,p11,p12
+t2: p1, p2, p3, p14,p16,p10,p11,p12
+t3: p1, p3, p2, p13,p15,p10,p11,p12
+t4: p1, p3, p2, p13,p15,p17,p18,p19
+t5: p1, p4, p4, p4, p4, p1, p1, p1
+t6: p1, p9, p5, p5, p5, p1, p1, p1
+t7: p1, p6, p10,p11,p12,p1, p1, p1
+t8: p1, p1, p10,p11,p12,p1, p1, p1
+t9: p1, p8, p8, p8, p8, p1, p1, p1
+t10:p1, p1, p17,p18,p19,p1, p1, p1

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives/songs/newlives.txt Added

@@ -0,0 +1,43 @@
+# Example song by Antti Silvast.
+
+bpm:125
+
+#instruments
+i1:saha,2,6,1,16000,-1,0
+i2:saha,2,5,1,16000,201,1
+i3:sini,2,5,1,23000,0,0
+i4:sini,2,16,1,4000,0000,-50
+i5:kohina,2,6,1,23000,0,-2
+i6:kohina,2,6,1,2300,0,0
+i7:saha,2,5,1,4000,0,0
+i8:saha,2,5,1,4000,201,4
+i9:kohina,2,6,1,22000,0,10
+i10:saha,2,5,1,15000,2,0
+
+#patterns
+p1: c2,echo1,c1,c3,c2,00,D4,A2, c2,echo1,c3,c2,c2,A2,c2,A2
+p2: g3,00,00,00,g3,00,00,g3,g3,00,00,00,g3,00,g3,00
+p3: echo1,00,00,00,d5,00,00,00,0,00,00,00,d5,00,00,00,0,00,00,d6,d5,00,00,00,0,00,00,00,d5,00,00,00
+p4: d5,d5,d4,d5,d5,d5,d4,d5,d5,d5,d4,d5,d5,d5,d4,d5
+p5: c4,echo1,D4,d4, c4,00,g4, D4,c4,00,A3, g3,00,c4,00,c3, c4,echo1,D4,d4, 00,c4,00,g3, D4,c4,00,A3, g3,00,c4,c3
+p6: 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p7: 00,00,00,g3,00,00,g3,00,00,g3,00,00,g3,g3,g3,g3
+p8: f4,echo1,00,00,c6,00,00,00,f4,00,00,00,c6,00,00,00, g4,echo1,00,c5,c6,00,00,00,g4,00,00,00,c6,00,00,00, G4,echo1,00,00,c6,00,00,00,G4,00,00,00,c6,00,00,00, D4,echo1,00,c5,c6,00,c6,00,D4,c6,00,00,c6,00,00,c6
+p9: c4,echo1,D4,d4, c4,00,g4, D4,c4,c5,A3, g3,d5,c4,D5,c3, c4,echo1,D4,d4, 00,c4,g5,g3, D4,c4,D5,A3, g3,d5,c4,c3
+p10: f2,echo1,f1,f3,f2,00,D4,A2, f2,echo1,f3,f2,f2,A2,f2,A2,g2,echo1,g1,g3,g2,00,D4,A2, g2,echo1,g3,g2,g2,A2,g2,A2,G2,echo1,G1,G3,G2,00,D4,A2, G2,echo1,G3,G2,G2,A2,G2,A2,D2,echo1,D1,D3,D2,00,D4,A2, D2,echo1,D3,D2,D2,A2,D2,A2
+p11: 0,00,00,00,c6,00,00,00,0,00,00,00,c6,00,00,00,0,00,00,c5,c6,00,c6,00,0,c6,00,00,c6,00,00,c6
+p12: 00,00,00,00,d5,00,00,00,0,00,00,00,d5,00,00,00,0,00,00,d6,d5,00,00,00,0,00,00,00,d5,00,00,00
+p13: g3,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p14: 00
+
+#tracks
+t1: p6,  p6,  p6,  p1,  p1,  p10, p10,  p10, p11, p1, p1, p1
+t2: p6,  p1,  p1,  p1,  p1,  p10, p10,  p10, p11, p1, p1, p1
+t3: p6,  p1,  p1,  p1,  p1,  p10, p10,  p10, p11, p1, p1, p1
+t4: p6,  p6,  p7,  p2,  p2,  p6,  p6,   p2,  p6,  p6, p2, p2
+t5: p6,  p6,  p6,  p3,  p3,  p6,  p6,   p3,  p6,  p6, p3, p3
+t6: p6,  p6,  p7,  p4,  p4,  p6,  p4,   p4,  p6,  p6, p4, p4
+t7: p6,  p6,  p6,  p5,  p9,  p5,  p5,   p5,  p11, p1, p9, p9
+t8: p6,  p6,  p6,  p5,  p5,  p5,  p5,   p5,  p11, p1, p5, p5
+t9: p6,  p6,  p6,  p6,  p3,  p3,  p3,   p3,  p6,  p6, p6, p6
+t10:p6,  p11, p6,  p6,  p6,  p8,  p8,   p8,  p11, p1, p6, p6

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives/songs/regrlives.txt Added

@@ -0,0 +1,70 @@
+# Example song by Antti Silvast.
+
+bpm:125
+
+# each instrument has the following parameters: 
+
+# in: waveform, attack, decay, sustain,
+# release,modulation,[sweep],[pan],[interpol],[modulator]
+# 
+# in            i and the number of instrument, e.g. i1
+# waveform      square | kantti, saw | saha, sin | sini, noise | kohina 
+# attack        attack magnitude in samples 
+# decay         decay magnitude in samples 
+# sustain       sustain magnitude in samples 
+# release       release magnitude in samples 
+# modulation    the amount of modulation (positive or negative) 
+# sweep         the amount of sweep (positive or negative) [optional] 
+# pan           stereo panning (0..100) [optional]
+# interpol      amount of sample interpolation (0..100) [optional] 
+# modulator     the waveform of modulation, for options see waveform [optional]
+
+#instruments
+i1:sini,2,16,1,4000,0,-60
+i2:saha,2,6,1,2000,0,0
+i3:kohina,2,10,1,5100,0,25
+i4:saha,2,5,1,4000,0,0
+i5:saha,2,4,1,4000,0,2
+i6:saha,2,4,1,16000,0,0
+i7:saha,2,5,1,23000,2,0
+i8:kantti,2,4,1,3000,500000,-5
+i9:sini,2,7,1,44100,2,0
+i10:kohina,2,5,1,8100,0,-1
+
+#patterns
+p1:00,   00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p2:echo1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p3:g3,00,00,00,g3,00,00,00,g3,00,00,00,g3,00,00,g3
+p4:c2,c3,c3,c2,00,c2,c2,c3,c2,00,c3,c2,00,c2,c3,c2
+p5:g6,g6,g5,g5,c3,00,g6,g5,g6,g5,g5,g5,c3,00,g5,g6
+p6:c4,d4,D4,c4,d4,D4,c4,d4,D4,c4,d4,D4,c4,d4,D4,d4, d4,D4,f4,d4,D4,f4,d4,D4,f4,d4,D4,f4,d4,D4,f4,D4, D4,f4,g4,D4,f4,g4,D4,f4,g4,D4,f4,g4,D4,f4,g4,f4, f4,g4,G4,f4,g4,G4,f4,g4,G4,f4,g4,G4,f4,g4,G4,D4
+p7:c4,d4,D4,c4,d4,D4,c4,d4,D4,c4,d4,D4,c4,d4,D4,d4, d4,D4,f4,d4,D4,f4,d4,D4,f4,d4,D4,f4,d4,D4,f4,D4
+p8:D4,f4,g4,D4,f4,g4,D4,f4,g4,D4,f4,g4,D4,f4,g4,f4, f4,g4,G4,f4,g4,G4,f4,g4,G4,f4,g4,G4,f4,g4,G4,D4
+p9:f4,g4,G4,f4,g4,G4,f4,g4,G4,f4,g4,G4,f4,g4,G4,D4
+p10:c1,echo1,00,00,00,00,00,00,00,00,00,c3,00,00,00,00
+p11:c5,c1,00,00,00,00,00,00,00,00,00,c3,00,00,00,00
+p12:c5,c6,c5,c5,c6,c5,c5,c6,c5,c6,c5,c5,c6,c5,c5,c6
+p13:D5,00,d5,D5,00,D5,d5,00, D5,00,d5,D5,00,D5,d5,00, f5,00,D5,f5,00,f5,D5,00, f5,00,D5,f5,00,f5,D5,00, g5,00,f5,g5,00,g5,f5,00, g5,00,f5,g5,00,g5,f5,00, G5,00,g5,G5,00,G5,g5,00, G5,00,g5,G5,00,G5,g5,00
+p14:00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p15:D5,00,d5,D5,00,D5,d5,00, D5,00,d5,D5,00,D5,d5,00, f5,00,D5,f5,00,f5,D5,00, f5,00,D5,f5,00,f5,D5,00
+p16:c2,c2,A1,c2,c2,D2,A1,c2,c2,c2,A1,c2,c2,D2,A1,c2
+p17:g5,00,f5,g5,00,g5,f5,00, g5,00,f5,g5,00,g5,f5,00, G5,00,g5,G5,00,G5,g5,00, G5,00,g5,G5,00,G5,g5,00
+p18:G5,00,g5,G5,00,G5,g5,00
+p19:c6,echo1,c5,00,c6,c6,c5,00,c6,00,c5,c6, 00,c6,c5,00
+p20:A1,00,c2,00,00,00,00,00,00,00,c5,d6,D5,c6,d5,D6, 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 
+p21:c2,00,00,00,00,00,00,00,00,00,0,00,00,00,00,00, 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p22:echo1,00,00,00,00,00,00,00,g6,g3,A1,A2,A1,A5,A6,A5,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
+p23:echo1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,c1,D1,g1,c2,D2,g2,c3,D3,g3,c4,D4,g4,c5,D5,g5,c6
+p24:00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,echo1,00,00,00,00,00,00,00,g6,g3,A1,A2,A1,A5,A6,A5,
+
+#tracks
+t1: p1,    p14,    p14,  p14,   p14,  p3,   p3,   p3,  p3,  p3,  p3,  p3   
+t2: p1,    p14,    p14,  p14,   p14,  p4,   p4,   p4,  p4,  p4,  p4,  p4  
+t3: p1,    p14,    p14,  p14,   p14,  p5,   p5,   p5,  p5,  p5,  p5,  p5  
+t4: p2,    p14,    p14,  p14,   p6,   p7,   p8,   p7,  p8,  p14, p14, p20 
+t5: p2,    p14,    p14,  p14,   p6,   p7,   p8,   p7,  p8,  p14, p14, p20 
+t6: p2,    p14,    p24,  p14,   p12,  p12,  p12,  p14, p14, p12, p12, p14 
+t7: p2,    p14,    p24,  p23,   p13,  p15,  p17,  p14, p14, p15, p17, p14 
+t8: p2,    p22,    p22,  p22,   p14,  p10,  p10,  p10, p10, p10, p10, p10 
+t9: p2,    p21,    p21,  p21,   p14,  p14,  p14,  p14, p14, p14, p14, p14 
+t10:p2,    p14,    p14,  p14,   p14,  p19,  p19,  p19, p19, p19, p19, p19

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data/fourKlives/songs/roselives.txt Added

@@ -0,0 +1,62 @@
+# Example song by Antti Silvast.
+
+bpm:125
+
+# each instrument has the following parameters: 
+
+# in: waveform, attack, decay, sustain,
+# release,modulation,[sweep],[pan],[interpol],[modulator]
+# 
+# in            i and the number of instrument, e.g. i1
+# waveform      square | kantti, saw | saha, sin | sini, noise | kohina 
+# attack        attack magnitude in samples 
+# decay         decay magnitude in samples 
+# sustain       sustain magnitude in samples 
+# release       release magnitude in samples 
+# modulation    the amount of modulation (positive or negative) 
+# sweep         the amount of sweep (positive or negative) [optional] 
+# pan           stereo panning (0..100) [optional]
+# interpol      amount of sample interpolation (0..100) [optional] 
+# modulator     the waveform of modulation, for options see waveform [optional]
+
+#instruments
+i1:sini,2,13,30,3700,0,-60
+i2:saha,2,5,30,2300,0000,2
+i3:kohina,2,5,1,2300,0,-2
+i4:kohina,2,4,1,2300,0,0
+i5:saha,2,5,1,3000,0,0
+i6:saha,2,4,1,19000,0,0
+i7:saha,2,4,1,3000,1000,0
+i8:kantti,2,3,1,3000,39120390,-2
+i9:saha,2,5,1,40000,100,500
+
+#patterns
+p1:0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+p2:echo1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+p3:g3,echo1,00,g3, g6,00,00,g3, 00,g3,00,g3, g6,00,g3,00, g3,g3,00,00, g6,00,00,g3, 00,g3,g3,g3, g6,00,g3,00
+p4:c4,c4,c3,c4, c4,c4,c3,00, c4,c4,c3,c4, c4,c4,c3,c4, c4,c4,c3,c4, c4,c4,c3,00, c4,c4,c3,c4, c4,c4,c3,c4
+p5:echo1,00,00,00, c1,00,00,00, 00,00,00,00, c3,00,00,c3, 00,00,00,00, c3,00,00,00, 00,00,00,00, c3,00,00,c3
+p6:c3,c2,c2,c3, c2,c2,D3,c2, D2,c3,c2,c2, g3,c2,g2,c3, c3,c3,c2,c3, c2,c2,D3,c2, D2,c3,c2,c2, A2,c2,A1,c3
+p7:c4,D4,g4,c5, c4,D4,g4,c5, c4,D4,g4,c5, c4,D4,g4,c5, D5,g4,D4,c4, D5,g4,D4,c4, d5,g4,D4,c4, d5,g4,D4,c4, G3,c4,D4,G4, G3,c4,D4,G4, G3,c4,D4,G4, G3,c4,D4,G4, A4,D4,c4,G3, A4,D4,c4,G3, A4,D4,c4,G3, A4,D4,c4,G3
+p8:00
+p9:c6,echo1,D6,00, d6,00,A5,00, c6,00,D6,00, d6,00,A5,00, c6,00,D6,00, d6,00,A5,00, c6,00,D6,00, d6,00,A5,00, c6,00,D6,00, d6,00,G5,00, c6,00,D6,00, d6,00,G5,00, c6,00,D6,00, d6,00,G5,00, c6,00,D6,00, d6,00,G5,00
+p10:c6,00,D6,00, d6,00,G5,00
+p11:00
+p12:00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p13:00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p14:c6,echo1,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p15:c1,echo1,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p16:c5,echo1,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p17:00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, c5,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+p18:echo1,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, c1,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00, 00,00,00,00
+
+#tracks
+t1:p1, p13, p13, p13, p13, p3,  p3, p3,  p13, p13, p13, p13 
+t2:p1, p13, p13, p13, p13, p6,  p6, p6,  p6,  p6,  p13, p13 
+t3:p2, p13, p13, p13, p13, p5,  p5, p5,  p15, p13, p13, p13 
+t4:p2, p13, p13, p13, p13, p4,  p4, p4,  p4,  p4,  p13, p13 
+t5:p1, p13, p13, p13, p13, p7,  p7, p7,  p13, p13, p13, p13 
+t6:p2, p13, p13, p14, p16, p13, p9, p13, p13, p13, p9,  p14 
+t7:p1, p13, p13, p13, p13, p7,  p7, p7,  p7,  p7,  p13, p13 
+t8:p2, p3,  p3,  p3,  p3,  p13, p13,p13, p13, p13, p13, p13 
+t9:p2, p15, p13, p13, p17, p13, p13,p18, p13, p18, p13, p13

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data_processor.c Added

@@ -0,0 +1,922 @@
+// data_processor.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+// generically process out[x] from a combination of in[a][b], store[z] and arithmetic expressions
+//#define DEBUG
+#include <stdio.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define EQS 256
+#define EQN 512
+
+#define NSTORE (EQN-EQS)
+
+#define MAX_EXP_LEN 65536
+
+typedef struct {
+  weed_plant_t **params;
+  double *store;
+  short error;
+} _sdata;
+
+
+typedef struct _node node; 
+
+struct _node {
+  node *left;
+  node *right;
+  node *parent;
+  int visited;
+  char *value;
+  char *varname;
+};
+
+static node *rootnode;
+
+
+static node *new_node(char *value) {
+  node *newnode=weed_malloc(sizeof(node));
+  newnode->left=newnode->right=newnode->parent=NULL;
+  newnode->visited=0;
+  newnode->value=strdup(value);
+  newnode->varname=NULL;
+  return newnode;
+}
+
+
+static node * add_parent(node *xnode, char *value) {
+  // add a parent to node; if node is rootnode, newnode becomes the new root
+  // node becomes the left child
+
+  node *newnode=new_node(value);
+  newnode->left=xnode;
+  if (xnode->parent!=NULL) {
+    if (xnode->parent->left==xnode) xnode->parent->left=newnode;
+    else xnode->parent->right=newnode;
+  }
+  else rootnode=newnode;
+  xnode->parent=newnode;
+
+  return newnode;
+}
+
+
+static node * add_right(node *xnode, char *value) {
+  // add node as right child
+
+  node *newnode=new_node(value);
+  newnode->parent=xnode;
+  xnode->right=newnode;
+
+  return newnode;
+}
+
+
+
+
+static void free_all(node *xnode) {
+  if (xnode==NULL) return;
+  free_all(xnode->left);
+  free_all(xnode->right);
+  weed_free(xnode->value);
+  if (xnode->varname!=NULL) weed_free(xnode->varname);
+  weed_free(xnode);
+}
+
+
+static double getval(char *what, _sdata *sdata) {
+  int error,which;
+
+  if (!strncmp(what,"i[",2)) {
+    which=atoi(what+2);
+    if (which>=EQN-EQS) {
+      sdata->error=3;
+      return 0.;
+    }
+    return weed_get_double_value(sdata->params[which],"value",&error);
+  }
+
+  if (!strncmp(what,"s[",2)) {
+    which=atoi(what+2);
+    if (which>=NSTORE) {
+      sdata->error=4;
+      return 0.;
+    }
+    return sdata->store[which];
+  }
+
+  return strtod(what,NULL);
+
+}
+
+
+
+static char *simplify2(node *left, node *right, node *op, _sdata *sdata) {
+  double res=0.;
+
+  char buf[32768];
+
+  if (!strcmp(op->value,"-")) res=getval(left->value,sdata)-getval(right->value,sdata);
+  else if (!strcmp(op->value,"*")) res=getval(left->value,sdata)*getval(right->value,sdata);
+  else if (!strcmp(op->value,"+")) res=getval(left->value,sdata)+getval(right->value,sdata);
+  else if (!strcmp(op->value,"/")) res=getval(left->value,sdata)/getval(right->value,sdata);
+
+  weed_free(op->value);
+
+  if (op->varname!=NULL) {
+    snprintf(buf,32768,"%s[%d]",op->varname,(int)res);
+    res=getval(buf,sdata);
+    free(op->varname);
+    op->varname=NULL;
+  }
+
+  snprintf(buf,32768,"%f",res);
+
+  op->value=strdup(buf);
+
+  free_all(left);
+  free_all(right);
+  op->left=op->right=NULL;
+  return op->value;
+
+}
+
+
+
+
+static char *simplify(node *xnode, _sdata *sdata) {
+  char *res=NULL;
+
+  if (xnode==NULL) return NULL;
+
+  if (xnode->left==NULL) {
+    xnode->visited=2;
+
+    return xnode->value;
+  }
+
+  if (xnode->left->left==NULL&&xnode->right->left==NULL) {
+#ifdef DEBUG
+    fprintf(stderr,"simplifying %s %s %s = ",xnode->left->value,xnode->value,xnode->right->value);
+#endif
+    res=simplify2(xnode->left,xnode->right,xnode,sdata);
+    if (xnode->left!=NULL) xnode->left->visited=2;
+    if (xnode->right!=NULL) xnode->right->visited=2;
+
+#ifdef DEBUG
+    fprintf(stderr,"%s\n",res);
+#endif
+  }
+  else {
+    simplify(xnode->left,sdata);
+    simplify(xnode->right,sdata);
+
+    if (xnode->left->left==NULL&&xnode->right->left==NULL) {
+#ifdef DEBUG
+      fprintf(stderr,"simplifying %s %s %s = ",xnode->left->value,xnode->value,xnode->right->value);
+#endif
+      res=simplify2(xnode->left,xnode->right,xnode,sdata);
+      if (xnode->left!=NULL) xnode->left->visited=2;
+      if (xnode->right!=NULL) xnode->right->visited=2;
+      
+#ifdef DEBUG
+      fprintf(stderr,"%s\n",res);
+#endif
+    }
+    else {
+      if (xnode->visited<2) {
+	xnode->visited=2;
+	simplify(xnode,sdata);
+      }
+    }
+  }
+
+  xnode->visited=2;
+
+  return res;
+}
+
+//#define DEBUG_SYNTAX
+
+static int exp_to_tree(const char *exp) {
+  size_t len=strlen(exp);
+
+  int nstart=-1;
+  int plevel=0;
+  int pstart;
+  int gotdot=0;
+  int retval;
+  int op=0;
+
+  char buf[1024];
+
+  char *varname=NULL;
+  char *parbit;
+
+  char *tmp;
+
+  node *oldroot;
+
+  register int i;
+
+  for (i=0;i<len;i++) {
+    switch (exp[i]) {
+
+    case '[':
+      if (varname==NULL) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 1\n");
+#endif
+	return 1;
+      }
+      plevel=2;
+      pstart=++i;
+
+      while(1) {
+	if (!strncmp(&exp[i],"]",1)) break;
+	i++;
+	if (i>len) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 2\n");
+#endif
+	  return 1;
+	}
+      }
+
+      if (i-pstart+3>MAX_EXP_LEN) return 5;
+
+      parbit=weed_malloc(i-pstart+3);
+      sprintf(parbit,"0+"); // need at least one operator to hold the varname
+
+      snprintf(parbit+2,i-pstart+1,"%s",exp+pstart);
+
+#ifdef DEBUG
+      fprintf(stderr,"got subexpression2 %s\n",parbit);
+#endif
+
+      oldroot=rootnode;
+      rootnode=NULL;
+
+      retval=exp_to_tree(parbit);
+      weed_free(parbit);
+
+      if (retval!=0) return retval;
+
+      rootnode->varname=varname;
+      varname=NULL;
+
+      if (oldroot!=NULL) {
+	oldroot->right=rootnode;
+	if (rootnode!=NULL) rootnode->parent=oldroot;
+	rootnode=oldroot;
+      }
+
+      break;
+
+    case '(':
+      if (plevel==1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 3\n");
+#endif
+	return 1;
+      }
+      if (nstart!=-1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 4\n");
+#endif
+	return 1;
+      }
+
+      plevel=2;
+      pstart=++i;
+
+      while(1) {
+	if (!strncmp(&exp[i],")",1)) plevel--;
+	else if (!strncmp(&exp[i],"(",1)) plevel++;
+
+	if (plevel==1) break;
+
+	i++;
+	if (i>len) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 5\n");
+#endif
+	  return 1;
+	}
+      }
+
+      parbit=strndup(exp+pstart,i-pstart);
+
+#ifdef DEBUG
+      fprintf(stderr,"got subexpression %s\n",parbit);
+#endif
+
+      oldroot=rootnode;
+      rootnode=NULL;
+
+      retval=exp_to_tree(parbit);
+      weed_free(parbit);
+
+      if (retval!=0) return retval;
+
+      if (oldroot!=NULL) {
+	oldroot->right=rootnode;
+	if (rootnode!=NULL) rootnode->parent=oldroot;
+	rootnode=oldroot;
+      }
+      break;
+
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      if (plevel==1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 6\n");
+#endif
+	return 1;
+      }
+      if (varname!=NULL) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 7\n");
+#endif
+	return 1;
+      }
+      if (nstart==-1) nstart=i;
+      break;
+    case '.':
+      if (plevel==1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 8\n");
+#endif
+	return 1;
+      }
+      if (gotdot||varname!=NULL) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 9\n");
+#endif
+	return 1;
+      }
+      if (nstart==-1) nstart=i;
+      gotdot=1;
+      break;
+    case '-':
+    case '+':
+      if (varname!=NULL) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 10\n");
+#endif
+	return 1;
+      }
+      if (nstart==-1&&plevel==0) {
+	if (len+2>MAX_EXP_LEN) return 5;
+
+	tmp=weed_malloc(len+2);
+	snprintf(tmp,i+1,"%s",exp);
+
+	sprintf(tmp+i,"0");
+
+	// replace "+-" or "-+" with "0-"
+	// replace "++" or "--" with "0+ or "
+	if ((op=='-'&&exp[i]=='+')||(op=='+'&&exp[i]=='-')||(op!='+'&&op!='-'&&exp[i]=='-')) 
+	  sprintf(tmp+i+1,"-");
+	else 
+	  sprintf(tmp+i+1,"+");
+	sprintf(tmp+i+2,"%s",exp+i+1);
+	len++;
+	i--;
+	sprintf((char *)exp,"%s",tmp);
+
+	weed_free(tmp);
+	op=exp[i];
+	break;
+      }
+
+    case '*':
+    case '/':
+      if (varname!=NULL) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 11\n");
+#endif
+	return 1;
+      }
+      op=exp[i];
+      if (plevel==0) {
+	if (nstart==-1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 12\n");
+#endif
+	  return 1;
+	}
+
+	snprintf(buf,i-nstart+1,"%s",exp+nstart);
+	
+	if (rootnode==NULL) {
+	  rootnode=new_node(buf);
+	  snprintf(buf,2,"%s",&exp[i]);
+	  add_parent(rootnode,buf);
+	}
+	else {
+	  add_right(rootnode,buf);
+	  snprintf(buf,2,"%s",&exp[i]);
+	  add_parent(rootnode,buf);
+	}
+      }
+      else {
+	snprintf(buf,2,"%s",&exp[i]);
+	add_parent(rootnode,buf);
+      }
+
+      nstart=-1;
+      gotdot=0;
+      plevel=0;
+
+      break;
+    case 'i':
+      if (plevel==1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 13\n");
+#endif
+	return 1;
+      }
+      if (varname!=NULL||nstart!=-1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 14\n");
+#endif
+	return 1;
+      }
+      varname=strdup("i");
+      break;
+    case 's':
+      if (plevel==1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 15\n");
+#endif
+	return 1;
+      }
+      if (varname!=NULL||nstart!=-1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 16\n");
+#endif
+	return 1;
+      }
+      varname=strdup("s");
+      break;
+    case ' ':
+      break;
+    default:
+      return 1;
+    }
+  }
+
+  if (nstart==-1) {
+#ifdef DEBUG_SYNTAX
+	printf("pt 17\n");
+#endif
+    if (plevel==0) return 1;
+    return 0;
+  }
+
+  snprintf(buf,i-nstart+1,"%s",exp+nstart);
+
+  if (rootnode==NULL) {
+    rootnode=new_node(buf);
+  }
+  else {
+    add_right(rootnode,buf);
+  }
+
+  return 0;
+}
+
+
+
+#ifdef DEBUG
+static void print_tree(node *xnode, int visits) {
+  //visit tree in infix order
+
+  if (xnode==NULL) return;
+
+  if (xnode->left==NULL) {
+    fprintf(stderr,"%s",xnode->value);
+    xnode->visited=visits;
+    return;
+  }
+
+  if (xnode->left->visited<visits) {
+    fprintf(stderr,"(");
+    print_tree(xnode->left,visits);
+  }
+  if (xnode->visited<visits) printf("%s",xnode->value);
+  xnode->visited=visits;
+  if (xnode->right->visited<visits) {
+    print_tree(xnode->right,visits);
+    fprintf(stderr,")");
+  }
+}
+#endif
+
+
+
+
+
+
+
+static int preproc(const char *exp) {
+  // put parens around *, /
+  char tmp[65536];
+  char lastop=0;
+
+  int nstart=-1,plevel=0;
+  size_t len=strlen(exp);
+
+  register int i;
+
+  
+  for (i=0;i<len;i++) {
+    switch (exp[i]) {
+    case '(':
+      nstart=i;
+    case '[':
+      i+=preproc(&exp[i+1]);
+      len=strlen(exp);
+      break;
+    case ')':
+    case ']':
+      i++;
+      goto preprocdone;
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9': 
+    case 'i':
+    case 's':
+      if (nstart==-1) nstart=i;
+      break;
+    case '+':
+    case '-':
+      if (nstart==-1) {
+	nstart=i;
+	break;
+      }
+      if (plevel>0&&(lastop=='*'||lastop=='/')) {
+	// close parens
+	if (nstart==-1) break;
+	sprintf(tmp,"%s",exp);
+	sprintf(tmp+i,")%s",exp+i);
+	sprintf((char *)exp,"%s",tmp);
+	len++;
+	i++;
+	plevel--;
+      }
+      lastop=exp[i];
+      nstart=-1;
+      break;
+    case '*':
+    case '/':
+      if (lastop=='+'||lastop=='-') {
+	// open parens
+	sprintf(tmp,"%s",exp);
+	sprintf(tmp+nstart,"(%s",exp+nstart);
+	sprintf((char *)exp,"%s",tmp);
+	len++;
+	i++;
+	nstart=-1;
+	plevel++;
+      }
+      lastop=exp[i];
+      break;
+    default:
+      break;
+    }
+  }
+
+ preprocdone:
+
+  // close any open parens
+  if (plevel>0) {
+    sprintf(tmp,"%s",exp);
+    for (i=0;i<plevel;i++) {
+      sprintf(tmp+len+i,")");
+    }
+    sprintf((char *)exp,"%s",tmp);
+    i=strlen(exp);
+  }
+
+  return i;
+}
+
+
+
+
+static double evaluate (const char *exp, _sdata *sdata) {
+  double res;
+
+  sdata->error=0;
+  rootnode=NULL;
+
+  preproc(exp);
+
+#ifdef DEBUG
+  printf("preproc is %s\n",exp);
+#endif
+
+  sdata->error=exp_to_tree(exp);
+  if (sdata->error>0) return 0.;
+
+#ifdef DEBUG
+  fprintf(stderr,"\nExp is:\n");
+  print_tree(rootnode,2);
+  fprintf(stderr,"\n\n");
+#endif
+  
+  simplify(rootnode,sdata);
+
+#ifdef DEBUG
+  fprintf(stderr,"\nSimplified result is:\n");
+  print_tree(rootnode,3);
+  fprintf(stderr,"\n\nOK\n");
+#endif
+
+  if (sdata->error) return 0.;
+
+  if (!strncmp(rootnode->value,"inf",3)) {
+    sdata->error=2;
+    return 0.;
+  }
+
+  res=strtod(rootnode->value,NULL);
+
+  free_all(rootnode);
+
+  return res;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////
+
+
+int dataproc_init(weed_plant_t *inst) {
+  register int i;
+
+  _sdata *sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  sdata->store=weed_malloc(NSTORE*sizeof(double));
+
+  if (sdata->store==NULL) {
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  for (i=0;i<NSTORE;i++) {
+    sdata->store[i]=0.;
+  }
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int dataproc_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  double res=0.;
+
+  char *ip=NULL,*ptr;
+
+  char exp[MAX_EXP_LEN];
+
+  size_t len;
+
+  int which;
+
+  register int i;
+
+  sdata->params=in_params;
+
+  for (i=EQS;i<EQN;i++) {
+    if (ip!=NULL) weed_free(ip);
+    ip=weed_get_string_value(in_params[i],"value",&error);
+
+    if (!strlen(ip)) continue;
+
+    ptr=index(ip,'=');
+    if (ptr==NULL) {
+      fprintf(stderr,"data_processor ERROR: eqn %d has no '='\n",i-EQS);
+      continue;
+    }
+
+    if (strncmp(ip,"s",1)&&strncmp(ip,"o",1)) {
+      fprintf(stderr,"data_processor ERROR: eqn %d must set s or o value\n",i-EQS);
+      continue;
+    }
+
+    if (strncmp(ip+1,"[",1)||strncmp(ptr-1,"]",1)) {
+      fprintf(stderr,"data_processor ERROR: eqn %d has invalid []\n",i-EQS);
+      continue;
+    }
+
+    if (strlen(ptr+1)>=MAX_EXP_LEN) {
+      fprintf(stderr,"data_processor ERROR: eqn %d has too long expression\n",i-EQS);
+      continue;
+    }
+
+    len=ptr-ip-2;
+
+    if (len<1) {
+      fprintf(stderr,"data_processor ERROR: eqn %d has invalid []\n",i-EQS);
+      continue;
+    }
+
+    if (len>=MAX_EXP_LEN) {
+      fprintf(stderr,"data_processor ERROR: eqn %d has too long []\n",i-EQS);
+      continue;
+    }
+
+    sdata->error=0;
+
+    snprintf(exp,len,"%s",ip+2);
+    which=(int)evaluate(exp,sdata);
+
+    if (!strncmp(ip,"o[",2)) {
+      if (which>=EQN-EQS) {
+	sdata->error=3;
+      }
+    }
+
+    else if (!strncmp(ip,"s[",2)) {
+      if (which>=NSTORE) {
+	sdata->error=4;
+      }
+    }
+
+    if (!sdata->error) {
+      sprintf(exp,"%s",ptr+1);
+      res=evaluate(exp,sdata);
+    }
+    else sdata->error+=100;
+
+    if (sdata->error) {
+      switch (sdata->error) {
+      case 1:
+	sprintf(exp,"%s",ptr+1);
+	fprintf(stderr,"data_processor ERROR: syntax error in RHS of eqn %d\n%s\n",i-EQS,exp); break;
+      case 2:
+	fprintf(stderr,"data_processor ERROR: division by 0 in RHS of eqn %d\n",i-EQS); break;
+      case 3:
+	fprintf(stderr,"data_processor ERROR: i array out of bounds in RHS of eqn %d\n",i-EQS); break;
+      case 4:
+	fprintf(stderr,"data_processor ERROR: s array out of bounds in RHS of eqn %d\n",i-EQS); break;
+      case 5:
+	fprintf(stderr,"data_processor ERROR: expanded expression too long in RHS of eqn %d\n",i-EQS); break;
+      case 101:
+	snprintf(exp,len,"%s",ip+2);
+	fprintf(stderr,"data_processor ERROR: syntax error in LHS of eqn %d\n%s\n",i-EQS,exp); break;
+      case 102:
+	fprintf(stderr,"data_processor ERROR: division by 0 in LHS of eqn %d\n",i-EQS); break;
+      case 103:
+	fprintf(stderr,"data_processor ERROR: o array out of bounds in LHS of eqn %d\n",i-EQS); break;
+      case 104:
+	fprintf(stderr,"data_processor ERROR: s array out of bounds in LHS of eqn %d\n",i-EQS); break;
+      case 105:
+	fprintf(stderr,"data_processor ERROR: expanded expression too long in LHS of eqn %d\n",i-EQS); break;
+      default:
+	break;
+      }
+
+    }
+
+    else {
+      if (!strncmp(ip,"s",1)) {
+	sdata->store[which]=res;
+      }
+      else {
+	weed_set_double_value(out_params[which],"value",res);
+      }
+    }
+
+  }
+
+  if (ip!=NULL) weed_free(ip);
+
+  weed_free(in_params);
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+int dataproc_deinit(weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  if (sdata!=NULL) {
+    if (sdata->store!=NULL) weed_free(sdata->store);
+    weed_free(sdata);
+  }
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+
+  if (plugin_info!=NULL) {
+    weed_plant_t *filter_class,*gui;
+
+    weed_plant_t *in_params[EQN+1];
+    weed_plant_t *out_params[EQN-EQS+1];
+
+    register int i;
+
+    char name[256];
+    char name2[256];
+    char label[256];
+
+    for (i=0;i<EQS;i++) {
+      snprintf(name,256,"input%03d",i);
+      in_params[i]=weed_float_init(name,"",0.,-1000000000000.,1000000000000.);
+      gui=weed_parameter_template_get_gui(in_params[i]);
+      weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+    }
+
+    for (i=EQS;i<EQN;i++) {
+      snprintf(name,256,"equation%03d",i-EQS);
+      snprintf(label,256,"Equation %03d",i-EQS);
+      snprintf(name2,256,"output%03d",i-EQS);
+      in_params[i]=weed_text_init(name,label,"");
+      out_params[i-EQS]=weed_out_param_float_init(name2,0.,-1000000000000.,1000000000000.);
+    }
+
+    in_params[EQN]=NULL;
+    out_params[EQN-EQS]=NULL;
+
+    filter_class=weed_filter_class_init("data_processor","salsaman",1,0,&dataproc_init,&dataproc_process,
+					&dataproc_deinit,NULL,NULL,in_params,out_params);
+
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/data_unpacker.c Added

@@ -0,0 +1,114 @@
+// dat_unpacker.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+// unpacks multivalued data into single valued outputs
+
+//#define DEBUG
+#include <stdio.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+
+int dunpack_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+  double *fvals,xval;
+
+  int oidx=0,nvals;
+
+  register int i,j;
+
+  for (i=0;i<256;i++) {
+    nvals=weed_leaf_num_elements(in_params[i],"value");
+    if (nvals>0) {
+      fvals=weed_get_double_array(in_params[i],"value",&error);
+      for (j=0;j<nvals;j++) {
+	xval=fvals[j];
+	if (xval>1.) xval=1.;
+	if (xval<-1.) xval=-1.;
+	weed_set_double_value(out_params[oidx++],"value",xval);
+	if (oidx==256) break;
+      }
+      weed_free(fvals);
+    }
+    if (oidx==256) break;
+  }
+
+  weed_free(in_params);
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+
+  if (plugin_info!=NULL) {
+    weed_plant_t *filter_class;
+
+    weed_plant_t *in_params[257];
+    weed_plant_t *out_params[257];
+
+    register int i;
+
+    char name[256];
+    char label[256];
+
+    for (i=0;i<256;i++) {
+      snprintf(name,256,"input%03d",i);
+      snprintf(label,256,"Input %03d",i);
+      in_params[i]=weed_float_init(name,label,0.,0.,1.);
+      weed_set_int_value(in_params[i],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
+
+      snprintf(name,256,"Output %03d",i);
+      out_params[i]=weed_out_param_float_init(name,0.,-1.,1.);
+    }
+
+    in_params[i]=NULL;
+    out_params[i]=NULL;
+
+    filter_class=weed_filter_class_init("data_unpacker","salsaman",1,0,NULL,&dunpack_process,
+					NULL,NULL,NULL,in_params,out_params);
+
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/deinterlace.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/deinterlace.c Changed

@@ -9,12 +9,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -26,14 +24,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
@@ -96,17 +95,22 @@
   
   int luma_offs=0;
 
-  if (palette==WEED_PALETTE_ARGB32||palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32||palette==WEED_PALETTE_YUVA8888||palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) psize=4;
-  
-  if (palette==WEED_PALETTE_YUV444P||palette==WEED_PALETTE_YUVA4444P||palette==WEED_PALETTE_YUV420P||palette==WEED_PALETTE_YVU420P||palette==WEED_PALETTE_YUV422P) psize=1;
+  if (palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) width>>=1; // 2 pixels per macropixel
+
+  if (palette==WEED_PALETTE_ARGB32||palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32||
+      palette==WEED_PALETTE_YUVA8888||palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) psize=4;
   
+  if (palette==WEED_PALETTE_YUV444P||palette==WEED_PALETTE_YUVA4444P||palette==WEED_PALETTE_YUV420P||
+      palette==WEED_PALETTE_YVU420P||palette==WEED_PALETTE_YUV422P) psize=1;
 
-  if (palette==WEED_PALETTE_ARGB32||palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32||palette==WEED_PALETTE_RGB24||palette==WEED_PALETTE_BGR24) luma_offs=1;
+  if (palette==WEED_PALETTE_ARGB32||palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32||
+      palette==WEED_PALETTE_RGB24||palette==WEED_PALETTE_BGR24) luma_offs=1;
 
   psize2=psize*2;
   psize3=psize*3;
-  
+
   widthx=width*psize;
+
   
   src+=irowstride;
   dst+=orowstride;

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/edge.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/edge.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/farneback_analyser.cpp Added

@@ -0,0 +1,384 @@
+// farneback_analyser.cpp
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// Computes a dense optical flow using the Gunnar Farneback’s algorithm.
+
+/*
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+following conditions are met:
+
+    Redistributions of source code must retain the above copyright notice, this list of conditions 
+    and the following disclaimer.
+    Redistributions in binary form must reproduce the above copyright notice, this list of conditions 
+    and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// calculates array flow, s.t.:
+// prevImg(y,x) = nextImg( y + flow(y,x)[0], x + flow(y,x)[1] )
+
+// input is nextImg : this is cached in memory to provide prevImg for the next call
+// output is two channels of type ALPHA FLOAT (the flow(y,x)[0] in the first, and the flow(y,x)[1] in the second)
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#define FP_BITS 16
+
+int myround(double n) {
+  return (n>=0.)?(int)(n + 0.5):(int)(n - 0.5);
+}
+
+#include "opencv2/core/core.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/video/tracking.hpp"
+using namespace cv;
+
+
+typedef struct {
+  int inited;
+  Mat *prevgrey;
+} _sdata;
+
+
+
+static uint8_t UNCLAMP_Y[256];
+
+
+static void init_luma_arrays(void) {
+  register int i;
+
+  for (i=0;i<17;i++) {
+    UNCLAMP_Y[i]=0;
+  }
+
+  for (i=17;i<235;i++) {
+    UNCLAMP_Y[i]=(int)((float)(i-16.)/219.*255.+.5);
+  }
+
+  for (i=235;i<256;i++) {
+    UNCLAMP_Y[i]=255;
+  }
+
+}
+
+static void unclamp_frame(uint8_t *data, int width, int row, int height) {
+  register int i,j;
+
+  row-=width;
+
+  for (i=0;i<height;i++) {
+    for (j=0;j<width;j++) {
+      *data++=UNCLAMP_Y[*data];
+    }
+    data+=row;
+  }
+}
+
+static uint8_t *copy_frame(const uint8_t *csrc, int width, int row, int height) {
+  uint8_t *src=(uint8_t *)csrc;
+  uint8_t *dst=(uint8_t *)weed_malloc(width*row);
+  if (!dst) return NULL;
+  if (width==row) weed_memcpy(dst,src,width*height);
+  else {
+    uint8_t *dstp=dst;
+    register int i;
+    for (i=0;i<height;i++) {
+      weed_memcpy(dstp,src,width);
+      weed_memset(dstp+width,0,row-width);
+      dstp+=row;
+      src+=row;
+    }
+  }
+  return dst;
+}
+
+
+
+
+int farneback_init (weed_plant_t *inst) {
+  int error;
+  _sdata *sdata;
+
+  sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  sdata->inited=WEED_FALSE;
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int farneback_deinit (weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  if (sdata!=NULL) {
+    if (sdata->inited) delete sdata->prevgrey;
+    weed_free(sdata);
+  }
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+int farneback_process (weed_plant_t *inst, weed_timecode_t tc) {
+  int error;
+
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  weed_plant_t **out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
+
+  uint8_t *src=(uint8_t *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
+
+  float *dst1=(float *)weed_get_voidptr_value(out_channels[0],"pixel_data",&error);
+  float *dst2=(float *)weed_get_voidptr_value(out_channels[1],"pixel_data",&error);
+
+  int width=weed_get_int_value(in_channel,"width",&error);
+  int height=weed_get_int_value(in_channel,"height",&error);
+  int palette=weed_get_int_value(in_channel,"current_palette",&error);
+
+  int irow=weed_get_int_value(in_channel,"rowstrides",&error);
+  int orow1=weed_get_int_value(out_channels[0],"rowstrides",&error);
+  int orow2=weed_get_int_value(out_channels[1],"rowstrides",&error);
+  
+  int clamped=0;
+
+  register int i,j;
+
+  uint8_t *grey;
+
+  Mat *cvgrey;
+  Mat cvprevgrey, cvflow, srcMat, mixMat, ucMat;
+
+  float *fptr;
+
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  weed_free(out_channels);
+
+  // convert image to greyscale
+
+  cvgrey = new Mat(1,1,CV_8U);
+
+  switch (palette) {
+  case WEED_PALETTE_RGB24:
+    srcMat=Mat(height,width,CV_8UC3,src,irow);
+    cvtColor(srcMat,*cvgrey,CV_RGB2GRAY);
+    break;
+  case WEED_PALETTE_BGR24:
+    {
+      int from_to[]={0,2,1,1,2,0}; // convert bgr to rgb
+      srcMat=Mat(height,width,CV_8UC3,src,irow);
+      mixChannels(&srcMat,1,&mixMat,1,from_to,3);
+      cvtColor(mixMat,*cvgrey,CV_RGB2GRAY);
+    }
+    break;
+  case WEED_PALETTE_RGBA32:
+    srcMat=Mat(height,width,CV_8UC4,src,irow);
+    cvtColor(srcMat,*cvgrey,CV_RGB2GRAY);
+    break;
+  case WEED_PALETTE_BGRA32:
+    {
+      int from_to[]={0,2,1,1,2,0,3,3}; // convert bgra to rgba
+      srcMat=Mat(height,width,CV_8UC4,src,irow);
+      mixChannels(&srcMat,1,&mixMat,1,from_to,4);
+      cvtColor(mixMat,*cvgrey,CV_RGB2GRAY);
+    }
+    break;
+  case WEED_PALETTE_ARGB32:
+    {
+      int from_to[]={0,3,1,0,2,1,3,2}; // convert argb to rgba
+      srcMat=Mat(height,width,CV_8UC4,src,irow);
+      mixChannels(&srcMat,1,&mixMat,1,from_to,4);
+      cvtColor(mixMat,*cvgrey,CV_RGB2GRAY);
+    }
+    break;
+  case WEED_PALETTE_YUVA4444P:
+  case WEED_PALETTE_YUV444P:
+  case WEED_PALETTE_YUV422P:
+  case WEED_PALETTE_YUV420P:
+  case WEED_PALETTE_YVU420P:
+    if (weed_plant_has_leaf(in_channel,"YUV_clamping")&&
+	(weed_get_int_value(in_channel,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED)) {
+      srcMat=Mat(height,width,CV_8U,src,irow);
+      ucMat=Mat(256,1,CV_8U,UNCLAMP_Y);
+      LUT(srcMat,ucMat,*cvgrey);
+    }
+    else {
+      srcMat=Mat(height,width,CV_8U,src,irow);
+      srcMat.copyTo(*cvgrey);
+    }
+    break;
+  default:
+    break;
+  }
+
+
+  if (sdata->inited==WEED_FALSE) {
+    sdata->prevgrey=cvgrey;
+    sdata->inited=WEED_TRUE;
+    return WEED_NO_ERROR;
+  }
+
+  /*
+    Parameters:	
+
+        prevImg – First 8-bit single-channel input image.
+
+        nextImg – Second input image of the same size and the same type as prevImg .
+
+        flow – Computed flow image that has the same size as prevImg and type CV_32FC2 .
+
+        pyrScale – Parameter specifying the image scale (<1) to build pyramids for each image. 
+
+	pyrScale=0.5 means a classical pyramid, where each next layer is twice smaller than the previous one.
+
+        levels – Number of pyramid layers including the initial image. levels=1 means that no extra layers are 
+	created and only the original images are used.
+
+        winsize – Averaging window size. Larger values increase the algorithm robustness to image noise and give 
+	more chances for fast motion detection, but yield more blurred motion field.
+
+        iterations – Number of iterations the algorithm does at each pyramid level.
+
+        polyN – Size of the pixel neighborhood used to find polynomial expansion in each pixel. 
+	Larger values mean that the image will be approximated with smoother surfaces, 
+	yielding more robust algorithm and more blurred motion field. Typically, polyN =5 or 7.
+
+        polySigma – Standard deviation of the Gaussian that is used to smooth derivatives used as a basis for the 
+	polynomial expansion. For polyN=5 , you can set polySigma=1.1 . 
+	For polyN=7 , a good value would be polySigma=1.5 .
+
+        flags –
+
+        Operation flags that can be a combination of the following:
+            OPTFLOW_USE_INITIAL_FLOW Use the input flow as an initial flow approximation.
+            OPTFLOW_FARNEBACK_GAUSSIAN Use the Gaussian winsize times winsize filter instead of a 
+	    box filter of the same size for optical flow estimation. Usually, this option gives 
+	    z more accurate flow than with a box filter, at the cost of lower speed. Normally, winsize for a 
+	    Gaussian window should be set to a larger value to achieve the same level of robustness.
+
+	    The function finds an optical flow for each prevImg pixel using the [Farneback2003] alorithm so that
+
+	    prevImg (y,x) = nextImg ( y + flow (y,x)[1], x + flow (y,x)[0])
+
+	    since we are mainly interested int nextImg, we store: -flow
+	    e.g.
+
+	    nextImg (y,x) = prevImg ( y - flow (y,x)[1], x - flow (y,x)[0])
+
+  */
+
+  calcOpticalFlowFarneback(*sdata->prevgrey, *cvgrey, cvflow, 0.5, 3, 15, 3, 5, 1.2, 0);
+
+  delete sdata->prevgrey;
+  sdata->prevgrey=cvgrey;
+
+  // copy cvflow to float outputs
+
+  width=cvflow.size().width;
+  height=cvflow.size().height;
+
+  irow=(cvflow.step[0]>>3)-width;
+  orow1=(orow1>>2)-width;
+  orow2=(orow2>>2)-width;
+
+  fptr=(float *)cvflow.data;
+
+  for (i=0;i<height;i++) {
+    for (j=0;j<width;j++) {
+      *dst1++=-*fptr++;
+      *dst2++=-*fptr++;
+    }
+    fptr+=irow;
+    dst1+=orow1;
+    dst2+=orow2;
+  }
+
+  return WEED_NO_ERROR;
+}
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    int ipalette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,
+			 WEED_PALETTE_YUVA4444P,
+			 WEED_PALETTE_YUV444P,
+			 WEED_PALETTE_YUV422P,
+			 WEED_PALETTE_YUV420P,
+			 WEED_PALETTE_YVU420P,
+			 WEED_PALETTE_END};
+    // define a vector output
+    int opalette_list[]={WEED_PALETTE_AFLOAT,WEED_PALETTE_END};
+
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel",
+							     WEED_CHANNEL_REINIT_ON_SIZE_CHANGE|
+							     WEED_CHANNEL_REINIT_ON_ROWSTRIDES_CHANGE|
+							     WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE,
+							     ipalette_list),NULL};
+    weed_plant_t *out_chantmpls[]={weed_channel_template_init("X values",WEED_CHANNEL_PALETTE_CAN_VARY,opalette_list),
+				   weed_channel_template_init("Y values",WEED_CHANNEL_PALETTE_CAN_VARY,opalette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("farneback_analyser","salsaman",1,0,&farneback_init,
+						      &farneback_process,&farneback_deinit,
+						      in_chantmpls,out_chantmpls,NULL,NULL);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(in_chantmpls[0],"YUV_clamping",WEED_YUV_CLAMPING_UNCLAMPED);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+
+    init_luma_arrays();
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/fireTV.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/fireTV.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/fourKlives.c Added

@@ -0,0 +1,794 @@
+// fourKlives.c
+// weed plugin to generate parametric audio
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#define DEBUG
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/*
+    The implementation of Syna functions
+
+    - Marq + Antti
+*/
+
+
+// ported to LiVES by salsaman@gmail.com
+
+//#define MONO
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include "syna.h"
+
+#define MAX_TUNES 1024
+#define MAX_TUNELEN 1024
+#define TUNE_DIR "data/fourKlives/songs/"
+
+static char *tunes[MAX_TUNES];
+
+static void set_tempo(_sdata *sdata, int tempo) {
+  sdata->update=sdata->new_update=6*sdata->global/(tempo*10/25);
+  //        ekolen=update*3;
+}
+
+static void set_base_freq(_sdata *sdata, int freq) {
+  //base_freq=(freq<<13)/BFREQ;
+  sdata->base_freq=BFREQ+freq;
+  if (sdata->base_freq<=0) sdata->base_freq=1;
+}
+
+
+
+static int syna_init(_sdata *sdata, int freq) {
+  register int n,i;
+
+  sdata->module=NULL;
+
+  sdata->base_freq=BFREQ;
+
+  sdata->maxtracks=0;
+
+  for(n=0;n<WAVES;n++) {
+    sdata->aalto[n]=NULL;
+  }
+
+  for(n=0;n<INSTR;n++) {
+    sdata->echo[n]=NULL;
+    sdata->instr[n]=NULL;
+    sdata->pi[n]=0;
+  }
+
+  sdata->slen=freq/BFREQ;
+  sdata->global=freq;
+  sdata->counter=0;
+
+    /* Generate lower octaves from 6 */
+  for(n=4;n>=0;n--)
+    for(i=0;i<12;i++)
+      notei[n*12+i]=notei[(n+1)*12+i]/2;
+
+  /* Generate the waveforms */
+  for(n=0;n<WAVES;n++) {
+    if (n!=KOHINA) {
+      sdata->aalto[n]=weed_malloc(sdata->slen*sizeof(float));
+      if (sdata->aalto[n]==NULL) {
+	return WEED_ERROR_MEMORY_ALLOCATION;
+      }
+      weed_memset(sdata->aalto[n],0,sdata->slen*sizeof(float));
+    }
+  }
+
+    for (n=0;n<sdata->slen;n++) {
+      sdata->aalto[KANTTI][n]=(n<sdata->slen/2)?-1.0:1.0;
+      sdata->aalto[SINI][n]  =sin(n*2.0*M_PI/(float)sdata->slen);
+      sdata->aalto[SAHA][n]  =-1.0+fmod(1.0+2.0*n/(float)sdata->slen,2.0);
+    }
+
+    /* Noise needs to be longer */
+    sdata->aalto[KOHINA]=weed_malloc(sdata->global*sizeof(float));
+    if (sdata->aalto[KOHINA]==NULL) {
+      return WEED_ERROR_MEMORY_ALLOCATION;
+    }
+
+    for(n=0;n<sdata->global;n++)
+        sdata->aalto[KOHINA][n]=(rand()%2000-1000)/(float)1000.0;
+
+    /* Set starting values */
+    for(n=0;n<INSTR;n++) {
+      sdata->live_row[n]=0;
+      sdata->new_live_row[n]=0;
+
+      sdata->off[n]=-1;
+      sdata->plus[n]=0;
+      sdata->trak[n][0]=END;
+      sdata->ti[n]=-1;
+      sdata->eko[n]=0;
+      sdata->pan[n]=(n&1)?128-64:128+64;
+#ifdef MONO
+      sdata->pan[n]=128;
+#endif
+      
+      sdata->pola[n]=0;
+      sdata->vol[n]=255;
+      sdata->prev[n]=0;
+      sdata->slide[n]=0;
+    }
+    return WEED_NO_ERROR;
+}
+
+#ifndef TINY
+static int syna_load(_sdata *sdata, const char *tune) {
+    FILE    *f;
+    long    length;
+
+    int retval;
+
+    /* Read the file and call syna_get */
+    f=fopen(tune,"rb");
+    if (f==NULL) return WEED_ERROR_INIT_ERROR;
+    fseek(f,0,SEEK_END);
+    length=ftell(f);
+    fseek(f,0,SEEK_SET);
+    sdata->module=weed_malloc(length+1);
+    retval=fread(sdata->module,1,length,f);
+    sdata->module[length]=0; /* String ends in zero */
+    fclose(f);
+
+    if (retval<length) return WEED_ERROR_INIT_ERROR;
+
+    return(syna_get(sdata));
+}
+#endif
+
+
+static int syna_get(_sdata *sdata) {
+  static char *rows[MAXR],*key,*tnp;
+  int tmp,a,d,s,r,mod,sweep,wave,patt,track,note,wave_mod;
+
+  register int i,j,n;
+
+#ifndef TINY
+  cleanup(sdata->module);  /* You better have a clean module in intros... */
+#endif
+
+  /* Extract rows */
+  for(n=0;n<MAXR;n++) {
+    rows[n]=strtok((n)?NULL:sdata->module,"\n");
+    if(rows[n]==NULL)
+      break;
+  }
+
+  /* Extract data from rows */
+  for(i=0;i<n;i++) {
+    if(rows[i][0]=='#')
+      continue;
+
+    key=strtok(rows[i],":");
+
+    if (key) {
+      if(!strcmp(key,"bpm")) {
+	tmp=atoi(strtok(NULL,":"))*10/25;
+	sdata->song_bpm=tmp;
+	sdata->new_update=sdata->update=6*sdata->global/tmp;
+	sdata->ekolen=sdata->update*3;
+      }
+      if(key[0]=='i') {
+	/* Get instrument number and wave form */
+	tmp=atoi(&key[1]);
+	if (tmp<INSTR) {
+	  if (sdata->echo[tmp]!=NULL) weed_free(sdata->echo[tmp]);
+	  sdata->echo[tmp]=weed_malloc(sdata->ekolen*sizeof(int));
+	  if (sdata->echo[tmp]==NULL) {
+	    return WEED_ERROR_MEMORY_ALLOCATION;
+	  }
+	  weed_memset(sdata->echo[tmp],0,sdata->ekolen*sizeof(int));
+	}
+
+	tnp=strtok(NULL,",");
+
+	wave=0;
+
+	if(!strcmp(tnp,"kantti") || !strcmp(tnp,"square"))
+	  wave=0;
+	else if(!strcmp(tnp,"sini") || !strcmp(tnp,"sin"))
+	  wave=1;
+	else if(!strcmp(tnp,"saha") || !strcmp(tnp,"saw"))
+	  wave=2;
+	else if(!strcmp(tnp,"kohina") || !strcmp(tnp,"noise"))
+	  wave=3;
+	
+	/* Get ADSR */
+	a=atoi(strtok(NULL,","));
+	d=atoi(strtok(NULL,","));
+	s=atoi(strtok(NULL,","));
+	r=atoi(strtok(NULL,","));
+
+	if (tmp<INSTR) {
+	  sdata->len[tmp]=a+d+s+r+1;
+	  sdata->instr[tmp]=weed_malloc(sdata->len[tmp]*sizeof(int));
+	  if (sdata->echo[tmp]==NULL) {
+	    return WEED_ERROR_MEMORY_ALLOCATION;
+	  }
+	  weed_memset(sdata->instr[tmp],0,sdata->len[tmp]*sizeof(int));
+	}
+
+	mod=atoi(strtok(NULL,","));
+	if((tnp=strtok(NULL,",")))
+	  sweep=atoi(tnp);
+	else
+	  sweep=0;
+	if((tnp=strtok(NULL,",")))
+	  if (tmp<INSTR) sdata->pan[tmp]=(float)atoi(tnp)*255/100;
+	if((tnp=strtok(NULL,",")))
+	  if (tmp<INSTR) sdata->pola[tmp]=atoi(tnp)*255/100;
+
+	wave_mod=1;
+	
+	if ((tnp=strtok(NULL,","))) {
+	  if(!strcmp(tnp,"kantti") || !strcmp(tnp,"square"))
+	    wave_mod=0;
+	  else if(!strcmp(tnp,"sini") || !strcmp(tnp,"sin"))
+	    wave_mod=1;
+	  else if(!strcmp(tnp,"saha") || !strcmp(tnp,"saw"))
+	    wave_mod=2;
+	  else if(!strcmp(tnp,"kohina") || !strcmp(tnp,"noise"))
+	    wave_mod=3;
+	}
+
+	if (tmp<INSTR) adsr(sdata,a,d,s,r,mod,sweep,tmp,wave,wave_mod);
+      }
+
+      if(key[0]=='p') /* Handle pattern */
+	{
+	  patt=atoi(&key[1]);
+	  j=0;
+	  while(1) {
+	    tnp=strtok(NULL,",");
+	    if(tnp!=NULL) {
+	      note=0;
+	      for (tmp=0;notes[tmp][0]!='0';tmp++)
+		if(!strcmp(notes[tmp],tnp))
+		  note=notei[tmp];
+	      sdata->ptn[patt][j]=note;
+	      if(note==VOL || note==SLIDE) {
+		j++;
+		sdata->ptn[patt][j]=atoi(strtok(NULL,","));
+	      }
+
+	      j++;
+	    }
+	    else {
+	      sdata->ptn[patt][j]=END;
+	      break;
+	    }
+	  }
+	}
+
+      if(key[0]=='t') /* Handle track */
+	{
+	  track=atoi(&key[1]);
+	  j=0;
+	  while(1) {
+	    tnp=strtok(NULL,",");
+	    if(tnp!=NULL) {
+	      if(!strcmp(tnp,"loop"))
+		sdata->trak[track][j]=LOOP;
+	      else {
+		patt=atoi(&tnp[1]);
+		sdata->trak[track][j]=patt;
+	      }
+	      if (j>sdata->maxtracks) sdata->maxtracks=j;
+	      j++;
+	    }
+	    else {
+	      sdata->trak[track][j]=END;
+	      break;
+	    }
+	  }
+	}
+    }
+  }
+
+  return WEED_NO_ERROR;
+}
+
+#if 0
+// added by Antti Silvast for setting all live the rows
+static void set_live_rows(_sdata *sdata, int * the_rows) {
+  register int i;
+
+  for(i=0;i<INSTR; i++) {
+    sdata->new_live_row[i]=the_rows[i];
+    //pi[i]=0;
+  }
+}
+#endif
+
+// added by Antti Silvast for setting just one live row
+static void set_live_row(_sdata *sdata, int channel, int the_row) {
+  sdata->new_live_row[channel]=the_row;
+}
+
+static void syna_play(_sdata *sdata, float *dest, int length, int channels, int interleave) {
+  int note,li; // li is the "live i"
+  int left,right,smp;
+  int ceko,c1eko;
+      
+  register int i,n;
+
+  ceko=sdata->counter%sdata->ekolen;
+
+  for(n=0;n<length;n++,sdata->counter++) {
+    c1eko=ceko+1;
+    if(c1eko==sdata->ekolen)
+      c1eko=0;
+
+    /* New row */
+    if (sdata->counter > sdata->update) {
+      sdata->counter=0;
+      sdata->update=sdata->new_update;
+      for (i=1;sdata->trak[i][0]!=END;i++) {
+	li=sdata->live_row[i];
+	//li=i;
+	if (li==END)
+	  continue;
+	sdata->pi[i]++;
+
+	if(li==-1 || sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]==END) {
+	  li=sdata->live_row[i]=sdata->new_live_row[i];
+	  //ti[i]++;
+	  /*
+	    if(trak[i][li]==LOOP)
+	    li=0;
+	    if(trak[i][li]==END)
+	    li=END;
+	  */
+	  sdata->pi[i]=0;
+	}
+	//printf("%d=%d ",i,trak[i][li]);
+
+	if (li!=END) {
+	  if ((note=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]])) {
+	    switch(note) {
+	    case STOP  : sdata->off[i]=-1; break;
+	    case ECHON : sdata->eko[i]=1; break;
+	    case ECHOFF: sdata->eko[i]=0; break;
+	    case VOL   : sdata->pi[i]++;
+	      sdata->vol[i]=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]*255/100;
+	      break;
+	    case SLIDE : sdata->pi[i]++;
+	      sdata->slide[i]=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]*164/1000;
+	      break;
+	    default    : sdata->plus[i]=note<<13;
+	      //plus[i]/=BFREQ;
+	      sdata->off[i]=0;
+	    }
+	  }
+	}
+      }
+      
+      //printf("\n");
+      
+    }
+
+#define MARQ_ARM_OPT
+    
+#ifndef MARQ_ARM_OPT
+    /* Sum the instruments */
+    left=right=0;
+    for(i=1;sdata->trak[i][0]!=END;i++) {
+      smp=sdata->echo[i][(sdata->counter+1)%sdata->ekolen];
+
+      sdata->echo[i][sdata->counter%sdata->ekolen]=sdata->echo[i][(sdata->counter+1)%sdata->ekolen]*6/10;
+      if (sdata->off[i]>=0) {
+	smp+=sdata->instr[i][sdata->off[i]>>13];
+
+	if (sdata->eko[i])
+	  sdata->echo[i][sdata->counter%sdata->ekolen]=smp*2/10;
+
+	sdata->off[i]+=(sdata->plus[i]+sdata->base_speed);
+	sdata->plus[i]+=sdata->slide[i];
+	if ((sdata->off[i]>>13)>=sdata->len[i] || sdata->off[i]<0)
+	  sdata->off[i]=-1;
+      }
+
+      if (sdata->pola[i])
+	smp=(smp*(255^sdata->pola[i])>>8)+(sdata->prev[i]*sdata->pola[i]>>8);
+      sdata->prev[i]=smp;
+
+      smp=smp*sdata->vol[i]>>8;
+      left+=(255^sdata->pan[i])*smp>>8;
+      right+=sdata->pan[i]*smp>>8;
+    }
+
+    if (left<-98301)
+      left=-98301;
+    if(left>98301)
+      left=98301;
+    if (!interleave||channels==1)
+      dest[n]=(float)left/98301.;
+    else
+      dest[n*2]=(float)left/98301.;
+
+    if (channels==2) {
+      if(right<-98301)
+	right=-98301;
+      if(right>98301)
+	right=98301;
+      if (interleave) dest[n*2+1]=(float)right/98301.;
+      else dest[n+length]=(float)right/98301.;
+    }
+
+#else
+    // sum the instruments
+    left=right=0;
+    for (i=1;sdata->trak[i][0]!=END;i++) {
+
+      smp=sdata->echo[i][c1eko];
+
+      //fprintf(stderr,"ok %d\n",smp);
+
+      sdata->echo[i][ceko]=smp*19>>5;
+
+      if (sdata->off[i]>=0) {
+	smp+=sdata->instr[i][sdata->off[i]>>13];
+	//fprintf(stderr,"ok2 %d\n",smp);
+
+	if(sdata->eko[i])
+	  sdata->echo[i][ceko]=smp*13>>6;
+	
+	sdata->off[i]+=(sdata->plus[i]/sdata->base_freq);
+	sdata->plus[i]+=sdata->slide[i]*sdata->base_freq;
+	if ((sdata->off[i]>>13)>=sdata->len[i] || sdata->off[i]<0)
+	  sdata->off[i]=-1;
+      }
+
+      if (sdata->pola[i])
+	smp=(smp*(255^sdata->pola[i])>>8)+(sdata->prev[i]*sdata->pola[i]>>8);
+      sdata->prev[i]=smp;
+      //fprintf(stderr,"ok23 %d\n",smp);
+
+      smp=smp*sdata->vol[i]>>8;
+	//fprintf(stderr,"ok24 %d\n",smp);
+      left+=(255^sdata->pan[i])*smp>>8;
+      if (channels==2)
+	right+=sdata->pan[i]*smp>>8;
+    }
+    
+    if(left<-98301)
+      left=-98301;
+    else
+      if(left>98301)
+	left=98301;
+    if (!interleave||channels==1)
+      dest[n]=(float)(left*21>>6)/32767.;
+    else {
+      dest[n*2]=(float)(left*21>>6)/32767.;
+      
+    }
+    
+    if (channels==2) {
+      if(right<-98301)
+	right=-98301;
+      else
+	if(right>98301)
+	  right=98301;
+      if (interleave) dest[n*2+1]=(float)(right*21>>6)/32767.;
+      else dest[n+length]=(float)(right*21>>6)/32767.;
+    }
+    
+    //fprintf(stderr,"vals %d and %d, %f and %f\n",left,right,(float)(left*21>>6)/32767.,(float)(right*21>>6)/32767.);
+
+    ceko++;
+    if(ceko==sdata->ekolen)
+      ceko=0;
+	
+#endif
+
+
+  }
+}
+
+/* Make ADSR to instruments */
+static void adsr(_sdata *sdata, int a, int d, int s, int r, int mod, int swp, int ins, int wave, int wave_mod)
+{
+    int n,modulo=sdata->slen,id=0;
+    float  i=0,vol=0.0,dv,oh=0.0,op,ip=1,sweep;
+
+    if(!a) a=1;
+    if(!r) r=1;
+
+    if(wave==KOHINA)
+        modulo=sdata->global;
+
+    if(mod) /* We modulate! */
+	if (wave_mod==1)
+		op=mod/100.0*2.0*M_PI/(float)sdata->slen;
+	else
+	        op=(float)mod/100.0;
+    else
+        op=0;
+
+    sweep=(float)swp/1000.0/(float)sdata->slen;
+
+    dv=32767.0/(float)a;
+    for(n=0;n<a;n++,i+=ip,ip+=sweep,vol+=dv,oh+=op)
+	if (wave_mod!=1)
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+	else
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+
+    for(n=0;n<d;n++,i+=ip,ip+=sweep,vol-=dv,oh+=op)
+	if (wave_mod!=1)
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+	else
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+
+
+    for(n=0;n<s;n++,i+=ip,ip+=sweep,oh+=op)
+	if (wave_mod!=1) 
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+	else
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+
+    dv=vol/(float)r;
+
+    for(n=0;n<r;n++,i+=ip,ip+=sweep,vol-=dv,oh+=op)
+	if (wave_mod!=1)
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+	else
+	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+
+}
+
+/* Fix the fscking Windoze/DOS newlines */
+#ifndef TINY
+void cleanup(char *s)
+{
+    char    *d=strdup(s);
+
+    for(;*d;d++)
+        if(*d!='\r' && *d!=' ')
+            *s++=*d;
+    *s=0;
+}
+#endif
+
+
+static void syna_deinit(_sdata *sdata) {
+  register int n;
+
+  if (sdata==NULL) return;
+
+  for(n=0;n<WAVES;n++) {
+    if (sdata->aalto[n]!=NULL) weed_free(sdata->aalto[n]);
+  }
+  for(n=0;n<INSTR;n++) {
+    if (sdata->echo[n]!=NULL) weed_free(sdata->echo[n]);
+  }
+  if (sdata->module!=NULL) weed_free(sdata->module);
+
+  weed_free(sdata);
+}
+
+
+/////////////////////////////////////////////
+
+
+int fourk_deinit(weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
+  if (sdata!=NULL) syna_deinit(sdata);
+  weed_set_voidptr_value(inst,"plugin_internal",NULL);
+  return WEED_NO_ERROR;
+}
+
+
+
+int fourk_init (weed_plant_t *inst) {
+  int error,retval;
+  int rate;
+
+  _sdata *sdata;
+
+  weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  char tune[MAX_TUNELEN];
+
+  snprintf(tune,MAX_TUNELEN-4,"%s%s",TUNE_DIR,tunes[weed_get_int_value(in_params[0],"value",&error)]);
+
+  weed_free(in_params);
+
+  sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  rate=weed_get_int_value(out_channel,"audio_rate",&error);
+
+  if ((retval=syna_init(sdata,rate))!=WEED_NO_ERROR) {
+#ifdef DEBUG
+    fprintf(stderr,"4k init failed\n");
+#endif
+    fourk_deinit(inst);
+    return retval;
+  }
+
+#ifdef DEBUG
+  fprintf(stderr,"4k: loading tune %s\n",tune);
+#endif
+
+  if ((retval=syna_load(sdata,tune))!=WEED_NO_ERROR) {
+
+    sprintf(tune+strlen(tune),"%s",".txt");
+
+#ifdef DEBUG
+  fprintf(stderr,"4k: loading tune %s\n",tune);
+#endif
+
+    if ((retval=syna_load(sdata,tune))!=WEED_NO_ERROR) {
+
+      fourk_deinit(inst);
+#ifdef DEBUG
+      fprintf(stderr,"4k load failed\n");
+#endif
+      return retval;
+    }
+  }
+
+  //set_tempo(sdata,136.); // bpm: maybe 8. to 263. ?
+  //set_base_freq(sdata,272.); // 145. to 400.
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+
+int fourk_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  int chans,nsamps,inter;
+
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+
+  float *dst=weed_get_voidptr_value(out_channel,"audio_data",&error);
+
+  double tempo=weed_get_double_value(in_params[1],"value",&error);
+  double bfreq=weed_get_double_value(in_params[2],"value",&error);
+
+  _sdata *sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  register int i;
+
+  weed_free(in_params);
+
+  chans=weed_get_int_value(out_channel,"audio_channels",&error);
+  nsamps=weed_get_int_value(out_channel,"audio_data_length",&error);
+  inter=weed_get_boolean_value(out_channel,"audio_interleaf",&error);
+  //rate=weed_get_int_value(out_channel,"audio_rate",&error);
+
+  for (i=0;i<NCHANNELS;i++) {
+    set_live_row(sdata,i,(rand()%(sdata->maxtracks*1000-1))/1000.f+1.);  // 2nd val can be 2 (?) to npat (?)
+  }
+
+  set_tempo(sdata,tempo*255.+8.); // bpm: maybe 8. to 263. ?
+  set_base_freq(sdata,bfreq*255.-128.); // 145. to 400.
+
+  syna_play(sdata,dst,nsamps,chans,inter); // dlen is number of samps....does interleaved
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info;
+  DIR *dir=NULL;
+  struct dirent *dirent;
+  size_t dlen;
+  int tcount=0;
+
+  // make list of tunes
+  // scan entries in the ./data/fourklives/songs directory
+  dir=opendir(TUNE_DIR);
+  if (dir==NULL) return NULL;
+
+  while (1) {
+    if (tcount==MAX_TUNES-1) break;
+    dirent=readdir(dir);
+    if (dirent==NULL) break;
+    dlen=strlen(dirent->d_name);
+    if (!strncmp(dirent->d_name,"..",dlen)) continue;
+    if (dlen>4 && !strcmp(dirent->d_name+dlen-4,".txt")) dlen-=4;
+    tunes[tcount++]=strndup(dirent->d_name,dlen);
+  }
+
+  closedir(dir);
+
+  tunes[tcount]=NULL;
+
+  plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+
+  if (plugin_info!=NULL) {
+    weed_plant_t *out_chantmpls[2];
+    weed_plant_t *in_params[NCHANNELS+4]; // tune name + channel rows + tempo + base_freq + NULL
+    weed_plant_t *filter_class;
+
+  
+    register int i;
+    
+    in_params[0]=weed_string_list_init("tune_name","_Tune",0,(const char ** const)tunes);
+    weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
+
+    in_params[1]=weed_float_init("tempo","_Tempo",.5,0.,1.);
+    in_params[2]=weed_float_init("bfreq","Base _Frequency",.5,0.,1.);
+
+
+    for (i=3;i<NCHANNELS+3;i++) {
+      // TODO - unique name
+      in_params[i]=weed_float_init("cparam","cparam",.5,0.,1.);
+    }
+
+    in_params[i]=NULL;
+
+    out_chantmpls[0]=weed_audio_channel_template_init("out channel 0",0);
+    out_chantmpls[1]=NULL;
+
+    filter_class=weed_filter_class_init("fourKlives","salsaman, anti and marq",1,0,&fourk_init,&fourk_process,
+						      &fourk_deinit,NULL,out_chantmpls,in_params,NULL);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+
+
+
+
+void weed_desetup(void) {
+  register int i;
+  for (i=0;tunes[i]!=NULL;i++) weed_free(tunes[i]);
+}

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/frei0r.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/frei0r.c Changed

@@ -1,10 +1,10 @@
 /* Frei0r wrapper for Weed
-   author: Salsaman (G. Finch) <salsaman@xs4all.nl,salsaman@gmail.com>
+   author: Salsaman (G. Finch) <salsaman@gmail.com>
 
    Released under the Lesser Gnu Public License (LGPL) 3 or later
    See www.gnu.org for details
 
- (c) 2005 - 2011, Salsaman
+   (c) 2005 - 2012, Salsaman
 */
 
 
@@ -25,12 +25,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -42,14 +40,16 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+
 /////////////////////////////////////////////////////////////
 typedef f0r_instance_t (*f0r_construct_f)(unsigned int width, unsigned int height);
 typedef void (*f0r_destruct_f)(f0r_instance_t instance);
@@ -66,8 +66,15 @@
 typedef void (*f0r_get_param_value_f)(f0r_instance_t *instance, f0r_param_t *param, int param_index);
 #endif
 
-// TODO
-#define MAX_PATH 4096
+#include <limits.h>
+
+#ifndef PATH_MAX
+#ifdef MAX_PATH
+#define PATH_MAX MAX_PATH
+#else
+#define PATH_MAX 4096
+#endif
+#endif
 
 
 static void getenv_piece(char * target, size_t tlen, char *envvar, int num) {
@@ -224,7 +231,7 @@
     f0r_update=weed_get_voidptr_value(filter,"plugin_f0r_update",&error);
     out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
     in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
-   (*f0r_update)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
+    (*f0r_update)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
     weed_free(out_channels);
     weed_free(in_channels);
     break;
@@ -240,7 +247,7 @@
     f0r_update2=weed_get_voidptr_value(filter,"plugin_f0r_update2",&error);
     out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
     in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
-   (*f0r_update2)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),weed_get_voidptr_value(in_channels[1],"pixel_data",&error),weed_get_voidptr_value(in_channels[2],"pixel_data",&error),weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
+    (*f0r_update2)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),weed_get_voidptr_value(in_channels[1],"pixel_data",&error),weed_get_voidptr_value(in_channels[2],"pixel_data",&error),weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
     weed_free(out_channels);
     weed_free(in_channels);
     break;
@@ -270,18 +277,18 @@
 
     int finished=0;
 
-    char vdir1[MAX_PATH]="/usr/lib/frei0r-1/";
-    char vdir2[MAX_PATH]="/usr/local/lib/frei0r-1/";
-    char vdir3[MAX_PATH];
+    char vdir1[PATH_MAX]="/usr/lib/frei0r-1/";
+    char vdir2[PATH_MAX]="/usr/local/lib/frei0r-1/";
+    char vdir3[PATH_MAX];
 
-    char dir1[MAX_PATH],dir2[MAX_PATH],dir3[MAX_PATH];
-    char plug1[MAX_PATH],plug2[MAX_PATH],plug3[MAX_PATH];
+    char dir1[PATH_MAX],dir2[PATH_MAX],dir3[PATH_MAX];
+    char plug1[PATH_MAX],plug2[PATH_MAX],plug3[PATH_MAX];
 
     struct dirent *vdirent=NULL,*dirent;
 
-    char homedir[MAX_PATH];
+    char homedir[PATH_MAX];
 
-    char vendor_name[MAX_PATH],plugin_name[MAX_PATH],weed_name[MAX_PATH];
+    char vendor_name[PATH_MAX],plugin_name[PATH_MAX],weed_name[PATH_MAX];
 
     DIR *curvdir=NULL,*curdir=NULL;
 
@@ -310,8 +317,8 @@
     int is_unstable;
 
 #ifdef CAN_GET_DEF
-  f0r_instance_t f0r_inst;
-  f0r_get_param_value_f f0r_get_param_value=NULL;
+    f0r_instance_t f0r_inst;
+    f0r_get_param_value_f f0r_get_param_value=NULL;
 #endif
 
     char *fpp=getenv("FREI0R_PATH");
@@ -327,8 +334,8 @@
       vdirval=10;
     }
     else {
-      snprintf(homedir,MAX_PATH,"%s",getenv("HOME"));
-      snprintf (vdir3,MAX_PATH,"%s/frei0r-1/",homedir);
+      snprintf(homedir,PATH_MAX,"%s",getenv("HOME"));
+      snprintf (vdir3,PATH_MAX,"%s/frei0r-1/",homedir);
     }
 
     while (vdirval<6||vdirval>9) {
@@ -357,8 +364,8 @@
       }
 
       if (vdirval>9) {
-	getenv_piece(vdir1,MAX_PATH,fpp,vdirval-10);
-	if (!strlen(vdir1)) {
+	getenv_piece(vdir1,PATH_MAX,fpp,vdirval-10);
+	if (!strlen(vdir1)||vdir1==NULL) {
 	  vdirval=6;
 	  break;
 	}
@@ -371,27 +378,27 @@
       
       weed_memset(vendor_name,0,1);
 	
-	do {
+      do {
 
-	  snprintf(dir1,MAX_PATH,"%s/%s",vdir1,vendor_name);
+	snprintf(dir1,PATH_MAX,"%s/%s",vdir1,vendor_name);
 
-	  if (vdirval<10) {
-	    snprintf(dir2,MAX_PATH,"%s/%s",vdir2,vendor_name);
-	    snprintf(dir3,MAX_PATH,"%s/%s",vdir3,vendor_name);
-	  }
+	if (vdirval<10) {
+	  snprintf(dir2,PATH_MAX,"%s/%s",vdir2,vendor_name);
+	  snprintf(dir3,PATH_MAX,"%s/%s",vdir3,vendor_name);
+	}
 
-	  vdirent=readdir(curvdir);
+	vdirent=readdir(curvdir);
 	  
-	  if (vdirent==NULL) {
-	    closedir(curvdir);
-	    curvdir=NULL;
+	if (vdirent==NULL) {
+	  closedir(curvdir);
+	  curvdir=NULL;
 	  vdirval++;
 	  break;
 	}
 
 	if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue;
 
-	snprintf(vendor_name,MAX_PATH,"%s",vdirent->d_name);
+	snprintf(vendor_name,PATH_MAX,"%s",vdirent->d_name);
 
 	if (vdirval==1) {
 	  curdir=opendir(dir3);
@@ -421,13 +428,13 @@
 
 	  if (!strncmp(dirent->d_name,"..",strlen(dirent->d_name))) continue;
 	  
-	  snprintf(plugin_name,MAX_PATH,"%s",dirent->d_name);
+	  snprintf(plugin_name,PATH_MAX,"%s",dirent->d_name);
 
-	  snprintf(plug1,MAX_PATH,"%s/%s",dir1,plugin_name);
+	  snprintf(plug1,PATH_MAX,"%s/%s",dir1,plugin_name);
 
 	  if (vdirval<10) {
-	    snprintf(plug2,MAX_PATH,"%s/%s",dir2,plugin_name);
-	    snprintf(plug3,MAX_PATH,"%s/%s",dir3,plugin_name);
+	    snprintf(plug2,PATH_MAX,"%s/%s",dir2,plugin_name);
+	    snprintf(plug3,PATH_MAX,"%s/%s",dir3,plugin_name);
 	    
 	    handle=dlopen(plug3,RTLD_NOW);
 	    if ((handle!=NULL&&(vdirval>1))||(handle==NULL&&vdirval==1)) {
@@ -613,13 +620,13 @@
 	  }
 	  
 	  num_weed_params=0;
+	  weed_free(pal);
 
 #ifdef CAN_GET_DEF
 	  // try to get defaults
 	  if ((f0r_inst=(*f0r_construct) (640,480))==NULL) {
 	    (*f0r_deinit)();
 	    dlclose(handle);
-	    weed_free(pal);
 	    weed_free(out_chantmpls);
 	    if (in_chantmpls!=NULL) weed_free(in_chantmpls);
 	    continue;
@@ -633,7 +640,6 @@
 #endif
 	      (*f0r_deinit)();
 	      dlclose(handle);
-	      weed_free(pal);
 	      weed_free(out_chantmpls);
 	      if (in_chantmpls!=NULL) weed_free(in_chantmpls);
 	      continue;
@@ -644,7 +650,6 @@
 	      f0r_destruct(f0r_inst);
 	      (*f0r_deinit)();
 	      dlclose(handle);
-	      weed_free(pal);
 	      weed_free(out_chantmpls);
 	      if (in_chantmpls!=NULL) weed_free(in_chantmpls);
 	      continue;
@@ -788,7 +793,6 @@
 #endif
 		(*f0r_deinit)();
 		dlclose(handle);
-		weed_free(pal);
 		weed_free(out_chantmpls);
 		if (in_chantmpls!=NULL) weed_free(in_chantmpls);
 		if (in_params!=NULL) weed_free(in_params);
@@ -809,10 +813,12 @@
 	  f0r_destruct(f0r_inst);
 #endif
 
-	  snprintf(weed_name,MAX_PATH,"Frei0r: %s",f0rinfo.name);
+	  snprintf(weed_name,PATH_MAX,"Frei0r: %s",f0rinfo.name);
 	  pversion=f0rinfo.major_version*1000+f0rinfo.minor_version;
 
-	  filter_class=weed_filter_class_init(weed_name,(char *)f0rinfo.author,pversion,0,&frei0r_init,&frei0r_process,&frei0r_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+	  filter_class=weed_filter_class_init(weed_name,"Frei0r developers",pversion,0,&frei0r_init,&frei0r_process,&frei0r_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+
+	  weed_set_string_value(filter_class,"extra_authors",(char *)f0rinfo.author);
 
 	  if (is_unstable) {
 	    weed_set_boolean_value(filter_class,"plugin_unstable",WEED_TRUE);
@@ -830,7 +836,6 @@
 
 	  if (f0rinfo.explanation!=NULL) weed_set_string_value(filter_class,"description",(char *)f0rinfo.explanation);
 	  num_filters++;
-	  weed_free(pal);
 	  weed_free(out_chantmpls);
 	  if (in_chantmpls!=NULL) weed_free(in_chantmpls);
 	  if (in_params!=NULL) weed_free(in_params);
@@ -858,7 +863,7 @@
 	// end vendor dir
       } while (vdirent!=NULL);
       if (curdir!=NULL) closedir(curdir);
-      }
+    }
     // end frei0r dirs
     if (curvdir!=NULL) closedir(curvdir);
 
@@ -867,7 +872,10 @@
     dup2(new_stderr,2);
 #endif
 
-    if (num_filters==0) return NULL;
+    if (num_filters==0) {
+      fprintf(stderr,"No frei0r plugins found; if you have them installed please set the FREI0R_PATH environment variable to point to them.\n");
+      return NULL;
+    }
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.am -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.am Changed

@@ -8,23 +8,26 @@
 shared_ldflags = -dynamiclib -module -avoid-version --tag=disable-static
 shared_cflags = -fno-common
 else
-shared_ldflags = -shared -fPIC -DPIC -Wl,-Bsymbolic -module -avoid-version --tag=disable-static
+shared_ldflags = -shared -fPIC -DPIC -no-undefined -module -avoid-version --tag=disable-static
 shared_cflags = -fPIC -DPIC
 endif
 
+
+
 if HAVE_SYSTEM_WEED
-AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ @WEED_UTILS_LIBS@
+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ 
 weed_CFLAGS = -DHAVE_SYSTEM_WEED
 else
-AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ ../../../libweed/libweed-utils.la
-weed_CFLAGS = 
+if IS_MINGW
+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@ -D IS_MINGW=1
+else
+AM_LDFLAGS = $(shared_ldflags) @GTK_LIBS@
+endif
+weed_CFLAGS =
 endif
 
 if HAVE_SYSTEM_WEED_PLUGIN_UTILS
-AM_LDFLAGS += @WEED_PLUGIN_UTILS_LIBS@
-weed_CFLAGS += -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
-else
-AM_LDFLAGS += ../../../libweed/libweed-plugin-utils.la
+weed_CFLAGS = -DHAVE_SYSTEM_WEED_PLUGIN_UTILS
 endif
 
 if HAVE_SYSTEM_WEED_COMPAT
@@ -39,8 +42,7 @@
 vjack_rcv_la_LDFLAGS = -ljack $(AM_LDFLAGS)
 endif
 
-#haar_analyser_la_SOURCES = haar_analyser.cpp
-#	haar_analyser.la 
+haar_analyser_la_SOURCES = haar_analyser.cpp haar_analyser.h
 
 
 fxpluginslib_LTLIBRARIES = gdk_fast_resize.la \
@@ -49,6 +51,7 @@
 	scribbler.la \
 	puretext.la \
 	mask_overlay.la \
+	haar_analyser.la \
 	$(vjack_libs) 
 
 
@@ -56,8 +59,8 @@
 
 install-data-local:
 	mkdir -p "$(DESTDIR)$(fxpluginslibdir)"
-	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)"
-	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)"
+	cp -rf data/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/data/"
+	cp -rf icons/ "$(DESTDIR)$(fxpluginslibdir)" && chmod -R a+r "$(DESTDIR)$(fxpluginslibdir)/icons/"
 	$(MAKE) -i install-data-local-remove-vcs-files
 
 install-data-local-remove-vcs-files:

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/Makefile.in Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/compositor.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/compositor.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/gdk_fast_resize.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/gdk_fast_resize.c Changed

@@ -10,14 +10,19 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../../libweed/weed.h"
 #include "../../../libweed/weed-palettes.h"
 #include "../../../libweed/weed-effects.h"
+#endif
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h>
+#else
 #include "../../../libweed/weed-plugin.h"
 #endif
 
+
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
@@ -27,13 +32,9 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
-#else
-#include "../../../libweed/weed-utils.h" // optional
-#include "../../../libweed/weed-plugin-utils.h" // optional
-#endif
+#include "../weed-utils-code.c" // optional
+#include "../weed-plugin-utils.c" // optional
+
 
 /////////////////////////////////////////////////////////////

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/haar_analyser.cpp Added

@@ -0,0 +1,706 @@
+// haar_analyser.cpp
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+// based partly on earlier code:
+
+/***************************************************************************
+    imgSeek ::  Haar 2d transform implemented in C/C++ to speed things up
+                             -------------------
+    begin                : Fri Jan 17 2003
+    email                : nieder|at|mail.ru
+    Time-stamp:            <05/01/30 19:58:56 rnc>
+    ***************************************************************************
+    *    Wavelet algorithms, metric and query ideas based on the paper        *
+    *    Fast Multiresolution Image Querying                                  *
+    *    by Charles E. Jacobs, Adam Finkelstein and David H. Salesin.         *
+    *    <http://www.cs.washington.edu/homes/salesin/abstracts.html>          *
+    ***************************************************************************
+
+    Copyright (C) 2003 Ricardo Niederberger Cabral
+
+    Clean-up and speed-ups by Geert Janssen <geert at ieee.org>, Jan 2006:
+    - introduced names for various `magic' numbers
+    - made coding style suitable for Emacs c-mode
+    - expressly doing constant propagation by hand (combined scalings)
+    - preferring pointer access over indexed access of arrays
+    - introduced local variables to avoid expression re-evaluations
+    - took out all dynamic allocations
+    - completely rewrote calcHaar and eliminated truncq()
+    - better scheme of introducing sqrt(0.5) factors borrowed from
+      FXT package: author Joerg Arndt, email: arndt@jjj.de,
+      http://www.jjj.de/
+    - separate processing per array: better cache behavior
+    - do away with all scaling; not needed except for DC component
+
+    To do:
+    - the whole Haar transform should be done using fixpoints
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../../libweed/weed.h"
+#include "../../../libweed/weed-palettes.h"
+#include "../../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "../weed-utils-code.c" // optional
+#include "../weed-plugin-utils.c" // optional
+
+
+/////////////////////////////////////////////////////////////
+
+
+/* C Includes */
+#include <math.h> 
+#include <stdio.h> 
+#include <stdlib.h> 
+#include <string.h>
+
+#include <gdk/gdk.h>
+
+
+/* imgSeek Includes */
+#include "haar_analyser.h"
+
+static unsigned short UNCLAMP_Y[256];
+static unsigned short UNCLAMP_UV[256];
+
+// unclamped Y'CbCr
+static gint Y_Ru[256];
+static gint Y_Gu[256];
+static gint Y_Bu[256];
+static gint Cb_Ru[256];
+static gint Cb_Gu[256];
+static gint Cb_Bu[256];
+static gint Cr_Ru[256];
+static gint Cr_Gu[256];
+static gint Cr_Bu[256];
+
+
+static void init_luma_arrays(void) {
+  register int i;
+
+  for (i = 0; i < 256; i++) {
+    Y_Ru[i] = myround(0.299 * (gdouble)i
+		      * (1<<FP_BITS));
+    Y_Gu[i] = myround(0.587 * (gdouble)i 
+		      * (1<<FP_BITS));
+    Y_Bu[i] = myround(0.114 * (gdouble)i 
+                      * (1<<FP_BITS));
+
+    
+    Cb_Bu[i] = myround(-0.168736 * (gdouble)i 
+		       * (1<<FP_BITS));
+    Cb_Gu[i] = myround(-0.331264 * (gdouble)i 
+		       * (1<<FP_BITS));
+    Cb_Ru[i] = myround((0.500 * (gdouble)i
+			+ 128.) * (1<<FP_BITS));
+
+    Cr_Bu[i] = myround(0.500 * (gdouble)i
+		       * (1<<FP_BITS));
+    Cr_Gu[i] = myround(-0.418688 * (gdouble)i 
+		       * (1<<FP_BITS));
+    Cr_Ru[i] = myround((-0.081312 * (gdouble)i 
+			+ 128.) * (1<<FP_BITS));
+  }
+
+  for (i=0;i<17;i++) {
+    UNCLAMP_Y[i]=UNCLAMP_UV[i]=0;
+  }
+
+  for (i=17;i<235;i++) {
+    UNCLAMP_Y[i]=(int)((float)(i-16.)/219.*255.+.5);
+    UNCLAMP_UV[i]=(int)((float)(i-16.)/224.*255.+.5);
+  }
+
+  for (i=235;i<256;i++) {
+    UNCLAMP_Y[i]=UNCLAMP_UV[i]=255;
+    if (i<241) UNCLAMP_UV[i]=(int)((float)(i-16.)/224.*255.+.5);
+  }
+
+}
+
+#define RGB_2_Y(a, b, c)			\
+  do { \
+    int i; \
+    register short x; \
+    \
+    for (i = 0; i < NUM_PIXELS_SQUARED; i++) { \
+      Unit Y, I, Q; \
+      if ((x=((Y_Ru[(int)a[i]]+Y_Gu[(int)b[i]]+Y_Bu[(int)(int)c[i]])>>FP_BITS))>255) x=255; \
+      Y=x<0?0:x; \
+      if ((x=((Cr_Ru[(int)a[i]]+Cr_Gu[(int)b[i]]+Cr_Bu[(int)c[i]])>>FP_BITS))>255) x=255; \
+      I=x<0?0:x; \
+      if ((x=((Cb_Ru[(int)a[i]]+Cb_Gu[(int)b[i]]+Cb_Bu[(int)c[i]])>>FP_BITS))>255) x=255; \
+      Q=x<0?0:x; \
+      a[i] = Y; \
+      b[i] = I; \
+      c[i] = Q; \
+    } \
+  } while(0)
+
+
+// Do the Haar tensorial 2d transform itself.
+// Here input is RGB data [0..255] in Unit arrays
+// Computation is (almost) in-situ.
+static void
+haar2D(Unit a[])
+{
+  int i;
+  Unit t[NUM_PIXELS >> 1];
+
+  // scale by 1/sqrt(128) = 0.08838834764831843:
+  /*
+  for (i = 0; i < NUM_PIXELS_SQUARED; i++)
+    a[i] *= 0.08838834764831843;
+  */
+
+  // Decompose rows:
+  for (i = 0; i < NUM_PIXELS_SQUARED; i += NUM_PIXELS) {
+    int h, h1;
+    Unit C = 1;
+
+    for (h = NUM_PIXELS; h > 1; h = h1) {
+      int j1, j2, k;
+
+      h1 = h >> 1;		// h = 2*h1
+      C *= 0.7071;		// 1/sqrt(2)
+      for (k = 0, j1 = j2 = i; k < h1; k++, j1++, j2 += 2) {
+        int j21 = j2+1;
+
+        t[k]  = (a[j2] - a[j21]) * C;
+        a[j1] = (a[j2] + a[j21]);
+      }
+      // Write back subtraction results:
+      memcpy(a+i+h1, t, h1*sizeof(a[0]));
+    }
+    // Fix first element of each row:
+    a[i] *= C;	// C = 1/sqrt(NUM_PIXELS)
+  }
+
+  // scale by 1/sqrt(128) = 0.08838834764831843:
+  /*
+  for (i = 0; i < NUM_PIXELS_SQUARED; i++)
+    a[i] *= 0.08838834764831843;
+  */
+
+  //q Decompose columns:
+  for (i = 0; i < NUM_PIXELS; i++) {
+    Unit C = 1;
+    int h, h1;
+
+    for (h = NUM_PIXELS; h > 1; h = h1) {
+      int j1, j2, k;
+
+      h1 = h >> 1;
+      C *= 0.7071;		// 1/sqrt(2) = 0.7071
+      for (k = 0, j1 = j2 = i; k < h1;
+	   k++, j1 += NUM_PIXELS, j2 += 2*NUM_PIXELS) {
+        int j21 = j2+NUM_PIXELS;
+
+        t[k]  = (a[j2] - a[j21]) * C;
+        a[j1] = (a[j2] + a[j21]);
+      }
+      // Write back subtraction results:
+      for (k = 0, j1 = i+h1*NUM_PIXELS; k < h1; k++, j1 += NUM_PIXELS)
+        a[j1]=t[k];
+    }
+    // Fix first element of each column:
+    a[i] *= C;
+  }
+}
+
+/* Do the Haar tensorial 2d transform itself.
+   Here input is unclamped YUV data [0..255] in Unit arrays.
+   Results are available in a, b, and c.
+   Fully inplace calculation; order of result is interleaved though,
+   but we don't care about that.
+*/
+void
+transform(Unit* a, Unit* b, Unit* c, int pal)
+{
+  if (pal==WEED_PALETTE_RGB24) {
+    RGB_2_Y(a, b, c);
+  }
+  else if (pal==WEED_PALETTE_BGR24) {
+    RGB_2_Y(c, b, a);
+  }
+
+  haar2D(a);
+  haar2D(b);
+  haar2D(c);
+
+  /* Reintroduce the skipped scaling factors: */
+  a[0] /= 2 * NUM_PIXELS_SQUARED;
+  b[0] /= 2 * NUM_PIXELS_SQUARED;
+  c[0] /= 2 * NUM_PIXELS_SQUARED;
+}
+
+
+// Find the NUM_COEFS largest numbers in cdata[] (in magnitude that is)
+// and store their indices in sig[].
+inline static void
+get_m_largests(Unit *cdata, Idx *sig, int num_coefs)
+{
+  int cnt, i;
+  valStruct val;
+  valqueue vq;			// dynamic priority queue of valStruct's
+
+  // Could skip i=0: goes into separate avgl
+
+  // Fill up the bounded queue. (Assuming NUM_PIXELS_SQUARED > NUM_COEFS)
+  for (i = 1; i < num_coefs+1; i++) {
+    val.i = i;
+    val.d = ABS(cdata[i]);
+    vq.push(val);
+  }
+  // Queue is full (size is NUM_COEFS)
+
+  for (/*i = NUM_COEFS+1*/; i < NUM_PIXELS_SQUARED; i++) {
+    val.d = ABS(cdata[i]);
+
+    if (val.d > vq.top().d) {
+      // Make room by dropping smallest entry:
+      vq.pop();
+      // Insert val as new entry:
+      val.i = i;
+      vq.push(val);
+    }
+    // else discard: do nothing
+  }
+
+  // Empty the (non-empty) queue and fill-in sig:
+  cnt=0;
+  do {
+    int t;
+
+    val = vq.top();
+    t = (cdata[val.i] <= 0);	/* t = 0 if pos else 1 */
+    /* i - 0 ^ 0 = i; i - 1 ^ 0b111..1111 = 2-compl(i) = -i */
+    sig[cnt++] = (val.i - t) ^ -t; // never 0
+    vq.pop();
+  } while(!vq.empty());
+  // Must have cnt==NUM_COEFS here.
+}
+
+// Determines a total of NUM_COEFS positions in the image that have the
+// largest magnitude (absolute value) in color value. Returns linearized
+// coordinates in sig1, sig2, and sig3. avgl are the [0,0] values.
+// The order of occurrence of the coordinates in sig doesn't matter.
+// Complexity is 3 x NUM_PIXELS^2 x 2log(NUM_COEFS).
+int
+calcHaar(Unit *cdata1, Unit *cdata2, Unit *cdata3,
+	 Idx *sig1, Idx *sig2, Idx *sig3, double *avgl, int num_coefs)
+{
+  avgl[0]=cdata1[0];
+  avgl[1]=cdata2[0];
+  avgl[2]=cdata3[0];
+
+  // Color channel 1:
+  get_m_largests(cdata1, sig1, num_coefs);
+
+  // Color channel 2:
+  get_m_largests(cdata2, sig2, num_coefs);
+
+  // Color channel 3:
+  get_m_largests(cdata3, sig3, num_coefs);
+
+  return 1;
+}
+
+
+
+///////////////////////////////////////
+
+
+inline G_GNUC_CONST int pl_gdk_rowstride_value (int rowstride) {
+  return (rowstride + 3) & ~3;
+}
+
+inline int G_GNUC_CONST pl_gdk_last_rowstride_value (int width, int nchans) {
+  return width*(((nchans<<3)+7)>>3);
+}
+
+static void plugin_free_buffer (guchar *pixels, gpointer data) {
+  return;
+}
+
+
+static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf) {
+  int channels=has_alpha?4:3;
+  int rowstride=pl_gdk_rowstride_value(width*channels);
+  return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
+}
+
+
+
+static GdkPixbuf *pl_channel_to_pixbuf (weed_plant_t *channel) {
+  int error;
+  GdkPixbuf *pixbuf;
+  int palette=weed_get_int_value(channel,"current_palette",&error);
+  int width=weed_get_int_value(channel,"width",&error);
+  int height=weed_get_int_value(channel,"height",&error);
+  int irowstride=weed_get_int_value(channel,"rowstrides",&error);
+  int rowstride,orowstride;
+  guchar *pixel_data=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error),*pixels,*end;
+  gboolean cheat=FALSE;
+  gint n_channels;
+
+  switch (palette) {
+  case WEED_PALETTE_RGB24:
+  case WEED_PALETTE_BGR24:
+  case WEED_PALETTE_YUV888:
+    if (irowstride==pl_gdk_rowstride_value(width*3)) {
+      pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, FALSE, 8, width, height, pixel_data);
+      cheat=TRUE;
+    }
+    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
+    n_channels=3;
+    break;
+  case WEED_PALETTE_RGBA32:
+  case WEED_PALETTE_BGRA32:
+  case WEED_PALETTE_YUVA8888:
+    if (irowstride==pl_gdk_rowstride_value(width*4)) {
+      pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, TRUE, 8, width, height, pixel_data);
+      cheat=TRUE;
+    }
+    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+    n_channels=4;
+    break;
+  default:
+    return NULL;
+  }
+  pixels=gdk_pixbuf_get_pixels (pixbuf);
+  orowstride=gdk_pixbuf_get_rowstride(pixbuf);
+  
+  if (irowstride>orowstride) rowstride=orowstride;
+  else rowstride=irowstride;
+  end=pixels+orowstride*height;
+
+  if (!cheat) {
+    gboolean done=FALSE;
+    for (;pixels<end&&!done;pixels+=orowstride) {
+      if (pixels+orowstride>=end) {
+	orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
+	done=TRUE;
+      }
+      weed_memcpy(pixels,pixel_data,rowstride);
+      if (rowstride<orowstride) weed_memset (pixels+rowstride,0,orowstride-rowstride);
+      pixel_data+=irowstride;
+    }
+  }
+  return pixbuf;
+}
+
+
+
+static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf) {
+  
+  int error;
+  int rowstride=gdk_pixbuf_get_rowstride(pixbuf);
+  int width=gdk_pixbuf_get_width(pixbuf);
+  int height=gdk_pixbuf_get_height(pixbuf);
+  int n_channels=gdk_pixbuf_get_n_channels(pixbuf);
+  guchar *in_pixel_data=(guchar *)gdk_pixbuf_get_pixels(pixbuf);
+  int out_rowstride=weed_get_int_value(channel,"rowstrides",&error);
+  guchar *dst=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  register int i;
+
+  if (rowstride==pl_gdk_last_rowstride_value(width,n_channels)&&rowstride==out_rowstride) {
+    weed_memcpy(dst,in_pixel_data,rowstride*height);
+    return FALSE;
+  }
+
+  for (i=0;i<height;i++) {
+    if (i==height-1) rowstride=pl_gdk_last_rowstride_value(width,n_channels);
+    weed_memcpy(dst,in_pixel_data,rowstride);
+    in_pixel_data+=rowstride;
+    dst+=out_rowstride;
+  }
+
+  return FALSE;
+}
+
+
+
+
+
+//////////////////////////
+
+
+typedef struct {
+  int coefs;
+  Idx *sig1;
+  Idx *sig2;
+  Idx *sig3;
+} _sdata;
+
+
+
+static int make_sigs(_sdata *sdata, int num_coefs) {
+
+
+  sdata->sig1=(Idx *)weed_malloc(num_coefs*sizeof(Idx));
+  if (sdata->sig1==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  sdata->sig2=(Idx *)weed_malloc(num_coefs*sizeof(Idx));
+  if (sdata->sig2==NULL) {
+    weed_free(sdata->sig1);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  sdata->sig3=(Idx *)weed_malloc(num_coefs*sizeof(Idx));
+  if (sdata->sig3==NULL) {
+    weed_free(sdata->sig1);
+    weed_free(sdata->sig2);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  sdata->coefs=num_coefs;
+  return WEED_NO_ERROR;
+}
+
+
+////////////////////////////////////////////////////////////
+
+
+int haar_init (weed_plant_t *inst) {
+  int error,retval;
+  _sdata *sdata;
+  weed_plant_t **in_params=(weed_plant_t **)weed_get_plantptr_array(inst,"in_parameters",&error);
+  int num_coefs=weed_get_int_value(in_params[0],"value",&error);
+
+  weed_free(in_params);
+
+  sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  if ((retval=make_sigs(sdata,num_coefs))!=WEED_NO_ERROR) return retval; 
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int haar_deinit (weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  if (sdata!=NULL) {
+    weed_free(sdata->sig1);
+    weed_free(sdata->sig2);
+    weed_free(sdata->sig3);
+    weed_free(sdata);
+  }
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int haar_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t *channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  unsigned char **orig_src,*src;
+  int width=weed_get_int_value(channel,"width",&error);
+  int height=weed_get_int_value(channel,"height",&error);
+  int pal=weed_get_int_value(channel,"current_palette",&error);
+  int irowstride=weed_get_int_value(channel,"rowstrides",&error);
+  weed_plant_t **out_params=(weed_plant_t **)weed_get_plantptr_array(inst,"out_parameters",&error);
+  weed_plant_t **in_params=(weed_plant_t **)weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  int psize=4;
+  int clamped=0;
+
+  int *orig_rows,orowstride,nplanes,hmax;
+
+  int num_coefs=weed_get_int_value(in_params[0],"value",&error);
+
+  unsigned char *end=src+height*irowstride;
+  register int i,j,k;
+
+  int cn = 0;
+  Unit cdata1[NUM_PIXELS_SQUARED];
+  Unit cdata2[NUM_PIXELS_SQUARED];
+  Unit cdata3[NUM_PIXELS_SQUARED];
+
+  double avgl[3];
+
+  GError **gerror;
+
+  GdkPixbuf *new_pixbuf;
+  GdkPixbuf *out_pixbuf=NULL;
+
+  weed_free(in_params);
+
+  if (weed_plant_has_leaf(channel,"YUV_clamping")&&
+      (weed_get_int_value(channel,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED))
+    clamped=1;
+
+  if (pal==WEED_PALETTE_YUV888) psize=3;
+  
+
+  // resize to NUM_PIXELS x NUM_PIXELS
+
+  if (width != NUM_PIXELS || height != NUM_PIXELS) {
+
+    GdkPixbuf *in_pixbuf=pl_channel_to_pixbuf(channel);
+
+    GdkInterpType up_interp=GDK_INTERP_HYPER;
+    GdkInterpType down_interp=GDK_INTERP_BILINEAR;
+
+    if (width>NUM_PIXELS||height>NUM_PIXELS) {
+      out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,NUM_PIXELS,NUM_PIXELS,up_interp);
+    }
+    else {
+      out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,NUM_PIXELS,NUM_PIXELS,down_interp);
+    }
+    
+    g_object_unref(in_pixbuf);
+    
+    irowstride=gdk_pixbuf_get_rowstride(out_pixbuf);
+
+    src=gdk_pixbuf_get_pixels(out_pixbuf);
+  }
+  else src=orig_src[0];
+
+  hmax=NUM_PIXELS*psize;
+
+  for (i = 0; i < NUM_PIXELS; i++) {
+    k=i*irowstride;
+    for (j = 0; j < hmax; j+=psize) {
+      if (clamped) {
+	// convert to unclamped
+	cdata1[cn] = UNCLAMP_Y[src[k+j]];
+	cdata2[cn] = UNCLAMP_UV[src[k+j+1]];
+	cdata3[cn] = UNCLAMP_UV[src[k+j]];
+      }
+      else {
+	// unclamped YUV - pass through
+	cdata1[cn] = src[k+j];
+	cdata2[cn] = src[k+j+1];
+	cdata3[cn] = src[k+j];
+      }
+      cn++;
+    }
+  }
+
+  if (out_pixbuf!=NULL) {
+    g_object_unref(out_pixbuf);
+  }
+  else {
+    if (src!=orig_src[0]) {
+      weed_set_voidptr_array(channel,"pixel_data",nplanes,(void **)orig_src);
+      weed_set_int_array(channel,"rowstrides",nplanes,orig_rows);
+    }
+  }
+
+  weed_free(orig_src);
+  weed_free(orig_rows);
+
+  if (num_coefs!=sdata->coefs) {
+    weed_free(sdata->sig1);
+    weed_free(sdata->sig2);
+    weed_free(sdata->sig3);
+    make_sigs(sdata,num_coefs);
+  }
+
+  transform(cdata1,cdata2,cdata3,pal);
+  calcHaar(cdata1,cdata2,cdata3,sdata->sig1,sdata->sig2,sdata->sig3,avgl,num_coefs);
+
+  weed_set_int_array(out_params[0],"value",num_coefs,sdata->sig1);
+  weed_set_int_array(out_params[1],"value",num_coefs,sdata->sig2);
+  weed_set_int_array(out_params[2],"value",num_coefs,sdata->sig3);
+  
+  weed_set_double_value(out_params[3],"value",avgl[0]);
+  weed_set_double_value(out_params[4],"value",avgl[1]);
+  weed_set_double_value(out_params[5],"value",avgl[2]);
+
+#ifdef DEBUG
+  printf("vals %f %f %f\n",avgl[0],avgl[1],avgl[2]);
+
+  for (i=0;i<num_coefs;i++) {
+    printf("vals %d: %d %d %d\n",i,sdata->sig1[i],sdata->sig2[i],sdata->sig3[i]);
+  }
+#endif
+
+
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+// 
+#define VLIMIT 4096
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    int palette_list[]={WEED_PALETTE_YUVA8888,WEED_PALETTE_YUV888,
+			WEED_PALETTE_END};
+    weed_plant_t *out_params[]={weed_out_param_integer_init("Y maxima",0,-VLIMIT,VLIMIT),weed_out_param_integer_init("U maxima",0,-VLIMIT,VLIMIT),weed_out_param_integer_init("V maxima",0,-VLIMIT,VLIMIT),weed_out_param_float_init("Y average",0.,0.,1.),weed_out_param_float_init("U average",0.,0.,1.),weed_out_param_float_init("V average",0.,0.,1.),NULL};
+    weed_plant_t *in_params[]={weed_integer_init("nco","Number of _Coefficients",40,1,NUM_PIXELS),NULL};
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("haar_analyser","salsaman and others",1,0,&haar_init,
+						      &haar_process,&haar_deinit,in_chantmpls,NULL,in_params,out_params);
+
+
+    weed_set_int_value(out_params[0],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
+    weed_set_int_value(out_params[1],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
+    weed_set_int_value(out_params[2],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+
+    init_luma_arrays();
+  }
+  return plugin_info;
+}
+

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/haar_analyser.h Added

@@ -0,0 +1,85 @@
+/***************************************************************************
+    imgSeek ::  This file is the haar 2d transform implemented in C/C++ to speed things up
+                             -------------------
+    begin                : Fri Jan 17 2003
+    email                : nieder|at|mail.ru
+    Time-stamp:            <03/05/09 21:29:35 rnc>
+
+    Copyright (C) 2003 Ricardo Niederberger Cabral
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#ifndef HAAR_H
+#define HAAR_H
+
+/* STL Includes */
+#include <queue>
+
+/* Number of pixels on one side of image; required to be a power of 2. */
+#define	NUM_PIXELS		128
+/* Totals pixels in a square image. */
+#define NUM_PIXELS_SQUARED	(NUM_PIXELS * NUM_PIXELS)
+/* Number of Haar coeffients we retain as signature for an image. */
+#define NUM_COEFS		40
+
+#define UNIT_IS_DOUBLE
+
+#undef ABS
+#ifdef UNIT_IS_DOUBLE
+#define ABS(x)	fabs(x)
+typedef double	Unit;
+#else
+#define UNIT_IS_INT
+#define ABS(x)	abs(x)
+typedef int	Unit;
+#endif
+
+#define FP_BITS 16 /// max fp bits [apparently 16 is faster]
+
+typedef int Idx;
+
+gint myround(gdouble n) {
+  return (n>=0.)?(gint)(n + 0.5):(gint)(n - 0.5);
+}
+
+/* signature structure */
+typedef struct valStruct_{
+  Unit d;			/* [f]abs(a[i]) */
+  int i;			/* index i of a[i] */
+  bool operator< (const valStruct_ &right) const
+  {
+    return d > right.d;
+  }
+} valStruct;
+
+typedef std::priority_queue < valStruct > valqueue;
+
+#define max(a, b)  (((a) > (b)) ? (a) : (b))
+#define min(a, b)  (((a) > (b)) ? (b) : (a))
+
+void initImgBin();
+
+void transform(Unit* a, Unit* b, Unit* c);
+
+void transformChar(unsigned char* c1, unsigned char* c2, unsigned char* c3,
+		   Unit* a, Unit* b, Unit* c);
+
+int calcHaar(Unit* cdata1, Unit* cdata2, Unit* cdata3,
+	     Idx* sig1, Idx* sig2, Idx* sig3, double * avgl);
+
+double *new_darray(int size) ;
+
+int *new_iarray(int size);
+
+#endif

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c Changed

@@ -9,12 +9,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../../libweed/weed.h"
 #include "../../../libweed/weed-palettes.h"
 #include "../../../libweed/weed-effects.h"
-#include "../../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -26,14 +24,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../../libweed/weed-utils.h" // optional
-#include "../../../libweed/weed-plugin-utils.h" // optional
+#include "../../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "../weed-utils-code.c" // optional
+#include "../weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
@@ -48,6 +47,15 @@
 #include <gdk/gdk.h>
 #include <pango/pangocairo.h>
 
+static gboolean is_big_endian() {
+  int32_t testint = 0x12345678;
+  char *pMem;
+  pMem = (char *) &testint;
+  if (pMem[0] == 0x78) return FALSE;
+  return TRUE;
+}
+
+
 // defines for configure dialog elements
 enum DlgControls {
   P_TEXT=0,
@@ -177,30 +185,212 @@
 
 
 /////////////////////////////////////////////
+static int unal[256][256];
+static int al[256][256];
+
+static void init_unal(void) {
+  // premult to postmult and vice-versa
 
+  register int i,j;
+  
+  for (i=0;i<256;i++) { //alpha val
+    for (j=0;j<256;j++) { // val to be converted
+      unal[i][j]=(float)j*255./(float)i;
+      al[i][j]=(float)j*(float)i/255.;
+    }
+  }
+}
 
-static GdkPixbuf *pl_channel_to_pixbuf (weed_plant_t *channel);
-static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf);
-static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf);
+static void alpha_unpremult(guchar *ptr, int width, int height, int rowstride, int pal, int un) {
+  int aoffs,coffs,psizel;
+  int alpha;
+  int psize=4;
+
+  register int i,j,p;
+
+  switch (pal) {
+  case WEED_PALETTE_BGRA32:
+    psizel=3;
+    coffs=0;
+    aoffs=3;
+    break;
+  case WEED_PALETTE_ARGB32:
+    psizel=4;
+    coffs=1;
+    aoffs=0;
+    break;
+  default:
+    return;
+  }
+
+  if (un) {
+    for (i=0;i<height;i++) {
+      for (j=0;j<width;j+=psize) {
+	alpha=ptr[j+aoffs];
+	for (p=coffs;p<psizel;p++) {
+	  ptr[j+p]=unal[alpha][ptr[j+p]];
+	}
+      }
+      ptr+=rowstride;
+    }
+  }
+  else {
+    for (i=0;i<height;i++) {
+      for (j=0;j<width;j+=psize) {
+	alpha=ptr[j+aoffs];
+	for (p=coffs;p<psizel;p++) {
+	  ptr[j+p]=al[alpha][ptr[j+p]];
+	}
+      }
+      ptr+=rowstride;
+    }
+  }
 
-inline G_GNUC_CONST int pl_gdk_rowstride_value (int rowstride) {
-  // from gdk-pixbuf.c
-  /* Always align rows to 32-bit boundaries */
-  return (rowstride + 3) & ~3;
 }
 
-inline int G_GNUC_CONST pl_gdk_last_rowstride_value (int width, int nchans) {
-  // from gdk pixbuf docs
-  return width*(((nchans<<3)+7)>>3);
+
+
+static cairo_t *channel_to_cairo(weed_plant_t *channel) {
+  // convert a weed channel to cairo
+  // the channel shares pixel_data with cairo
+  // so it should be copied before the cairo is destroyed
+
+  // "width","rowstrides" and "current_palette" of channel may all change
+
+  int irowstride,orowstride;
+  int width,widthx;
+  int height;
+  int pal;
+  int error;
+  int flags=0;
+
+  register int i;
+
+  guchar *src,*dst,*pixel_data;
+
+  cairo_surface_t *surf;
+  cairo_t *cairo;
+  cairo_format_t cform=CAIRO_FORMAT_ARGB32;
+
+  width=weed_get_int_value(channel,"width",&error);
+  height=weed_get_int_value(channel,"height",&error);
+  pal=weed_get_int_value(channel,"current_palette",&error);
+  irowstride=weed_get_int_value(channel,"rowstrides",&error);
+
+  widthx=width*4;
+
+  orowstride=cairo_format_stride_for_width(cform,width);
+
+  src=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  pixel_data=(guchar *)weed_malloc(height*orowstride);
+
+  if (pixel_data==NULL) return NULL;
+
+  if (irowstride==orowstride) {
+    weed_memcpy((void *)pixel_data,(void *)src,irowstride*height);
+  }
+  else {
+    dst=pixel_data;
+    for (i=0;i<height;i++) {
+      weed_memcpy((void *)dst,(void *)src,widthx);
+      weed_memset((void *)dst+widthx,0,widthx-orowstride);
+      dst+=orowstride;
+      src+=irowstride;
+    }
+  }
+
+  if (weed_plant_has_leaf(channel,"flags")) flags=weed_get_int_value(channel,"flags",&error);
+  if (!(flags&WEED_CHANNEL_ALPHA_PREMULT)) {
+    // if we have post-multiplied alpha, pre multiply
+    alpha_unpremult(pixel_data,widthx,height,orowstride,pal,FALSE);
+  }
+
+  surf=cairo_image_surface_create_for_data(pixel_data,
+					   cform, 
+					   width, height,
+					   orowstride);
+
+  if (surf==NULL) {
+    weed_free(pixel_data);
+    return NULL;
+  }
+
+  cairo=cairo_create(surf);
+  cairo_surface_destroy(surf);
+  weed_free(pixel_data);
+
+  return cairo;
 }
 
-static void plugin_free_buffer (guchar *pixels, gpointer data) {
-  return;
+
+
+static void cairo_to_channel(cairo_t *cairo, weed_plant_t *channel) {
+  // updates a weed_channel from a cairo_t
+  cairo_surface_t *surface=cairo_get_target(cairo);
+
+  cairo_format_t cform=CAIRO_FORMAT_ARGB32;
+
+  int error;
+
+  guchar *src,*dst,*pixel_data=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  int flags=0;
+
+  int height=weed_get_int_value(channel,"height",&error);
+  int irowstride,orowstride=weed_get_int_value(channel,"rowstrides",&error);
+  int width=weed_get_int_value(channel,"width",&error),widthx=width*4;
+
+  register int i;
+
+  // flush to ensure all writing to the image was done
+  cairo_surface_flush (surface);
+
+  src = cairo_image_surface_get_data (surface);
+
+  irowstride=cairo_format_stride_for_width(cform,width);
+
+  if (irowstride==orowstride) {
+    weed_memcpy((void *)pixel_data,(void *)src,irowstride*height);
+  }
+  else {
+    dst=pixel_data;
+    for (i=0;i<height;i++) {
+      weed_memcpy((void *)dst,(void *)src,widthx);
+      weed_memset((void *)(dst+widthx),0,widthx-orowstride);
+      dst+=orowstride;
+      src+=irowstride;
+    }
+  }
+
+
+  if (weed_plant_has_leaf(channel,"flags")) flags=weed_get_int_value(channel,"flags",&error);
+  if (!(flags&WEED_CHANNEL_ALPHA_PREMULT)) {
+    int pal=weed_get_int_value(channel,"current_palette",&error);
+
+    // un-premultiply the alpha
+    alpha_unpremult(pixel_data,widthx,height,orowstride,pal,TRUE);
+  }
+
+
 }
 
+
 static char **fonts_available = NULL;
 static int num_fonts_available = 0;
 
+// work around some **weirdness** with strndup
+static char *stringdup(const char *s, size_t n) {
+  char *ret;
+  size_t len=strlen(s);
+  if (len>=n) len=n-1;
+  ret=weed_malloc(len+1);
+  weed_memcpy(ret,s,len);
+  weed_memset(ret+len,0,1);
+  return ret;
+}
+
+
 
 static size_t utf8len(char *text) {
   register size_t toffs=0;
@@ -635,10 +825,12 @@
     }
       
     if (sdata->bool1) 
-      setxypos(dwidth,dheight,width/2+sin(sdata->count/4.+(sdata->dbl3-1.)*9.)*radX,height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
+      setxypos(dwidth,dheight,width/2+sin(sdata->count/4.+(sdata->dbl3-1.)*9.)*radX,
+	       height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
       
     else
-      setxypos(dwidth,dheight,width/2+sin(sdata->count/4.+(sdata->dbl3-1.)*8.)*radX,height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
+      setxypos(dwidth,dheight,width/2+sin(sdata->count/4.+(sdata->dbl3-1.)*8.)*radX,
+	       height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
       
     if (!strncmp(xtext,".",1)) sdata->int1++;
       
@@ -760,38 +952,35 @@
 
 
 int puretext_process (weed_plant_t *inst, weed_timecode_t tc) {
-
-  GdkPixbuf *pixbuf = NULL;
-  GdkPixbuf *pixbuf_new = NULL;
-
-  size_t toffs;
-    
-  int alpha_threshold = 0;
   int error;
 
-  register int i,j;
-
-  weed_plant_t *in_channel=  in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
   weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
 
-  unsigned char *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
-  unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
+  sdata_t *sdata=(sdata_t *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  guchar *bgdata=NULL;
+
+  pt_subst_t *xsubst;
+
+  cairo_t *cairo;
+
+  guchar *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
+
+  size_t toffs;
+    
+  //int alpha_threshold = 0;
 
-  int irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
   int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
 
   int width=weed_get_int_value(out_channel,"width",&error);
   int height=weed_get_int_value(out_channel,"height",&error);
-  int palette=weed_get_int_value(out_channel,"current_palette",&error);
 
   int mode=weed_get_int_value(in_params[P_MODE],"value",&error);
 
-  sdata_t *sdata=(sdata_t *)weed_get_voidptr_value(inst,"plugin_internal",&error);
-
-  unsigned char *bgdata=NULL;
-
-  pt_subst_t *xsubst;
+  register int i,j;
+  
 
   weed_free(in_params); // must weed free because we got an array
 
@@ -821,20 +1010,6 @@
 
   sdata->count=0;
 
-  if (dst!=src&&src!=NULL) {
-    // if not inplace, copy in pixel_data to out pixel_data
-    if (irowstride==orowstride&&irowstride==width*3) {
-      weed_memcpy(dst,src,width*3*height);
-    }
-    else {
-      for (i=0;i<height;i++) {
-	weed_memcpy(dst,src,width*3);
-	dst+=orowstride;
-	src+=irowstride;
-      }
-    }
-  }
-
   if (sdata->mode==PT_WORD_COALESCE) {
     // backup original data
     bgdata=weed_malloc(height*orowstride);
@@ -845,18 +1020,11 @@
 
   // THINGS TO TO WITH TEXTS AND PANGO
   if((!in_channel) || (in_channel == out_channel))
-    pixbuf = pl_channel_to_pixbuf(out_channel);
+    cairo = channel_to_cairo(out_channel);
   else
-    pixbuf = pl_channel_to_pixbuf(in_channel);
-
-  if(pixbuf) {
-    // do cairo and pango things
-    GdkPixmap *pixmap = NULL;
-    gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, NULL, alpha_threshold);
-    if(pixmap) {
-      cairo_t *cairo = gdk_cairo_create(pixmap);
+    cairo = channel_to_cairo(in_channel);
+
       if(cairo) {
-	PangoContext *ctx=pango_cairo_create_context(cairo);
 	// TODO - get real offset of start in bytes
 
 	if (sdata->text_type==TEXT_TYPE_ASCII) {
@@ -868,8 +1036,8 @@
 
 	// loop from start char to end char
 	for (i=sdata->start;i<sdata->start+(sdata->length==0?1:sdata->length);i++) {
-	  PangoLayout *layout = pango_layout_new(ctx);
-	  if(layout) { 
+	  PangoLayout *layout = pango_cairo_create_layout(cairo);
+	  if (layout) { 
 	    PangoFontDescription *font;
 	    char *xtext;
 
@@ -889,12 +1057,12 @@
 		case PT_LETTER_MODE:
 		  // letter mode
 		  if (sdata->text_type==TEXT_TYPE_ASCII) {
-		    xtext=strndup(&sdata->text[toffs],1);
+		    xtext=stringdup(&sdata->text[toffs],1);
 		    toffs++;
 		  }
 		  else {
 		    int xlen=mbtowc(NULL,&sdata->text[toffs],4);
-		    xtext=strndup(&sdata->text[toffs],xlen);
+		    xtext=stringdup(&sdata->text[toffs],xlen);
 		    toffs+=xlen;
 		  }
 		  break;
@@ -907,7 +1075,7 @@
 		  else {
 		    xsubst=get_nth_word_utf8(sdata->text,i);
 		  }
-		  xtext=strndup(&sdata->text[xsubst->start],xsubst->length);
+		  xtext=stringdup(&sdata->text[xsubst->start],xsubst->length);
 
 		  weed_free(xsubst);
 		  break;
@@ -922,7 +1090,7 @@
 	    pango_layout_set_text(layout, (char *)xtext, -1);
 
 	    // default colour - opaque white
-	    sdata->fg.red=sdata->fg.green=sdata->fg.blue=65535;
+	    sdata->fg.red=sdata->fg.green=sdata->fg.blue=255.;
 	    sdata->fg_alpha=1.;
 
 	    cairo_save(cairo);
@@ -932,12 +1100,6 @@
 
 	    free(xtext);
 
-	    if (palette==WEED_PALETTE_BGR24) {
-	      int tmp=sdata->fg.red;
-	      sdata->fg.red=sdata->fg.blue;
-	      sdata->fg.blue=tmp;
-	    }
-
 	    cairo_move_to(cairo, sdata->x_text, sdata->y_text);
 
 	    cairo_set_source_rgba(cairo,sdata->fg.red/255.0, sdata->fg.green/255.0, sdata->fg.blue/255.0, 
@@ -955,29 +1117,16 @@
 
 	} // end loop
 
-	g_object_unref(ctx);
-
-	// and finally convert backwards
-	pixbuf_new = gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL,	\
-						  0, 0,			\
-						  0, 0,			\
-						  -1, -1);
-	pl_pixbuf_to_channel(out_channel, pixbuf_new);
-	g_object_unref(pixbuf_new);
-
+	cairo_to_channel(cairo,out_channel);
 	cairo_destroy(cairo);
       }
 
-    }
-    g_object_unref(pixmap);
-  }
-
 
   if (sdata->mode==PT_WORD_COALESCE) {
     if (sdata->dbl1>0.) {
-      unsigned char *b_data=bgdata;
+      guchar *b_data=bgdata;
       int width3=width*3;
-      unsigned char *dstx=dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
+      guchar *dstx=dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
       
       for (i=0;i<height;i++) {
 	for (j=0;j<width3;j+=3) {
@@ -1010,20 +1159,22 @@
 
 
 
-
-inline static int font_compare(const void *p1, const void *p2) {  
+/*
+static int font_compare(const void *p1, const void *p2) {  
   const char *s1 = (const char *)(*(char **)p1);
   const char *s2 = (const char *)(*(char **)p2);
-  return(strcasecmp(s1, s2));
-}
+  char *u1 = g_utf8_casefold(s1, -1);
+  char *u2 = g_utf8_casefold(s2, -1);
+  int ret = strcmp(u1, u2);
+  g_free(u1);
+  g_free(u2);
+  return ret;
+  }*/
 
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
 
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
-    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
-    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
     weed_plant_t *in_params[P_END+1],*gui;
     weed_plant_t *filter_class;
     PangoContext *ctx;
@@ -1033,8 +1184,28 @@
 
     char *deftextfile;
 
+    int palette_list[2];
+    weed_plant_t *in_chantmpls[2];
+    weed_plant_t *out_chantmpls[2];
+
     int flags,error;
 
+    if (is_big_endian())
+      palette_list[0]=WEED_PALETTE_ARGB32;
+    else 
+      palette_list[0]=WEED_PALETTE_BGRA32;
+
+    palette_list[1]=WEED_PALETTE_END;
+
+    in_chantmpls[0]=weed_channel_template_init("in channel 0",0,palette_list);
+    in_chantmpls[1]=NULL;
+
+    out_chantmpls[0]=weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list);
+    out_chantmpls[1]=NULL;
+
+    init_unal();
+
+
     // this section contains code
     // for configure fonts available
     num_fonts_available = 0;
@@ -1068,6 +1239,8 @@
     deftextfile=g_build_filename(g_get_home_dir(), "livestext.txt", NULL);
 
     in_params[P_TEXT]=weed_text_init("textfile","_Text file",deftextfile);
+    gui=weed_parameter_template_get_gui(in_params[P_TEXT]);
+    weed_set_int_value(gui,"maxchars",80); // for display only - fileread will override this
     flags=0;
     if (weed_plant_has_leaf(in_params[P_TEXT],"flags")) 
       flags=weed_get_int_value(in_params[P_TEXT],"flags",&error);
@@ -1084,7 +1257,8 @@
 
     g_free(deftextfile);
 
-    filter_class=weed_filter_class_init("puretext","Salsaman & Aleksej Penkov",1,0,&puretext_init,&puretext_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+    filter_class=weed_filter_class_init("puretext","Salsaman & Aleksej Penkov",1,0,&puretext_init,&puretext_process,NULL,
+					in_chantmpls,out_chantmpls,in_params,NULL);
 
     gui=weed_filter_class_get_gui(filter_class);
     weed_set_string_value(gui,"layout_scheme","RFX");
@@ -1116,104 +1290,3 @@
 }
 
 
-
-static GdkPixbuf *pl_channel_to_pixbuf (weed_plant_t *channel) {
-  int error;
-  GdkPixbuf *pixbuf;
-  int palette=weed_get_int_value(channel,"current_palette",&error);
-  int width=weed_get_int_value(channel,"width",&error);
-  int height=weed_get_int_value(channel,"height",&error);
-  int irowstride=weed_get_int_value(channel,"rowstrides",&error);
-  int rowstride,orowstride;
-  guchar *pixel_data=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error),*pixels,*end;
-  gboolean cheat=FALSE;
-  gint n_channels;
-
-  switch (palette) {
-  case WEED_PALETTE_RGB24:
-  case WEED_PALETTE_BGR24:
-  case WEED_PALETTE_YUV888:
-    if (irowstride==pl_gdk_rowstride_value(width*3)) {
-      pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, FALSE, 8, width, height, pixel_data);
-      cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-    n_channels=3;
-    break;
-  case WEED_PALETTE_RGBA32:
-  case WEED_PALETTE_BGRA32:
-  case WEED_PALETTE_ARGB32:
-  case WEED_PALETTE_YUVA8888:
-    if (irowstride==pl_gdk_rowstride_value(width*4)) {
-      pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, TRUE, 8, width, height, pixel_data);
-      cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-    n_channels=4;
-    break;
-  default:
-    return NULL;
-  }
-  pixels=gdk_pixbuf_get_pixels (pixbuf);
-  orowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  
-  if (irowstride>orowstride) rowstride=orowstride;
-  else rowstride=irowstride;
-  end=pixels+orowstride*height;
-
-  if (!cheat) {
-    gboolean done=FALSE;
-    for (;pixels<end&&!done;pixels+=orowstride) {
-      if (pixels+orowstride>=end) {
-	orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-	done=TRUE;
-      }
-      weed_memcpy(pixels,pixel_data,rowstride);
-      if (rowstride<orowstride) weed_memset (pixels+rowstride,0,orowstride-rowstride);
-      pixel_data+=irowstride;
-    }
-  }
-  return pixbuf;
-}
-
-
-
-static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf) {
-  // return TRUE if we can use the original pixbuf pixels
-  
-  int error;
-  int rowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  int width=gdk_pixbuf_get_width(pixbuf);
-  int height=gdk_pixbuf_get_height(pixbuf);
-  int n_channels=gdk_pixbuf_get_n_channels(pixbuf);
-  guchar *in_pixel_data=(guchar *)gdk_pixbuf_get_pixels(pixbuf);
-  int out_rowstride=weed_get_int_value(channel,"rowstrides",&error);
-  guchar *dst=weed_get_voidptr_value(channel,"pixel_data",&error);
-
-  register int i;
-
-  if(dst == in_pixel_data)
-    return TRUE;
-
-  if (rowstride==pl_gdk_last_rowstride_value(width,n_channels)&&rowstride==out_rowstride) {
-    weed_memcpy(dst,in_pixel_data,rowstride*height);
-    return FALSE;
-  }
-
-  for (i=0;i<height;i++) {
-    if (i==height-1) rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-    weed_memcpy(dst,in_pixel_data,rowstride);
-    in_pixel_data+=rowstride;
-    dst+=out_rowstride;
-  }
-
-  return FALSE;
-}
-
-static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf) {
-  // we can cheat if our buffer is correctly sized
-  int channels=has_alpha?4:3;
-  int rowstride=pl_gdk_rowstride_value(width*channels);
-  return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
-}
-

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c Changed

@@ -10,12 +10,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../../libweed/weed.h"
 #include "../../../libweed/weed-palettes.h"
 #include "../../../libweed/weed-effects.h"
-#include "../../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -27,21 +25,30 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../../libweed/weed-utils.h" // optional
-#include "../../../libweed/weed-plugin-utils.h" // optional
+#include "../../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "../weed-utils-code.c" // optional
+#include "../weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <gdk/gdk.h>
 #include <pango/pangocairo.h>
+#include <gdk/gdk.h>
+
+static gboolean is_big_endian() {
+  int32_t testint = 0x12345678;
+  char *pMem;
+  pMem = (char *) &testint;
+  if (pMem[0] == 0x78) return FALSE;
+  return TRUE;
+}
 
 // defines for configure dialog elements
 enum DlgControls {
@@ -67,37 +74,200 @@
 
 
 /////////////////////////////////////////////
+static int unal[256][256];
+static int al[256][256];
 
+static void init_unal(void) {
+  // premult to postmult and vice-versa
 
-static GdkPixbuf *pl_channel_to_pixbuf (weed_plant_t *channel);
-static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf);
-static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf);
-
-inline G_GNUC_CONST int pl_gdk_rowstride_value (int rowstride) {
-  // from gdk-pixbuf.c
-  /* Always align rows to 32-bit boundaries */
-  return (rowstride + 3) & ~3;
+  register int i,j;
+  
+  for (i=0;i<256;i++) { //alpha val
+    for (j=0;j<256;j++) { // val to be converted
+      unal[i][j]=(float)j*255./(float)i;
+      al[i][j]=(float)j*(float)i/255.;
+    }
+  }
 }
 
-inline int G_GNUC_CONST pl_gdk_last_rowstride_value (int width, int nchans) {
-  // from gdk pixbuf docs
-  return width*(((nchans<<3)+7)>>3);
+static void alpha_unpremult(guchar *ptr, int width, int height, int rowstride, int pal, int un) {
+  int aoffs,coffs,psizel;
+  int alpha;
+  int psize=4;
+
+  register int i,j,p;
+
+  switch (pal) {
+  case WEED_PALETTE_BGRA32:
+    psizel=3;
+    coffs=0;
+    aoffs=3;
+    break;
+  case WEED_PALETTE_ARGB32:
+    psizel=4;
+    coffs=1;
+    aoffs=0;
+    break;
+  default:
+    return;
+  }
+
+  if (un) {
+    for (i=0;i<height;i++) {
+      for (j=0;j<width;j+=psize) {
+	alpha=ptr[j+aoffs];
+	for (p=coffs;p<psizel;p++) {
+	  ptr[j+p]=unal[alpha][ptr[j+p]];
+	}
+      }
+      ptr+=rowstride;
+    }
+  }
+  else {
+    for (i=0;i<height;i++) {
+      for (j=0;j<width;j+=psize) {
+	alpha=ptr[j+aoffs];
+	for (p=coffs;p<psizel;p++) {
+	  ptr[j+p]=al[alpha][ptr[j+p]];
+	}
+      }
+      ptr+=rowstride;
+    }
+  }
+
 }
 
-static void plugin_free_buffer (guchar *pixels, gpointer data) {
-  return;
+
+
+static cairo_t *channel_to_cairo(weed_plant_t *channel) {
+  // convert a weed channel to cairo
+  // the channel shares pixel_data with cairo
+  // so it should be copied before the cairo is destroyed
+
+  // "width","rowstrides" and "current_palette" of channel may all change
+
+  int irowstride,orowstride;
+  int width,widthx;
+  int height;
+  int pal;
+  int error;
+  int flags=0;
+
+  register int i;
+
+  guchar *src,*dst,*pixel_data;
+
+  cairo_surface_t *surf;
+  cairo_t *cairo;
+  cairo_format_t cform=CAIRO_FORMAT_ARGB32;
+
+  width=weed_get_int_value(channel,"width",&error);
+  height=weed_get_int_value(channel,"height",&error);
+  pal=weed_get_int_value(channel,"current_palette",&error);
+  irowstride=weed_get_int_value(channel,"rowstrides",&error);
+
+  widthx=width*4;
+
+  orowstride=cairo_format_stride_for_width(cform,width);
+
+  src=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  pixel_data=(guchar *)weed_malloc(height*orowstride);
+
+  if (pixel_data==NULL) return NULL;
+
+  if (irowstride==orowstride) {
+    weed_memcpy((void *)pixel_data,(void *)src,irowstride*height);
+  }
+  else {
+    dst=pixel_data;
+    for (i=0;i<height;i++) {
+      weed_memcpy((void *)dst,(void *)src,widthx);
+      weed_memset((void *)(dst+widthx),0,widthx-orowstride);
+      dst+=orowstride;
+      src+=irowstride;
+    }
+  }
+
+  if (weed_plant_has_leaf(channel,"flags")) flags=weed_get_int_value(channel,"flags",&error);
+  if (!(flags&WEED_CHANNEL_ALPHA_PREMULT)) {
+    // if we have post-multiplied alpha, pre multiply
+    alpha_unpremult(pixel_data,widthx,height,orowstride,pal,FALSE);
+  }
+
+  surf=cairo_image_surface_create_for_data(pixel_data,
+					   cform, 
+					   width, height,
+					   orowstride);
+
+  if (surf==NULL) {
+    weed_free(pixel_data);
+    return NULL;
+  }
+
+  cairo=cairo_create(surf);
+  weed_free(pixel_data);
+  cairo_surface_destroy(surf);
+
+  return cairo;
 }
 
-static const char **fonts_available = NULL;
-static int num_fonts_available = 0;
 
-static weed_plant_t *weed_parameter_get_gui(weed_plant_t *param) {
+
+static void cairo_to_channel(cairo_t *cairo, weed_plant_t *channel) {
+  // updates a weed_channel from a cairo_t
+  cairo_surface_t *surface=cairo_get_target(cairo);
+
+  cairo_format_t cform=CAIRO_FORMAT_ARGB32;
+
   int error;
-  weed_plant_t *ptmpl=weed_get_plantptr_value(param,"template",&error);
-  return weed_parameter_template_get_gui(ptmpl);
+
+  guchar *src,*dst,*pixel_data=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error);
+
+  int flags=0;
+
+  int height=weed_get_int_value(channel,"height",&error);
+  int irowstride,orowstride=weed_get_int_value(channel,"rowstrides",&error);
+  int width=weed_get_int_value(channel,"width",&error),widthx=width*4;
+
+  register int i;
+
+  // flush to ensure all writing to the image was done
+  cairo_surface_flush (surface);
+
+  src = cairo_image_surface_get_data (surface);
+
+  irowstride=cairo_format_stride_for_width(cform,width);
+
+  if (irowstride==orowstride) {
+    weed_memcpy((void *)pixel_data,(void *)src,irowstride*height);
+  }
+  else {
+    dst=pixel_data;
+    for (i=0;i<height;i++) {
+      weed_memcpy((void *)dst,(void *)src,widthx);
+      weed_memset((void *)(dst+widthx),0,widthx-orowstride);
+      dst+=orowstride;
+      src+=irowstride;
+    }
+  }
+
+
+  if (weed_plant_has_leaf(channel,"flags")) flags=weed_get_int_value(channel,"flags",&error);
+  if (!(flags&WEED_CHANNEL_ALPHA_PREMULT)) {
+    int pal=weed_get_int_value(channel,"current_palette",&error);
+
+    // un-premultiply the alpha
+    alpha_unpremult(pixel_data,widthx,height,orowstride,pal,TRUE);
+  }
+
+
 }
 
 
+static const char **fonts_available = NULL;
+static int num_fonts_available = 0;
+
 int scribbler_init(weed_plant_t *inst) {
   int error;
 
@@ -164,32 +334,31 @@
 //
 
 int scribbler_process (weed_plant_t *inst, weed_timecode_t timestamp) {
-  char *text;
+  int error;
+
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t *in_channel=NULL;
 
   rgb_t *fg,*bg;
 
-  int cent,rise;
-  int alpha_threshold = 0;
-  int fontnum;
-  int error,mode;
+  cairo_t *cairo;
 
   double f_alpha, b_alpha;
   double dwidth, dheight;
   double font_size, top;
 
-  GdkPixbuf *pixbuf = NULL;
-  GdkPixbuf *pixbuf_new = NULL;
-
-  weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
-  weed_plant_t *in_channel=NULL;
+  char *text;
 
-  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  int cent,rise;
+  //int alpha_threshold = 0;
+  int fontnum;
+  int mode;
 
   int width=weed_get_int_value(out_channel,"width",&error);
   int height=weed_get_int_value(out_channel,"height",&error);
 
-  int palette=weed_get_int_value(out_channel,"current_palette",&error);
-
   if (weed_plant_has_leaf(inst,"in_channels")) {
     in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   }
@@ -210,118 +379,70 @@
   top=weed_get_double_value(in_params[P_TOP],"value",&error);
 
 
-  if (palette==WEED_PALETTE_BGR24/*||palette==WEED_PALETTE_BGRA32*/) {
-    int tmp=fg->red;
-    fg->red=fg->blue;
-    fg->blue=tmp;
-
-    tmp=bg->red;
-    bg->red=bg->blue;
-    bg->blue=tmp;
-  }
-
-
   weed_free(in_params); // must weed free because we got an array
 
-  if (in_channel!=out_channel&&in_channel!=NULL) {
-    // if not inplace, copy in pixel_data to out pixel_data
-    void *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
-    void *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
-    if (dst!=src) {
-      int irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
-      int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
-      if (irowstride==orowstride&&irowstride==width*3) {
-	weed_memcpy(dst,src,width*3*height);
-      }
-      else {
-	register int i;
-	for (i=0;i<height;i++) {
-	  weed_memcpy(dst,src,width*3);
-	  dst+=orowstride;
-	  src+=irowstride;
-	}
-      }
-    }
-  }
-
   // THINGS TO TO WITH TEXTS AND PANGO
   if((!in_channel) || (in_channel == out_channel))
-    pixbuf = pl_channel_to_pixbuf(out_channel);
+    cairo = channel_to_cairo(out_channel);
   else
-    pixbuf = pl_channel_to_pixbuf(in_channel);
+    cairo = channel_to_cairo(in_channel);
 
-  if(pixbuf) {
+  if (cairo) {
     // do cairo and pango things
-    GdkPixmap *pixmap = NULL;
-    gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, NULL, alpha_threshold);
-    if(pixmap) {
-      cairo_t *cairo;
-      cairo = gdk_cairo_create(pixmap);
-      if(cairo) {
-        PangoLayout *layout;
-        layout = pango_cairo_create_layout(cairo);
-        if(layout) { 
-          PangoFontDescription *font;
-          double x_pos, y_pos;
-          double x_text, y_text;
-
-          font = pango_font_description_new();
-          if((num_fonts_available) && (fontnum >= 0) && (fontnum < num_fonts_available) && (fonts_available[fontnum]))
-            pango_font_description_set_family(font, fonts_available[fontnum]);
-
-          pango_font_description_set_size(font, font_size*PANGO_SCALE);
-
-          pango_layout_set_font_description(layout, font);
-          pango_layout_set_text(layout, text, -1);
-          getxypos(layout, &x_pos, &y_pos, width, height, cent, &dwidth, &dheight);
-
-          if(!rise)
-            y_pos = y_text = height*top;
-
-          x_text = x_pos;
-          y_text = y_pos;
-          if (cent) pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	  else pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
-
-          cairo_move_to(cairo, x_text, y_text);
-
-          switch(mode) {
-          case 1:
-                 cairo_set_source_rgba(cairo,bg->red/255.0, bg->green/255.0, bg->blue/255.0, b_alpha);
-                 fill_bckg(cairo, x_pos, y_pos, dwidth, dheight);
-                 cairo_move_to(cairo, x_text, y_text);
-                 cairo_set_source_rgba(cairo,fg->red/255.0, fg->green/255.0, fg->blue/255.0, f_alpha);
-                 pango_layout_set_text(layout, text, -1);
-                 break;
-          case 2:
-                 cairo_set_source_rgba(cairo,bg->red/255.0, bg->green/255.0, bg->blue/255.0, b_alpha);
-                 fill_bckg(cairo, x_pos, y_pos, dwidth, dheight);
-                 cairo_move_to(cairo, x_pos, y_pos);
-                 cairo_set_source_rgba(cairo,fg->red/255.0, fg->green/255.0, fg->blue/255.0, f_alpha);
-                 pango_layout_set_text(layout, "", -1);
-                 break;
-          case 0:
-          default:
-                 cairo_set_source_rgba(cairo,fg->red/255.0, fg->green/255.0, fg->blue/255.0, f_alpha);
-                 break;
-          }
-
-          pango_cairo_show_layout(cairo, layout);
-
-          // and finally convert backwards
-          pixbuf_new = gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL,\
-              0, 0,\
-              0, 0,\
-              -1, -1);
-          pl_pixbuf_to_channel(out_channel, pixbuf_new);
-          g_object_unref(pixbuf_new);
-          g_object_unref(layout);
-          pango_font_description_free(font);
-        }
-        cairo_destroy(cairo);
+    PangoLayout *layout = pango_cairo_create_layout(cairo);
+    if (layout) { 
+      PangoFontDescription *font;
+      double x_pos, y_pos;
+      double x_text, y_text;
+      
+      font = pango_font_description_new();
+      if ((num_fonts_available) && (fontnum >= 0) && (fontnum < num_fonts_available) && (fonts_available[fontnum]))
+	pango_font_description_set_family(font, fonts_available[fontnum]);
+      
+      pango_font_description_set_size(font, font_size*PANGO_SCALE);
+      
+      pango_layout_set_font_description(layout, font);
+      pango_layout_set_text(layout, text, -1);
+      getxypos(layout, &x_pos, &y_pos, width, height, cent, &dwidth, &dheight);
+
+      if (!rise)
+	y_pos = y_text = height*top;
+
+      x_text = x_pos;
+      y_text = y_pos;
+      if (cent) pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+      else pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
+
+      cairo_move_to(cairo, x_text, y_text);
+
+      switch (mode) {
+      case 1:
+	cairo_set_source_rgba(cairo,(double)bg->red/255.0, (double)bg->green/255.0, (double)bg->blue/255.0, b_alpha);
+	fill_bckg(cairo, x_pos, y_pos, dwidth, dheight);
+	cairo_move_to(cairo, x_text, y_text);
+	cairo_set_source_rgba(cairo,(double)fg->red/255.0, (double)fg->green/255.0, (double)fg->blue/255.0, f_alpha);
+	pango_layout_set_text(layout, text, -1);
+	break;
+      case 2:
+	cairo_set_source_rgba(cairo,(double)bg->red/255.0, (double)bg->green/255.0, (double)bg->blue/255.0, b_alpha);
+	fill_bckg(cairo, x_pos, y_pos, dwidth, dheight);
+	cairo_move_to(cairo, x_pos, y_pos);
+	cairo_set_source_rgba(cairo,(double)fg->red/255.0, (double)fg->green/255.0, (double)fg->blue/255.0, f_alpha);
+	pango_layout_set_text(layout, "", -1);
+	break;
+      case 0:
+      default:
+	cairo_set_source_rgba(cairo,(double)fg->red/255.0, (double)fg->green/255.0, (double)fg->blue/255.0, f_alpha);
+	break;
       }
-      g_object_unref(pixmap);
+
+      pango_cairo_show_layout(cairo, layout);
+
+      g_object_unref(layout);
+      pango_font_description_free(font);
     }
+    cairo_to_channel(cairo,out_channel);
+    cairo_destroy(cairo);
   }
 
   weed_free(text);
@@ -332,12 +453,18 @@
 }
 
 
-inline static int font_compare(const void *p1, const void *p2) {  
+static int font_compare(const void *p1, const void *p2) {  
   const char *s1 = (const char *)(*(char **)p1);
   const char *s2 = (const char *)(*(char **)p2);
-  return(strcasecmp(s1, s2));
+  char *u1 = g_utf8_casefold(s1, -1);
+  char *u2 = g_utf8_casefold(s2, -1);
+  int ret = strcmp(u1, u2);
+  g_free(u1);
+  g_free(u2);
+  return ret;
 }
 
+
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
   weed_plant_t **clone1,**clone2;
@@ -346,14 +473,29 @@
   if (plugin_info!=NULL) {
     const char *modes[]={"foreground only","foreground and background","background only",NULL};
     // removed palettes with alpha channel
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
-    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
-    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
+    int palette_list[2];
+    weed_plant_t *in_chantmpls[2];
+    weed_plant_t *out_chantmpls[2];
     weed_plant_t *in_params[P_END+1],*pgui;
     weed_plant_t *filter_class;
     PangoContext *ctx;
     int flags=0,error;
 
+    if (is_big_endian())
+      palette_list[0]=WEED_PALETTE_ARGB32;
+    else 
+      palette_list[0]=WEED_PALETTE_BGRA32;
+
+    palette_list[1]=WEED_PALETTE_END;
+
+    in_chantmpls[0]=weed_channel_template_init("in channel 0",0,palette_list);
+    in_chantmpls[1]=NULL;
+
+    out_chantmpls[0]=weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list);
+    out_chantmpls[1]=NULL;
+
+    init_unal();
+
     // this section contains code
     // for configure fonts available
     num_fonts_available = 0;
@@ -403,8 +545,8 @@
     in_params[P_FGALPHA]=weed_float_init("fr_alpha","_Alpha _Foreground",1.0,0.0,1.0);
     in_params[P_BGALPHA]=weed_float_init("bg_alpha","_Alpha _Background",1.0,0.0,1.0);
     in_params[P_FONTSIZE]=weed_float_init("fontsize","_Font Size",20.0,10.0,128.0);
-    in_params[P_CENTER]=weed_switch_init("center","_Center text",1);
-    in_params[P_RISE]=weed_switch_init("rising","_Rising text",1);
+    in_params[P_CENTER]=weed_switch_init("center","_Center text",WEED_TRUE);
+    in_params[P_RISE]=weed_switch_init("rising","_Rising text",WEED_TRUE);
     in_params[P_TOP]=weed_float_init("top","_Top",0.0,0.0,1.0);
     in_params[P_END]=NULL;
     
@@ -447,103 +589,3 @@
   fonts_available = NULL;
 }
 
-static GdkPixbuf *pl_channel_to_pixbuf (weed_plant_t *channel) {
-  int error;
-  GdkPixbuf *pixbuf;
-  int palette=weed_get_int_value(channel,"current_palette",&error);
-  int width=weed_get_int_value(channel,"width",&error);
-  int height=weed_get_int_value(channel,"height",&error);
-  int irowstride=weed_get_int_value(channel,"rowstrides",&error);
-  int rowstride,orowstride;
-  guchar *pixel_data=(guchar *)weed_get_voidptr_value(channel,"pixel_data",&error),*pixels,*end;
-  gboolean cheat=FALSE;
-  gint n_channels;
-
-  switch (palette) {
-  case WEED_PALETTE_RGB24:
-  case WEED_PALETTE_BGR24:
-  case WEED_PALETTE_YUV888:
-    if (irowstride==pl_gdk_rowstride_value(width*3)) {
-      pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, FALSE, 8, width, height, pixel_data);
-      cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-    n_channels=3;
-    break;
-//  case WEED_PALETTE_RGBA32:
-//  case WEED_PALETTE_BGRA32:
-  case WEED_PALETTE_ARGB32:
-  case WEED_PALETTE_YUVA8888:
-    if (irowstride==pl_gdk_rowstride_value(width*4)) {
-      pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, TRUE, 8, width, height, pixel_data);
-      cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-    n_channels=4;
-    break;
-  default:
-    return NULL;
-  }
-  pixels=gdk_pixbuf_get_pixels (pixbuf);
-  orowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  
-  if (irowstride>orowstride) rowstride=orowstride;
-  else rowstride=irowstride;
-  end=pixels+orowstride*height;
-
-  if (!cheat) {
-    gboolean done=FALSE;
-    for (;pixels<end&&!done;pixels+=orowstride) {
-      if (pixels+orowstride>=end) {
-	orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-	done=TRUE;
-      }
-      weed_memcpy(pixels,pixel_data,rowstride);
-      if (rowstride<orowstride) weed_memset (pixels+rowstride,0,orowstride-rowstride);
-      pixel_data+=irowstride;
-    }
-  }
-  return pixbuf;
-}
-
-
-
-static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf) {
-  // return TRUE if we can use the original pixbuf pixels
-  
-  int error;
-  int rowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  int width=gdk_pixbuf_get_width(pixbuf);
-  int height=gdk_pixbuf_get_height(pixbuf);
-  int n_channels=gdk_pixbuf_get_n_channels(pixbuf);
-  guchar *in_pixel_data=(guchar *)gdk_pixbuf_get_pixels(pixbuf);
-  int out_rowstride=weed_get_int_value(channel,"rowstrides",&error);
-  guchar *dst=weed_get_voidptr_value(channel,"pixel_data",&error);
-
-  register int i;
-
-  if(dst == in_pixel_data)
-    return TRUE;
-
-  if (rowstride==pl_gdk_last_rowstride_value(width,n_channels)&&rowstride==out_rowstride) {
-    weed_memcpy(dst,in_pixel_data,rowstride*height);
-    return FALSE;
-  }
-
-  for (i=0;i<height;i++) {
-    if (i==height-1) rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-    weed_memcpy(dst,in_pixel_data,rowstride);
-    in_pixel_data+=rowstride;
-    dst+=out_rowstride;
-  }
-
-  return FALSE;
-}
-
-static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf) {
-  // we can cheat if our buffer is correctly sized
-  int channels=has_alpha?4:3;
-  int rowstride=pl_gdk_rowstride_value(width*channels);
-  return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
-}
-

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/videowall.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/videowall.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/gdk/vjack_rcv.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/gdk/vjack_rcv.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/haip.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/haip.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/ladspa.c Added

@@ -0,0 +1,1031 @@
+// ladspa.c
+// weed plugin wrapper for LADSPA effects
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h> // optional
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h" // optional
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <dlfcn.h>
+
+#include <limits.h>
+
+#ifndef PATH_MAX
+#ifdef MAX_PATH
+#define PATH_MAX MAX_PATH
+#else
+#define PATH_MAX 4096
+#endif
+#endif
+
+#include <ladspa.h>
+
+typedef LADSPA_Descriptor* (*lad_descriptor_f)(unsigned long);
+typedef LADSPA_Handle (*lad_instantiate_f)(const struct _LADSPA_Descriptor * Descriptor, unsigned long SampleRate);
+typedef void (*lad_activate_f)(LADSPA_Handle Instance);
+typedef void (*lad_deactivate_f)(LADSPA_Handle Instance);
+typedef void (*lad_connect_port_f)(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation);
+typedef void (*lad_run_f)(LADSPA_Handle Instance, unsigned long SampleCount);
+typedef void (*lad_cleanup_f)(LADSPA_Handle Instance);
+
+typedef struct {
+  LADSPA_Handle handle_l;
+  int activated_l;
+  LADSPA_Handle handle_r;
+  int activated_r;
+} _sdata;
+
+
+#define DEF_ARATE 44100
+
+//////////////////////////////////////////////////////////////////
+
+static void getenv_piece(char * target, size_t tlen, char *envvar, int num) {
+  // get num piece from envvar path and set in target
+  char *str1;
+  memset(target,0,1);
+  
+  /* extract first string from string sequence */
+  str1 = strtok(envvar, ":");
+ 
+  /* loop until finishied */
+  while ( --num>=0 ) {
+    /* extract string from string sequence */
+    str1 = strtok(NULL, ":");
+      
+    /* check if there is nothing else to extract */
+    if (str1 == NULL) break;
+  }
+
+  if (str1!=NULL) snprintf(target,tlen,"%s",str1);
+
+}
+
+
+static int float_deinterleave(float *fbuffer, int nsamps, int nchans) {
+  // deinterleave a float buffer
+  register int i,j;
+
+  float *tmpfbuffer=(float *)weed_malloc(nsamps*nchans*sizeof(float));
+  if (tmpfbuffer==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+  
+  for (i=0;i<nsamps;i++) {
+    for (j=0;j<nchans;j++) {
+      tmpfbuffer[nsamps*j+i]=fbuffer[i*nchans+j];
+    }
+  }
+  weed_memcpy(fbuffer,tmpfbuffer,nsamps*nchans*sizeof(float));
+  weed_free(tmpfbuffer);
+  return WEED_NO_ERROR;
+}
+
+
+static int float_interleave(float *fbuffer, int nsamps, int nchans) {
+  // deinterleave a float buffer
+  register int i,j;
+
+  float *tmpfbuffer=(float *)weed_malloc(nsamps*nchans*sizeof(float));
+  if (tmpfbuffer==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+  
+  for (i=0;i<nsamps;i++) {
+    for (j=0;j<nchans;j++) {
+      tmpfbuffer[i*nchans+j]=fbuffer[j*nsamps+i];
+    }
+  }
+  weed_memcpy(fbuffer,tmpfbuffer,nsamps*nchans*sizeof(float));
+  weed_free(tmpfbuffer);
+  return WEED_NO_ERROR;
+}
+
+
+
+/////////////////////////////////////////////////////////////
+
+
+int ladspa_init(weed_plant_t *inst) {
+  int error;
+  weed_plant_t *channel=NULL;
+  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+
+  lad_instantiate_f lad_instantiate_func=(lad_instantiate_f)weed_get_voidptr_value(filter,"plugin_lad_instantiate_func",&error);
+  LADSPA_Descriptor* laddes=(LADSPA_Descriptor *)weed_get_voidptr_value(filter,"plugin_lad_descriptor",&error);
+
+  _sdata *sdata;
+
+  int rate=0;
+  int pinc,poutc;
+
+  register int i;
+
+  sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+  if (sdata==NULL) {
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  if (weed_plant_has_leaf(inst,"in_channels")) channel=weed_get_plantptr_value(inst,"in_channels",&error);
+  if (channel==NULL&&weed_plant_has_leaf(inst,"out_channels")) channel=weed_get_plantptr_value(inst,"out_channels",&error);
+
+  if (channel!=NULL) rate=weed_get_int_value(channel,"audio_rate",&error);
+  
+  if (rate==0) rate=DEF_ARATE;
+
+  pinc=weed_get_int_value(filter,"plugin_in_channels",&error);
+  poutc=weed_get_int_value(filter,"plugin_out_channels",&error);
+
+  sdata->activated_l=sdata->activated_r=WEED_FALSE;
+
+  sdata->handle_l=(lad_instantiate_func)(laddes,rate);
+  if (pinc==1||poutc==1) sdata->handle_r=(lad_instantiate_func)(laddes,rate);
+  else sdata->handle_r=NULL;
+
+  weed_set_voidptr_value(inst,"plugin_data",sdata);
+
+  if (weed_get_boolean_value(filter,"plugin_dual",&error)==WEED_TRUE) {
+    if (weed_plant_has_leaf(inst,"in_parameters")) {
+      weed_plant_t **in_params=(weed_plant_t **)weed_get_plantptr_array(inst,"in_parameters",&error);
+      int ninps=(weed_leaf_num_elements(inst,"in_parameters")-2)/2;
+      int link=weed_get_boolean_value(in_params[ninps*2],"value",&error);
+      for (i=0;i<ninps;i++) {
+	weed_plant_t *ptmpl=weed_get_plantptr_value(in_params[i],"template",&error);
+	weed_plant_t *gui=weed_parameter_template_get_gui(ptmpl);
+	if (link==WEED_TRUE) {
+	  weed_set_int_value(gui,"copy_value_to",i+ninps);
+	  ptmpl=weed_get_plantptr_value(in_params[i+ninps],"template",&error);
+	  gui=weed_parameter_template_get_gui(ptmpl);
+	  weed_set_int_value(gui,"copy_value_to",i);
+	}
+	else {
+	  weed_set_int_value(gui,"copy_value_to",-1);
+	  ptmpl=weed_get_plantptr_value(in_params[i+ninps],"template",&error);
+	  gui=weed_parameter_template_get_gui(ptmpl);
+	  weed_set_int_value(gui,"copy_value_to",-1);
+	}
+      }
+    }
+  }
+
+  return WEED_NO_ERROR;
+
+}
+
+
+int ladspa_deinit(weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_data",&error);
+  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  lad_deactivate_f lad_deactivate_func=(lad_activate_f)weed_get_voidptr_value(filter,"plugin_lad_deactivate_func",&error);
+  lad_cleanup_f lad_cleanup_func=(lad_cleanup_f)weed_get_voidptr_value(filter,"plugin_lad_cleanup_func",&error);
+
+  if (sdata->activated_l==WEED_TRUE) {
+    if (lad_deactivate_func!=NULL) (*lad_deactivate_func)(sdata->handle_l);
+    if (lad_cleanup_func!=NULL) (*lad_cleanup_func)(sdata->handle_l);
+  }
+
+  if (sdata->activated_r==WEED_TRUE) {
+    if (lad_deactivate_func!=NULL) (*lad_deactivate_func)(sdata->handle_r);
+    if (lad_cleanup_func!=NULL) (*lad_cleanup_func)(sdata->handle_r);
+  }
+
+  if (sdata!=NULL) {
+    weed_free(sdata);
+  }
+
+  return WEED_NO_ERROR;
+
+}
+
+
+
+int ladspa_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  int nsamps=0;
+
+  int pinc,poutc;
+  int iinc=0,ioutc=0,oinc,ooutc;
+  int iinp=0,ioutp=0,pinp=0,poutp=0;
+  int inplace=WEED_FALSE;
+  int inter=WEED_FALSE;
+  int dual=WEED_FALSE;
+  int rate=DEF_ARATE;
+
+  weed_plant_t *in_channel=NULL,*out_channel=NULL;
+  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  weed_plant_t *ptmpl;
+
+  lad_connect_port_f lad_connect_port_func;
+  lad_run_f lad_run_func;
+
+  float *src=NULL,*dst=NULL,*psrc,*pdst;
+  float *invals=NULL,*outvals=NULL;
+
+  LADSPA_Descriptor* laddes;
+  LADSPA_PortDescriptor ladpdes;
+  LADSPA_PortRangeHint ladphint;
+  LADSPA_PortRangeHintDescriptor ladphintdes;
+  LADSPA_Handle handle;
+
+  weed_plant_t **in_params=NULL;
+  weed_plant_t **out_params=NULL;
+
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_data",&error);
+
+  register int i;
+
+
+  if (weed_plant_has_leaf(inst,"in_channels")) {
+    in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
+    if (in_channel!=NULL) {
+      src=(float *)weed_get_voidptr_value(in_channel,"audio_data",&error);
+      if (src==NULL) return WEED_NO_ERROR;
+      iinc=weed_get_int_value(in_channel,"audio_channels",&error);
+      nsamps=weed_get_int_value(in_channel,"audio_data_length",&error);
+      inter=weed_get_boolean_value(in_channel,"audio_interleaf",&error);
+      rate=weed_get_int_value(in_channel,"audio_rate",&error);
+    }
+  }
+
+  if (weed_plant_has_leaf(inst,"out_channels")) {
+    out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+    if (out_channel!=NULL) {
+      dst=(float *)weed_get_voidptr_value(out_channel,"audio_data",&error);
+      if (dst==NULL) return WEED_NO_ERROR;
+      ioutc=weed_get_int_value(out_channel,"audio_channels",&error);
+      nsamps=weed_get_int_value(out_channel,"audio_data_length",&error);
+      inter=weed_get_boolean_value(out_channel,"audio_interleaf",&error);
+      rate=weed_get_int_value(out_channel,"audio_rate",&error);
+    }
+  }
+
+  ooutc=ioutc;
+  oinc=iinc;
+
+  if (src==dst) inplace=WEED_TRUE;
+
+  pinc=weed_get_int_value(filter,"plugin_in_channels",&error);
+  poutc=weed_get_int_value(filter,"plugin_out_channels",&error);
+
+  if (pinc>0&&iinc==0) return WEED_NO_ERROR;
+  if (poutc>0&&ioutc==0) return WEED_NO_ERROR;
+
+  if (pinc==2&&iinc==1) return WEED_NO_ERROR;
+  if (poutc==2&&ioutc==1) return WEED_NO_ERROR;
+
+
+  if (pinc==1&&iinc==2) dual=WEED_TRUE;
+  if (poutc==1&&ioutc==2) dual=WEED_TRUE;
+
+  if (sdata->activated_l==WEED_FALSE) {
+    lad_activate_f lad_activate_func=(lad_activate_f)weed_get_voidptr_value(filter,"plugin_lad_activate_func",&error);
+    if (lad_activate_func!=NULL) (*lad_activate_func)(sdata->handle_l);
+    sdata->activated_l=WEED_TRUE;
+  }
+
+  if (dual&&sdata->activated_r==WEED_FALSE) {
+    lad_activate_f lad_activate_func=(lad_activate_f)weed_get_voidptr_value(filter,"plugin_lad_activate_func",&error);
+    if (lad_activate_func!=NULL) (*lad_activate_func)(sdata->handle_r);
+    sdata->activated_r=WEED_TRUE;
+  }
+
+  if (iinc>1&&inter==WEED_TRUE) {
+    // we asked the host for non-interleaved audio, but just in case...
+    if (float_deinterleave(src,nsamps,iinc)!=WEED_NO_ERROR) return WEED_ERROR_HARDWARE;
+  }
+
+  laddes=(LADSPA_Descriptor *)weed_get_voidptr_value(filter,"plugin_lad_descriptor",&error);
+  lad_connect_port_func=(lad_connect_port_f)weed_get_voidptr_value(filter,"plugin_lad_connect_port_func",&error);
+
+  lad_run_func=(lad_run_f)weed_get_voidptr_value(filter,"plugin_lad_run_func",&error);
+
+  handle=sdata->handle_l;
+
+  psrc=src;
+  pdst=dst;
+
+  if (pinc>0||poutc>0) {
+    // connect audio ports
+
+    for (i=0;i<laddes->PortCount;i++) {
+      ladpdes=laddes->PortDescriptors[i];
+        
+      if (ladpdes&LADSPA_PORT_AUDIO) {
+	// channel
+	if (ladpdes&LADSPA_PORT_INPUT) {
+	  // connect to next instance audio in
+	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)psrc);
+	  psrc+=nsamps;
+	  iinc--;
+	}
+	else {
+	  // connect to next instance audio out
+	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)pdst);
+	  pdst+=nsamps;
+	  ioutc--;
+	}
+      }
+    }
+
+  }
+
+  if (weed_plant_has_leaf(inst,"in_parameters")) {
+    iinp=weed_leaf_num_elements(inst,"in_parameters");
+    in_params=(weed_plant_t **)weed_get_plantptr_array(inst,"in_parameters",&error);
+    if (weed_get_boolean_value(filter,"plugin_dual",&error)==WEED_TRUE) iinp-=2;
+  }
+  
+  if (weed_plant_has_leaf(inst,"out_parameters")) {
+    ioutp=weed_leaf_num_elements(inst,"out_parameters");
+    out_params=(weed_plant_t **)weed_get_plantptr_array(inst,"out_parameters",&error);
+  }
+
+
+  if (ioutp>0) outvals=weed_malloc(ioutp*sizeof(float));
+  if (iinp>0) invals=weed_malloc(iinp*sizeof(float));
+
+  if (iinp>0||ioutp>0) {
+
+    for (i=0;i<laddes->PortCount;i++) {
+      ladpdes=laddes->PortDescriptors[i];
+      
+      if (ladpdes&LADSPA_PORT_CONTROL) {
+	// control ports
+	ladphint=laddes->PortRangeHints[i];
+	ladphintdes=ladphint.HintDescriptor;
+	ptmpl=weed_get_plantptr_value(in_params[pinp],"template",&error);
+
+	if (ladpdes&LADSPA_PORT_INPUT) {
+	  // connect to next instance in param	
+	  if (ladphintdes&LADSPA_HINT_TOGGLED) {
+	    invals[pinp]=(float)weed_get_boolean_value(in_params[pinp],"value",&error);
+	  }
+	  else if (ladphintdes&LADSPA_HINT_TOGGLED) {
+	    invals[pinp]=(float)weed_get_int_value(in_params[pinp],"value",&error);
+	  }
+	  else {
+	    invals[pinp]=(float)weed_get_double_value(in_params[pinp],"value",&error);
+	  }
+	  if (weed_get_boolean_value(ptmpl,"plugin_sample_rate",&error)==WEED_TRUE) invals[pinp]*=(float)rate;
+	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&invals[pinp++]);
+	}
+	else {
+	  // connect to store for out params
+	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&outvals[poutp++]);
+	}
+      }
+    }
+
+  }
+
+
+  (*lad_run_func)(handle,nsamps);
+
+  handle=sdata->handle_r;
+
+
+  if (pinc>0||poutc>0) {
+    if (ioutc>0||iinc>0) {
+      // the second instance out channel is unconnected; we need to connect it to the second lad instance
+
+      // if we have an unconnected (second) in channel, we connect it here; otherwise we connect both input ports again
+      if (iinc==0) psrc=src;
+
+      for (i=0;i<laddes->PortCount;i++) {
+	ladpdes=laddes->PortDescriptors[i];
+        
+	if (ladpdes&LADSPA_PORT_AUDIO) {
+	  // channel
+	  if (ladpdes&LADSPA_PORT_INPUT) {
+	    // connect to next instance audio in
+	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)psrc);
+	    psrc+=nsamps;
+	  }
+	  else {
+	    // connect to next instance audio out
+	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)pdst);
+	  }
+	}
+      }
+    }
+  }
+
+
+  if (iinp>0||ioutp>0) {
+
+    if (pinp<iinp||poutp<ioutp) {
+      // need to use second instance
+      for (i=0;i<laddes->PortCount;i++) {
+	ladpdes=laddes->PortDescriptors[i];
+      
+	if (ladpdes&LADSPA_PORT_CONTROL) {
+	  // control ports
+	  ladphint=laddes->PortRangeHints[i];
+	  ladphintdes=ladphint.HintDescriptor;
+	  ptmpl=weed_get_plantptr_value(in_params[pinp],"template",&error);
+
+	  if (ladpdes&LADSPA_PORT_INPUT) {
+	    // connect to next instance in param	
+	    if (ladphintdes&LADSPA_HINT_TOGGLED) {
+	      invals[pinp]=(float)weed_get_boolean_value(in_params[pinp],"value",&error);
+	    }
+	    else if (ladphintdes&LADSPA_HINT_TOGGLED) {
+	      invals[pinp]=(float)weed_get_int_value(in_params[pinp],"value",&error);
+	    }
+	    else {
+	      invals[pinp]=(float)weed_get_double_value(in_params[pinp],"value",&error);
+	    }
+	    if (weed_get_boolean_value(ptmpl,"plugin_sample_rate",&error)==WEED_TRUE) invals[pinp]*=(float)rate;
+
+	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&invals[pinp++]);
+	  }
+	  else {
+	    // connect to store for out params
+	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&outvals[poutp++]);
+	  }
+	}
+      }
+
+    }
+
+  }
+
+
+  if (dual) (*lad_run_func)(handle,nsamps);
+
+  // copy out values to out_params
+  for (i=0;i<ioutp;i++) {
+    switch (weed_leaf_seed_type(out_params[i],"value")) {
+    case WEED_SEED_BOOLEAN:
+      weed_set_boolean_value(out_params[i],"value",(int)outvals[i]);
+      weed_set_int64_value(out_params[i],"timecode",timestamp);
+      break;
+    case WEED_SEED_INT:
+      weed_set_int_value(out_params[i],"value",(int)outvals[i]);
+      weed_set_int64_value(out_params[i],"timecode",timestamp);
+      break;
+    default:
+      weed_set_double_value(out_params[i],"value",(double)outvals[i]);
+      weed_set_int64_value(out_params[i],"timecode",timestamp);
+      break;
+    }
+  }
+
+  if (invals!=NULL) weed_free(invals);
+  if (outvals!=NULL) weed_free(outvals);
+  if (in_params!=NULL) weed_free(in_params);
+  if (out_params!=NULL) weed_free(out_params);
+
+  // just in case the host wanted interleaved audio...
+  if (inter==WEED_TRUE&&oinc>1) {
+    if (float_interleave(src,nsamps,oinc)!=WEED_NO_ERROR) return WEED_ERROR_HARDWARE;
+  }
+
+  if (inter==WEED_TRUE&&ooutc>1&&!inplace) {
+    if (float_interleave(dst,nsamps,ooutc)!=WEED_NO_ERROR) return WEED_ERROR_HARDWARE;
+  }
+
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  unsigned long num_plugins=0;
+
+  int num_filters=0;
+
+  if (plugin_info!=NULL) {
+    // get LADSPA path
+
+    char *lpp=getenv("LADSPA_PATH");
+
+    char **rfx_strings=NULL;
+    weed_plant_t **out_chantmpls=NULL,**in_chantmpls=NULL;
+    weed_plant_t **in_params=NULL,**out_params=NULL,*gui;
+    
+    struct dirent *vdirent=NULL;
+    weed_plant_t *filter_class;
+
+    int vdirval=0;
+    int pnum,wnum;
+
+    int new_stdout,new_stderr;
+    
+    LADSPA_Descriptor* laddes;
+    LADSPA_Properties ladprop;
+    LADSPA_PortDescriptor ladpdes;
+    LADSPA_PortRangeHint ladphint;
+    LADSPA_PortRangeHintDescriptor ladphintdes;
+    LADSPA_Data lbound;
+    LADSPA_Data ubound;
+    LADSPA_Data defval;
+
+    lad_descriptor_f lad_descriptor_func;
+    lad_instantiate_f lad_instantiate_func;
+    lad_activate_f lad_activate_func;
+    lad_deactivate_f lad_deactivate_func;
+    lad_connect_port_f lad_connect_port_func;
+    lad_run_f lad_run_func;
+    lad_cleanup_f lad_cleanup_func;
+
+    char cname[128];
+
+#define LABSIZE 1024
+
+    char label[LABSIZE];
+    char vdir[PATH_MAX];
+    char plugin_name[PATH_MAX],weed_name[PATH_MAX],plug1[PATH_MAX];
+    DIR *curvdir=NULL;
+
+    void *handle;
+
+    int ninps,noutps,ninchs,noutchs;
+    int oninps,onoutps,oninchs,onoutchs;
+    int cninps,cnoutps;
+    int stcount;
+
+    int dual;
+
+    register int i,j;
+
+    //#define DEBUG
+#ifndef DEBUG
+    new_stdout=dup(1);
+    new_stderr=dup(2);
+
+    close(1);
+    close(2);
+#endif
+
+    while (1) {
+      // split by :
+      getenv_piece(vdir,PATH_MAX,lpp,vdirval);
+      if (!strlen(vdir)||vdir==NULL) break;
+      curvdir=opendir(vdir);
+      if (curvdir==NULL) break;
+
+      while (1) {
+	// check each plugin
+	vdirent=readdir(curvdir);
+	if (vdirent==NULL) {
+	  closedir(curvdir);
+	  curvdir=NULL;
+	  vdirval++;
+	  break;
+	}
+
+	if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue;
+
+	snprintf(plugin_name,PATH_MAX,"%s",vdirent->d_name);
+	snprintf(plug1,PATH_MAX,"%s/%s",vdir,plugin_name);
+
+	//fprintf(stderr,"checking %s\n",plug1);
+
+	handle=dlopen(plug1,RTLD_NOW);
+	if (handle==NULL) continue;
+	
+	if ((lad_descriptor_func=dlsym(handle,"ladspa_descriptor"))==NULL) {
+	  dlclose(handle);
+	  continue;
+	}
+
+	num_plugins=0;
+
+	while ((laddes=((*lad_descriptor_func)(num_plugins))) != NULL) {
+
+	  if ((lad_instantiate_func=laddes->instantiate)==NULL) {
+	    continue;
+	  }
+
+	  lad_activate_func=laddes->activate;
+
+	  lad_deactivate_func=laddes->deactivate;
+
+	  if ((lad_connect_port_func=laddes->connect_port)==NULL) {
+	    continue;
+	  }
+	  if ((lad_run_func=laddes->run)==NULL) {
+	    continue;
+	  }
+
+	  lad_cleanup_func=laddes->cleanup;
+
+	  //fprintf(stderr,"2checking %s : %ld\n",plug1,num_plugins);
+	  ladprop=laddes->Properties;
+
+	  ninps=noutps=ninchs=noutchs=0;
+
+	  // create the in_parameters, out_parameters, in_channels, out_channels
+
+	  for (i=0;i<laddes->PortCount;i++) {
+	    // count number of each type first
+	    ladpdes=laddes->PortDescriptors[i];
+	    ladphint=laddes->PortRangeHints[i];
+
+	    if (ladpdes&LADSPA_PORT_CONTROL) {
+	      // parameter
+	      if (ladpdes&LADSPA_PORT_INPUT) {
+		// in_param
+		ninps++;
+	      }
+	      else {
+		// out_param
+		noutps++;
+	      }
+	    }
+	    else {
+	      // channel
+	      if (ladpdes&LADSPA_PORT_INPUT) {
+		// in_channel
+		ninchs++;
+	      }
+	      else {
+		// out_channel
+		noutchs++;
+	      }
+	    }
+	  }
+
+
+	  // do we need to double up the channels ?
+	  // if we have 0,1 or 2 input channels, 1 outputs
+	  // 1 input, 0 or 2 outputs
+
+	  if ((ninchs<2&&noutchs<2&&(ninchs+noutchs>0))||noutchs==1) {
+	    dual=WEED_TRUE;
+	    stcount=1;
+	  }
+	  else {
+	    dual=WEED_FALSE;
+	    stcount=0;
+	  }
+
+	  oninchs=ninchs;
+	  onoutchs=noutchs;
+	  oninps=ninps;
+	  onoutps=noutps;
+
+	  if (dual&&oninchs==1) ninchs=2; 
+	  if (dual&&onoutchs==1) noutchs=2; 
+
+	  if (dual==WEED_TRUE) {
+	    ninps=oninps*2;
+	    noutps=onoutps*2;
+
+	    rfx_strings=weed_malloc((ninps+3+stcount)*sizeof(char *));
+	    for (pnum=0;pnum<ninps+3+stcount;pnum++) {
+	      rfx_strings[pnum]=(char *)weed_malloc(256);
+	    }
+
+	    if (ninchs==0) {
+	      sprintf(rfx_strings[stcount],"layout|\"Left output channel\"|");
+	      sprintf(rfx_strings[oninps+2+stcount],"layout|\"Right output channel\"|");
+	    }
+	    else {
+	      if (ninchs==1) sprintf(rfx_strings[stcount],"layout|\"Left/mono channel\"");
+	      else sprintf(rfx_strings[stcount],"layout|\"Left channel\"");
+	      sprintf(rfx_strings[oninps+2+stcount],"layout|\"Right channel\"");
+	    }
+	    sprintf(rfx_strings[oninps+1+stcount],"layout|hseparator|");
+	  }
+
+	  if (ninps>0) {
+	    // add extra in 2 extra params for "link channels"
+	    in_params=(weed_plant_t **)weed_malloc((++ninps+stcount*2)*sizeof(weed_plant_t *));
+	    in_params[ninps+stcount*2-1]=NULL;
+	    if (dual==WEED_TRUE) {
+	      in_params[ninps-1]=weed_switch_init("link","_Link left and right parameters",WEED_TRUE);
+	      gui=weed_parameter_template_get_gui(in_params[ninps-1]);
+	      weed_set_int_value(gui,"copy_value_to",ninps);
+	      sprintf(rfx_strings[0],"layout|p%d|",ninps-1);
+
+	      // link it to a dummy param which is hidden and reinit - this allows the value to be updated and the plugin to be reinited at any time
+	      in_params[ninps]=weed_switch_init("link dummy","linkdummy",WEED_TRUE);
+	      weed_set_int_value(in_params[ninps],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE); 
+	      gui=weed_parameter_template_get_gui(in_params[ninps]);
+	      weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+	    }
+
+	  }
+	  else in_params=NULL;
+
+	  if (noutps>0) {
+	    out_params=(weed_plant_t **)weed_malloc(++noutps*sizeof(weed_plant_t *));
+	    out_params[noutps-1]=NULL;
+	  }
+	  else out_params=NULL;
+
+	  //fprintf(stderr,"%s has inc %d and outc %d\n",laddes->Name,ninchs,noutchs);
+
+	  if (ninchs>0) {
+	    in_chantmpls=(weed_plant_t **)weed_malloc(2*sizeof(weed_plant_t *));
+	    if (ninchs==1) sprintf(cname,"Mono channel");
+	    else if (ninchs==2) sprintf(cname,"Stereo channel");
+	    else sprintf(cname,"Multi channel");
+	    in_chantmpls[0]=weed_audio_channel_template_init(cname,0);
+	    in_chantmpls[1]=NULL;
+	    if (!dual||oninchs!=1) weed_set_int_value(in_chantmpls[0],"audio_channels",ninchs);
+	    weed_set_boolean_value(in_chantmpls[0],"audio_interleaf",WEED_FALSE);
+	  }
+	  else in_chantmpls=NULL;
+
+	  if (noutchs>0) {
+	    out_chantmpls=(weed_plant_t **)weed_malloc(++noutchs*sizeof(weed_plant_t *));
+	    if (noutchs==1) sprintf(cname,"Mono channel");
+	    else if (noutchs==2) sprintf(cname,"Stereo channel");
+	    else sprintf(cname,"Multi channel");
+	    out_chantmpls[0]=weed_audio_channel_template_init(cname,0);
+	    out_chantmpls[1]=NULL;
+	    if (!dual||onoutchs!=1) weed_set_int_value(out_chantmpls[0],"audio_channels",noutchs);
+	    weed_set_boolean_value(out_chantmpls[0],"audio_interleaf",WEED_FALSE);
+	    if (oninchs==onoutchs&&!(ladprop&LADSPA_PROPERTY_INPLACE_BROKEN)) weed_set_int_value(out_chantmpls[0],"flags",WEED_CHANNEL_CAN_DO_INPLACE);
+	  }
+	  else out_chantmpls=NULL;
+
+	  cnoutps=cninps=0;
+
+	  for (i=0;i<laddes->PortCount;i++) {
+	    ladpdes=laddes->PortDescriptors[i];
+	    ladphint=laddes->PortRangeHints[i];
+	    ladphintdes=ladphint.HintDescriptor;
+
+	    if (ladpdes&LADSPA_PORT_CONTROL) {
+	      // parameter
+	      if (ladpdes&LADSPA_PORT_INPUT) {
+		// in_param
+		snprintf(label,LABSIZE,"_%s",laddes->PortNames[i]);
+
+		if (ladphintdes&LADSPA_HINT_TOGGLED) {
+		  // boolean type
+		  if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+		    in_params[cninps]=weed_switch_init(laddes->PortNames[i],label,WEED_TRUE);
+		    if (dual) in_params[cninps+oninps]=weed_switch_init(laddes->PortNames[i],label,WEED_TRUE);
+		  }
+		  else {
+		    in_params[cninps]=weed_switch_init(laddes->PortNames[i],label,WEED_FALSE);
+		    if (dual) in_params[cninps+oninps]=weed_switch_init(laddes->PortNames[i],label,WEED_FALSE);
+		  }
+		}
+		else {
+		  // int/float type
+		  lbound=ladphint.LowerBound;
+		  ubound=ladphint.UpperBound;
+
+		  if (lbound==0.&&ubound==0.) {
+		    // try some sanity
+		    lbound=0.;
+		    ubound=1.;
+		  }
+
+		  defval=lbound;
+
+		  if (ladphintdes&LADSPA_HINT_DEFAULT_LOW) {
+		    defval+=(ubound-lbound)/4.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MIDDLE) {
+		    defval+=(ubound-lbound)/2.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_HIGH) {
+		    defval+=(ubound-lbound)*3./4.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MAXIMUM) {
+		    defval=ubound;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_0) {
+		    defval=0.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+		    defval=1.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_100) {
+		    defval=100.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_440) {
+		    defval=440.;
+		  }
+		  if (ladphintdes&LADSPA_HINT_INTEGER) {
+		    in_params[cninps]=weed_integer_init(laddes->PortNames[i],label,defval+.5,lbound+.5,ubound+.5);
+		    if (dual) in_params[cninps+oninps]=weed_integer_init(laddes->PortNames[i],label,defval+.5,lbound+.5,ubound+.5);
+		  }
+		  else {
+		    in_params[cninps]=weed_float_init(laddes->PortNames[i],label,defval,lbound,ubound);
+		    if (dual) in_params[cninps+oninps]=weed_float_init(laddes->PortNames[i],label,defval,lbound,ubound);
+		  }
+
+		}
+
+		if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(in_params[cninps],"plugin_sample_rate",WEED_TRUE);
+		else weed_set_boolean_value(in_params[cninps],"plugin_sample_rate",WEED_FALSE);
+
+		if (ladphintdes&LADSPA_HINT_LOGARITHMIC) weed_set_boolean_value(in_params[cninps],"plugin_logarithmic",WEED_TRUE);
+		else weed_set_boolean_value(in_params[cninps],"plugin_logarithmic",WEED_FALSE);
+
+		if (dual) {
+		  if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(in_params[cninps+oninps],"plugin_sample_rate",WEED_TRUE);
+		  else weed_set_boolean_value(in_params[cninps+oninps],"plugin_sample_rate",WEED_FALSE);
+
+		  if (ladphintdes&LADSPA_HINT_LOGARITHMIC) weed_set_boolean_value(in_params[cninps+oninps],"plugin_logarithmic",WEED_TRUE);
+		  else weed_set_boolean_value(in_params[cninps+oninps],"plugin_logarithmic",WEED_FALSE);
+
+		  sprintf(rfx_strings[cninps+1+stcount],"layout|p%d|",cninps);
+		  sprintf(rfx_strings[cninps+oninps+3+stcount],"layout|p%d|",cninps+oninps);
+		}
+
+		cninps++;
+	      }
+	      else {
+		// out_param
+		if (ladphintdes&LADSPA_HINT_TOGGLED) {
+		  // boolean type
+		  if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+		    out_params[cnoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_TRUE);
+		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_TRUE);
+		  }
+		  else {
+		    out_params[cnoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_FALSE);
+		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_FALSE);
+		  }
+		}
+		else {
+		  // int/float type
+		  lbound=ladphint.LowerBound;
+		  ubound=ladphint.UpperBound;
+		  defval=lbound;
+
+		  if (ladphintdes&LADSPA_HINT_DEFAULT_LOW) {
+		    defval+=(ubound-lbound)/4.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MIDDLE) {
+		    defval+=(ubound-lbound)/2.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_HIGH) {
+		    defval+=(ubound-lbound)*3./4.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MAXIMUM) {
+		    defval=ubound;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_0) {
+		    defval=0.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+		    defval=1.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_100) {
+		    defval=100.;
+		  }
+
+		  else if (ladphintdes&LADSPA_HINT_DEFAULT_440) {
+		    defval=440.;
+		  }
+		  
+		  if (ladphintdes&LADSPA_HINT_INTEGER) {
+		    out_params[cnoutps]=weed_out_param_integer_init(laddes->PortNames[i],defval+.5,lbound+.5,ubound+.5);
+		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_integer_init(laddes->PortNames[i],defval+.5,lbound+.5,ubound+.5);
+		  }
+		  else {
+		    out_params[cnoutps]=weed_out_param_float_init(laddes->PortNames[i],defval,lbound,ubound);
+		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_float_init(laddes->PortNames[i],defval,lbound,ubound);
+		  }
+
+		}
+
+		if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_TRUE);
+		else weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_FALSE);
+
+		if (dual) {
+		  if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_TRUE);
+		  else weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_FALSE);
+		}
+
+		cnoutps++;
+	      }
+
+
+	    }
+
+	  }
+
+	  snprintf(weed_name,PATH_MAX,"LADSPA: %s",laddes->Name);
+
+	  filter_class=weed_filter_class_init(weed_name,"LADSPA developers",0,0,&ladspa_init,&ladspa_process,&ladspa_deinit,
+					      in_chantmpls,out_chantmpls,in_params,out_params);
+	
+	  weed_set_string_value(filter_class,"extra_authors",laddes->Maker);
+
+	  weed_set_voidptr_value(filter_class,"plugin_lad_descriptor",laddes);
+
+	  weed_set_voidptr_value(filter_class,"plugin_lad_descriptor_func",(void *)lad_descriptor_func);
+	  weed_set_voidptr_value(filter_class,"plugin_lad_instantiate_func",(void *)lad_instantiate_func);
+	  weed_set_voidptr_value(filter_class,"plugin_lad_activate_func",(void *)lad_activate_func);
+	  weed_set_voidptr_value(filter_class,"plugin_lad_deactivate_func",(void *)lad_deactivate_func);
+	  weed_set_voidptr_value(filter_class,"plugin_lad_connect_port_func",(void *)lad_connect_port_func);
+	  weed_set_voidptr_value(filter_class,"plugin_lad_run_func",(void *)lad_run_func);
+	  weed_set_voidptr_value(filter_class,"plugin_lad_cleanup_func",(void *)lad_cleanup_func);
+
+	  if (dual==WEED_TRUE) {
+	    weed_set_boolean_value(filter_class,"plugin_dual",WEED_TRUE);
+	    if (ninps>0) {
+	      gui=weed_filter_class_get_gui(filter_class);
+	      weed_set_string_value(gui,"layout_scheme","RFX");
+	      weed_set_string_value(gui,"rfx_delim","|");
+
+	      // subtract 1 from ninps since we incremented it
+	      weed_set_string_array(gui,"rfx_strings",ninps+2+stcount,rfx_strings);
+	      for (wnum=0;wnum<ninps+2+stcount;wnum++) weed_free(rfx_strings[wnum]);
+	      weed_free(rfx_strings);
+	      rfx_strings=NULL;
+	      
+	      for (j=0;j<oninps;j++) {
+		gui=weed_parameter_template_get_gui(in_params[j]);
+		weed_set_int_value(gui,"copy_value_to",j+oninps);
+		gui=weed_parameter_template_get_gui(in_params[j+oninps]);
+		weed_set_int_value(gui,"copy_value_to",j);
+	      }
+
+	    }
+	  }
+	  else weed_set_boolean_value(filter_class,"plugin_dual",WEED_FALSE);
+
+	  if (in_params!=NULL) weed_free(in_params);
+	  if (out_params!=NULL) weed_free(out_params);
+	  if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+	  if (out_chantmpls!=NULL) weed_free(out_chantmpls);
+
+	  weed_set_int_value(filter_class,"plugin_in_channels",oninchs);
+	  weed_set_int_value(filter_class,"plugin_out_channels",onoutchs);
+	  weed_set_int_value(filter_class,"plugin_in_params",oninps);
+	  weed_set_int_value(filter_class,"plugin_out_params",onoutps);
+	  
+	  weed_plugin_info_add_filter_class (plugin_info,filter_class);
+	  num_plugins++;
+	  num_filters++;
+	  //fprintf(stderr,"DONE\n");
+	}
+      }
+    }
+
+#ifndef DEBUG
+  dup2(new_stdout,1);
+  dup2(new_stderr,2);
+#endif
+
+  }
+
+
+  if (num_filters==0) {
+    fprintf(stderr,"No LADSPA plugins found; if you have them installed please set the LADSPA_PATH environment variable to point to them.\n");
+    return NULL;
+  }
+  weed_set_int_value(plugin_info,"version",package_version);
+
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/layout_blends.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/layout_blends.c Changed

@@ -9,12 +9,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -26,14 +24,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 
@@ -149,7 +148,7 @@
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),weed_channel_template_init("in channel 1",0,palette_list),NULL};
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
 
-    weed_plant_t *in_params1[]={weed_float_init("start","_Start",0.666667,0.,1.),weed_radio_init("sym","Make s_ymmetrical",1,1),weed_radio_init("usend","Use _end value",0,1),weed_float_init("end","_End",0.333333,0.,1.),weed_switch_init("vert","Split _horizontally",0),weed_float_init("borderw","Border _width",0.,0.,0.5),weed_colRGBi_init("borderc","Border _colour",0,0,0),NULL};
+    weed_plant_t *in_params1[]={weed_float_init("start","_Start",0.666667,0.,1.),weed_radio_init("sym","Make s_ymmetrical",1,1),weed_radio_init("usend","Use _end value",0,1),weed_float_init("end","_End",0.333333,0.,1.),weed_switch_init("vert","Split _horizontally",WEED_FALSE),weed_float_init("borderw","Border _width",0.,0.,0.5),weed_colRGBi_init("borderc","Border _colour",0,0,0),NULL};
 
     weed_plant_t *filter_class=weed_filter_class_init("triple split","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&tsplit_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/libvis.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/libvis.c Changed

@@ -17,12 +17,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -34,14 +32,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <stdlib.h>

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/lifeTV.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/lifeTV.c Changed

@@ -19,12 +19,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -36,14 +34,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <strings.h>

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/livetext.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/livetext.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/log_sig.c Added

@@ -0,0 +1,102 @@
+// nn_programmer.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+// converts float values to log_sig values
+
+//#define DEBUG
+#include <stdio.h>
+#include <math.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+
+int logsig_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+  double fval;
+
+  register int i;
+
+  for (i=0;i<256;i++) {
+    if (weed_plant_has_leaf(in_params[i],"value")) {
+      fval=weed_get_double_value(in_params[i],"value",&error);
+      weed_set_double_value(out_params[i],"value",1./(1.+exp(-fval)));
+    }
+  }
+
+  weed_free(in_params);
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+
+  if (plugin_info!=NULL) {
+    weed_plant_t *filter_class;
+
+    weed_plant_t *in_params[257];
+    weed_plant_t *out_params[257];
+
+    register int i;
+
+    char name[256];
+    char label[256];
+
+    for (i=0;i<256;i++) {
+      snprintf(name,256,"input%03d",i);
+      snprintf(label,256,"Input %03d",i);
+      in_params[i]=weed_float_init(name,label,0.,-1000000000000.,1000000000000.);
+      snprintf(name,256,"Output %03d",i);
+      out_params[i]=weed_out_param_float_init(name,0.,-1.,1.);
+    }
+
+    in_params[i]=NULL;
+    out_params[i]=NULL;
+
+    filter_class=weed_filter_class_init("log_sig","salsaman",1,0,NULL,&logsig_process,
+					NULL,NULL,NULL,in_params,out_params);
+
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/mirrors.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/mirrors.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/multi_blends.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/multi_blends.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c Changed

@@ -8,12 +8,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -25,14 +23,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <math.h>

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/negate.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/negate.c Changed

@@ -1,6 +1,6 @@
 // negate.c
 // weed plugin
-// (c) G. Finch (salsaman) 2005
+// (c) G. Finch (salsaman) 2005 - 2012
 //
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
@@ -10,12 +10,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -27,28 +25,48 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 int negate_process (weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   unsigned char *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
   unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
-  int width=weed_get_int_value(in_channel,"width",&error)*3;
+
+  int width=weed_get_int_value(in_channel,"width",&error);
   int height=weed_get_int_value(in_channel,"height",&error);
+  int pal=weed_get_int_value(in_channel,"current_palette",&error);
   int irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
   int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
+  int psize=4,start=0;
+
   unsigned char *end=src+height*irowstride;
+
   register int i;
 
+  int enabled=weed_get_boolean_value(in_params[0],"value",&error);
+  weed_free(in_params);
+
+  if (enabled==WEED_FALSE) {
+    return WEED_NO_ERROR;
+  }
+
+  if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
+  if (pal==WEED_PALETTE_ARGB32) start=1;
+
+  width*=psize;
+
+
   // new threading arch
   if (weed_plant_has_leaf(out_channel,"offset")) {
     int offset=weed_get_int_value(out_channel,"offset",&error);
@@ -60,8 +78,10 @@
   }
 
   for (;src<end;src+=irowstride) {
-    for (i=0;i<width;i++) {
+    for (i=start;i<width;i+=psize) {
       dst[i]=src[i]^0xFF;
+      dst[i+1]=src[i+1]^0xFF;
+      dst[i+2]=src[i+2]^0xFF;
     }
     dst+=orowstride;
   } 
@@ -74,11 +94,17 @@
 weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
+    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,WEED_PALETTE_END};
 
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("negate","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&negate_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
+    weed_plant_t *in_params[]={weed_switch_init("enabled","_Enabled",WEED_TRUE),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("negate","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&negate_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+
+
+    weed_plant_t *gui=weed_parameter_template_get_gui(in_params[0]);
+    weed_set_boolean_value(gui,"hidden",WEED_TRUE);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/nn_programmer.c Added

@@ -0,0 +1,264 @@
+// nn_programmer.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+// works in combination with data_processor to make a neural net
+//#define DEBUG
+#include <stdio.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <sys/time.h>
+
+typedef struct {
+  double *constvals;
+  double *vals;
+} _sdata;
+
+#define MAXNODES 128
+#define MAXSTRLEN 8192
+
+#define NGAUSS 4
+
+static double drand (double max) {
+  double denom=(double)(2ul<<30)/max;
+  double num=(double)lrand48();
+  return (double)(num/denom);
+}
+
+
+static void seed_rand(void) {
+  struct timeval tv;
+  gettimeofday(&tv,NULL);
+  srand48(tv.tv_sec);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////
+
+
+int nnprog_init(weed_plant_t *inst) {
+  register int i,j;
+
+  _sdata *sdata=(_sdata *)weed_malloc(sizeof(_sdata));
+
+  if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+
+  sdata->vals=weed_malloc(MAXNODES*2*MAXNODES*sizeof(double));
+
+  if (sdata->vals==NULL) {
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  sdata->constvals=weed_malloc(MAXNODES*sizeof(double));
+
+  if (sdata->constvals==NULL) {
+    weed_free(sdata->vals);
+    weed_free(sdata);
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+
+  seed_rand();
+
+  for (i=0;i<MAXNODES*2;i++) {
+    if (i<MAXNODES) sdata->constvals[i]=drand(2.)-1.;
+    for (j=0;j<MAXNODES;j++) {
+      sdata->vals[i*MAXNODES+j]=drand(2.)-1.;
+    }
+  }
+
+  weed_set_voidptr_value(inst,"plugin_internal",sdata);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+int nnprog_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  double fit=(1.-weed_get_double_value(in_params[0],"value",&error))/(double)NGAUSS;
+  double rval;
+
+  int innodes=weed_get_int_value(in_params[1],"value",&error);
+  int outnodes=weed_get_int_value(in_params[2],"value",&error);
+  int hnodes=weed_get_int_value(in_params[3],"value",&error);
+
+  char *strings[256];
+  char tmp[MAXSTRLEN];
+
+  char *ptr;
+
+  int k,idx=0;
+
+  register int i,j,z;
+
+  weed_free(in_params);
+
+  // adjust values according to fitness
+  
+  for (i=0;i<hnodes+outnodes;i++) {
+    if (i<MAXNODES) {
+      rval=0.;
+      for (z=0;z<NGAUSS;z++) {
+	rval+=(drand(2.)-1.)*fit;
+      }
+
+      if (rval>0.)
+	sdata->constvals[i]+=(1.-sdata->constvals[i])*rval;
+      else 
+	sdata->constvals[i]+=(1.+sdata->constvals[i])*rval;
+
+      if (sdata->constvals[i]<-1.) sdata->constvals[i]=-1.;
+      if (sdata->constvals[i]>1.) sdata->constvals[i]=1.;
+    }
+    for (j=0;j<MAXNODES;j++) {
+
+      rval=0.;
+      for (z=0;z<NGAUSS;z++) {
+	rval+=(drand(2.)-1.)*fit;
+      }
+
+      if (rval>0.)
+	sdata->vals[idx]+=(1.-sdata->vals[idx])*rval;
+      else 
+	sdata->vals[idx]+=(1.+sdata->vals[idx])*rval;
+
+      if (sdata->vals[idx]<-1.) sdata->vals[idx]=-1.;
+      if (sdata->vals[idx]>1.) sdata->vals[idx]=1.;
+
+      idx++;
+    }
+  }
+  
+  
+  // create strings for hidden nodes (store values) 
+  
+  for (i=0;i<hnodes;i++) {
+    snprintf(tmp,MAXSTRLEN,"s[%d]=%f",i,sdata->constvals[i]);
+    ptr=tmp+strlen(tmp);
+    for (j=0;j<innodes;j++) {
+      snprintf(ptr,MAXSTRLEN,"+%f*i[%d]",sdata->vals[i*MAXNODES+j],j);
+      ptr=tmp+strlen(tmp);
+    }
+    strings[i]=strdup(tmp);
+  }
+
+  k=i;
+
+  // create strings for output nodes (store values) 
+
+  for (i=0;i<outnodes;i++) {
+    snprintf(tmp,MAXSTRLEN,"o[%d]=",i);
+    ptr=tmp+strlen(tmp);
+    for (j=0;j<hnodes;j++) {
+      snprintf(ptr,MAXSTRLEN,"+%f*s[%d]",sdata->vals[(k+i)*MAXNODES+j],j);
+      ptr=tmp+strlen(tmp);
+    }
+    strings[i+k]=strdup(tmp);
+  }
+
+
+  for (i=0;i<hnodes+outnodes;i++) {
+    weed_set_string_value(out_params[i],"value",strings[i]);
+#ifdef DEBUG
+    if (strlen(strings[i])) printf("eqn %d: %s\n",i,strings[i]);
+#endif
+    weed_free(strings[i]);
+  }
+
+
+  weed_free(out_params);
+
+  return WEED_NO_ERROR;
+}
+
+
+int nnprog_deinit(weed_plant_t *inst) {
+  int error;
+  _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
+
+  if (sdata!=NULL) {
+    if (sdata->constvals!=NULL) weed_free(sdata->constvals);
+    if (sdata->vals!=NULL) weed_free(sdata->vals);
+    weed_free(sdata);
+  }
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+
+  if (plugin_info!=NULL) {
+    weed_plant_t *filter_class;
+
+    weed_plant_t *in_params[]={weed_float_init("fitness","_Fitness",0.,0.,1.),weed_integer_init("innodes","Number of _Input Nodes",1,1,256),weed_integer_init("outnodes","Number of _Output Nodes",1,1,128),weed_integer_init("hnodes","Number of _Hidden Nodes",1,1,128),NULL};
+    weed_plant_t *out_params[MAXNODES*2+1];
+
+    register int i;
+
+    char name[256];
+
+    for (i=0;i<MAXNODES*2;i++) {
+      snprintf(name,256,"Equation%03d",i);
+      out_params[i]=weed_out_param_text_init(name,"");
+    }
+
+    out_params[i]=NULL;
+
+    filter_class=weed_filter_class_init("nn_programmer","salsaman",1,0,&nnprog_init,&nnprog_process,
+					&nnprog_deinit,NULL,NULL,in_params,out_params);
+
+
+    for (i=1;i<4;i++) 
+      weed_set_int_value(in_params[i],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/noise.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/noise.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/onedTV.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/onedTV.c Changed

@@ -21,12 +21,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -38,14 +36,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 typedef unsigned int RGB32;

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/palette_test.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/palette_test.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/plasma.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/plasma.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/posterise.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/posterise.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/rippleTV.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/rippleTV.c Changed

@@ -20,12 +20,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -37,14 +35,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #define MAGIC_THRESHOLD 70

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/rotozoom.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/rotozoom.c Changed

@@ -1,3 +1,4 @@
+
 // rotozoom.c
 // original code (c) Kentaro Fukuchi (effecTV)
 // weed plugin
@@ -10,12 +11,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -27,36 +26,43 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <math.h>
 
-
-typedef unsigned int RGB32;
 static int roto[256];
 static int roto2[256];
 
 /////////////////////////////////////////////////////////////
 
-static void draw_tile(int stepx, int stepy, int zoom,RGB32 *texture,RGB32 *image, int video_width, int video_height)
-{
-  int x, y, xd, yd, a, b, sx, sy;
+static void draw_tile(int stepx, int stepy, int zoom, unsigned char *src, unsigned char *dst, 
+		      int video_width, int irowstride, int orowstride, int video_height,
+		      int dheight, int offset, int psize) {
+  int x, y, xd, yd, a, b, sx=0, sy=0;
+
+  int origin;
+
   register int i,j;
-  int test;
-    
-  int video_area=video_width*video_height;
-  sx = sy = 0;
+
+  orowstride/=psize;
+  irowstride-=video_width*psize;
+
   xd = (stepx * zoom) >> 12;
   yd = (stepy * zoom) >> 12;
-    
+  
+  sx = -yd*offset;
+  sy = xd*offset;
+
+
   /* Stepping across and down the screen, each screen row has a
    * starting coordinate in the texture: (sx, sy).  As each screen
    * row is traversed, the current texture coordinate (x, y) is
@@ -68,16 +74,21 @@
    * you move about the image.
    */
 
-  for (j = 0; j < video_height; j++) {
+  for (j = 0; j < dheight; j++) {
     x = sx; y = sy;   
     for (i = 0; i < video_width; i++) {
       a=((x>>12&255)*video_width)>>8;
       b=((y>>12&255)*video_height)>>8;
-      //      a*=video_width/64;
+
+      //       a*=video_width/64;
       //      b*=video_height/64;
-      *image++=((test=b*video_width+a)<video_area)?texture[test]:0;
+      origin=(b*orowstride+a)*psize;
+
+      weed_memcpy(dst,&src[origin],psize);
+      dst+=psize;
       x += xd; y += yd;
     }
+    dst+=irowstride;
     sx -= yd; sy += xd;
   }
 }
@@ -99,27 +110,42 @@
 
 
 int rotozoom_process (weed_plant_t *inst, weed_timecode_t timestamp) {
-  RGB32 *src,*dst;
-  int width,height;
-  int zoom;
-  weed_plant_t *in_channel,*out_channel;
+  unsigned char *src,*dst;
   int error;
+  weed_plant_t *in_channel,*out_channel;
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  int width,height,irowstride,orowstride,palette;
+  int psize=3;
+  int zoom,autozoom;
+
   int path=weed_get_int_value(inst,"plugin_path",&error);
   int zpath=weed_get_int_value(inst,"plugin_zpath",&error);
-  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-  int autozoom;
+
+  int offset=0,dheight;
 
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
 
-  src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
-  dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
+  src=(unsigned char *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
+  dst=(unsigned char *)weed_get_voidptr_value(out_channel,"pixel_data",&error);
 
   width = weed_get_int_value(in_channel,"width",&error);
   height = weed_get_int_value(in_channel,"height",&error);
+  palette = weed_get_int_value(in_channel,"current_palette",&error);
+  irowstride = weed_get_int_value(in_channel,"rowstrides",&error);
+  orowstride = weed_get_int_value(out_channel,"rowstrides",&error);
 
   autozoom=weed_get_boolean_value(in_params[1],"value",&error);
 
+  // new threading arch
+  if (weed_plant_has_leaf(out_channel,"offset")) {
+    offset=weed_get_int_value(out_channel,"offset",&error);
+    dheight=weed_get_int_value(out_channel,"height",&error);
+    dst+=offset*orowstride;
+  }
+  else dheight=height;
+
   if (autozoom==WEED_TRUE) {
     weed_set_int_value(inst,"plugin_zpath",(zpath + 1) & 255);
   }
@@ -129,7 +155,13 @@
   }
   zoom=roto2[zpath];
 
-  draw_tile(roto[path], roto[(path + 128) & 0xFF],zoom,src,dst,width,height);
+  if (palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) width>>=1; // 2 pixels per macropixel
+
+  if (palette==WEED_PALETTE_ARGB32||palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32||
+      palette==WEED_PALETTE_YUVA8888||palette==WEED_PALETTE_UYVY||palette==WEED_PALETTE_YUYV) psize=4;
+
+  draw_tile(roto[path], roto[(path + 128) & 0xFF],zoom,src,dst,width,irowstride,orowstride,height,dheight,offset,psize);
+
   weed_set_int_value(inst,"plugin_path",(path - 1) & 255);
 
   weed_free(in_params);
@@ -144,12 +176,14 @@
   weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
   if (plugin_info!=NULL) {
     int i;
-    int palette_list[]={WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,WEED_PALETTE_YUVA8888,WEED_PALETTE_END};
+    int palette_list[]={WEED_PALETTE_RGB24,WEED_PALETTE_BGR24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,
+			WEED_PALETTE_ARGB32,WEED_PALETTE_UYVY,WEED_PALETTE_YUYV,WEED_PALETTE_YUV888,WEED_PALETTE_YUVA8888,WEED_PALETTE_END};
     
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",0,palette_list),NULL};
     weed_plant_t *in_params[]={weed_integer_init("zoom","_Zoom value",128,0,255),weed_switch_init("autozoom","_Auto zoom",WEED_TRUE),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("rotozoom","effectTV",1,0,&rotozoom_init,&rotozoom_process,&rotozoom_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("rotozoom","effectTV",1,WEED_FILTER_HINT_MAY_THREAD,rotozoom_init,
+						      rotozoom_process,rotozoom_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
     
     weed_plugin_info_add_filter_class (plugin_info,filter_class);

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/shift.c Added

@@ -0,0 +1,209 @@
+// shift.c
+// weed plugin
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+/////////////////////////////////////////////////////////////
+
+
+
+
+static void add_bg_pixel(unsigned char *ptr, int pal, int clamping, int trans) {
+  if (trans==WEED_TRUE) trans=0;
+  else trans=255;
+
+  switch (pal) {
+  case WEED_PALETTE_RGB24:
+  case WEED_PALETTE_BGR24:
+    weed_memset(ptr,0,3);
+    break;
+
+  case WEED_PALETTE_RGBA32:
+  case WEED_PALETTE_BGRA32:
+    weed_memset(ptr,0,3);
+    ptr[3]=trans;
+    break;
+
+  case WEED_PALETTE_ARGB32:
+    weed_memset(ptr+1,0,3);
+    ptr[0]=trans;
+    break;
+
+  case WEED_PALETTE_YUV888:
+    if (clamping!=WEED_YUV_CLAMPING_CLAMPED) ptr[0]=0;
+    else ptr[0]=16;
+    ptr[1]=ptr[2]=128;
+    break;
+
+  case WEED_PALETTE_YUVA8888:
+    if (clamping!=WEED_YUV_CLAMPING_CLAMPED) ptr[0]=0;
+    else ptr[0]=16;
+    ptr[1]=ptr[2]=128;
+    ptr[3]=trans;
+    break;
+  }
+
+}
+
+
+static void add_bg_row(unsigned char *ptr, int xwidth, int pal, int clamping, int trans) {
+  register int i;
+  int psize=4;
+  if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_YUV888) psize=3;
+  for (i=0;i<xwidth;i+=psize) add_bg_pixel(ptr+i,pal,clamping,trans);
+}
+
+
+
+int shift_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  unsigned char *src=(unsigned char *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
+  unsigned char *dst=(unsigned char *)weed_get_voidptr_value(out_channel,"pixel_data",&error);
+
+  int width=weed_get_int_value(in_channel,"width",&error);
+  int sheight=weed_get_int_value(in_channel,"height",&error);
+  int irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
+  int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
+
+  unsigned char *dend;
+
+  size_t send=irowstride*sheight;
+
+  int x=(int)(weed_get_double_value(in_params[0],"value",&error)*(double)width+.5);
+  int y=(int)(weed_get_double_value(in_params[1],"value",&error)*(double)sheight+.5)*irowstride;
+  int trans=weed_get_boolean_value(in_params[2],"value",&error);
+
+  int offset=0;
+  int dheight=weed_get_int_value(out_channel,"height",&error); // may differ because of threading
+
+  int pal=weed_get_int_value(in_channel,"current_palette",&error);
+
+  int psize=4;
+
+  int sx,sy,ypos;
+
+  int istart,iend;
+
+  int clamping=WEED_YUV_CLAMPING_CLAMPED;
+
+  weed_free(in_params);
+
+  // new threading arch
+  if (weed_plant_has_leaf(out_channel,"offset")) {
+    offset=weed_get_int_value(out_channel,"offset",&error);
+    dst+=offset*orowstride;
+  }
+
+  dend=dst+dheight*orowstride;
+  
+  ypos=(offset-1)*irowstride;
+
+  if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_YUV888) psize=3;
+
+  if (pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) 
+    clamping=weed_get_int_value(in_channel,"YUV_clamping",&error);
+
+  x*=psize;
+  width*=psize;
+
+  if (x<0) {
+    // shift left
+    istart=0;
+    iend=width+x;
+    if (iend<0) iend=0;
+  }
+  else {
+    // shift right
+    if (x>=width) x=width;
+    istart=x;
+    iend=width;
+  }
+
+  for (;dst<dend;dst+=orowstride) {
+    ypos+=irowstride;
+    sy=ypos-y;
+
+    if (sy<0||sy>=send) {
+      add_bg_row(dst,width,pal,clamping,trans);
+      continue;
+    }
+
+    if (x>0) {
+      add_bg_row(dst,x,pal,clamping,trans);
+      sx=0;
+    }
+    else sx=-x;
+
+    if (istart<iend) {
+      weed_memcpy(&dst[istart],src+sy+sx,iend-istart);
+    }
+
+    if (iend<width) add_bg_row(&dst[iend],width-iend,pal,clamping,trans);
+
+  }
+
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,
+			WEED_PALETTE_YUV888,WEED_PALETTE_YUVA8888,WEED_PALETTE_END};
+
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
+    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",0,palette_list),NULL};
+    weed_plant_t *in_params[]={weed_float_init("xshift","_X shift (ratio)",0.,-1.,1.),
+			       weed_float_init("yshift","_Y shift (ratio)",0.,-1.,1.),
+			       weed_switch_init("transbg","_Transparent edges",WEED_FALSE),
+			       NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("shift","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,&shift_process,NULL,
+						      in_chantmpls,out_chantmpls,in_params,NULL);
+
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/simple_blend.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/simple_blend.c Changed

@@ -10,12 +10,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -27,14 +25,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 /* precomputed tables */
@@ -92,32 +91,42 @@
 /////////////////////////////////////////////////////////////////////////
 
 int common_init (weed_plant_t *inst) {
-
   return WEED_NO_ERROR;
 }
 
 
 static int common_process (int type, weed_plant_t *inst, weed_timecode_t timecode) {
   int error;
+
   weed_plant_t **in_channels=weed_get_plantptr_array(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t *in_param;
+
   unsigned char *src1=weed_get_voidptr_value(in_channels[0],"pixel_data",&error);
   unsigned char *src2=weed_get_voidptr_value(in_channels[1],"pixel_data",&error);
   unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
-  int width=weed_get_int_value(in_channels[0],"width",&error)*3;
+
+  unsigned char blendneg;
+  unsigned char blend_factor;
+
+  int width=weed_get_int_value(in_channels[0],"width",&error);
   int height=weed_get_int_value(in_channels[0],"height",&error);
+  int pal=weed_get_int_value(in_channels[0],"current_palette",&error);
   int irowstride1=weed_get_int_value(in_channels[0],"rowstrides",&error);
   int irowstride2=weed_get_int_value(in_channels[1],"rowstrides",&error);
   int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
-  unsigned char *end=src1+height*irowstride1;
   int inplace=(src1==dst);
-  weed_plant_t *in_param;
+  int bf,psize=4;
+  int start=0;
+
+  unsigned char *end=src1+height*irowstride1;
 
   register int j;
 
-  int bf;
-  unsigned char blendneg;
 
-  unsigned char blend_factor;
+  if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
+  if (pal==WEED_PALETTE_ARGB32) start=1;
+
+  width*=psize;
 
   in_param=weed_get_plantptr_value(inst,"in_parameters",&error);
   bf=weed_get_int_value(in_param,"value",&error);
@@ -139,7 +148,7 @@
   }
 
   for (;src1<end;src1+=irowstride1) {
-    for (j=0;j<width;j+=3) {
+    for (j=start;j<width;j+=psize) {
       switch (type) {
       case 0:
 	// chroma blend
@@ -199,31 +208,39 @@
   weed_plant_t **clone1,**clone2,**clone3;
 
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
-    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),weed_channel_template_init("in channel 1",0,palette_list),NULL};
+    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,WEED_PALETTE_END};
+    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),
+				  weed_channel_template_init("in channel 1",0,palette_list),NULL};
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
     weed_plant_t *in_params1[]={weed_integer_init("amount","Blend _amount",128,0,255),NULL};
     weed_plant_t *in_params2[]={weed_integer_init("threshold","luma _threshold",64,0,255),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("chroma blend","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&chroma_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("chroma blend","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,
+						      &chroma_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
 
     weed_set_boolean_value(in_params1[0],"transition",WEED_TRUE);
     weed_set_boolean_value(in_params2[0],"transition",WEED_TRUE);
 
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
 
-    filter_class=weed_filter_class_init("luma overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&lumo_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),in_params2,NULL);
+    filter_class=weed_filter_class_init("luma overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,NULL,
+					&lumo_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),
+					(clone2=weed_clone_plants(out_chantmpls)),in_params2,NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
 
-    filter_class=weed_filter_class_init("luma underlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&lumu_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params2)),NULL);
+    filter_class=weed_filter_class_init("luma underlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,
+					&lumu_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),
+					(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params2)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
     weed_free(clone3);
 
-    filter_class=weed_filter_class_init("negative luma overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,&common_init,&nlumo_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params2)),NULL);
+    filter_class=weed_filter_class_init("negative luma overlay","salsaman",1,WEED_FILTER_HINT_MAY_THREAD,
+					&common_init,&nlumo_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),
+					(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params2)),NULL);
     weed_plugin_info_add_filter_class (plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/slide_over.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/slide_over.c Changed

@@ -9,12 +9,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -26,14 +24,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 
@@ -180,7 +179,7 @@
     int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
     weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),weed_channel_template_init("in channel 1",0,palette_list),NULL};
     weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",0,palette_list),NULL};
-    weed_plant_t *in_params[]={weed_integer_init("amount","Transition _value",128,0,255),weed_radio_init("dir_rand","_Random",1,1),weed_radio_init("dir_r2l","_Right to left",0,1),weed_radio_init("dir_l2r","_Left to right",0,1),weed_radio_init("dir_b2t","_Bottom to top",0,1),weed_radio_init("dir_t2b","_Top to bottom",0,1),weed_switch_init("mlower","_Slide lower clip",1),weed_switch_init("mupper","_Slide upper clip",0),NULL};
+    weed_plant_t *in_params[]={weed_integer_init("amount","Transition _value",128,0,255),weed_radio_init("dir_rand","_Random",1,1),weed_radio_init("dir_r2l","_Right to left",0,1),weed_radio_init("dir_l2r","_Left to right",0,1),weed_radio_init("dir_b2t","_Bottom to top",0,1),weed_radio_init("dir_t2b","_Top to bottom",0,1),weed_switch_init("mlower","_Slide lower clip",WEED_TRUE),weed_switch_init("mupper","_Slide upper clip",WEED_FALSE),NULL};
 
     weed_plant_t *filter_class=weed_filter_class_init("slide over","salsaman",1,0,&sover_init,&sover_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/softlight.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/softlight.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/syna.h Added

@@ -0,0 +1,150 @@
+/*
+    Definitions for Syna
+
+    - Marq
+*/
+
+enum {  Nc1=0,NC1,Nd1,ND1, Ne1,Nf1,NF1,Ng1, NG1,Na1,NA1,Nb1,
+        Nc2,  NC2,Nd2,ND2, Ne2,Nf2,NF2,Ng2, NG2,Na2,NA2,Nb2,
+        Nc3,  NC3,Nd3,ND3, Ne3,Nf3,NF3,Ng3, NG3,Na3,NA3,Nb3,
+        Nc4,  NC4,Nd4,ND4, Ne4,Nf4,NF4,Ng4, NG4,Na4,NA4,Nb4,
+        Nc5,  NC5,Nd5,ND5, Ne5,Nf5,NF5,Ng5, NG5,Na5,NA5,Nb5,
+        Nc6,  NC6,Nd6,ND6, Ne6,Nf6,NF6,Ng6, NG6,Na6,NA6,Nb6,
+        NECHON, NECHOFF, NSTOP, NVOL, NSLIDE, NEMPTY /* Special "notes" */
+     };
+
+// the base frequency
+
+#define BFREQ 262
+
+
+
+
+// TODO - use enum
+#define KANTTI 0
+#define SINI   1
+#define SAHA   2
+#define KOHINA 3
+#define WAVES 4 // must be KOHINA+1
+
+#define INSTR 30
+#define PTLEN 100
+#define MAXR 1000
+
+#define ECHON -4
+#define ECHOFF -5
+#define STOP -6
+#define END -2
+#define LOOP -3
+#define VOL -7
+#define SLIDE -8
+
+#ifndef M_PI
+#define M_PI 3.141592
+#endif
+
+#undef TINY
+
+#define NCHANNELS 10
+
+
+typedef struct {
+  float   *aalto[WAVES];
+
+  int  *instr[INSTR],*echo[INSTR],vol[INSTR],pola[INSTR],
+    prev[INSTR],pan[INSTR],off[INSTR],plus[INSTR],slide[INSTR];
+
+// an addition for Syna Live -Antti
+  int	live_row[INSTR];
+  int	new_live_row[INSTR];
+
+  int  global,slen,update,new_update,trak[INSTR][PTLEN],ptn[MAXR][PTLEN],
+            ti[INSTR],pi[INSTR],len[INSTR],ekolen;
+
+  char *module,eko[INSTR];
+
+  int song_bpm;
+
+  int base_freq;
+
+  int counter;
+
+  int maxtracks;
+} _sdata;
+
+
+static char *notes[]={
+            "c1","C1","d1","D1", "e1","f1","F1","g1", "G1","a1","A1","b1",
+            "c2","C2","d2","D2", "e2","f2","F2","g2", "G2","a2","A2","b2",
+            "c3","C3","d3","D3", "e3","f3","F3","g3", "G3","a3","A3","b3",
+            "c4","C4","d4","D4", "e4","f4","F4","g4", "G4","a4","A4","b4",
+            "c5","C5","d5","D5", "e5","f5","F5","g5", "G5","a5","A5","b5",
+            "c6","C6","d6","D6", "e6","f6","F6","g6", "G6","a6","A6","b6",
+            "echo1","echo0","stop","vol","sld","0"};
+
+static int notei[]={
+            0,0,0,0, 0,0,0,0, 0,0,0,0,
+            0,0,0,0, 0,0,0,0, 0,0,0,0,
+            0,0,0,0, 0,0,0,0, 0,0,0,0,
+            0,0,0,0, 0,0,0,0, 0,0,0,0,
+            0,0,0,0, 0,0,0,0, 0,0,0,0,
+            1047,1109,1175,1245, 1319,1397,1480,1568, 1661,1760,1864,1976,
+            ECHON,ECHOFF,STOP,VOL,SLIDE,0};
+
+
+static void adsr(_sdata *, int a, int d, int s, int r, int mod, int swp, int ins, int wave, int wave_mod);
+static void cleanup(char *s);
+
+
+/* Some variables that might be useful */
+//extern int syna_counter,syna_row;
+
+/* Init the whole shit. Instruments etc. Call this first of all.
+   freq=main frequency */
+static int syna_init(_sdata *, int freq);
+
+#if 0
+// Change all the live rows.
+static void set_live_rows(_sdata *, int * the_rows);
+#endif
+
+// Change just one live row.
+// input: channel. Should be larger than 1, maximum according to song's number of channels.
+// input: the row. Should be larger than 0, maximum according to song's number of patterns.
+static void set_live_row(_sdata *, int channel, int the_row);
+
+// Alter the tempo realtime.
+// input: tempo in bpm. Should be larger than 1.
+static void set_tempo(_sdata *, int tempo);
+
+// Alter the frequency realtime.
+// input: freq relative to 262 Hz, so the actual base frequency is (262+freq). Should be larger than -262.
+static void set_base_freq(_sdata *sdata, int freq);
+
+#ifndef TINY
+/* Loads a tune from a file. 0=OK, -1=error */
+static int syna_load(_sdata *, const char *tune);
+#endif
+
+/* Gets a tune from memory */
+static int syna_get(_sdata *);
+
+/* Plays a fragment to destination */
+static void syna_play(_sdata *sdata, float *dest, int length, int channels, int interleave);
+
+/* Sets channel volume [0..1]. Channels start from 1 */
+//static void syna_setvol(_sdata *, int chn, float nvol);
+
+/* Sets BPM */
+//static void syna_setbpm(_sdata *, int bpm);
+
+/* Trigs channel with note (see enum above) */
+//static void syna_trig(int chn,int note);
+
+/* (Un)mutes channel 0=normal 1=mute, delay=0 - mute at once, delay=1 -
+   mute when the next row starts */
+//static void syna_mute(int chn,int nmute,int delay);
+
+/* Transposes a channel. Negative tp transposes down, positive up. Not
+   relative to the previous transposition! */
+//static void syna_transpose(int chn,int tp);

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/textfun.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/textfun.c Changed

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/tone_gen.c Added

@@ -0,0 +1,167 @@
+// tone_gen.c
+// weed plugin to generate simple audio tones
+// (c) G. Finch (salsaman) 2012
+//
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h> // optional
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h" // optional
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////////////
+
+static int num_versions=1; // number of different weed api versions supported
+static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+
+static int package_version=1; // version of this package
+
+//////////////////////////////////////////////////////////////////
+
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
+#else
+#include "../../libweed/weed-plugin.h" // optional
+#endif
+
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
+#include <string.h>
+
+/////////////////////////////////////////////////////////////
+
+static int resample(float **inbuf, float *outbuf, int nsamps, int nchans, int inter, int irate, int orate) {
+  // resample (time stretch) nsamps samples from inbuf at irate to outbuf at outrate
+  // return how many samples in in were consumed
+
+  // we maintain the same number of channels and interleave if necessary 
+
+  register size_t offs=0;
+  register float src_offset_f=0.f;
+  register int src_offset_i=0;
+  register int i,j;
+  register double scale;
+
+  scale=(double)irate/(double)orate;
+
+  for (i=0;i<nsamps;i++) {
+    // process each sample
+
+    if (inter) {
+      for (j=0;j<nchans;j++) {
+	outbuf[offs]=inbuf[j][src_offset_i];
+	offs++;
+      }
+    }
+    else {
+      for (j=0;j<nchans;j++) {
+	outbuf[offs+(j*nsamps)]=inbuf[j][src_offset_i];
+      }
+      offs++;
+    }
+
+    // resample on the fly
+    src_offset_i=(int)(src_offset_f+=scale);
+
+  }
+
+  return src_offset_i;
+}
+
+
+
+/////////////////////////////////////////////////////////////
+
+
+int tonegen_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+  int error;
+  int chans,nsamps,inter,rate,nrsamps;
+
+  weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  float *dst=weed_get_voidptr_value(out_channel,"audio_data",&error);
+
+  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  double freq=weed_get_double_value(in_params[0],"value",&error);
+  double mult=weed_get_double_value(in_params[1],"value",&error);
+  double trate;
+
+  float **buff;
+
+  register int i,j;
+
+  weed_free(in_params);
+
+  chans=weed_get_int_value(out_channel,"audio_channels",&error);
+  nsamps=weed_get_int_value(out_channel,"audio_data_length",&error);
+  inter=weed_get_boolean_value(out_channel,"audio_interleaf",&error);
+  rate=weed_get_int_value(out_channel,"audio_rate",&error);
+
+
+
+  // fill with audio at TRATE
+  trate=freq*mult;
+
+  if (trate<0.) trate=-trate;
+
+  if (trate==0.) {
+    memset(dst,0,nsamps*chans*sizeof(float));
+    return WEED_NO_ERROR;
+  }
+
+  nrsamps=((double)nsamps/(double)rate*trate+.5);
+  buff=weed_malloc(chans*sizeof(float *));
+  for (i=0;i<chans;i++) {
+    buff[i]=weed_malloc(nrsamps*sizeof(float));
+  }
+
+  for (i=0;i<nrsamps;i++) {
+    for (j=0;j<chans;j++) {
+      buff[j][i]=1.;
+    }
+    i++;
+    if (i<nrsamps) {
+      for (j=0;j<chans;j++) {
+	buff[j][i]=-1.;
+      }
+    }
+  }
+
+  resample(buff,dst,nsamps,chans,inter,trate,rate);
+
+  for (i=0;i<chans;i++) {
+    weed_free(buff[i]);
+  }
+
+  weed_free(buff);
+
+  return WEED_NO_ERROR;
+}
+
+
+
+
+weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+  weed_plant_t *plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
+  if (plugin_info!=NULL) {
+    weed_plant_t *out_chantmpls[]={weed_audio_channel_template_init("out channel 0",0),NULL};
+    weed_plant_t *in_params[]={weed_float_init("freq","_Frequency",7500.,0.0,48000.0),
+			       weed_float_init("multiplier","Frequency _Multiplier",1.,.01,1000.),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("tone generator","salsaman",1,0,NULL,&tonegen_process,
+						      NULL,NULL,out_chantmpls,in_params,NULL);
+
+    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    weed_set_int_value(plugin_info,"version",package_version);
+  }
+  return plugin_info;
+}
+

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/tvpic.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/tvpic.c Changed

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/vertigo.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/vertigo.c Changed

@@ -15,12 +15,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -32,14 +30,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <math.h>

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/warpTV.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/warpTV.c Changed

@@ -22,12 +22,10 @@
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
 #include <weed/weed-effects.h>
-#include <weed/weed-plugin.h>
 #else
 #include "../../libweed/weed.h"
 #include "../../libweed/weed-palettes.h"
 #include "../../libweed/weed-effects.h"
-#include "../../libweed/weed-plugin.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////
@@ -39,14 +37,15 @@
 
 //////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_SYSTEM_WEED
-#include <weed/weed-utils.h> // optional
-#include <weed/weed-plugin-utils.h> // optional
+#ifdef HAVE_SYSTEM_WEED_PLUGIN_UTILS
+#include <weed/weed-plugin.h> // optional
 #else
-#include "../../libweed/weed-utils.h" // optional
-#include "../../libweed/weed-plugin-utils.h" // optional
+#include "../../libweed/weed-plugin.h" // optional
 #endif
 
+#include "weed-utils-code.c" // optional
+#include "weed-plugin-utils.c" // optional
+
 /////////////////////////////////////////////////////////////
 
 #include <math.h>

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/weed-plugin-utils.c Added

@@ -0,0 +1,657 @@
+/* WEED is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   Weed is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this source code; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+
+
+   Weed is developed by:
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+
+   mainly based on LiViDO, which is developed by:
+
+
+   Niels Elburg - http://veejay.sf.net
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+   Denis "Jaromil" Rojo - http://freej.dyne.org
+
+   Tom Schouten - http://zwizwa.fartit.com
+
+   Andraz Tori - http://cvs.cinelerra.org
+
+   reviewed with suggestions and contributions from:
+
+   Silvano "Kysucix" Galliani - http://freej.dyne.org
+
+   Kentaro Fukuchi - http://megaui.net/fukuchi
+
+   Jun Iio - http://www.malib.net
+
+   Carlo Prelz - http://www2.fluido.as:8080/
+
+*/
+
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2010 */
+
+
+#include <string.h>
+
+#define __WEED_INTERNAL__
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-palettes.h>
+#include <weed/weed-effects.h>
+#else
+#include "../../libweed/weed.h"
+#include "../../libweed/weed-palettes.h"
+#include "../../libweed/weed-effects.h"
+#endif
+
+
+///////////////////////////////////////////////////////////
+inline int _leaf_exists (weed_plant_t *plant, const char *key) {
+  if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return 0;
+  return 1;
+}
+
+
+int weed_get_api_version(weed_plant_t *plugin_info) {
+  // return api version selected by host
+  int api_version;
+  weed_plant_t *host_info;
+  weed_leaf_get(plugin_info,"host_info",0,&host_info);
+  weed_leaf_get(host_info,"api_version",0,&api_version);
+  return api_version;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+weed_plant_t *weed_plugin_info_init (weed_bootstrap_f weed_boot, int num_versions, int *api_versions) {
+  /////////////////////////////////////////////////////////
+  // get our bootstrap values
+  // every plugin should call this in its weed_setup()
+  int api_version;
+
+  weed_default_getter_f weed_default_get;
+  weed_leaf_get_f *wlg;
+  weed_leaf_set_f *wls;
+  weed_plant_new_f *wpn;
+  weed_plant_list_leaves_f *wpll;
+  weed_leaf_num_elements_f *wlne;
+  weed_leaf_element_size_f *wles;
+  weed_leaf_seed_type_f *wlst;
+  weed_leaf_get_flags_f *wlgf;
+  weed_malloc_f *weedmalloc;
+  weed_free_f *weedfree;
+  weed_memset_f *weedmemset;
+  weed_memcpy_f *weedmemcpy;
+
+  weed_plant_t *host_info=weed_boot((weed_default_getter_f *)&weed_default_get,num_versions,api_versions),*plugin_info;
+  if (host_info==NULL) return NULL; // matching version was not found
+
+
+  //////////// get api version /////////
+  weed_default_get(host_info,"api_version",0,&api_version);
+
+
+  // depending on the api version we could have different functions
+
+  // we must use the default getter to get our API functions
+
+  weed_default_get(host_info,"weed_malloc_func",0,(void *)&weedmalloc);
+  weed_malloc=weedmalloc[0];
+
+  weed_default_get(host_info,"weed_free_func",0,(void *)&weedfree);
+  weed_free=weedfree[0];
+
+  weed_default_get(host_info,"weed_memset_func",0,(void *)&weedmemset);
+  weed_memset=weedmemset[0];
+
+  weed_default_get(host_info,"weed_memcpy_func",0,(void *)&weedmemcpy);
+  weed_memcpy=weedmemcpy[0];
+
+  weed_default_get(host_info,"weed_leaf_get_func",0,(void *)&wlg);
+  weed_leaf_get=wlg[0];
+
+  weed_default_get(host_info,"weed_leaf_set_func",0,(void *)&wls);
+  weed_leaf_set=wls[0];
+
+  weed_default_get(host_info,"weed_plant_new_func",0,(void *)&wpn);
+  weed_plant_new=wpn[0];
+
+  weed_default_get(host_info,"weed_plant_list_leaves_func",0,(void *)&wpll);
+  weed_plant_list_leaves=wpll[0];
+
+  weed_default_get(host_info,"weed_leaf_num_elements_func",0,(void *)&wlne);
+  weed_leaf_num_elements=wlne[0];
+
+  weed_default_get(host_info,"weed_leaf_element_size_func",0,(void *)&wles);
+  weed_leaf_element_size=wles[0];
+
+  weed_default_get(host_info,"weed_leaf_seed_type_func",0,(void *)&wlst);
+  weed_leaf_seed_type=wlst[0];
+
+  weed_default_get(host_info,"weed_leaf_get_flags_func",0,(void *)&wlgf);
+  weed_leaf_get_flags=wlgf[0];
+
+
+  // get any additional functions for higher API versions ////////////
+
+
+
+  //////////////////////////////////////////////////////////////////////
+
+  // we can now use the normal API functions
+
+
+  plugin_info=weed_plant_new(WEED_PLANT_PLUGIN_INFO);
+
+  weed_leaf_set(plugin_info,"host_info",WEED_SEED_PLANTPTR,1,&host_info);
+
+  return plugin_info;
+}
+
+
+weed_plant_t *weed_channel_template_init (const char *name, int flags, int *palettes) {
+  int i;
+  weed_plant_t *chantmpl=weed_plant_new(WEED_PLANT_CHANNEL_TEMPLATE);
+
+  weed_leaf_set(chantmpl,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(chantmpl,"flags",WEED_SEED_INT,1,&flags);
+
+  for (i=0;palettes[i]!=WEED_PALETTE_END;i++);
+  if (i==0) weed_leaf_set(chantmpl,"palette_list",WEED_SEED_INT,0,NULL);
+  else weed_leaf_set(chantmpl,"palette_list",WEED_SEED_INT,i,palettes);
+  return chantmpl;
+}
+
+
+weed_plant_t *weed_audio_channel_template_init (const char *name, int flags) {
+  int wtrue=WEED_TRUE;
+  weed_plant_t *chantmpl=weed_plant_new(WEED_PLANT_CHANNEL_TEMPLATE);
+
+  weed_leaf_set(chantmpl,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(chantmpl,"flags",WEED_SEED_INT,1,&flags);
+  weed_leaf_set(chantmpl,"is_audio",WEED_SEED_BOOLEAN,1,&wtrue);
+  return chantmpl;
+}
+
+
+weed_plant_t *weed_filter_class_init (const char *name, const char *author, int version, int flags, weed_init_f init_func, weed_process_f process_func, weed_deinit_f deinit_func, weed_plant_t **in_chantmpls, weed_plant_t **out_chantmpls, weed_plant_t **in_paramtmpls, weed_plant_t **out_paramtmpls) {
+  int i;
+  weed_plant_t *filter_class=weed_plant_new(WEED_PLANT_FILTER_CLASS);
+
+  weed_leaf_set(filter_class,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(filter_class,"author",WEED_SEED_STRING,1,&author);
+  weed_leaf_set(filter_class,"version",WEED_SEED_INT,1,&version);
+  weed_leaf_set(filter_class,"flags",WEED_SEED_INT,1,&flags);
+
+  if (init_func!=NULL) {
+    weed_init_f *fn_ptr_ptr=(weed_init_f *)weed_malloc(sizeof(weed_init_f));
+    *fn_ptr_ptr=init_func;
+    weed_leaf_set(filter_class,"init_func",WEED_SEED_VOIDPTR,1,&fn_ptr_ptr);
+  }
+  if (process_func!=NULL) {
+    weed_process_f *fn_ptr_ptr=(weed_process_f *)weed_malloc(sizeof(weed_process_f));
+    *fn_ptr_ptr=process_func;
+    weed_leaf_set(filter_class,"process_func",WEED_SEED_VOIDPTR,1,&fn_ptr_ptr);
+  }
+  if (deinit_func!=NULL) {
+    weed_deinit_f *fn_ptr_ptr=(weed_deinit_f *)weed_malloc(sizeof(weed_deinit_f));
+    *fn_ptr_ptr=deinit_func;
+    weed_leaf_set(filter_class,"deinit_func",WEED_SEED_VOIDPTR,1,&fn_ptr_ptr);
+  }
+
+  if (in_chantmpls==NULL||in_chantmpls[0]==NULL) weed_leaf_set(filter_class,"in_channel_templates",WEED_SEED_VOIDPTR,0,NULL);
+  else {
+    for (i=0;in_chantmpls[i]!=NULL;i++);
+    weed_leaf_set(filter_class,"in_channel_templates",WEED_SEED_PLANTPTR,i,in_chantmpls);
+
+  }
+
+  if (out_chantmpls==NULL||out_chantmpls[0]==NULL) weed_leaf_set(filter_class,"out_channel_templates",WEED_SEED_VOIDPTR,0,NULL);
+  else {
+    for (i=0;out_chantmpls[i]!=NULL;i++);
+    weed_leaf_set(filter_class,"out_channel_templates",WEED_SEED_PLANTPTR,i,out_chantmpls);
+  }
+
+  if (in_paramtmpls==NULL||in_paramtmpls[0]==NULL) weed_leaf_set(filter_class,"in_parameter_templates",WEED_SEED_VOIDPTR,0,NULL);
+  else {
+    for (i=0;in_paramtmpls[i]!=NULL;i++);
+    weed_leaf_set(filter_class,"in_parameter_templates",WEED_SEED_PLANTPTR,i,in_paramtmpls);
+  }
+
+  if (out_paramtmpls==NULL||out_paramtmpls[0]==NULL) weed_leaf_set(filter_class,"out_parameter_templates",WEED_SEED_VOIDPTR,0,NULL);
+  else {
+    for (i=0;out_paramtmpls[i]!=NULL;i++);
+    weed_leaf_set(filter_class,"out_parameter_templates",WEED_SEED_PLANTPTR,i,out_paramtmpls);
+  }
+  
+  return filter_class;
+} 
+
+
+void weed_plugin_info_add_filter_class (weed_plant_t *plugin_info, weed_plant_t *filter_class) {
+  int num_filters=0,i;
+  weed_plant_t **filters;
+
+  if (_leaf_exists(plugin_info,"filters")) num_filters=weed_leaf_num_elements(plugin_info,"filters");
+  filters=(weed_plant_t **)weed_malloc((num_filters+1)*sizeof(weed_plant_t *));
+  for (i=0;i<num_filters;i++) weed_leaf_get(plugin_info,"filters",i,&filters[i]);
+  filters[i]=filter_class;
+  weed_leaf_set(plugin_info,"filters",WEED_SEED_PLANTPTR,i+1,filters);
+  weed_leaf_set(filter_class,"plugin_info",WEED_SEED_PLANTPTR,1,&plugin_info);
+  weed_free(filters);
+}
+
+
+weed_plant_t *weed_parameter_template_get_gui (weed_plant_t *paramt) {
+  weed_plant_t *gui;
+
+  if (_leaf_exists(paramt,"gui")) {
+    weed_leaf_get(paramt,"gui",0,&gui);
+    return gui;
+  }
+
+  gui=weed_plant_new(WEED_PLANT_GUI);
+  weed_leaf_set(paramt,"gui",WEED_SEED_PLANTPTR,1,&gui);
+  return gui;
+}
+
+
+weed_plant_t *weed_filter_class_get_gui (weed_plant_t *filter) {
+  weed_plant_t *gui;
+
+  if (_leaf_exists(filter,"gui")) {
+    weed_leaf_get(filter,"gui",0,&gui);
+    return gui;
+  }
+
+  gui=weed_plant_new(WEED_PLANT_GUI);
+  weed_leaf_set(filter,"gui",WEED_SEED_PLANTPTR,1,&gui);
+  return gui;
+}
+
+  
+weed_plant_t *weed_parameter_get_gui(weed_plant_t *param) {
+  weed_plant_t *xtemplate;
+
+  if (_leaf_exists(param,"template")) {
+    weed_leaf_get(param,"template",0,&xtemplate);
+    return weed_parameter_template_get_gui(xtemplate);
+  }
+  return NULL;
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+weed_plant_t *weed_integer_init (const char *name, const char *label, int def, int min, int max) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_INTEGER;
+  weed_plant_t *gui;
+  int wtrue=WEED_TRUE;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_INT,1,&def);
+  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
+
+  gui=weed_parameter_template_get_gui(paramt);
+  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
+  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
+
+  return paramt;
+}
+
+
+weed_plant_t *weed_string_list_init (const char *name, const char *label, int def, const char ** const list) {
+  int i=0;
+  weed_plant_t *paramt,*gui;
+  int min=0;
+
+  while (list[i]!=NULL) i++;
+  i--;
+
+  if (def<=-1) min=def=-1;
+
+  paramt=weed_integer_init(name,label,def,min,i);
+  gui=weed_parameter_template_get_gui(paramt);
+
+  weed_leaf_set(gui,"choices",WEED_SEED_STRING,i+1,list);
+
+  return paramt;
+}
+
+
+weed_plant_t *weed_switch_init (const char *name, const char *label, int def) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_SWITCH;
+  weed_plant_t *gui;
+  int wtrue=WEED_TRUE;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_BOOLEAN,1,&def);
+
+  gui=weed_parameter_template_get_gui(paramt);
+  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
+  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
+
+  return paramt;
+}
+
+weed_plant_t *weed_radio_init (const char *name, const char *label, int def, int group) {
+  weed_plant_t *paramt=weed_switch_init(name,label,def);
+  weed_leaf_set(paramt,"group",WEED_SEED_INT,1,&group);
+  return paramt;
+}
+
+
+
+weed_plant_t *weed_float_init (const char *name, const char *label, double def, double min, double max) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_FLOAT;
+  weed_plant_t *gui;
+  int wtrue=WEED_TRUE;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,1,&def);
+  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
+
+  gui=weed_parameter_template_get_gui(paramt);
+  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
+  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
+
+  return paramt;
+}
+
+
+weed_plant_t *weed_text_init (const char *name, const char *label, const char *def) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_TEXT;
+  weed_plant_t *gui;
+  int wtrue=WEED_TRUE;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_STRING,1,&def);
+
+  gui=weed_parameter_template_get_gui(paramt);
+  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
+  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
+
+  return paramt;
+}
+
+
+weed_plant_t *weed_colRGBi_init (const char *name, const char *label, int red, int green, int blue) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_COLOR;
+  int cspace=WEED_COLORSPACE_RGB;
+  int def[3]={red,green,blue};
+  int min=0;
+  int max=255;
+  weed_plant_t *gui;
+  int wtrue=WEED_TRUE;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
+
+  weed_leaf_set(paramt,"default",WEED_SEED_INT,3,def);
+  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
+
+  gui=weed_parameter_template_get_gui(paramt);
+  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
+  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
+
+  return paramt;
+}
+
+
+weed_plant_t *weed_colRGBd_init (const char *name, const char *label, double red, double green, double blue) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_COLOR;
+  int cspace=WEED_COLORSPACE_RGB;
+  double def[3]={red,green,blue};
+  double min=0.;
+  double max=1.;
+  weed_plant_t *gui;
+  int wtrue=WEED_TRUE;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
+
+  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,3,def);
+  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
+
+  gui=weed_parameter_template_get_gui(paramt);
+  weed_leaf_set(gui,"label",WEED_SEED_STRING,1,&label);
+  weed_leaf_set(gui,"use_mnemonic",WEED_SEED_BOOLEAN,1,&wtrue);
+
+  return paramt;
+}
+
+
+weed_plant_t *weed_out_param_integer_init (const char *name, int def, int min, int max) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_INTEGER;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_INT,1,&def);
+  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
+  return paramt;
+}
+
+
+weed_plant_t *weed_out_param_switch_init (const char *name, int def) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_SWITCH;
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_BOOLEAN,1,&def);
+  return paramt;
+}
+
+
+
+weed_plant_t *weed_out_param_float_init (const char *name, double def, double min, double max) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_FLOAT;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,1,&def);
+  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
+
+  return paramt;
+}
+
+
+
+weed_plant_t *weed_out_param_text_init (const char *name, const char *def) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_TEXT;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"default",WEED_SEED_STRING,1,&def);
+
+  return paramt;
+}
+
+
+
+weed_plant_t *weed_out_param_colRGBi_init (const char *name, int red, int green, int blue) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_COLOR;
+  int cspace=WEED_COLORSPACE_RGB;
+  int def[3]={red,green,blue};
+  int min=0;
+  int max=255;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
+
+  weed_leaf_set(paramt,"default",WEED_SEED_INT,3,def);
+  weed_leaf_set(paramt,"min",WEED_SEED_INT,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_INT,1,&max);
+
+  return paramt;
+}
+
+
+
+weed_plant_t *weed_out_param_colRGBd_init (const char *name, double red, double green, double blue) {
+  weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
+  int hint=WEED_HINT_COLOR;
+  int cspace=WEED_COLORSPACE_RGB;
+  double def[3]={red,green,blue};
+  double min=0.;
+  double max=1.;
+
+  weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
+  weed_leaf_set(paramt,"hint",WEED_SEED_INT,1,&hint);
+  weed_leaf_set(paramt,"colorspace",WEED_SEED_INT,1,&cspace);
+
+  weed_leaf_set(paramt,"default",WEED_SEED_DOUBLE,3,def);
+  weed_leaf_set(paramt,"min",WEED_SEED_DOUBLE,1,&min);
+  weed_leaf_set(paramt,"max",WEED_SEED_DOUBLE,1,&max);
+
+  return paramt;
+}
+
+
+
+///////////////////////////////////////////////////////////////////////
+
+static void _weed_clone_leaf (weed_plant_t *from, const char *key, weed_plant_t *to) {
+  int i,num=weed_leaf_num_elements(from,key);
+
+  int *datai;
+  double *datad;
+  char **datac;
+  int64_t *datai6;
+  void **datav;
+  weed_plant_t **datap;
+  size_t stlen;
+
+  int seed_type=weed_leaf_seed_type(from,key);
+
+  if (num==0) weed_leaf_set(to,key,seed_type,0,NULL);
+  else {
+    switch (seed_type) {
+    case WEED_SEED_INT:
+      datai=(int *)weed_malloc(num*sizeof(int));
+      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai[i]);
+      weed_leaf_set(to,key,WEED_SEED_INT,num,datai);
+      weed_free(datai);
+      break;
+    case WEED_SEED_INT64:
+      datai6=(int64_t *)weed_malloc(num*sizeof(int64_t));
+      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai6[i]);
+      weed_leaf_set(to,key,WEED_SEED_INT64,num,datai6);
+      weed_free(datai6);
+      break;
+    case WEED_SEED_BOOLEAN:
+      datai=(int *)weed_malloc(num*sizeof(int));
+      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai[i]);
+      weed_leaf_set(to,key,WEED_SEED_BOOLEAN,num,datai);
+      weed_free(datai);
+      break;
+    case WEED_SEED_DOUBLE:
+      datad=(double *)weed_malloc(num*sizeof(double));
+      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datad[i]);
+      weed_leaf_set(to,key,WEED_SEED_DOUBLE,num,datad);
+      weed_free(datad);
+      break;
+    case WEED_SEED_VOIDPTR:
+      datav=(void **)weed_malloc(num*sizeof(void *));
+      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datav[i]);
+      weed_leaf_set(to,key,WEED_SEED_VOIDPTR,num,datav);
+      weed_free(datav);
+      break;
+    case WEED_SEED_PLANTPTR:
+      datap=(weed_plant_t **)weed_malloc(num*sizeof(weed_plant_t *));
+      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datap[i]);
+      weed_leaf_set(to,key,WEED_SEED_PLANTPTR,num,datap);
+      weed_free(datap);
+      break;
+    case WEED_SEED_STRING:
+      datac=(char **)weed_malloc(num*sizeof(char *));
+      for (i=0;i<num;i++) {
+	stlen=weed_leaf_element_size(from,key,i);
+	datac[i]=(char *)weed_malloc(stlen+1);
+	weed_leaf_get(from,key,i,&datac[i]);
+	weed_memset(datac[i]+stlen,0,1);
+      }
+      weed_leaf_set(to,key,WEED_SEED_STRING,num,datac);
+      for (i=0;i<num;i++) weed_free(datac[i]);
+      weed_free(datac);
+      break;
+    }
+  }
+}
+
+
+weed_plant_t **weed_clone_plants (weed_plant_t **plants) {
+  //plants must be a NULL terminated array
+  int i,j,k,type,num_plants;
+  weed_plant_t **ret,*gui,*gui2;
+  char **leaves,**leaves2;
+  for (i=0;plants[i]!=NULL;i++);
+  num_plants=i;
+  ret=(weed_plant_t **)weed_malloc((num_plants+1)*sizeof(weed_plant_t *));
+
+  for (i=0;i<num_plants;i++) {
+    weed_leaf_get(plants[i],"type",0,&type);
+    ret[i]=weed_plant_new(type);
+
+    leaves=weed_plant_list_leaves(plants[i]);
+    for (j=0;leaves[j]!=NULL;j++) {
+      if (!strcmp(leaves[j],"gui")) {
+	weed_leaf_get(plants[i],"gui",0,&gui);
+	gui2=weed_plant_new(WEED_PLANT_GUI);
+	weed_leaf_set(ret[i],"gui",WEED_SEED_PLANTPTR,1,&gui2);
+	leaves2=weed_plant_list_leaves(gui);
+	for (k=0;leaves2[k]!=NULL;k++) {
+	  _weed_clone_leaf(gui,leaves2[k],gui2);
+	  weed_free(leaves2[k]);
+	}
+	weed_free(leaves2);
+      }
+      else _weed_clone_leaf(plants[i],leaves[j],ret[i]);
+      weed_free(leaves[j]);
+    }
+    weed_free(leaves);
+  }
+  ret[i]=NULL;
+  return ret;
+}
+

LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/weed-utils-code.c Added

@@ -0,0 +1,413 @@
+/* WEED is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   Weed is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this source code; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+
+
+   Weed is developed by:
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+
+   mainly based on LiViDO, which is developed by:
+
+
+   Niels Elburg - http://veejay.sf.net
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+   Denis "Jaromil" Rojo - http://freej.dyne.org
+
+   Tom Schouten - http://zwizwa.fartit.com
+
+   Andraz Tori - http://cvs.cinelerra.org
+
+   reviewed with suggestions and contributions from:
+
+   Silvano "Kysucix" Galliani - http://freej.dyne.org
+
+   Kentaro Fukuchi - http://megaui.net/fukuchi
+
+   Jun Iio - http://www.malib.net
+
+   Carlo Prelz - http://www2.fluido.as:8080/
+
+*/
+
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2010 */
+
+#include <string.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#else
+#include "../../libweed/weed.h"
+#endif
+
+
+
+/////////////////////////////////////////////////////////////////
+
+static int weed_plant_has_leaf (weed_plant_t *plant, const char *key) {
+  if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return WEED_FALSE;
+  return WEED_TRUE;
+}
+
+/////////////////////////////////////////////////////////////////
+// leaf setters
+
+static int weed_set_int_value (weed_plant_t *plant, const char *key, int value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_INT,1,&value);
+}
+
+static int weed_set_double_value (weed_plant_t *plant, const char *key, double value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_DOUBLE,1,&value);
+}
+
+static int weed_set_boolean_value (weed_plant_t *plant, const char *key, int value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_BOOLEAN,1,&value);
+}
+
+static int weed_set_int64_value (weed_plant_t *plant, const char *key, int64_t value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_INT64,1,&value);
+}
+
+static int weed_set_string_value (weed_plant_t *plant, const char *key, const char *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_STRING,1,&value);
+}
+
+static int weed_set_plantptr_value (weed_plant_t *plant, const char *key, weed_plant_t *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_PLANTPTR,1,&value);
+}
+
+static int weed_set_voidptr_value (weed_plant_t *plant, const char *key, void *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set (plant,key,WEED_SEED_VOIDPTR,1,&value);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// general leaf getter
+
+inline static int weed_get_value (weed_plant_t *plant, const char *key, void *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_get(plant, key, 0, value);
+}
+
+////////////////////////////////////////////////////////////
+
+static int weed_get_int_value (weed_plant_t *plant, const char *key, int *error) {
+  int retval=0;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  else *error=weed_get_value (plant,key,&retval);
+  return retval;
+}
+
+static double weed_get_double_value (weed_plant_t *plant, const char *key, int *error) {
+  double retval=0.;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_DOUBLE) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value (plant,key,&retval);
+  return retval;
+}
+
+static int weed_get_boolean_value (weed_plant_t *plant, const char *key, int *error) {
+  int retval=0;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_BOOLEAN) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value (plant,key,&retval);
+  return retval;
+}
+
+static int64_t weed_get_int64_value (weed_plant_t *plant, const char *key, int *error) {
+  int64_t retval=0;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT64) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value (plant,key,&retval);
+  return retval;
+}
+
+static char *weed_get_string_value (weed_plant_t *plant, const char *key, int *error) {
+  size_t size;
+  char *retval=NULL;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_STRING) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+  if ((retval=(char *)weed_malloc((size=weed_leaf_element_size(plant,key,0))+1))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+  if ((*error=weed_get_value (plant,key,&retval))!=WEED_NO_ERROR) {
+    weed_free (retval);
+    return NULL;
+  }
+  weed_memset(retval+size,0,1);
+  return retval;
+}
+
+static void *weed_get_voidptr_value (weed_plant_t *plant, const char *key, int *error) {
+  void *retval=NULL;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_VOIDPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value (plant,key,&retval);
+  return retval;
+}
+
+static weed_plant_t *weed_get_plantptr_value (weed_plant_t *plant, const char *key, int *error) {
+  weed_plant_t *retval=NULL;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_PLANTPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value (plant,key,&retval);
+  return retval;
+}
+
+
+////////////////////////////////////////////////////////////
+
+static int *weed_get_int_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  int *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free (retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+static double *weed_get_double_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  double *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_DOUBLE) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(double *)weed_malloc(num_elems*sizeof(double)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free (retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+static int *weed_get_boolean_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  int *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_BOOLEAN) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free (retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+static int64_t *weed_get_int64_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  int64_t *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT64) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(int64_t *)weed_malloc(num_elems*8))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free (retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+static char **weed_get_string_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  char **retval;
+  size_t size;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_STRING) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(char **)weed_malloc(num_elems*sizeof(char *)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((retval[i]=(char *)weed_malloc((size=weed_leaf_element_size(plant,key,i))+1))==NULL) {
+      for (--i;i>=0;i--) weed_free(retval[i]);
+      *error=WEED_ERROR_MEMORY_ALLOCATION;
+      weed_free (retval);
+      return NULL;
+    }
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      for (--i;i>=0;i--) weed_free(retval[i]);
+      weed_free (retval);
+      return NULL;
+    }
+    weed_memset(retval[i]+size,0,1);
+  }
+  return retval;
+}
+
+static void **weed_get_voidptr_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  void **retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_VOIDPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(void **)weed_malloc(num_elems*sizeof(void *)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free (retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+static weed_plant_t **weed_get_plantptr_array (weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  weed_plant_t **retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_PLANTPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+
+  if ((retval=(weed_plant_t **)weed_malloc(num_elems*sizeof(weed_plant_t *)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0;i<num_elems;i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free (retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+/////////////////////////////////////////////////////
+
+static int weed_set_int_array (weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set (plant,key,WEED_SEED_INT,num_elems,values);
+}
+
+static int weed_set_double_array (weed_plant_t *plant, const char *key, int num_elems, double *values) {
+  return weed_leaf_set (plant,key,WEED_SEED_DOUBLE,num_elems,values);
+}
+
+static int weed_set_boolean_array (weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set (plant,key,WEED_SEED_BOOLEAN,num_elems,values);
+}
+
+static int weed_set_int64_array (weed_plant_t *plant, const char *key, int num_elems, int64_t *values) {
+  return weed_leaf_set (plant,key,WEED_SEED_INT64,num_elems,values);
+}
+
+static int weed_set_string_array (weed_plant_t *plant, const char *key, int num_elems, char **values) {
+  return weed_leaf_set (plant,key,WEED_SEED_STRING,num_elems,values);
+}
+
+static int weed_set_voidptr_array (weed_plant_t *plant, const char *key, int num_elems, void **values) {
+  return weed_leaf_set (plant,key,WEED_SEED_VOIDPTR,num_elems,values);
+}
+
+static int weed_set_plantptr_array (weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values) {
+  return weed_leaf_set (plant,key,WEED_SEED_PLANTPTR,num_elems,values);
+}

LiVES-1.6.1.tar.bz2/lives-plugins/weed-plugins/xeffect.c -> LiVES-2.0.3.tar.bz2/lives-plugins/weed-plugins/xeffect.c Changed

LiVES-1.6.1.tar.bz2/ltmain.sh -> LiVES-2.0.3.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/$[\\"]$/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$[\\"]$/\\\1/g
+s/$/\\n/
+s/$[^\n]*$.*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

LiVES-1.6.1.tar.bz2/m4/Makefile.in -> LiVES-2.0.3.tar.bz2/m4/Makefile.in Changed

LiVES-1.6.1.tar.bz2/m4/libtool.m4 -> LiVES-2.0.3.tar.bz2/m4/libtool.m4 Changed

@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,17 +2513,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2526,7 +2585,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2542,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2579,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2648,7 +2707,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2717,7 +2776,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2742,7 +2801,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2766,7 +2825,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2797,7 +2856,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2807,7 +2866,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3229,7 +3288,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3649,6 +3708,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
@@ -4233,7 +4293,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4325,18 +4387,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4496,7 +4573,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4521,7 +4600,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4772,8 +4850,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5068,6 +5145,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5114,10 +5192,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5130,7 +5204,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5169,7 +5243,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5611,9 +5684,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5771,7 +5841,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6141,7 +6210,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6902,12 +6971,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7104,7 +7179,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7237,7 +7311,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7424,6 +7497,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7493,6 +7637,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],

LiVES-1.6.1.tar.bz2/m4/ltoptions.m4 -> LiVES-2.0.3.tar.bz2/m4/ltoptions.m4 Changed

LiVES-1.6.1.tar.bz2/m4/ltversion.m4 -> LiVES-2.0.3.tar.bz2/m4/ltversion.m4 Changed

LiVES-1.6.1.tar.bz2/menu-entries/LiVES.desktop -> LiVES-2.0.3.tar.bz2/menu-entries/LiVES.desktop Changed

LiVES-1.6.1.tar.bz2/missing -> LiVES-2.0.3.tar.bz2/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

LiVES-1.6.1.tar.bz2/po/POTFILES.in -> LiVES-2.0.3.tar.bz2/po/POTFILES.in Changed

LiVES-1.6.1.tar.bz2/po/ar.po -> LiVES-2.0.3.tar.bz2/po/ar.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 11:57+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "سيتم إنعاش البرنامج بعد إعادة تشغيله. وشكرا\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "عند الإبلاغ عن العثرات ، يرجى ذِكر نظام التشغيل الخاص بك ، والتوزيعة ، "
 "وإصدارة البرنامج."
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "وأية معلومات موضحة أدناه.\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "المعلومات.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "الحفاظ على ضبط\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "غيّر حجم"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "غيّر حجم جميع الإطارات"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "أيّ"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "بدون"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "مستحسن"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "معطّل !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**التخطيط الحالي**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "مُضمَّن"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "مخصص"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "اختبار"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "تم العثور علي convert"
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "لم يتم العثور علي convert"
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "تم العثور علي composite"
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "لم يتم العثور علي composite"
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "تم العثور على .'sox'\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "لم يتم العثور على .'sox'\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "عدم إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "إكتشاف ...جاك..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "عدم إكتشاف ...جاك..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "إكتشاف ...'pulse audio'..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "عدم إكتشاف ...'pulse audio'..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "إكتشاف ...بايثون..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "عدم إكتشاف ...بايثون..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "إكتشاف ...'dvgrab'..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "عدم إكتشاف ...'dvgrab'..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "إكتشاف ... 'xwininfo'..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "عدم إكتشاف ... 'xwininfo'..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,22 +276,48 @@
 "\n"
 "تقرير مدير النافذة كـ \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "إكتشاف عدد الشاشات %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "مجلدات الملفات المؤقتة %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -264,15 +327,15 @@
 "توصيل جاك الصوت او 'pulse audio'\n"
 "العديد من ميزات الصوت لن تكون متوفرة\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "التواصل مع جاك الصوت ، جيد !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "التواصل مع 'pulse audio' ، رائع !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -281,7 +344,7 @@
 "مرحبا بك مع إصدار برنامج لايفز %s\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -290,87 +353,87 @@
 "\n"
 "جمل بدأ البرنامج: %s [المدخلات] [اسم الملف [وقت-البدأ] [الإطارات]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "حيث: اسم الملف هو أسم ملف الميديا أو اسم ملف النسخ الاحتياطي\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "وقت-البدأ : تعريف وقت البدأ بوحدة الثانية\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "الإطارات : أكبر عدد ممكن لفتح الإطارات\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "تستطيع الإختيار:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-مساعدة : عرض مستند المساعدة وإغلاقه\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-المجموعة <اسم المجموعة> : تحميل تلقائى لإسم مجموعة المقاطع\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-مجموعة غير متوفرة : عدم تحميل أى مجموعة عند البداية\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-عدم إسترجاع : عدم إسترجاع المجموعة المعطوبة بالقوة\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-إسترجاع : إسترجاع المجموعة المعطوبة بالقوة\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-عدم إستخدام الواجهة الرسومية : لا تستعرض الواجهة الرسومية\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-إبدأ تشغيل محرر المقاطع : بداية تشغيل وضع محرر المقاطع\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-إبدأ-تشغيل المسارات المتعددة : بداية تشغيل وضع المسارات المتعددة\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 "إبدأ مكتب المنسق الخاص <منفذ> : ابدأ مكتب المنسق الخاص بالمستمع على منفذ "
 "'UDP'\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "لا تبدأ مكتب المنسق الخاص : لا تبدأ مكتب المنسق الخاص بالمستمع\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -378,44 +441,44 @@
 "'mplayer'"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr "، 'sox' أو جاك\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " أو 'sox'\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-مخطط الجهاز <إسم المخطط> : تحميل تلقائى لمخطط الجهاز\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "- صَحّح : حاول تصحيح الأعطاب (يحتاج تثبيت 'gdb')\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "بداية تشغيل الواجة الرسومية..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -423,28 +486,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"السمة 'theme' التى طلبتها ربما تكون غير موجودة . من فضلك تأكد أنك قمت "
-"بتنصيبها\n"
-"%s/%s.\n"
-"ربما كنت بحاجة إلى تغيير قيمة <prefix_dir> فى ملف لايفز فى مجلد الهوم الخاص "
-"بك  ~/.lives file)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج كتابة ملف صغير فى مسار الملفات المؤقتة '/tmp'\n"
-"من فضلك تأكد ان لديك تصريح الوصول للكتابة على مسار الملفات المؤقتة ثم أعد "
-"المحاولة.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -458,54 +511,37 @@
 "من فضلك راجع ملف 'README' المرفق مع الحزمة\n"
 "قبل تشغيل برنامج لايفز.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج قراءة ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج إستخدام مجلد الملفات المؤقتة\n"
-"%s\n"
-"\n"
-"يرجى التحقق من وضْع مجلد <tempdir>\n"
-"%s/.lives\n"
-"ثم إعادة المحاولة\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -513,10 +549,8 @@
 "\n"
 "%s"
 msgstr ""
-"لم يتمكن برنامج لايفز من إلتقاط هذه الصورة\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -534,7 +568,7 @@
 "\n"
 "وشكرا\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -544,7 +578,14 @@
 "يحتاج برنامج لايفز اى من أدوات 'mplayer' أو 'sox' لآداء مهامه . يرجى تنصيب "
 "أحد هذه الأدوات ، ثم إعادة المحاولة\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -554,7 +595,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'mplayer' . ربما تحتاج تنصيب الأداة "
 "للحصول على أداء أفضل.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -564,7 +605,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'convert' و 'image-magick' . ربما "
 "تحتاج تنصيب الأداتين للحصول على تأثيرات الإعادة.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -574,7 +615,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'composite' و 'image-magick' . ربما "
 "تحتاج تنصيب الأداتين للحصول على تأثيرات الدمج 'merge function'\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -584,7 +625,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'sox' . بعض مميرات الصوت لن تعمل. "
 "يجب تنصيب الأداة 'sox'\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -592,68 +633,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"لم يستطيع برنامج لايفز إيجاد أى إضافات التشفير'encoder plugins'\n"
-"يرجى التحقق من تنصيب هذه الأدوات بشكل صحيح\n"
-"%s%s%s/\n"
-"لن تستطيع حفظ الملفات بدون هذه الأدوات\n"
-"ربما تحتاج الى تغيير القيمة <lib_dir> فى ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "التحميل التلقائى للمجموعة %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "أوديو بلاير 'audio player' غير صالح %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "شغّل"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -661,35 +696,35 @@
 "لم يتمكن برنامج لايفز من إلتقاط هذه الصورة\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "ملف مغلق %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_تراجع"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_كرّر"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "فيديو"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "الصوت الأيسر"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "الصوت الأيمن"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -698,26 +733,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr ""
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -727,7 +747,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -737,7 +757,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -748,7 +768,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -757,54 +777,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -812,11 +832,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -824,145 +844,153 @@
 "ولكن بعض ميزات الصوت سوف يتم تعطيلها.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -970,94 +998,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "دع برنامج لايفز يقوم بتعيين _إمتداد الملف"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "دع برنامج لايفز يقوم بتعيين _إمتداد الملف"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "طبق 'Deinterlace'"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "معاينة"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1066,8 +1094,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1075,179 +1103,188 @@
 "\n"
 "يرجى الانتظار"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "أعرض التفاصيل"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_كاف"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_معاينة"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "إل_غِ"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "التنسيق"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "حجم الإطار"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "حجم الملف"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "حجم البايت"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "إجمالي الوقت"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr ""
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "الإطارات"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "الأحداث"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "الصوت"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "معدل / حجم"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "إبقاء _اعدادتي"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "استخدام الإ_عدادات الموصى بها"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "وتظهر _تفاصيل"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "أ_غلق النّافذة"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_لحفظ الملف"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    عدد من الأطر لفتح"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1257,7 +1294,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1266,46 +1303,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "لا ترسل معلومات النطاق الترددي"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "حاول هذا الإعداد إذا كنت تواجه مشاكل في الحصول على دفق"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1313,421 +1366,376 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr ""
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "متق_دم"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "الحد الأقصى لعدد من المسارات لعرض"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "الفصل  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "الأوّل"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "الأخير"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "ثوان."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "الاختيار."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "عدد من المسارات مطلوبة :    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "الدليل:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "وتشمل الدلائل"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr ""
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "التحديد"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "اللقب / الاسم : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "الكاتب / الفنان : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "التعليقات : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_لحفظ الملف"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_يمسح تخطيط"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_تجاهل التغييرات"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_تخطيط حذف"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_حفظ التخطيط"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "تعينه كافتراضي"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "انتق ملف"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "التحميل التلقائى للمجموعة %s..."
+msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج كتابة ملف صغير فى مسار الملفات المؤقتة '/tmp'\n"
-"من فضلك تأكد ان لديك تصريح الوصول للكتابة على مسار الملفات المؤقتة ثم أعد "
-"المحاولة.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "هذا الملف"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1737,7 +1745,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1747,14 +1755,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1762,7 +1770,7 @@
 "\n"
 "الملف غير صالح المشروع.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1775,33 +1783,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1809,97 +1817,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "التحميل التلقائى للمجموعة %s..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "الإعادة"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "قصّ"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "اللصق"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1908,31 +1916,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1940,7 +1948,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1949,86 +1957,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "جاري الإدراج"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "إدراج"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "يمحي"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "حذف"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2036,11 +2044,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2049,7 +2057,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2058,7 +2066,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2067,22 +2075,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2090,94 +2098,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2193,26 +2200,25 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"هذا البرنامج هو برنامج حر ؛ بامكانك إعادة توزيعه و / أو تعديل\n"
-"وبموجب شروط رخصة جنو العمومية والتي نشرتها\n"
-"مؤسسة البرمجيات الحرة ؛ إما الإصدار 3 من الرخصة ، أو\n"
-"(باختيارك) أي إصدار لاحق.\n"
-"\n"
-"هذا البرنامج يوزع على أمل أن يكون مفيدا ،\n"
-"ولكن من دون اي ضمانات ؛ حتى دون ضمان ضمني\n"
-"تسويق أو الملاءمة لغرض معين. راجع\n"
-"رخصة جنو العمومية العامة لمزيد من التفاصيل.\n"
-"\n"
-"يجب عليك أن تكون قد استلمت نسخة من رخصة جنو العمومية\n"
-"مع هذا البرنامج ، وإذا تعذر ، لكتابة البرمجيات الحرة\n"
-"مؤسسة ، شركة ، 59 معبد مكان -- الجناح 330 ، وبوسطن ، ماجستير 02111-1307 ، "
-"الولايات المتحدة الأمريكية.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "وتحرير الفيديو وبرنامج الجيش اليوغوسلافي."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  salsaman https://launchpad.net/~salsaman\n"
+"  عبدالله شلي (Abdellah Chelli) https://launchpad.net/~sneetsher\n"
+"  عمرو رجائى(Amr) https://launchpad.net/~amr-ragaee"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2226,21 +2232,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2248,195 +2254,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "إلغاء"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "أغنية جديدة"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "التبديل حلقات متواصلة من (س)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "حلقات التبديل المستمر على (س)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "حدد الملف الصوتي"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "افتتاح مؤتمر نزع السلاح المسار..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "اختيار المسارات"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "أخطاء التصميم"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "إغلاق _النافذة"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "أخطاء وا_ضحة"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_حذف تخطيطات المتضررة"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "إستأنف"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "مؤقتا..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "ايقاف مؤقت"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "استأنفت..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "حافظ عليه"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2448,30 +2466,28 @@
 "(انقر فوق الاحتفاظ للحفاظ على ما لديك ، ووقف)\n"
 "(انقر فوق استئناف لمواصلة تجهيز)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "إلغـاء"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_قف"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "_انقاذ جهاز رسم الخرائط..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2480,7 +2496,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2488,7 +2504,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2496,7 +2512,7 @@
 "\n"
 "سجل الوقت يجب أن يكون أكبر من الصفر.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2505,17 +2521,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "الخارجية النافذة قد أفرج عنه.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2525,19 +2541,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "أغاني مختارة والتصدير..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "التصدير والصوت..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2546,81 +2562,86 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "تصدير الصوت"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "إلحاق الملفات الصوتية..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "إلحاق الصوت"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "إلحاق أغنية"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "تقليم / الوسادة أغنية"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "يتلاشى الصوت..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2630,973 +2651,939 @@
 "حذف جميع السمعية سيتم إغلاق هذا الملف.\n"
 "هل أنت متأكد ؟"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "حذف كل صوت..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "حذف أغنية"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "حذف أغنية"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "تسجيل صوتي جديد"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "تعذّر العثور على ملف الصورة: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "ماذا تفعل مع إطارات الحافظة اضافية -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_إدراج إطارات"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_انخفاض بأطر"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_طريقة الانتقال :"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "دمج عمله.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_العرف الأثر"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "العرف ا_لمرافق"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_ملف"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_فتح ملف / دليل"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "_الملفات الحديثة..."
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "فتح _الموقع / دفق..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "_الاستيراد من الأجهزة"
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "_الاستيراد من الأجهزة"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "_الاستيراد من الأجهزة"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "_الاستيراد من الأجهزة"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_الملفات الحديثة..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_إغلاق هذه القصاصات"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_تعديل"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_نسخة التحديد"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "ق_طع التحديد"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "ا_حذف التحديد"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "انت_ق..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "حدد كافة _إطارات"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "حدد _تأثير آخر"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "اع_كس الاختيار"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_قفل اختيار العرض"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_شَغِّل"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_تلعب جميع"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "اخت_يار اللعب"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_قف"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "الترج_يع"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_كامل الشاشة"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_مضاعفة الحجم"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "اللعب في نافذة _منفصلة"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_خلفية بيضاء"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(تلقائيا) _حلقة فيديو (لتناسب المسار الصوتي)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "حلق_ة مستمرة"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "_بينغ بونغ الحلقات"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "أص_مت"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "الآ_ثار"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_الأدوات"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "أدوات يتم تطبيقها على مقاطع كاملة."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "أد_وات"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "ت_وليد"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "أدوات _مخصص"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "ت_وليد"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_تفضيلات..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_الصوت"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "_قذف القرص"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "لكليب _جديد..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "لا_ختيار"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_تصدير أغنية..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_حذف أغنية..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "وتظهر معلوم_ات كليب"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "عرض / _تحرير ملف تعليقات"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "وتظهر _رسائل"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "وتظهر_ تخطيط أخطاء"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_لقطات"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "م_تقدم"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_ارسال تيار لأرواح..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_الجيش اليوغوسلافي"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_إعادة تعيين جميع سرعات القراءة ومواقف"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_ميدي / عصا التحكم واجهة"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "_ميدي / جويستيك المتعلم..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_انقاذ جهاز رسم الخرائط..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_تحميل جهاز رسم الخرائط..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "وتظهر الجيش اليوغوسلافي _كيز"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "ولعب ا_طفال"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_لا شيء"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_جنون بأطر"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_أرواح تلفزيون (النطاق العريض)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_مختصر (يفتح في المتصفح)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_التبرع لهذا المشروع !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_البريد الإلكتروني لصاحب"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "بلغ عن عثرة"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "_اقتراح ميزة"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "بادر بالترجمة"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "حل المشا_كل"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_عن"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "الترجيع لبدء (ث)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "تلعب جميعع (ع)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "وقف التشغيل (ف)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "تلعب اختيار (ذ)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "الحجم"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "تلعب أبطأ (السيطرة لأسفل)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "اللعب بشكل أسرع (السيطرة متابعة)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "إخفاء شريط الأدوات هذا"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "تختلف سرعة الفيديو"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "الإطار الأول"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "الإطار آخر"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "الإطار الأول الذي اختير في هذه القصاصة"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "الإطار الأخير المحدد في هذا الكليب"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "بدءا...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_حر"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "اب_دأ"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_نهاية"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "إعادة"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3604,81 +3591,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3686,7 +3673,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3694,32 +3681,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3727,68 +3714,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3798,53 +3785,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_تراجع عن %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "أ_عد %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "فتح %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3856,11 +3854,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3868,14 +3866,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3883,30 +3881,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "يتلاشى الصوت..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3914,66 +3911,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "التحديد"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "حجم الملف"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3982,16 +3975,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "دون عنوان%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3999,7 +3992,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4007,68 +4000,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "يسترجع"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4078,22 +4066,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4101,68 +4089,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "تحذير"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "أخطاء وا_ضحة"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_عن"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4173,7 +4159,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4185,11 +4171,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4197,46 +4183,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4244,7 +4230,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4256,14 +4242,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4271,19 +4257,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4291,83 +4277,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4376,14 +4362,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4392,7 +4378,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4403,7 +4389,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4412,11 +4398,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4458,11 +4444,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4484,17 +4470,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4502,28 +4489,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4532,7 +4519,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4540,7 +4527,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4548,7 +4535,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4559,7 +4546,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4569,7 +4556,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4577,7 +4564,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4586,13 +4573,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4603,13 +4590,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4619,7 +4606,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4628,7 +4615,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4636,7 +4623,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4644,63 +4631,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4708,14 +4695,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4724,25 +4711,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4751,34 +4738,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4786,14 +4773,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4801,14 +4783,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4816,28 +4793,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج قراءة ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4845,28 +4812,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج قراءة ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4874,18 +4831,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4894,7 +4846,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4903,7 +4855,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4912,14 +4864,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4927,13 +4887,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4943,27 +4903,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4972,14 +4932,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4990,19 +4950,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5010,7 +4970,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5018,7 +4978,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5030,45 +4990,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"مرحبا بك مع إصدار برنامج لايفز %s\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5077,346 +5035,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "مولد"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "مولد"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "مولد"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "الانتقالات"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "التأثير"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "المؤثرات"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "أدوات"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "ملف صوتي"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "مجهول"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "وتشمل الدلائل"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "ع_رض"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "إر_تفاع"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5424,74 +5635,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "تعينه كافتراضي"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "غغلق النافذة"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_كرّر"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "أخضر"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "أزرق"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5501,17 +5709,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5521,32 +5729,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5555,14 +5763,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5572,40 +5773,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5614,11 +5822,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5627,7 +5835,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5637,192 +5845,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "النّوع:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "ال_خصائص..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5832,55 +6024,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "انقل للأ_على"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "أ_سفل"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5889,7 +6081,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5897,231 +6089,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6129,28 +6309,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6159,41 +6339,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6203,27 +6383,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6232,7 +6412,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6242,12 +6422,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6257,7 +6437,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6267,12 +6447,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6280,23 +6460,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6306,55 +6486,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "مُضمَّن"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "مخصص"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "اختبار"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6362,26 +6530,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6389,7 +6568,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6397,7 +6576,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6406,28 +6585,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6439,20 +6625,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6460,790 +6646,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "واجهة مستعمل رسومية"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "ثوان"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "أ_بدًا"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "تشغيل"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "يجري التسجيل"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "كوديك الصوت"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "الترميز"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "مجلد الحفظ"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " م بايت"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "تحذيرات"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "متفرقات"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "السِمات"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "متقدِم"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7251,222 +7437,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "أعد التحجيم"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "إعاده التشكيل"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "غير موقّع"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "الحالي"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "جديد"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "غير محدود"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7477,7 +7655,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7488,89 +7666,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7580,7 +7758,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7588,20 +7766,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7609,18 +7787,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-"%s/.lives\n"
-"\n"
-"يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7630,22 +7803,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7655,43 +7828,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7699,40 +7877,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "لا وصف"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "الوصف: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7741,65 +7924,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "معلومات"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "امح"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7849,11 +8036,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7871,64 +8053,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7937,7 +8119,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7945,14 +8127,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7962,7 +8144,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7971,208 +8153,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "احذف الصندوق"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "إحذف %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8182,7 +8366,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8190,587 +8374,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "_فتح ملف اختيار..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_الاستيراد من الأجهزة"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "ال_تحديد"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "ا_نسخ..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "ت_صيير"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_معاينة"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_طبّق"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "التمرير"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8778,275 +8970,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "حذف الحزم الغير مستخدمة"
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_إيقاف مؤقت"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "إطارات"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9054,95 +9238,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "يتصل بخادوم نقل جاك"
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9150,7 +9333,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9158,329 +9341,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "بدء خادوم بالص-اوديو..."
+msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "يتصل بخادوم نقل جاك"
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "المعطيات"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "ملاحظة"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "قيمة"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "الولاية"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "متغيّر"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "س"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "النطاق"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_حذف الكل"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "إيقاف التسجيل"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "إطار في الثانية"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9489,7 +9678,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9498,12 +9687,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9833,7 +10022,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    عدد من الأطر لفتح"
+#~ msgstr "_انخفاض بأطر"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -10040,7 +10229,7 @@
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    عدد من الأطر لفتح"
+#~ msgstr "_انخفاض بأطر"
 
 #, fuzzy
 #~ msgid "_Other Center"
@@ -10121,9 +10310,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "ثوان"
 
-#~ msgid "_Top"
-#~ msgstr "_قمة"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "موجي"
@@ -10345,25 +10531,3 @@
 
 #~ msgid "$error"
 #~ msgstr "$خطأ"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "بدء خادوم بالص-اوديو..."
-
-#~ msgid "Red"
-#~ msgstr "أحمر"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "لم يستطيع البرنامج الكتابة على ملف الإعدادات\n"
-#~ "%s/.lives\n"
-#~ "\n"
-#~ "يرجى التحقق من تصريحات هذا الملف والمجلد ثم إعادة المحاولة\n"

LiVES-1.6.1.tar.bz2/po/ca.po -> LiVES-2.0.3.tar.bz2/po/ca.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:08+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Gràcies. La recuperació ha de ser possible si es reinicia LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "Quan es notifiqui una falla, si us plau poseu les dades del vostre sistema "
 "operatiu, distribució i la versió de LIVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "Tot seguit hi haurà alguna informació:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "informació.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Grup de seguretat.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Redimensionat"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "reconfigureu totes les finestres"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "qualsevol"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "Recomanat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "Espatllat"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**El disseny actual**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Incorporat"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Personalitzat"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Comprova"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "detectat convertidor"
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT convertidor"
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "detectada composició"
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT composició"
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detectat...\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NO S'HA DETECTAT...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NO S'HA DETECTAT..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NO S'HA DETECTAT..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NO S'HA DETECTAT..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NO S'HA DETECTAT..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NO S'HA DETECTAT..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NO S'HA DETECTAT..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,37 +276,63 @@
 "\n"
 "Administrador Finestra d'informes com \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre de monitors detectat: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Directori temporal és %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilat amb suport per a jack, bé !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilat amb suport pulse audio, meravellós !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -278,92 +341,92 @@
 "Benvingut a LiVES versió %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames: nombre màxim de fotogrames per obrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts poden ser:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : mostra aquest text d'ajuda i sortir de\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : no carregueu cap conjunt en l'arrencada\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : càrrega de força de xoc de recuperació\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : no mostrar la interfície gràfica d'usuari\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : començarà en mode d'imatge en l'editor\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : començarà en la manera multipista\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : no comenci oient OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -371,45 +434,45 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : tractar d'accidents de depuració (requereix 'gdb' instal lat)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "A partir GUI ..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -417,17 +480,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -436,36 +500,36 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -475,7 +539,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -486,42 +550,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -529,96 +600,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <N d'arxiu>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Reprodueix"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Tancat el fitxer %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Desfés"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Refés"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -627,26 +698,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: recuperació de disseny ?"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -656,7 +712,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -666,7 +722,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -677,7 +733,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -686,54 +742,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -741,155 +797,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Següent"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -897,94 +961,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Visualització prèvia"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -998,8 +1062,8 @@
 "\n"
 "Recordeu apagar els efectes (ctrl-0) després !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1007,180 +1071,188 @@
 "\n"
 "Esperi"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Mostra els detalls"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Suficient"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Previsualització"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formata"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Mida del marc"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Mida del fitxer"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Temps total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "QPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Marcs"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Àudio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Mantingui la configuració del _meu"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Mostra _Detalls"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Tanca la finestra"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Desa en arxiu"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insereix"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Nombre de vegades per inserir"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Insereix _amb el so"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Insereix _sense so"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - De selecció obert"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - De selecció obert"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1190,7 +1262,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1199,48 +1271,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "No enviï informació d'ample de banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Proveu aquesta opció si vostè està tenint problemes per aconseguir un flux de"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Tria un directori de treball"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1248,399 +1335,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Tria un directori de treball"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nou nom "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avançat"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capítol  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "primer"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "últim"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "segons."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "selecció."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Carpeta:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr ""
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "selecció"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Títol/Nom : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentaris : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Desa en arxiu"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: seleccioneu un directori"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "No feu cas dels canvis"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Guardar disseny"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recuperació de disseny ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: recuperació de disseny ?"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "Estableix com a predeterminat"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Selecciona Fitxer"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1648,11 +1694,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Aquest fitxer"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1660,7 +1706,7 @@
 ",\n"
 " - incloent-hi el disseny actual - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1670,7 +1716,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1680,14 +1726,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1695,7 +1741,7 @@
 "\n"
 "Arxiu de projecte no vàlid.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1708,33 +1754,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1742,97 +1788,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Suprimeix %s"
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Retalla"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1841,31 +1887,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1873,7 +1919,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1882,79 +1928,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "S'està inserint"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Insereix"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "S'està suprimint"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -1964,7 +2010,7 @@
 "\n"
 "La selecció està bloquejat.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1972,11 +2018,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1985,7 +2031,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1994,7 +2040,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2003,22 +2049,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2026,93 +2072,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2129,11 +2175,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Ferran https://launchpad.net/~ferranl\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  nitrofurano https://launchpad.net/~nitrofurano-3t\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2147,21 +2206,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2169,195 +2228,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "S'està cancel·lant"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Reprén"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Mantén"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2365,29 +2436,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Atura"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2396,7 +2466,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2404,13 +2474,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2419,17 +2489,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2439,19 +2509,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2460,1049 +2530,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "No es pot trobar el fitxer del mapa de píxels (pixmap): %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Fitxer"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Edita"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Enganxa com a _nou"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Suprimix la selecció"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "S_elecciona..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecció"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Reprodueix"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Atura"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "Pantalla _completa"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Silenci"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Eines"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitats"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Genera"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Genera"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferències..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Àudio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Informació"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "Ava_nçat"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Joguines"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Cap"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Quant a"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volum"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Lliure"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Inici"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Arrere"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Reprodueix-ho tot"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3510,81 +3556,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3592,7 +3638,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3600,32 +3646,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3633,68 +3679,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3704,53 +3750,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Desfés %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refés %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3762,11 +3819,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3774,14 +3831,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3789,29 +3846,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3819,66 +3876,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "selecció"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Mida del fitxer"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3887,16 +3940,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Sense títol%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3904,7 +3957,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3912,68 +3965,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "S'està restaurant"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3983,22 +4031,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4006,69 +4054,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "avís"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Insereix"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Falla"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Quant a"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4079,7 +4124,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4091,11 +4136,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4103,46 +4148,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4150,7 +4195,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4162,14 +4207,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4177,19 +4222,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4197,83 +4242,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4282,14 +4327,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4298,7 +4343,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4309,7 +4354,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4318,11 +4363,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4364,11 +4409,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4390,17 +4435,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4408,28 +4454,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4438,7 +4484,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4446,7 +4492,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4454,7 +4500,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4465,7 +4511,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4475,7 +4521,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4483,7 +4529,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4492,13 +4538,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4509,13 +4555,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4525,7 +4571,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4534,7 +4580,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4542,7 +4588,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4550,63 +4596,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4614,14 +4660,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4630,25 +4676,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4657,33 +4703,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -4693,7 +4739,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -4703,7 +4749,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -4713,7 +4759,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4722,7 +4768,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -4732,7 +4778,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4741,7 +4787,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -4751,12 +4797,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4765,7 +4811,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4774,7 +4820,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4783,14 +4829,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4798,13 +4852,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4814,27 +4868,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4843,14 +4897,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4861,19 +4915,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4881,7 +4935,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4889,7 +4943,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4901,45 +4955,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Benvingut a LiVES versió %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4948,346 +5000,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generador"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generador"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "generador"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transicions"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efecte"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efectes"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilitats"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "divisor"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "àudio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mescladors d'àudio"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Mescladors d'àudio"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "desconegut"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "A_mplada"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "A_lçada"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5295,74 +5600,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Estableix com a predeterminat"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Tanca la _finestra"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Paràmetre no vàlid"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Refés"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Verd"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Blau"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5372,17 +5674,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5392,32 +5694,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5426,14 +5728,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5443,40 +5738,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5485,11 +5787,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5498,7 +5800,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5508,193 +5810,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: recuperació de disseny ?"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Codi de l'idioma:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5704,55 +5989,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Mou am_unt"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Mou a_vall"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5761,7 +6046,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5769,231 +6054,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6001,28 +6274,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6031,41 +6304,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6075,27 +6348,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6104,7 +6377,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6114,12 +6387,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6129,7 +6402,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6139,12 +6412,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6152,23 +6425,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6178,55 +6451,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Incorporat"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Personalitzat"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Comprova"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6234,26 +6495,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6261,7 +6533,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6269,7 +6541,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6278,28 +6550,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6311,20 +6590,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6332,790 +6611,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "IGU"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "segons"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Mai"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "S'està descodificant"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Connectors"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Reproducció"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Enregistrament"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Còdec d'Àudio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Directoris"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Advertències"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Miscelànea"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temes"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7123,222 +7402,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Redimensiona"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Remostreja"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Sense signar"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nou"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Il·limitat"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7349,7 +7620,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7360,89 +7631,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tipus: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7452,7 +7723,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7460,19 +7731,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7482,12 +7753,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7497,22 +7768,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7522,43 +7793,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7566,40 +7842,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Cap Descripció"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Descripció: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7608,65 +7889,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Informació"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Neteja"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7716,11 +8001,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7738,64 +8018,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7804,7 +8084,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7812,14 +8092,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7829,7 +8109,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7838,208 +8118,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Tapa els forats"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Suprimeix el bloc"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Suprimeix %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8049,7 +8331,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8057,587 +8339,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "_Selecció"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderitza"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Visualitza"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Visualització compacta"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Aplica"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Desplaçament"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s a %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8645,275 +8935,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "fotogrames"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8921,94 +9203,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9016,7 +9298,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9024,328 +9306,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Començant servidor d'audio pulsant..."
+msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "dades"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocitat"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "estat"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "interval"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Suprimeix-los tots"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Atura l'enregistrament"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "clau"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9354,7 +9643,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9363,12 +9652,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9999,9 +10288,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "segons"
 
-#~ msgid "_Top"
-#~ msgstr "_Superior"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "Ona"
@@ -10200,10 +10486,6 @@
 #~ msgid "tunnel"
 #~ msgstr "tunel"
 
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Insereix"
-
 #~ msgid "cdda2wav is required for this function."
 #~ msgstr "És necessari cdda2wav per aquesta funció"
 
@@ -10213,20 +10495,5 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Primer heu de triar el dispositiu CD a Preferències"
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LIVES no troba prou imatges per satisfer els treballs."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Proveu-ho de nou amb dades diferents"
-
 #~ msgid "$error"
 #~ msgstr "Falla"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Començant servidor d'audio pulsant..."
-
-#~ msgid "Red"
-#~ msgstr "Vermell"

LiVES-1.6.1.tar.bz2/po/cs.po -> LiVES-2.0.3.tar.bz2/po/cs.po Changed

@@ -8,20 +8,21 @@
 "Project-Id-Version: LiVEScz\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:09+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: <martin@svobodicz.com, ales@mur.at>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-Language: Czech\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -30,7 +31,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -44,7 +60,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -56,7 +72,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -64,170 +80,191 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Zachování nastavení.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Měním velikost"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "Změnit velikost všech _snímků"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Libovolný"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Žádný"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "doporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "zakázáno!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Bieżący układ**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Vestavěno"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Vlastní"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Test"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert... nalezen..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NENALEZEN..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite... nalezen..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NENALEZEN..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox... nalezen\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NENALEZEN\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... nalezen..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NENALEZEN..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd... nalezen..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NENALEZEN..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykryto..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIE WYKRYTO..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python... nalezen..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python... NENALEZEN..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab... nalezen..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab... NENALEZEN..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo... nalezeno..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo... NENALEZENO..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -238,37 +275,63 @@
 "\n"
 "Správcem oken je \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "počet nalezených monitorů: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "malý endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "velký endian"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Složka pro dočasné soubory je %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Zkompilováno s podporou Jacku, dobrá práce!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Kompilován s podporou pulse audio, skvělé !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -277,7 +340,7 @@
 "Vítejte v LiVES verze %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -286,85 +349,85 @@
 "\n"
 "Startovací syntaxe je: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Kde: název souboru je název media souboru nebo záložního souboru.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "počáteční _čas : čas do spuštění souboru ve vteřinách\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "snímků : maximální počet snímků, které lze otevřít\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts může být:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : zobrazit tuto nápovědu a ukončit\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : automaticky otevřít sestavu klipu\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : při spuštění nenahrávat sestavu\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : nenahrávat havarijní zálohu\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : nahrát havarijní zálohu\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : nezobrazovat GUI\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : spustit OSC naslouchač na UDP portu <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : nespouštět OSC naslouchač\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -372,44 +435,44 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox, nebo jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " lub sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <nazwa mapy> : automatycznie Pokaż urządzenie ładunkowe\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : próby debugowania awarii (wymaga 'gdb' zainstalowane)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Startuji grafické rozhraní..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -417,26 +480,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Téma, které hledáte nebylo nalezeno. Ujistěte se, že máte toto téma "
-"nainstalované v\n"
-"%s/%s.\n"
-"(Možná budete muset upravit <prefix_dir> ve vašem ~/.lives souboru)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES nebyl schopen zapsat malý soubor do /tmp\n"
-"Ujistěte se, zda máte práva zápisu do /tmp a zkuste to znovu.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -450,53 +505,37 @@
 "Prosím přečtěte si ještě jednou README soubor, který byl dodán s instalačním "
 "balíkem než spustíte LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES nemůže číst ze svého konfiguračního souborun%s/.lives\n"
-"\n"
-"Zkontrolujte oprávnění a zkuste to znova\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES nemůže zapisovat do svého konfiguračního souboru\n"
-"%s/.lives\n"
-"\n"
-"Zkontrolujte oprávnění a zkuste to znovu\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES  nebyl schopen použít dočasný adresář\n"
-"%s\n"
-"\n"
-"Zkontrolujte <tempdir> nastavení v  \n"
-"%s/.lives\n"
-"a zkuste to znovu.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -504,10 +543,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES nebyl schopen zachytit tento obrázek\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -524,7 +561,7 @@
 "instalačním balíkem než spustíte LiVES.\n"
 "Díky.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -534,7 +571,14 @@
 "LiVES pro provoz momentálně vyžaduje 'mplayer', nebo 'sox'. Nainstalujte "
 "jeden z nich a zkuste to znovu.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -544,7 +588,7 @@
 "LiVES nebyl schopen najít 'mplayer'. Instalací 'mplayer' získáte plně "
 "funkční LiVES.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -554,7 +598,7 @@
 "LiVES nebyl schopen najít 'convert'. Chcete-li využívat renderovacích "
 "efektů, měli byste nainstalovat convert a image-magick.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -564,7 +608,7 @@
 "LiVES nebyl schopen najít 'composite'. Pakliže chcete využívat funkci "
 "slučování, měli byste nainstalovat composite a image-magick.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -574,7 +618,7 @@
 "LiVES nemohlo nalézt 'sox'. Některé zvukové funkce nejspíše nebudou "
 "fungovat. Měli byste nainstalovat 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -582,69 +626,63 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES nemohl najít kódovací pluginy.\n"
-"Prosím, ověřte, zda byly správně nainstalovány do\n"
-"%s%s%s/\n"
-"Bez nich nebudete moci ukládat.\n"
-"Budete potřebovat změnit hodnotu <lib_dir> v ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Automaticky načítám sadu %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Neplatný zvukový přehrávač %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 "LiVES-%s: <Bezejmenný%d> %dx%d : %d snímků, %d bitů na pixel, %.3f snímků/s"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? snímků ???, bitů na pixel, %.3f snímků/s"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d snímků, %d bitů na pixel, %.3f snímků/s"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <žádný soubor>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Přehrát"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -652,35 +690,35 @@
 "LiVES nebyl schopen zachytit tento obrázek\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Zavřený soubor %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Znovu"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Levý zvuk"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Pravý zvuk"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -694,26 +732,11 @@
 "přepínat klipy při otevírání.\n"
 "Upravte nastavení přehrávání v Nastavení a zkuste to znova.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Přehrávací okno"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Přehrávací okno"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -723,7 +746,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -733,7 +756,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +767,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -753,54 +776,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -808,11 +831,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -820,145 +843,153 @@
 "ale některé zvukové funkce, bude zakázán.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Zvolte zvukový přehrávač"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Použijte _pulse audio přehrávač"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Použít zvukový přehrávač _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Použijte _sox audio přehrávač"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Použijte _mplayer audio přehrávač"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "Nelze spustit generátor %s\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -966,97 +997,97 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Nechat LiVES nastavit _příponu souboru"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "Nechat LiVES nastavit _příponu souboru"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Použít odstranění prokládání"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Je-li zapnuto, ze snímků bude odstraněno prokládání tak, jak jsou "
 "importovány."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Kliknutím zobrazíte _náhled vybraného videa, obrázku, či zvukového souboru"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Kliknutím zobrazíte _náhled vybraného zvukového souboru"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Kliknutím zobrazíte _náhled vybraného videa"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Zpracovávám..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1070,8 +1101,8 @@
 "\n"
 "Nezapomeňte poté vypnout (ctrl-0) efekty!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1079,107 +1110,114 @@
 "\n"
 "Čekejte prosím"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Zobrazit detaily"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Dost"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Náhled"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formátovat"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Velikost snímku"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Velikost souboru"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Velikost v Bytech"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Celkovy čas"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Snímků"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Události"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Pomer(rate)/velikost"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Pravý zvuk"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Nastavení kódování"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------- (Zaškrtněte políčko pro změnu velikosti dle návrhu)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<------------- (Zaškrtněte políčko pro použití doporučené velikosti)"
+msgstr ""
+
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Uložit _má nastavení"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Použít _doporučené nastavení"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1187,76 +1225,75 @@
 "_Nezobrazovat již toto varování\n"
 "(změnu nastavení provedete v Nastavení > Varování)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Zobrazit _Detaily"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Zavřít okno"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Zapisz do pliku"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Vložit"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Kolikrát vložit"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Vložit do délky zvuku"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Vložit _před výběr"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Vložit obsah schránky před vybrané snímky"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Vložit _za výběr"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Vložit obsah schránky za vybrané snímky"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Vložit _se zvukem"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Vložit _bez zvuku"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Otevřít výběr"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Počáteční čas výběru (s)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Počet snímků k otevření"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
+
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Otevřít umístění"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Přejmenovat klip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1272,7 +1309,7 @@
 "Dále se ujistěte, zda máte nastavenou šířku pásma v Nastavení > Streamování\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1281,47 +1318,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Neposílat informace o šířce pásma"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Máte-li problém s příjmem, zkuste toto nastavení"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Přejmenovat klip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Zadejte jméno sestavy"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1333,7 +1385,7 @@
 "Prosím napište jméno sestavy.\n"
 "LiVES Vám připomene uložení sestavy při ukončení.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1342,247 +1394,207 @@
 "projekt.\n"
 "Jméno bude použito jako jméno projektu.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Přejmenovat klip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Zadejte jméno sestavy"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Zadejte jméno sestavy"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nové jméno "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Zadat jméno "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Pokročilé"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Zavést CD stopu"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Zvolit DVD titul/kapitolu"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Zvolit VCD titul"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Zavést stopu (z %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD titul"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD titul"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Maximální počet stop k zobrazení"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Kapitola  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Výstupní formát"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES: - Postupně zesílit zvuk"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES: - Postupně ztišit zvuk"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Zesílit přes  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "první"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Ztišit přes  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "poslední"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekund."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "výběr."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Hrát hudbu náhodně"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Počet požadovaných stop :    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Adresář"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Včetně podadresářů"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimální velikost souboru (MiB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maximální velikost souboru (MiB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "výběr"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Komentáře k souborům (volitelné)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Titul/název : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/umělec : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Komentáře : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Zapisz do pliku"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: zvolte adresář"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: vyberte soubor"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Zrušit/zahodit/uložit"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1592,7 +1604,7 @@
 "Stávající rozložení bylo od posledního uložení změněno.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1602,7 +1614,7 @@
 "Stávající rozložení bylo od posledního uložení změněno.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1612,7 +1624,7 @@
 "Stávající sestava klipů může být uložena.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1620,7 +1632,7 @@
 "Současná sestava klipů nebyla uložena.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1628,7 +1640,7 @@
 "Současné rozložení nebylo uloženo.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1636,140 +1648,131 @@
 "Obecny układ nie został zmieniony od ostatniego zapisania.\n"
 "Co chcesz zrobić ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Zadat jméno klipu"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Automatické otevření při dalším spuštění"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Vymazat rozložení"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorovat změny"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Smazat klipy"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Smazat rozložení"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Uložit rozložení"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Uložit sestavu klipu"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: zpět layout ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Nastavení kódování"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "Smazat _značky z časové osy"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Vynulovat hodnoty"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Ukládám jako sestavu %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Zvolte soubor"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Automaticky načítám sadu %s..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "Vyčištění klipu"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES nemohl najít program %s.\n"
-"Zkontrolujte, je-li v cestě a je spustitelný program.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Tento soubor"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1779,7 +1782,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1789,14 +1792,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1804,7 +1807,7 @@
 "\n"
 "Neplatný soubor projektu.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1826,33 +1829,33 @@
 "stornujte.\n"
 "Po této změně budete moci importovat nový projekt.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importuji projekt %s  jako %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importuji projekt"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportuji projekt %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportuji projekt"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Obnovit .lv1 soubor"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Zálohovat jako .lv1 rejstřík"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Obnovit .lv1 soubor"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1864,97 +1867,97 @@
 "Sestava bude smazána z disku.\n"
 "Jste si jisti?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Mažu sestavu..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Mažu sestavu..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Mazání sestavy"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Sestava %s byla trvale smazána z disku.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Vložit ticho"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Vracím zpět"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Obnovuji zvuk..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Délka videa je momentálně %d snímků při %.3f snímků za sekundu\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Schránka byla převzorkována na %d snímků\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Opakuji"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Kopírování snímků %d do %d%s do schránky ..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Kopírování do schránky"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Vkládání"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1968,7 +1971,7 @@
 "Zkuste označit všechny snímky a potom použít \n"
 "'Oříznout zvuk' ze Zvukového menu."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -1976,7 +1979,7 @@
 "LiVES nemohl vložit protože poměr zvuku nesedí.\n"
 "Prosím instalujte 'sox' a zkuste znovu."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -1986,7 +1989,7 @@
 "Vložením dojde k posunu snímků v některých vícestopých rozvrženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -1996,11 +1999,11 @@
 "Vložením dojde k posunu zvuku v některých vícestopých rozvrženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Převzorkovat zvuk ve schráce"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2012,7 +2015,7 @@
 "LiVES nemohl převzorkovat zvuk ve schránce.\n"
 "Zvuk ze schránky byl vymazán.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2026,30 +2029,30 @@
 "chcete pokračovat s vkládáním\n"
 "s nezměněným zvukem ?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Vkládání %d%s snímků ze schránky..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Vkládám"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Vložit %d krát ze schránky%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Vložit %d snímků ze schránky%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2059,7 +2062,7 @@
 "Vymazání všech snímků zavře tento soubor.\n"
 "Opravdu to chcete ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2069,8 +2072,8 @@
 "Smazání způsobí chybějící snímky v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2080,7 +2083,7 @@
 "Smazání způsobí chybějící zvuk v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2090,7 +2093,7 @@
 "Smazání způsobí posun snímků v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2100,20 +2103,20 @@
 "Smazání způsobí posun zvuku v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Mazání snímků %d do %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Mažu"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2123,7 +2126,7 @@
 "\n"
 "Výběr je uzamčený.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2131,11 +2134,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Nahrávání přerušeno.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2148,7 +2151,7 @@
 "Zpráva tohoto pluginu '%s':\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2161,7 +2164,7 @@
 "Nelze najít 'init' metodu v pluginu %s.\n"
 "Plugin je možná poškozený nebo není správně instalován."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2173,22 +2176,22 @@
 "\n"
 "Klikněte ''Zrušit' pokud nesouhlasíte.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Ukládádání %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Otvírání klipů ze sady %s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d klipy byly obnoveny ze setu(%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2199,38 +2202,37 @@
 "Pokračujte POUZE pokud nemáte spuštěnou další kopii LiVES.\n"
 "Pokračujete kliknutím OK.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Čistím diskový prostor..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Čistění diskového místa"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d MB diskového prostoru bylo obnoveno.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2238,7 +2240,7 @@
 "\n"
 "  Otvírání..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2247,7 +2249,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2256,14 +2258,14 @@
 "\n"
 "(%d decoded)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2271,23 +2273,23 @@
 "\n"
 "  Neznámo"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2296,8 +2298,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2313,25 +2314,26 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"Tento program je svobodný software, můžete jej šířit a / nebo modifikovat\n"
-"za podmínek uvedených v licenci GNU General Public License, vydávané\n"
-"Free Software Foundation a to buď verze 3 této licence, nebo\n"
-"(podle vašeho uvážení) kterékoli pozdější verze.\n"
-"\n"
-"Tento program je rozšiřován v naději, že bude užitečné,\n"
-"avšak BEZ JAKÉKOLI ZÁRUKY; dokonce bez předpokládané záruky\n"
-"PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. Podívejte se\n"
-"GNU General Public License pro více informací.\n"
-"\n"
-"Byste měli obdržet kopii licence GNU General Public License\n"
-"spolu s tímto programem, pokud ne, napište o ni Free Software\n"
-"Foundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Jakub Žáček https://launchpad.net/~dawon\n"
+"  Martin Svoboda https://launchpad.net/~martin-svobodicz\n"
+"  Roman Horník https://launchpad.net/~roman.hornik\n"
+"  milzou https://launchpad.net/~vonfsro\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2345,7 +2347,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2355,14 +2357,14 @@
 "\n"
 "Musíte nainstalovat mplayer pro náhled tohoto souboru.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2375,195 +2377,207 @@
 "Opravdu chcete pokračovat ?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Otvíráni zvuku %s, typu %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Otevřít zvuk"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Ruší se"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Nový zvuk : %d Hz %d kanál(ů) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Vykonávání zvuku"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nový zvuk"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d snímků je dost !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Přehrát celou obrazovku (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Vypnout přehrávání na celou obrazovku (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Dvojitá velikost (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Jednoduchá velikost (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Schovej přehrávací okno (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Zobraz hrací okno (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Přehraj v odděleném okně (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Vypnout opakované hraní (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Zapnout opakované hraní (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Hlasitost zvuku (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Pustit zvuk (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Ztišit zvuk (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Obracení přechodné paměti..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Obracení přechodné paměti"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Vybrat zvukový soubor"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Označte vaše zařízení pro hraní CD v Nástroje | Předvolby | Různé\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Otevirání CD stopy %d z %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CD stopa %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Otvírání CD stopy..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Chyba při otvírání CD stopy\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Výběr stopy"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "chyby rozložení"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "_Zavřít okno"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Vymazat _chyby"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Smazat zasažené rozvržení"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Pokračovat"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pozastaveno..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "pokračovat..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Zachovat"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2575,30 +2589,28 @@
 "(kliknout Podržet pro zachování toho co máme a stop)\n"
 "(kliknout Pokračovat pro pokračování)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Stop"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Vybrané snímky"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Ulož snímekk jako%s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2607,7 +2619,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2620,7 +2632,7 @@
 "\"xwininfo\"\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2628,7 +2640,7 @@
 "\n"
 "Doba nahrávání musí být větší než 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2642,17 +2654,17 @@
 "Vyberte 'Zrušit' pro zrušení\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Externí. okno bylo spuštěno.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2667,19 +2679,19 @@
 "Stop nebo 'q' pro ukončení.\n"
 "(Bude použito výchozí nastavení %.3f snímků za sekundu.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES nemohl zachytit toto okno. Sorry.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Vyexportovat vybraný zvuk jako..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Vyexportovat zvuk jako..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2693,81 +2705,86 @@
 "Klikněte na 'OK'  pro export s novou rychlostí nebo 'Zrušit' a exportovat "
 "originálním poměrem(rate).\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportování zvuku %d do %d jako %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportování zvuku jako %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportování zvuku"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Připojit zvukový soubor..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Připojování zvukového soubor %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Připojování zvuku"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Připojit zvuk"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Oříznutí zvuku z %.2f na %.2f sekundy..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Oříznout/Doplnit zvuk"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Oříznout/Doplnit zvuk"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Zesilování zvuku"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Zesilování zvuku"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Ztišování zvuku"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Ztlumit zvuk"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s na %.1f vteřin"
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Ztišování..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2777,671 +2794,635 @@
 "Vymazání audia způsobí zavření tohoto souboru.\n"
 "Pokračovat ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Vymazáváni zvuku kompletně"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Vymazáváni zvuku od %.2f do %.2f sekund..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Mazání zvuku"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Vymazat zvuk"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Nahrát nový zvuk"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Vkládání ticha od %.2f do %.2f sekund..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Vkládání ticha"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Smazat %d rozvržení...opravdu ?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nenalezen pixmap soubor: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Sloučit"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Sloučit schránku [ %d snímků ]    s výběrem [ %d snímků ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr "Sloučit schránku [ %d snímků (přeskupeno)]    s výběrem [ %d snímků ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Vyrovnat _počátky"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Vyrovnat _konce"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Co dělat s přebývajícími snímky ve schránce -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Vložit snímky"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Zahodit snímky"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Počet opakování schránky"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Opakovat schránku do naplnění výběru"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Přechod:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Sloučit schránku s výběrem..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "Vkládání %d extra snímků před sloučením\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "vkládám %d extra snímků\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Sloučení hotovo.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Vlastní efekty"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "Vlastní _pomůcky"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Otevřít soubor/adresář"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "_Poslední soubory..."
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "_Otevřít  umístění/stream..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "Importovat výběr z _dvd/vcd..."
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "Importovat výběr z _dvd"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "Importovat ze zařízení"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "Importovat ze zařízení"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importovat z _Firewire zařízení (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importovat z _Firewire zařízení (hdvú"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Poslední soubory..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_Znovuotevřít sadu..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Zavřít/_Uložit vše"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Kódovat _výběr jako..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Zavřít tento klip"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Zálohovat klip jako lv1..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Obnovit klip z .lv1..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Kódovat/Otevřít/Zálohovat _se zvukem"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "_Vyčistit disk"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Editovat"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_VÍCESTOPÝ režim"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Kopírovat výběr"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Vyjmout výběr"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Vložit ze schránky..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Vložit jako _nový"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Sloučit schránku s výběrem..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Smazat výběr"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Oddělit _video od zvuku"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Vybrat..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Vybrat všechny snímky"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "_Pouze počáteční snímek"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_Pouze poslední snímek"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Vybrat od prvního snímku"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Vybrat do _posledního snímku"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Vybrat poslední vložení/_Sloučení"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Vybrat poslední _efekt"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Obrátit výběr"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_Zamknout šířku výběru"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Přehrát vše"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "_Přehrát výběr"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "_Přehrát schránku"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "_Převinout"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Plná obrazovka"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Dvojitá velikost"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "_Přehrát v odděleném okně"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Prázdné pozadí"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Automaticky)_opakovat video (vyplnit podle zvuku)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "O_pakovat nepřetržitě"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong Smyčky"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Ztlumit zvuk"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Oddělené okno sticky mode"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "Ukázat počítadlo snímků"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "E_fekty"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Efekty jsou použity na současný výběr"
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Nástroje jsou použity na dokončení klipů"
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Otočit schránku"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Změnit přehrávání / Uložit rychlost"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Převzorkovat _video na nový poměr(sample rate)"
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Pomůcky"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Generovat"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Vlastní _nástroje"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Generovat"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Zachytit _externí okno "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Nastavení..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Zvuk"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Zavést _nový zvuk pro klip"
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Zavést _CD stopu"
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "Vysunout CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Nahrát e_xterní zvuk..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "k novému _klipu..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "k _výběru"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "_Zesílit zvuk..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "_Ztišit zvuk..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Vyexportovat zvuk"
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "_Vyexportovat označený zvuk"
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "_Vyexportovat všechen zvuk"
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Připojit zvuk"
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Oříznout/pad zvuk..."
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "_oříznout/pad zvuk k označení..."
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "_oříznout/pad zvuk od začátku do _Hraj Start..."
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_vymazat zvuk"
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "_vymazat označený zvuk"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "_vymazat veškerý zvuk"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Vsunout _ticho do výběru"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Převzorkovat zvuk..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Přehrát _zvuk, použít xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Přehrát náhodný _zvuk, použít xmms..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Zastavit xmms _přehrávání"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Zobrazit _Informace o klipu"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Zobrazit/ _Upravit komentáře k souboru"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Zobrazit _informace o schránce"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Zobrazit _zprávy"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Zobrazit chyby _rozložení"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Klipy"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Přejmenovat klip v menu..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "Pro _pokročilé"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Efekty/Nástroje/Pomůcky"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Nový test RFX Skript"
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Kopírovat RFX Skript k testování..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Upravit RFX Skript"
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "_Přejmenovat RFX Skript"
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Smazat test RFX Skript"
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importovat vlastní RFX skript"
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "_Exportovat vlastní RFX skript"
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "_Smazat vlastní RFX skript"
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "_Rekonstruovat všechny RFX pluginy"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Poslat LiVES proud do ..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Otevřít _yuv4mpeg stream na %sstream.yuv"
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importovat projekt (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportovat projekt (.lv2)"
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Mapování real time _efektu"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Přiřaď real time efekty k ctrl-numerickým klávesám."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Nastavit _výchozí hodnoty real time effektu"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Nastavit výchozí hodnoty pro real time efekty."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Uložit _výchozí hodnoty real time effektu"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3449,305 +3430,305 @@
 "Uložit výchozí hodnoty real time efektů, budou použity při každém spuštění "
 "LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Resetování všech rychlosti přehrávání a pozice"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "Rozhraní _MIDI/Joystick"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_Uložit mapu zařízení..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_Načíst mapu zařízení..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Zobrazit VJ klávesy"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "Hračky"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Nic"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_Bláznivé snímky"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (širokopásmová)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manuál (otevře se v prohlížeči)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Věnovat prostředky na projekt !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_E-mail autora"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "_Nahlásit chybu"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Navrhněte _funkci"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_O LiVES"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Zpět na začátek (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Přehrát vše (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Zastavit přehrávání (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Přehrát výběr (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Hlasitost zvuku (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Vyplň pozadí (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Hrát pomaleji (ctrl-šipka dolů)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Hrát rychleji (ctrl+šipka nahoru)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "přeskočit dozadu (kontrol+levá šipka)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Přeskočit dopředu (ctrl+pravá šipka)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Zobrazt informace o klipu (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Schovat tuto lištu"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Rychlost přehrávání videa (snímků za sekundu)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Změnit rychlost videa"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "První snímek"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Poslední snímek"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "První vybraný snímek v tomto klipu"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "Poslední vybraný snímek v tomto klipu"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Začíná.....\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr "    Stisknutím 'q' ukončíte nahrávání.  NEPŘEKRÝVEJTE HRACÍ OKNO !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Číslo snímku k náhledu"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "Vo_lné"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Volný výběr čísla snímku"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Start"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "Kon_ec"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Kurzor"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Převinout"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Přehrát vše"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Přehrát výběr"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Opakování zapnuto/vypnuto"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Spustit _nahrávání"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Zastavit _nahrávání"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Schovat přehrávací okno"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Zobrazit přehrávací okno"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "%.2f s"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "%.2f s"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "%.2f s"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "%.2f s"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "%.2f s"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Mazání schránky"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3758,7 +3739,7 @@
 "==============================\n"
 "Přepnuto na klip %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3768,11 +3749,11 @@
 "==============================\n"
 "Přehození na prázdný klip\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3781,7 +3762,7 @@
 "Jméno setu bylo změněno z %s na %s. Související rozložení budou "
 "aktualizovány\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3790,7 +3771,7 @@
 "Klip %s schází v tomto setu.\n"
 "Je vyžadován tímto rozložením:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3799,7 +3780,7 @@
 "Klip %s byl uzavřen.\n"
 "Je vyžadován tímto rozložením:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3808,7 +3789,7 @@
 "Snímky v klipu %s byly posunuty.\n"
 "Tato rozvržení budou ovlivněny:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3817,7 +3798,7 @@
 "Snímky z klipu %s byly smazány.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3826,7 +3807,7 @@
 "Zvuk byl smazán z klipu %s.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3835,7 +3816,7 @@
 "Zvuk v klipu %s byl posunut.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3844,7 +3825,7 @@
 "Zvuk v klipu %s byl upraven.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3853,7 +3834,7 @@
 "Snímky v klipu %s byly upraveny.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3861,7 +3842,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3872,7 +3853,7 @@
 "Sestava %s je souběžně používána jinou kopií LiVES.\n"
 "Vyberte jiné jméno.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3880,16 +3861,13 @@
 "\n"
 "Jméno souboru nesmí být prázdné\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"Jméno nesmí obsahovat mezery nebo znaky%s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3898,13 +3876,13 @@
 "\n"
 "Jméno nesmí obsahovat mezery nebo znaky%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3915,68 +3893,68 @@
 "Sestava %s již existuje.\n"
 "Prosím vyberte jiné jméno.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Odstraňuji rozložení %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [otevírání...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video  [%.2f sek]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Nepopsané)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Žádné video)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Žádný zvuk)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [otevírání...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Levý kanál zvuku  [otevírání...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Levý kanál zvuku   [%.2f sek]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Pravý kanál zvuku  [otevírání...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Pravý kanál zvuku  [%.2f sek]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES nemůže při načítání klipů přepnout na mplayer."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Vyčištění klipu"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3991,54 +3969,65 @@
 "\n"
 "přemazat ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Vrátit %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Opakovat %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "---------------Výběr--------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sek ] ----------výběr---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " snímků ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Kontroluji hlavičku souboru"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Otvírání%s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Otvírání%s začátek %.2f sek. snímků %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " bez zvuku"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Otevírám zvuk pro %s"
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -4048,18 +4037,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"LiVES není doposud optimalizován na velké soubory\n"
-"Začněte s malými, nebo použijte otevřít rejstřík výběr \n"
-"(velikost rejstříku=%.2fMB)\n"
-"\n"
-"Opravdu pokračovat ?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - mějte přeci trpělivost."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4071,7 +4054,7 @@
 "LiVES nebyl schopen extrahovat buď video, nebo zvuk.\n"
 "Prosím, pro více informací zkontrolujte okno terminálu.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4081,7 +4064,7 @@
 "\n"
 "K otevření tohoto souboru musíte nainstalovat mplayer.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4093,32 +4076,29 @@
 "Zkontrolujte nastavení příkazu pro otevření videa v\n"
 "Nástrojích|Předvolbách|Dekodování\n"
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Ztišování..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Ulož snímekk jako%s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Ulož snímekk jako%s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Přejmenovat klip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4130,33 +4110,29 @@
 "\n"
 "Tak co, pokračovat ?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "výběr"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Spojuji výběr"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (bez zvuku)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "Ukládání snímků %d do %d%s jako \"%s\" : enkoder = %s : formát = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "Ukládání snímků 1 do %d%s jako \"%s\" : enkoder = %s : formát = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Ukládám [může to chvíli trvat]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4166,34 +4142,33 @@
 "\n"
 "Chyba enkoderu - výstupní soubor nebyl vytvořen !\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "Mazání schránky"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Velikost souboru"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "nahrávání přerušeno náhledem.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "nahrávání přerušeno přehráváním náhledu.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Nahrávání produkce..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Průměrná hodnota FPS byla %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4207,16 +4182,16 @@
 "Klikněte na Nástroje--->Změnit velikost všech snímků \n"
 "a změňte všechny velikost všech snímků na současnou hodnotu.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Bez jména%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4224,7 +4199,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4236,14 +4211,14 @@
 "(snímků za sekundu). \n"
 "Výchozí hodnoty lze nastavit v Nástroje | Předvolby | Různé\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Rychlost přehrávání byla upravena na %.3f snímků za sekundu, aby odpovídal "
 "zvuku.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4252,7 +4227,7 @@
 "Snímky=%d typ=%s velikost=%dx%d *bpp=Šedá škála* snímků za sekundu  =%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4261,49 +4236,44 @@
 "Snímků=%d typ=%s velikost=%dx%d bpp=%d snímků za sekundu =%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s nic\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d kanál(ů) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Komentář: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Uložení snímků %d jako %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "zZálohování %s jako %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Zálohuji"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "data byly zazálohovány"
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Obnovování %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Obnovování"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4317,22 +4287,22 @@
 "LiVES ho nemohl obnovit.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4340,7 +4310,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4350,64 +4320,59 @@
 "Byly nalezeny soubory z předchozího spuštění LiVES.\n"
 "Pokusit se o jejich obnovení?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Obnovuji soubory"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Zobrazit postižených _rozložení"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Čistění diskového místa"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s pokročilé nastavení"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Varování !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "varování"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Výběr barvy"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Vymazat _chyby"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_O LiVES"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4418,7 +4383,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4430,11 +4395,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Audio přehrávače nemohou být přepnuty během přehrávání."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4446,20 +4411,18 @@
 "LiVES nemohl vykonat tuto operaci kvůli nedostatek paměti.\n"
 "Co takhle zkusit zavřít ostatní prográmky ...\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% hotovo. Zbývající čas je přibližně %us\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4468,14 +4431,14 @@
 "\n"
 "Otevřeno %d z %d snímků. Zbývající čas je přibližně %us.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4484,7 +4447,7 @@
 "\n"
 "%d snímků otevřeno.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4493,7 +4456,7 @@
 "\n"
 "Zbývající čas: %d sec"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4504,7 +4467,7 @@
 "Nezlobte se, ale LiVES může otevřít pouze %d souborů najednou.\n"
 "Zavřete soubor a zkuste to znova."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4523,7 +4486,7 @@
 "\n"
 "Ujistěte se, že do tohoto adresáře můžete zapisovat."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4533,7 +4496,7 @@
 "Prosím nainstalujte 'sox'\n"
 "Nebo vyberte jiný formát kódování v Nástroje | Nastavení | Encoding\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4545,7 +4508,7 @@
 "Tento formát nelze použít s vybraným zvukovým kodekem.\n"
 "Nastavte zvukový kodek v Nástroje|Nastavení|Encoding\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4553,16 +4516,13 @@
 "Toto rozvržení obsahuje vygenerované snímky.\n"
 "Nelze ho uložit. Nejprve ho vyrendrujte klip.\n"
 
-#: src/dialogs.c:1820
-#, fuzzy
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
-"Toto rozvržení obsahuje vygenerované snímky.\n"
-"Nelze ho uložit. Nejprve ho vyrendrujte klip.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4573,7 +4533,7 @@
 "\n"
 "Z důvodu omezení ve %s formátu\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4581,43 +4541,43 @@
 "LiVES doporučuje následující nastavení:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", označeno"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", neoznačeno"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", malý endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", velký endian"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Nastavení videa na %.3f snímků za sekundu\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Nastavení videa na %d:%d snímků za sekundu\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Nastav velikost videa na %d x %d pixelů\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4625,35 +4585,35 @@
 "\n"
 "Přejete si:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "změnit velikost videa %d x %d pixelů\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES musí:\n"
 
-#: src/dialogs.c:1974
-#, fuzzy, c-format
+#: src/dialogs.c:2112
+#, c-format
 msgid "resample audio to %d Hz%s%s\n"
-msgstr "převzorkování videa na %d:%d snímků za sekundu\n"
+msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "převzorkování videa na %.3f snímků za sekundu\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "převzorkování videa na %d:%d snímků za sekundu\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4667,7 +4627,7 @@
 "Vyberte `OK` pro pokračování, `Zrušit` pro storno.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4677,7 +4637,7 @@
 "Změny použité na výběr nebudou trvalé.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4690,7 +4650,7 @@
 "LiVES nemohl nahrát produkci. Nedostatek paměti \n"
 "Zkuste nahrát jen vybranou část souboru"
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4707,7 +4667,7 @@
 "Vložení bude upraveno, aby se vešlo do klipu\n"
 "Vyberte 'Zrušit' a ukončíte vkládání nebo 'OK' a pokračovat."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4716,11 +4676,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Zobrazit klávesy"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4800,11 +4760,11 @@
 "d dvojí rozměr\n"
 "g smyčky ping pong\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Klávesy pro výběr stopy"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4826,19 +4786,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Historie zpráv"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Po upgradu/instalaci budete možná muset poopravit ,<prefix_dir> nastavení ~/."
-"lives souboru."
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4846,10 +4805,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4859,18 +4818,18 @@
 "\n"
 " (Soubory musí mít příponu .mp3, .ogg, .wav, .mod, .xm nebo .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "nezdařilo se(neznámý typ)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4883,7 +4842,7 @@
 "Kliknutím na 'OK' přidáte aktuální klipy a rozložení k existujícímu.\n"
 "Klikněte na 'Zrušit' pro výběr nového jména.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4895,7 +4854,7 @@
 "Opravdu pokračovat ?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4907,7 +4866,7 @@
 "Opravdu pokračovat ?\n"
 "."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4918,7 +4877,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4928,7 +4887,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4936,7 +4895,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4945,13 +4904,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4962,13 +4921,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4978,20 +4937,16 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
-#, fuzzy, c-format
+#: src/dialogs.c:2361
+#, c-format
 msgid ""
 "\n"
 "Some old layouts for the set %s already exist.\n"
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 msgstr ""
-"\n"
-"Existují stará rozvržení pro set %s.\n"
-"Doporučujeme je smazat.\n"
-"OK pro smazání, Cancel pro zachování na disku.\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5004,7 +4959,7 @@
 "Zavřete jinou aplikaci, nebo uberte paměť pro krok zpět\n"
 "v Nastavení/Multitrack/Paměť zpět\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5016,7 +4971,7 @@
 "Zvyšte velikost paměti pro krok zpět\n"
 "v Nastavení/Multitrack/Paměť zpět\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5025,19 +4980,19 @@
 "LiVES nemohl rezervovat dostatek paměť pro zásobník multistopého kroku "
 "zpět.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "nebo vložte menší hodnotu.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Zkuste znovu z editoru klipů, zkuste uzavřít jiné aplikace\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Zkuste zavřít jinou aplikaci\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5045,34 +5000,34 @@
 "Multitrack má nastaveno 0 zvukových kanálu, ale rozložení obsahuje zvuk.\n"
 "Upravte nastavení zvuku v menu Nástroje.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "Současná struktura obsahuje zvuk, proto zvukové kanály nemohou mít nulovou "
 "hodnotu.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5082,7 +5037,7 @@
 "\n"
 "Audio poměr(rate) musí být větší než 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5090,7 +5045,7 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5100,7 +5055,7 @@
 "\n"
 "Pro používání této funkce musíte nainstalovat balík \"dvgrab\".\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5109,25 +5064,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5136,34 +5091,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "přerušeno.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "selhalo.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "chyba v souboru. Ukončeno.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5171,13 +5126,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5185,13 +5136,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5199,26 +5146,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5226,26 +5165,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5253,17 +5184,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES neschopno zapsat rejstřík:\n"
-"%s\n"
-"podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5272,7 +5199,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5285,7 +5212,7 @@
 "%s\n"
 "podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5294,19 +5221,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"Sestava bude smazána z disku.\n"
-"Jste si jisti?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5314,13 +5244,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5330,27 +5260,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5359,14 +5289,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5377,19 +5307,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5397,7 +5327,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5405,7 +5335,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5417,45 +5347,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Vítejte v LiVES verze %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5464,201 +5392,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generátor"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Generátory"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generátor"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Generátory"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "přechod"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Přechody"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efekt"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efekty"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "pomůcka"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Pomůcky"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "sazeč"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Sezeče"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Taps"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "rozdělovač"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Rozdělovače"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Převodníky"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Přechody zvuku/videa"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "pouze zvuk"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Audio Mixery"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "Ovládání hlasitosti"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Ovladače hlasitosti zvuku"
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "pouze zvuk"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Zvukové parametry"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s všechny snímky..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s schránka do snímků %d na %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s do schránky..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s do nového klipu..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s snímků %d do %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s schránka s výběrem"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s do schránky"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s do nového klipu"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s snímky %d do %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5666,148 +5637,356 @@
 "\n"
 "Nebyly generovány žádné snímky.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Chyba: plugin %s nemá žádnou funkci weed_setup().\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Včetně podadresářů"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Nelze spustit ukázku %s, chybový kód %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Nelze spustit generátor %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Nepodařilo se spustit generátor %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Nepodařilo se spustit generátor %s, chyba %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Pro změnu těchto hodnot můžete kliknout na Náhled"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Vynulovat hodnoty"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Snímek"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Zachovat stejný poměr stran jako u originálního políčka"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Oprava ukazatele hlediska"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Vybrat soubor"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Zachovat stejný poměr stran jako u originálního políčka"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "Přechod _In"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Přechod in"
-
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Přechod _Out"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Přechod out"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : velikost"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Nová velikost (pixely)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Šířka"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Výška"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Generovat do S_chránky"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Generovat rámce do schránky"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Generovat do _Nového klipu"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Generovat rámce do nového klipu"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5818,62 +5997,59 @@
 "Musíte označit nejméně %d snímků k použití tohoto efektu.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "_Zavřít okno"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Žádné parametry"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Neplatný parametr"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Výběr barvy"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Klikněte pro nastavení barvy"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Znovu"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Červená (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Zelená"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Zelená (0 -255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Modrá"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Modrá (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -5882,12 +6058,12 @@
 "\n"
 "Chyba pluginu : %s  selhal s kódem %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : zpráva  %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5897,17 +6073,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5917,32 +6093,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5951,14 +6127,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5968,40 +6137,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6010,11 +6186,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Nelze změnit velikost, nainstalujete imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6023,7 +6199,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6033,188 +6209,171 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/unknown"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Nastavení kódování"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Otevření %s selhalo, přechod nemůže změnit velikost.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s pokročilé nastavení"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nový Test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Editovat Test RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efekt -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Přechod -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generátor -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Nástroj -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Pomůcka -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Jméno:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Jméno pluginu (bez mezer)."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Verze:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Verze skriptu."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Autor skriptu."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (nepovinné):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL správce pluginu."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menu text:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Text zobrazený v menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Popis akce:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Popište, co plugin dělá. např \"identifikuje rohy\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Minimální počet snímků:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Minimální počet snímků, kterým tento efekt muže být aplikován. Normálně 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Požadavky..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Vypište binárky požadované pluginem."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Vlastnosti"
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Nastavit vlastnosti pro plugin. Nepovinné."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parametry..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Nastavit parametry použité v před/smyčka/po/spoušť kódu. Nepovinné."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Parametr _okna nápovědy..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Nastavit nápovědy jak rozložit okno s parametry. Nepovinné."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Jazykový kód:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Jazyl pro před/smyčka/po/spoušť. Nepovinné."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "_Před smyčka kód..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Kód spouštěný před smyčkou. Nepovinné."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "_Kód smyčky..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Kód smyčky použitý na každý snímek."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "_Kód po smyčce..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Kód spouštěný po smyčce. Nepovinné."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "_Spouštěcí kód..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6222,7 +6381,7 @@
 "Nastavit spouštěcí kód pro situaci, kdy parametr okna je zobrazen, nebo "
 "parametr je pozměněn. Nepovinné (kromě Pomůcek)"
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6237,55 +6396,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX požadavky"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX parametry"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX parametry okna nápověda"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX spouštěče"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nový vstup"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Upravit vstup"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Vymazat vstup"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Posun_nahoru"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Posun_dolu"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX vlastnosti"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "_Pomalu (nápověda GUI)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6299,7 +6458,7 @@
 "Nejdříve odstraňte spouštěč .\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6311,197 +6470,185 @@
 "Některé spouštěče byly upraveny.\n"
 "Zkontrolujte kód spouštěče.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nový RFX Parametr"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Editovat RFX Parametr"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Jméno:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Jméno parametru musí být v pluginu jedinečné."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Jméno/Označení:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 "Jméno zobrazované parametrem. Podtržené představuje mnemotechnickou pomůcku."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "Tlačítko _skupina: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "Pro skupinu přepínačů může být použita pouze nenulová hodnota."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Typ:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Typ parametru (vyberte ze seznamu)"
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Počet decimálních _míst: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "_Výchozí hodnota:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_Výchozí: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "Tlačítko _skupina: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "Pro skupinu přepínačů může být použita pouze nenulová hodnota."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "_Minimální hodnota: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Ma_ximální hodnota: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     _Krok:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "O kolik je upraven parametr po stisku otáčecích šipek."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Zalomení: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Vždy když hodnota překročí max->min a min->max."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Nastav _hodnoty"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Výchozí hodnota:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Minimální hodnota: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Maximální hodnota: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Výchozí _červená:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Výchozí _zelená"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Výchozí _modrá "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "Nastavit _výchozí"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Výchozí hodnota:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Maximální délka (znaků): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nový RFX Parametr nápovědy okna"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Editovat RFX Parametr nápovědy okna"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Klíčové slovo:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Speciální typ:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Speciální podtyp:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Řada:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Propojené parametry (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Propojené parametry (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nový RFX spouštěč"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Upravitt RFX spouštěč"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Pokud:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Před smyčkový kód"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Smyčkový kód"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Po smyčkový kód"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: -Výchozí text (max. délka %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Zadejte hodnoty, jedna na řádek"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6511,7 +6658,7 @@
 "\n"
 "Jméno nesmí být prázdné.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6521,7 +6668,7 @@
 "\n"
 "Jméno nesmí obsahovat mezery.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6531,7 +6678,7 @@
 "\n"
 "Text v menu nesmí zůstat prázdný.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6541,7 +6688,7 @@
 "\n"
 "Popis akce nesmí zůstat prázdný.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6551,7 +6698,7 @@
 "\n"
 "Jméno autor nesmí zůstat prázdné.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6563,7 +6710,7 @@
 "Plugin s tímto jménem již existuje.\n"
 "Jméno musí být jedinečné.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6573,7 +6720,7 @@
 "\n"
 "Smyčkový kód by neměl být prázdný\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6583,7 +6730,7 @@
 "\n"
 "Spouštěcí kód by pro pomůcku neměl být prázdný\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6593,7 +6740,7 @@
 "\n"
 "Jméno parametru nesmí být prázdné.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6606,41 +6753,41 @@
 "Nalezen duplicitní parametr. Jméno parametru musí být v pluginu jedinečné.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Zápis skriptového souboru %s..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "<define> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Špatná verze skriptu.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "<name> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "<version> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "<author> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "<description> sekce nebyla ve skriptu nalezena .\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Špatný popis. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6655,27 +6802,27 @@
 "nalezen ve skriptu.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Předělávání všech RFX skriptů...vestavěno..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Předělávání skriptů"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "vlastní..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "Předělávání vstupů dynamického menu ..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6688,7 +6835,7 @@
 "LiVES nemohl najít program %s.\n"
 "Zkontrolujte, je-li v cestě a je spustitelný program.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6703,12 +6850,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Mazání rfx skriptu %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6723,7 +6870,7 @@
 "%s\n"
 "Kód chyby: %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6738,12 +6885,12 @@
 "už existuje.\n"
 "Vymažte jej nebo přejmenujte testovací skript.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Prosazování testovacího rfx pluginu %s do běžného..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6751,29 +6898,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Selhalo přemístění skript pluginu z\n"
-"%s do\n"
-"%s\n"
-"Kód %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importovat skript z..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Exportovat skript do..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírování %s do %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6788,55 +6929,43 @@
 "již existuje.\n"
 "Nejprve jej vymažte nebo přejmenujte importovaný skript.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Vestavěno"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Vlastní"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Test"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Kopírovat RFX skript"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Z typu :    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Skript :    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Přejmenovat testovací RFX skript"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Ze skriptu : "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Jméno RFX  skriptu"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Jméno skriptu: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Nové jméno: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Nové jméno skriptu: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6848,28 +6977,45 @@
 "Testovací skript s tímto jménem již existuje.\n"
 "Jméno musí být unikátní.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Přejmenování RFX testovacího skriptu %s na %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Selhalo přemístění skript pluginu z\n"
+"%s do\n"
+"%s\n"
+"Kód %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Použití Real time efektů na výběr"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Vidíte: VJ - ukázat  VJ klávesy.  Nastavit real time efekty a pak je zde "
 "použít."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6877,7 +7023,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6885,7 +7031,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6894,34 +7040,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Nelze vytvořit nebo zapisovat do nového dočasného adresáře\n"
-"Zkuste vytvořit ho jako root, např. \n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"Adresář nyní nebude změněn.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6939,7 +7086,7 @@
 "\n"
 "Stisknutím 'Zrušit' obnovíte výchozí nastavení dočasného adresáře."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -6950,7 +7097,7 @@
 "nainstalován.\n"
 "Viz. http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -6958,7 +7105,7 @@
 "\n"
 "Přepnutí audio přehrávačů vyžaduje restart (jackd nesmí být používán)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6966,364 +7113,379 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (nejvyšší kvalita; největší soubory)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Předvolby"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Otevřít maximalizovaný výběr souboru"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Zobrazit poslední soubory v menu Soubor"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Otevřít maximalizované hlavní okno"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Zobrazit nástrojovou lištu pokud je pozadí prázdné"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Při spuštění vícestopého módu:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Vyzvi mě k nastavení šířky, výšky, fps a zvuku"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_Vždy použij tyto hodnoty:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Použij stejné _hodnoty pro rendrování nového klipu"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Šířka           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Výška      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Zpět velikost bufferu (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Ukončit vícestopý mód po převodu"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nikdy"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Vícestopa/Převod"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Příkaz otevření videa             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr " %     ( snížení = zpomalení, větší soubory; pro jpeg, vyšší kvalita )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Výchozí formát obrázků          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Dekódování"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Kvalita _náhledu"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Kvalita _náhledu"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Zobrazit FPS statistiky"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Přehrávač"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- vnitřní -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "Zvuk kopíruje video _tempo/směr"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "Zvuk kopíruje přepínání _klipů"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Přehrát"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Co nahrát po stisku 'r'   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "Změny _snímku"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "F_PS změny"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Nahrávání"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Modulátor                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
+
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Výstupní formát"
 
-#: src/preferences.c:3699
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Zvukový kodek"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Použít _antialiasing při změně velikosti"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7331,80 +7493,95 @@
 "Počet  \"virtuálních\" kláves realtime efektů. Lze je ovládat přes okno "
 "realtime efektů, nebo přes síť (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "Pracovní adresář LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Adresáře"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7412,206 +7589,192 @@
 "Varovat při Vkládání / Sloučit pokud tempo snímků ve schránce nesouhlasí s "
 "tempem výběru"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Varovat při otvírání velikost souboru přesáhne "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Zobrazit varování před uložením se_tu"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Zobrazit varování jestliže při spuštění _nejsou nalezeny rendrovací efekty ."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Zobrazit varování jestliže při startu _nejsou nalezeny kódovací pluginy ."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Zobrazit varování, jestliže je vloženo duplicitní jméno."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "Při nahrání sestavy upozornit, jestliže chybí klipy z _rozvržení."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Upozornit, jestliže má být zavřen klip použitý v rozvržení."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Upozornit, jestliže mají být smazány snímky použité v rozvržení."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Upozornit, jestliže mají být posunuty snímky použité v rozvržení."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Upozornit, jestliže mají být změněny snímky použité v rozvržení."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Upozornit, jestliže má být smazán zvuk použitý v rozvržení."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Upozornit, jestliže má být posunut zvuk použitý v rozvržení."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Upozornit, jestliže má být změněn zvuk použitý v rozvržení."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Upozornit, jestliže rozložení nebylo před ukončením vícestopého režimu "
 "uloženo."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Upozornit, jestliže multitrack nemá zvukové kanály a rozložení je otevřeno "
 "se zvukem."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Zobrazit informační zprávu po importu z firewire zařízení."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
-#, fuzzy
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
-"Zobrazit varování jestliže při startu _nejsou nalezeny kódovací pluginy ."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Varování"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 "Identifikační signál bloku Midi (vyžaduje rejstříky midistart a midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Při vkládání/slučování snímků:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Zrychlit/Zpomalit vkládání"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Převzorkovat vložení"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pozastavit xmms při přehrávání zvuku"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD zařízení           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES může zavést zvukové stopy z tohoto CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "Standard FPS        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Snímků za sekundu pokud není uvedeno jinak"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Různé"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Nové téma:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Témata"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Rychlost stahování (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES musí být zkompilován bez \"configure --disable-OCS\" pro použití OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Dálková správa OMC povolena"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Spustit OMC při startu"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Streamování/Vysílání přes síť"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Jack přenos"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7619,47 +7782,43 @@
 "LiVES musí být zkompilován s jack/transport.h a jack/jack.h pro použití "
 "přenosu přes jack"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Jack: _přenosový konfigurační soubor"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "Jméno jack serveru kontrolujícího LiVES přenos"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Spustit _server při startu LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Jack zvuk"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "LiVES musí být zkompilován s  jack/jack.h pro použití audio jack"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -7667,107 +7826,93 @@
 "MUSÍTE nastavit audio přehrávač na \"jack\" v záložce Přehrávání, chcete-li "
 "používat audio konektor"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Jack: konfigurační soubor _zvukového serveru"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Jméno zvukového jack serveru"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Integrace jacku"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7775,68 +7920,68 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "Změny témat budou patrné po restartování LiVES."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Změny nastavení jack se projeví po restartu LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Synchronizace s externí frekvencí %.8f snímků za sekundu.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Nelze inicializovat OSC přijímač\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "UPOZORNĚNÍ: Nelze spusti OSC server na UDP portu %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Spuštěn OSC server na UDP portu %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Nelze spustit OSC/UDP server na portu %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Měním velikost snímků od 1 do %d"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Měním velikost snímků od 1 do %d"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Změna velikosti"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Převzorkování/Změnit velikost"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Délka videa je nyní %d snímků.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -7846,154 +7991,146 @@
 "\n"
 "Nový poměr(rate) musí být větší než 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Převzorkování zvuku"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES nebyl schopen převzorkovat zvuk.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Převzorkovat zvuk"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Zvuk byl převzorkován na %d Hz, %d kanálů, %d bitů"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Převzorkování videa na %.3f snímků za vteřinu..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Převzorkování videa na %.3f snímků za vteřinu..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Převzorkovat"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Převzorkovat zvuk"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Vsunout ticho"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nový zvukový klip"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Nastavení externího klipu"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Poměr (Rate v Hertzích) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Kanálů "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Velikost vzorku "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Označeno"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Neoznačeno"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Současný"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "P_ovolit zvuk"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Frekvence (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Kanály "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Kanály "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    _Velikost vzorku "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Velikost vzorku "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nový"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Snímků za sekundu "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Nahrát maximálně:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " hodin  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minut  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " sekund  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Neomezené"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Kliněte na OK pro nahrávání, Zrušit pro ukončení."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Změnit rychlost přehrávání"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Převzorkovat video"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8004,7 +8141,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8015,15 +8152,15 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8034,7 +8171,7 @@
 "rozloženích.\n"
 "Opravdu změnit rychlost ?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8044,56 +8181,48 @@
 "Zrychlení klipu způsobí chybějící zvuk v některých vícestopých rozloženích.\n"
 "Opravdu změnit rychlost ?\n"
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Změna rychlosti způsobí posun snímků v některých vícestopých rozloženích.\n"
-"Opravdu pokračovat?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Změna rychlosti způsobí posun zvuku v některých vícestopých rozvrženích.\n"
-"Opravdu pokračovat ?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Změna rychlosti"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Změna rychlosti playbacku na %.3f rámečků za sekundu a zvuku na %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Změna rychlosti playbacku na %.3f rámečků za sekundu\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Převzorkování videa"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Převzorkování videa ze schránky"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Přeskupení snímků"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8103,20 +8232,20 @@
 "\n"
 "LiVES nemohl přeskupit snímky"
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Srovnávání rámečků"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "chyba při převzorkování..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8132,7 +8261,7 @@
 "Opravdu ?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8144,12 +8273,12 @@
 "Klikněte na 'OK' nastavíte toto rozložení kláves jako výchozí\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Ukládání rozložení kláves %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8158,8 +8287,8 @@
 "\n"
 "Aktualizuji soubor rozložení kláves %s..."
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -8167,18 +8296,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"Nelze zapisovat do souboru rozložení kláves\n"
-"%s\n"
-"Kód chyby :%d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Ukládání výchozích hodnot real time efektu do  %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8193,22 +8317,22 @@
 "%s\n"
 "Kód chyby :%d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Zavádění výchozích hodnot real time efektu z %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Nahrávání výchozích rozměrů generátoru z %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Nahrávání výchozího rozložení kláves z %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8223,27 +8347,27 @@
 "%s\n"
 "Kód chyby :%d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Neplatný řádek %d v %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Neplatná klávesa %d v %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Neplatný efect %s v %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8252,16 +8376,21 @@
 "Tato verze LiVES neumožňuje kombinaci generátorů/negenerátorů na stejné "
 "klávese (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Klávese %d přiřazeno příliš efektů.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "vyžadován update.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8273,40 +8402,45 @@
 "Některé efekty se nepodařilo nalézt.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Bez popisu"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Zpráva pro %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Jméno efektu: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Jméno pluginu: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Verze: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8320,65 +8454,69 @@
 "klávese.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES nemůže najít efekt %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Zobrazování real time efektu"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Klávesová zkratka"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Aktivní klávesa"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Klávesová zkratka"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Odstranit všechny efekty"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Aktivní mód"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "informace"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Nastavit parametry"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Odstranit"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Jméno efektu:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Uložit jako výchozí nastavení kláves"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_Nahrát výchozí nastavení kláves"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8430,11 +8568,6 @@
 msgid "none\n"
 msgstr "nic\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d kanál(y) %d (bps)\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8454,64 +8587,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Aktuální stopa: %s (vrstav %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Aktuální stopa: Zvuk v pozadí\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f s\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Klikněte pravý tlačítkem pro zobrazení kontextového menu.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8520,7 +8653,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8528,14 +8661,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8545,7 +8678,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8554,12 +8687,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f s do %.2f s.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8567,182 +8700,184 @@
 "Kliknutím na časovou osu\n"
 "vyberete snímek.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "vyberte časové pásmo.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Mód myši: Posun"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Mód myši: Výběr"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Zavřít časové intervaly"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Přesunout blok"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Přesunout audio blok"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Smazat blok"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Smazat zvukový blok"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Rozdělit stopy"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Rozdělit blok"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Použít %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Smazat %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Vložit blok"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Vložit zvukový blok"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "neoznačený "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "označený "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "velký endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "malý endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -8751,15 +8886,15 @@
 "Multitrack hodnoty nastaveny na %.3f fps, velikost snímku %d x %d, zvukové "
 "kanály %d, audio poměr %d, velikost zvukového vzorku %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "neplatný seznam událostí. Ukončeno.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "seznam událostí má neplatný fps. Ukončeno.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8774,7 +8909,7 @@
 "uzavřete aktuální set,\n"
 "potom otevřete v novém setu z menu Soubor.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8785,431 +8920,439 @@
 "LiVES našel neplatný počet zvukových kanálů (%d).\n"
 "Nemohlo být otevřeno.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "_Otevřít soubor..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importovat výběr z _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importovat výběr z _dvd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importovat výběr z _vcd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "Importovat ze zařízení"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Uložit rozložení jako..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Vyčistit/Smazat rozložení..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorovat šířku, výšku a hodnoty zvuku v otevřeném rozložení"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_EDITOR KLIPU"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Vložit vybraný klip"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_Vložit vybraný zvukový klip"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Smazat vybraný blok"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_Přeskočit na hranici předchozího bloku"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_Přeskočit na hranici následujícího bloku"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Smazat _značky z časové osy"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Přesunout efekty s bloky"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Smazat vybraný efekt"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Použít efekt na _blok..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Použít efekt na _oblast..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Stopy"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Přesun aktuální zvukové stopy na _pozadí"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Přidat video stopu na _konec"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Přidat video stopu na _začátek"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_Rozdělit vybrané video stopy"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "_Výběr"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Vybrat stávající stopu"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Vybrat _všechny video stopy"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "_Nevybrat video stopu"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Vybrat _vše"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Vybrat od _začátku"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Vybrat do _konce"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Začátek oblasti"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Konec oblasti"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "_Spustit v čase"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "_Ukončit v čase"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Změnit šířku, výšku a hodnoty zvuku..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Render"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Rendrovat_video"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Rendrovat _zvuk"
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Pohled"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Blokovat _In/out body"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Aktuální efekty"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Zvukové parametry"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Zobraz _zvukovou stopu na pozadí"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Kompaktní pohled"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Přiblížit"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Oddálit"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_Detaily o multitracku"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "Okno _událostí"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_Zobraz události SNÍMKU"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Zobraz klávesy mutlitracku"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Mód myši: _Posun"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Mód myši: _Výběr"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Použít"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Smazat uzel"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "_Další uzel"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "_Předchozí uzel"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "_Otočit přehrávání  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Rychlost  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr ""
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "_Začátek ukotvení"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr ""
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "První snímek"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr ""
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "_Konec ukotvení"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr ""
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Poslední snímek"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Rolovat"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9219,91 +9362,91 @@
 "==============================\n"
 "Přepnuto do režimu Editace klipu\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Časová osa (vteřiny)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Zvuk v pozadí"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (vrstva %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (vrstva %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Vybraný efekt"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "Zobrazit/Upra_vit tento efekt"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "Zobra_zit tento efekt"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Odstranit tento efekt"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d do %d vybráno  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f s"
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d snímků"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9313,65 +9456,65 @@
 "==============================\n"
 "Přepnuto do vícestopého režimu\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s výstup"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "vrstva %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "zvuková stopa"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s na %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "Mapa _předchozího filtru"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Vložit _před"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Vložit _po"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "Mapa _dalšího filtru"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9379,84 +9522,80 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Vybraný blok/snímek"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Zvolit tento blok"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "Zde _rozdělit blok"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Seznam _efektů"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Upravit %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Vymazat tento blok"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Vložit zde"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Zvuk vložit sem"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Detaily o multistopě"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9464,56 +9603,62 @@
 "\n"
 " (proměnná)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "stopa %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "skladby %s a %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "vybrané stopy"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Přidány %s %s do %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Přidán efektt %s do stopy %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "vloženo %d snímků do nového klipu.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Probíhá úklid..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pozastavit"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pozastavit (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9521,20 +9666,20 @@
 msgstr ""
 "Vložený zvuk %.4f do %.4f z klipu %s do zvuku v pozadí od %.4f do %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr "Vložené snímky %d do %d z klipu %s do stopy %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9542,111 +9687,101 @@
 "vyberte jendu nebo více stop\n"
 "pro vytvoření pásma.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d video soubory vybrány.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "nebo pro posun VLOŽIT PO."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "vyberte časové pásmo.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "po.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "před tím.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Odstraněné hodnoty pro efekt %s v čase %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Nastavit hodnoty pro %s %s na %s v čase %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Automatické otevření (pokaždé)"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Rozvržení uloženo do %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "klipy a snímky"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "clipy"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "snímky"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9654,7 +9789,7 @@
 "\n"
 "Autozavedení rozvržení.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9665,11 +9800,11 @@
 "Některé %s scházejí v rozložení%s\n"
 "Z toho důvodu nemohly být otevřeny správně.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9678,83 +9813,83 @@
 "\n"
 "Nelze zavést soubor s rozvržením %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Zavádím rozvržení z %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d událostí...zpracovávám..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Kontroluji a znovu vytvářím seznam události"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d chyb nalezeno.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps nastaven na %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Obnovit hodnoty"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACK server spuštěn\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Nelze se připojit k JACK serveru\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Spuštěn podsystém jack audio.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Spuštěna čtečka audio jacku .\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9762,7 +9897,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9770,329 +9905,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Nelze se připojit k JACK serveru\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - Zvolte zvukový přehrávač"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "data"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "rychlost"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "poznámka"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "hodnota"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "stav"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "proměnná"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "oblast"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Odstranit vše"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Zastavit nahrávání"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "klíč"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10101,7 +10242,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10110,12 +10251,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10330,10 +10471,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Ztlumit zvuk"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Ztlumit zvuk"
-
 #~ msgid "Fade"
 #~ msgstr "Stmívat"
 
@@ -10825,9 +10962,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "_Schránka je vlevo nahoře"
 
-#~ msgid "_Top"
-#~ msgstr "_Top"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "_Vertikální prvky"
 
@@ -11088,116 +11222,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Nejdříve musíte v Nastavení nastavit CD mechaniku"
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LiVES nemůže nalézt Vámi požadovaný počet stop."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Zkuste to znovu s jinými hodnotami"
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name selhalo:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Nelze se připojit k JACK serveru\n"
-
-#~ msgid "Red"
-#~ msgstr "Červená"
-
-#~ msgid "error.\n"
-#~ msgstr "chyba.\n"
-
-#~ msgid "Plugin timed out on message %s\n"
-#~ msgstr "plugin vypršel časově se zprávou %s\n"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Nelze načíst soubor\n"
-#~ "%s\n"
-#~ "Chybový kód: %d\n"
-
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Nelze číst výchozí soubor\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to read sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nelze načíst velikost souboru\n"
-#~ "%s\n"
-#~ "Kód chyby: %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES neschopno zapsat rejstřík:\n"
-#~ "%s\n"
-#~ "podivejte se na zapisovací povolení rejstříku"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write script file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nelze zapisovat do skriptového souboru\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write filter defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nelze zapsat výchozí soubor\n"
-#~ "%s\n"
-#~ "Kód chyby :%d\n"
+#~ msgid "Default value:    "
+#~ msgstr "Výchozí hodnota:    "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nelze zapsat výchozí velikosti souboru\n"
-#~ "%s\n"
-#~ "Kód chyby: %d\n"
+#~ msgid "Minimum value: "
+#~ msgstr "Minimální hodnota: "
 
-#~ msgid "No clips were recovered for set (%s).\n"
-#~ msgstr "Pražádné klipy nebyly obnoveny pro set (%s).\n"
+#~ msgid "Maximum value: "
+#~ msgstr "Maximální hodnota: "

LiVES-1.6.1.tar.bz2/po/da.po -> LiVES-2.0.3.tar.bz2/po/da.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2010-04-11 02:27+0000\n"
-"Last-Translator: AJenbo <anders@jenbo.dk>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +53,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -45,176 +61,197 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Ændrer størrelse"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Enhver"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "anbefalet"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Indbygget"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Brugerdefineret"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Test"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -222,172 +259,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -395,17 +458,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -414,37 +478,37 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -452,13 +516,8 @@
 "\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -469,42 +528,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -512,96 +578,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Afspil"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "Fortryd"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr ""
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -610,26 +676,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Indstillinger"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -639,7 +690,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -649,7 +700,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -660,7 +711,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -669,54 +720,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -724,155 +775,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Næste"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -880,94 +939,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -976,8 +1035,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -985,180 +1044,188 @@
 "\n"
 "Vent venligst"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Vis detaljer"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Annuller"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Filstørrelse"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Tid i alt"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Begivenheder"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Vis _detaljer"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Luk Vindue"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Indstillinger"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1168,7 +1235,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1177,47 +1244,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1225,398 +1307,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr ""
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nyt navn "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avanceret"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "først"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "sidste"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekunder."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr ""
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Katalog:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Indstillinger"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Nulstil værdier"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Vælg fil"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Kopierer %s til %s..."
+msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1624,17 +1666,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Denne fil"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1644,7 +1686,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1654,20 +1696,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1680,33 +1722,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1714,97 +1756,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Kopierer %s til %s..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Klip"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Sæt ind"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1813,31 +1855,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1845,7 +1887,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1854,86 +1896,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Indsætter"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Indsæt"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Sletter"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Slet"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1941,11 +1983,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1954,7 +1996,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1963,7 +2005,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -1972,22 +2014,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -1995,64 +2037,64 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2060,30 +2102,30 @@
 "\n"
 "  Ukendt"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2100,11 +2142,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  AJenbo https://launchpad.net/~ajenbo\n"
+"  nanker https://launchpad.net/~nanker"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2118,21 +2171,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2140,195 +2193,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Annullerer"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Ny lyd"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Vælg lydfil"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Luk _vindue"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Ryd _fejl"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Genoptag"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "på pause..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pause"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "genoptaget..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Behold"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2336,29 +2401,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Annuller"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Valgt ramme"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "_Parametre..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2367,7 +2431,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2375,13 +2439,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2390,17 +2454,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2410,19 +2474,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2431,1050 +2495,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "Importerer script fra..."
+msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
+#: src/gui.c:1109
+msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1084
-msgid "Custom _Tools"
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3482,81 +3521,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3564,7 +3603,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3572,32 +3611,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3605,68 +3644,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3676,53 +3715,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3734,11 +3784,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3746,14 +3796,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3761,30 +3811,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "LiVES: Valgt ramme"
+msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3792,66 +3841,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Filstørrelse"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3860,16 +3905,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3877,7 +3922,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3885,68 +3930,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3956,22 +3996,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -3979,69 +4019,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s avancerede indstillinger"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr ""
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Vælg farve"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Ryd _fejl"
+msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4052,7 +4089,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4064,11 +4101,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4076,46 +4113,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4123,7 +4160,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4135,14 +4172,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4150,19 +4187,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4170,83 +4207,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4255,14 +4292,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4271,7 +4308,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4282,7 +4319,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4291,11 +4328,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4337,11 +4374,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4363,17 +4400,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4381,28 +4419,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4411,7 +4449,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4419,7 +4457,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4427,7 +4465,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4438,7 +4476,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4448,7 +4486,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4456,7 +4494,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4465,13 +4503,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4482,13 +4520,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4498,7 +4536,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4507,7 +4545,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4515,7 +4553,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4523,63 +4561,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4587,14 +4625,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4603,25 +4641,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4630,34 +4668,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4665,14 +4703,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4680,14 +4713,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4695,13 +4723,8 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4710,8 +4733,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4719,13 +4742,8 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4734,8 +4752,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4743,18 +4761,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4763,7 +4776,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4772,7 +4785,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4781,14 +4794,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4796,13 +4817,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4812,27 +4833,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4841,14 +4862,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4859,19 +4880,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4879,7 +4900,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4887,7 +4908,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4899,7 +4920,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -4908,34 +4929,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4944,347 +4965,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "overgange"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Overgange"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "effekt"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Effekter"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "opdeler"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Opdelere"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "lyd/video"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "kun video"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "kun lyd"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "lyd"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Lydmiksere"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Lydeffekter"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "lydstyrke kontrol"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Lydstyrke kontrol"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "kun video"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "kun video"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "kun lyd"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Lydparametre"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "ukendt"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr ""
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Nulstil værdier"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _ramme"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/framedraw.c:267
+msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Vælg fil"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr ""
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : størrelse"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Ny størrelse (pixels)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Bredde"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Højde"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5292,73 +5565,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Vælg som standard"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Luk _vindue"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Ingen parametre"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Ugyldig parameter"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Vælg farve"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Klik for at vælge farve"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Den røde værdi (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Grøn"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Den grønne værdi (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Blå"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Den blå værdi (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5368,17 +5639,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5388,32 +5659,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5422,14 +5693,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5439,40 +5703,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5481,11 +5752,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5494,7 +5765,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5504,193 +5775,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/ukendt"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Indstillinger"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s avancerede indstillinger"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Ny test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Effekt -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Værktøj -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Navn          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Version:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Script version."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Forfatter:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Script forfatter"
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menu tekst:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parametre..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Sprogkode:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5700,55 +5954,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX Krav"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parametre"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Flyt _op"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Flyt ne_d"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5757,7 +6011,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5765,231 +6019,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Navn:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Sæt _værdier"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Standard værdi:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Minimums værdi: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Maksimums værdi: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Standard _Rød:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Standard _Grøn:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Standard _Blå: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Standrad værdi:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Række:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -5997,28 +6239,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6027,41 +6269,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Dårlig script version.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6071,27 +6313,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6100,7 +6342,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6110,12 +6352,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6125,7 +6367,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6135,12 +6377,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6148,23 +6390,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importerer script fra..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Eksporterer script til..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopierer %s til %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6174,55 +6416,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Indbygget"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Brugerdefineret"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Test"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Kopier RFX script"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Fra script: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFX Script navn"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Script navn: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Nyt navn: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Nyt script navn: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6230,26 +6460,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6257,7 +6498,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6265,7 +6506,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6274,28 +6515,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6307,20 +6555,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6328,790 +6576,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Indstillinger"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_Anvend altid følgende værdier:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Efter hver _ændring"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Aldrig"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Afkoder"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Afspiller"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- internt -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "LYD"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Afspilning"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Optager"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Enkoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Output format"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Lyd codeks"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Encoder"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Mapper"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Advarsler"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD udstyr           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Vælg CD udstyr"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Div"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Nyt tema           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temaer"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Jack integration"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Joystick udstyr"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Vælg joystick udstyr"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_MIDI udstyr"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Vælg MIDI udstyr"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "MIDI gentag"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7119,222 +7367,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Tilpas"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Indsæt stilhed"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Kanaler "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Aktuel"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Slå lyd til"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Kanaler "
-
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Kanaler "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Ny"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Rammer per sekundt "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " timer  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minutter  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " sekender  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7345,7 +7585,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7356,89 +7596,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Hastighedsændring"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7448,7 +7688,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7456,20 +7696,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7477,18 +7717,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"Kunne ikke åbne fil\n"
-"%s\n"
-"Fejlkode %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7498,22 +7733,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7523,43 +7758,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "opdatering nødvendig.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7567,40 +7807,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Ingen beskrivelse"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Information for %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Effekt navn: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Plugin navn: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Forfatter: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Version: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7609,65 +7854,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Sæt parametre"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Effekt navn:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7717,11 +7966,6 @@
 msgid "none\n"
 msgstr "intet\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7739,64 +7983,64 @@
 msgid "TV card %d"
 msgstr "TV kort %d"
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "Åbnede TV kort %d (%s)"
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewire kort %d"
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "Åbnede firewire kort %d"
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "Auto backup"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Kilde: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7805,7 +8049,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7813,14 +8057,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7830,7 +8074,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7839,208 +8083,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "at vælge en ramme."
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "at vælge en blok."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Flyt blok"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Flyt lydblok"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Slet blok"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Slet lydblok"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Split spor"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Split blok"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Slet %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Indsæt blok"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Indsæt mellemrum"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Indsæt lydblok"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8050,7 +8296,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8058,587 +8304,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Åbn..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Indlæs layout..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Slet den valgte blok"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Slet den valgte effekt"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Spor"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Va_lg"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Vælg aktuelt spor"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Vælg _alle videospor"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "Vælg _ingen videospor"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Vis"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Lydparametre"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Kompakt visning"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Zoom ind"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Zoom ud"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Anvend"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Tid"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Start ramme"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Slut ramme"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Rul"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Vælg spor"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Vis/skjul lyd"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Valgt effekt"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Vis denne effekt"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Slet denne effekt"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Denne effekt kan ikke flyttes"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d rammer"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s output"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "lydspor"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s til %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Indsæt _før"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Indsæt _efter"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8646,275 +8900,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Vælg denne blok"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Split blok her"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Juster %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "Slet denne _blok"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Indsæt her"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Indsæt lyd her"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "spor %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "spor %s og %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "valgte spor"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Rydder op..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pause"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pause (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "efter det.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "før det.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "rammer"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8922,94 +9168,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "auto backup"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Indlæser layout fra %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d fejl opdaget.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Nulstil værdier"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Luk mikser"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACK server startet\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Kunne ikke oprette forbindelse til JACK server\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9017,7 +9263,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9025,328 +9271,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Kunne ikke oprette forbindelse til JACK server\n"
+msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "data"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "hastighed"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "note"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "værdi"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variabel"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Slet alle"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Start video playback"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Stop video playback"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Afspil video hurtigere"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Afspil video langsommere"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Start optagelse"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Stop optagelse"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "nøgle"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9355,7 +9608,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9368,12 +9621,12 @@
 "Ugyldig version i fil\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9742,7 +9995,7 @@
 
 #, fuzzy
 #~ msgid "Step per _Frame"
-#~ msgstr "    _ramme"
+#~ msgstr "Start ramme"
 
 #, fuzzy
 #~ msgid "Swirl _start"
@@ -9931,9 +10184,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "_Tid (sekunder)"
 
-#~ msgid "_Top"
-#~ msgstr "_Top"
-
 #~ msgid "_Wavemax"
 #~ msgstr "_Wavemax"
 
@@ -10099,75 +10349,17 @@
 #~ msgid "tunnel"
 #~ msgstr "Annullerer"
 
-#, fuzzy
-#~ msgid "Unable to open output file !"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Kunne ikke åbne fil\n"
-#~ "%s\n"
-#~ "Fejlkode %d\n"
-
-#, fuzzy
-#~ msgid "LiVES could not write to $nfile."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Kunne ikke åbne fil\n"
-#~ "%s\n"
-#~ "Fejlkode %d\n"
-
-#, fuzzy
-#~ msgid "LiVES was unable to open it."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Kunne ikke åbne fil\n"
-#~ "%s\n"
-#~ "Fejlkode %d\n"
-
-#, fuzzy
-#~ msgid "LiVES was not able to open the file"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Kunne ikke åbne fil\n"
-#~ "%s\n"
-#~ "Fejlkode %d\n"
-
 #~ msgid "$file"
 #~ msgstr "$fil"
 
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Vælg farve"
-
 #~ msgid "$error"
 #~ msgstr "$fejl"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Kunne ikke oprette forbindelse til JACK server\n"
-
-#~ msgid "Red"
-#~ msgstr "Rød"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "kunne ikke læse fil\n"
-#~ "%s\n"
-#~ "Fejlkode %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "No effect selected.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Ingen effekt valgt.\n"
+#~ msgid "Default value:    "
+#~ msgstr "Standard værdi:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "Minimums værdi: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "Maksimums værdi: "

LiVES-1.6.1.tar.bz2/po/de_DE.po -> LiVES-2.0.3.tar.bz2/po/de_DE.po Changed

@@ -3,20 +3,21 @@
 "Project-Id-Version: Lives 0.9.5\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-01-08 13:38+0000\n"
-"Last-Translator: Daniel Winzen <d@winzen4.de>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-14 13:17+0000\n"
-"X-Generator: Launchpad (build 14664)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-Language: German\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +26,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr "%s Warnung: %s\n"
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr "%s Kritischer Fehler: %s\n"
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr "%s Fataler Fehler: %s\n"
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -34,13 +50,13 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 "\n"
-"LiVES ist leider abgestürzt.\n"
-"Bitte melden Sie diesen Fehler bei http://sourceforge.net/tracker/?"
+"Leider ist LiVES abgestürzt.\n"
+"Bitte melden Sie diesen Fehler unter http://sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"Danke. Datenwiederherstellung sollte möglich sein, wenn Sie LiVES neu "
-"starten.\n"
+"Danke. Projektwiederherstellung sollte beim nächsten Start von LiVES möglich "
+"sein.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -49,382 +65,406 @@
 msgstr ""
 "\n"
 "\n"
-"Wenn Sie einen Absturz melden, geben Sie bitte Details zu ihrem "
-"Betriebssystem, Distribution und der LiVES Version an ("
+"Wenn Sie Abstürze melden, schließen Sie bitte Details über ihr "
+"Betriebssystem, ihre Distribution und LiVES Version ein ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
-"und alle folgenden Informationen:\n"
+"und die Informationen, die unten angezeigt werden:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
-"Bitte installieren Sie gdb und führen Sie LiVES mit der -debug Option aus, "
-"um weitere Informationen zu sammeln.\n"
+"Bitte installieren Sie gdb und starten Sie LiVES mit der -debug Option neu, "
+"um weitere Informationen zu sammeln\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
-msgstr "Haltbare Menge.\n"
+msgstr ""
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Skalieren"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
-msgstr "_Skaliere alle Frames"
+msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
-msgstr "Jede/s"
+msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
-msgstr "Keine/n"
+msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
-msgstr "Empfohlen"
+msgstr "empfohlen"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
-msgstr "deaktiviert !"
+msgstr "deaktiviert!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
-msgstr "**Das aktuelle Layout**"
+msgstr ""
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr ""
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
-msgstr "Lade Echtzeiteffektplugins..."
+msgstr "Lade Echtzeit-Effekt Plugins..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
-msgstr "Starte den Jack Audio Server..."
+msgstr "Starte Jack Audio Server..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
-"\n"
-"\n"
-"Manueller start von jackd erforderlich. Bitte stellen Sie sicher daß jackd "
-"läuft, \n"
-"oder ändern Sie den Wert von <jack_opts> in ~/.lives auf 16 \n"
-"und starten LiVES neu.\n"
-"Alternativ dazu starten Sie entweder LiVES \"lives -jackopts 16\", oder "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
-msgstr "Starte PulseAudio Server"
+msgstr "Starte den Pulse Audio Server"
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
-msgstr "Optionelle Abhängigkeiten werden überprüft:"
+msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
-msgstr "mplayer ...gefunden"
+msgstr ""
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
-msgstr "mplayer...nicht gefunden..."
+msgstr ""
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
-msgstr "convert...gefunden..."
+msgstr ""
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
-msgstr "convert...nicht gefunden..."
+msgstr ""
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
-msgstr "composite...gefunden..."
+msgstr ""
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
-msgstr "composite...nicht gefunden..."
+msgstr ""
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
-msgstr "SoX...gefunden\n"
+msgstr ""
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
-msgstr "SoX...nicht gefunden\n"
+msgstr ""
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
-msgstr "cdda2wav...gefunden..."
+msgstr ""
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
-msgstr "cdda2wav...nicht gefunden..."
+msgstr ""
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
-msgstr "jackd...gefunden..."
+msgstr ""
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
-msgstr "jackd...NICHT GEFUNDEN..."
+msgstr ""
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...gefunden..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
-msgstr "Pulse Audio...nicht gefunden..."
+msgstr "Pulse Audio...NICHT GEFUNDEN..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
-msgstr "python...gefunden..."
+msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
-msgstr "python...NICHT GEFUNDEN..."
+msgstr ""
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
-msgstr "dvgrab...gefunden..."
+msgstr ""
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
-msgstr "dvgrab...NICHT GEFUNDEN..."
+msgstr ""
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
-msgstr "xwininfo...gefunden..."
+msgstr ""
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
-msgstr "xwininfo...NICHT GEFUNDEN..."
+msgstr ""
+
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
 
-#: src/main.c:1549
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
 "\n"
 "Window manager reports as \"%s\"; "
 msgstr ""
-"\n"
-"\n"
-"Fensterverwaltung identifiziert sich als \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
-msgstr "Anzahl der gefundenen Monitore: %d\n"
+msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Anzahl der gefundenen CPUs: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
-msgstr "temporäres Verzeichnis ist %s\n"
+msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
-"Warnung - Diese Version von LiVES wurde weder mit JACK Audio- noch "
-"PulseAudio-Unterstützung kompiliert. Viele Audiofunktionen werden nicht "
-"verfügbar sein.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
-msgstr "Kompilliert mit Support durch jack, gut!\n"
+msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
-msgstr "Kompiliert mit PulseAudio-Unterstützung. Wunderbar!\n"
+msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
-"Willkommen in LiVES Version %s.\n"
+"Willkommen bei LiVES Version %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
-"\n"
-"Startsyntax ist: %s [optn] [Dateiname [start_zeit] [Frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
-msgstr "Wobei Dateiname der Name einer Medien- oder Backupdatei ist.\n"
+msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
-msgstr "start_zeit: Dateiname Startzeit in Sekunden\n"
+msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
-msgstr "frames: Die Maximale Anzahl der zu öffnenden Frames\n"
+msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
-msgstr "Möglich für optn:\n"
+msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
-msgstr "-help: Zeige nur diesen Hilfetext an\n"
+msgstr "-help            : Diese Hilfe anzeigen und beenden\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
-"-tmpdir <tempdir>: Verwende anderes Arbeitsverzeichnis (z.B. /Var/ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
-msgstr "-set <setname> : automatisches Laden des Clips mit Setzen des Namen\n"
+msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
-msgstr "-noset : lade keine Sets beim Start\n"
+msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
-msgstr "-norecover       : keine Absturzwiederherstellung laden\n"
+msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
-msgstr "-recover         : Laden von Absturzwiederherstellungen erzwingen\n"
+msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
-msgstr "-nogui: Keine GUI anzeigen.\n"
+msgstr "-nogui           : Das GUI nicht anzeigen\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
-msgstr "-nosplash : Zeige kein Begrüßungsfenster\n"
+msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
-msgstr "-noplaywin :  Zeige kein Abspielfenster\n"
+msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
-msgstr "-startup-ce : Start im Clip-Editor-Modus\n"
+msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
-msgstr "-startup-mt : Start in Mehrspur-Modus\n"
+msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
-msgstr "-oscstart <port> :  starte OSC Listener für UDP-Port <port>\n"
+msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
-msgstr "-nooscstart : starte nicht den OSC Listener\n"
+msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
-"-aplayer <ap>    : Starte mit dem angegebenen Audioprogramm. <ap> kann z.B. "
-"mplayer sein"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
-msgstr ", SoX oder JACK\n"
+msgstr ", sox oder jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
-"-jackopts <opts> : opts ist ein Bitmap von den Jack Startoptionen [1 = Jack "
-"Übertragungsclient, 2 = Jack Übertragungsmaster, 4 = Starte Jack "
-"Übertragungsserver, 8 = stoppe Audio gleichzeitig mit Video, 16 = starte "
-"Jack Audioserver] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
-msgstr " oder SoX\n"
+msgstr " oder sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
-msgstr "-devicemap <mapname> : lade automatisch die Geräteliste\n"
+msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
-msgstr ""
-"-debug : versuchen, Abstürze zu debuggen (erfordert installiertes 'gdb')\n"
+msgstr "-debug : Versuchen, Probleme zu finden ('gdb' muss installiert sein)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
-msgstr "Starte die grafische Oberfläche..."
+msgstr "Starte das GUI..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -432,27 +472,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Das von Ihnen geforderte Thema konnte nicht gefunden werden.  Bitte stellen "
-"Sie sicher, dass es in %s/%s installiert wurde.\n"
-"(Möglicherweise müssen Sie den Wert von <prefix_dir> in der Datei ~./lives "
-"ändern)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES konnte keine Datei in das Verzeichnis /tmp schreiben.\n"
-"Bitte, stellen Sie sicher das Sie Zugriffsrechte zum Schreiben in das "
-"Verzeichnis /tmp besitzen und wiederholen danach den Vorgang.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -460,55 +491,37 @@
 "Please review the README file which came with this package\n"
 "before running LiVES.\n"
 msgstr ""
-"\n"
-"`smogrify` muss ausführbar sein und sich im selben Pfad befinden\n"
-"\n"
-"Bitte lesen Sie die im Packet enthaltene README Datei\n"
-"bevor Sie LiVES starten.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES konnte die Datei mit den Einstellungen\n"
-"%s/.lives\n"
-"nicht lesen.\n"
-"\n"
-"Bitte, prüfen Sie die Zugriffsrechte dieser Datei und wiederholen den "
-"Vorgang.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES konnte die Konfigurations-Datei nicht ändern:\n"
-"%s/.lives\n"
-"\n"
-"Bitte überprüfen Sie die Rechte für diese Datei und ihren Pfad\n"
-"und versuchen Sie es erneut.\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -518,7 +531,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -528,66 +541,50 @@
 "\n"
 "Thankyou.\n"
 msgstr ""
-"\n"
-"Eine unzulässige Version von smogrify wurde in dem Pfad gefunden\n"
-"\n"
-"Bitte sehen sie die README-Datei ein, die sich in diesem Paket befinden,\n"
-"bevor sie LiVES verwenden.\n"
-"\n"
-"Danke\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
+
+#: src/main.c:2366
+msgid ""
 "\n"
-"LiVES benötigt entweder das Programm 'MPlayer' oder 'SoX'. Bitte "
-"installieren Sie eines dieser Programme und versuchen es nochmal.\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
-"\n"
-"LiVES konnte 'mplayer' nicht finden. Um LiVES vollständig nutzen zu können, "
-"sollten sie das Programm 'mplayer' installieren.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
-"\n"
-"LiVES konnte 'convert' nicht finden. Um gerenderte Effekte nutzen zu können, "
-"sollten sie die Programme 'convert' und 'image-magick' installieren.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
-"\n"
-"Lives konnte 'composite' nicht finden. Um die Misch-Funktion nutzen zu "
-"können , sollten sie die Programme 'composite' und 'image-magick' "
-"installieren.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
-"\n"
-"LiVES konnte 'SoX' nicht finden. Manche Audio-Features funktionieren unter "
-"Umständen deshalb nicht. Sie sollten 'SoX' installieren.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -595,103 +592,98 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES konnte keine Kodiererplugins finden.\n"
-"Bitte überprüfen Sie, ob sie korrekt in %s%s%s/ installiert wurden,\n"
-"denn ohne sie können Sie nicht Speichern.\n"
-"Eventuell müssen Sie den Wert von <lib_dir> im  Ordner ~/.lives ändern.\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
-msgstr "Automatisches Laden von %s..."
+msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
-msgstr "Ungültiger Audio-Player %s\n"
+msgstr "Ungültiger Audiospieler %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
-msgstr "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
+msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
-msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
+msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
-msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
+msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
-msgstr "LiVES-%s: <Keine Datei geöffnet>"
+msgstr "LiVES-%s: <Keine Datei>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
-msgstr ""
+msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
-msgstr "Spiele"
+msgstr "Wiedergabe"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
-"LiVES konnte dieses Abbild nicht aufzeichnen\n"
+"LiVES konnte das Bild nicht aufnehmen\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Datei %s geschlossen\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
-msgstr "_Rückgängig machen"
+msgstr "_Rückgängig"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
-msgstr "_Wiederholen"
+msgstr "_Wiederherstellen"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
-msgstr "Film"
+msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
-msgstr "Linker Tonkanal"
+msgstr "Links Audio"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
-msgstr "Rechter Tonkanal"
+msgstr "Rechts Audio"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -699,33 +691,12 @@
 "mplayer.\n"
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES kann nicht zwischen den Clips wechseln, solange ein Clip geöffnet wird "
-"und der Audioplayer \"mplayer\" ausgewählt ist.\n"
-"Bitte passen Sie die Wiedergabeoptionen in den Einstellungen an und "
-"versuchen Sie es erneut.\n"
-
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "Lives: - Abspielfenster"
 
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
-msgstr "Lives: - Abspielfenster"
+msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -734,13 +705,8 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"Ein Ordner mit dem Namen\n"
-"%s\n"
-"existiert bereits. Möchten Sie diesen Ordner benutzen ?\n"
-"\n"
-"(Freier Speicherplatz = %s)\n"
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -750,7 +716,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -761,7 +727,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -770,349 +736,313 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
-msgstr "Der Verzeichnisname ist zu lang"
+msgstr "Ordnername ist zu lang!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
-"LiVES konnte ihren ausgewählten Audioplayer nicht starten.\n"
-"\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
-"Vor dem Start von LiVES müssen Sie einen Audioplayer auswählen.\n"
-"PulseAudio ist für die meisten Benutzer empfehlenswert"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
-", aber diese Version von LiVES wurde ohne PulseAudio-Unterstützung "
-"kompiliert.\n"
-"\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
-", aber Sie haben PulseAudio nicht auf Ihrem System installiert.\n"
-"Es wird empfohlen PulseAudio zu installieren, bevor Sie LiVES starten.\n"
-"\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
-msgstr "JACK audio wird für professionelle Anwender empfohlen."
+msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
-", aber diese Version von LiVES wurde ohne JACK Audio-Unterstützung "
-"kompiliert.\n"
-"\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
-", aber Sie haben JACKd nicht installiert. Es wird empfohlen JACKd zu "
-"installieren, bevor sie LiVES starten.\n"
-"\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
 "audio player instead.\n"
 "\n"
 msgstr ""
-", aber verhindert, dass LiVES auf einigen Systemen startet.\n"
-"Wenn LiVES nicht mit JACK startet, versuchen Sie es mit einem anderen "
-"Audioplayer neu zu starten.\n"
-"\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
-"SoX kann benutzt werden, wenn keiner der anderen Audioplayer funktioniert, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
-"aber einige Funktionen werden deaktiviert sein.\n"
-"\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
-"aber Sie haben SoX nicht installiert.\n"
-"Es wird empfohlen SoX zu installieren, bevor Sie LiVES starten.\n"
-"\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
-"Der MPLAYER Audioplayer wird nur für Testzwecke empfohlen.\n"
-"\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
-msgstr "LiVES: - Wählen sie einen Audio Player"
+msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
-msgstr "Benutze _PulseAudio Player"
+msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
-msgstr "_Jack als Audio-Player verwenden"
+msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
-msgstr "Benutze _SoX Audioplayer"
+msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
-msgstr "Benutze _MPlayer Audioplayer"
+msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
-msgstr "_Nächste"
+msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Übersprungen"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
-msgstr "Erfolgreich"
+msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
-msgstr "LiVES: - Überprüfe Einstellungen"
+msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
-msgstr "LiVES: - Fehlersuche"
+msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
-msgstr "LiVES wird jetzt einige grundlegende Einstellungen überprüfen\n"
+msgstr "LiVES wird nun einige grundsätzliche Konfigurationstests durchführen\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
-msgstr "Suche nach \"SoX\""
+msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
-"Sie sollten SoX installieren, um die gesamte Tonbearbeitung von LiVES nutzen "
-"zu können"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
-msgstr "Überprüfe, ob SoX Ton umwandeln kann"
+msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr "Befehl fehlgeschlagen: %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
-msgstr "Sie sollten sox_fmt_all oder ähnliches installieren"
+msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
-msgstr "Suche nach \"mplayer\""
+msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
-"Sie sollten mplayer installieren, um alle Decodierungen von LiVES nutzen zu "
-"können"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
-msgstr "Überprüfe, ob mplayer Ton umwandeln kann"
+msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
-msgstr "Sie sollten mplayer mit pcm/wav - Unterstützung installieren"
+msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
-msgstr "Sie sollten mplayer zu einer neueren Version aktualisieren"
+msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
-"Sie sollten mplayer mit png/alpha- oder jpeg - Unterstützung installieren"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
-msgstr "Suche nach \"convert\""
+msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
-"Installieren Sie ImageMagick, um alle Rendering-Effekte nutzen zu können"
 
-#: src/startup.c:937
+#: src/startup.c:859
 msgid ""
 "\n"
 "\n"
-"    Click Cancel to exit and install any missing components, or Next to "
-"continue    \n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
 msgstr ""
+
+#: src/startup.c:865
+msgid ""
 "\n"
 "\n"
-"    Klicken Sie auf \"Abbrechen\", um das Programm zu verlassen und fehlende "
-"Programme zu installieren, oder \"Weiter\", um fortzufahren    \n"
+"    Click Cancel to exit and install any missing components, or Next to "
+"continue    \n"
+msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
-"\n"
-"\n"
-"Die Standardeinstellung kann später in den Einstellungen geändert werden\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
-msgstr "Starte im Clipschneidemodus"
+msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
-msgstr "Starte im Multitrackmodus"
+msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
-msgstr "_Fertigstellen"
+msgstr "_Fertig"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
-msgstr "Lasse LiVES die Dateiendung _festlegen."
+msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "Lasse LiVES die Dateiendung festlegen (.%s)"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Deinterlacing zulassen"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
-msgstr "Wenn aktiviert, werden Frames beim Import deinterlaced."
+msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
-"Hier klicken um eine _Vorschau auf alle ausgewählten Videos, Bilder und "
-"Audio-Files zu erhalten."
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
-"Hier klicken um eine _Vorschau auf alle ausgewählten Audio-Files zu erhalten"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
-msgstr "Hier klicken um eine _Vorschau auf das Video zu erhalten."
+msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
-msgstr "LiVES: - Verarbeite..."
+msgstr "LiVES: - Verarbeiten..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1120,196 +1050,198 @@
 "\n"
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
-"\n"
-"\n"
-"Bitte warten\n"
-"\n"
-"Denken sie daran, die Effekte danach auszuschalten (Strg-0)!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 "\n"
-"Bitte haben Sie etwas Geduld"
+"Bitte Warten"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Details anzeigen"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Genug"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
-msgstr "Pause/Genug"
+msgstr "Pause/_Genug"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
-msgstr "Format"
+msgstr ""
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
-msgstr "Größe des Frames"
+msgstr ""
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
-msgstr "Größe der Datei"
+msgstr "Dateigröße"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
-msgstr "Bytegröße"
+msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
-msgstr "Gesamtzeit"
+msgstr "Gesamtdauer"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
-msgstr "BPS (Bilder pro Sekunde)"
+msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
-msgstr "Bilder"
+msgstr ""
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
-msgstr "Events"
+msgstr "Ereignisse"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
-msgstr "Ton"
+msgstr "Audio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
-msgstr "Rate/Größe"
+msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
-msgstr "Rechter Tonkanal"
+msgstr "Rechtes Audio"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
-msgstr "LiVES: - Verschlüsselungsoptionen"
+msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
-msgstr "_Meine Einstellungen beibehalten"
+msgstr "_Meine Einstellungen behalten"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
-msgstr "Die _empfohlenen Einstellungen übernehmen."
+msgstr "_Empfohlene Einstellungen benutzen"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
-"Diese Warnung _nicht mehr anzeigen\n"
-"(Kann über Einstellungen/Warnungen wieder rückgängig gemacht werden)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
-msgstr "Zeige Details"
+msgstr "_Details anzeigen"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "Fenster _schließen"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
-msgstr "_Datei speichern"
+msgstr "In _Datei speichern"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Einfügen"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
-msgstr "_Anzahl der einzufügenden Zeiten"
+msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
-msgstr "_Einfügen um Audio anzupassen"
+msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
-msgstr "Am _Anfang der Auswahl einfügen"
+msgstr "_Vor der Auswah einfügen"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
-msgstr "Zwischablage vor den ausgewählten Frame einfügen."
+msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
-msgstr "Am _Ende der Auswahl einfügen"
+msgstr "_Nach der Auswahl einfügen"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
-msgstr "Zwischablage hinter den ausgewählten Frame einfügen."
+msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
-msgstr "Einfügen _mit Ton"
+msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
-msgstr "Einfügen _ohne Ton"
+msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
-msgstr "LiVES: - Öffne Auswahl"
+msgstr "LiVES: - Auswahl öffnen"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Wahl der Startzeit (in Sekunden)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Anzahl der einzulesenden Bilder"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
-msgstr "LiVES: - Öffne im Netzwerk"
+msgstr "LiVES: - Ort öffnen"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr ""
+msgstr "LiVES: - Youtube Clip öffnen"
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1318,14 +1250,8 @@
 "Also make sure you have set your bandwidth in Preferences|Streaming\n"
 "\n"
 msgstr ""
-"\n"
-"\n"
-"Um einen Stream zu öffnen, stellen sie sicher, dass die richtigen "
-"Bilblioteken im mplayer kompilliert wurden\n"
-"und dass sie die Bandbreite über Einstelungen/Streaming gesetzt haben.\n"
-"\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1334,488 +1260,424 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
+"Geben Sie die URL des Clips unten ein.\n"
+"Z.B: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
+"\n"
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
-msgstr "URL: "
+msgstr "URL : "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr "Youtube URL : "
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
-msgstr "Sende keine Informationen über die verwendete Bandbreite"
+msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
-"Versuchen Sie diese Einstellung falls Sie Probleme beim Empfang des "
-"Datenstroms haben"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
+msgstr ".webm"
+
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Clip umbenennen"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
 "Please enter the set name you wish to use.\n"
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
-"Sie müssen einen Namen für das aktuelle Clip Set angeben.\n"
-"Dadurch sind sie in der Lage, das Layout mit den selben Clips zu einem "
-"späteren Zeitpunkt wiederherzustellen.\n"
-"Bitte geben sie jetzt den gewünschten Namen ein.\n"
-"LiVES wird sie später, wenn sie das Programm schließen, noch einmal daran "
-"erinnern, das Clip Set zu speichern.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
-"Um dieses Projekt exportieren zu können müssen sie einen Namen für das Clip "
-"Set angeben.\n"
-"Dieser wird auch als Projekt-Name verwendet werden.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
-"Willkommen bei LiVES !\n"
-"Dieser Start-Assistent führt Sie durch die\n"
-"erste Installation, damit Sie die Anwendung bestmöglich nutzen können.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-"\n"
-"Zunächst müssen Sie ein Arbeitsverzeichnis für LiVES angeben.\n"
-"Dieses Verzeichnis sollte viel freien Speicherplatz haben.\n"
-"Beachten Sie, dass auf vielen Systemen /tmp beim Herunterfahren gelöscht "
-"wird, dann sollten Sie vielleicht ein anderes Verzeichnis wählen.\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Filmausschnitt umbenennen"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES:- Geben Sie einen Namen für das Set an"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Wählen Sie ein Arbeitsverzeichnis"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Neuer Name "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
-msgstr "Name für das Set "
+msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
-msgstr "_Erweitert"
+msgstr "E_rweitert"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
-msgstr "LiVES: - Lade CD Titel"
+msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
-msgstr "LiVES: - Auswahl des DVD Titels/Kapitels"
+msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
-msgstr "LiVES: - Auswahl des VCD Titels"
+msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
-msgstr "LiVES:- Maximale Anzahl der angezeigten Tracks ändern"
+msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
-msgstr "Zu ladende Spur (von %s)"
+msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD Titel"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD Titel"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
-msgstr "Maximale Anzahl der angezeigten Tracks"
+msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
-msgstr ""
+msgstr "Gerät:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
-msgstr ""
+msgstr "Gerät:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Kapitel  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
-msgstr ""
+msgstr "Kanal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
-msgstr "Audio ID  "
+msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
-msgstr ""
+msgstr "Breite"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
-msgstr ""
+msgstr "Höhe"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr ""
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr "_Treiber"
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Ausgabeformat"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr "_Ausgabeformat"
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
-msgstr "LiVES:- Audio einblenden"
+msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
-msgstr "LiVES:- Audio ausblenden"
+msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
-msgstr "Eiblenden über  "
+msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
-msgstr "Erste(r)"
+msgstr ""
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
-msgstr "Ausblenden über  "
+msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
-msgstr "letzter"
+msgstr ""
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "Sekunden."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "Auswahl."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Musik im Zufallmodus abspielen"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Anzahl der angeforderten Titel:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Verzeichnis:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Unterverzeichisse miteinbeziehen"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimale Dateigröße (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maximale Dateigröße (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
-msgstr "LiVES: - Dateikommentar (optional)"
+msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
-msgstr "Titel/Name: "
+msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
-msgstr "Autor/Künstler: "
+msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
-msgstr "Anmerkungen: "
+msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: Wählen sie ein Verzeichniss"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: Wählen sie eine Datei"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
-msgstr "LiVES:- Abrechen/Verwerfen/Speichern"
+msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"Sie verlassen den Multitrack-Modus.\n"
-"Das aktuelle Layout wurde nicht gespeichert.\n"
-"Was möchten sie tun?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
-"Sie verlassen den Multitrack-Modus.\n"
-"Das aktuelle Layout wurde nach der letzten Änderung nicht gespeichert.\n"
-"Was möchten sie tun?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"Sie verlassen LiVES.\n"
-"Der aktuelle Clip kann gespeichert werden.\n"
-"Was möchten sie tun?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"Der aktuelle Clip wurde nicht gespeichert.\n"
-"Was möchten sie tun?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"Das aktuelle Layout wurde nicht gespeichert.\n"
-"Was möchten sie tun?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"Das aktuelle Layout wurde nicht geändert, seit es zuletzt gespeichert "
-"wurde.\n"
-"Was möchten Sie tun ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
-"Das aktuelle Layout enthält generierte Frames und kann nicht beibehalten "
-"werden.\n"
-"Sie sollten es rendern, bevor Sie den Mehrspur-Modus verlassen.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
-"Sie sind im Begriff, den Mehrspur-Modus zu verlassen.\n"
-"Das aktuelle Layout enthält generierte Frames und kann nicht beibehalten "
-"werden.\n"
-"Was möchten Sie tun?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
-msgstr "Clip set _name"
+msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
-msgstr "Beim nächsten mal _automatisch neu laden"
+msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
-msgstr "Layout _verwerfen"
+msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
-msgstr "Änderungen _ignorieren"
+msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
-msgstr "Clip Set _löschen"
+msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
-msgstr "Layout _löschen"
+msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
-msgstr "Layout _speichern"
+msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
-msgstr "Clip Set _speichern"
+msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
-msgstr "LiVES: Layout wiederherstellen?"
+msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
-"\n"
-"LiVES hat ein Multitasking-Layout von einer früheren Session gefunden.\n"
-"Möchten Sie eine Wiederherstellung versuchen?\n"
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
-msgstr "Speichern als %s..."
-
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Dateiauswahl"
+msgstr ""
 
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1823,19 +1685,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
-msgstr "Diese Datei"
+msgstr ""
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
-",\n"
-" - einschließlich der aktuellen Layout - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1845,7 +1705,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1854,28 +1714,21 @@
 "\n"
 "Really close it ?"
 msgstr ""
-"\n"
-"% s\n"
-"wird im aktuellen Layout benutzt.\n"
-"\n"
-"Wirklich schließen?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
-"\n"
-"Ungültige Projekt-Datei.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1887,149 +1740,132 @@
 "then File|Close/Save all Clips and provide a new set name or discard it.\n"
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
-"\n"
-"Das Set %s existiert bereits.\n"
-"Um das Projekt zu importieren, müssen Sie das vorhandene Set umbenennen oder "
-"löschen.\n"
-"Dazu wählen Sie Datei|Set neu laden und den Namen\n"
-"%s\n"
-"aus und erstellen Sie dann einen neuen Namen via Datei|Alle Clips speichern "
-"oder verwerfen Sie das Set.\n"
-"Nachdem Sie das einmal durchgeführt haben, wird es Ihnen möglich sein das "
-"neue Projekt zu importieren.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
-msgstr "Importiere das Projekt %s als Set %s..."
+msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
-msgstr "Projekt wird importiert"
+msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
-msgstr "Projekt %s wird exportiert..."
+msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
-msgstr "Projekt wird exportiert"
-
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr ".lv1 Datei wiederherstellen"
+msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
-msgstr "Sichern als .lv1 Datei"
+msgstr ""
+
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
 "Set will be deleted from the disk.\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"Das Set wird von der Disk gelöscht.\n"
-"Sind sie sicher?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
-msgstr "Lösche Set..."
+msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
-msgstr "Lösche Set"
+msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
-msgstr "Das Set %s wurde entgültig von der Disk gelöscht.\n"
+msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
-msgstr "Stille einfügen"
+msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
-msgstr "Rückgängig"
+msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
-msgstr "Audio Wiederherstellung..."
+msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
-msgstr "Bereinigung der Framebilder"
+msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
-msgstr "Lösche überzählige Bilder"
+msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
-msgstr "Länge des Films ist jetzt %d Bilder bei %.3f Bildern pro Sekunde.\n"
+msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
-msgstr "Clipboard wurde neu abgetastet für %d Frames.\n"
+msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
-msgstr "stelle Zustand wieder her"
+msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
-msgstr "Kopiere Bild %d bis %d%s in den Zwischenspeicher..."
+msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
-msgstr "Kopiere in den Zwischenspeicher"
+msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
-msgstr "Ausschneiden"
+msgstr ""
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
-msgstr "Zwischenspeicher einfügen"
+msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
-"Dieser Vorgang verändert oder konvertiert Bilder.\n"
-"Bitte installieren Sie 'convert' aus dem Image-Magick- Paket, und starten "
-"Sie LiVES neu.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2037,58 +1873,40 @@
 "Try selecting all frames, and then using \n"
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
-"\n"
-"\n"
-"Das Video ist länger als der Ton.\n"
-"Versuchen Sie alle Frames auszuwählen und benutzen Sie \n"
-"die 'Trimme Audio' Funktion im Audio Menü."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
-"LiVES könnte es nicht einfügen, weil die Abtastrate nicht passt.\n"
-"Bitte installieren Sie SoX und versuchen Sie es erneut."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Das Einfügen wird Bilder in manchen Mehrspur-Layouts verschieben.\n"
-"Sind Sie sicher, dass Sie fortfahren möchten?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Das Einfügen wird Ton in manchen Mehrspur-Layouts verschieben.\n"
-"Sind Sie sicher, dass Sie fortfahren möchten?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
-msgstr "Umwandlung der Abtastrate der Audiodaten in der Zwischenablage"
+msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to resample the clipboard audio. \n"
 "Clipboard audio has been erased.\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES konnte die Abtastrate der Audiodaten in der Zwischenablage nicht "
-"ändern. \n"
-"Audiodaten in der Zwischenablage wurden gelöscht.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2096,114 +1914,87 @@
 "Do you wish to continue with the insert \n"
 "using unchanged audio ?\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES konnte die Abtastrate der Audiodaten in der Zwischenablage nicht "
-"ändern.\n"
-"Möchten Sie mit dem Einfügen der unveränderten Audiodaten fortfahren?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
-msgstr "Füge %d%s Bilder aus dem Zwischenspeicher ein..."
+msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
-msgstr "einfügen"
+msgstr ""
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
-msgstr "Füge %d mal aus der Zwischenablage%s ein..."
+msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
-msgstr "Füge %d Bilder aus der Zwischenablage%s ein..."
+msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
-msgstr "Einfügen"
+msgstr ""
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
-"\n"
-"Wenn sie alle Frames löschen, schließen sie auch diese Datei.\n"
-"Sind Sie sicher?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Das Löschen hat zur Folge, dass in einigen Multitrack Layouts Frames "
-"fehlen.\n"
-"Sind Sie sicher?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Das Löschen hat zur Folge, dass in einigen Multitrack Layouts der Ton "
-"fehlen.\n"
-"Sind Sie sicher?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Das Löschen hat zur Folge, dass sich in einigen Multitrack Layouts die "
-"Frames tauschen.\n"
-"Sind Sie sicher?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Das Löschen hat zur Folge, dass sich in einigen Multitrack Layouts der Ton "
-"tauscht.\n"
-"Sind Sie sicher?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
-msgstr "Lösche Bild %d bis %d%s..."
+msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
-msgstr "Lösche"
+msgstr ""
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
-msgstr "Löschen"
+msgstr ""
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
-"\n"
-"\n"
-"Die Auswahl ist gesperrt.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2211,11 +2002,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
-msgstr "Aufnahme abgebrochen.\n"
+msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2223,12 +2014,8 @@
 "The '%s' plugin reports:\n"
 "%s\n"
 msgstr ""
-"\n"
-"\n"
-"Das Plugin '%s' berichtet:\n"
-"%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2236,12 +2023,8 @@
 "Unable to find the 'init' method in the %s plugin.\n"
 "The plugin may be broken or not installed correctly."
 msgstr ""
-"\n"
-"\n"
-"Im Plugin %s konnte die 'init'-Methode nicht gefunden werden.\n"
-"Dieses Plugin ist unter Umständen kaputt oder nicht korrekt installiert."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2249,140 +2032,117 @@
 "\n"
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
-"Wenn Sie das Set speichern, werden Kopien aller geladenen Clips auf der "
-"Platte %s verbleiben.\n"
-"\n"
-"Bitte klicken Sie 'Abbrechen', wenn Sie dies nicht möchten.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
-msgstr "Speichere das Set %s"
+msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
-msgstr "Lade Clips aus dem Set %s"
+msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
 "this machine.\n"
 "Click OK to proceed.\n"
 msgstr ""
-"LiVES wird versuchen etwas Festplattenspeicher freizuräumen.\n"
-"Stellen Sie sicher, dass keine andere Instanz von LiVES auf diesem Rechner "
-"läuft.\n"
-"Klicken Sie OK um fortzufahren.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
-msgstr "Plattenspeicher wird bereinigt..."
+msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
-msgstr "Setze Bildraten und Bildwerte zurück ..."
+msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Externe: %s\n"
-"Intern: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
-"\n"
-"  Öffne..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
-"\n"
-"(%d virtuell)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
-"\n"
-"(%d entschlüsselt)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
-"\n"
-"  %.2f Sek."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
-"\n"
-"  Unbekannt"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
-msgstr "unterzeichnen"
+msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
-"  %d Hz %d bit\n"
-"%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2399,11 +2159,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
-msgstr "Ein Video-Editor, und VJ-Programm."
+msgstr ""
+
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Adrian https://launchpad.net/~leftshiftlp\n"
+"  Daniel Winzen https://launchpad.net/~q-d\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Lukas Bögelein https://launchpad.net/~lukas-boegelein\n"
+"  Schiwi https://launchpad.net/~mschiwi\n"
+"  h3ndrik https://launchpad.net/~hendrik-langer\n"
+"  milan https://launchpad.net/~milan-fox"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2417,25 +2193,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
-"\n"
-"\n"
-"Sie müssen das Programm MPlayer einspielen um diese Datei ansehen zu "
-"können.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2443,230 +2215,236 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
-msgstr "Öffne Ton %s, Typ %s..."
+msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
-msgstr "Öffne Ton"
+msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
-msgstr "Abbruch"
-
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Nuer Ton: %d Hz %d Kanal %d bps\n"
+msgstr ""
 
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
-msgstr "New Audio"
+msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
-msgstr "%d Frames sind genug!\n"
+msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
-msgstr "Vollbild Playback (f)"
+msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
-msgstr "Vollbild Playback aus (f)"
+msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
-msgstr "Doppelte Größe (d)"
+msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
-msgstr "Normale Größe (d)"
+msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
-msgstr "Das Abspielfenster verbergen (s)"
+msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
-msgstr "Das Abspielfenster zeigen (s)"
+msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
-msgstr "In eigenem Fenster abspielen (s)"
+msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
-msgstr "Dauerloops aus (o)"
+msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
-msgstr "Dauerloops an (o)"
+msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
-msgstr "Tonlautstärke (%.2f)"
+msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
-msgstr "Stummschaltung aus (z)"
+msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
-msgstr "Stummschaltung ein (z)"
+msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
-msgstr "Mache Zwischenablage rückgängig...."
+msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
-msgstr "Mache Zwischenablage rückgängig"
+msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
-msgstr "Untertiteldatei geladen: %s\n"
+msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
-msgstr "Untertitel wurden gelöscht.\n"
+msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Tondatei auswählen"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
-"Bitte, stellen Sie Ihr CD Gerät unter Werkzeuge | Einstellungen | "
-"Verschiedenes ein\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
-msgstr "Öffne CD Titel %d von %s..."
+msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
-msgstr "CD Titel %d"
+msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
-msgstr "Öffne CD Titel..."
+msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
-msgstr "Fehler beim Öffnen des CD Titels\n"
-
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Wähle Spuren"
+msgstr ""
 
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
-msgstr "Layout Errors"
+msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
-msgstr "_Fenster schließen"
+msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
-msgstr "_Errors löschen"
+msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
-msgstr "Betroffene Layouts _löschen"
+msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
-msgstr "Fortsetzen"
+msgstr ""
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
-msgstr "angehalten..."
+msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
-msgstr "Pause"
+msgstr ""
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
-msgstr "fortgesetzt..."
+msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
-msgstr "Behalten"
+msgstr ""
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
 "(click Keep to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 msgstr ""
-"\n"
-"Angehalten\n"
-"(klicken Sie bleiben zu behalten, was Sie haben und stop)\n"
-"(klicken Sie auf Fortsetzen, um die Verarbeitung fortzusetzen)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
-msgstr "Abbrechen"
+msgstr ""
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2675,27 +2453,21 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
 "You must install \"xwininfo\" before you can use this feature\n"
 "\n"
 msgstr ""
-"\n"
-"\n"
-"Bitte installieren sie \"xwininfo\", bevor sie dieses Feature nutzen können\n"
-"\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
-"\n"
-"Aufnahmezeit muss größer als \"Null\" sein.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2703,25 +2475,18 @@
 "Click 'Cancel' to cancel\n"
 "\n"
 msgstr ""
-"Ein externes Fenster aufnehmen:\n"
-"\n"
-"Klicken Sie zuerst 'OK' und dann auf ein Fenster, um es aufzunehmen.\n"
-"Klicken Sie 'Abbrechen' um zurückzukehren.\n"
-"\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
-msgstr "Externes Fenster wurde freigegeben.\n"
+msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
-"Klicken Sie in ein Fenster, um es aufzunehmen\n"
-"Drücken Sie 'q', um die Aufnahme zu beenden"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2730,25 +2495,20 @@
 "Stop or 'q' to finish.\n"
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
-"\n"
-"Externes Fenster aufgenommen. Breite=%d, Höhe=%d, bpp=%d. *Nicht skalieren*\n"
-"\n"
-"Klicken Sie Stop oder drücken Sie q um abzuschließen.\n"
-"(Standardmäßig werden %.3f Frames pro Sekunde benutzt.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
-msgstr "LiVES konnte den Inhalt dieses Fensters nicht aufzeichnen.\n"
+msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
-msgstr "Exportiere ausgewählten Ton als..."
+msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
-msgstr "Exportiere Ton als..."
+msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2756,1149 +2516,1108 @@
 "Click 'OK' to export at the new speed, or 'Cancel' to export at the original "
 "rate.\n"
 msgstr ""
-"\n"
-"\n"
-"Die Tonabspielgeschwindigkeit dieses Clips wurde verändert.\n"
-"Klicken Sie 'OK', um mit der veränderten Geschwindigkeit, oder\n"
-"'Abbrechen', um mit der ursprünglichen Geschwindigkeit zu exportieren.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
-msgstr "Exportiere Tonspurschnitt %d nach %d als %s..."
+msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
-msgstr "Exportiere Ton nach %s..."
+msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
-msgstr "Exportiere Tonspur"
+msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Tondatei anhängen..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
-msgstr "Hänge Tondatei %s an..."
+msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
-msgstr "Ton anhängen"
+msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
-msgstr "Audio wird angehängt"
+msgstr ""
+
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
-msgstr "Trimme Audio von %.2f auf %.2f Sekunden..."
+msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
-msgstr "Audio einblenden"
+msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
-msgstr "Audio einblenden"
+msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
-msgstr "Audio ausblenden"
+msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
-msgstr "Audio ausblenden"
+msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
-"\n"
-"Löschen der gesamten Tonspur bewirkt das diese Datei geschloßen wird.\n"
-"Sind sie sicher das Sie dies wollen?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
-msgstr "Lösche gesamten Ton..."
+msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
-msgstr "Lösche Ton von %.2f bis %.2f Sekunden..."
+msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
-msgstr "Lösche Ton"
+msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
-msgstr "Audio löschen"
+msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
-msgstr "Neuen Audio-Stream aufnehmen"
+msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
-msgstr "Füge Tonstille von %.2f bis %.2f Sekunde ein..."
+msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
-msgstr "Tonstille einfügen"
-
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
 msgstr ""
-"\n"
-"Lösche %d Layout(s)... Sind Sie sicher?\n"
 
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr "Bildlogodatei %s nicht gefunden"
+msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
-msgstr "LiVES: - Zusammenfügen"
+msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
-msgstr "_Starter werden ausgerichtet"
+msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
-msgstr "_Enden werden ausgerichtet"
+msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
-msgstr "Was soll mit den überzähligen Clipboard-Frames geschehen?"
+msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
-msgstr "_Frames einfügen"
+msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
-msgstr "_Frames verwerfen"
+msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
-msgstr "Anzahl der Wiederholungen des Clipboards"
+msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
-msgstr "_Übergang:"
+msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
-msgstr "Zwischenablage und Auswahl werden zusammengeführt ..."
-
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
 msgstr ""
 
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "füge jetzt %d zusätzliche(s) Bild(er) ein\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
-msgstr "Zusammenfügen beendet.\n"
+msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
-msgstr "_Persönliche Effekte"
+msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
-msgstr "Persönliches _Zubehör"
+msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
-msgstr "_Datei"
+msgstr ""
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
-msgstr "_Öffne Datei/Verzeichnis"
+msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
-msgstr "Öffne _Fremdverzeichnis/Videoadresse..."
+msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
-msgstr "Importiere aus _Firewire-Device (dv)"
+msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
-msgstr "Importiere aus _Firewire-Device (hdv)"
+msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
-msgstr "_Benutzte Dateien..."
+msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
-msgstr "Clip-Set _nachladen"
+msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
-msgstr "Schließe und Sp_eichere alle Clips"
+msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
-msgstr "Codiere Auswahl _als..."
+msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
-msgstr "_Schließe diesen Clip"
+msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
-msgstr "_Backup des Clips als .lv1..."
+msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
-msgstr "_Stelle den Clip wieder her aus .lv1..."
+msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
-msgstr "Festplatte a_ufräumen"
+msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
-msgstr "_Bearbeiten"
+msgstr ""
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
-msgstr "_Mehrspur-Modus"
+msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
-msgstr "_Kopiere Auswahl"
+msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
-msgstr "Auswahl _ausschneiden"
+msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
-msgstr "_Einfügen aus dem Zwischenspeicher"
+msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
-msgstr "Auswahl als _neu einfügen"
+msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
-msgstr "_lösche Auswahl"
+msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
-msgstr "_Video von Ton trennen"
+msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
-msgstr "_Auswahl..."
+msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
-msgstr "_Alle Bilder auswählen"
+msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
-msgstr "Nur _Anfangsbild"
+msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
-msgstr "Nur _Endbild"
+msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
-msgstr "Auswahl vom _ersten Bild"
+msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
-msgstr "Auswahl bis zum _letzten Bild"
+msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
-msgstr "Wählen Sie Letzte _Effekt"
+msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
-msgstr "Auswahl _invertieren"
+msgstr ""
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
-msgstr "_Spiele"
+msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
-msgstr "_Spiele alles"
+msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
-msgstr "Auswahl _abspielen"
+msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
-msgstr "Inhalt der _Zwischenablage wiedergeben"
+msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
-msgstr "_Anhalten"
+msgstr ""
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
-msgstr "Zu_rückspulen"
+msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
-msgstr "_Gesamter Bildschirm"
+msgstr ""
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
-msgstr "_Doppelte Größe"
+msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
-msgstr "In einem _separaten Fenster abspielen"
+msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
-msgstr "Hintergrund _Löschen"
+msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
-msgstr "(Automatisch)-_Schleife Video (zum Audio-Track passen)"
+msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
-msgstr "Endl_osschleife"
+msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
-msgstr "Schleifen Pin_g Pong"
+msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
-msgstr "_Stumm schalten"
+msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
-msgstr "_Zeige Bildzähler"
+msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
-msgstr "Untertitel anzeigen"
+msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
-msgstr "Effekt_e"
+msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
-msgstr "Effekte werden auf die derzeitige Auswahl angewandt."
+msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
-msgstr "_Werkzeuge"
+msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
-msgstr "Zwischenablage _rückgängig machen"
+msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
-msgstr "_Zubehör"
-
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Erzeugen"
+msgstr ""
 
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
-msgstr "Persönliche _Werkzeuge"
+msgstr ""
+
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
-msgstr "Untertitel löschen"
+msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
-msgstr "_Externes Fenster aufzeichnen... "
+msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
-msgstr "_Einstellungen"
+msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
-msgstr "_Audio"
+msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
-msgstr "Lade _CD Titel"
+msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
-msgstr "CD a_uswerfen"
+msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
-msgstr "nach Neu _Clip..."
+msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
-msgstr "zur _Auswahl"
+msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
-msgstr "_Exportiere Ton"
+msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
-msgstr "Exportiere _ausgewählten Ton"
+msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
-msgstr "Exportiere _:gesamten Ton..."
+msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
-msgstr "Ton _anhängen"
+msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
-msgstr "_Lösche Ton"
+msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
-msgstr "Lösche _ausgewählten Ton"
+msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
-msgstr "Lösche _gesamten Ton"
+msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Spiele _Musik mittles xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
-msgstr "_Information"
+msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
-msgstr "Zeige/_Ändere Dateikommentare"
+msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
-msgstr "Zeige Informationen über den _Zwischenspeicher"
+msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
-msgstr "Zeige _Ausgabeprotokoll"
+msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
-msgstr "_Layout einblenden Fehler"
+msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
-msgstr "_Filmabschnitt"
+msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
-msgstr "E_rweitert"
+msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
-msgstr "_RFX Effekte/Werkzeuge/Zubehör"
+msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
-msgstr "_Neue RFX Prüfbefehlsdatei..."
+msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
-msgstr "_Kopiere RFX Befehlsdatei zum Prüfen..."
+msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
-msgstr "_Ändere Prüf RFX Befehlsdatei"
+msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
-msgstr "_Sende LiVES Stream an..."
+msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
-msgstr "_Importiere Projekt (.lv2)..."
+msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
-msgstr "E_xportiere Projekt (.lv2)..."
+msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
-msgstr "_Tastaturkürzel"
+msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
-msgstr "_MIDI/joystick Schnittstelle"
+msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
-msgstr "_MIDI/Joystick Lernenden..."
+msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
-msgstr "Tastatur_kürzel anzeigen"
+msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
-msgstr "Sp_iele"
+msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
-msgstr "_Keine"
+msgstr ""
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
-msgstr "_Schlechte Bilder"
+msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
-msgstr "_LiVES Fernseher (Breitband)"
+msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
-msgstr "_Hilfe"
+msgstr ""
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
-msgstr "_Handbuch (wird in einem Browser)"
+msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
-msgstr "_Spenden an das Projekt !"
+msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
-msgstr "_Email an die Redaktion"
+msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
-msgstr "Melden _bug"
+msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
-msgstr "Schlagen Sie eine _Charakteristikum"
+msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
-msgstr "Unterstützung bei der _Übersetzung"
+msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
-msgstr "_Fehlersuche"
+msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
-msgstr "_Über"
+msgstr ""
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
-msgstr "Rücklauf zu starten (w)"
+msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
-msgstr "Spielen Sie alle (p)"
+msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
-msgstr "Stoppen Sie die Wiedergabe (q)"
+msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
-msgstr "Spielen Auswahl (y)"
+msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
-msgstr "Volumen"
+msgstr ""
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
-msgstr "Lautstärke (1,00)"
+msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
-msgstr "Wiedergabe langsamer (ctrl-abwärts)"
+msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
-msgstr "Wiedergabe schneller (ctrl-oben)"
+msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
-msgstr "Zurückspulen (Strg-links)"
+msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
-msgstr "Direkt nach vorn (ctrl-recht)"
+msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
-msgstr "Verstecke diese Werkzeugleiste"
+msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
-msgstr "     Wiedergabegeschwindigkeit des Films (Bilder pro Sekunde)        "
+msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
-msgstr "Anpassen der Wiedergabegeschwindigkeit"
+msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
-msgstr "                                                            "
+msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
-msgstr "Erstes Bild"
+msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
-msgstr "Letztes Bild"
+msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
-msgstr "Die ersten ausgewählten Rahmen in diesem Clip"
+msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
-msgstr "Die zuletzt ausgewählte Bild in diesem Clip"
+msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
-msgstr "Beginne...\n"
+msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
-"    Drücken Sie 'q' Aufnahme zu stoppen. NICHT FÜR DAS SPIELEN FENSTER !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
-msgstr "_Frei"
+msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
-msgstr "_Starten"
+msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
-msgstr "_Ende"
+msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
-msgstr "_Zeiger"
+msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
-msgstr "Zurück Spulen"
+msgstr ""
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
-msgstr "Spiele alles"
+msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
-msgstr "Auswahl abspielen"
+msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
-msgstr "Schleife Ein/Aus"
+msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
-msgstr "Beginne _Aufnahme"
+msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
-msgstr "Beende _Aufnahme"
+msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
-msgstr "Verstecke Abspielfenster"
+msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
-msgstr "Zeige Abspielfenster"
+msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
-msgstr "Inhalt des Zwischenspeichers wird gelöscht"
+msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
 "==============================\n"
 "Switched to clip %s\n"
 msgstr ""
-"\n"
-"==============================\n"
-"Gewechselt zu Filmausschnitt %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
-"\n"
-"==============================\n"
-"Gewechselt zu leerem Filmausschnitt\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
-msgstr "(leer)"
+msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3906,7 +3625,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3914,32 +3633,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3947,70 +3666,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
-msgstr "Film [öffnen...]"
+msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
-msgstr "Film [%.2f Sek]"
+msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
-msgstr "(nicht festgelegt)"
+msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
-msgstr "(kein Film)"
+msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
-msgstr "(kein Ton)"
+msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
-msgstr "Mono [öffnen...]"
+msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
-msgstr "Linker Tonkanal [öffnen...]"
+msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
-msgstr "Mono [%.2f Sek]"
+msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
-msgstr "Linker Tonkanal [%.2f Sek]"
+msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
-msgstr "Rechter Tonkanal [öffnen...]"
+msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
-msgstr "Rechter Tonkanal [%.2f Sek]"
+msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
-"LiVES kann nicht zum Programm mplayer wechseln während ein Filmausschnitt "
-"geladen wird."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
-msgstr "Bereinige Filmausschnitt"
+msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4019,59 +3736,65 @@
 "\n"
 "Overwrite ?\n"
 msgstr ""
-"\n"
-"%s\n"
-"ist bereits vorhanden.\n"
-"\n"
-"Überschreiben?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
-msgstr "_Änderung %s rückgängig machen"
+msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
-msgstr "%s _erneuern"
+msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
-msgstr "-------------Auswahl------------"
+msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
-msgstr " Sek ] ----------Auswahl---------- [ "
+msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
-msgstr " Bilder ] ----------"
+msgstr ""
+
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
 
-#: src/saveplay.c:158
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
-msgstr "Öffne %s"
+msgstr ""
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
-msgstr "Öffne %s Anfangszeit %.2f Bilder pro Sek. %d"
+msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
-msgstr " ohne Ton"
+msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4083,11 +3806,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
-msgstr " - bitte haben Sie etwas Geduld."
+msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4095,18 +3818,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
-"\n"
-"\n"
-"Sie müssen wahrscheinlich das Programm mplayer installieren um diese Datei "
-"öffnen zu können.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4114,29 +3833,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4144,66 +3863,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "ausgewählt"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
-msgstr "Verbinde die ausgewählten Stücke"
+msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
-msgstr " (ohne Ton)\n"
+msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
-msgstr "Speichern [kann eine lange Zeit]"
+msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
-msgstr "Aufnahmeleistung..."
+msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
-msgstr "Durchschnittliche BPS: %.4f\n"
+msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4212,16 +3927,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
-msgstr "Unbekannt"
+msgstr ""
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
-msgstr "Unbenannt%d"
+msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4229,7 +3944,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4237,68 +3952,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
-msgstr " - Kommentar: %s\n"
+msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
-msgstr "Speichere Bild %d als %s..."
+msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
-msgstr "Sichere %s nach %s"
+msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
-msgstr "Sichere Daten"
+msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
-msgstr "Leistungsdaten wurden gesichert..."
+msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
-msgstr "Rücksicherung von %s..."
+msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
-msgstr "Rücksicherung"
+msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4306,28 +4016,24 @@
 "The file %s is corrupt.\n"
 "LiVES was unable to restore it.\n"
 msgstr ""
-"\n"
-"\n"
-"Die Datei %s ist fehlerhaft.\n"
-"LiVES konnte den Inhalt nicht wieder herstellen.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4335,66 +4041,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
-msgstr "Wiederherstellen von Dateien"
+msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
-msgstr "LiVES: - Achtung !"
+msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
-msgstr "Warnung"
+msgstr ""
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4405,7 +4111,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4417,11 +4123,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4429,46 +4135,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4476,7 +4182,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4488,14 +4194,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4503,19 +4209,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4523,85 +4229,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
-"\n"
-"Vielleicht möchten Sie:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
-msgstr "LiVES muß:\n"
+msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4609,23 +4313,15 @@
 "Click `OK` to proceed, `Cancel` to abort.\n"
 "\n"
 msgstr ""
-"\n"
-"Sie können diese Änderungen später rückgängig zu machen.\n"
-"\n"
-"Klicken Sie auf `OK`, um fortzufahren, `Abbrechen`, um abzubrechen.\n"
-"\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
-"\n"
-"Änderungen übernommen, um die Auswahl wird kein Dauerzustand sein.\n"
-"\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4634,7 +4330,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4645,7 +4341,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4654,11 +4350,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
-msgstr "Zeige Tastaturkombinationen"
+msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4700,11 +4396,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4726,17 +4422,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4744,28 +4441,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4774,7 +4471,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4782,7 +4479,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4790,7 +4487,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4801,7 +4498,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4811,7 +4508,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4819,7 +4516,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4828,13 +4525,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4845,13 +4542,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4861,7 +4558,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4870,7 +4567,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4878,7 +4575,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4886,87 +4583,78 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
-msgstr "Schließen Sie einige andere Anwendungen\n"
+msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
-"Das aktuelle Layout wurde Audio-, Audio-Kanäle, so darf nicht auf Null "
-"gesetzt werden.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
 "and may take a long time to display.\n"
 "Are you sure you wish to view it ?\n"
 msgstr ""
-"\n"
-"Event-Liste wird sehr groß sein\n"
-"und kann lange dauern, angezeigt werden soll.\n"
-"Sind Sie sicher, dass du es sehen ?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
-"\n"
-"\n"
-"Sie müssen 'dvgrab' um diese Funktion zu nutzen.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4975,25 +4663,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5002,33 +4690,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
-msgstr "abgesagt.\n"
+msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
-msgstr "fehlgeschlagen.\n"
+msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
-msgstr "fertig.\n"
+msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
-msgstr "Fehler in der Datei. Fehlgeschlagen.\n"
+msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -5038,7 +4726,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -5048,7 +4736,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -5058,7 +4746,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -5067,7 +4755,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -5077,7 +4765,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5086,7 +4774,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5096,12 +4784,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5110,7 +4798,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5118,13 +4806,8 @@
 "%s\n"
 "Please check the file permissions and try again."
 msgstr ""
-"\n"
-"LiVES konnte die Datei\n"
-"%s\n"
-"nicht schreiben!\n"
-"Bitte, prüfen Sie die Zugriffsrechte der Datei und wiederholen den Vorgang."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5133,14 +4816,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5148,13 +4839,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5164,27 +4855,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5193,14 +4884,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5211,19 +4902,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5231,7 +4922,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5239,7 +4930,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5251,7 +4942,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5260,34 +4951,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5296,424 +4987,671 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
-msgstr "generator"
+msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
-msgstr "Generatoren"
+msgstr ""
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generator"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Generatoren"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
-msgstr "Übergang"
+msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
-msgstr "Verbindungen"
+msgstr ""
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
-msgstr "effekt"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
-msgstr "Effekte"
+msgstr ""
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
-msgstr "Dienstprogramm"
+msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
-msgstr "Dienstprogramme"
+msgstr ""
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
-msgstr "Setzer"
+msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
-msgstr "trenner"
+msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
-msgstr "Konverter"
+msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
-msgstr "Konverter"
+msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
-msgstr "audio"
+msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
-msgstr "Audiomischer"
+msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Audiomischer"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
-msgstr "unbekannt"
+msgstr ""
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
-"\n"
-"Keine Frames generiert wurden.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
-msgstr "Sie können in der Vorschau klicken, um diese Werte zu ändern"
+msgstr ""
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
-msgstr "Werte zu_rück setzen"
-
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Bild"
+msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/framedraw.c:267
+msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Wählen Sie Datei"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr ""
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
-msgstr "Neue Größe (Pixel)"
+msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Breite"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Höhe"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
 "You must select at least %d frames to use this effect.\n"
 "\n"
 msgstr ""
-"\n"
-"Sie müssen mindestens %d Bilder auswählen um diesen Effekt nutzen zu "
-"können.\n"
-"\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
-msgstr "Als Vorgabewert setzen"
+msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
-msgstr "Fenster _schließen"
+msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
-msgstr "Keine Parameter"
+msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
-msgstr "Ungültige Angabe"
+msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
-msgstr "LiVES: - Farbauswahl"
+msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
-msgstr "Klicken Sie, um die Farbe"
+msgstr ""
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
-msgstr "Die Rot-Wert (0 - 255)"
+msgstr ""
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
-msgstr "Die Grün-Wert (0 - 255)"
+msgstr ""
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
-msgstr "Die Blau-Wert (0 - 255)"
+msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5723,17 +5661,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5743,32 +5681,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
-msgstr "_FPS"
+msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5777,14 +5715,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5794,40 +5725,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5836,11 +5774,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5849,7 +5787,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5859,192 +5797,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
-msgstr "LiVES: - Neues Prüf RFX"
+msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
-msgstr "LiVES: - Prüf RFX bearbeiten"
+msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
-msgstr "Typ:"
-
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Effekt -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
 msgstr ""
 
-#: src/rfx-builder.c:235
-msgid "Generator -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Werkzeug -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Zubehör -"
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
-msgstr "Name:          "
+msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
-msgstr "Name der Erweiterung. Keine Leerzeichen verwenden."
+msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
-msgstr "Version:       "
+msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
-msgstr "Das Skript-Version."
+msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
-msgstr "    Autor:       "
+msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
-msgstr "Das Skript Autor."
+msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
-msgstr "    URL (fakultativ):       "
+msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
-msgstr "URL für das Plugin Betreuer."
+msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
-msgstr "Menü Überschrift:    "
+msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
-msgstr "Der Text zu zeigen, in dem Menü."
+msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
-msgstr "Aktion Beschreibung:        "
+msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
-msgstr "_Anforderungen..."
+msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
-msgstr "_Eigenschaften..."
+msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
-msgstr "_Parameter..."
+msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Sprachkürzel:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
-msgstr "Code nach der Schleife ausgeführt werden. Fakultativ."
+msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6054,55 +5976,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
-msgstr "LiVES: - RFX Voraussetzungen"
+msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
-msgstr "_Neuer Eintrag"
+msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
-msgstr "_Bearbeite Eintrag"
+msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
-msgstr "_Entferne Eintrag"
+msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
-msgstr "Nach _oben"
+msgstr ""
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
-msgstr "Nach _unten"
+msgstr ""
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6111,7 +6033,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6119,270 +6041,248 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
-msgstr "_Name:    "
+msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
-msgstr "_Etikett:    "
+msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
-msgstr "_Typ:         "
+msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
-msgstr "Parametertyp (aus der Liste auswählen)."
+msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
-msgstr "Dezimal_stellen: "
+msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
-msgstr "_Vorgabe Welt:    "
+msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
-msgstr "_Vorgabe: "
+msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
-msgstr "     _Schrittweite:   "
+msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Wickeln: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Voreingestellter Wert:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Kleinster Wert: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Größter Wert: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Schlüsselwort:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Besondere Art:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
-msgstr "Wann:         "
+msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
-"\n"
-"\n"
-"Der Name darf nicht leer sein.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
-"\n"
-"\n"
-"Der Name darf keine Leerzeichen enthalten.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
 "There is already a plugin with this name.\n"
 "Name must be unique.\n"
 msgstr ""
-"\n"
-"\n"
-"Es ist bereits eine Erweiterung mit diesem Namen vorhanden.\n"
-"Der Name muß eindeutig sein.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6391,41 +6291,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
-msgstr "Schreibe Befehlsdatei %s..."
+msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6435,27 +6335,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
-msgstr "Benutzerdefiniert..."
+msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
-msgstr "prüfe..."
+msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
-msgstr "erneuer dynamische Menüeinträge..."
+msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6464,7 +6364,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6474,12 +6374,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6489,7 +6389,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6499,12 +6399,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6512,23 +6412,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
-msgstr "Kopiere %s nach %s..."
+msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6538,55 +6438,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Mitgeliefert"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Prüfe"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
-msgstr "   Skript:    "
+msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
-msgstr "Vom Skript: "
+msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
-msgstr "Skript Name: "
+msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
-msgstr "Neuer Name: "
+msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6594,26 +6482,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
-msgstr "_Bewerben Echtzeit-Effekte zur Auswahl"
+msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6621,7 +6520,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6629,7 +6528,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6638,28 +6537,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6671,20 +6577,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6692,790 +6598,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
-msgstr "LiVES: - Einstellungen"
+msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
-msgstr " Monitor Zahl für LiVES der Schnittstelle"
+msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
-msgstr " Visualizza caratteri romani Monitor-Nummer für die Wiedergabe"
+msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
-msgstr "Graphische Bedienerführung"
+msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
-msgstr "_Breite           "
+msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
-msgstr "          _Höhe      "
+msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
-msgstr "_Jeder"
+msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
-msgstr "sekunden"
+msgstr ""
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
-msgstr "Nach jeder _Veränderung"
+msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
-msgstr "_Niemals"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
-msgstr "Verwenden Sie nach Möglichkeit sofort zur Eröffnung"
+msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Befehl zum Film öffnen             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
-msgstr "_jpeg"
+msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
-msgstr "_png"
+msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
-msgstr "Dekodiere"
-
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Vorschau _Qualität"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
-msgstr "Niedrig - kann die Leistung verbessern auf langsameren Maschinen"
+msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
-msgstr "Normal - empfohlen für die meisten Benutzer"
+msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
-msgstr "Hoch - Verbesserung der Qualität kann auf sehr schnelle Maschinen"
+msgstr ""
+
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
-msgstr "_Zeigen FPS Statistiken"
+msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
-msgstr "_Plugin"
+msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
-msgstr "VIDEO"
+msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
-msgstr "_Spieler"
+msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
-msgstr "mplayer"
+msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
-msgstr "AUDIO"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
-msgstr "Wiedergabe"
+msgstr ""
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
-msgstr "Aufnahme"
+msgstr ""
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
-msgstr "Audiocodec"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
-msgstr "Kodierung"
+msgstr ""
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
-msgstr "Verzeichnisse"
+msgstr ""
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
-msgstr " MB"
+msgstr ""
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
-msgstr "Warnungen"
+msgstr ""
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
-msgstr "CD Gerät           "
-
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
 msgstr ""
 
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
-msgstr "LiVES kann die Musiktitel dieser CD lesen"
+msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
-msgstr "Grundeinstellung BPS (Bild pro Sek)        "
+msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
-msgstr "Verschiedenes"
+msgstr ""
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
-msgstr "Themen"
+msgstr ""
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
-msgstr "Bandbreite beim Herunterladen in Kb/s       "
+msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
-msgstr "UDP Kanal       "
+msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
-msgstr "Empfang/Netzwerk"
+msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
-msgstr "Fortgeschritten"
+msgstr ""
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7483,224 +7389,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
-"Synchronisiere gemäß der externen Bildgeschwindigkeit von %.8f Bildern pro "
-"Sekunde.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
-msgstr "Kann OSC/UDP Server auf Kanal %d nicht starten \n"
+msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
-msgstr "Die Länge des Videos beträgt jetzt %d Frames.\n"
+msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
-msgstr "Resampling"
+msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
-msgstr "Unsigniert"
+msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
-msgstr "Aktuell"
-
-#: src/resample.c:1486
-msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
+#: src/resample.c:1340
+msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
-msgstr "Neu"
+msgstr ""
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
-msgstr "Unbegrenzt"
+msgstr ""
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7711,7 +7607,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7722,89 +7618,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
-msgstr "Typ: %s"
+msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7814,7 +7710,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7822,19 +7718,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7844,12 +7740,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7859,22 +7755,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7884,43 +7780,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7928,40 +7829,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr ""
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
-msgstr "Autor: %s"
+msgstr ""
+
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
-msgstr "Beschreibung: "
+msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7970,65 +7876,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
-msgstr "Information"
+msgstr ""
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
-msgstr "Setzte Parameter"
+msgstr ""
+
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2184
 msgid "Clear"
-msgstr "Säubern"
+msgstr ""
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8078,11 +7988,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d Kanal/Kanäle %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8100,64 +8005,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8166,7 +8071,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8174,14 +8079,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8191,7 +8096,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8200,208 +8105,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
-msgstr "Lücken schließen"
+msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
-msgstr "Lösche %s"
+msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8411,7 +8318,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8419,587 +8326,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
-msgstr "Ö_ffne Dateiauswahl..."
+msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
-msgstr "Auswahl von _dvd/vcd einlesen..."
+msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
-msgstr "Auswahl von _dvd einlesen"
+msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
-msgstr "Auswahl von _vcd einlesen"
+msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
-msgstr "Daten über Schnittstelle _einlesen"
+msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
-msgstr "_Speichere Anordnung als…"
+msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
-msgstr "Au_swahl"
+msgstr ""
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
-msgstr "_Kopieren..."
+msgstr ""
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
-msgstr "_Render"
+msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
-msgstr "_Ansicht"
+msgstr ""
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
-msgstr "Listenansicht"
+msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
-msgstr "_Anwenden"
+msgstr ""
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
-msgstr "Startframe"
-
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr ""
+
+#: src/multitrack.c:8167
 msgid "End frame"
-msgstr "Endframe"
+msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
-msgstr "Rollen"
+msgstr ""
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
-msgstr " %s"
+msgstr ""
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
-msgstr "%d frames"
+msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
-msgstr "%s bis %s"
+msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9007,275 +8922,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
-msgstr "Aufräumen läuft…"
+msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
-msgstr "_Pausieren"
+msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
-msgstr "rahmen"
+msgstr ""
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9283,94 +9190,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9378,7 +9285,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9386,327 +9293,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
-msgstr "daten"
+msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
-msgstr "Geschwindigkeit"
+msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
-msgstr "Notiz"
+msgstr ""
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
-msgstr "Wert"
+msgstr ""
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
-msgstr "Status"
+msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
-msgstr "Variable"
+msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
-msgstr "x"
+msgstr ""
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
-msgstr "Bereich"
+msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
-msgstr "Alle _löschen"
+msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
-msgstr "Aufnahme beginnen"
+msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
-msgstr "Aufnahme stoppen"
+msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
-msgstr "fps"
+msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
-msgstr "Schlüssel"
+msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
-msgstr "pnum"
+msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9715,7 +9630,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9724,12 +9639,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9749,10 +9664,6 @@
 msgid "Opened device %s\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "180 _degrees             "
-#~ msgstr "CD Gerät           "
-
 #~ msgid "Adjust contrast"
 #~ msgstr "Kontrast einstellen"
 
@@ -9766,7 +9677,7 @@
 
 #, fuzzy
 #~ msgid "Blank _Colour"
-#~ msgstr "_Zeige Bildzähler"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Blank frames"
@@ -9792,27 +9703,7 @@
 
 #, fuzzy
 #~ msgid "Border _Colour"
-#~ msgstr "_Zeige Bildzähler"
-
-#, fuzzy
-#~ msgid "Brightness _end"
-#~ msgstr "_Starter werden ausgerichtet"
-
-#, fuzzy
-#~ msgid "Brightness _start"
-#~ msgstr "_Starter werden ausgerichtet"
-
-#, fuzzy
-#~ msgid "Brightness change"
-#~ msgstr "Änderungen _ignorieren"
-
-#, fuzzy
-#~ msgid "Brightness end"
-#~ msgstr "Änderungen _ignorieren"
-
-#, fuzzy
-#~ msgid "Brightness start"
-#~ msgstr "_Starter werden ausgerichtet"
+#~ msgstr "Verblassen"
 
 #~ msgid "Charcoal"
 #~ msgstr "Kohlezeichnung"
@@ -9826,11 +9717,11 @@
 
 #, fuzzy
 #~ msgid "Clipboard _over selection"
-#~ msgstr "Zwischenablage und Auswahl werden zusammengeführt ..."
+#~ msgstr "_Nach der Auswahl einfügen"
 
 #, fuzzy
 #~ msgid "Clipboard _under selection"
-#~ msgstr "Zwischenablage und Auswahl werden zusammengeführt ..."
+#~ msgstr "_Nach der Auswahl einfügen"
 
 #~ msgid "Colorize"
 #~ msgstr "Einfärben"
@@ -9861,7 +9752,7 @@
 
 #, fuzzy
 #~ msgid "Cycle _Step"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #~ msgid "Deinterlace"
 #~ msgstr "Entflackern"
@@ -9907,7 +9798,7 @@
 
 #, fuzzy
 #~ msgid "Fade _colour"
-#~ msgstr "Audio ausblenden"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Fade _end"
@@ -9915,33 +9806,29 @@
 
 #, fuzzy
 #~ msgid "Fade _in"
-#~ msgstr "Audio einblenden"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Fade _out"
-#~ msgstr "Audio ausblenden"
-
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Audio ausblenden"
+#~ msgstr "Verblassen"
 
 #~ msgid "Fade"
 #~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Fading video"
-#~ msgstr "Audio einblenden"
+#~ msgstr "Ausblenden"
 
 #~ msgid "Fading"
 #~ msgstr "Ausblenden"
 
 #, fuzzy
 #~ msgid "Fina_l frame"
-#~ msgstr "Endframe"
+#~ msgstr "Erstelle leere Frames"
 
 #, fuzzy
 #~ msgid "Flash _colour"
-#~ msgstr "Audio ausblenden"
+#~ msgstr "Verblassen"
 
 #~ msgid "Flip vertically"
 #~ msgstr "Vertikal spiegeln"
@@ -9952,31 +9839,23 @@
 
 #, fuzzy
 #~ msgid "Frame Calculator"
-#~ msgstr "_Zeige Bildzähler"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Frame _Colour"
-#~ msgstr "_Zeige Bildzähler"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Frame _height"
-#~ msgstr "Größe des Frames"
-
-#, fuzzy
-#~ msgid "Frame _in frame position of clipboard..."
-#~ msgstr "Kopiere Bild %d bis %d%s in den Zwischenspeicher..."
-
-#, fuzzy
-#~ msgid "Frame _in frame position of top frame..."
-#~ msgstr "Kopiere Bild %d bis %d%s in den Zwischenspeicher..."
+#~ msgstr "_Höhe"
 
 #, fuzzy
 #~ msgid "Frame _width"
-#~ msgstr "Größe des Frames"
+#~ msgstr "_Höhe"
 
 #, fuzzy
 #~ msgid "Frames _per second (FPS)"
-#~ msgstr "sekunden"
+#~ msgstr "Sekunden."
 
 #, fuzzy
 #~ msgid "Gamma _end"
@@ -9984,11 +9863,11 @@
 
 #, fuzzy
 #~ msgid "Gamma _start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "Gamma change"
-#~ msgstr "Änderungen _ignorieren"
+#~ msgstr "Verblassen"
 
 #~ msgid "Generate blank frames"
 #~ msgstr "Erstelle leere Frames"
@@ -10011,7 +9890,7 @@
 
 #, fuzzy
 #~ msgid "Generating clip from image"
-#~ msgstr "Bereinigung der Framebilder"
+#~ msgstr "Erstelle leere Frames"
 
 #, fuzzy
 #~ msgid "Generating coloured frames"
@@ -10027,11 +9906,11 @@
 
 #, fuzzy
 #~ msgid "Hue _start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "Hue change"
-#~ msgstr "Änderungen _ignorieren"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "Hue end"
@@ -10039,7 +9918,7 @@
 
 #, fuzzy
 #~ msgid "Hue start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #~ msgid "Keep _Centered"
 #~ msgstr "Mittig bleiben"
@@ -10077,16 +9956,12 @@
 #~ msgstr "Normalisieren"
 
 #, fuzzy
-#~ msgid "Number of _frames"
-#~ msgstr "    Anzahl der einzulesenden Bilder"
-
-#, fuzzy
 #~ msgid "Pixilate"
-#~ msgstr "Zwischenspeicher einfügen"
+#~ msgstr "Drehe"
 
 #, fuzzy
 #~ msgid "Pixilating"
-#~ msgstr "Zwischenspeicher einfügen"
+#~ msgstr "Drehe"
 
 #~ msgid "Posterize"
 #~ msgstr "Tontrennung"
@@ -10096,14 +9971,6 @@
 #~ msgstr "Tontrennung"
 
 #, fuzzy
-#~ msgid "Replacing colours in"
-#~ msgstr "Umwandlung der Abtastrate der Audiodaten in der Zwischenablage"
-
-#, fuzzy
-#~ msgid "Resize All Frames"
-#~ msgstr "_Skaliere alle Frames"
-
-#, fuzzy
 #~ msgid "Rotate Clip"
 #~ msgstr "Drehe"
 
@@ -10112,27 +9979,27 @@
 
 #, fuzzy
 #~ msgid "S_tart %"
-#~ msgstr "_Starten"
+#~ msgstr "Verwirbeln"
 
 #, fuzzy
 #~ msgid "Saturation _end"
-#~ msgstr "Übergang"
+#~ msgstr "Verwirbeln"
 
 #, fuzzy
 #~ msgid "Saturation _start"
-#~ msgstr "Übergang"
+#~ msgstr "Verwirbeln"
 
 #, fuzzy
 #~ msgid "Saturation change"
-#~ msgstr "Übergang"
+#~ msgstr "Schachbrett"
 
 #, fuzzy
 #~ msgid "Saturation end"
-#~ msgstr "Übergang"
+#~ msgstr "Verwirbeln"
 
 #, fuzzy
 #~ msgid "Saturation start"
-#~ msgstr "Übergang"
+#~ msgstr "Verwirbeln"
 
 #~ msgid "Sepia"
 #~ msgstr "Sepia"
@@ -10169,14 +10036,6 @@
 #~ msgstr "Spannweite"
 
 #, fuzzy
-#~ msgid "Step _Value"
-#~ msgstr "Startframe"
-
-#, fuzzy
-#~ msgid "Step per _Frame"
-#~ msgstr "    _Bild"
-
-#, fuzzy
 #~ msgid "Swirl _start"
 #~ msgstr "Verwirbeln"
 
@@ -10209,22 +10068,18 @@
 
 #, fuzzy
 #~ msgid "_Background Colour"
-#~ msgstr "Hintergrund _Löschen"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_Background colour"
-#~ msgstr "Hintergrund _Löschen"
+#~ msgstr "Verblassen"
 
 #~ msgid "_Bottom"
 #~ msgstr "_Ende"
 
 #, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "_Zeige Bildzähler"
-
-#, fuzzy
 #~ msgid "_Cycle Start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "_Decrease Contrast"
@@ -10232,11 +10087,11 @@
 
 #, fuzzy
 #~ msgid "_End Colour"
-#~ msgstr "Hintergrund _Löschen"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_End amount"
-#~ msgstr "Nur _Endbild"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_Fade level"
@@ -10248,38 +10103,26 @@
 
 #, fuzzy
 #~ msgid "_Fill colour"
-#~ msgstr "Audio ausblenden"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_First frame"
-#~ msgstr "Erstes Bild"
+#~ msgstr "Erstelle leere Frames"
 
 #, fuzzy
 #~ msgid "_Flash for"
-#~ msgstr "Audio ausblenden"
+#~ msgstr "Verblassen"
 
 #~ msgid "_Font"
 #~ msgstr "_Schriftart"
 
 #, fuzzy
 #~ msgid "_Frames per second"
-#~ msgstr "sekunden"
+#~ msgstr "Sekunden."
 
 #, fuzzy
 #~ msgid "_Frames"
-#~ msgstr "Bilder"
-
-#, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Audio ausblenden"
-
-#, fuzzy
-#~ msgid "_Image File"
-#~ msgstr "_Datei"
-
-#, fuzzy
-#~ msgid "_Image"
-#~ msgstr "_Datei"
+#~ msgstr "Erstelle leere Frames"
 
 #, fuzzy
 #~ msgid "_Increase Contrast"
@@ -10289,10 +10132,6 @@
 #~ msgstr "_Invertieren"
 
 #, fuzzy
-#~ msgid "_Number of frames"
-#~ msgstr "    Anzahl der einzulesenden Bilder"
-
-#, fuzzy
 #~ msgid "_Other Center"
 #~ msgstr "_Weitere"
 
@@ -10301,7 +10140,7 @@
 
 #, fuzzy
 #~ msgid "_Point size"
-#~ msgstr "_Zeiger"
+#~ msgstr "Dateigröße"
 
 #, fuzzy
 #~ msgid "_Radius end"
@@ -10323,15 +10162,15 @@
 
 #, fuzzy
 #~ msgid "_Rotate Selection by"
-#~ msgstr "Auswahl _ausschneiden"
+#~ msgstr "_Nach der Auswahl einfügen"
 
 #, fuzzy
 #~ msgid "_Sigma end"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "_Sigma start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "_Skip ahead"
@@ -10342,41 +10181,30 @@
 
 #, fuzzy
 #~ msgid "_Source Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_Start Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_Start Value"
-#~ msgstr "Startframe"
-
-#, fuzzy
-#~ msgid "_Start amount"
-#~ msgstr "Nur _Anfangsbild"
+#~ msgstr "Verwirbeln"
 
 #, fuzzy
 #~ msgid "_Stroke colour"
-#~ msgstr "_Starten"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "_Target Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Verblassen"
 
 #~ msgid "_Text"
 #~ msgstr "_Text"
 
 #, fuzzy
 #~ msgid "_Time (seconds)"
-#~ msgstr "sekunden"
-
-#, fuzzy
-#~ msgid "_Top left is clipboard"
-#~ msgstr "Kopiere in den Zwischenspeicher"
-
-#~ msgid "_Top"
-#~ msgstr "_Oben"
+#~ msgstr "Sekunden."
 
 #, fuzzy
 #~ msgid "_Wavemax"
@@ -10391,7 +10219,7 @@
 
 #, fuzzy
 #~ msgid "_X Start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "_Y Center"
@@ -10399,7 +10227,7 @@
 
 #, fuzzy
 #~ msgid "_Y Start"
-#~ msgstr "_Starten"
+#~ msgstr "_Radius"
 
 #, fuzzy
 #~ msgid "blank_frames"
@@ -10409,10 +10237,6 @@
 #~ msgstr "verwischen"
 
 #, fuzzy
-#~ msgid "brightness_change"
-#~ msgstr "Änderungen _ignorieren"
-
-#, fuzzy
 #~ msgid "charcoal"
 #~ msgstr "Kohlezeichnung"
 
@@ -10462,18 +10286,14 @@
 
 #, fuzzy
 #~ msgid "fade_in_out"
-#~ msgstr "Audio ausblenden"
+#~ msgstr "Verblassen"
 
 #~ msgid "fc"
 #~ msgstr "fc"
 
 #, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "_Zeige Bildzähler"
-
-#, fuzzy
 #~ msgid "gamma_change"
-#~ msgstr "Änderungen _ignorieren"
+#~ msgstr "Verblassen"
 
 #, fuzzy
 #~ msgid "gen_blank_frames"
@@ -10488,10 +10308,6 @@
 #~ msgstr "Erstelle leere Frames"
 
 #, fuzzy
-#~ msgid "hue_change"
-#~ msgstr "Änderungen _ignorieren"
-
-#, fuzzy
 #~ msgid "modulate"
 #~ msgstr "Drehe"
 
@@ -10507,7 +10323,7 @@
 
 #, fuzzy
 #~ msgid "pixilate"
-#~ msgstr "Zwischenspeicher einfügen"
+#~ msgstr "Drehe"
 
 #, fuzzy
 #~ msgid "posterize"
@@ -10521,7 +10337,7 @@
 
 #, fuzzy
 #~ msgid "saturation_change"
-#~ msgstr "Übergang"
+#~ msgstr "Schachbrett"
 
 #~ msgid "sepia"
 #~ msgstr "Sepia"
@@ -10554,7 +10370,7 @@
 
 #, fuzzy
 #~ msgid "transition_bwthresh"
-#~ msgstr "Übergang"
+#~ msgstr "Schachbrett"
 
 #, fuzzy
 #~ msgid "transition_checkerboard"
@@ -10562,15 +10378,15 @@
 
 #, fuzzy
 #~ msgid "transition_fade2"
-#~ msgstr "Übergang"
+#~ msgstr "Schachbrett"
 
 #, fuzzy
 #~ msgid "transition_splice"
-#~ msgstr "Übergang"
+#~ msgstr "Schachbrett"
 
 #, fuzzy
 #~ msgid "trim_frames"
-#~ msgstr "rahmen"
+#~ msgstr "Erstelle leere Frames"
 
 #~ msgid "tunnel"
 #~ msgstr "Tunnel"
@@ -10578,27 +10394,25 @@
 #, fuzzy
 #~ msgid "Unable to open output file !"
 #~ msgstr ""
-#~ "LiVES konnte dieses Abbild nicht aufzeichnen\n"
+#~ "LiVES konnte das Bild nicht aufnehmen\n"
 #~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES: Wählen sie eine Datei"
+#~ msgstr ""
+#~ "LiVES konnte das Bild nicht aufnehmen\n"
+#~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was unable to open it."
 #~ msgstr ""
-#~ "LiVES konnte dieses Abbild nicht aufzeichnen\n"
+#~ "LiVES konnte das Bild nicht aufnehmen\n"
 #~ "\n"
 
 #, fuzzy
-#~ msgid "Error creating new backup."
-#~ msgstr "Fehler beim Öffnen des CD Titels\n"
-
-#, fuzzy
 #~ msgid "LiVES was not able to open the file"
 #~ msgstr ""
-#~ "LiVES konnte dieses Abbild nicht aufzeichnen\n"
+#~ "LiVES konnte das Bild nicht aufnehmen\n"
 #~ "\n"
 
 #~ msgid "$file"
@@ -10616,9 +10430,6 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Sie müssen zuerst das CD-Laufwerk in den Einstellungen einstellen."
 
-#~ msgid "Try again with different values."
-#~ msgstr "Versuchen sie es erneut mit anderen Werten."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name fehlgeschlagen:"

LiVES-1.6.1.tar.bz2/po/en_GB.po -> LiVES-2.0.3.tar.bz2/po/en_GB.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-02-01 11:59+0000\n"
-"Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-15 09:42+0000\n"
+"Last-Translator: salsaman <salsaman@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-03 17:37+0000\n"
-"X-Generator: Launchpad (build 14738)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr "%s Warning: %s\n"
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr "%s Critical error: %s\n"
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr "%s Fatal error: %s\n"
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "When reporting crashes, please include details of your operating system, "
 "distribution, and the LiVES version ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "and any information shown below:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,170 +88,191 @@
 "information.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Preserving set.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Resizing"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Resize All Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Any"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "None"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recommended"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "disabled !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**The current layout**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Builtin"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Custom"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Test"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Starting jack transport server..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Connecting to jack transport server..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 "\n"
 "\n"
-"Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"Manual start of jackd required. Please make sure jackd is running,\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...detected..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NOT DETECTED..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...detected..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NOT DETECTED..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detected\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NOT DETECTED\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detected..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NOT DETECTED..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detected..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NOT DETECTED..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detected..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NOT DETECTED..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detected..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NOT DETECTED..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detected..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NOT DETECTED..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detected..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NOT DETECTED..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr "Windows version %04X"
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr "UNKNOWN - please patch me !"
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -246,22 +283,48 @@
 "\n"
 "Window manager reports as \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "number of monitors detected: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr "Number of CPUs detected: %d "
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "little endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "big endian"
+
+#: src/main.c:1732
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Number of CPUs detected: %d\n"
+msgid "(%d bits, %s)\n"
+msgstr "(%d bits, %s)\n"
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr "GUI type is: "
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ", with cairo support"
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Temp directory is %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -271,15 +334,15 @@
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compiled with jack support, good !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compiled with pulse audio support, wonderful !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -288,7 +351,7 @@
 "Welcome to LiVES version %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -297,73 +360,73 @@
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Where: filename is the name of a media file or backup file.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : filename start time in seconds\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : maximum number of frames to open\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts can be:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : show this help text and exit\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : autoload clip set setname\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : do not load any set on startup\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : force no-loading of crash recovery\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : force loading of crash recovery\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 "-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : do not show the gui\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : do not show the splash window\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : do not show the play window\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : start in clip editor mode\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : start in multitrack mode\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -371,30 +434,30 @@
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : start OSC listener on UDP port <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : do not start OSC listener\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 "-aplayer <ap>    : start with selected audio player. <ap> may be mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox or jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -404,15 +467,15 @@
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " or sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autoload devicemap\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -420,15 +483,15 @@
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Starting GUI..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -436,26 +499,27 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 "\n"
 "\n"
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -469,50 +533,50 @@
 "Please review the README file which came with this package\n"
 "before running LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"Please check the <tempdir> setting in\n"
+"%s\n"
 "and try again.\n"
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -527,7 +591,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -545,7 +609,7 @@
 "\n"
 "Thankyou.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -555,7 +619,17 @@
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -565,7 +639,7 @@
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -575,7 +649,7 @@
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -585,7 +659,7 @@
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -595,7 +669,7 @@
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -603,68 +677,68 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 "\n"
 "LiVES was unable to find any encoder plugins.\n"
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Autoloading set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Invalid audio player %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No File>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Play"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -672,35 +746,35 @@
 "LiVES was unable to capture this image\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Closed file %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Undo"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Redo"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Left Audio"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Right Audio"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -714,26 +788,11 @@
 "mplayer.\n"
 "Please adjust the playback options in Preferences and try again.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr " (%d %% scale)"
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Play Window%s"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Play Window"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -748,7 +807,7 @@
 "\n"
 "(Free space = %s)\n"
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -763,7 +822,7 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -780,7 +839,7 @@
 "\n"
 "(Free space = %s)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -793,11 +852,11 @@
 "%s\n"
 "Please try again and choose a different location.\n"
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Directory name is too long !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -805,7 +864,7 @@
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -815,7 +874,7 @@
 "\n"
 "PULSE AUDIO is recommended for most users"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -823,7 +882,7 @@
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -833,11 +892,11 @@
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio is recommended for pro users"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -845,7 +904,7 @@
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -855,7 +914,7 @@
 "before running LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -867,11 +926,11 @@
 "audio player instead.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX may be used if neither of the preceding players work, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -879,7 +938,7 @@
 "but some audio features will be disabled.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -889,7 +948,7 @@
 "You are advised to install it before running LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -897,91 +956,91 @@
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Choose an audio player"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Use _pulse audio player"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Use _jack audio player"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Use _sox audio player"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Use _mplayer audio player"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Next"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Skipped"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Passed"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Failed"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testing Configuration"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Troubleshoot"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES will now run some basic configuration tests\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Checking for \"sox\" presence"
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "You should install sox, to be able to use all the audio features in LiVES"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Checking if sox can convert audio"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Unable to allocate 176400 bytes memory."
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Unable to write to: %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr "Command failed: %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "You should install sox_fmt_all or similar"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Checking for \"mplayer\" presence"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -989,43 +1048,55 @@
 "You should install mplayer, to be able to use all the decoding features in "
 "LiVES"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Checking if mplayer can convert audio"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "You should install mplayer with pcm/wav support"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Checking if mplayer can decode to png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "You may wish to upgrade mplayer to a newer version"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Checking if mplayer can decode to jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "You should install mplayer with either png/alpha or jpeg support"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "You may wish to add jpeg output support to mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Checking for \"convert\" presence"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Install imageMagick, to be able to use all of the rendered effects"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1037,7 +1108,7 @@
 "    Click Cancel to exit and install any missing components, or Next to "
 "continue    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1047,7 +1118,7 @@
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1057,7 +1128,7 @@
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1067,74 +1138,74 @@
 "\n"
 "The default can always be changed later from Preferences.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Choose the startup interface"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "Start in _Clip Edit mode"
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr "This is the best choice for simple editing tasks and for VJs\n"
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "Start in _Multitrack mode"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Finish"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Let LiVES set the _file extension"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr "Let LiVES set the _file extension (.%s)"
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr "Apply _Deinterlace"
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "If this is set, frames will be deinterlaced as they are imported."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Preview"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "Click here to _Preview any selected video, image or audio file"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Click here to _Preview any selected audio file"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Click here to _Preview the video"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Processing..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1148,8 +1219,8 @@
 "\n"
 "Remember to switch off effects (ctrl-0) afterwards !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1157,87 +1228,100 @@
 "\n"
 "Please Wait"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Show details"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Enough"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Preview"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "Pause/_Enough"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Frame size"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "File size"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Byte size"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Total time"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Frames"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Events"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Rate/size"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Right audio"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Encoding options"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr "<------------- (Check the box to re_size as suggested)"
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr "<------------- (Check the box to use the _size recommendation)"
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr "Use _letterboxing to maintain aspect ratio (optional)"
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
@@ -1245,19 +1329,15 @@
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr "Use _letterboxing to maintain aspect ratio (optional)"
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Keep _my settings"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Use _recommended settings"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1265,75 +1345,75 @@
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Show _Details"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Save to file"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insert"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Number of times to insert"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Insert to fit audio"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Insert _before selection"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Insert clipboard before selected frames"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Insert _after selection"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Insert clipboard after selected frames"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Insert _with sound"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Insert with_out sound"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Open Selection"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Selection start time (sec)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Number of frames to open"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Open Location"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: - Open Youtube Clip"
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1349,7 +1429,7 @@
 "Also make sure you have set your bandwidth in Preferences|Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1363,7 +1443,7 @@
 "Please make sure you have the latest version of that tool installed.\n"
 "\n"
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1373,39 +1453,55 @@
 "E.g: https://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr "Youtube URL : "
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Do not send bandwidth information"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Try this setting if you are having problems getting a stream"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr "Download to _Directory : "
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr "Download Directory..."
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr "Download _File Name : "
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Rename Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Enter Set Name"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr "LiVES: - Enter a Set Name to Reload"
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Choose a Working Directory"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1417,7 +1513,7 @@
 "Please enter the set name you wish to use.\n"
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1425,7 +1521,7 @@
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1435,243 +1531,200 @@
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"First of all you need to choose a working directory for LiVES.\n"
-"This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Rename Clip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Enter Set Name"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Enter a Set Name to Reload"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Choose a Working Directory"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "New name "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Set name "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "Use def_aults"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- Select input device"
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr "Select input device:"
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Load CD Track"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Select DVD Title/Chapter"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Select VCD Title"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Change Maximum Visible Tracks"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Device details"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Track to load (from %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD Title"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD Title"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Maximum number of tracks to display"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Device:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Device:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Chapter  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Channel  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "Input number"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "Use default width, height and FPS"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Width"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Height"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Fade Audio In"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Fade Audio Out"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Fade in over  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "first"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Fade out over  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "last"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "seconds."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "selection."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Play Random Music"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Number of Tracks Requested:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Directory:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Include subdirectories"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimum File Size (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "selection"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - File Comments (optional)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Title/Name : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Author/Artist : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comments : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "_Options"
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr "Save _subtitles to file"
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "Subtitle file"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "Browse..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: choose a directory"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: choose a file"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancel/Discard/Save"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1681,7 +1734,7 @@
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1691,7 +1744,7 @@
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1701,7 +1754,7 @@
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1709,7 +1762,7 @@
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1717,7 +1770,7 @@
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1725,7 +1778,7 @@
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1733,7 +1786,7 @@
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1743,43 +1796,43 @@
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "Clip set _name"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Auto reload next time"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Wipe layout"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignore changes"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Delete clip set"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Delete layout"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Save layout"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Save clip set"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recover layout ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1789,57 +1842,57 @@
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: - Disk Recovery Options"
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr "Delete _Orphaned Clips"
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "Clear _Backup Files from Closed Clips"
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr "Remove Sets which have _Layouts but no Clips"
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr "_Reset to Defaults"
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr "_Accept"
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Saving as set %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Select File"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "Please enter the name of the file to save the clip as.\n"
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr "Please enter a valid URL for the download.\n"
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "Downloading %s to %s..."
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr "Downloading clip..."
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1851,11 +1904,11 @@
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "This file"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1863,7 +1916,7 @@
 ",\n"
 " - including the current layout - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1878,7 +1931,7 @@
 "\n"
 "Really close it ?"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1893,7 +1946,7 @@
 "\n"
 "Really close it ?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1903,7 +1956,7 @@
 "\n"
 "Really close it ?"
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1911,7 +1964,7 @@
 "\n"
 "Invalid project file.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1932,33 +1985,33 @@
 "then File|Close/Save all Clips and provide a new set name or discard it.\n"
 "Once you have done this, you will be able to import the new project.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importing the project %s as set %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importing project"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exporting project %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exporting project"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Restore .lv1 file"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Backup as .lv1 file"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Restore .lv1 file"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1970,90 +2023,90 @@
 "Set will be deleted from the disk.\n"
 "Are you sure ?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr "Deleting set %s..."
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Deleting set..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Deleting set"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Set %s was permanently deleted from the disk.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Insert Silence"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Undoing"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Restoring audio..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Clearing frame images"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Deleting excess frames"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Length of video is now %d frames at %.3f frames per second.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Clipboard was resampled to %d frames.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Re-doing"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Copying frames %d to %d%s to the clipboard..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Pulling frames from clip"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Copying to the clipboard"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Cut"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "Pasting %d frames to new clip %s..."
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Pasting"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "...added audio..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2063,7 +2116,7 @@
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2077,7 +2130,7 @@
 "Try selecting all frames, and then using \n"
 "the 'Trim Audio' function from the Audio menu."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2085,7 +2138,7 @@
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2095,7 +2148,7 @@
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2105,11 +2158,11 @@
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Resampling clipboard audio"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2121,7 +2174,7 @@
 "LiVES was unable to resample the clipboard audio. \n"
 "Clipboard audio has been erased.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2135,30 +2188,30 @@
 "Do you wish to continue with the insert \n"
 "using unchanged audio ?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserting %d%s frames from the clipboard..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Inserting"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserting %d times from the clipboard%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserting %d frames from the clipboard%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Insert"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2168,7 +2221,7 @@
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2178,8 +2231,8 @@
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2189,7 +2242,7 @@
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2199,7 +2252,7 @@
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2209,20 +2262,20 @@
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Deleting frames %d to %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Deleting"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Delete"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2232,7 +2285,7 @@
 "\n"
 "Selection is locked.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2244,11 +2297,11 @@
 "(To cancel, press 'r' or click on Play|Record Performance again before you "
 "play.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Record cancelled.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2261,7 +2314,7 @@
 "The '%s' plugin reports:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2274,7 +2327,7 @@
 "Unable to find the 'init' method in the %s plugin.\n"
 "The plugin may be broken or not installed correctly."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2287,22 +2340,22 @@
 "\n"
 "Please press 'Cancel' if that is not what you want.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Saving set %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Loading clips from set %s"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr "%d clips and %d layouts were recovered from set (%s).\n"
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2314,40 +2367,37 @@
 "this machine.\n"
 "Click OK to proceed.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Cleaning up disk space..."
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr "Recovering disk space..."
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "%s of disk space was recovered.\n"
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Resetting frame rates and frame values..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"External: %s\n"
-"Internal: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "buffered"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2355,7 +2405,7 @@
 "\n"
 "  Opening..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2364,7 +2414,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2373,7 +2423,7 @@
 "\n"
 "(%d decoded)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2382,7 +2432,7 @@
 "\n"
 "  %.2f sec."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2390,23 +2440,23 @@
 "\n"
 "  Unknown"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "unsigned"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "signed"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2415,7 +2465,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2445,11 +2495,24 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "A video editor and VJ program."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
+"  Harry Rickards https://launchpad.net/~hrickards\n"
+"  Robert Readman https://launchpad.net/~robert-readman\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2472,7 +2535,7 @@
 "salsaman@gmail.com\n"
 "Homepage: http://lives.sourceforge.net"
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2482,17 +2545,14 @@
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2504,168 +2564,180 @@
 "Are you sure you wish to continue ?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Opening audio %s, type %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Opening audio"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Cancelling"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "New audio: %d Hz %d channel(s) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Committing audio"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "New Audio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d frames are enough !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Encoder debug output"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Fullscreen playback (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Fullscreen playback off (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr " (%d %% scale)"
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr "LiVES: - Play Window%s"
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Double size (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Single size (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Hide the play window (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Show the play window (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Play in separate window (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr "LiVES: - Streaming"
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Switch continuous looping off (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Switch continuous looping on (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Audio volume (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Unmute the audio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Mute the audio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Reversing clipboard..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Reversing clipboard"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr "LiVES: Load subtitles from..."
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Loaded subtitle file: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "Subtitles were erased.\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Please set your CD play device in Tools | Preferences | Misc\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Opening CD track %d from %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CD track %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Opening CD track..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Error loading CD track\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Selecting tracks"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "layout errors"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Close _Window"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Clear _Errors"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Delete affected layouts"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Resume"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2675,27 +2747,27 @@
 "Paused\n"
 "(click Resume to continue processing)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "paused..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pause"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "resumed..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Keep"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "Enough"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2707,28 +2779,28 @@
 "(click Keep to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr "Stop"
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Selected frame"
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr "_Save frame as..."
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr "Audio is ahead of video by %.4f secs at frame %d, with fps %.4f\n"
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2742,7 +2814,7 @@
 "Please send a patch to get it working on other platforms.\n"
 "\n"
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2754,7 +2826,7 @@
 "You must install \"xwininfo\" before you can use this feature\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2762,7 +2834,7 @@
 "\n"
 "Record time must be greater than 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2776,11 +2848,11 @@
 "Click 'Cancel' to cancel\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "External window was released.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2788,7 +2860,7 @@
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2803,19 +2875,19 @@
 "Stop or 'q' to finish.\n"
 "(Default of %.3f frames per second will be used.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES was unable to capture this window. Sorry.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Export Selected Audio as..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Export Audio as..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2829,81 +2901,86 @@
 "Click 'OK' to export at the new speed, or 'Cancel' to export at the original "
 "rate.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exporting audio frames %d to %d as %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exporting audio as %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exporting audio"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Appending audio file %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Appending audio"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Append Audio"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Trimming audio from %.2f to %.2f seconds..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Trimming/Padding audio"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Trim/Pad Audio"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Fading audio in"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Fade audio in"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Fading audio out"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Fade audio out"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s over %.1f seconds..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s from time %.2f seconds to %.2f seconds..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Fading audio..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2913,667 +2990,636 @@
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Deleting all audio..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Deleting audio from %.2f to %.2f seconds..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Deleting Audio"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Delete Audio"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Record new audio"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserting silence from %.2f to %.2f seconds..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Inserting Silence"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Couldn't find pixmap file: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Merge"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Align _Starts"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Align _Ends"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "What to do with extra clipboard frames -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Insert Frames"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Drop Frames"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Number of Times to Loop Clipboard"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Loop Clipboard to Fit Selection"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Transition Method:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Merging clipboard with selection..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "inserting %d extra frame(s) before merge\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "now inserting %d extra frame(s)\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Merge done.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr "_Custom Generators"
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Custom Effects"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "Custom _Utilities"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_File"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Open File/Directory"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr "O_pen Part of File..."
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Open _Location/Stream..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr "Open _Youtube Clip..."
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr "Import from _dvd/vcd..."
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr "Import from _dvd"
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr "Import from _vcd"
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr "_Import from Firewire"
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Import from _Firewire Device (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Import from _Firewire Device (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr "_Add Webcam/TV card..."
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr "Add _Unicap Device"
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr "Add Live _Firewire Device"
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr "Add _TV Device"
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Recent Files..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_Reload Clip Set..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Close/Sa_ve All Clips"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "_Encode Clip As..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Encode _Selection As..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Close This Clip"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Backup Clip as .lv1..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Restore Clip from .lv1..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Encode/Load/Backup _with Sound"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "Auto load subtitles"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Clean _up Diskspace"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK mode"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copy Selection"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Cu_t Selection"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Insert from Clipboard..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Paste as _New"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Merge Clipboard with Selection..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Delete Selection"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Decouple _Video from Audio"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Select..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Select _All Frames"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "_Start Frame Only"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_End Frame Only"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Select from _First Frame"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Select to _Last Frame"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Select Last Insertion/_Merge"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Select Last _Effect"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Invert Selection"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_Lock Selection Width"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Play"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Play All"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Pla_y Selection"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Play _Clipboard"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Re_wind"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Full Screen"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Double Size"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Play in _Separate Window"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Blank Background"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Auto)_loop Video (to fit audio track)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "L_oop Continuously"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong Loops"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Mute"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Separate Window 'S_ticky' Mode"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "S_how Frame Counter"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "Show Subtitles"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr "Letterbox mode"
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Effect_s"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Effects are applied to the current selection."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Run Test Rendered Effect/Tool/Generator..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Tools"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Tools are applied to complete clips."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Reverse Clipboard"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Change Playback/Save Speed..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Resample _Video to New Frame Rate..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilities"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Generate"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Custom _Tools"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Generate"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Loading rendered effect plugins..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr "Load _Subtitles from File..."
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr "Erase subtitles"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Capture _External Window... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferences..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Load _New Audio for Clip..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Load _CD Track..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "E_ject CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Record E_xternal Audio..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "to New _Clip..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "to _Selection"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Fade Audio _In..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Fade Audio _Out..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Export Audio..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Export _Selected Audio..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Export _All Audio..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Append Audio..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Trim/Pad Audio..."
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Trim/Pad Audio to _Selection"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Trim/Pad Audio from Beginning to _Play Start"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Delete Audio..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Delete _Selected Audio"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Delete _All Audio"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Insert _Silence in Selection"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Resample Audio..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Play _Music Using xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Random Music _Using xmms..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Stop xmms _Playing"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Show Clip _Info"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Show/_Edit File Comments"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Show _Clipboard Info"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Show _Messages"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Show _Layout Errors"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Clips"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Rename Current Clip in Menu..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "A_dvanced"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Effects/Tools/Utilities"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_New Test RFX Script..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copy RFX Script to Test..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Edit Test RFX Script..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "Rena_me Test RFX Script..."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Delete Test RFX Script..."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promote Test Rendered Effect/Tool/Generator..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Import Custom RFX script..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_xport Custom RFX script..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "De_lete Custom RFX Script..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Re_build all RFX plugins"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Receive _LiVES stream from..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Send LiVES stream to..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Open _yuv4mpeg stream on %sstream.yuv..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Import Project (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xport Project (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Real Time _Effect Mapping"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Bind real time effects to ctrl-number keys."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Set Real Time Effect _Defaults"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Set default parameter values for real time effects."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Save Real Time Effect _Defaults"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3581,145 +3627,145 @@
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Reset all playback speeds and positions"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/joystick interface"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/joystick learner..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_Save device mapping..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_Load device mapping..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Show VJ _Keys"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "To_ys"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_None"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr "_Autolives"
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_Mad Frames"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (broadband)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Help"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manual (opens in browser)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Donate to the project !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Email the author"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Report a _bug"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Suggest a _feature"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Assist with _translating"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Troubleshoot"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_About"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Rewind to start (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Play all (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Stop playback (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Play selection (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Audio volume (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Unblank background (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Play slower (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Play faster (ctrl-up)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Skip back (ctrl-left)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Skip forward (ctrl-right)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Show clip info (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Hide this toolbar"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3728,161 +3774,161 @@
 "to stop."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Video playback speed (frames per second)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Vary the video speed"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "First Frame"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Last Frame"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "The first selected frame in this clip"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "The last selected frame in this clip"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Starting...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Frame number to preview"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Free"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Free choice of frame number"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Start"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "Frame number is linked to start frame"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_End"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "Frame number is linked to end frame"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Pointer"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "Frame number is linked to playback pointer"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Rewind"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Play all"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Play Selection"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Start _recording"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Stop _recording"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "_Record Performance"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Hide Play Window"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Show Play Window"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f EB"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f PB"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f TB"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f MB"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f KiB"
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr "%d bytes"
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Clearing the clipboard"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3893,7 +3939,7 @@
 "==============================\n"
 "Switched to clip %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3903,11 +3949,11 @@
 "==============================\n"
 "Switched to empty clip\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(blank)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3916,7 +3962,7 @@
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3925,7 +3971,7 @@
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3934,7 +3980,7 @@
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3943,7 +3989,7 @@
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3952,7 +3998,7 @@
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3961,7 +4007,7 @@
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3970,7 +4016,7 @@
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3979,7 +4025,7 @@
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3988,7 +4034,7 @@
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3999,7 +4045,7 @@
 "cannot be opened, as it is in use\n"
 "by another copy of LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -4010,7 +4056,7 @@
 "The set %s is currently in use by another copy of LiVES.\n"
 "Please choose another set name.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -4018,7 +4064,7 @@
 "\n"
 "Set names may not be blank.\n"
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
@@ -4026,7 +4072,7 @@
 "\n"
 "Set names may not be longer than 128 characters.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -4035,7 +4081,7 @@
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
@@ -4043,7 +4089,7 @@
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4054,68 +4100,68 @@
 "The set %s already exists.\n"
 "Please choose another set name.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Removing layout %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [opening...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sec]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Undefined)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(No video)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(No audio)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [opening...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Left Audio [opening...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Left Audio [%.2f sec]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Right Audio [opening...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Right Audio [%.2f sec]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES cannot switch to mplayer whilst clips are loading."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Cleaning up clip"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4130,53 +4176,64 @@
 "\n"
 "Overwrite ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Undo %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Redo %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Selection------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sec ] ----------Selection---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Examining file header"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Opening %s start time %.2f sec. frames %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " without sound"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Opening audio for %s"
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4195,11 +4252,11 @@
 "\n"
 "Are you sure you wish to continue ?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - please be patient."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4211,7 +4268,7 @@
 "LiVES was unable to extract either video or audio.\n"
 "Please check the terminal window for more details.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4221,7 +4278,7 @@
 "\n"
 "You may need to install mplayer to open this file.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4233,29 +4290,29 @@
 "Please check the setting of Video open command in\n"
 "Tools|Preferences|Decoding\n"
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr "Adding image..."
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Subtitles were saved as %s\n"
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr "LiVES: Save Frame %d as..."
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr "LiVES: Save Frame as..."
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: Save Clip as..."
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4267,33 +4324,29 @@
 "\n"
 "Do you still wish to continue ?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "selection"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Linking selection"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (with no sound)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Saving [can take a long time]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4303,33 +4356,33 @@
 "\n"
 "Encoder error - output file was not created !\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr "Clearing letterbox..."
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr "File size was %s\n"
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "recording aborted by preview.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "recording aborted by clipboard playback.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Recording performance..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Average FPS was %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4343,16 +4396,16 @@
 "You should click on Tools--->Resize All\n"
 "and resize all frames to the current size.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Untitled%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4363,7 +4416,7 @@
 "Error getting file info for clip %s.\n"
 "Bad things may happen with this clip.\n"
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4374,12 +4427,12 @@
 "Playback speed not found or invalid ! Using default fps of %.3f fps. \n"
 "Default can be set in Tools | Preferences | Misc.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4388,7 +4441,7 @@
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4397,49 +4450,44 @@
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s none\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d channel(s) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comment: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Saving frame %d as %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Backing up %s to %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Backing up"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "performance data was backed up..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restoring %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Restoring"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4453,22 +4501,22 @@
 "LiVES was unable to restore it.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "rec %.2f MB"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!rec %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr "rec ?? MB"
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4479,7 +4527,7 @@
 "RECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %ld GB !\n"
 "Record stop level can be set in Preferences.\n"
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4489,59 +4537,59 @@
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Recovering files"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Recovering files..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Show affected _layouts"
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr "_Recover disk space"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr " _Advanced Settings >>"
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Warning !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "warning"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr "LiVES: - Question"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr "question"
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr "LiVES: - File Error"
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr "File Error"
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr "_Abort"
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr "_Retry"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4558,7 +4606,7 @@
 "\n"
 "(Disk warning levels can be configured in Preferences.)"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4577,11 +4625,11 @@
 "(Next warning will be shown at %s. Disk warning levels can be configured in "
 "Preferences.)"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Audio players cannot be switched during playback."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4593,20 +4641,18 @@
 "LiVES was unable to perform this operation due to unsufficient memory.\n"
 "Please try closing some other applications first.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr "Processing has been paused."
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% done. Time remaining: %u sec\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4615,7 +4661,7 @@
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4624,7 +4670,7 @@
 "\n"
 "%d/%d frames opened.\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4633,7 +4679,7 @@
 "\n"
 "%d frames opened.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4642,7 +4688,7 @@
 "\n"
 "Time remaining: %d sec"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4653,7 +4699,7 @@
 "Sorry, LiVES can only open %d files at once.\n"
 "Please close a file and then try again."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4672,7 +4718,7 @@
 "\n"
 "Please make sure you can write to this directory."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4682,7 +4728,7 @@
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4694,7 +4740,7 @@
 "This encoder/format cannot use the requested audio codec.\n"
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4702,7 +4748,7 @@
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4710,7 +4756,7 @@
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4721,7 +4767,7 @@
 "\n"
 "Due to restrictions in the %s format\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4729,43 +4775,43 @@
 "LiVES recommends the following settings:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", signed"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", unsigned"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "Use an audio rate of %d Hz%s%s\n"
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Set video rate to %.3f frames per second\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Set video rate to %d:%d frames per second\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Set video size to %d x %d pixels\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4773,35 +4819,35 @@
 "\n"
 "You may wish to:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "resize video to %d x %d pixels\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "disable audio, since the target encoder cannot encode audio\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES must:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr "resample audio to %d Hz%s%s\n"
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "resample video to %.3f frames per second\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "resample video to %d:%d frames per second\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4815,7 +4861,7 @@
 "Click `OK` to proceed, `Cancel` to abort.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4825,7 +4871,7 @@
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4839,7 +4885,7 @@
 "memory available.\n"
 "Try recording for just a selection of the file."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4857,7 +4903,7 @@
 "\n"
 "Please press Cancel to abort the insert, or OK to continue."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4871,11 +4917,11 @@
 "You should only click OK if you understand what you are doing, otherwise, "
 "click Cancel."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Show Keys"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4955,11 +5001,11 @@
 "d                             double size\n"
 "g                             ping pong loops\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Multitrack Keys"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4999,19 +5045,18 @@
 "\n"
 "For other keys, see the menus.\n"
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Message History"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -5019,16 +5064,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES could not find any rendered effect plugins.\n"
-"Please make sure you have them installed in\n"
-"%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5038,11 +5077,11 @@
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "failed (unknown type)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
@@ -5052,7 +5091,7 @@
 "Do you wish to remove the layout files associated with this set?\n"
 "(They will not be usable without the set).\n"
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -5065,7 +5104,7 @@
 "Click OK to add the current clips and layouts to the existing set.\n"
 "Click Cancel to pick a new name.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5077,7 +5116,7 @@
 "Are you sure you wish to continue ?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5089,7 +5128,7 @@
 "Are you sure you wish to continue ?\n"
 "."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -5106,7 +5145,7 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise, click 'Cancel' to skip loading this file.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5121,7 +5160,7 @@
 "%s\n"
 "The clip could not be loaded.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5133,7 +5172,7 @@
 "Please check your ~/.jackdrc file and remove this option if present.\n"
 "Alternately, select a different audio player in Preferences.\n"
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5147,7 +5186,7 @@
 "and also that the soundcard is not in use by another program.\n"
 "Automatic jack startup will be disabled now.\n"
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5155,7 +5194,7 @@
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES.\n"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5172,7 +5211,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5180,7 +5219,7 @@
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5195,7 +5234,7 @@
 "You can increase the value in Preferences/Multitrack.\n"
 "It is recommended to increase it to at least %d MB"
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -5208,7 +5247,7 @@
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5220,7 +5259,7 @@
 "Either close some other applications, or reduce the undo memory\n"
 "using Preferences/Multitrack/Undo Memory\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5232,7 +5271,7 @@
 "You may need to increase the undo memory\n"
 "using Preferences/Multitrack/Undo Memory\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5240,19 +5279,19 @@
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "or enter a smaller value.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Try again from the clip editor, try closing some other applications\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Try closing some other applications\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5260,13 +5299,13 @@
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5276,7 +5315,7 @@
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5286,7 +5325,7 @@
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5294,7 +5333,7 @@
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5304,7 +5343,7 @@
 "\n"
 "Audio rate must be greater than 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5316,7 +5355,7 @@
 "and may take a long time to display.\n"
 "Are you sure you wish to view it ?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5326,7 +5365,7 @@
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5340,19 +5379,19 @@
 "the \"jack\" or the \"pulse audio\" audio player.\n"
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "Video playback plugin failed to initialise palette !\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Decoder plugin failed to initialise palette !\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Unable to set framerate of video plugin\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5360,7 +5399,7 @@
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5373,33 +5412,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "cancelled.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "failed.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "done.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "error in file. Failed.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "Additional info: %s\n"
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr "The error value was %d%s\n"
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -5414,7 +5453,7 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -5429,7 +5468,7 @@
 "Please check for possible error causes.\n"
 "%s"
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -5444,7 +5483,7 @@
 "Please check for possible error causes.\n"
 "%s"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -5457,7 +5496,7 @@
 "%s\n"
 "Please check for possible error causes.\n"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -5472,7 +5511,7 @@
 "The error was\n"
 "%s.\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5485,7 +5524,7 @@
 "%s\n"
 "Please check for possible error causes.\n"
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5500,12 +5539,12 @@
 "The error was\n"
 "%s.\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr "Value for \"%s\" could not be read."
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5518,7 +5557,7 @@
 "%s\n"
 "Please check your system for errors.\n"
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5531,7 +5570,7 @@
 "%s\n"
 "Please check the file permissions and try again."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5544,7 +5583,15 @@
 "%s\n"
 "Please check the directory permissions and try again."
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5554,7 +5601,7 @@
 "Abort and exit immediately from LiVES\n"
 "Are you sure?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5565,7 +5612,7 @@
 "The %s cannot encode clips with image type %s.\n"
 "Please select another encoder from the list.\n"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5573,7 +5620,7 @@
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5588,7 +5635,7 @@
 "- Check if this device is in use by another program.\n"
 "- Check if the device actually exists.\n"
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5598,7 +5645,7 @@
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5606,7 +5653,7 @@
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5616,7 +5663,7 @@
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5629,7 +5676,7 @@
 "Click 'Cancel' to set another file name\n"
 "or 'OK' to continue and save as type \"%s\"\n"
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5639,7 +5686,7 @@
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5655,7 +5702,7 @@
 "You are strongly advised to close the other copy, before clicking 'OK' to "
 "continue."
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5663,7 +5710,7 @@
 "\n"
 "No video input devices could be found.\n"
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5671,7 +5718,7 @@
 "\n"
 "All video input devices are already in use.\n"
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5683,7 +5730,7 @@
 "CLEANING AND COPYING FILES. THIS MAY TAKE SOME TIME.\n"
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5693,7 +5740,7 @@
 "Please check the spelling of the set name and try again.\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5711,7 +5758,7 @@
 "File -> Clean up Diskspace\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5724,7 +5771,7 @@
 "Welcome to LiVES version %s !\n"
 "\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
@@ -5734,7 +5781,7 @@
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
@@ -5742,7 +5789,7 @@
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -5752,7 +5799,7 @@
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -5762,7 +5809,7 @@
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5775,197 +5822,244 @@
 "to let other applications connect to it.\n"
 "Do you wish to allow this (for this session only) ?\n"
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generator"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Generators"
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr "Data generator"
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr "Data Generators"
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "transition"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transitions"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "effect"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Effects"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "utility"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilities"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Compositors"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Taps"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "splitter"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Splitters"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "converter"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Converters"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr "analyser"
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr "Analysers"
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "audio/video"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Audio/Video Transitions"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "video only"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Video only Transitions"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "audio only"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Audio only Transitions"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Audio Mixers"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Audio Effects"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "audio volume controller"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Audio Volume Controllers"
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr "video analyser"
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr "Video analysers"
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr "audio analyser"
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr "Audio Analysers"
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "unknown"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s all frames..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s clipboard into frames %d to %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s to clipboard..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s to new clip..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s frames %d to %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s clipboard with selection"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s to clipboard"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s to new clip"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s frames %d to %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5973,17 +6067,46 @@
 "\n"
 "No frames were generated.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Error: plugin %s has no weed_setup() function.\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr "No usable filters found in plugin %s\n"
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5992,130 +6115,310 @@
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr "Some plugin directories"
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Successfully loaded %d Weed filters\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Failed to start instance %s, error code %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Unable to start generator %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Failed to start generator %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Failed to start generator %s, error %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr "%s [unstable] (%s)"
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "You can click in Preview to change these values"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Reset Values"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Frame"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Maintain aspect ratio of original frame"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Maintain _Aspect Ratio"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Select file"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Maintain aspect ratio of original frame"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr "Display Password"
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "Transition _In"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Transition in"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "Crossfade audio"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "Check the box to make audio transition with the video"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "Crossfade audio"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Transition _Out"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Transition out"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "Target _FPS (plugin may override this)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : size"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "New size (pixels)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Width"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Height"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Generate to _Clipboard"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Generate frames to the clipboard"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Generate to _New Clip"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Generate frames to a new clip"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -6126,59 +6429,59 @@
 "You must select at least %d frames to use this effect.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Set as default"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr "Reset"
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Close _window"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "No parameters"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Invalid parameter"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Select Colour"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Click to set the colour"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr "_Red"
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "The red value (0 - 255)"
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr "_Green"
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "The green value (0 - 255)"
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr "_Blue"
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "The blue value (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -6187,12 +6490,12 @@
 "\n"
 "Plugin error: %s failed with code %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : message was %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6207,17 +6510,17 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Updating video playback plugin defaults in %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Loading video playback plugin defaults from %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6232,32 +6535,32 @@
 " Tools|Preferences|Playback|Playback Plugins Advanced\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr "Saving playback plugin defaults to %s..."
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Fixed framerate for plugin.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Fixed framerate for plugin.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "_Colourspace"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Colourspace input to the plugin.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr "Save settings to an alternate file.\n"
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6270,16 +6573,7 @@
 "Failed to open playback plugin %s\n"
 "Error was %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6294,7 +6588,16 @@
 "is missing a mandatory function.\n"
 "Unable to use it.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6304,7 +6607,7 @@
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6313,30 +6616,26 @@
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr "Audio stream unable to use preferred format '%s'\n"
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr "Using '%s' format instead.\n"
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVES was unable to find its encoder plugins. Please make sure you have the "
-"plugins installed in\n"
-"%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6349,11 +6648,11 @@
 "%s%s%s\n"
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Unable to resize, please install imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6366,7 +6665,7 @@
 "Failed to open decoder plugin %s\n"
 "Error was %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6381,187 +6680,171 @@
 "is missing a mandatory function.\n"
 "Unable to use it.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/unknown"
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr "LiVES: - Decoder Plugins"
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr "Enabled Video Decoders (uncheck to disable)"
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Failed to load %s, transitions may not resize.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s advanced settings"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - New Test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Edit Test RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Type:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Effect -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transition -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generator -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Tool -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utility -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Name:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "The name of the plugin. No spaces allowed."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Version:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "The script version."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Author:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "The script author."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (optional):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL for the plugin maintainer."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menu text:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "The text to show in the menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Action description:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Describe what the plugin is doing. E.g. \"Edge detecting\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Minimum frames:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Requirements..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Enter any binaries required by the plugin."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Properties..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Set properties for the plugin. Optional."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parameters..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Set up parameters used in pre/loop/post/trigger code. Optional."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Parameter _Window Hints..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Set hints about how to lay out the parameter window. Optional."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Language for pre/loop/post/triggers. Optional."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "_Pre loop code..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Code to be executed before the loop. Optional."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "_Loop code..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Loop code to be applied to each frame."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "_Post loop code..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Code to be executed after the loop. Optional."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "_Trigger code..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6569,7 +6852,7 @@
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6584,55 +6867,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX Requirements"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parameters"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX Parameter Window Hints"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX Triggers"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_New Entry"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Edit Entry"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Remove Entry"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Move _Up"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Move _Down"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX Properties"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "_Slow (hint to GUI)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "_Batch mode generator"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6646,7 +6929,7 @@
 "Please remove the trigger first.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6658,27 +6941,27 @@
 "Some triggers were adjusted.\n"
 "Please check the trigger code.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - New RFX Parameter"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Edit RFX Parameter"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Name:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Name of the parameter, must be unique in the plugin."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Label:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6686,171 +6969,159 @@
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "Button _Group: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "A non-zero value can be used to group radio buttons."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Type:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Parameter type (select from list)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Decimal _places: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "_Default value:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_Default: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "Button _Group: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "A non-zero value can be used to group radio buttons."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "_Minimum value: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Ma_ximum value: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     _Step size:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Whether the value wraps max->min and min->max."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Set _values"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Default value:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Minimum value: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Maximum value: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Default _Red:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Default _Green:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Default _Blue: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "Set _default"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Default value:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Maximum length (chars): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - New RFX Parameter Window Hint"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Edit RFX Parameter Window Hint"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Keyword:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Special Type:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Special Subtype:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
+
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Row:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Linked parameters (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Linked parameters (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Linked parameters (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - New RFX Trigger"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Edit RFX Trigger"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "When:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Pre Loop Code"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Loop Code"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Post Loop Code"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Default text (max length %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Enter values, one per line"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6860,7 +7131,7 @@
 "\n"
 "Name must not be blank.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6870,7 +7141,7 @@
 "\n"
 "Name must not contain spaces.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6880,7 +7151,7 @@
 "\n"
 "Menu text must not be blank.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6890,7 +7161,7 @@
 "\n"
 "Action description must not be blank.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6900,7 +7171,7 @@
 "\n"
 "Author must not be blank.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6912,7 +7183,7 @@
 "There is already a plugin with this name.\n"
 "Name must be unique.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6922,7 +7193,7 @@
 "\n"
 "Loop code should not be blank.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6932,7 +7203,7 @@
 "\n"
 "Trigger code should not be blank for a utility.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6942,7 +7213,7 @@
 "\n"
 "Parameter name must not be blank.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6956,41 +7227,41 @@
 "plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Writing script file %s..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "No <define> section found in script.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Bad script version.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "No <name> section found in script.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "No <version> section found in script.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "No <author> section found in script.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "No <description> section found in script.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Bad description. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -7005,27 +7276,27 @@
 "found in script.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Rebuilding all RFX scripts...builtin..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Rebuilding scripts"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "custom..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "rebuilding dynamic menu entries..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -7038,7 +7309,7 @@
 "LiVES was unable to find the program %s.\n"
 "Please check this program is in your path and executable.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -7053,12 +7324,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Deleting rfx script %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -7073,7 +7344,7 @@
 "%s\n"
 "Error code was %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -7088,12 +7359,12 @@
 "already exists.\n"
 "Please delete it first, or rename the test script.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promoting rfx test plugin %s to custom..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -7101,29 +7372,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Failed to move the plugin script from\n"
-"%s to\n"
-"%s\n"
-"Return code was %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Import Script from..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copying %s to %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -7138,55 +7403,43 @@
 "already exists.\n"
 "Please delete it first, or rename the import script.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Builtin"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Custom"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Test"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copy RFX Script"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Rename test RFX Script"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "From script: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFX Script name"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Script name: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "New name: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "New script name: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7198,27 +7451,44 @@
 "There is already a test script with this name.\n"
 "Script name must be unique.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renaming RFX test script %s to %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Apply Real Time Effects to Selection"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Loading rendered effect %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7230,7 +7500,7 @@
 "Video playback plugins are only activated in\n"
 "full screen, separate window (fs) mode\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7242,7 +7512,7 @@
 "\n"
 "(Free space = UNKNOWN)"
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -7255,40 +7525,35 @@
 "\n"
 "(Free space = %s)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"The temp directory is LiVES working directory where opened clips and sets "
-"are stored.\n"
-"It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
 "Unable to create or write to the new temporary directory.\n"
-"You may need to create it as the root user first, e.g:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7308,7 +7573,7 @@
 "Alternatively, press Cancel to restore the temporary directory to its "
 "original setting."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7318,7 +7583,7 @@
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7326,7 +7591,7 @@
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7338,67 +7603,67 @@
 "pulseaudio must be installed first.\n"
 "See http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (highest quality; largest files)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferences"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Open file selection maximised"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Show recent files in the File menu"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Stop screensaver on playback    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Open main window maximised"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Show toolbar when background is blanked"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Allow mouse wheel to switch clips"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr "Shrink previews to fit in interface"
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Startup mode:"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "_Clip editor"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "_Multitrack mode"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Multi-head support"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " monitor number for LiVES interface"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " monitor number for playback"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7406,230 +7671,246 @@
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Force single monitor"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "When entering Multitrack mode:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Prompt me for width, height, fps and audio settings"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_Always use the following values:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Use these same _values for rendering a new clip"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Width           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Height      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr "          _FPS"
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Enable backing audio track"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Audio track per video track"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Undo buffer size (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Exit multitrack mode after rendering"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Auto backup layouts"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Every"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "seconds"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "After every _change"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Never"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Multitrack/Render"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Use instant opening when possible"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr "Enable instant opening of some file types using decoder plugins"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Video open command             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Open/render compression                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
+
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr " %     ( lower = slower, larger files; for jpeg, higher quality )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr "(Check Help/Troubleshoot to see which image formats are supported)"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Enable automatic deinterlacing when possible"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Automatically deinterlace frames when a plugin suggests it"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr "Ignore blank borders when possible"
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr "Clip any blank borders from frames where possible"
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "When opening multiple files, concatenate images into one clip"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Decoding"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr "The preview quality for video playback - affects resizing"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Preview _quality"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Low - can improve performance on slower machines"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normal - recommended for most users"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "High - can improve quality on very fast machines"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Preview _quality"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr "The preview quality for video playback - affects resizing"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Show FPS statistics"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr "Stream audio"
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr "Stream audio to playback plugin"
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Player"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr "(See also the Jack Integration tab for jack startup options)"
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "Audio play _command"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- internal -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "Audio follows video _rate/direction"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "Audio follows _clip switches"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Playback"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7637,69 +7918,68 @@
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      What to record when 'r' is pressed   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "_Frame changes"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "F_PS changes"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "_Real time effects"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "_Clip switches"
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_Internal Audio (requires jack or pulse audio player)"
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr "Pause recording if free disk space falls below:"
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Recording"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Output format"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Audio codec"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Use _antialiasing when resizing"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Number of _real time effect keys"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7707,80 +7987,95 @@
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr "Use _threads where possible when applying effects"
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr "Number of _threads"
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Video load directory (default)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Video save directory (default) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Audio load directory (default) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Image directory (default) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Backup/Restore directory (default) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Temp directory (do not remove) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "The default directory for loading video clips from"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "The default directory for saving encoded clips to"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "The default directory for loading and saving audio"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "The default directory for saving frameshots to"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr "The default directory for backing up/restoring single clips"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "LiVES working directory."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Directories"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr "Warn if diskspace falls below: "
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr " MB [set to 0 to disable]"
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr "Diskspace critical level: "
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7788,19 +8083,19 @@
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Warn on Open if file _size exceeds "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Show a warning before saving a se_t"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
@@ -7808,65 +8103,65 @@
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "Show a warning if no _rendered effects are found at startup."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Show a warning if no _encoder plugins are found at startup."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Show a warning if a _duplicate set name is entered."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "When a set is loaded, warn if clips are missing from _layouts."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Warn if a clip used in a layout is about to be closed."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Warn if frames used in a layout are about to be deleted."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Warn if frames used in a layout are about to be shifted."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Warn if frames used in a layout are about to be altered."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Warn if audio used in a layout is about to be deleted."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Warn if audio used in a layout is about to be shifted."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Warn if audio used in a layout is about to be altered."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr "Popup layout errors after clip changes."
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "Warn if the layout has not been saved when leaving multitrack mode."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7874,115 +8169,103 @@
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Show info message after importing from firewire device."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Show a warning before opening a yuv4mpeg stream (advanced)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "Show a warning when multitrack is low on backup space."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr "Show a warning advising cleaning of disk space after a crash."
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr "Show a warning if unable to connect to pulseaudio player."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Warnings"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi synch (requires the files midistart and midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "When inserting/merging frames:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Speed Up/Slow Down Insertion"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Resample Insertion"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pause xmms during audio playback"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD device           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Choose CD device"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES can load audio tracks from this CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "Default FPS        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Frames per second to use when none is specified"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Misc"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "New theme:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Themes"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Download bandwidth (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "OMC remote control enabled"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Start OMC on startup"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Streaming/Networking"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Jack transport"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7990,47 +8273,43 @@
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Jack _transport config file"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "The name of the jack server which can control LiVES transport"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Start _server on LiVES startup"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr "Jack transport _master (start and stop)"
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr "Jack transport _client (start and stop)"
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr "Jack transport sets start position"
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr "Jack transport timebase slave"
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr "(See also Playback -> Audio follows video rate/direction)"
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Jack audio"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "LiVES must be compiled with jack/jack.h present to use jack audio"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8038,84 +8317,71 @@
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Jack _audio server config file"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "The name of the jack server for audio"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr "Play audio even when transport is _paused"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Jack Integration"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Events to respond to:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "_Joystick events"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Joystick device"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "The joystick device, e.g. /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Choose joystick device"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "_MIDI events"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr "Create an ALSA MIDI port which other MIDI devices can be connected to"
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Use _ALSA MIDI (recommended)"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr "Create an ALSA MIDI port which other MIDI devices can be connected to"
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "Use _raw MIDI"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Read directly from the MIDI device"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_MIDI device"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "The MIDI device, e.g. /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Choose MIDI device"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Advanced"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "MIDI check _rate"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8123,24 +8389,23 @@
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "MIDI repeat"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Number of non-reads allowed between succesive reads."
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(Warning: setting this value too high can slow down playback.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "MIDI/Joystick learner"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8152,7 +8417,7 @@
 "take effect.\n"
 "Click OK to continue.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
@@ -8160,63 +8425,63 @@
 "For the directory change to take effect, LiVES will restart when the "
 "Preferences dialogue closes."
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Theme changes will not take effect until the next time you start LiVES."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Jack options will not take effect until the next time you start LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Syncing to external framerate of %.8f frames per second.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Cannot initialise OSC receiver\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "WARNING: Cannot start OSC server at UDP port %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Started OSC server at UDP port %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Cannot start OSC/UDP server at port %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Resizing frames 1 to %d"
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr "Resizing/letterboxing frames 1 to %d"
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Resize"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Resample/Resize"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Length of video is now %d frames.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8226,154 +8491,146 @@
 "\n"
 "New rate must be greater than 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Resampling audio"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES was unable to resample the audio as requested.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Resample Audio"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Audio was resampled to %d Hz, %d channels, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resampling video at %.8f frames per second..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Resampling video at %.3f frames per second..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Reordering error !\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Resample"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Resample Audio"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Insert Silence"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - New Clip Audio"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - External Clip Settings"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Rate (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Channels "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Sample Size "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
+
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Signed"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Current"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Enable audio"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Channels "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Channels "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    _Sample Size "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "New"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Frames Per Second "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Record for maximum:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " hours  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minutes  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " seconds  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Unlimited"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Click OK to begin recording, or Cancel to quit."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Change playback speed"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Resample Video"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8390,7 +8647,7 @@
 "Please enter the desired playback speed\n"
 "in _frames per second"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8407,15 +8664,15 @@
 "Please enter the _resampled rate\n"
 "in frames per second"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OR enter the desired clip length in _seconds"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Change the _audio speed as well"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8425,7 +8682,7 @@
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8435,7 +8692,7 @@
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
@@ -8445,7 +8702,7 @@
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
@@ -8455,33 +8712,33 @@
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Speed Change"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Changed playback speed to %.3f frames per second.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Resampling video"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Resampling clipboard video"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Reordering frames"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8491,20 +8748,20 @@
 "\n"
 "LiVES was unable to reorder the frames."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Deordering frames"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "resampling error..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8520,7 +8777,7 @@
 "Are you sure ?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8532,12 +8789,12 @@
 "Click 'OK' to save this keymap as your default\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Saving keymap to %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8546,7 +8803,7 @@
 "\n"
 "Updating keymap file %s..."
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -8561,12 +8818,12 @@
 "%s\n"
 "Error was %s\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Saving real time effect defaults to %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8581,22 +8838,22 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Loading real time effect defaults from %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Loading generator default sizes from %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Loading default keymap from %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8611,27 +8868,27 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Invalid line %d in %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Invalid key %d in %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Invalid effect %s in %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr "Unknown effect %s in %s\n"
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8640,16 +8897,21 @@
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Too many effects bound to key %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "update required.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8661,40 +8923,45 @@
 "Some effects could not be located.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "No Description"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Information for %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Effect name: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Plugin name: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Author: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Version: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Description: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8708,65 +8975,69 @@
 "generators on the same key.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES could not locate the effect %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Real time effect mapping"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Key grab"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Key active"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Key grab"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "Grab keyboard for this effect key"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Clear all effects"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Mode active"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Set Parameters"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Clear"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Effect name:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Save as default keymap"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_Load default keymap"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8818,11 +9089,6 @@
 msgid "none\n"
 msgstr "none\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d channel(s) %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8842,58 +9108,58 @@
 msgid "TV card %d"
 msgstr "TV card %d"
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "Opened TV card %d (%s)"
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewire card %d"
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "Opened firewire card %d"
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "Auto backup"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Backing audio"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Current track: %s (layer %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Current track: Backing audio\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Current track: Layer %d audio\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f sec.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Source: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Right click for context menu.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -8901,7 +9167,7 @@
 "Double click on a block\n"
 "to select it."
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8915,7 +9181,7 @@
 "in the timeline by\n"
 "right or double clicking on it.\n"
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8927,7 +9193,7 @@
 "No effect selected.\n"
 "Select an effect in FX stack first, to view its parameters.\n"
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8937,7 +9203,7 @@
 "\n"
 "No clips loaded.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8953,7 +9219,7 @@
 "Alternately, you can enable Autotransitions from the Effects menu,\n"
 "before inserting clips into the timeline."
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8967,12 +9233,12 @@
 "and a time region\n"
 "to apply compositors.\n"
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f sec. to %.2f sec.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8980,182 +9246,186 @@
 "Single click on timeline\n"
 "to select a frame.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr "%s [unstable]"
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+"You can click and drag\n"
+"below the timeline"
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "to select a time region.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Selected clip"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "_Adjust start and end points"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr "_Edit/encode in clip editor"
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "_Show clip information"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "_Close this clip"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Audio mixer (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "Single click on timeline"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "to select a frame."
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr "Double click or right click on timeline"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "to select a block."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "Clips can be dragged"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "onto the timeline."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "Mouse mode is: Move"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "clips can be moved around."
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "Mouse mode is: Select."
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "Drag with mouse on timeline"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "to select tracks and time."
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "_Insert mode: Normal"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Mouse mode: Move"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Mouse mode: Select"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "_Gravity: Normal"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "_Gravity: Left"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "_Gravity: Right"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr "Close _last gap(s) in selected tracks/time"
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Close _first gap(s) in selected tracks/time"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Close gaps"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Move block"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Move audio block"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Delete block"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Delete audio block"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Split tracks"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Split block"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Apply %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Delete %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Insert block"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Insert gap"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Insert audio block"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Effect order change"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "unsigned "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "signed "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "big endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "little endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9164,15 +9434,15 @@
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "invalid event list. Failed.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "event list has invalid fps. Failed.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -9187,7 +9457,7 @@
 "close the current set,\n"
 "then load in the new set from the File menu.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -9198,330 +9468,358 @@
 "This has an invalid number of audio channels (%d) for LiVES.\n"
 "It cannot be loaded.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr "Layout was wiped.\n"
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Clips"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr "In/out"
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr "FX stack"
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Params."
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Open..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "O_pen File Selection..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Import Selection from _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Import Selection from _dvd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Import Selection from _vcd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Import from Device"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "_Close the selected clip"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Save layout as..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Load layout..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Wipe/Delete layout..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignore width, height and audio values from loaded layouts"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr "Auto load _subtitles with clips"
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_CLIP EDITOR"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "_Adjust selected clip start/end points"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Insert selected clip"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_Insert selected clip audio"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Delete selected block"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_Jump to previous block boundary"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_Jump to next block boundary"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Clear _marks from timeline"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Ignore selection limits when inserting"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "_Play from Timeline Position"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr "Pla_y selected time only"
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Move effects with blocks"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr "Select _autotransition effect..."
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "View/_Edit selected effect"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Delete selected effect"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Apply effect to _block..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Apply effect to _region..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Tracks"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Make _Backing Audio current track"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Add Video Track at _Rear"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Add Video Track at _Front"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "_Split current track at cursor"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_Split selected video tracks"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Insert gap in selected tracks/time"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Insert gap in current track/selected time"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Close all _gaps in selected tracks/time"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Se_lection"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Select Current Track"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Select _all video tracks"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "Select _no video tracks"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Select all _time"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Select from _zero time"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Select to _end time"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Timecode to region start"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Timecode to region end"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "_Region start to timecode"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "_Region end to timecode"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Change width, height and audio values..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Render"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Render all to new clip"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Render _video"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Render _audio"
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr "_Normalise rendered audio"
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "_Pre-render audio"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_View"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Block _In/out points"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Effects at current"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Audio parameters"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Show backing _audio track"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Compact view"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Maximum tracks to display..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Scroll to follow playback"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Centre on cursor"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Zoom in"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Zoom out"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "Multitrack _details"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "_Event Window"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "_Event Window (selected time only)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_Show FRAME events"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Show multitrack keys"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Mouse mode: _Move"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Mouse mode: _Select"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "Insert mode: _Normal"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Insert with _audio"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 "Select whether video clips are inserted and moved with their audio or not"
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "Select _overlap"
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
@@ -9529,103 +9827,83 @@
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "Select _overlap"
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Expanded View (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Compact View (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "Gravity: _Normal"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "Gravity: _Left"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "Gravity: _Right"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Clips"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr "In/out"
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr "FX stack"
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Params."
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Apply"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Time"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Del. node"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "_Next node"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "_Prev node"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "_Reverse playback  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Velocity  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Anchor the start point to the timeline"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "Anchor _start"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Anchor the start point to the timeline"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Start frame"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Anchor the end point to the timeline"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "Anchor _end"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Anchor the end point to the timeline"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "End frame"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9635,91 +9913,91 @@
 "==============================\n"
 "Switched to Clip Edit mode\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Timeline (seconds)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Backing audio"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Layer %d audio"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "Show/hide audio details"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Layer %d audio"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (layer %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Select track"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Show/hide audio"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (layer %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Selected effect"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_View/Edit this effect"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_View this effect"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Delete this effect"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "Cannot insert after this effect"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "This effect cannot be moved"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d to %d selected  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sec."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d frames"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9729,19 +10007,19 @@
 "==============================\n"
 "Switched to Multitrack mode\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr "Drag the time slider to where you"
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "want to set effect parameters"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Set parameters, then click \"Apply\"\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9751,46 +10029,46 @@
 "have been set.\n"
 "Nodes can be deleted."
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "Effect has no parameters.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s output"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "layer %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "audio track"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s to %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "_Prev filter map"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Insert _before"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Insert _after"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "_Next filter map"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9802,7 +10080,7 @@
 "No effects at current track,\n"
 "current time.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -9812,7 +10090,7 @@
 "on the timeline\n"
 "to apply it to the selected region."
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -9822,7 +10100,7 @@
 "on the timeline\n"
 "to apply it to the selected region."
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -9830,64 +10108,60 @@
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Selected block/frame"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Select this block"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Split block here"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "List _effects here"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Adjust %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Delete this block"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Insert here"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Insert audio here"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Inserted gap in selected tracks from time %.4f to %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Inserted gap in track %s from time %.4f to %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Undid %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Redid %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Multitrack details"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9895,56 +10169,62 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "track %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "tracks %s and %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "selected tracks"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Added %s %s to %s from %.4f to %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Added effect %s to track %s from %.4f to %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "rendered %d frames to new clip.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Cleaning up..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pause"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pause (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Press 'm' during playback"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "to make a mark on the timeline"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9953,14 +10233,14 @@
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9969,7 +10249,7 @@
 "Time region %.3f to %.3f\n"
 "selected.\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9977,12 +10257,12 @@
 "select one or more tracks\n"
 "to create a region.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d video tracks selected.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9990,7 +10270,7 @@
 "Double click on timeline\n"
 "to deselect time region."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9998,7 +10278,7 @@
 "Single click on an effect\n"
 "to select it."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10006,7 +10286,7 @@
 "Double click on an effect\n"
 "to edit it."
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10014,7 +10294,7 @@
 "Right click on an effect\n"
 "for context menu.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10022,7 +10302,7 @@
 "Effect order can be changed at\n"
 "FILTER MAPS"
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -10030,27 +10310,15 @@
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "or INSERT AFTER buttons to move it."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-"You can click and drag\n"
-"below the timeline"
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "to select a time region.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "Click on another effect,"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10058,46 +10326,46 @@
 "and the selected one\n"
 "will be inserted"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "after it.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "before it.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Removed parameter values for effect %s at time %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Set parameter values for %s %s on %s at time %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Autoreload each time"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Saved layout to %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "clips and frames"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "clips"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "frames"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10105,7 +10373,7 @@
 "\n"
 "Auto reload layout.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -10116,11 +10384,11 @@
 "Some %s are missing from the layout%s\n"
 "Therefore it could not be loaded properly.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "auto backup"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -10129,43 +10397,43 @@
 "\n"
 "Unable to load layout file %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Loading layout from %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Got %d events...processing..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Checking and rebuilding event list"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d errors detected.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps set to %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack audio mixer"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Reset values"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Close mixer"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10173,35 +10441,35 @@
 "_Invert backing audio\n"
 "and layer volumes"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "Adjust backing and layer audio values so that they sum to 1.0"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "_Gang layer audio"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Adjust all layer audio values to the same value"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACK server started\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Unable to connect to JACK server.\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Started jack audio subsystem.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Started jack audio reader.\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
@@ -10209,7 +10477,7 @@
 "\n"
 "Connection to jack audio was reset.\n"
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10221,7 +10489,7 @@
 "Falling back to sox audio player.\n"
 "You can change this in Preferences/Playback.\n"
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10233,7 +10501,7 @@
 "Falling back to mplayer audio player.\n"
 "You can change this in Preferences/Playback.\n"
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10241,11 +10509,11 @@
 "\n"
 "Unable to connect to pulse audio server.\n"
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES will exit and you can choose another audio player.\n"
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -10253,113 +10521,113 @@
 "\n"
 "Connection to pulse audio was reset.\n"
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "unclamped"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "clamped"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Responding to joystick events from %s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr "Creating ALSA seq port..."
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Responding to MIDI events from %s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "data"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocity"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "note"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "value"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "state"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "Vars."
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "MIDI ch %d note on"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "MIDI ch %d note off"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "MIDI ch %d controller %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "MIDI ch %d pitch bend"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "MIDI ch %d pgm change"
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "Joystick button %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Joystick axis %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "range"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* scale"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10367,200 +10635,208 @@
 "\n"
 "Click OK to delete all entries\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMC learner"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "Clear _unmatched"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Delete all"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Start video playback"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Stop video playback"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "Clip select <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Switch foreground clip to the nth valid clip"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Play forwards"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Play video in a forwards direction"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Play backwards"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Play video in a backwards direction"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Reverse playback direction"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Reverse direction of video playback"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Play video faster"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Play video at a slightly faster rate"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Play video slower"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Play video at a slightly slower rate"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "Toggle video freeze"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Freeze video, or if already frozen, unfreeze it"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "Set video framerate to <fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Set framerate of foreground clip to <float fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Start recording"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Stop recording"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "Toggle recording state"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "Swap foreground and background clips"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Reset effect keys"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "Switch all effects off."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "Enable effect key <key>"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "Disable effect key <key>"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "Toggle effect key <key>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Set parameter value <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Set <value> of pth (numerical) parameter for effect key <key>."
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "Switch foreground to next clip"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "Switch foreground to previous clip"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Set video framerate to ratio <fps_ratio>"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr "Set framerate ratio of foreground clip to <float fps_ratio>"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "Retrigger clip <clipnum>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr "Cycle to next mode for effect key <key>"
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "Cycle to previous mode for effect key <key>"
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "key"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Saving device mapping to file %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10573,7 +10849,7 @@
 "Error parsing file\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10586,12 +10862,12 @@
 "Invalid version in file\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Loading device mapping from file %s..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10817,9 +11093,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Fade _out"
 
-#~ msgid "Fade video in or out"
-#~ msgstr "Fade video in or out"
-
 #~ msgid "Fade"
 #~ msgstr "Fade"
 
@@ -11321,9 +11594,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "_Top left is clipboard"
 
-#~ msgid "_Top"
-#~ msgstr "_Top"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "_Vertical segments"
 
@@ -11549,6 +11819,16 @@
 #~ msgid "Unable to locate the program $rfx_builder_multi"
 #~ msgstr "Unable to locate the program $rfx_builder_multi"
 
+#, fuzzy
+#~ msgid ""
+#~ "You can work around this by switching to jpeg output in Preferences/"
+#~ "Decoding."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Image decoding type has been switched to jpeg. You can revert this in "
+#~ "Preferences/Decoding.    \n"
+
 #~ msgid "This does not appear to be a valid video or image file"
 #~ msgstr "This does not appear to be a valid video or image file"
 
@@ -11582,14 +11862,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "You must set the CD device first in Preferences."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LiVES could not find enough tracks fitting your request."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Try again with different values."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name failed:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
+
+#~ msgid "Default value:    "
+#~ msgstr "Default value:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "Minimum value: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "Maximum value: "

LiVES-1.6.1.tar.bz2/po/es.po -> LiVES-2.0.3.tar.bz2/po/es.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-11-06 20:39+0000\n"
-"Last-Translator: Fitoschido <fitoschido@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
-"X-Generator: Launchpad (build 14381)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +34,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr "%s Aviso: %s\n"
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr "%s Error crítico: %s\n"
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr "%s Error grave: %s\n"
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +63,7 @@
 "group_id=64341&atid=507139\n"
 "Gracias. Debería poder recuperar su sesión reiniciando LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -59,7 +75,7 @@
 "Cuando informe del problema, incluya detalles de su sistema operativo, "
 "distribución, y la versión de LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +83,7 @@
 "y la información mostrada debajo:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,163 +93,184 @@
 "información.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
-msgstr "Conjunto preservado.\n"
+msgstr "Preservando el conjunto.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos los cuadros"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Cualquiera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Ninguno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "desactivado"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**La disposición actual**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Integrado"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Personalizado"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Prueba"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tiempo real..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor PulseAudio..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Comprobando dependencias opcionales:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert... Detectado..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
-msgstr "convert... No Detectado"
+msgstr "convert... NO DETECTADO..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite... detectado..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
-msgstr "composite... No Detectado"
+msgstr "composite... NO DETECTADO..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox... detectado\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
-msgstr "sox... No Detectado\n"
+msgstr "sox... NO DETECTADO\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
-msgstr "cdda2wav... detectado"
+msgstr "cdda2wav... detectado..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NO DETECTADO..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd... detectado..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NO DETECTADO..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NO DETECTADO..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python... detectado..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python... NO DETECTADO..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab... detectado..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab... NO DETECTADO..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo... detectado..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo... NO DETECTADO..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -242,42 +279,68 @@
 msgstr ""
 "\n"
 "\n"
-"El explorador de archivos reporta como \"%s\"; "
+"El gestor de ventanas se reporta como «%s»; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Número de CPU detectados: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "El directorio temporal es %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
-"ATENCION - Esta versión de LiVES no ha sido\n"
-"compilada con soporte para jack ni pulse audio.\n"
-"No todas las opciones de audio estarán disponibles.\n"
+"AVISO - esta versión de LiVES se compiló sin compatibilidad\n"
+"para jack o pulse audio.\n"
+"No estarán disponibles muchas funciones de sonido.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilado con soporte para jack, ¡bien!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilado con soporte de audio pulse. ¡fantástico!\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -286,7 +349,7 @@
 "Bienvenido a LiVES versión %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -295,87 +358,86 @@
 "\n"
 "La sintaxis de inicio es: %s [opts] [nombredearchivo [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
-"Donde: nombredearchio es el nombre del archivo multimedia o a un archivo de "
-"respaldo.\n"
+"Donde: nombredearchivo es el nombre de un archivo multimedia o de respaldo.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
-msgstr "start_time: comienzo del archivo multimedia en segundos\n"
+msgstr "tiempo_inicio: tiempo de inicio del nombre de archivo en segundos\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
-msgstr "frames: número máximo de frames a abrir\n"
+msgstr "cuadros: número máximo de cuadros a abrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "los opcionales pueden ser:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "help: muestra este texto de ayuda y sale\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <nombredeset>: autocarga un clip set nombredeset\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset: no carga ningún ser al iniciar\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover: fuerza la no restauración post crash\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover: fuerza la recuperación post crash\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui: no muestra la interfaz gráfica\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : no mostrar la pantalla de inicio\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : no mostrar la ventana de reproducción\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : inicia en modo editor de copiado.\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : inicia en modo multipista.\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <puerto>: inicia la escucha OSC en el puerto UDP <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart: no inicia la escucha OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -383,15 +445,15 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -402,29 +464,29 @@
 "maestro, 4 = iniciar servidor de transporte de jack, 8 = pausar audio cuando "
 "vídeo sea pausado, 16 = inicar servidor de audio jack] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-mapadispositivos <nombremapa>  : autocargar mapadispositivos\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-depurar: trata de errores de depuración (requiere 'gdb' instalado)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Iniciando GUI..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -432,26 +494,27 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 "\n"
 "\n"
-"El tema que ha seleccionado no puede ser encontrado. Por favor, que tiene "
-"los temas instalados en\n"
+"No se pudo encontrar el tema que solicitó. Asegúrese de que tiene instalados "
+"los temas en\n"
 "%s/%s.\n"
+"(Quizá necesite cambiar el valor de <prefix_dir> en su archivo %s)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 "\n"
-"LiVES no fue capaz de escribir un pequeño archivo en /tmp\n"
-"Por favor, asegúrese que tiene permisos de acceso a /tmp e inténtelo "
-"nuevamente.\n"
+"LiVES no pudo crear un archivo pequeño en %s\n"
+"Asegúrese de que tiene acceso de escritura a %s e inténtelo de nuevo.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -465,55 +528,37 @@
 "Por favor, lea el archivo README que viene con este paquete\n"
 "antes de iniciar LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de leer su archivo de configuración desde\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo e inténtelo nuevamente.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES fue incapaz de usar el directorio temporal.\n"
-"%s\n"
-"\n"
-"Por favor, fíjese en la configuración de <tempdir> en \n"
-"%s/.lives\n"
-"y vuelva a intentar.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -521,10 +566,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES no pudo capturar esta imagen\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -542,7 +585,7 @@
 "\n"
 "Gracias.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -552,7 +595,14 @@
 "LiVES requiere actualmente de 'mplayer' o 'sox' para funcionar. Por favor, "
 "instale alguno de ellos, e intente nuevamente.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -562,7 +612,7 @@
 "LiVES no pudo encontrar 'mplayer'. Puede que usted desee instalar mplayer "
 "para usar LiVES de manera más completa.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -572,7 +622,7 @@
 "LiVES no pudo encontrar 'convert'. Debe instalar convert e image-magick si "
 "desea utilizar efectos de renderizado.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -582,7 +632,7 @@
 "LiVES no pudo encontrar 'composite'. Debe instalar composite e image-magick "
 "si desea utilizar la función fusionar.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -592,7 +642,7 @@
 "LiVES no pudo encontrar 'sox'. Puede que lgunas características de audio no "
 "funcionen. Debe instalar 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -600,68 +650,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES fue incapaz de encontrar un plugin codificador.\n"
-"Por favor, asegurese que los haya instalado correctamente en\n"
-"%s%s%s/\n"
-"No será capaz de 'Guardar' sin ellos.\n"
-"Puede que necesite cambiar el valor de <lib_dir> en ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Autocargando conjunto %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
-msgstr ""
+msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Reproductor de audio no válido %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%d Sintítulo> %dx%d : %d cuadros %d bpp %.3f cps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? cuadros ??? bpp %.3f cps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cuadros %d bpp %.3f cps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No hay archivo>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -669,35 +713,35 @@
 "LiVES no pudo capturar esta imagen\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Archivo %s cerrado\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Audio izquierda"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Audio derecha"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -712,27 +756,12 @@
 "Por favor, ajuste las opciones de reproducción en Preferencias e intente "
 "nuevamente.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Ventana de reproducción"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Ventana de reproducción"
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -740,14 +769,9 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"Ya existe un directorio con el nombre\n"
-"%s.\n"
-"¿Quiere utilizar este directorio?\n"
-"\n"
-"(Espacio libre = %.2f GB)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -755,14 +779,9 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"Ya existe un directorio con el nombre\n"
-"%s.\n"
-"¿Quiere utilizar este directorio?\n"
-"\n"
-"(Espacio libre = %.2f GB)\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -771,13 +790,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"¿Crear el directorio\n"
-"%s\n"
-"?\n"
-"\n"
-"(Espacio libre = %.2f GB)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -786,11 +800,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "¡El nombre del directorio es demasiado largo!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -798,14 +812,14 @@
 "LiVES FALLO AL INICIAR EL REPRODUCTOR DE AUDIO SELECCIONADO!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr "Antes de iniciar LiVES, necesita escoger un reproductor de audio."
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -813,7 +827,7 @@
 ", pero esta versión de LiVES no fue compilada con soporte para pulse audio.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -824,11 +838,11 @@
 "LiVES\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio es recomendado para usuarios profesionales"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -836,7 +850,7 @@
 ", pero esta versión de LiVES no fue compilada con soporte para jack audio\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -846,7 +860,7 @@
 "primero antes de ejecutar LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -858,11 +872,11 @@
 "reproductor de audio en su lugar.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX puede utilizarse si ninguno de los sistemas  anteriores trabajan, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -870,7 +884,7 @@
 "pero algunas características de audio se desactivarán.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -880,7 +894,7 @@
 "Se recomienda instalarlo antes de ejecutar LiVES\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -889,92 +903,92 @@
 "prueba.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Seleccione un reproductor de audio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Usar reproductor _pulse audio"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Utilizar el reproductor de audio _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Usar reproductor _sox audio"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Usar reproductor _mplayer audio"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Ignorado"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Correcto"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Fallido"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Configuración de prueba"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Resolución de problemas"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES ahora ejecutará algunas pruebas básicas de configuración\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Comprobando la presencia de «sox»"
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Debería instalar sox para poder utilizar todas las características de audio "
 "en LiVES"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Verificando si sox puede convertir audio"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
-msgstr ""
+msgstr "No se pudo escribir en: %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "Debería instalar sox_fmt_all o similares"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Comprobando la presencia de «mplayer»"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -982,43 +996,51 @@
 "Debería instalar mplayer para poder utilizar todas las opciones de "
 "decodificación en LiVES"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Comprobando si mplayer puede convertir audio"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Debería instalar  mplayer con soporte pcm/wav"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Comprobando si mplayer puede descodificar a png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Tal vez desee actualizar mplayer a una versión nueva"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Comprobando si mplayer puede descodificar a jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Debería instalar mplayer con otro soporte de png/alpha o jpeg"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Tal vez desee añadir soporte de salida jpeg a mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Verificando la presencia de «convert»"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Instale imageMagick para poder usar todos los efectos renderizados"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1030,7 +1052,7 @@
 "    Pulse Cancelar para salir e instalar cualquier componente faltante, o "
 "Siguiente para continuar    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1040,7 +1062,7 @@
 "\n"
 "Finalmente, puede elegir la interfaz de inicio por defecto para LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1051,7 +1073,7 @@
 "LiVES tiene dos interfaces principales y puede iniciar con cualquiera de "
 "ellas.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1061,79 +1083,78 @@
 "\n"
 "Lo predeterminado siempre puede cambiarse después en Preferencias.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Elija la interfaz de inicio"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
-#, fuzzy
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
-msgstr "Esta es la mejor elección para tareas simples de edición o para  VJs\n"
+msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "Inicie en modo _multipista"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Esta es una mejor opción para tareas de edición complejas que impliquen "
 "varios clips.\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Permitir a LiVES elegir la extensión _file"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr "Permitir a LiVES establecer la e_xtensión de archivo (.%s)"
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Aplicar desentrelazado"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Si esto se elige, los cuadros serán desentrelazados mientras son importados."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Previsualización"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clic aquí para _Preview cualquier archivo de audio, imagen o video "
 "seleccionado."
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clic aquí para _Preview cualquier archivo de audio seleccionado"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Clic aquí para _Preview el vídeo"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Procesando..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1147,8 +1168,8 @@
 "\n"
 "¡Recuerde desactivar los efectos (ctrl-0) después!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1156,105 +1177,114 @@
 "\n"
 "Por favor, espere."
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Mostrar detalles"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Suficiente"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Previsualizar"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Pau_sa"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formatear"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Tamaño del fotograma"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Tamaño de archivo"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Tamaño de byte"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Tiempo total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "CPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Fotogramas"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Tasa/tamaño"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Audio derecho"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opciones de codificación"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Guardar _mis configuraciones"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Utilizar las configuraciones _recomendadas"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1262,76 +1292,75 @@
 "_No mostrar esta alerta nunca más\n"
 "(puede restaurarse desde Preferencias/Alertas)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Mostrar _detalles"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Cerrar Ventana"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Guardar en archivo"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insertar"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Número de veces a insertar"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Insertar para ajustarse al audio"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Insertar _antes de la selección"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Insertar el portapapeles antes de los cuadros seleccionados"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Insertar _luego de la selección"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Insertar el portapapeles luego de los cuadros seleccionados"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Insertar _con sonido"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Insert _sin sonido"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "Abrir seleccion"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Selección tiempo de inicio (seg)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Número de cuadros a abrir"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Lugar"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LIVES: Renombrar Clip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1348,7 +1377,7 @@
 "Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1357,48 +1386,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "No enviar información de ancho de banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Intente esta configuración si está teniendo problemas al obtener un stream"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LIVES: Renombrar Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Introduzca el Nombre"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Elija un directorio de trabajo"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1410,7 +1454,7 @@
 "Por favor, ingrese el nombre de set que desee utilizar.\n"
 "LiVES le recomendará guardar el set de clips cuando intente salir.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1419,7 +1463,7 @@
 "clip.\n"
 "Este será el utilizado para el nombre del proyecto.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1430,244 +1474,200 @@
 "instalación inicial de forma que obtenga el máximo rendimiento de esta "
 "aplicación.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"Primero que todo necesita escoger un directorio de trabajo para LiVES.\n"
-"Este debería ser un directorio con abundante espacio libre disponible.\n"
-"Note que en muchos sistemas el contenido de /tmp es borrado al apagar, por "
-"lo que puede ser desaconsejable crearlo en /tmp.\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LIVES: Renombrar Clip"
 
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Introduzca el Nombre"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Introduzca el Nombre"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Elija un directorio de trabajo"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nuevo Nombre "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Seleccione el nombre "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "Usar p_redeterminados"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- Seleccionar dispositivo de entrada"
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr "Seleccione dispositivo de entrada:"
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LIVES:- Carga una pista del CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LIVES:- Seleccione el Titulo/Capitulo del DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LIVES:- Seleccione el Titulo del VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Cambiar el Máximo de Pistas Visibles"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Detalles del dispositivo"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Pistas a cargar (de %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Título de DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Título de VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de pistas a mostrar"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Dispositivo: /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Dispositivo: fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Cápitulo  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "Ingresar número"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "Usar el ancho, altura y FPS por defecto"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Anchura"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Altura"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Controlador"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Formato de Salida"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Audio Fade In"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Audio Fade Out"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Finalizó el fade in  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "primero"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Finalizó el fade out  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "segundos"
 
-#: src/interface.c:2948
-msgid "selection."
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr "selección"
 
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Reproducir música al azar"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Número de pistas solicitadas:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Directorio:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Incluir los subdirectorios"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Tamaño mínimo de archivo (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Tamaño máximo de archivo (MB)        "
-
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentarios de archivo (opcional)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Título/Nombre: "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentarios : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr "Guardar _subtítulos a archivo"
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "Archivo de subtítulos"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "Examinar..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: selecciona un directorio"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: selecciona un archivo"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Desechar/Guardar"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1677,7 +1677,7 @@
 "La disposición actual no ha sido guardada.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1687,7 +1687,7 @@
 "La disposición actual se ha modificado desde el último resguardo.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1697,7 +1697,7 @@
 "El set de clips actual no ha sido guardado.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1705,7 +1705,7 @@
 "El set de clips actual no ha sido guardado.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1713,62 +1713,62 @@
 "La disposición actual no ha sido guardada.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Nombre de set de clips"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Auto carga la próxima vez"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Limpiar disposiciones"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorar cambios"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Borrar set de clips"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Borrar disposiciones"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Guardar disposiciones"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Guardar set de clips"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recuperar el diseño?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1778,76 +1778,69 @@
 "LiVES ha detectado un proyecto multipista de una sesión anterior.\n"
 "¿Te gustaría intentar recuperarlo?\n"
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Opciones de codificación"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Restablecer valores"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Guardando como set %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Seleccione archivo"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Autocargando conjunto %s..."
+msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir un pequeño archivo en /tmp\n"
-"Por favor, asegúrese que tiene permisos de acceso a /tmp e inténtelo "
-"nuevamente.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Este archivo"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1855,7 +1848,7 @@
 ",\n"
 " - incluir la interfaz actial - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1865,7 +1858,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1875,14 +1868,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1890,7 +1883,7 @@
 "\n"
 "Archivo de proyecto inválido.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1911,33 +1904,33 @@
 "set, o descártelo.\n"
 "Una vez que haya hecho esto, podrá importar el nuevo proyecto.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importando el proyecto %s como set %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Iportando proyecto"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportando proyecto como %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportando proyecto"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Restaurar archivo .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Resguardar como archivo .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Restaurar archivo .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1949,91 +1942,91 @@
 "El set será borrado del disco.\n"
 "¿Está seguro?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Borrando set..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Borrando set..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Borrando set"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "El set %s ha sido borrado definitivamente del disco.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Insertar Silencio"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Deshaciendo"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Restaurando audio..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Limpiando imagenes de cuadro"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Borrando cuadros sobrantes"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "La longitud del video es ahora de %d cuadros a %.3f cuadros por segundo.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "El portapapeles fue resampleado a %d cuadros.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Rehaciendo"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Copiando cuadros %d a %d%s al portapapeles"
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Tomando cuadros del clip"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Copiando al portapapeles"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Pegando"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "...audio añadido..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2044,7 +2037,7 @@
 "Por favor instale el \"convertidor\" en el paquete de imagen magica y, a "
 "continuación, reinicie LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2058,7 +2051,7 @@
 "Intente seleccionar todos los fotogramas, y luego use \n"
 "la función 'Cortar Audio'  desde el menu de Audio"
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2066,7 +2059,7 @@
 "LiVES no puede insertar porque las tasas de audio no coinciden.\n"
 "Por favor instale 'sox', y vuelva a intentarlo."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2076,7 +2069,7 @@
 "La inserción cambiará el audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2086,11 +2079,11 @@
 "La inserción cambiará el audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Reconvirtiendo el audio"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2102,7 +2095,7 @@
 "LIVES no puede reconvertir el portapapeles del audio seleccionado.\n"
 "La selección de audio será borrrada\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2115,30 +2108,30 @@
 "LIVES no pudo reconvertir el portapapeles de audio.\n"
 "¿Desea continuar con la inserción del audio no convertido?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Insertando %d%s fotogramas desde el portapapeles..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Insertando"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Insertando %d veces desde el portapapeles%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Insertando %d fotogramas desde el portapapeles%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2148,7 +2141,7 @@
 "La eliminación de todos los fotogramas cerrará este archivo.\n"
 "¿Está seguro?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2158,8 +2151,8 @@
 "La eliminación causará la pérdida de fotogramas en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2169,7 +2162,7 @@
 "La eliminación causará la pérdida de audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2180,7 +2173,7 @@
 "multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2190,20 +2183,20 @@
 "La eliminación causará el cambio del audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Eliminando fotogramas %d a %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Eliminando"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2213,7 +2206,7 @@
 "\n"
 "La selección está bloqueada.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2225,11 +2218,11 @@
 "(Para cancelar, pulse 'r' o haga clic en Reproducir | Grabar Sesión antes de "
 "empezar la reproducción.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Grabación cancelada.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2242,7 +2235,7 @@
 "El '% s' informe del plugin:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2255,7 +2248,7 @@
 "No se puede encontrar el  el método 'init' en el % s plugin.\n"
 "El plug-in puede estar roto o no instalado correctamente."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2268,22 +2261,22 @@
 "\n"
 "Por favor, pulse \"Cancelar\" en caso que no sea lo que usted desea.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Guardando la selección% s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Cargando clips desde la selección%s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d clips fueron recuperados desde el conjunto (%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2295,41 +2288,37 @@
 "corriendo en esta máquina.\n"
 "Haga clic en Aceptar para continuar.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Limpiando espacio en el disco..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Limpiando espacio en el disco"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d MB de espacio en el disco fueron recuperados.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Reestablecimiento de tipos de frame y valores de frame..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Externo: %s\n"
-"Interno: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "almacenado"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2337,7 +2326,7 @@
 "\n"
 "  Abriendo..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2346,7 +2335,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2355,7 +2344,7 @@
 "\n"
 "(%d decodificado)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2364,7 +2353,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2372,23 +2361,23 @@
 "\n"
 "  Desconocido"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "no firmado"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "firmado"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2397,7 +2386,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2414,12 +2403,29 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Un editor de vídeo y programa VJ."
 
-#: src/callbacks.c:5668
-#, fuzzy, c-format
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n"
+"  Bruno https://launchpad.net/~brunoy\n"
+"  Dante Díaz https://launchpad.net/~dante\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Odzs https://launchpad.net/~nicobranca\n"
+"  Paco Molinero https://launchpad.net/~franciscomol\n"
+"  karlinux https://launchpad.net/~carlosmolines\n"
+"  nitrofurano https://launchpad.net/~nitrofurano-3t"
+
+#: src/callbacks.c:5786
+#, c-format
 msgid ""
 "LiVES Version %s\n"
 "(c) G. Finch (salsaman) %s\n"
@@ -2431,18 +2437,8 @@
 "salsaman@gmail.com\n"
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
-"LiVES versión %s\n"
-"(c) G. Finch (salsaman) %s\n"
-"\n"
-"Publicado bajo la licencia GPL 3 o posterior (http://www.gnu.org/licenses/"
-"gpl.txt)\n"
-"LiVES se distribuye SIN NINGUNA GARANTÍA\n"
-"\n"
-"Contacte al autor en:\n"
-"salsaman@xs4all.nl\n"
-"Sitio web: http://lives.sourceforge.net"
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2452,14 +2448,14 @@
 "\n"
 "Necesita instalar mplayer para poder previsualizar este archivo.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2471,171 +2467,182 @@
 "multipista.\n"
 "¿Está seguro de continuar?"
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Abriendo audio % s, tipo % s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Abriendo audio"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Cancelando"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Nuevo audio: %d Hz %d canal(es)  % d bps.\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Procesando audio"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nuevo Sonido"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "¡%d fotogramas son suficientes !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Codificar la salida del depurador"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Reproducción en pantalla completa (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Apagar reproducción en pantalla completa (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Tamaño doble (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Tamaño simple (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Ocultar la ventana de reporducción (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Mostrar la ventana de reproducción (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Reproduci en una ventana separada (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr "LiVES: - Streaming"
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Apagar el bucle continuo"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Encender el bucle continuo"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volimen del audio (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Desactivar silencio de audio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Activar silencio de audio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Invertir el portapapeles..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Invertir el portapapeles"
 
-#: src/callbacks.c:7893
-#, fuzzy
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
-msgstr "Cargar _subtítulos desde archivo..."
+msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Cargado el archivo de subtítulos: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "Los subtítulos se han eliminado.\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Seleccionar fichero de audio"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Por favor, configure su dispositivo de reproducción de CD en Herramientas | "
 "Preferencias | Varios\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Abriendo la pista del CD %d desde %s"
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Pista del CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Abriendo la pista del CD..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Error cargando la pista del CD\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Seleccionando pistas"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "errores de diseño"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Cerrar_Ventana"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Borrar_Errores"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Borrar Diseños Afectados"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Reanudar"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2645,27 +2652,27 @@
 "Pausado\n"
 "(pulse Reanudar para continuar el proceso)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pausado..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "resumido..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Conservar"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "Suficiente"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2677,30 +2684,28 @@
 "(Presiona Conservar para conservar lo que tienes y parar)\n"
 "(Presiona Reanudar para continuar el proceso)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Detener"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Guardar Frame como %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2709,7 +2714,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2721,7 +2726,7 @@
 "Debes instalar \"xwininfo\" antes de poder usar esta característica\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2729,7 +2734,7 @@
 "\n"
 "El tiempo de grabación debe ser mayor a 0\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2740,11 +2745,11 @@
 "capturar una ventana independiente\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Fue liberada una Ventana Externa\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2752,7 +2757,7 @@
 "Click en una ventana para relizar una captura\n"
 "Presione 'q' para detener la grabación"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2767,19 +2772,19 @@
 "Parar o 'q' para detener.\n"
 "( Se usará la frecuencia predeterminada de %.3f cuadros por segundo.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES no pudo capturar esta ventana. Disculpe.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Exportar el Audio Seleccionado como..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Exportar el Audio como..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2793,81 +2798,86 @@
 "Presione 'OK' para exportar con la nueva velocidad, o 'Cancelar' para "
 "exportar a la velocidad original.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportando los cuadros de audio %d a %d como %s"
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportando el audio como %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportando el audio"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Incluyendo Archivo de Audio"
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Incluyendo archivo de audio %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Adjuntando audio"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Añadir audio"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Recortando el audio desde el segundo %.2f hasta el segundo %.2f..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Recortando/Rellenando audio"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Recortar/Rellenar Audio"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Aumentando el volúmen de audio"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Fundido entrada de audio"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Fundiendo salida de audio"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Fundido de salida de audio"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s sobre %.1f segundos"
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s de tiempo %.2f segundos a %.2f segundos..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Desvaneciendo audio..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2877,669 +2887,638 @@
 "Borrar todo el audio cerrará el archivo.\n"
 "Está seguro ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Eliminando todo el audio..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "eliminando el audio desde el segundo %.2f hasta %.2f..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Eliminando el Audio"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Borrar Audio"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Grabar nuevo audio"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Insertando silencio desde el segundo %.2f al %.2f..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Insertando Silencio"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Borrar %d diseño(s)...esta seguro ?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "No se encontró el archivo pixmap (xpm): %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES:- Unir"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Unir Portapapeles [ %d Cuadros ] con la Selección [ %d Cuadros ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "Unir Portapapeles [ %d Cuadros (resampleado) con la Selección [ %d Cuadros ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Alineando _Comienzos"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Alineando _Finales"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Qué hacer con los cuadros extras en el portapapeles -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Insertar Cuadros"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Desechar Frames"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Repetir e_l portapapeles para ajustar la selección"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Método de Transición:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Uniendo el portapapeles con la selección..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "insertando %d cuadro(s) extra antes de unir\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "insertando ahora %d cuadro(s) extra\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Unión terminada.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr "Ge_neradores personalizados..."
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Efectos personalizados"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "_Utilidades personalizadas"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Abrir Archivo/Directorio"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr "A_brir parte de archivo..."
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Abrir _localización/flujo..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr "Importar desde _DVD/VCD..."
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr "Importar desde _DVD"
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr "Importar desde _VCD"
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr "_Importar desde Firewire"
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importar de _Dispositivo Firewire (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importar de _Dispositivo Firewire (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr "_Añadir cámara web/tarjeta de TV..."
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr "Añadir dispositivo _Unicap"
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Archivos Recientes..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Cerrar y Guardar todos los clips"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "_Codificar clip como..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Codificar _Selección Como..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Cerrar Este Clip"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Respaldar Clip como .lv1..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Recuperar Clip desde .lv1..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Codificar/Cargar/Respaldar _con Sonido"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "Cargar subtítulos automáticamente"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Liberar espacio en disco"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_modo MULTIPISTAS"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copiar Selección"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Cortar _Selección"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Insertar desde el Portapapeles"
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Pegar como _Nuevo"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Unir contenido del Portapapeles con la Selección..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Borrar la Selección"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Separar _Video del Audio"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Seleccionar _Todos los Cuadros"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "_Solo Primer Fotograma"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_Solo Ultimo Fotograma"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Seleccionar desde _Primer Cuadro"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Seleccionar al _Último Cuadro"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Seleccionar Última Inserción/_Unión"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Seleccionar Último _Efecto"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_Encadenar Selección Con"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Reproducir Todo"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "_Reproducir Selección"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Reproducir _Portapapeles"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "_Rebobinar"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Pantalla completa"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Duplicar el Tamaño"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Reproducir en _Ventana Independiente"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Fondo en Blanco"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Auto)_Repetir Video (Ajustar al track de audio)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Reproducir Continuamente"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Silenciar"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Separar Ventana Modo 'S_ticky'"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "_Mostrar Contador de Cuadros"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "Mostrar subtítulos"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "_Efectos"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Efectos aplicados a la selección actual"
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Cambiar velocidad de Reproducción/Guardar..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilidades"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Generar"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Herramien_tas personalizadas"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Generar"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Cargando agregados con efectos renderizados"
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr "Cargar _subtítulos desde archivo..."
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr "Eliminar subtítulos"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Capturar ventana _externa... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferencias..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Cargar _Nuevo Audio para Clip..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Cargar _Pista del CD..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "Expulsar CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Grabar _Audio Externo..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "a un Nuevo _Clip"
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "a la _selección"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Desvaneceer entrada de aud_io..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Desvanecer salida de audi_o..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Exportar Audio..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Exportar _Audio Seleccionado..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Exportar _Todo el Audio..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Añadir Audio"
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Eliminar Audio"
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Eliminar _Audio Seleccionado"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Eliminar _Todo el Audio"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Insertar _Silencio en la Selección"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Resamplear Audio..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Reproducir _Música con XMMS..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Música Aleatoria _En XMMS"
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Detener Reproducción con XMMS"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Información"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Mostrar Información del _Clip"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Mostrar/_Editar Comentarios del Archivo"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Mostrar _Información del Portapapeles"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Mostrar _Mensajes"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Clips"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renombrar el Clip Actual en el Menú..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Avanzado"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Efectos/Herramientas/Utilidades"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importar Script  RFX Personalizado"
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportar Script RFX Personalizado..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "Borrar Script RFX Persona_lizado..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Reconstruir todos los agregados RFX"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Recibir flujo _LiVES desde..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Enviar el flujo LiVES a..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Abrir el flujo yuv4mpeg en %sstream.yuv..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importar Proyecto (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportar proyecto (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Enlazar efectos de tiempo real a ctrl-teclas de números"
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "establecer Efecto en Tiempo Real _por defecto"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 "Establecer los valores por defecto de los parámetros para los Efectos en "
 "Tiempo Real."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Guardar los Efectos en Tiempo Real por defecto"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3547,309 +3526,309 @@
 "Guardar los Efectos en Tiempo Real por defecto de tal manera de recargarlos "
 "cada vez que use LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Resetear todas las velocidades y posiciones de reproducción"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
-"Resetear todas las posiciones de reproducción al cuadro 1, y resetear todas "
-"las tasas de reproducción de cuadros"
+"Restablecer todas las posiciones de reproducción al cuadro 1, y restablecer "
+"todas las velocidades de fotogramas de reproducción."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
-msgstr "_MIDI/joystick interfaz"
+msgstr "Interfaz _MIDI/joystick"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Mostrar _claves de VJ"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Herramientas"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
-msgstr ""
+msgstr "_LiVES TV (banda ancha)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
-msgstr "_Ayuda"
+msgstr "Ay_uda"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manual (se abre en el navegador)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Donar al Proyecto!"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Email al Autor"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Reportar un _fallo"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Sugerir una característica"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Rebobinar para empezar (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Reproducir todo (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Detener la Reproducción (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Reproducir la Selección (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volúmen"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Volumen de Audio (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Reproducción más Lenta (ctrl-abajo)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Reproducción más Rápida (ctrl-arriba)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Anterior (ctrl-izquierda)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Siguiente (ctrl-derecha)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Ocultar esta Barra"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Variar la velocidad del video"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Primer Frame"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Último Frame"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "el primer Frame seleccionado en este clip"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "el último Frame seleccionado en este clip"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Arrancando...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Presione 'q' para detener la grabación.  NO CUBRA LA VENTANA DE "
 "GRABACIÓN! !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Libre"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Inicio"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "Fin"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Retroceder"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Reproduce todo"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Reproducir Selección"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Repetir Si/No"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Comenzar a Grabar"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Detener Grabación"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "Grabar Performance"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Esconder Ventana de reproducción"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Mostrar ventana De Reproducción"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Limpiar Portapapeles"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3857,18 +3836,18 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3877,7 +3856,7 @@
 "El nombre del conjunto se ha cambiado de %s a %s. Los Diseños afectadas han "
 "sido actualizado en consecuencia\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3886,56 +3865,56 @@
 "El clip% s no se encuentra en este conjunto.\n"
 "Es requerido por las disposiciones siguientes:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3946,7 +3925,7 @@
 "No se pudo abrir, esta siendo usado\n"
 "por otra copia de LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3957,7 +3936,7 @@
 "El Set %s esta siendo usado por otra copia de LiVES.\n"
 "Por favor elige otro Set\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3965,16 +3944,13 @@
 "\n"
 "Los nombres de los Sets no pueden estar en blanco.\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"Los nombres de los Sets no pueden contener espacios o los caractéres%s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3983,13 +3959,13 @@
 "\n"
 "Los nombres de los Sets no pueden contener espacios o los caractéres%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4000,68 +3976,68 @@
 "El set %s ya existe.\n"
 "Escoje otro nombre.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [abriendo...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sec]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Indefinido)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(No video)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(No audio)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [Abriendo...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Audio Izquierdo [Abriendo...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Audio Izquierdo [%.2f sec]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Audio Derecho [Abriendo...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Audio Derecho [%.2f sec]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4076,53 +4052,64 @@
 "\n"
 "Sobreescribir ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Deshacer %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Rehacer %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Selección------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " seg ] ----------Selección---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Examinando cabeceras..."
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Abriendo %s start time %.2f sec. frames %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " Sin sounido"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Apertura de audio para %s"
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4134,11 +4121,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - Por favor sea Paciente"
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4150,7 +4137,7 @@
 "LiVES  es incapaz de extraer ya sea vídeo o audio.\n"
 "Por favor, consulte la ventana del terminal para más detalles.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4160,7 +4147,7 @@
 "\n"
 "Puede que necesite instalar MPlayer para abrir este archivo.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4168,32 +4155,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Desvaneciendo audio..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Guardar Frame como %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Guardar Frame como %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LIVES: Renombrar Clip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4201,33 +4185,29 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "selección"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (sin sonido)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4237,33 +4217,33 @@
 "\n"
 "error de codificación - archivo no creado!\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Tamaño de archivo"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "grabación abortada por la visualización.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "grabación abortada por la reproducción del portapapeles.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Grabando Performance..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "el promedio de FPS fue %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4277,16 +4257,16 @@
 "Debes cliquear en Herramientas--->Redimensinar todo\n"
 "y ajusta todos los cuadros al tamaño actual.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Sin título%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4294,7 +4274,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4302,68 +4282,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comentario: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Guardando cuadro %d como %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Creando respaldo  %s a %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Creando copia de respaldo"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restaurando %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Restaurando"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4377,22 +4352,22 @@
 "Imposible recuperarlo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4400,7 +4375,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4410,63 +4385,59 @@
 "Se encontraron archivos de una sesión previa.\n"
 "Desea intentar recobrarlos?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Recuperando archivos"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Limpiando espacio en el disco"
+msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Advertencia !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "advertencia"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Seleccionar Color"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Borrar_Errores"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Acerca de"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4477,7 +4448,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4489,11 +4460,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "El reproductor de audio no se puede cambiar durante la reproducción"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4505,46 +4476,46 @@
 "LiVES no pudo realizar esta operación debido a la insuficiencia de memoria.\n"
 "Por favor pruebe cerrando otras aplicaciónes.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4552,7 +4523,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4564,14 +4535,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4579,19 +4550,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4599,83 +4570,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4684,14 +4655,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4700,7 +4671,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4711,7 +4682,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4720,11 +4691,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4766,11 +4737,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4792,17 +4763,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Hirtorial de mensajes"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4810,28 +4782,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4840,7 +4812,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4848,7 +4820,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4856,7 +4828,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4867,7 +4839,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4877,7 +4849,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4885,7 +4857,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4894,13 +4866,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4911,7 +4883,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -4920,7 +4892,7 @@
 "Alternativamente puedes  cerrar y volver a abrir LiVES  y seleccionar otro "
 "reproductor de audio.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4930,7 +4902,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4939,7 +4911,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4947,7 +4919,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4955,63 +4927,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Pruebe cerrando otras aplicaciónes\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5019,7 +4991,7 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5029,7 +5001,7 @@
 "\n"
 "Debe instalar 'dvgrab' para usar esta función.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5038,25 +5010,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5065,34 +5037,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "Cancelado.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "fracasó.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "error en el archivo.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5100,15 +5072,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5116,15 +5082,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5132,29 +5092,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES no fue capaz de leer su archivo de configuración desde\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5162,29 +5111,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de leer su archivo de configuración desde\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5192,19 +5130,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5213,7 +5145,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5222,7 +5154,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5231,19 +5163,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"El set será borrado del disco.\n"
-"¿Está seguro?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5251,13 +5186,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5267,27 +5202,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5296,14 +5231,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5314,19 +5249,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5334,7 +5269,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5342,7 +5277,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5354,45 +5289,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Bienvenido a LiVES versión %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5401,202 +5334,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generador"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "generadores"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generador"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "generadores"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "transiciones"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transiciones"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efecto"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efectos"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "utilidad"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilidades"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "separador"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Separadores"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "conversor"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Conversores"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Transiciónes de Audio/Video"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Transición solo de video"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Transición solo de audio"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mezcladores de audio"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "control de volumen de audio"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Controles de volumen de audio"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "Reproducir vídeo rápido"
+msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "Parametros de Audio"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Parametros de Audio"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5604,148 +5579,356 @@
 "\n"
 "No se generaron cuadros\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Error: plugin %s has no weed_setup() function.\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Incluir los subdirectorios"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "A_ncho"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Altura"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5753,74 +5936,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Establecer como predeterminado"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "_Cerrar ventana"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Sin parametros"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Parámetro inválido"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Seleccionar Color"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Click para seleccionar colour"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Rehacer"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Valor de Rojo (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Verde"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Valor de Verde (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Azul"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Valor de Azul (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5830,17 +6010,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5850,32 +6030,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5884,14 +6064,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5901,40 +6074,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5943,11 +6123,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5956,7 +6136,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5966,192 +6146,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efecto -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transición -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generador -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Herramienta -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utilidad -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Nombre:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "El nombre del plugin no admite espacios"
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Versión:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Versión del script."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Autor del script"
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (opcional):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "El texto a mostrar en el menú."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Descripción:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Describe lo que el plugin hace. Por ejemplo, Edge \"detectar\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Requisitos..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parametros..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Código del idioma:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6161,55 +6325,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nueva Entrada"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "Bo_rrar Entrada"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Mover _Arriba"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Mover _Abajo"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6218,7 +6382,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6226,196 +6390,184 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6425,7 +6577,7 @@
 "\n"
 "El nombre no debe estar en blanco.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6435,28 +6587,28 @@
 "\n"
 "El nombre no debe contener espacios.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6464,28 +6616,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6494,41 +6646,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6538,27 +6690,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6567,7 +6719,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6577,12 +6729,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6592,7 +6744,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6602,12 +6754,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6615,23 +6767,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6641,55 +6793,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Integrado"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Prueba"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6697,26 +6837,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6724,7 +6875,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6732,42 +6883,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"¿Crear el directorio\n"
-"%s\n"
-"?\n"
-"\n"
-"(Espacio libre = %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6779,20 +6932,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6800,790 +6953,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "IGU"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nunca"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Decodificando"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "Com_plemento"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Reproductor"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Grabando"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Formato de Salida"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Códec de audio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Carpetas"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Advertencias"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Varios"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Nuevo tema:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "puerto UDP       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7591,222 +7744,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionar cuadros 1 a %d"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Redimensionar cuadros 1 a %d"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Resamplear/Reescalar"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "La longitud del video es ahora de %d cuadros.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Resamplear Audio"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resamplear video at %.8f cuadros por segundo..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Remuestreo de video at %.3f cuadros por segundo..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Remuestreo"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Insertar Silencio"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Canales "
-
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Canales "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nuevo"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " horas  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minutos  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " segundos  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7817,7 +7962,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7828,89 +7973,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Cambiar Velocidad"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Reordenando cuadros"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Desordenando cuadros"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7920,7 +8065,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7928,20 +8073,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7949,19 +8094,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"LiVES no fue capaz de escribir su archivo de configuración\n"
-"%s/.lives\n"
-"\n"
-"Por favor, compruebe los permisos del archivo y directorio\n"
-"e inténtelo nuevamente.\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7971,22 +8110,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7996,43 +8135,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8040,40 +8184,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Sin Descripción"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Descripción: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8082,65 +8231,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Información"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8190,11 +8343,6 @@
 msgid "none\n"
 msgstr "Nada\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8212,64 +8360,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Origen: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8278,7 +8426,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8286,14 +8434,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8303,7 +8451,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8312,208 +8460,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "para seleccionar una región de tiempo.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mezclador de Audio (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Cerrar huecos"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Eliminar bloque"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Separar pistas"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Aplicar %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Borrar %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8523,7 +8673,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8531,588 +8681,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr "Entrada/Salida"
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Parám."
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "Abriendo selección de archivos..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importar Selección desde _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Import Selección desde _dvd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importar Selección desde _vcd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Importar desde Dispositivo"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
-#, fuzzy
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
-msgstr "Cargar subtítulos automáticamente"
+msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "Pis_tas"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Se_lección"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Cambiar ancho, alto y volumen de audio..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Ver"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Parametros de Audio"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Vista compacta"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Zoom Más"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Zoom Menos"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr "Entrada/Salida"
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Parám."
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Empezar en el fotograma"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Terminar en el fotograma"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Desplazador"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d cuadros"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s a %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9120,275 +9277,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "o INSERTAR DESPUÉS para moverlo"
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "para seleccionar una región de tiempo.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "después de él\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "antes de él\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Autocargar cada vez"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "fotogramas"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9396,94 +9545,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Cargando disposición desde %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d errores detectados.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mezclador de audio multipista"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Restablecer valores"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Ajustar todas las capas de valores de sonido al mismo valor"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "Servidor JACK iniciado\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Imposible conectar al servidor JACK\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9491,7 +9640,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9499,329 +9648,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Imposible conectar al servidor JACK\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - Seleccione un reproductor de audio"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "datos"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocidad"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "Var."
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "rango"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Reproducir vídeo rápido"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Reproducir vídeo lento"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Iniciar grabación"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Detener la grabación"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "clave"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9830,7 +9985,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9839,12 +9994,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10035,10 +10190,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Fundido de salida de audio"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Fundido de salida de audio"
-
 #~ msgid "Fade"
 #~ msgstr "Desvanecer"
 
@@ -10209,7 +10360,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Número de cuadros a abrir"
+#~ msgstr "_Número de veces a insertar"
 
 #, fuzzy
 #~ msgid "Photo/still"
@@ -10463,7 +10614,7 @@
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Número de cuadros a abrir"
+#~ msgstr "_Número de veces a insertar"
 
 #, fuzzy
 #~ msgid "_Other Center"
@@ -10552,9 +10703,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Copiando al portapapeles"
 
-#~ msgid "_Top"
-#~ msgstr "_Arriba"
-
 #, fuzzy
 #~ msgid "_Vertical segments"
 #~ msgstr "Giro Vertical"
@@ -10816,41 +10964,8 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Debés configurar el dispositivo de CD en Preferencias."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVES no pudo encontrar suficientes pistas que acordes con tu solicitud."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Vuelve a intentar con diferentes valores."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "Falló $plugin_name:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Imposible conectar al servidor JACK\n"
-
-#~ msgid "Red"
-#~ msgstr "Rojo"
-
-#~ msgid "error.\n"
-#~ msgstr "error\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES no fue capaz de escribir su archivo de configuración\n"
-#~ "%s/.lives\n"
-#~ "\n"
-#~ "Por favor, compruebe los permisos del archivo y directorio\n"
-#~ "e inténtelo nuevamente.\n"

LiVES-1.6.1.tar.bz2/po/et.po -> LiVES-2.0.3.tar.bz2/po/et.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:02+0000\n"
-"Last-Translator: Tarmo Ilves <tarmo.ilves.001@mail.ee>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Aitäh. Peaks olema võimalik progress taastada LiVES-i taaskäivitusel.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "Vigadest teatades, palun lisage infot oma operatsioonisüsteemist, jaotusest "
 "ja LiVES-i versioonist ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "ja mis tahes allpool esitatud teave:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "infot.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Valiku säilitamine.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Mõõtmete muutmine"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_kõikide kaadrite suuruse muutmine"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Kõik"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Pole"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "soovitatav"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "keelatud !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Praegune skeem**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Sisseehitatud"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Kohandatud"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Testi"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "komposiit...tuvastatud.."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "komposiit...ei tuvastatud..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...tuvastatud\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...ei tuvastatud\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -236,172 +273,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -409,17 +472,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -428,36 +492,36 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -467,7 +531,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -478,42 +542,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -521,96 +592,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Esita"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "Võta _tagasi"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Taasta"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -619,26 +690,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr ""
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -648,7 +704,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -658,7 +714,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -669,7 +725,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -678,54 +734,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -733,155 +789,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -889,94 +953,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Eelvaade"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -985,8 +1049,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -994,179 +1058,188 @@
 "\n"
 "Palun oota"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Näita üksikasju"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Eelvaade"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Katkesta"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Vorming"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Raami suurus"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Failisuurus"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Aeg kokku"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Raamid"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Sündmused"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Heli"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Näita _detailisi"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1176,7 +1249,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1185,47 +1258,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1233,397 +1321,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Uus nimi "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Laiendatud"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Väljundi vorming"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "esimene"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "viimane"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekundit."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr ""
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Kataloog:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Miinimum faili suurus (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maksimum faili suurus (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "valik"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "Sea vaikeväärtuseks"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Vali fail"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1631,17 +1680,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "See fail"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1651,7 +1700,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1661,20 +1710,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1687,33 +1736,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1721,97 +1770,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Kustutamine"
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Lõika"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Kleebi"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1820,31 +1869,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1852,7 +1901,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1861,86 +1910,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Lisan"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Kustutamine"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1948,11 +1997,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1961,7 +2010,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1970,7 +2019,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -1979,22 +2028,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2002,93 +2051,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2105,11 +2154,23 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Tarmo Ilves https://launchpad.net/~koolobus\n"
+"  lyyser https://launchpad.net/~lyyser"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2123,21 +2184,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2145,195 +2206,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Tühistamine"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Jätka"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Paus"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Säilita"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2341,29 +2414,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Peata"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2372,7 +2444,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2380,13 +2452,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2395,17 +2467,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2415,19 +2487,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2436,1049 +2508,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Ei suuda leida väljundkaardi (pixmap) faili %s!"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Redigeeri"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Kustuta valik"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Vali..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Pööra valik"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Esita"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Peata"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Täisekraan"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Tumm"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Tööriistad"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "Üldkas_utatavad"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Genereeri"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Genereeri"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Eriline"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Puudub"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Abi"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Lähemalt"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Helitugevus"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Vaba"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Alusta"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Tagasikerimine"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3486,81 +3534,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3568,7 +3616,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3576,32 +3624,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3609,68 +3657,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3680,53 +3728,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Võta tagasi %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Tee uuesti %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Avamine %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3738,11 +3797,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3750,14 +3809,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3765,29 +3824,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3795,66 +3854,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "valik"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Failisuurus"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3863,16 +3918,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Pealkirjata%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3880,7 +3935,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3888,68 +3943,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Taastamine"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3959,22 +4009,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -3982,68 +4032,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "hoiatus"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "$error"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Lähemalt"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4054,7 +4102,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4066,11 +4114,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4078,46 +4126,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4125,7 +4173,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4137,14 +4185,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4152,19 +4200,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4172,83 +4220,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4257,14 +4305,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4273,7 +4321,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4284,7 +4332,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4293,11 +4341,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4339,11 +4387,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4365,17 +4413,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4383,28 +4432,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4413,7 +4462,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4421,7 +4470,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4429,7 +4478,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4440,7 +4489,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4450,7 +4499,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4458,7 +4507,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4467,13 +4516,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4484,13 +4533,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4500,7 +4549,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4509,7 +4558,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4517,7 +4566,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4525,63 +4574,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4589,14 +4638,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4605,25 +4654,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4632,33 +4681,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -4668,7 +4717,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -4678,7 +4727,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -4688,7 +4737,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4697,7 +4746,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -4707,7 +4756,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4716,7 +4765,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -4726,12 +4775,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4740,7 +4789,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4749,7 +4798,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4758,14 +4807,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4773,13 +4830,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4789,27 +4846,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4818,14 +4875,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4836,19 +4893,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4856,7 +4913,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4864,7 +4921,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4876,7 +4933,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -4885,34 +4942,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4921,343 +4978,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Siirded"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efekt"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efektid"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Tööriistad"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "eraldaja"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "teadmata"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Laius"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Kõrgus"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5265,74 +5578,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Sea vaikeväärtuseks"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Sulge aken"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Taasta"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Roheline"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Sinine"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5342,17 +5652,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5362,32 +5672,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5396,14 +5706,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5413,40 +5716,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5455,11 +5765,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5468,7 +5778,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5478,192 +5788,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tüüp:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Keele kood:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5673,55 +5967,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Liiguta ü_les"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Liiguta _alla"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5730,7 +6024,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5738,231 +6032,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -5970,28 +6252,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6000,41 +6282,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6044,27 +6326,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6073,7 +6355,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6083,12 +6365,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6098,7 +6380,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6108,12 +6390,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6121,23 +6403,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6147,55 +6429,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Sisseehitatud"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Kohandatud"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Testi"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6203,26 +6473,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6230,7 +6511,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6238,7 +6519,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6247,28 +6528,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6280,20 +6568,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6301,790 +6589,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "sekundid"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Mitte kunagi"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Taasesitus"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Salvestamine"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Väljundi vorming"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Kodeering"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Kataloogid"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Hoiatused"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Muud"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Teemad"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Muu"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7092,222 +7380,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Suuruse muutmine"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Päevakajaline"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Uus"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Pealkirjata"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7318,7 +7598,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7329,89 +7609,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7421,7 +7701,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7429,19 +7709,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7451,12 +7731,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7466,22 +7746,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7491,43 +7771,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7535,40 +7820,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Kirjeldus puudub"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Kirjeldus: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7577,65 +7867,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Andmed"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Puhasta"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7685,11 +7979,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7707,64 +7996,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7773,7 +8062,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7781,14 +8070,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7798,7 +8087,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7807,208 +8096,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8018,7 +8309,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8026,587 +8317,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "_Valik"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Genereerimine"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Vaade"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Tihe vaade"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Rakenda"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Kerib"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s kuni %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8614,275 +8913,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Puhastamine..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Peata"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "kaadrit"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8890,94 +9181,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8985,7 +9276,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8993,328 +9284,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Heli serveri pulse käivitamine..."
+msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "andmed"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "kiirus"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "märkus"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "väärtus"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "maakond"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "muutuja"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "vahemik"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Kustuta kõik"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "klahv"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9323,7 +9621,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9332,12 +9630,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9398,26 +9696,6 @@
 #~ msgid "Border _Colour"
 #~ msgstr "_Alusta"
 
-#, fuzzy
-#~ msgid "Brightness _end"
-#~ msgstr "Siirded"
-
-#, fuzzy
-#~ msgid "Brightness _start"
-#~ msgstr "Siirded"
-
-#, fuzzy
-#~ msgid "Brightness change"
-#~ msgstr "Siirded"
-
-#, fuzzy
-#~ msgid "Brightness end"
-#~ msgstr "Siirded"
-
-#, fuzzy
-#~ msgid "Brightness start"
-#~ msgstr "Siirded"
-
 #~ msgid "Charcoal"
 #~ msgstr "Söejoonistus"
 
@@ -9844,10 +10122,6 @@
 #~ msgstr "_Kaadrid"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Hajumine"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_Fail"
 
@@ -9942,9 +10216,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "sekundid"
 
-#~ msgid "_Top"
-#~ msgstr "_Ülemine"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "Laine"
@@ -9973,10 +10244,6 @@
 #~ msgstr "kaadrit"
 
 #, fuzzy
-#~ msgid "brightness_change"
-#~ msgstr "Siirded"
-
-#, fuzzy
 #~ msgid "charcoal"
 #~ msgstr "Söejoonistus"
 
@@ -10147,12 +10414,3 @@
 
 #~ msgid "$error"
 #~ msgstr "$error"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Heli serveri pulse käivitamine..."
-
-#~ msgid "Red"
-#~ msgstr "Punane"

LiVES-1.6.1.tar.bz2/po/fi.po -> LiVES-2.0.3.tar.bz2/po/fi.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-01-20 00:23+0000\n"
-"Last-Translator: Tuomas Lähteenmäki <Unknown>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-03 17:36+0000\n"
-"X-Generator: Launchpad (build 14738)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +34,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -48,7 +64,7 @@
 "Kiitos. Palautumisen tulisi olla mahdollista uudelleen käynnistäessäsi "
 "ohjelman.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -60,7 +76,7 @@
 "Raportoidessasi kaatumisista, sisällytä käyttöjärjestelmän tiedot, "
 "jakeluversio ja LiVESin versiotiedot ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -68,7 +84,7 @@
 "ja alla olevat tiedot:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -78,171 +94,184 @@
 "lisätietoja.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Säilytetään leikesarja.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Koon muutos"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "Muuta kaikkien kuvien k_okoa"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Mikä tahansa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Ei mitään"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "suositeltu"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "kytketty pois päältä!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Nykyinen asettelu**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Mukauta"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Kokeile"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
-"\n"
-"\n"
-"Manuaaliseen käynnistämiseen tarvitaan jackd. Ole hyvä ja varmista että "
-"jackd on käynnissä,\n"
-"tai muuta <jack_opts> arvoa tiedostossa ~/.lives  arvoksi 16\n"
-"ja uudelleen käynnistä LiVES.\n"
-"\n"
-"Vaihtoehtoisesti voit kokeilla käynnistää \"lives-jackopts 16\", tai "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...havaittu..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...EI HAVAITTU..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...havaittu..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...EI HAVAITTU..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...havaittu\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...EI HAVAITTU\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...havaittu..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...EI HAVAITTU..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...havaittu..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...EI HAVAITTU..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...havaittu..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...EI HAVAITTU..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...havaittu..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...EI HAVAITTU..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...havaittu..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...EI HAVAITTU..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...havaittu..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...EI HAVAITTU..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr "TUNTEMATON - ole hyvä ja korjaa minut !"
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -253,22 +282,48 @@
 "\n"
 "Ikkunointiohjelma ilmoitti olevansa \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "näyttöjä löydetty: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Suorittimia havaittu: %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Tilapäishakemisto on %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -278,15 +333,15 @@
 "jack- tai pulse audio -tukea.\n"
 "Jotkut ääniominaisuudet eivät ole käytettävissä.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Käännetty jack-tuella, hienoa!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Käännetty pulse audio -tuella, loistavaa!\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -295,7 +350,7 @@
 "Tervetuloa LiVES-versioon %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -305,132 +360,132 @@
 "Käynnistyssyntaksi on: %s [valitsimet] [tiedostonimi [aloitusaika] "
 "[kehykset]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Missä: tiedostonimi on mediatiedoston tai varmuuskopiotiedoston nimi.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "aloitusaika : tiedostonnimen aloitusaika sekunteina\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "kehykset : avattavien kehysten enimmäismäärä\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "valitsimia voivat olla:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : näytä tämä ohjeteksti ja poistu\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <leikenimi> : lataa automaattisesti leikesarja leikenimi\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : älä lataa leikesarjoja käynnistäessä\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : voimaan lastaus kaatua hyödyntämistä\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : käynnistä ilman käyttöliittymää\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : alkaa clip editori-tilassa\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startum-mt : alkaa moniraitaäänityksen tilassa\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <portti> : käynnistä OSC-kuuntelin UDP-portissa <portti>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : älä käynnistä OSC-kuuntelinta\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 "-aplayer <ap>    : käynnistä valitulla äänisoittimella. <ap> voi olla mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox tai jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " tai sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <kartan nimi> : automaattisesti Kontti kartta\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : yritä jäljittää kaatumisen aiheuttavaa vikaa (\"gdb\" "
 "oltava asennettuna)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Käynnistetään graafinen käyttöliittymä..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -438,25 +493,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Valitsemaasi teemaa ei löytynyt. Tarkista että teemat on asennettu kansioon\n"
-"%s/%s.\n"
-"(Muuta tarvittaessa <prefix_dir>-arvoa tiedostosta ~/.lives)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES ei pystynyt kirjoittamaan pientä tiedostoa /tmp-kansioon\n"
-"Tarkista että sinulla on kirjoitusoikeus /tmp-kansioon ja yritä uudelleen.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -465,50 +513,36 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES ei pystynyt lukemaan asetustiedostoa\n"
-"%s/.lives\n"
-"\n"
-"Tarkista tiedoston käyttöoikeudet ja yritä uudestaan.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES ei pystynyt kirjoittamaan asetustiedostoon\n"
-"%s/.lives\n"
-"\n"
-"Tarkista tiedoston ja sen sijaintihakemiston käyttöoikeudet\n"
-"ja yritä uudestaan.\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"Ole hyvä ja tarkista <tempdir> asetuksista\n"
-"%s/.lives\n"
-"ja yritä uudelleen.\n"
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -523,7 +557,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -534,14 +568,21 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -551,7 +592,7 @@
 "LiVES ei löytänyt ohjelmaa \"mplayer\". Asenna mplayer jos haluat käyttää \n"
 "LiVESiä täysipainoisesti.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -561,7 +602,7 @@
 "LiVES ei löytänyt \"convert\"-ohjelmaa. Asenna convert ja image-magick jos "
 "haluat käyttää hahmonnettuja tehosteita.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -571,7 +612,7 @@
 "LiVES ei löytänyt \"composite\"-ohjelmaa. Asenna composite ja image-magick "
 "jos haluat käyttää yhdistä-toimintoa.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -581,7 +622,7 @@
 "LiVES ei löytänyt ohjelmaa 'sox'. Jotkin ääniominaisuudet eivät välttämättä "
 "toimi. Sinun tulisi asentaa 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -589,62 +630,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Ladataan automaattisesti leikesarja %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Virheellinen musiikkisoitin %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Nimetön%d> %dx%d : %d kuvaa %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? kuvaa ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d kuvaa %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Ei tiedostoa>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Toista"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -652,35 +693,35 @@
 "LiVES ei pystynyt kaappaamaan tätä kuvaa\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Tiedosto %s suljettiin\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "Kum_oa"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Tee uudestaan"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Vasen ääni"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Oikea ääni"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -689,26 +730,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr ""
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Toistoikkuna"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -718,7 +744,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -728,7 +754,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -739,7 +765,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -752,11 +778,11 @@
 "%s\n"
 "Valitse eri hakemisto ja yritä uudelleen.\n"
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Kansion nimi on liian pitkä!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -764,7 +790,7 @@
 "LiVES EI PYSTYNYT KÄYNNISTÄMÄÄN VALITSEMAASI ÄÄNISOITINTA!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -774,7 +800,7 @@
 "\n"
 "PULSE AUDIO on suositeltava useimmille käyttäjille"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -782,7 +808,7 @@
 ", mutta tätä LiVESin versiota ei ole käännetty pulse audio -tuella.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -792,11 +818,11 @@
 " On suositeltavaa asentaa pulse audio ennen LiVESin käynnistystä.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio on suositeltava edistyneemmille käyttäjille"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -804,7 +830,7 @@
 ", mutta tätä LiVESin versiota ei ole käännetty jack audio -tuella.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -814,7 +840,7 @@
 "käynnistystä.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -826,11 +852,11 @@
 "uudestaan ja kokeilla jotain muuta äänisoitinta.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOXia voi käyttää jos kumpikaan edellisistä soittimista ei toimi, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -838,7 +864,7 @@
 "mutta jotkut ääniominaisuudet eivät ole käytettävissä.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -848,7 +874,7 @@
 "On suositeltavaa asentaa se ennen LiVESin käynnistystä.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -856,132 +882,140 @@
 "MPLAYER-äänisoitinta suositellaan vain testaustarkoituksiin.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Valitse äänisoitin"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Käytä _pulse-äänisoitinta"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Käytä _jack-äänisoitinta"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Käytä _sox-äänisoitinta"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Käytä _mplayer-äänisoitinta"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Ohitettu"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Hyväksytty"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testaus asetukset"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Vianmääritys"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Tarkistetaan löytyykö \"sox\""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Tarkistetaan, voiko sox muuntaa ääntä"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Kirjoittaminen ei onnistu: %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr "Komento epäonnistui: %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Tarkistetaan löytyykö \"mplayer\""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Tarkistetaan, voiko mplayer muuntaa ääntä"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Sinun pitäisi asentaa mplayer pcm/wav tuella"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Tarkistetaan voiko mplayer purkaa png/aplhaa"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Voit halutessasi päivittää mplayerin uudempaan versioon"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Tarkistetaan voiko mplayer purkaa jpegiä."
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Tarkistetaan löytyykö \"convert\""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -993,96 +1027,96 @@
 "    Napsauta Peru jos haluat lopettaa ja asentaa puuttuvat ohjelmat, tai "
 "Seuraava jatkaaksesi    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Valitse käynnistettävä käyttöliittymä"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "Käynnistä _Leikemuokkaustilaan"
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "Käynnistä _Multitrack-tilaan"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Valmis"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Anna LiVESin asettaa _tiedostomääre"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Käytä lomituksen poistoa"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Napsauta tästä esi_katsellaksesi mitä tahansa valittua video-, kuva- tai "
 "äänitiedostoa"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Napsauta tästä esi_kuunnellaksesi valittua äänitiedostoa"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Klikkaa tästä _Esikatselu video"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Käsitellään..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1096,8 +1130,8 @@
 "\n"
 "Muista poistaa tehosteet käytöstä (ctrl-0) myöhemmin!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1105,105 +1139,114 @@
 "\n"
 "Odota hetki"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Näytä yksityiskohdat"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Riittää jo"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Peruuta"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formaatti"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Kuvakoko"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Tiedostokoko"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Tavukoko"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Kokonaisaika"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Kuvia"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Oikea ääni"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Pidä _Omat asetukset"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Käytä _suositeltuja asetuksia"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1211,75 +1254,75 @@
 "_Älä näytä tätä varoitusta enää uudestaan\n"
 "(varoituksen voi laittaa takaisin päälle kohdasta Asetukset/Varoitukset)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Näytä _tiedot"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Tallenna tiedoston"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Lisäys"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Lisäyskertojen määrä"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Lisää valinnan _eteen"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Lisää leikepöydän sisältö valittujen kuvien eteen"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Lisää valinnan _perään"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Lisää leikepöydän sisältö valittujen kuvien perään"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Lisää äänen _kanssa"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Lisää _ilman ääntä"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Avaa valinta"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Useita kehyksiä avata"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Avaa sijainti"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1289,7 +1332,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1298,46 +1341,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Älä lähetä kaistanleveystietoja"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Nimeä leike uudelleen"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Nimeä leikesarja"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Valitse työkansio"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1345,251 +1404,213 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Nimeä leike uudelleen"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Nimeä leikesarja"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Valitse työkansio"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Uusi nimi "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Leikesarjan nimi "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "L_isäasetukset"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Lataa CD-kappale"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Laitteen tiedot"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Laite:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Laite:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Kanava  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Leveys"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Korkeus"
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Tallennusmuoto"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Häivytys äänen alkuun"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Häivytys äänen loppuun"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Häivytä alusta  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "ensimmäiset"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Häivytä lopusta  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "viimeiset"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekuntia."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "valinta."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Kansio:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Sisällytä alikansiot"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Tiedoston minimikoko (Mt)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Tiedoston maksimikoko (Mt)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "valinta"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Tiedoston kommentit (valinnainen)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Otsikko/Nimi : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Tekijä/esittäjä : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Kommentit : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "Tekstitystiedosto"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: valitse kansio"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: valitse tiedosto"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Peru/Hylkää/Tallenna"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1599,7 +1620,7 @@
 "Nykyistä asettelua ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1609,7 +1630,7 @@
 "Nykyistä asettelua on muutettu viime tallennuksen jälkeen.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1619,7 +1640,7 @@
 "Nykyinen leikesarja voidaan tallentaa.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1627,7 +1648,7 @@
 "Nykyistä leikesarjaa ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1635,62 +1656,62 @@
 "Nykyistä asettelua ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "Leikesarjan _nimi"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "Lataa _automaattisesti uudelleen seuraavalla kerralla"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Poista asettelu"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Hylkää muutokset"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Poista leikesarja"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Poista asettelu"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Tallenna asettelu"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Tallenna leikesarja"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: palautetaanko asettelu?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1700,57 +1721,57 @@
 "LiVES löysi multitrack-asettelun edellisen istunnon jäljiltä.\n"
 "Haluatko yrittää sen palautusta?\n"
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Valitse tiedosto"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1758,17 +1779,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Tämä tiedosto"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1778,7 +1799,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1788,14 +1809,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1803,7 +1824,7 @@
 "\n"
 "Virheellinen projektitiedosto.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1816,33 +1837,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Palauta .lv1-tiedosto"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Varmuuskopioi .lv1-tiedostoon"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Palauta .lv1-tiedosto"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1854,97 +1875,97 @@
 "Leikesarja poistetaan levyltä.\n"
 "Haluatko varmasti tehdä tämän?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Poistetaan leikesarja..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Poistetaan leikesarja"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Leikesarja %s poistettiin lopullisesti levyltä.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Kumotaan"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Videon pituus on nyt %d kuvaa nopeudella %.3f kuvaa sekunnissa.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Kopioidaan kuvat %d - %d%s leikepöydälle..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Kopioidaan leikepöydälle"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Liitetään"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1953,31 +1974,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1985,7 +2006,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1994,30 +2015,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Lisätään %d%s kuvaa leikepöydältä..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Lisätään"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Lisätään %d kertaa leikepöydältä%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Lisätään %d kuvaa leikepöydältä%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Lisäys"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2027,49 +2048,49 @@
 "Kaikkien kuvien poisto sulkee tämän tiedoston.\n"
 "Haluatko varmasti tehdä tämän?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Poistetaan kuvat %d - %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Poistetaan"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Poisto"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2079,7 +2100,7 @@
 "\n"
 "Valinta on lukittu.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2087,11 +2108,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Nauhoitus peruttu.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2104,7 +2125,7 @@
 "'%s'-liitännäinen ilmoittaa:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2117,7 +2138,7 @@
 "Liitännäisestä %s ei löytynyt 'init'-metodia.\n"
 "Liitännäinen saattaa olla rikki tai virheellisesti asennettu."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2126,22 +2147,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Tallennetaan leikesarja %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Ladataan leikkeet leikesarjasta %s"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2153,37 +2174,37 @@
 "kopioita LiVESistä.\n"
 "Napsauta OK jatkaaksesi.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2191,28 +2212,28 @@
 "\n"
 "  Avataan..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2220,30 +2241,30 @@
 "\n"
 "  Tuntematon"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2260,11 +2281,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Videomuokkain ja VJ-ohjelma."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n"
+"  Mikko Nissinen https://launchpad.net/~mikko\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2278,7 +2312,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2288,14 +2322,14 @@
 "\n"
 "Tämän tiedoston esikatselu onnistuu ainoastaan jos mplayer on asennettuna.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2303,195 +2337,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Avataan äänitiedosto %s, tyyppi %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Avataan äänitiedosto"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Perutaan"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Uusi ääniraita: %d Hz %d kanava(a) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Uusi ääniraita"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Piilota toistoikkuna (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Näytä toistoikkuna (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Toista erillisessä ikkunassa (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Äänenvoimakkuus (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Palauta ääni (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Vaimenna ääni (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Käännetään leikepöydän järjestys..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Käännetään leikepöydän järjestys"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Ladattiin tekstitystiedosto: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Valitse äänitiedosto"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Määritä CD-soittolaite kohdasta Työkalut | Asetukset | Sekalaiset\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CD-raita %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Avataan CD-raita..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Virhe ladattaessa CD-raitaa\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Sulje _ikkuna"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Jatka"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pysäytetty..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pysäytä"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "jatketaan..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Pidä"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2499,28 +2545,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2529,7 +2575,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2541,7 +2587,7 @@
 "Tätä ominaisuutta voi käyttää vain jos \"xwininfo\" on asennettuna\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2549,7 +2595,7 @@
 "\n"
 "Tallennusajan tulee olla pidempi kuin 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2564,11 +2610,11 @@
 "Napsauta \"Peruuta\" peruaksesi toiminnon\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Ulkoinen ikkuna vapautettiin.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2576,7 +2622,7 @@
 "Napsauta haluamaasi ikkunaa kaapataksesi sen\n"
 "Paina \"q\" lopettaaksesi nauhoituksen."
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2586,20 +2632,20 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 "LiVES ei pystynyt kaappaamaan tästä ikkunasta. Pahoittelemme tapahtunutta.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Vie valittu äänijakso tiedostoon..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Vie ääniraita tiedostoon..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2613,81 +2659,86 @@
 "Napsauta \"OK\" viedäksesi uudella nopeudella, tai \"Peruuta\" viedäksesi "
 "alkuperäisellä nopeudella.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Viedään äänijakso %d - %d tiedostoon %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Viedään ääniraita tiedostoon %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Viedään ääniraita"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2697,969 +2748,940 @@
 "Tämä tiedosto suljetaan jos koko ääniraita poistetaan.\n"
 "Haluatko varmasti tehdä tämän?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Poistetaan koko ääniraita..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Poistetaan ääniraita"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kuvatiedostoa ei löytynyt: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Yhdistetään leikepöydän sisältö valintaan..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "lisätään %d ylimääräistä kuva(a) ennen yhdistämistä\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Avaa tiedosto/hakemisto"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Avaa sijainti/suo_ratoisto..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Tuo Firewire-laitteelta (_dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Tuo Firewire-laitteelta (_hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Viimeisimmät tiedostot..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "Lataa leikesarja _uudestaan..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Sulje/tallenna _kaikki leikkeet"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Tallenna _valinta nimellä..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Sulje tämä leike"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "Var_muuskopioi leike .lv1-tiedostoon..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Palauta leike .lv1-tiedostosta..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Tallenna/lataa/varmuuskopioi _äänen kanssa"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "Lataa tekstitykset automaattisesti"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Siivoa lev_ytila"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK-tila"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Kopioi valinta"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "_Leikkaa valinta"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "L_isää leikepöydältä..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Liitä _uutena"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Yhdistä leikepöydän sisältö valintaan..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Poista valinta"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "I_rrota video ääniraidasta"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Valitse..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Valitse _kaikki kuvat"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "Vain _aloituskuva"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "Vain _lopetuskuva"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Valitse _ensimmäisestä kuvasta alkaen"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Valitse _viimeiseen kuvaan saakka"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Valitse viimeisin lisäys/_yhdistäminen"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Valitse viimeisin _tehoste"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "Tee k_äänteinen valinta"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "Luki_tse valinnan leveys"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "T_oisto"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Toista kaikki"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Toista _valinta"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Toista _leikepöydän sisältö"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Pysäytä"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Palaa _alkuun"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "K_okoruutu"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Kak_sinkertainen koko"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Toista _erillisessä ikkunassa"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "P_imennä tausta"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "_Jatkuva silmukka"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong -silmukka"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Vaimenna ääni"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "Näytä _kuvalaskuri"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "Näytä tekstitykset"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "T_ehosteet"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Tehosteet lisätään nykyiseen valintaan."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "T_yökalut"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Työkaluja käytetään kokonaisissa leikkeissä."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Käännä leikepöydän _järjestys"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "Muuta toisto/tallennus_nopeutta..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Muunna _videon kuvanopeus..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "A_puvälineet"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "Lu_o"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "Lu_o"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Ladataan hahmonnetut tehosteliitännäiset..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr "Lataa _tekstitykset tiedostosta..."
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Kaappaa _ulkoisesta ikkunasta... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Asetukset..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Ääni"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Lataa leikkeeseen _uusi ääniraita..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Lataa _CD-kappale..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "P_oista CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "_Nauhoita ulkoisesta lähteestä..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "Uuteen _leikkeeseen..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "_Valintaan"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Tee _alkuhäivytys..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Tee _loppuhäivytys..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "Vie _ääni..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Vie _valittu äänijakso..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Vie _koko ääniraita..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Poista ääni..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Poista _valittu äänijakso"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Poista _koko ääniraita"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Soita _musiikkia xmms-soittimella..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Pysäytä xmms-_toisto"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "T_iedot"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Näytä leikkeen _tiedot"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Näytä/_muokkaa tiedostokommentteja"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Näytä _leikepöydän tiedot"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Näytä _viestit"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Näytä _asetteluvirheet"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Leikkeet"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "Nimeä nykyinen leike _uudelleen ikkunassa..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "Li_sätyökalut"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX-tehosteet/työkalut/apuohjelmat"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "_Vastaanota LiVES-suoratoisto..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Lähetä LiVES-suoratoisto..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "Tuo pro_jekti (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "V_ie projekti (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Tosiaikaisten _tehosteiden näppäinsidokset"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Sido tosiaikaiset tehosteet ctrl-numero-näppäinyhdistelmiin."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Näytä VJ-_näppäimet"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "Leikki_kalut"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "Le_vottomat kuvat"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (laajakaista)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "O_hje"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "Käyttöo_hje (avautuu selaimessa)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "Tee _lahjoitus projektille!"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "Lähetä _postia tekijälle"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Tee _vikailmoitus"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Ehdota _ominaisuutta"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Auta _kääntämisessä"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Tietoja ohjelmasta"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Palaa alkuun (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Toista kaikki (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Pysäytä toisto (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Toista valinta (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Äänenvoimakkuus (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Toista hitaammin (ctrl-alas)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Toista nopeammin (ctrl-ylös)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Näytä leikkeen tiedot (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Piilota tämä työkalurivi"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Videon toistonopeus (kuvaa sekunnissa)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Ensimmäinen kuva"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Viimeinen kuva"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "Ensimmäinen valittu kuva tässä leikkeessä"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "Viimeinen valittu kuva tässä leikkeessä"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Käynnistetään...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Paina \"q\" pysäyttääksesi nauhoituksen.  ÄLÄ PEITÄ TOISTOIKKUNAA !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Vapaana"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Käynnistä"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Takaisinkelaus"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Toista kaikki"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Toista valinta"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Aloita _nauhoitus"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Pysäytä _nauhoitus"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Piilota toistoikkuna"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Näytä toistoikkuna"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Tyhjennetään leikepöytää"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3670,7 +3692,7 @@
 "==============================\n"
 "Vaihdettiin leikkeeseen %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3680,32 +3702,32 @@
 "==============================\n"
 "Vaihdettiin tyhjään leikkeeseen\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3714,7 +3736,7 @@
 "Leikkeen %s kuvia on siirrelty.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3723,7 +3745,7 @@
 "Leikkeestä %s on poistettu kuvia.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3732,7 +3754,7 @@
 "Leikkeestä %s on poistettu ääniraita.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3741,7 +3763,7 @@
 "Leikkeen %s ääniraitaa on siirrelty.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3750,7 +3772,7 @@
 "Leikkeen %s ääniraitaa on muutettu.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3759,7 +3781,7 @@
 "Leikkeen %s kuviin on tehty muutoksia.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3770,7 +3792,7 @@
 "ei voida avata, sillä se on toisen\n"
 "LiVES-kopion käytössä.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3778,7 +3800,7 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3786,13 +3808,13 @@
 "\n"
 "Leikesarjalla pitää olla nimi.\n"
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3801,13 +3823,13 @@
 "\n"
 "Leikesarjan nimi ei saa sisältää välilyöntejä tai merkkejä %s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3818,68 +3840,68 @@
 "%s-niminen leikesarja on jo olemassa.\n"
 "Valitse joku toinen nimi.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Poistetaan asettelu %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [avataan...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f s]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Ei videoraitaa)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Ei ääniraitaa)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [avataan...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Vasen ääni [avataan...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f s]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Vasen ääni [%.2f s]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Oikea ääni [avataan...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Oikea ääni [%.2f s]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3894,53 +3916,64 @@
 "\n"
 "Korvataanko se?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "Kum_oa %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "Tee uu_destaan %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Valinta------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " s ] ----------Valinta---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " kuvaa ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3952,11 +3985,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3964,7 +3997,7 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -3974,7 +4007,7 @@
 "\n"
 "Tämän tiedoston avaaminen saattaa vaatia mplayerin asennuksen.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3982,29 +4015,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4017,33 +4050,29 @@
 "\n"
 "Haluatko tästä huolimatta jatkaa?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "valinta"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (ilman ääntä)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Tallennetaan [saattaa kestää kauan]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4053,33 +4082,33 @@
 "\n"
 "Pakkausvirhe - tiedostoa ei luotu!\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4088,16 +4117,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Nimetön%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4105,7 +4134,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4117,12 +4146,12 @@
 "fps. \n"
 "Oletusarvon voi asettaa kohdasta Työkalut | Asetukset | Sekalaiset.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4131,7 +4160,7 @@
 "Kuvia=%d tyyppi=%s koko=%dx%d *bpp=Harmaasävy* fps=%.3f\n"
 "Ääni:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4140,49 +4169,44 @@
 "Kuvia=%d tyyppi=%s koko=%dx%d bpp=%d fps=%.3f\n"
 "Ääni:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d kanava(a) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Kommentti: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Tallennetaan kuva %d nimellä %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Varmuuskopioidaan %s tiedostoon %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Varmuuskopioidaan"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Palautetaan %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Palautetaan"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4196,22 +4220,22 @@
 "LiVES ei pystynyt palauttamaan sitä.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4219,7 +4243,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4229,59 +4253,59 @@
 "Edellisen LiVES-istunnon jäljiltä löytyi tiedostoja.\n"
 "Haluatko yrittää niiden palautusta?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Palautetaan tiedostoja"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Palautetaan tiedostoja..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Varoitus!"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "varoitus"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4292,7 +4316,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4304,11 +4328,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Äänisoitinta ei voi vaihtaa toiston aikana."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4320,20 +4344,18 @@
 "LiVES ei pystynyt suorittamaan tätä toimintoa muistin vähyyden vuoksi.\n"
 "Kokeile sulkea ensin muita sovelluksia.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% valmiina. Aikaa jäljellä: %u s\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4342,7 +4364,7 @@
 "\n"
 "%d/%d kuvaa avattu. Aikaa jäljellä %u s.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4351,7 +4373,7 @@
 "\n"
 "%d/%d kuvaa avattu.\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4360,7 +4382,7 @@
 "\n"
 "%d kuvaa avattu.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4369,7 +4391,7 @@
 "\n"
 "Aikaa jäljellä: %d s"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4380,7 +4402,7 @@
 "Valitettavasti LiVES voi avata vain %d tiedostoa kerralla.\n"
 "Sulje joku tiedosto ja yritä uudelleen."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4399,14 +4421,14 @@
 "\n"
 "Varmista että sinulla on kirjoitusoikeus tähän kansioon."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4414,19 +4436,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4437,7 +4459,7 @@
 "\n"
 "%s-formaatin rajoituksista johtuen\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4445,77 +4467,77 @@
 "LiVES suosittelee seuraavia asetuksia:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Aseta videon nopeudeksi %.3f kuvaa sekunnissa\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Aseta videon nopeudeksi %d:%d kuvaa sekunnissa\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Aseta videon kooksi %d x %d pikseliä\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4529,7 +4551,7 @@
 "Napsauta \"OK\" jatkaaksesi, \"Peruuta\" keskeyttääksesi.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4539,7 +4561,7 @@
 "Valintaan tehdyt muutokset eivät ole pysyviä.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4548,7 +4570,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4559,7 +4581,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4568,11 +4590,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4614,11 +4636,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Multitrack-näppäimet"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4640,17 +4662,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Viestihistoria"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4658,28 +4681,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4688,7 +4711,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4700,7 +4723,7 @@
 "Haluatko varmasti jatkaa?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4712,7 +4735,7 @@
 "Haluatko varmasti jatkaa?\n"
 "."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4723,7 +4746,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4733,7 +4756,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4741,7 +4764,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4750,13 +4773,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4767,7 +4790,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -4776,7 +4799,7 @@
 "Voit myös käynnistää LiVESin uudelleen ja valita jonkun toisen "
 "äänisoittimen.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4786,7 +4809,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4795,7 +4818,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4803,7 +4826,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4811,7 +4834,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -4820,57 +4843,57 @@
 "LiVES ei pystynyt varaamaan riittävästi muistia multitrack-tilan kumoa-"
 "toiminnolle.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "tai anna pienempi arvo.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Kokeile sulkea muita ohjelmia\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4878,14 +4901,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4894,25 +4917,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4921,33 +4944,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "peruttiin.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "epäonnistui.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "valmis.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -4957,7 +4980,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -4967,7 +4990,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -4977,7 +5000,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4986,7 +5009,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -4996,7 +5019,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5005,7 +5028,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5015,12 +5038,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5029,7 +5052,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5042,7 +5065,7 @@
 "%s\n"
 "Tarkista tiedoston käyttöoikeudet ja yritä uudestaan."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5051,14 +5074,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5066,13 +5097,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5082,27 +5113,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5111,14 +5142,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5129,19 +5160,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5149,7 +5180,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5157,7 +5188,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5169,7 +5200,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5178,34 +5209,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5214,213 +5245,289 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "vaihtuma"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Vaihtumat"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "tehoste"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Tehosteet"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Apuohjelmat"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "tuntematon"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s kaikki kuvat..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s leikepöydälle..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s uuteen leikkeeseen..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s kuvat %d - %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s leikepöydälle"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s uuteen leikkeeseen"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s kuvat %d - %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Virhe: %s-liitännäinen ei sisällä weed_setup()-toimintoa.\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5429,130 +5536,310 @@
 "Info: Liitännäistä %s ei voitu ladata\n"
 "Virheilmoitus oli: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Ladattu onnistuneesti %d Weed-suodatinta\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr ""
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Palauta arvot"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    Kuv_a"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Säilytä alkuperäinen kuvasuhde"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Säilytä kuva_suhde"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Valitse tiedosto"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Säilytä alkuperäinen kuvasuhde"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr ""
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Uusi koko (pikseliä)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Leveys"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Korkeus"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Luo leike_pöydälle"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Luo kuvat leikepöydälle"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Luo uu_si leike"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Luo kuvat uuteen leikkeeseen"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5564,71 +5851,71 @@
 "valittuna.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Aseta oletukseksi"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Sulje _ikkuna"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Ei arvoja"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Virheellinen arvo"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Valitse väri"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Napsauta asettaaksesi värin"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Punaisen arvo (0 - 255)"
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Vihreän arvo (0 - 255)"
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Sinisen arvo (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5638,17 +5925,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5658,32 +5945,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5696,14 +5983,7 @@
 "Toistoliitännäistä %s ei voitu avata\n"
 "Virheilmoitus oli %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5718,40 +5998,47 @@
 "puuttuu pakollinen toiminto.\n"
 "Sitä ei voida käyttää.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5760,11 +6047,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Koon muuttaminen ei onnistu, ole hyvä ja asenna imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5773,7 +6060,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5783,192 +6070,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Tehoste -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Vaihtuma -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Työkalu -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Nimi:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Liitännäisen nimi. Ei välilyöntejä nimeen."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Versio:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Komentosarjan versio."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Tekijä:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Komentosarjan tekijä."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (valinnainen):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "Liitännäisen ylläpitäjän URL."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Valikkoteksti:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Valikossa näytettävä teksti."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Toiminnon kuvaus:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Kuvaile mitä liitännäinen tekee. Esim. \"Edge detecting\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Kielikoodi:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5983,55 +6254,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Poista kohde"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Siirrä _ylös"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Siirrä _alas"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6040,7 +6311,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6048,196 +6319,184 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Uusi RFX-parameteri"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Muokkaa RFX-parameteria"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Oletusarvo:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Vähimmäisarvo: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Enimmäisarvo: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Oletusarvo:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6247,7 +6506,7 @@
 "\n"
 "Nimi ei saa olla tyhjä.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6257,7 +6516,7 @@
 "\n"
 "Nimi ei saa sisältää välilyöntejä.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6267,7 +6526,7 @@
 "\n"
 "Valikkoteksti ei saa olla tyhjä.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6277,14 +6536,14 @@
 "\n"
 "Toiminnon kuvaus ei saa olla tyhjä.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6292,28 +6551,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6322,41 +6581,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6366,27 +6625,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6395,7 +6654,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6410,12 +6669,12 @@
 "%s?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Poistetaan rfx-komentosarja %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6425,7 +6684,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6435,12 +6694,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6448,23 +6707,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6474,55 +6733,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr ""
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Mukauta"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Kokeile"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Uusi nimi: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6530,26 +6777,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Käytä valinnassa tosiaikaisia tehosteita"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Ladataan hahmonnettu tehoste %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6557,7 +6815,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6565,7 +6823,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6574,34 +6832,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"Tilapäiskansio on LiVESin työkansio jonne avatut leikkeet ja leikesarjat "
-"varastoidaan.\n"
-"Sen tulisi sijaita levyosiolla jossa on runsaasti vapaata levytilaa.\n"
-"\n"
-"Vinkki: vältä sen sijoittamista /tmp-kansioon, sillä tavallisesti /tmp "
-"tyhjennetään järjestelmän sammutuksen yhteydessä."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6613,20 +6872,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6634,296 +6893,312 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (korkein laatu; suurimmat tiedostot)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Asetukset"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Avaa tiedostovalinta suurennettuna"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Näytä viimeisimmät tiedostot Tiedosto-valikossa"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Pysäytä näytönsäästäjä toistettaessa    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Avaa pääikkuna suurennettuna"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Näytä työkalurivi kun tausta on pimennetty"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Käytä hiiren rullaa leikkeiden vaihtoon"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Moninäyttötuki"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " LiVES-käyttöliittymälle käytettävän näytön numero"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " toistoon käytettävän näytön numero"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "Käyttöliittymä"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Siirryttäessä Multitrack-tilaan:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Kysy aina leveys-, korkeus-, fps- ja ääniasetukset"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "Käytä _aina seuraavia arvoja:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Leveys           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Korkeus      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Kumoa-puskurin koko (Mt)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Asetteluiden automaattitallennus"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Jokaisen _muutoksen jälkeen"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Ei koskaan"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Videon toistokomento             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Oletuskuvaformaatti          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Käytä automaattista lomituksenpoistoa mikäli mahdollista"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Avattaessa useita tiedostoja, ketjuta kuvat yhteen leikkeeseen"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "_Esikatselun laatu"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Matala - parantaa suorituskykyä hitaammilla koneilla"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normaali - suositeltava useimmille käyttäjille"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Korkea - parantaa laatua nopeammilla koneilla"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "_Esikatselun laatu"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Näytä FPS-tiedot"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Liitännäinen"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Soitin"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "Äänen soitto_komento"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- sisäinen -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "ÄÄNI"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Toisto"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -6931,235 +7206,249 @@
 "Nauhoita ääni kaapattaessa _ulkoisesta ikkunasta\n"
 " (vaatii jack- tai pulse audion)"
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Mitä nauhoitetaan kun \"r\" on painettu   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "_FPS-muutokset"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "_Tosiaikaiset tehosteet"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Nauhoitus"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Pakkaaja                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Tallennusmuoto"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Äänikoodekki"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Pakkaus"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Käytä kuva-alueen _pehmennystä kokoa muutettaessa"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "_Tehostenäppäimien lukumäärä"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Videoiden latauskansio (oletus)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Videoiden tallennuskansio (oletus) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Äänileikkeiden latauskansio (oletus) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Kuvakansio (oletus) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Varmuuskopio/palautuskansio (oletus) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Tilapäiskansio (älä poista) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "Oletuskansio josta videoleikkeet ladataan"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "Oletuskansio johon pakatut leikkeet tallennetaan"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "Oletuskansio avattaville ja tallennettaville äänitiedostoille"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "Oletuskansio johon kuvaotokset tallennetaan"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr "Oletuskansio yksittäisten leikkeiden varmuuskopiointiin/palautukseen"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "LiVESin työkansio."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Kansiot"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Varoita jos avattavan tiedoston _koko on yli "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " Mt"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Näytä varoitus ennen leikesarjan _tallennusta"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Näytä varoitus jos _hahmonnettuja tehosteita ei löydy käynnistyksen "
 "yhteydessä."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Näytä varoitus jos _pakkausliitännäisiä ei löydy käynnistyksen yhteydessä."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "Varoita leikesarjaa ladattaessa jos asetteluista puuttuu leikkeitä."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Varoita jos asettelussa käytetty leike aiotaan sulkea."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Varoita jos asettelussa käytettyjä kuvia aiotaan poistaa."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Varoita jos asettelussa käytettyjä kuvia aiotaan siirtää."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Varoita jos asettelussa käytettyjä kuvia aiotaan muuttaa."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Varoita jos asettelussa käytetty ääniraita aiotaan poistaa."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Varoita jos asettelussa käytettyä ääniraitaa aiotaan siirtää."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Varoita jos asettelussa käytettyä ääniraitaa aiotaan muuttaa."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Varoita multitrack-tilasta poistuttaessa jos asettelua ei ole tallennettu."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Varoita jos multitrack ei sisällä äänikanavia ja aiotaan ladata ääntä "
 "sisältävä asettelu."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7167,270 +7456,240 @@
 "Varoita jos multitrack sisältää äänikanavia ja äänisoittimeksi ei ole "
 "valittu \"jack\" tai \"pulse audio\"."
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Näytä ilmoitus firewire-laitteelta tuonnin jälkeen."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Näytä varoitus ennen yuv4mpeg-suoratoiston avaamista (edistynyt)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Varoitukset"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi-synkronointi (vaatii tiedostot midistart ja midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pysäytä xmms äänen toiston ajaksi"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD-laite           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Valitse CD-laite"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Sekalaiset"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Uusi teema:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Latauksen kaistanleveys (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES täytyy kääntää ilman valitsinta \"configure --disable-OSC\" jotta OMC:"
 "tä voi käyttää"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Käytä OMC-etäohjausta"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP-portti       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Käynnistä OMC LiVESin käynnistyksen yhteydessä"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Suoratoisto/Verkko"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Jack-välityspalvelu"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Jack-_välityspalvelun asetustiedosto"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Käynnistä _palvelin LiVESin käynnistyessä"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Jack-_äänipalvelimen asetustiedosto"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "_Peliohjaintapahtumat"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Peliohjainlaite"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Peliohjainlaite, esim. /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Valitse peliohjainlaite"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "_MIDI-tapahtumat"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr "Luo ALSA MIDI-portti johon muut MIDI-laitteet voidaan yhdistää"
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Käytä _ALSA MIDIä (suositeltu)"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr "Luo ALSA MIDI-portti johon muut MIDI-laitteet voidaan yhdistää"
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Lue suoraan MIDI-laitteelta"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_MIDI-laite"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDI-laite, esim. /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Valitse MIDI-laite"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Varoitus: toisto saattaa hidastua jos tämä arvo asetetaan liian suureksi.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7438,224 +7697,216 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Teeman vaihdos tulee voimaan vasta seuraavalla LiVESin käynnistyskerralla."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "Jack-asetukset tulevat voimaan vasta seuraavalla LiVEsin käynnistyskerralla."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Videon pituus on nyt %d kuvaa.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Ulkoisen leikkeen asetukset"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Taajuus (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Kanavia "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Näytekoko "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
+
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Nykyinen"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Taajuus (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    K_anavia "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Kanavia "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    _Näytekoko "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Näytekoko "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Uusi"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Kuvaa sekunnissa "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Nauhoita korkeintaan:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " tuntia  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minuuttia  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " sekuntia  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Rajoittamaton nauhoitus"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Napsauta OK aloittaaksesi nauhoituksen, tai Peruuta lopettaaksesi."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Muuta toistonopeutta"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7672,7 +7923,7 @@
 "Anna haluttu toistonopeus\n"
 "_kuvina sekunnissa"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7689,89 +7940,89 @@
 "Anna _uusi toistonopeus\n"
 "kuvina sekunnissa"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "TAI anna haluttu leikkeen pituus _sekunteina"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Muuta myös _äänen nopeutta"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Nopeuden muutos"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Muutettiin toistonopeudeksi %.3f kuvaa sekunnissa.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tyyppi: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7781,7 +8032,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7793,12 +8044,12 @@
 "Napsauta \"OK\" tallentaaksesi tämän näppäinkartan oletuskartaksi\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Tallennetaan näppäinkartta tiedostoon %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -7807,7 +8058,7 @@
 "\n"
 "Päivitetään näppäinkarttatiedosto %s..."
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7817,12 +8068,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7832,22 +8083,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Ladataan oletusnäppäimistökartta tiedostosta %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7862,43 +8113,48 @@
 "%s\n"
 "Virhekoodi on %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Näppäimeen %d on sidottu liian monta tehostetta.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7906,40 +8162,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Ei kuvausta"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Tehosteen nimi: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Liitännäisen nimi: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Tekijä: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Versio: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7948,65 +8209,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES ei löytänyt tehostetta %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Tosiaikaisten tehosteiden näppäinsidokset"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Poista kaikki tehosteet"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Käytössä"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Tietoa"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Määritä arvot"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Tehosteen nimi:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Tallenna oletuskartaksi"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_Lataa oletuskartta"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8056,11 +8321,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d kanava(a) %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8078,64 +8338,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Nykyinen raita: %s (taso %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Nykyinen raita: Tason %d ääni\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f s\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Lähde: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8144,7 +8404,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8152,7 +8412,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8162,7 +8422,7 @@
 "\n"
 "Ei ladattuja leikkeitä.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8172,7 +8432,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8181,12 +8441,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f s - %.2f s\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8194,197 +8454,199 @@
 "Napsauta kerran aikajanalla\n"
 "valitaksesi kuvan.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "_Näytä leikkeen tiedot"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "_Sulje tämä leike"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Äänimikseri (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "Leikkeitä voi raahata"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "aikajanalle."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "Hiiren tila on: Siirrä"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "Hiiren tila on: Valitse"
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "H_iiren tila: Siirrä"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "H_iiren tila: Valitse"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Sulje välit"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Siirrä lohkoa"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Siirrä äänilohkoa"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Poista lohko"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Poista äänilohko"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Poista %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Lisää väli"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8394,7 +8656,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8402,431 +8664,439 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Leikkeet"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "A_vaa tiedostovalinta..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Tuo valinta _dvd/vcd-levyltä..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Tuo valinta _dvd:ltä"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Tuo valinta _vcd:ltä"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "Tuo _laitteelta"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Tallenna asettelu nimellä.."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "L_ataa asettelu..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Pyyhi/poista asettelu..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_LEIKEMUOKKAIN"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "_Säädä valitun leikkeen aloitus/lopetuskohtaa"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "L_isää valittu leike"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "L_isää valittu äänileike"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Poista valittu lohko"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "Hyppää e_delliseen lohkorajaan"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "Hyppää s_euraavaan lohkorajaan"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Poista aikajanan _merkit"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "_Toista aikajanan sijainnista alkaen"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Poista valittu tehoste"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Raidat"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "Jaa nykyinen raita osiin _osoittimen kohdalta"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "Jaa _valitut raidat osiin"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Va_linnat"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Valitse _kaikki videoraidat"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Muuta leveys-, korkeus- ja ääniarvoja..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Näytä"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "L_ähennä"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "L_oitonna"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_Multitrack-tiedot"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "_Tapahtumaikkuna"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Näytä multitrack-näppäimet"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Hiiren tila: _Siirrä"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Hiiren tila: _Valitse"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Laajempi näkymä (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Suppea näkymä (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Leikkeet"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Ankkuroi aloituspiste aikajanaan"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Ankkuroi aloituspiste aikajanaan"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Aloituskuva"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Ankkuroi lopetuspiste aikajanaan"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Ankkuroi lopetuspiste aikajanaan"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Lopetuskuva"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Vieritys"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -8836,91 +9106,91 @@
 "==============================\n"
 "Vaihdettiin leikemuokkaustilaan\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Aikajana (sekuntia)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Tason %d ääni"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Tason %d ääni"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (taso %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (taso %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Poista tämä tehoste"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Tätä tehostetta ei voi siirtää"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d - %d valittuna  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f s"
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d kuvaa"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -8930,65 +9200,65 @@
 "==============================\n"
 "Vaihdettiin Multitrack-tilaan\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8996,21 +9266,21 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -9018,133 +9288,135 @@
 "Tehosteita voi raahata\n"
 "aikajanalla oleviin lohkoihin."
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Valitse tämä lohko"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Jaa lohko osiin tästä"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Poista tämä lohko"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Multitrack-tiedot"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "raita %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "raidat %s ja %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "valitut raidat"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Siivotaan..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Paina toiston aikana \"m\""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "tehdäksesi merkin aikajanalle"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Lisättiin kuvat %d - %d leikkeestä %s raitaan %s aikaväliltä %.4f - %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9153,7 +9425,7 @@
 "Aikajakso %.3f - %.3f\n"
 "valittu.\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9161,12 +9433,12 @@
 "valitse yksi tai useampia raitoja\n"
 "luodaksesi alueen.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d videoraita(a) valittu.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9174,7 +9446,7 @@
 "Kaksoisnapsauta aikajanaa\n"
 "poistaaksesi aikajakson valinnan."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9182,7 +9454,7 @@
 "Napsauta tehostetta\n"
 "valitaksesi sen."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9190,7 +9462,7 @@
 "Kaksoisnapsauta tehostetta\n"
 "muokataksesi sitä."
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9198,88 +9470,78 @@
 "Napsauta tehostetta hiiren\n"
 "oikealla avataksesi pikavalikon.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9287,11 +9549,11 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9300,83 +9562,83 @@
 "\n"
 "Asettelutiedostoa %s ei voitu ladata\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "virheitä havaittu %d.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack-äänimikseri"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Palauta arvot"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Sulje mikseri"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACK-palvelin käynnistetty\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "JACK-palvelimeen ei voitu muodostaa yhteyttä\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9384,7 +9646,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9392,327 +9654,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "arvo"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "Peliohjainpainike %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Peliohjainakseli %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "alue"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMC-koulutin"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Poista kaikki"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Käynnistä videotoisto"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Pysäytä videotoisto"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "Valitse leike <leikenro>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Toista eteenpäin"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Toista taaksepäin"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Käänteinen toistosuunta"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Toista videota nopeammin"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Toista videota hitaammin"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Aloita nauhoitus"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Pysäytä nauhoitus"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9725,7 +9995,7 @@
 "Virhe jäsenneltäessä tiedostoa\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9734,12 +10004,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9882,14 +10152,6 @@
 #~ msgid "Cycle _Step"
 #~ msgstr "_Käynnistä"
 
-#, fuzzy
-#~ msgid "Deinterlace"
-#~ msgstr "Käytä lomituksen poistoa"
-
-#, fuzzy
-#~ msgid "Deinterlacing"
-#~ msgstr "Käytä lomituksen poistoa"
-
 #~ msgid "E_nd %"
 #~ msgstr "Lopetus-%"
 
@@ -9918,12 +10180,12 @@
 #~ msgstr "Häivytä lopusta  "
 
 #, fuzzy
-#~ msgid "Fade video in or out"
+#~ msgid "Fade"
 #~ msgstr "Häivytä alusta  "
 
 #, fuzzy
-#~ msgid "Fade"
-#~ msgstr "Häivytä alusta  "
+#~ msgid "Fading video"
+#~ msgstr "Pysäytä nauhoitus"
 
 #, fuzzy
 #~ msgid "Fading"
@@ -10019,6 +10281,10 @@
 #~ msgstr "_Hylkää muutokset"
 
 #, fuzzy
+#~ msgid "Hue end"
+#~ msgstr "_Häivytystaso"
+
+#, fuzzy
 #~ msgid "Hue start"
 #~ msgstr "_Käynnistä"
 
@@ -10038,6 +10304,10 @@
 #~ msgstr "harmaasävy"
 
 #, fuzzy
+#~ msgid "Modulate (BSH)"
+#~ msgstr "Pikselöidään"
+
+#, fuzzy
 #~ msgid "Modulating"
 #~ msgstr "Pikselöidään"
 
@@ -10175,7 +10445,7 @@
 
 #, fuzzy
 #~ msgid "Step per _Frame"
-#~ msgstr "    Kuv_a"
+#~ msgstr "Aloituskuva"
 
 #, fuzzy
 #~ msgid "Swirl _start"
@@ -10412,9 +10682,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Kopioidaan leikepöydälle"
 
-#~ msgid "_Top"
-#~ msgstr "Yl_häältä"
-
 #, fuzzy
 #~ msgid "_Vertical segments"
 #~ msgstr "Siirretään pystysuunnassa"
@@ -10472,10 +10739,6 @@
 #~ msgstr "Kontrastin säätö"
 
 #, fuzzy
-#~ msgid "deinterlace"
-#~ msgstr "Käytä lomituksen poistoa"
-
-#, fuzzy
 #~ msgid "enhance"
 #~ msgstr "Peruuta"
 
@@ -10523,6 +10786,10 @@
 #~ msgstr "harmaasävy"
 
 #, fuzzy
+#~ msgid "negate"
+#~ msgstr "Liitetään"
+
+#, fuzzy
 #~ msgid "noisify"
 #~ msgstr "Kohina"
 
@@ -10651,8 +10918,14 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "CD-laite täytyy määritellä ensin asetuksista."
 
-#~ msgid "Try again with different values."
-#~ msgstr "Yritä uudelleen toisilla arvoilla."
-
 #~ msgid "$error"
 #~ msgstr "$error"
+
+#~ msgid "Default value:    "
+#~ msgstr "Oletusarvo:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "Vähimmäisarvo: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "Enimmäisarvo: "

LiVES-1.6.1.tar.bz2/po/fr.po -> LiVES-2.0.3.tar.bz2/po/fr.po Changed

@@ -10,20 +10,21 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-01-11 01:14+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Français <kwizart@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-14 13:17+0000\n"
-"X-Generator: Launchpad (build 14664)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,7 +33,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -46,7 +62,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Merci. Une récupération devrait être possible si vous redémarrez LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -59,7 +75,7 @@
 "détails de votre système d'exploitation, la distribution, et la version de "
 "LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +83,7 @@
 "et toute autre information indiquée ci-dessous :\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,170 +93,184 @@
 "recueillir plus d'informations.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Marque positionnée.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Recadrage"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Recadre Toutes Les Images"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Tous"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recommandé"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "désactivé !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**La configuration actuelle**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Intégré"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Personnalisé"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Essai"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Chargement des plugins d'effets en temps réel"
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Lancement du serveur de transport Jack..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Connexion au serveur de transport Jack..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
-"\n"
-"\n"
-"Démarrage manuel de jackd nécessaire. Vérifiez que jackd est démarré, \n"
-"ou mettez la valeur de <jack_opts> dans ~/.lives à 16\n"
-"et redémarrez LiVES.\n"
-"\n"
-"Autrement, essayez de démarrer lives avec soit « lives -jackopts 16 », soit "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Verification des dépendances optionnelles:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer....détecté..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DÉTECTÉ..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...détecté..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DÉTECTÉ..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...détecté..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DÉTECTÉ..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...détecté\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DÉTECTÉ\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...détecté..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DÉTECTÉ..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...détecté..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DÉTECTÉ..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...détecté..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NON DÉTECTÉ..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...détecté..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NON DÉTECTÉ..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...détecté..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON DÉTECTÉ..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...détecté..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON DÉTECTÉ..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr "INCONNU - veuillez me corriger !"
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -251,22 +281,48 @@
 "\n"
 "Le gestionnaire de fenêtres apparaît comme étant  \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre d'écrans trouvés : %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Nombre de processeurs détectés : %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "little endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "big endian"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Le dossier temporaire est %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -276,15 +332,15 @@
 "prise en charge de jack ou de pulse audio.\n"
 "De nombreuses fonctionnalités ne seront pas disponibles.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilé avec le support de jack, bien !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilé avec la prise en charge de Pulse Audio, génial !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -293,7 +349,7 @@
 "Bienvenue sur LiVES version %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -303,77 +359,77 @@
 "La syntaxe de lancement est: %s [options] [nomfichier [start_time] "
 "[frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Où: le nom de fichier est est le nom d'un fichier média ou d'un fichier de "
 "sauvegarde.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time: temps du début du nom du fichier en secondes.\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "images : nombre maximal d'images à ouvrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts peut être:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : montre l'aide et quitte.\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <repertoiretemporaire> : utiliser un autre répertoire de travail "
 "(ex : /var/ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 "-set <nom_du_set> : charger automatiquement l'ensemble de clips nom_du_set\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : ne charger aucun profil au démarrage\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : désactiver la récupération automatique en cas de crash\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 "-recover         : force le chargement du recouvrement après un crash\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr "-nothreaddialog : ne fait rien (option conservée pour compatibilité)\n"
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : lance le programme sans l'interface graphique.\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash : ne pas montrer la fenêtre de démarrage\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin : ne pas montrer la fenêtre de lecture\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : démarrer en mode éditeur de clip\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : démarrer en mode multipiste\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -381,15 +437,15 @@
 "-fxmodesmax <n> : permet <n> modes par clé d'effet (minimum : 1, valeur par "
 "défaut : 8)\n"
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : démarrer l'écoute de OSC sur le port UDP <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart  : ne pas démarrer l'écouteur OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -397,15 +453,15 @@
 "peut être remplacé par mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -416,17 +472,17 @@
 "serveur de transport jack, 8 = mettre l'audio en pause quand la vidéo est "
 "mise en pause, 16 = démarrer le serveur audio jack] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-devicemap <mapname> : lancer automatiquement la cartographie des "
 "périphériques\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -435,15 +491,15 @@
 "lecture vidéo depuis <fichier> (Remarque : définit seulement la "
 "configuration, pas le type du plugin)\n"
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : essayer de debugger les crashs (nécessite 'gdb' installé)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Démarrage de l'interface graphique..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -451,28 +507,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Le thème que vous avez demandé ne peut être trouvé. Assurez-vous que le "
-"thème est installé dans\n"
-"%s/%s.\n"
-"(Vous devez peut être changer la valeur de <prefix_dir> dans votre fichier "
-"~/.lives)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES est incapable d'écrire un petit fichier dans /tmp\n"
-"Assurez-vous SVP que vous avez les permissions d'accès à /tmp et essayez à "
-"nouveau.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -486,50 +532,36 @@
 "Relisez SVP le fichier README livré avec ce programme\n"
 "avant de lancer LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES n'arrive pas à lire son fichier de configuration\n"
-"%s/.lives\n"
-"\n"
-"Vérifiez les permissions de ce fichier et essayez à nouveau.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES n'arrive pas à écrire dans son fichier de configuration\n"
-"%s/.lives\n"
-"\n"
-"Vérifiez les permissions de ce fichier  et du répertoire\n"
-"et essayez à nouveau.\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"Vérifiez le paramètre <tempdir> dans \n"
-"%s/.lives\n"
-"et recommencez.\n"
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -544,7 +576,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -562,7 +594,7 @@
 "\n"
 "Merci.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -572,7 +604,14 @@
 "Actuellement LiVES a besoin de 'Mplayer' ou 'Sox' pour fonctionner. "
 "Installez-en un des deux ou un autre et essayez à nouveau.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -582,7 +621,7 @@
 "LiVES n'arrive pas à trouver 'mplayer'. Vous devez installer mplayer pour "
 "utiliser LiVES pleinement.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -592,7 +631,7 @@
 "LiVES n'arrive pas à trouver 'convert'. Vous devez installer convert qui est "
 "contenu dans ImageMagick si vous voulez utiliser les effets de rendu.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -603,7 +642,7 @@
 "est contenu dans ImageMagick si vous voulez utiliser les fonctions de "
 "fusion.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -613,7 +652,7 @@
 "Lives n'a pas pu trouver 'sox'. Certaines fonctions audios risquent de pas "
 "fonctionner. Vous devriez installer 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -621,69 +660,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES n'arrive pas à trouver de plugin de conversion.\n"
-"Vérifiez que vous les avez installés correctement dans\n"
-"%s%s%s/\n"
-"Vous ne pourrez pas Enregistrer sans eux.\n"
-"(Vous devez peut être changer la valeur de <lib_dir> dans votre fichier ~/."
-"lives)\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "En chargeant automatiquement le set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Lecteur audio invalide %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sans titre%d> %dx%d : %d cadres %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? cadres ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cadres %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Pas de Fichier>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "enr %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!enr %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Lecture"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -691,35 +723,35 @@
 "LiVES ne peut capturer cette image\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Fichier Fermé %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Audio Gauche"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Audio Droite"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -734,26 +766,11 @@
 "Changez SVP les options de lecture dans les Préférences et essayez à "
 "nouveau.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Fenêtre de Lecture"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Fenêtre de Lecture"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -768,7 +785,7 @@
 "\n"
 "(Espace disque restant = %s)\n"
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -784,7 +801,7 @@
 "restant.\n"
 "Choisissez un autre emplacement.\n"
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -801,7 +818,7 @@
 "\n"
 "(Espace disque restant = %s)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -814,11 +831,11 @@
 "%s\n"
 "Veuillez réessayer et choisir un autre répertoire\n"
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Le nom du dossier est trop long!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -826,7 +843,7 @@
 "LiVES A MANQUÉ LE DÉBUT DE TON LECTEUR AUDIO SÉLECTIONNÉ !\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -836,7 +853,7 @@
 "\n"
 "PULSE AUDIO est recommandé pour la plupart des utilisateurs"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -845,7 +862,7 @@
 "pulse.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -855,11 +872,11 @@
 " Vous devez l'installer avant de lancer LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "L'audio JACK est recomandé pour les utilisateurs professionnels"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -868,7 +885,7 @@
 "l'audio jack.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -878,7 +895,7 @@
 "avant de lancer LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -890,11 +907,11 @@
 "autre lecteur audio à la place\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX peut être utilisé si aucun des lecteurs précédents a fonctionné, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -902,14 +919,14 @@
 "mais certaines fonctionnalités audio serontdésactivées.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -917,92 +934,92 @@
 "Le lecteur audio MPLAYER est seulement recommandé dans le but de test.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - choisir un lecteur audio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Utilise le lecteur audio _pulse"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Utiliser le lecteur audio jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Utilise le lecteur audio _sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Utilise le lecteur audui _mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Suivant"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Échoué"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Test de Configuration"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES : - Dépannage"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES va maintenant lancer quelques tests de configuration de base\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Vérification de la présence de \"sox\""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Vous devriez installer sox pour utiliser toutes les fonctionnalités audio de "
 "LiVES"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Vérifie si sox peut convertir du son"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Impossible d'allouer 176400 octets en mémoire."
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Impossible d'écrire sur : %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr "La commande a échoué : %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "Vous devriez installer sox_fmt_all ou équivalent"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Vérifie si \"mplayer\" est présent"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -1010,45 +1027,53 @@
 "Vous devriez installer mplayer pour pouvoir utiliser toutes les "
 "fonctionnalité de décodage de LiVES"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Vérifie si mplayer peut convertir du son"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Vous devriez installer mplayer avec la prise en charge de pcm/wav"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Vérifie si mplayer peut décoder en png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Il est suggéré d'utiliser une version plus récente de mplayer"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Vérifie si mplayer peut décoder en jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 "Vous devriez installer mplayer avec la prise en charge du jpeg ou du png/"
 "alpha"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Vous pouvez ajouter le support de sortie jpeg à mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Vérification de la présence de la commande \"convert\""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Installer imageMagick pour pouvoir utiliser tous les effets"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1060,7 +1085,7 @@
 "    Cliquez sur Annuler pour quitter et installer les composants manquants, "
 "ou sur Suivant pour continuer    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1071,91 +1096,91 @@
 "Finalement, vous pouvez choisir L'interface de démarrage par défaut pour "
 "LiVES\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Laisser LiVES gérer l'extension de fichier"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Appliquer le désentrelacement"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Si vous sélectionnez cela, la vidéo sera désentrelacée durant son "
 "importation."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Voir"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Cliquez ici pour _Prévisualiser tout fichier vidéo, image, ou audio "
 "sélectionné."
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Cliquez ici pour _Prévisualiser tout fichier audio sélectionné"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Cliquez ici pour prévisualiser la vidéo."
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Traitement..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1169,8 +1194,8 @@
 "\n"
 "N'oubliez pas de désactiver les effets (ctrl-0) par la suite !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1178,105 +1203,114 @@
 "\n"
 "Patientez SVP"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Montrer les détails"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Assez"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Voir"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Taille de l'encadrement"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Taille Fichier"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Byte size"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Temps Total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "IPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Images"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Evènement"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Vitesse/taille"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Audio droite"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Options d'encodage"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Conserver mes réglages"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Utilisé les paramètres recommandés"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1284,75 +1318,75 @@
 "Ne _plus afficher cet avertissement à nouveau\n"
 "(peut-être modifié depuis Préférences/Avertissements)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Voir Les _Détails"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Fermer la fenêtre"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Sauve au fichier"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insère"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Nombre de fois à insérer"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Insère pour correspondre au son"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Insère _avant la sélection"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Inserez le contenu du presse-papier avant la sélection"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Insère après la sélection"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Insérer le contenu du presse-papier après la sélection"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Insère avec le _son"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Insère sans le son"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Ouvrir Sélection"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Début de la sélection (sec)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Nombre d'images à ouvrir"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Ouvrir emplacement"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1369,7 +1403,7 @@
 "Préférences|Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1378,47 +1412,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Ne pas envoyer les infos de bande passante"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Essayez cette option si vous avez des problèmes de chargement sur un stream"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Renommer Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Entrer le nom des paramètres"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Choisissez un répertoire de travail"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1432,7 +1482,7 @@
 "LiVES va vous rappeler d'enregistrer le clip fixées ultérieurement lorsque "
 "vous essayez de quitter.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1440,7 +1490,7 @@
 "Pour pouvoir exporter ce projet, il faut nommer cet ensemble de clips.\n"
 "Ce nom sera également utilisé comme nom du projet.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1451,243 +1501,200 @@
 "l'installation initiale afin que vous puissiez profiter au maximum de cette "
 "application.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"Avant tout vous devez choisir un répertoire de travail pour LiVES.\n"
-"Cela devrait être un répertoire avec beaucoup d'espace disque disponible.\n"
-"Notez, sur de nombreux systèmes, /tmp est effacé à l'extinction, de sorte "
-"qu'il mai serait pas souhaitable de le créer dans /tmp.\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Renommer Clip"
 
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Entrer le nom des paramètres"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Choisissez un répertoire de travail"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nouveau Nom "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Indiquer nom "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avancé"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Charger une piste CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Sélectionne le titre/chapitre du DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Sélectionne le titre VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Changer le nombre de pistes affichées"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Piste à charger (de %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Titre DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Titre VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Nombre maximal de piste à afficher"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Chapitre  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Format de sortie"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES: - montée progressive du son (fondu d'ouverture)"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES: - Descente progressive (fondu de fermeture)"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "premier"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "dernier"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "secondes."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "sélection."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Lecture Musique Aléatoire"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Nombre de Pistes demandées :    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Répertoire :"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "inclure les sous-répertoires"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Taille Minimum Fichier (Mo)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Taille Maximun Fichier (Mo)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "sélection"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Commentaires Fichier (optionnel)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Titre/Nom : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Auteur/Artiste : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Commentaires : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: choisir un répertoire"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: choisir un fichier"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Annuler/Continuer/Sauvegarder"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1697,7 +1704,7 @@
 "Votre travail n'a pas encore été sauvegardé.\n"
 "Que voulez vous faire ?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1707,7 +1714,7 @@
 "Votre n'avez pas sauvergardé vos derniers changements.\n"
 "Que voulez vous faire ?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1717,7 +1724,7 @@
 "Vous n'avez pas encore sauvegardé votre travail.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1725,7 +1732,7 @@
 "Le clip current n'a pas été sauvé.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1733,7 +1740,7 @@
 "La disposition actuelle n'a pas étée sauvée.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1742,7 +1749,7 @@
 "enregistrement.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1751,7 +1758,7 @@
 "être conservées.\n"
 "Vous peuvez tenir à rendre avant de quitter le mode multipiste.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1762,100 +1769,100 @@
 "être conservés.\n"
 "Que souhaitez-vous faire ?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Nom de l'ensemble de clips"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "Recharge _automatiquement la prochaine fois"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Essuyez layout"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignore les changements"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Supprime l'ensemble de clips"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Supprime la disposition"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Sauve la disposition"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Sauve l'ensemble de clips"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: récupérer la disposition ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "En sauvant comme l'ensemble %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Sélectionne Fichier"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1863,11 +1870,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Ce fichier"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1875,7 +1882,7 @@
 ",\n"
 " - y compris la mise en page actuelle - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1885,7 +1892,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1895,14 +1902,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1910,7 +1917,7 @@
 "\n"
 "Fichier de projet invalide.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1923,33 +1930,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importer le projet %s en tant que %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "importation du projet"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportation du projet %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportation du projet"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Restaurer fichier .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Sauvegarder comme fichier .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Restaurer fichier .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1961,99 +1968,99 @@
 "L'ensemble sera supprimé du disque.\n"
 "Es-tu sûr ?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Suppression du set..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Suppression du set"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Insère Silence"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Annulation"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "La longueur de la vidéo est maintenant de %d images à %.3f images par "
 "seconde.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Le presse-papiers a été reéchantillonne à %d images.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Refaire"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Copie des images %d à %d%s vers le presse-papiers...."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Copie vers le presse-papiers"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Couper"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Collage"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2067,31 +2074,31 @@
 "Essayez de sélectionner tous les cadres, et d'utiliser ensuite \n"
 "la fonction 'Taille Audio' dans le menu Audio."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Re-échantillonage de l'audio du Presse-papiers"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2103,7 +2110,7 @@
 "LiVES est incapable de reéchantillonner l'audio du presse-papiers. \n"
 "Le Presse-papiers a été effacé.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2117,30 +2124,30 @@
 "Voulez-vous continuer avec cette insertion\n"
 "sans modifier l'audio ?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Insère %d%s images depuis le Presse-papiers..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Insertion"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Insère %d de temps depuis le Presse-papiers%s...."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Insère %d images depuis le Presse-papiers%s...."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Insérer"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2150,49 +2157,49 @@
 "L'effacement de toutes les images va fermer ce fichier.\n"
 "Êtes-vous certain de vouloir continuer ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Effacement des images %d à %d%s...."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Effacement"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Effacer"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2202,7 +2209,7 @@
 "\n"
 "La sélection est verrouillée.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2210,11 +2217,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Enregistrement annulé\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2227,7 +2234,7 @@
 "Le plugin '%s' a retourné :\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2240,7 +2247,7 @@
 "Impossible de trouver la méthode 'init' dans le plugin %s.\n"
 "Le plugin est défectueux ou mal installé."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2249,22 +2256,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Sauvegarde %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Chargement des clips depuis %s"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2276,40 +2283,37 @@
 "fonctionnant sur cette machine.\n"
 "Appuyer sur OK pour commercer.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Nettoyage de l'espace disque..."
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Extérieur: %s\n"
-"Intérieur: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2317,7 +2321,7 @@
 "\n"
 "  Ouverture..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2326,7 +2330,7 @@
 "\n"
 "(%d virtuaux)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2335,7 +2339,7 @@
 "\n"
 "(%d decodés)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2344,7 +2348,7 @@
 "\n"
 "  %.2f sec."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2352,23 +2356,23 @@
 "\n"
 "  Inconnu"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "signé"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2377,7 +2381,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2394,11 +2398,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Un éditeur de vidéo et VJ programme."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Mathieu MD https://launchpad.net/~mathieu.md\n"
+"  Nicolas Chauvet https://launchpad.net/~kwizart\n"
+"  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
+"  Vincent Lhote https://launchpad.net/~vincent.lhote\n"
+"  little jo https://launchpad.net/~littel-jo\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2412,7 +2432,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2422,14 +2442,14 @@
 "\n"
 "Vous devez installer Mplayer pour pouvoir visionner ce fichier.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2437,195 +2457,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Ouverture de l'audio %s, type %s...."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Ouverture de l'audio"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Annulation"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Nouvel audio: %d Hz %d canal/canaux %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Validation du son"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nouveau Audio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d images sont en trop !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Lecture plein Écran (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Lecture plein Écran (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Taille Double (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Taille simple (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Cacher la Fenêtre de Lecture (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Afficher la Fenêtre de Lecture (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Lecture dans une Fenêtre séparée (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Passer en boucle continue (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Passer en boucle continue (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume audio (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Activer ll'audio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Désactiver l'audio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Inversement du Presse-papiers..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Inversement du presse-papiers"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Sélectionner le Fichier Audio"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Indiquez SVP votre lecteur CD dans Outils | Préférences | Divers\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Ouverture de la piste %d en provenance du CD %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Piste CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Ouverture de la piste CD...."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Erreur lors du chargement de la piste du CD\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Sélection des pistes"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "Erreurs de sortie"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Ferme La _Fenêtre"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Efface Les _Fautes"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Supprime les dispositions concernées"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "en attente..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pause"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "reprise..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Garder"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2637,28 +2669,28 @@
 "('Garder' pour garder ce qu'il y a et Arrêter)\n"
 "('Reprendre' pour continuer le traitement)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Image sélectionnée"
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2667,7 +2699,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2680,7 +2712,7 @@
 "fonctionnalité\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2688,7 +2720,7 @@
 "\n"
 "La nouvelle vitesse doit être supérieure à 0\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2702,17 +2734,17 @@
 "Cliquez 'Annuler' pour annuler\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "La fenêtre extérieure a été 'released'.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2728,19 +2760,19 @@
 "Arrêter ou 'q' pour terminer.\n"
 "(La valeur par défaut de %.3f images par seconde est utilisée.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES ne peut capturer cette fenêtre, Désolé.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Exporte Audio Sélectionné sous...."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Exporte Audio sous..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2754,81 +2786,86 @@
 "Cliquez 'OK' pour l'exporter à la nouvelle vitesse ou 'Annuler' pour "
 "l'exporter à la vitesse originale.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportation du son de la position %d à %d sous %s...."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exporte son sous %s...."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportation du son"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Ajouter Fichier Audio..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Ajout du fichier son %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Ajout du fichier son"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Ajouter Audio"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Ajuste audio de %.2f à %.2f secondes..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Ajustement/Complément audio"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Ajuste/Délaie Audio"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Fondu audio entrant"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Fondu audio entrée"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Fondu audio sortant"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Fondu audio sortie"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Fondu audio..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2838,59 +2875,52 @@
 "L'effacement complet de l'audio va fermer ce fichier.\n"
 "Êtes-vous certain de vouloir continuer ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Efface complet de l'audio..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Effacement de l'audio de %.2f à %.2f secondes..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Effacement du son"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Efface Audio"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Enregistre de nouvel audio"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Insertion d'un silence de %.2f à %.2f secondes..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Insertion Silence"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Impossible de trouver le fichier image : %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Union"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Fusionner Presse-papiers [ %d Images ]       Avec la sélection [ %d Images ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2898,913 +2928,891 @@
 "Fusionner Presse-papiers [ %d Images (reéchantillonnées]       Avec la "
 "sélection [ %d Images ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Aligner Début"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Aligner Fin"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Que faire des images en plus du presse-papiers -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Insérer Images"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Ignorer images"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Nombre de relectures du Presse-papiers"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Répéter _le Presse-papiers pour Correspondre à la Sélection"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "Méthode de _Transition :"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Jonction du presse-papiers avec la sélection..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "insertion de %d image(s) en plus avant le point de fusion\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "insère à présent %d image(s) en plus\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Fusion terminée.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "Effets Personnalisés"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "_Utilitaires Personnalisés"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Ouvre Fichier/Répertoire"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Ouvrir URL/Stream..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importe depuis _Firewire périphérique (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importe depuis _Firewire périphérique (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "Fichiers _Récents...."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Ferme / _Enregistre Tous Les Clips"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Ferme Ce Clip"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Nettoyage de l'espace disque"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Mode multipistes"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copier Sélection"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "_Couper Sélection"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Insérer depuis le Presse-papiers..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Coller comme _Nouveau"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Joindre le Presse-papiers avec la Sélection...."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Effacer Sélection"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Dissocier _Vidéo de l'Audio"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Sélectionner..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Sélectionner toutes les Images..."
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "Première Image seulement"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_Dernière Image seulement"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Sélection à partir de la première Image"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Sélection jusqu'à la Dernière Image"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Sélection dernière Insertion/Fusion"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Sélection dernier _Effet"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inverser Sélection"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "Verrouiller _Largeur Sélection"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Lecture"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "Lecture Tout"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Lecture Sélection"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Lecture Presse-papiers"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Arrêter"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Rembobiner"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Plein Écran"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Taille Double"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Lecture dans une Fenêtre _Séparée"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Cacher Arrière Plan"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Auto)relecture Vidéo (pour correspondre à la piste audio)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Lecture Continue"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong (Lecture Continue)"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Muet"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Fenêtre mode 'S_ticky' séparée"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "Afficher Compteur d'Image_s"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Effet_s"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Les effets sont appliqués à la sélection actuelle."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Outils"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Les outils s'appliquent aux clips en entier."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Inve_rser contenu Presse-papiers"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Change la vitesse de Playback/Sauvegarde"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Reéchantillonner la _Vidéo avec la Nouvelle Vitesse..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitaires"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Génère"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Outils Personnalisés"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Génère"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Capturer Fenêtre _Extérieure.... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Préférences...."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Charge _Nouveau Son pour le Clip..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "_Charger une piste CD...."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "Éjecter CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Enregistrement audio"
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "vers nouveau clip..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "vers Sélection"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Fondu audio entrant..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Fondu audio sortant..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Exporter Audio..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Exporte Audio _Sélectionné...."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Exporter _Audio Complet...."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Ajouter Audio..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Ajuste/Délaie Audio..."
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Ajuste/Délaie Audio vers la _Sélection"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Ajuste/Remplit l'Audio depuis le début jusqu'à Démarrer la Lecture"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Efface Audio..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "_Effacer Audio Sélectionné"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Efface Tout l'_Audio"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Insérer un silence dans la sélection"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Reéchantillonner Audio...."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Jouer _Musique avec xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Musique aléatoire avec xmms..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Arreter la lecture xmms"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Informations"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Afficher/_Éditer les Commentaires Fichier"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Afficher Informations du Presse-papiers"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Afficher Messages"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Afficher les erreurs de _mise en page"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Clips"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renomme le Clip actuel dans le Menu..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "A_vancé"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Effets _RFX/Outils/Utilitaires"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Nouvel Essai de Script RFX..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copie Script RFX vers Essai..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Édite l'essai de Script RFX...."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "_Renomme l'Essai de Script RFX...."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "Efface l'Essai de Script RFX...."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promouvoir Effet Rendu Du Test/Outil/Générateur..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importer un Script RFX Personnalisé..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_xporter un Script RFX Personnalisé..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "Effacer un Script RFX Personnalisé..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Régénère tous les plugins RFX"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Recevoir les flux _LiVES depuis..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "Envoyer les flux LiVES vers..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importe Projet (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "_Exporte Projet (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Lie les effets en temps réel aux touches ctrl-nombre."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Réinitialiser toutes les vitesses de lecture et les positions"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "Interface _MIDI/joystick"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "Apprenant _MIDI/joystick..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Afficher Touches de Raccourci"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "J_ouets"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_Mauvaises Images"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (hertzienne)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manuel (il s'ouvre dans le navigateur)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Faites un don au projet !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Envoie une e-mail à l'auteur"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Signale un _bug"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Propose une nouvelle _fonctionnalité"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Aider à la _traduction"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Résolution de problèmes"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_A propos"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Revenir au début (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Lecture de l'ensemble (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Arrête la lecture (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Lecture Sélection (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Volume audio (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Couleur d'arrière-plan (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Jouer plus lentement  (ctrl-bas)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Jouer plus rapidement (ctrl+haut)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Retour rapide (Ctrl+gauche)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Avancer (ctrl+droit)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Cache cette barre d'outils"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Vitesse de vidéo (images par seconde)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Faire varier la vitesse de la vidéo"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Première Image"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Dernière Image"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "Le cadre choisi en premier dans ce clip"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "Le cadre sélectionné dernier dans ce clip"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Démarrage...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Appuyer sur 'q' pour arréter l'enregistrement. NE RECOUVREZ PAS LA "
 "FENÊTRE DE LECTURE !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Numéro de cadres pour prévisualiser"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Libre"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Début"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Fin"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Pointeur"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Rembobiner"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Lecture de l'ensemble"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Lecture Sélection"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Boucle On/Off"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Démarrer l'enregistrement"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Arréter l'enregistrement"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Cacher la Fenêtre de Lecture"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Afficher la Fenêtre de Lecture"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Effacement du presse-papiers"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3815,7 +3823,7 @@
 "==============================\n"
 "Basculé sur le clip %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3825,74 +3833,74 @@
 "==============================\n"
 "Basculé sur le clip vide\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(vide)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3900,7 +3908,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3908,7 +3916,7 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3916,13 +3924,13 @@
 "\n"
 "Le nom du paramètre ne doit pas être vide.\n"
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3931,13 +3939,13 @@
 "\n"
 "Le nom ne doit pas contenir d'espaces ou de caractère %s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3945,70 +3953,70 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Vidéo [ouverture...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Vidéo [%.2f sec]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Non Défini)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Pas de vidéo)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Pas de son)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [ouverture...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Audio Gauche [ouverture...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Audio Gauche [%.2f sec]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Audio Droit [ouverture...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Audio Droit [%.2f sec]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES ne peut basculer sur Mplayer lorsque un clip est en cours de "
 "chargement."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Remise en ordre du clip"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4023,53 +4031,64 @@
 "\n"
 "Écraser ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Annuler %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Rétablir %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Sélection------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sec ] ----------Sélection---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " images ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Examiner l'en tête du fichier"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Ouverture de %s début %.2f sec. %d images"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " sans le son"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4081,11 +4100,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - soyez patient SVP."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4097,7 +4116,7 @@
 "LiVES n'est pas capable d'extraire de la vidéo ou du son avec ce fichier.\n"
 "Vérifier dans le terminal pour plus de détails\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4107,7 +4126,7 @@
 "\n"
 "Vous devez installer mplayer pour pouvoir visionner ce fichier.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4119,29 +4138,29 @@
 "Vérifiez SVP les paramètres de la commande d'ouverture Vidéo dans\n"
 "Outils|Préférences|Décodage\n"
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4153,37 +4172,33 @@
 "\n"
 "Voulez-vous vraiment continuer ?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "sélection"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Lier la sélection"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (sans le son)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Enregistrement des images %d à %d%s en tant que \"%s\" : encodeur = %s : "
 "format = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Enregistrement des images 1 à %d%s en tant que \"%s\" : encodeur = %s : "
 "format = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Épargne [peut prendre un certain temps]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4193,33 +4208,33 @@
 "\n"
 "Erreur sur l'encodeur - fichier de sortie non créé !\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "enregistrement annulé par la pré-visualisation.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Enregistrement de la représentation..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Moyenne d'IPS = %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4233,16 +4248,16 @@
 "Vous devez aller dans Outils--->Redimensionner toutes les images\n"
 "et redimensionner toutes les images aux dimensions actuelles.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Sans Nom%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4250,7 +4265,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4262,14 +4277,14 @@
 "%.3f ips. \n"
 "La valeur par défaut peut être fixée dans Outils|Préférences|Divers.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "La vitesse de playback est ajustée à %.3f images par seconde pour "
 "correspondre au son.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4278,56 +4293,51 @@
 "Cadres = %d genre = %s dimension = %d x %d *bpp = Greyscale* fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "aucun %s\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d canal/canaux %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Commentaires : %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Enregistre Image %d comme %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Sauvegarde %s à %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Sauvegarde"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "les données de la représentation sont sauvegardées..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restauration de %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Restauration"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4341,22 +4351,22 @@
 "LiVES est incapable de le restaurer.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4364,7 +4374,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4374,59 +4384,59 @@
 "Des fichiers d'une précédente exécution de LiVES ont été trouvés.\n"
 "Voulez-vous essayer de les récupérer ?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Récupération des fichiers"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Récupération des fichiers..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Afficher les _mises en page touchés"
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Attention !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "attention"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4437,7 +4447,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4449,11 +4459,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Lecteurs audio ne peuvent pas être allumés pendant la lecture."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4465,20 +4475,18 @@
 "LiVES ne peut terminer cette opération à cause d'un manque de mémoire.\n"
 "Essayez SVP de fermer d'autres applications.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% fait. Temps restant: %u sec\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4487,14 +4495,14 @@
 "\n"
 "%d/%d images ouvertes. Temps restant %u sec.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4503,7 +4511,7 @@
 "\n"
 "%d images ouvertes.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4512,7 +4520,7 @@
 "\n"
 "Temps restant: %d sec"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4523,7 +4531,7 @@
 "Désolé, LiVES ne peut ouvrir que %d fichiers à la fois.\n"
 "Fermez un fichier et essayez à nouveau."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4542,14 +4550,14 @@
 "\n"
 "Assurez-vous que vous pouvez écrire dans ce répertoire."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4561,19 +4569,19 @@
 "Cet encodeur/format ne peut utiliser le codec audio demandé.\n"
 "Fixez SVP le codec audio dans Outils|Préférences|Encodage\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4584,7 +4592,7 @@
 "\n"
 "Provient de restrictions dans le format %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4592,43 +4600,43 @@
 "LiVES recommande les paramètres suivants:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", signé"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", non signé"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Nombre d'images par secondes défini à %d:%d par seconde\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Redimensionner vers %d x %d pixels\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4636,35 +4644,35 @@
 "\n"
 "Vous voudriez :\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "Redimensionner la video en %d x %d pixels\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES doit:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "Rééchantillonage vidéo à %.3f images par seconde.\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "rééchantillonage video en %d:%d images par seconde\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4678,7 +4686,7 @@
 "Appuyer sur `OK` pour commencer, `Annuler` pour abandonner.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4688,7 +4696,7 @@
 "Les changements appliqués à la selection ne seront pas permanents.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4702,7 +4710,7 @@
 "\"moire disponible.\n"
 "Essayez d'enregistrer sur une partie du fichier."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4720,7 +4728,7 @@
 "\n"
 "Cliquez sur Annuler pour abandonner ou OK pour continuer."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4734,11 +4742,11 @@
 "N'appuyer sur OK que si vous comprenez ce que vous faites, sinon appuyer sur "
 "Annuler."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Afficher Touches"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4820,11 +4828,11 @@
 "d taille double\n"
 "g boucles ping-pong\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Clefs multipiste"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4846,19 +4854,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Historique des Messages"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Après une installation/mise à jour vous devez ajuster le paramètre "
-"<prefix_dir> dans votre fichier ~/.lives"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4866,10 +4873,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4879,18 +4886,18 @@
 "\n"
 " (Les extensions doivent être du type .mp3, .ogg, .wav, .mod, .xm ou .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "échoué (type de fichier inconnu)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4899,7 +4906,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4907,7 +4914,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4915,7 +4922,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4926,7 +4933,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4936,7 +4943,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4944,7 +4951,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4953,13 +4960,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4970,7 +4977,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -4978,7 +4985,7 @@
 "\n"
 "Sinon, vous pouvez redémarrer LiVES et sélectionner un autre lecteur audio.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4988,7 +4995,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4997,7 +5004,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5005,7 +5012,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5013,7 +5020,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5022,50 +5029,50 @@
 "LiVES ne peut allouer suffisamment de mémoire pour l'historique des "
 "opérations multipiste.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "ou entrer une valeur plug petite.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5075,7 +5082,7 @@
 "\n"
 "Le taux audio doit être supérieur à 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5083,7 +5090,7 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5093,7 +5100,7 @@
 "\n"
 "Vous devez installer 'dvgrab' pour utiliser cette fonction.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5102,25 +5109,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5129,33 +5136,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "annulé.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "échoué.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "erreur dans le fichier. Echec.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -5165,7 +5172,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -5175,7 +5182,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -5185,7 +5192,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -5194,7 +5201,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -5204,7 +5211,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5213,7 +5220,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5223,12 +5230,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5237,7 +5244,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5250,7 +5257,7 @@
 "%s\n"
 "Vérifiez les permissions du fichier et essayez à nouveau."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5259,14 +5266,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5274,13 +5289,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5290,27 +5305,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5319,14 +5334,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5337,19 +5352,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5357,7 +5372,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5365,7 +5380,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5377,7 +5392,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5386,34 +5401,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5422,216 +5437,289 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "générateur"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Générateur"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "générateur"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Générateur"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "transition"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transitions"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "effets"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Effets"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "Utilitaire"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilitaires"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositeur"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Compositeurs"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "séparateur"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Séparateurs"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Convertisseurs"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Transitions Audio/Vidéo"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "audio seulement"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mixers Audio"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Mixers Audio"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s toutes les images...."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s le presse-papiers dans les images %d à %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s vers le presse-papiers..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s vers un nouveau clip..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s images %d à %d...."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s le presse-papiers avec la sélection"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s vers le presse-papiers"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s vers un nouveau clip"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s images %d à %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Erreur: le greffon %s n'a pas de fonction weed_setup().\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5640,130 +5728,310 @@
 "Info: Impossible de charger le plugin %s\n"
 "L'erreur était: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Impossible de charger l'instance %s, code d'erreur %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Impossible de charger le générateur %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Impossible de démarrer le générateur %s.\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Impossible de charger le générateur %s, erreur %d.\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Vous pouvez cliquer sur Prévisualiser pour changer ces valeurs"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Remise à Zéro des valeurs"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Images"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Maintenir les proportions originales"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "M_aintenir Proportions"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr ""
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Maintenir les proportions originales"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "Transition d'entrée"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr ""
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : taille"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Nouvelle taille (pixels)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "Largeur"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Hauteur"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Générer vers le presse-papiers"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Générer les images vers le Presse-papiers..."
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Générer les images vers un nouveau clip"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Générer les images vers un nouveau clip"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5774,59 +6042,59 @@
 "Vous devez sélectionner au moins %d images pour utiliser cet effet.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Utiliser par défault"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Fermer la fenêtre"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Pas de paramètre"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Paramètre non valide"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES:- Sélectionne Couleur"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Cliquez pour changer la couleur"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Valeur de rouge  (0 - 255)"
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Valeur de vert  (0 - 255)"
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Valeur de bleu  (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -5835,12 +6103,12 @@
 "\n"
 "Erreur plugin : %s a échoué avec le code %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : le message était %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5855,17 +6123,17 @@
 "%s\n"
 "Code d'erreur %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Actualisation du module de lecture vidéo par défault depuis %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Chargement du module de lecture vidéo par défault depuis %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5875,32 +6143,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_IPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Entré colorimétrique vers le plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "Espace colorimétrique"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Entré colorimétrique vers le plugin.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5913,16 +6181,7 @@
 "Échec à l'ouverture du module de lecture %s\n"
 "L'erreur était %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"Échec à l'initialisation du module de lecture.\n"
-"L'erreur était: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5932,44 +6191,49 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"Échec à l'initialisation du module de lecture.\n"
+"L'erreur était: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVES n'arrive pas à trouver ces plugins . Assurez-vous que ces plugins sont "
-"installés dans\n"
-"%s%s%s\n"
-"ou changer la valeur de <lib_dir> dans ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5982,11 +6246,11 @@
 "%s%s%s\n"
 "ou basculez sur un autre plugin dans Outils|Préférences|Encodage\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5995,7 +6259,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6005,188 +6269,172 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 "Chargement de %s échoué, les transitions ne peuvent être redimensionnées.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "paramètres avancés %s"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nouvel Essai RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Édite l'Essai RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Type :"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Effet -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transition -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Générateur -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Outil -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utilitaire -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Nom :          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Le nom du plugin, Sans espaces."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Version :       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "La version du script"
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Auteur :       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "L'auteur du script."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (optionel):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL pour le mainteneur du plugin"
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Texte du Menu :    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Le texte à afficher dans le menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Description de l'action :        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Décrivez ce que fait le plugin. Ex. \"Détection de Bords\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Nombre d'images minimum :"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "Le nombre minimum d'images pour cet effet/outil. Habituellement 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "A besoin de...."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Indiquez toutes les librairies d'on a besoin ce plugin."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Propriétés...."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Fixer les propriétés pour ce plugin. Optionnel."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Paramètres...."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Fixer les paramètres en code pre/loop/post/trigger. Optionnel."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Paramètres d'Info Bulle...."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "Fixer les renseignements pour compléter la fenêtre des paramètres. Optionnel."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Langage de programmation :"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Langage de programmation pour pre/loop/post/triggers. Optionnel."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "Code _Pre loop...."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Code à exécuter avant la boucle (loop). Optionnel."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "Code Boucle..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Code de boucle appliqué à chaque image."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "Code suivant la boucle...."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Code devant être exécuté après la boucle. Optionnel."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "Code _trigger..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6194,7 +6442,7 @@
 "Fixer le code trigger quand les paramètres de la fenêtre sont affichés ou "
 "lorsqu'un paramètre est changé. Optionnel (excepté pour les Utilitaires)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6209,55 +6457,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Besoins RFX"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Paramètres RFX"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Paramètres Info-Bulle de la fenêtre RFX"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Triggers RFX"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nouvelle Entrée"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Édition Entrée"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "Enlève_r Entrée"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Déplacer vers le _Haut"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Déplacer vers le _Bas"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Propriétés RFX"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "Lent (avertir)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6271,7 +6519,7 @@
 "Enlevez SVP le trigger en premier.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6283,27 +6531,27 @@
 "Quelques triggers ont été ajustés.\n"
 "Vérifiez SVP le code du trigger.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nouveau Paramètre RFX"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Édite le Paramètre RFX"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "Nom:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "Marque:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6311,172 +6559,160 @@
 "Étiquette devant être affichée par le paramètre. Un tiret bas « _ » indique "
 "le raccourci clavier."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "_Groupe de boutons : "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-"Une valeur non égale à zéro peut être utilisée pour grouper les boutons "
-"radio."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Genre:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Typ de paramètre (sélection depuis la liste)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "_Places des décimales : "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "Valeur par défaut :    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "Par défaut: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "_Groupe de boutons : "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+"Une valeur non égale à zéro peut être utilisée pour grouper les boutons "
+"radio."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "Valeur _minimale: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Valeur ma_ximale: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     Taille du pas:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Emballe: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Pose _valeurs"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Valeur par défaut :    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Valeur Minimum : "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Valeur Maximum : "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Défaut rouge:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Défaut vert:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Défaut bleu: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "Définir par _défaut"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Valeur par défaut:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "La longueur maximale du texte: "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nouvelle Info-Bulle de Fenêtre RFX"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Édite Info-Bulle de Fenêtre RFX"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Mot-Clé :         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Type spécial :         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "SubType Spécial :         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Ligne :    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Paramètres liés (%d) :    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Paramètres liés (4) :    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Paramètres liés (2) :    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nouveau Trigger RFX"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Édite Trigger RFX"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Quand :         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Code précédant la Boucle"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Code de la Boucle"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Code suivant la Boucle"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES : - Texte par défaut (longueur max. : %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Entrer le nom des paramètres, un par ligne"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6486,7 +6722,7 @@
 "\n"
 "Le nom ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6496,7 +6732,7 @@
 "\n"
 "Le nom ne doit pas contenir d'espaces.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6506,7 +6742,7 @@
 "\n"
 "Le texte de menu ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6516,7 +6752,7 @@
 "\n"
 "La description de l'action ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6526,7 +6762,7 @@
 "\n"
 "L'auteur ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6538,7 +6774,7 @@
 "Un plugin existe déjà avec ce nom.\n"
 "Le nom doit être unique.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6548,7 +6784,7 @@
 "\n"
 "Le code de boucle ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6558,7 +6794,7 @@
 "\n"
 "Le code trigger ne doit pas être vide pour un utilitaire.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6568,7 +6804,7 @@
 "\n"
 "Le nom du paramètre ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6582,41 +6818,41 @@
 "greffon doivent être uniques.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Écriture du fichier script %s...."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "Aucune section <define> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Mauvaise version du Script.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "Pas de section <name> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "Aucune section <version> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "Aucune section <author> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "Aucune section <description> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Description érronnée. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6631,27 +6867,27 @@
 "trouvé dans le script.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Régénère tous les scripts RFX....intégré..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Regénère tous les scripts RFX"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "personnalisé...."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test...."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "régénère les entrées dynamiques des menus...."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6664,7 +6900,7 @@
 "LiVES est incapable de trouver le programme %s.\n"
 "Vérifiez SVP si ce programme est dans le path et  exécutable.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6679,12 +6915,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Effacement du script RFX %s...."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6699,7 +6935,7 @@
 "%s\n"
 "Le code d'erreur est %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6714,12 +6950,12 @@
 "existe déjà.\n"
 "Effacez-le en premier ou renommez le script test.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Passage du plugin rfx test %s vers personnalisé..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6727,29 +6963,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Échec lors du déplacement du plugin de\n"
-"%s vers\n"
-"%s\n"
-"Le code retourné est %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importe Script depuis..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Exporte Script vers..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6764,55 +6994,43 @@
 "existe déjà.\n"
 "Effacez-le en premier ou renommez le script d'import.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Intégré"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Essai"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copie Script RFX"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Type de provenance :    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Script :    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: -Renomme l'Essai de Script RFX...."
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Depuis Script : "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nom du Script RFX"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Nom du script : "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Nouveau Nom : "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Nouveau nom de script : "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6824,28 +7042,45 @@
 "Un script de test existe déjà sous ce nom.\n"
 "Le nom de script doit être unique.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renomme le script de test RFX de %s vers %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Échec lors du déplacement du plugin de\n"
+"%s vers\n"
+"%s\n"
+"Le code retourné est %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Applique effets en temps réel à la sélection"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Chargement de l'effet rendu %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Allez sur VJ - Afficher les touches VJ. Fixez les effets et appliquez-les "
 "ensuite ici."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6857,7 +7092,7 @@
 "Les greffons de lecture vidéo sont uniquement activés en\n"
 "mode plein écran, fenêtre séparée (fs)\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6869,7 +7104,7 @@
 "\n"
 "(Espace disque restant = INCONNU)"
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6878,40 +7113,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"Le répertoire temporaire est le répertoire de travail de LiVES où les clips "
-"et sets ouverts sont stockés.\n"
-"Il devrait se trouver sur une partition ayant beaucoup d'espace libre.\n"
-"\n"
-"Info : évitez d'utiliser /tmp, car ce répertoire est souvent vidé lors de "
-"l'arrêt du système d'exploitation."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Impossible de créer ou d'écrire dans le nouveau répertoire temporaire.\n"
-"Vous devez certainement le créer en tant qu'utilisateur root au début, e.g:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"Le répertoire ne doit plus être changé ensuite.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6931,7 +7161,7 @@
 "Dans le cas contraire, cliquez sur Annuler pour retrouver le répertoire "
 "temporaire comme à l'origine."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -6942,7 +7172,7 @@
 "installé.\n"
 "Voir http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -6951,7 +7181,7 @@
 "Le changement de lecteur audio nécessite un redémarrage (jackd ne doit pas "
 "être lancé)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6963,67 +7193,67 @@
 "d'abord être installé.\n"
 "Voir http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (meilleure qualité ; plus gros fichiers)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Préférences"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Ouvrir la sélection de fichiers maximisée"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Afficher fichiers récents dans le menu fichier"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "En lecture désactiver l'économiseur d'écran    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Ouvrir la fenêtre principale maximisée"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Afficher la barre d'outils lorsque l'arrière plan est ignoré"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Faire défiler les clips avec la roulette de la souris"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr "Réduire l'aperçu pour l'adapter à l'interface"
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Mode de démarrage :"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "Éditeur de _clips"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "Mode _multitrack"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Support de plusieurs moniteurs"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " Numéro du moniteur pour l'interface de LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " numéro du moniteur pour la lecture"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7031,384 +7261,412 @@
 "Une valeur de 0 permet d'utiliser tous les moniteurs disponibles (ne "
 "fonctionne qu'avec certains greffons de lecture)."
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Force moniteur unique"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Forcer le mode moniteur unique"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "Interface Graphique"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Lors du passage en mode Multitrack :"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_M'avertir pour la largeur, la hauteur, fps et les réglages audio"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "Toujours utiliser les valeurs suivantes:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Utiliser ces mêmes _valeurs pour le rendu d'un nouveau clip"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Largeur           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Taille      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr "          _FPS"
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Piste audio par piste vidéo"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Taille du tampon d'annulation (Mo)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "Sortir du mode Multitrack après le r_endu"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Sauvegarde automatique des agencements"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Chaque"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "secondes"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Après chaque _changement"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Jamais"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Multi-piste/Render"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Utiliser l'ouverture instantanée si possible"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Utiliser l'ouverture instantanée par greffons de décodage pour certains "
 "types de fichiers"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Commande d'ouverture de Vidéo             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Compression d'ouverture/de rendu                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
+
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     (petit = plus lent, fichiers plus grands; pour jpeg, meilleure "
 "qualité)"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Format d'image par défaut          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr "(Voir Aide/Dépannage pour la liste des formats d'image compatibles)"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Décodage"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-"La qualité de l'aperçu pour la lecture vidéo - affecte le redimensionnement"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Prévisualiser la qualité"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Basse - peut améliorer les performances sur des machines lentes"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normale - recommandée pour la plupart des utilisateurs"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Haute - peut améliorer la qualité sur des machines très rapides"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Prévisualiser la qualité"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+"La qualité de l'aperçu pour la lecture vidéo - affecte le redimensionnement"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "Affiche les Statistiques d'IP_S"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "Greffon"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDÉO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Lecteur"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "Commande de lecture audio"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- interne -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Playback"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Quoi enregistrer lorsque 'r' pressé   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "Changement d'images"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "Changement I_PS"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "Effets en temps _réel"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-#, fuzzy
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_Audio (nécessite de jack ou du lecteur audio pulse)"
-
-#: src/preferences.c:3529
-#, fuzzy
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_Audio (nécessite de jack ou du lecteur audio pulse)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Enregistrement"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Encodeur                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Format de sortie"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Codec audio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Utiliser _antialias lors du redimensionnement"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Nombre de touches pour les effets en temps _réel"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Répertoire des images (par défaut) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Répertoire temporaire (ne pas supprimer) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "Répertoire de travail de LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Répertoires"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7416,362 +7674,332 @@
 "Avertissement lors de l'Insertion / Union si le nb d'images par secondes du "
 "presse-papiers ne correspond pas à celui de la sélection"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avertissement à l'Ouverture si la taille dépasse "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " Mo"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Afficher un avertissement avant d'enregistrer les paramètres"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 "Avertir si les cadres utilisés dans une mise en page sont sur le point "
 "d'être déplacés."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 "Avertir si les cadres utilisés dans une mise en page sont sur le point "
 "d'être modifiés."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 "Avertir si l'audio utilisé dans une mise en page est sur le point d'être "
 "supprimé."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 "Avertir si l'audio utilisé dans une mise en page est sur le point d'être "
 "déplacé."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 "Avertir si l'audio utilisé dans une mise en page est sur le point d'être "
 "modifié."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Avertir si la mise en page n'a pas été enregistrée au moment de quitter le "
 "mode multipiste."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Afficher un message apres l'importation d'un périphérique firewire"
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Afficher un avertissement avant d'ouvrir un flux yuv4mpeg (avancé)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Avertissements"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Synthétiseur Midi (a besoin des fichiers midistart et midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Lors de l'insertion/fusion des images :  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Accélère/Ralentit Insertion"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Reéchantillonner l'Insertion"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pause xmms lors du playback audio"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "Lecteur CD           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Choisissez périphérique CD"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LIVES ne peut charger les pistes audio de ce CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "IPS par défaut        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Images par seconde à utiliser si aucun est sélectionné"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Divers"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Nouveau thème :           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Bande passante de Téléchargement (Ko/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Contrôle distant OMC activé"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Lancer OMC au démarrage"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Diffusion/Réseau"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Transport jack"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Fichier de configuration Jack _transport"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Lancement du _server au démarrage de LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Audio Jack"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Nom du serveur jack pour l'audio"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Intégration de jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "Événements _joystick"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "Dispositif _joystick"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Le dispositif joystick, par exemple /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "Événements _MIDI"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr ""
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Utilise _ALSA MIDI (recommandé)"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr ""
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Lire directement depuis le périphérique MIDI"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "périphérique _MIDI"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "Le dispositif MIDI, par exemple /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Choisissez le périphérique MIDI"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "Répétition MIDI"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Attention: la définition de cette valeur à un niveau trop élevé peut "
 "ralentir la lecture.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7779,69 +8007,69 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Les changements de thème ne prennent effet qu'après redémarrage de LiVES."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Les options de jack ne prennent effet qu'après redémarrage de LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "La longueur de la vidéo est maintenant de %.8f images par seconde.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Ne peut initialiser le récepteur OSC\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionnement de l'image 1 vers %d"
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Retailler"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Rééchantillonner/Retailler"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "La longueur de la vidéo est maintenant de %d images.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -7851,155 +8079,147 @@
 "\n"
 "La nouvelle vitesse doit être supérieure à 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Reéchantillonage audio"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES ne peut reéchantillonner l'audio comme demandé.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Reéchantillonner Audio"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "L'audio est reéchantillonné à %d Hz, %d canal/canaux, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "La longueur de la vidéo est maintenant à  %.8f images par seconde..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "La longueur de la vidéo est maintenant à %.3f images par seconde..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Erreur de réorganisation !\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Ré-echantilloner"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Reéchantillonner Audio"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Insère Silence"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nouveau clip audio"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Paramètres du clip externe"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Vitesse (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Canaux "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Taille "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
+
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Signé"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Non Signé"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Courant"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Permet audio"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Proportion (Hz) "
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Canaux "
-
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Canaux "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Taille d'échantillon "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nouveau"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "Images par secondes "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Valeur maximum possible pour l'enregistrement:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " heures  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minutes  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " secondes  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 "Cliquez sur OK pour commencer l'enregistrement, ou Annuler pour sortir."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Change la vitesse de playback"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Reéchantillone Vidéo"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8010,7 +8230,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8021,69 +8241,69 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OU entrez la durée désirée pour le clip en _secondes"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Changement de vitesse"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Changé la vitesse de playback à %.3f ips et l'audio à %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Changé la vitesse de playback à %.3f images par seconde.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Reéchantillonage de la vidéo"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Reéchantillonage de la vidéo du presse-papiers"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Réorganisation des images"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8093,20 +8313,20 @@
 "\n"
 "LiVES n'est pas capable de réorganiser les images."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Désorganisation des images"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "erreur de reéchantillonage...."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8116,7 +8336,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8128,12 +8348,12 @@
 "Cliquer sur 'OK' pour sauvegarder ce keymap en tant que defaut\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Sauvegarde des raccourcis vers %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8142,7 +8362,7 @@
 "\n"
 "Actualiser le fichier keymap %s..."
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -8152,12 +8372,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Enregistre les effets temps réél par défault vers %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8172,22 +8392,22 @@
 "%s\n"
 "Code d'erreur %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Chargement des effets temps réél par défault depuis %s ..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Chargement du keymap par défaut depuis %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8197,43 +8417,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Ligne invalide %d dans %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Clef invalide %d dans %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Effet invalide %s dans %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Trop effets liés à la clé %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "Actualisation requise.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8245,40 +8470,45 @@
 "Certains effets ne peuvent être trouvés\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Pas de Description"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informations pour %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nom de l'effet: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nom du greffon: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur/Artiste : %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Version :  %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Description : "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8287,65 +8517,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES ne peut pas localiser l'effet %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Capturer l'entrée clavier"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Clef active"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Capturer l'entrée clavier"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Vider tout les effets"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Informations"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Paramètres"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Nettoyer"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Nom de l'effet:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8395,11 +8629,6 @@
 msgid "none\n"
 msgstr "aucun\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d canal/canaux %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8417,64 +8646,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f sec.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Source: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "clic droit pour menu contextuel.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8483,7 +8712,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8491,14 +8720,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8508,7 +8737,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8517,208 +8746,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f sec. vers %.2f sec.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "Sélectionner une région temporelle.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Mouse mode: Déplacement"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Mouse mode: Sélection"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Fermer les"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Déplacer le block"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Déplacer le block audio"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Effacer le block"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Effacer Audio Sélectionné"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Séparer les pistes"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Séparer block"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Appliquer %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Effacer %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Insère block"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Insertion silence"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Insère un block audio"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Changement de l'ordre des effets"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "non signé "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "signé "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "big endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "little endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "Liste d'évènement invalide. Échec.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "La liste d'évènements à un fps invalide. Échec.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8728,7 +8959,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8739,433 +8970,441 @@
 "Il y a un nombre incompatible de piste audio (%d) pour LiVES.\n"
 "Il ne peut être chargé.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "Ouvrir Fichier Sélection...."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importe Sélection depuis _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importe Sélection depuis _dvd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importe Sélection depuis _vcd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Importe depuis Lecteur"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Sauve disposition comme..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Charge disposition..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 "_Ignore la largeur, la hauteur et les valeurs audio à partir de mises en "
 "page chargée"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "Éditeur de clip"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "Insérer le clip sélectionné"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "Insérer l'audio du clip sélectionné"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Supprimer les blocs sélectionnés"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_Passe à la limite du bloc précédent"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_Passe à la limite du bloc suivant"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Nettoyer les balises depuis la ligne de temps."
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Ignore les limites de la sélection lors de l'insertion"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Voir/_Modifier l'effet sélectionné"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Supprime l'effet sélectionné"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Appliquer l'effet à _block..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Pistes"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "Séparer les pistes à la position du curseur"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "Séparer les pistes vidéos sélectionnées"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Insérer un vide dans les pistes/temps sélectionné"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Sélection"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "Sélectionner la piste actuelle"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Sélectionne toutes les pistes vidéo"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Sélectionner l'ensemble _time"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Sélectionne depuis _zero temps"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Sélection jusqu'à la fin du temps"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copie..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Modifie la largeur, la hauteur et les valeurs audio..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Rendu"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "Vue"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "Effets à la position courante"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Paramètres audio"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Vue compacte"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Pistes maximums à afficher..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Center le curseur"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "Détails multipistes"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "Fenêtre Des Événements"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Mouse mode: _Déplacement"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Mouse mode: _Sélection"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Vue étendue (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Vue compacte (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Temps"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Supprimer le noeud"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "Noeud _suivant"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "Noeud _précédent"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "Lecture inversée  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Vitesse  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Image de début"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Image de fin"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Défiler"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9175,91 +9414,91 @@
 "==============================\n"
 "Basculé dans le mode Édition du clip\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Timeline (seconds)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Sauvegarde audio"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "Montrer/cacher les détails audio"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (couche %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Sélectionner la piste"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Vidéo %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (couche %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES:- Effet Sélectionné"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_Voir/Éditer cet effet"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Voir cet effet"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Supprimer cet effet"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "Insertion impossible après cet effet"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Cet effet ne peut pas être déplacé"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d to %d sélectionné  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sec."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d images"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9269,65 +9508,65 @@
 "==============================\n"
 "Basculé dans le mode multipiste\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "Sortie %s"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "calque %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "piste audio"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s vers %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "Carte des filtres _précédente"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "_Insérer avant"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Insère après"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "Carte des filtres _suivante"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9335,84 +9574,80 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: block/image sélectionné"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "Sélectionner ce block"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Séparer les blocks à partir d'ici"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Lister les effets ici"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Ajuster %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "Ajuster ce block"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Insérer ici"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Insérer l'audio ici"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Défaire %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Rétablir %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Détails multipiste"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9420,76 +9655,82 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "piste %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "pistes %s et %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "piste sélectionnés"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Ajouté %s %s à %s depuis %.4f vers %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Effet %s ajouté vers la piste %s depuis %.4f vers %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "Rendre %d images dans le nouveau clip.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Nettoyage en cours..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pause"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pause (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Presser 'm' lors de la lecture"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "Faire une marque sur la ligne de temps"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9497,12 +9738,12 @@
 "Sélectionner une ou plusieurs pistes\n"
 "Pour créer une région.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "Piste vidéo %d sélectionnée.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9510,7 +9751,7 @@
 "Double-cliquer sur l'échelle des temps\n"
 "pour déselectionner l'intervalle de temps."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9518,7 +9759,7 @@
 "Cliquez sur un effet\n"
 "pour le sélectionner."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9526,7 +9767,7 @@
 "Double-cliquez sur un effet\n"
 "pour l'éditer."
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9534,88 +9775,78 @@
 "Cliquez droit sur un effet\n"
 "pour voir son menu contextuel.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "ou les boutons INSÉRER APRÈS pour le déplacer."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "Sélectionner une région temporelle.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "apres lui.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "avant lui.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "Recharger à chaque fois"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "clips et images"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "clips"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "images"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9623,94 +9854,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "sauvegarde automatique"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "J'ai %d évènements... en pr..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d erreurs détectées.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer audio multi-piste"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Remettre les valeurs"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Fermer la console"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "Le serveur jack a bien démarré.\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Impossible de se connecter au serveur jack\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9722,7 +9953,7 @@
 "Retour au lecteur audio sox.\n"
 "Vous pouvez changer cela dans Preferences/Lecture\n"
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9734,7 +9965,7 @@
 "Retour au lecteur audio mplayer.\n"
 "Vous pouvez changer cela dans Preferences/Lecture\n"
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9742,11 +9973,11 @@
 "\n"
 "Impossible de se connecter au serveur pulse audio.\n"
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES se termine et vous pouvez choisir un autre lecteur audio.\n"
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -9754,311 +9985,319 @@
 "\n"
 "La connexion à pulse audio a été réinitialisée.\n"
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "données"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "vitesse"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "note"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valeur"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "état"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "Bouton joystick %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Axe joystick %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "intervalle"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* scale"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: apprenant OMC"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "Tout _supprimer"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Démarrez la lecture vidéo"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Arrêtez la lecture vidéo"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Reproduire en avant"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Lire une vidéo dans une direction vers l'avant"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Lecture arrière"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Lire une vidéo dans une direction vers l'arrière"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Lecture vidéo plus rapide"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Lire une vidéo à un rythme légèrement plus rapide"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Lecture vidéo lente"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Lire une vidéo à un rythme légèrement plus lent"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Commencer l'enregistrement"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Arrêter l'enregistrement"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "clé"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10067,7 +10306,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10080,12 +10319,12 @@
 "Version non valide dans le fichier\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10307,10 +10546,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Fondu audio sortie"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Fondu audio sortie"
-
 #~ msgid "Fade"
 #~ msgstr "Fondu"
 
@@ -10816,9 +11051,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Copie vers le presse-papiers"
 
-#~ msgid "_Top"
-#~ msgstr "_Haut"
-
 #, fuzzy
 #~ msgid "_Vertical segments"
 #~ msgstr "Décalage vertical"
@@ -11097,15 +11329,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Vous devez configurer le lecteur dans les Préférences."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVES ne peut pas trouver assez de pistes pour réaliser votre demande."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Essayer à nouveau avec d'autres valeurs."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name échec:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
+
+#~ msgid "Default value:    "
+#~ msgstr "Valeur par défaut :    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "Valeur Minimum : "
+
+#~ msgid "Maximum value: "
+#~ msgstr "Valeur Maximum : "

LiVES-1.6.1.tar.bz2/po/gl.po -> LiVES-2.0.3.tar.bz2/po/gl.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:09+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Grazas. A recuperación debe ser posible se reinicia LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "Cando falla de información, por favor inclúa os detalles do seu sistema "
 "operativo, distribución, ea versión LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "e todas as informacións que aparecen a continuación:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "máis información.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Preservar set.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos os cadros"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Calquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Ningún"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "minusválidos !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "** O esquema actual **"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Incorporado"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Personalizado"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Proba"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Comprobar dependencias opcionais:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...detectados..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON DETECTA..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...detectados..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON DETECTA..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...detectados..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON DETECTA..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detectados\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON DETECTA\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectados..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON DETECTA..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detectados..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON DETECTA..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectados..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NON DETECTA..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detectados..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NON DETECTA..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectados..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON DETECTA..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectados..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON DETECTA..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,37 +276,63 @@
 "\n"
 "Informes como xestor de xanelas \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectado: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Directorio temporal é %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Feita con soporte a jack, boa !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Feita con soporte a pulse audio, marabilloso !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -278,92 +341,92 @@
 "Benvido á LiVES versión %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : número máximo de cadros para abrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts pode ser:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : amosar esta axuda e sae\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : non cargar ningún set na inicialización\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : forza non carga de Recuperación\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : non mostrar o gui\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : iniciar no modo de editor clip\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -371,44 +434,44 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : tentar depurar erros (require 'gdb' instalado)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -416,17 +479,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -435,37 +499,37 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -473,10 +537,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -487,42 +549,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -530,62 +599,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cadros %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No ficheiro>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -593,35 +662,35 @@
 "LiVES non puido capturar esta foto\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Pechado o ficheiro %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Desfacer"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -630,26 +699,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Opcións de codificación"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -659,7 +713,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -669,7 +723,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -680,7 +734,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -689,54 +743,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -744,155 +798,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -900,94 +962,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Previsualización"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Procesamento da..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1001,8 +1063,8 @@
 "\n"
 "Lembre apagar efectos (ctrl) despois !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1010,107 +1072,114 @@
 "\n"
 "Espere por favor"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Mostrar detalles"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Suficiente"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Vista previa"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Tamaño do fotograma"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Tamaño do ficheiro"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Tamaño en bytes"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Tempo total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Fotogramas"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Son"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Prezo/tamaño"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opcións de codificación"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------- (Marque a caixa para cambiar o tamaño, como suxire)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<------------- (Marque a caixa para usar a recomendación de tamaño)"
+msgstr ""
+
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Manter _miñas opcións"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Usar configuración _recomendadas"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1118,76 +1187,75 @@
 "_Non mostrar este aviso máis\n"
 "(pode estar conectado de novo en Preferencias/Avisos)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Amosar _Detalles"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Pechar a xanela"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Gardar o ficheiro"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserir"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Número de veces para introducir"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Inserir _antes da selección"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Inserir _despois a selección"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Inserir _con son"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Insire _o sen son"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Abrir Selección"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Número de cadros para abrir"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Local"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Renomear Clip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1203,7 +1271,7 @@
 "Tamén asegúrese de ter definido a súa banda Preferencias | Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1212,47 +1280,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Non enviar información de ancho de banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Probe esta configuración se está tendo problemas para obter un fluxo"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Renomear Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Escolla un directorio de traballo"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1264,7 +1347,7 @@
 "Por favor, escriba o nome do xogo que quere usar.\n"
 "LiVES ha lembra-lo para gardar o xogo máis tarde, cando tenta saír.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1272,7 +1355,7 @@
 "Para exportar este proxecto, ten que escribir un nome para este clip set.\n"
 "Esta será tamén usado para o nome do proxecto.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1282,253 +1365,214 @@
 "Este asistente de inicio ha guía a través do\n"
 "instalación inicial para que poda obter o máximo do presente solicitude.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Renomear Clip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Escolla un directorio de traballo"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Novo nome "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Definir nome "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Advanzado"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Faixa de carga (de %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Título DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Título VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de pistas para amosar"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capítulo  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "primeiro"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "segundos."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "selección."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Número de Pistas solicitadas:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Cartafol:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Incluir subdirectorio"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr ""
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "selección"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentarios Arquivo (opcional)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Título/Nome : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentarios : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Gardar o ficheiro"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: escolla un directorio"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: escolla un ficheiro"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Rexeitar/Gardar"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1538,7 +1582,7 @@
 "O conxunto clip actual pode ser salvado.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1546,7 +1590,7 @@
 "O conxunto clip actual non foi salvo.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1554,7 +1598,7 @@
 "O esquema actual non foi salvo.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1562,7 +1606,7 @@
 "O actual trazado non cambiou desde que foi gardado por última vez.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1570,108 +1614,107 @@
 "O esquema actual contén cadros xerados e non pode ser sostida.\n"
 "Se o desexa, pode facelo antes de saír do modo multi-pista.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Limpar esquema"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorar as mudanzas"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Borrar esquema"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Gardar esquema"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recuperar esquema ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Opcións de codificación"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Seleccionar ficheiro"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1679,11 +1722,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Este ficheiro"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1691,7 +1734,7 @@
 ",\n"
 " - Ata o esquema actual - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1701,7 +1744,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1711,14 +1754,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1726,7 +1769,7 @@
 "\n"
 "Arquivo de proxecto non é válido.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1739,33 +1782,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1773,97 +1816,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Eliminar %s"
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Desfacendo"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1872,31 +1915,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1904,7 +1947,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1913,79 +1956,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "A inserir"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "A borrar"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -1995,7 +2038,7 @@
 "\n"
 "Selección está bloqueado.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2003,11 +2046,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2016,7 +2059,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2025,7 +2068,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2034,22 +2077,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2057,40 +2100,37 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Externo: %s\n"
-"Interior: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2098,28 +2138,28 @@
 "\n"
 "  Apertura..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2127,23 +2167,23 @@
 "\n"
 "  Descoñecido"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2152,8 +2192,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2169,26 +2208,24 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"Este programa é software libre; vostede pode redistribuílo e / ou modificar\n"
-"baixo os termos da GNU General Public License como publicado pola\n"
-"the Free Software Foundation, versión 3 da licenza, ou\n"
-"(pola súa opción) calquera versión posterior.\n"
-"\n"
-"Este programa distribúese coa esperanza de que poida ser útil,\n"
-"pero SEN NINGUNHA GARANTÍA, nin sequera a garantía implícita de\n"
-"COMERCIAL ou aptitude a un determinado PROPÓSITO. Vexa a\n"
-"GNU General Public License para máis detalles.\n"
-"\n"
-"Debería ter recibido unha copia da GNU General Public License\n"
-"xunto con este programa, se non, escriba á Free Software\n"
-"Foundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, E.U."
-"A..\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Un editor de vídeo e un programa de VJ."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  nitrofurano https://launchpad.net/~nitrofurano-3t\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2202,7 +2239,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2212,14 +2249,14 @@
 "\n"
 "Ten que instalar o mplayer para ver o ficheiro.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2227,195 +2264,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Cancelando"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nova Audio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d  cadros son abondo !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Mostrar a ventana de xogo (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Xogar en xanela separada (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Reactivar o audio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Seleccione o ficheiro de audio"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Pechar _Fiestra"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Borrar _Erros"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Eliminar esquemas afectado"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pausa..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "retomar..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Manter"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2427,29 +2476,28 @@
 "(prema En conserva para manter o que tes e deter)\n"
 "(preme Continuar para continuar procesamento)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Deter"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2458,7 +2506,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2466,13 +2514,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2481,17 +2529,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Xanela externa foi liberado.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2501,19 +2549,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2522,1049 +2570,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Non se atopou o ficheiro de pixmap: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Borrar selección"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inverter selección"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Deter"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Pantalla completa"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Sen son"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilidades"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Xerar"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Xerar"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferencias..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Avanzado"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Ningún"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Axuda"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Acerca de..."
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Libre"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Inicio"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3572,81 +3596,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3654,7 +3678,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3662,32 +3686,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3695,68 +3719,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3766,53 +3790,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Desfacer %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refacer %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3824,11 +3859,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3836,14 +3871,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3851,31 +3886,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "LiVES: - Procesamento da..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Renomear Clip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3883,66 +3916,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "selección"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Tamaño do ficheiro"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3951,16 +3980,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Sentítulo%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3968,7 +3997,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3976,68 +4005,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "A restaurar"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4047,22 +4071,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4070,69 +4094,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "advertencia"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Inserir"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Borrar _Erros"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Acerca de..."
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4143,7 +4164,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4155,11 +4176,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4167,46 +4188,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4214,7 +4235,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4226,14 +4247,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4241,19 +4262,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4261,83 +4282,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4346,14 +4367,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4362,7 +4383,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4373,7 +4394,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4382,11 +4403,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4428,11 +4449,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4454,17 +4475,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4472,28 +4494,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4502,7 +4524,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4510,7 +4532,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4518,7 +4540,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4529,7 +4551,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4539,7 +4561,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4547,7 +4569,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4556,13 +4578,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4573,13 +4595,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4589,7 +4611,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4598,7 +4620,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4606,7 +4628,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4614,63 +4636,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4678,14 +4700,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4694,25 +4716,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4721,34 +4743,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "fallou.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4756,11 +4778,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4768,11 +4788,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4780,10 +4798,8 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4792,8 +4808,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4801,10 +4817,8 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4813,8 +4827,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4822,15 +4836,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4839,7 +4851,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4848,7 +4860,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4857,14 +4869,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4872,13 +4892,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4888,27 +4908,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4917,14 +4937,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4935,19 +4955,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4955,7 +4975,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4963,7 +4983,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4975,45 +4995,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Benvido á LiVES versión %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5022,344 +5040,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transicións"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efecto"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efectos"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utensilios"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "separador"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "son"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "descoñecido"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Incluir subdirectorio"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Largura"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Altura"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5367,74 +5640,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "O parámetro non é válido"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Refacer"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Verde"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Azul"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5444,17 +5714,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5464,32 +5734,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5498,14 +5768,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5515,40 +5778,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5557,11 +5827,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5570,7 +5840,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5580,193 +5850,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Opcións de codificación"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5776,55 +6029,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Mover _arriba"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Mover _abaixo"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5833,7 +6086,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5841,231 +6094,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6073,28 +6314,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6103,41 +6344,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6147,27 +6388,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6176,7 +6417,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6186,12 +6427,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6201,7 +6442,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6211,12 +6452,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6224,23 +6465,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6250,55 +6491,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Incorporado"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Proba"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6306,26 +6535,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6333,7 +6573,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6341,7 +6581,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6350,28 +6590,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6383,20 +6630,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6404,790 +6651,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nunca"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Complemento"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Reprodución"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Gravando"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Directorios"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Advertencias"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Varios"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7195,222 +7442,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Remuestreo"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Novo"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7421,7 +7660,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7432,89 +7671,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7524,7 +7763,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7532,20 +7771,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7553,15 +7792,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
-"\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7571,22 +7808,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7596,43 +7833,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7640,40 +7882,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Sen descripción"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Descrición: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7682,65 +7929,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Borrar"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7790,11 +8041,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7812,64 +8058,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7878,7 +8124,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7886,14 +8132,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7903,7 +8149,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7912,208 +8158,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8123,7 +8371,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8131,587 +8379,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "_Selección"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Visualización"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Vista compacta"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Comezar no fotograma"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Rematar no fotograma"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Desprazar"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s a %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8719,275 +8975,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Limpando..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "cadros"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8995,94 +9243,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9090,7 +9338,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9098,327 +9346,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "datos"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocidade"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variábel"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "intervalo"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "chave"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9427,7 +9683,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9436,12 +9692,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9763,7 +10019,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Número de cadros para abrir"
+#~ msgstr "_Número de veces para introducir"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -9948,10 +10204,6 @@
 #~ msgstr "Fotogramas"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Esvaír"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_Ficheiro"
 
@@ -9969,7 +10221,7 @@
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Número de cadros para abrir"
+#~ msgstr "_Número de veces para introducir"
 
 #, fuzzy
 #~ msgid "_Other Center"
@@ -10050,9 +10302,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "segundos"
 
-#~ msgid "_Top"
-#~ msgstr "_Inicio"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "Onda"
@@ -10259,7 +10508,9 @@
 
 #, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES: escolla un ficheiro"
+#~ msgstr ""
+#~ "LiVES non puido capturar esta foto\n"
+#~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was unable to open it."
@@ -10276,12 +10527,5 @@
 #~ msgid "$file"
 #~ msgstr "$file"
 
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Inserir"
-
 #~ msgid "$error"
 #~ msgstr "$error"
-
-#~ msgid "Red"
-#~ msgstr "Vermello"

LiVES-1.6.1.tar.bz2/po/he.po -> LiVES-2.0.3.tar.bz2/po/he.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:10+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +34,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +63,7 @@
 "group_id=64341&atid=507139\n"
 "תודה. ניתן לשחזר את הנתונים שאבדו בהפעלה מחדש של LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -59,7 +75,7 @@
 "בעת דיווח על קריסות, נא לכלול פרטים על מערכת ההפעלה שלך, ההפצה וגרסת ה־LiVES "
 "שבשימוש ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +83,7 @@
 "וכל מידע זמין מוצג כאן:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,163 +93,184 @@
 "מידע.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "מתבצע שימור האוסף.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "שינוי גודל"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_שינוי גודל כל השקופיות"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "הכל"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "ללא"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "מומלץ"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "נוטרל !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**הפריסה הנוכחית**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "מובנה"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "מותאם אישית"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "בדיקה"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...זוהה..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...לא זוהה..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...זוהה..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...לא זוהה..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...זוהה...\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...לא זוהה...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...זוהה"
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...לא זוהה"
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...זוהה..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...לא זוהה..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...זוהה..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse Audio...לא זוהה..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...זוהה..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...לא זוהה..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...זוהה..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...לא זוהה..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...זוהה..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...לא זוהה..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -244,22 +281,48 @@
 "\n"
 "מנהל החלונות המדווח הוא \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "מספר הצגים שזוהו: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "little endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "big endian"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "התיקייה הזמנית היא %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -269,15 +332,15 @@
 "תמיכה ב־jack או ב־pulse audio.\n"
 "תכונות רבות הקשורות לשמע לא תהיינה זמינות.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "הודר עם תמיכה ב־jack, מצוין !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "הודר עם תמיכה ב־pulse audio, נהדר !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -286,7 +349,7 @@
 "ברוכים הבאים ל־LiVES גרסה %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -295,99 +358,99 @@
 "\n"
 "תחביר ההתחלה הוא:%s [אפשרויות] [שם קובץ [זמן התחלה] [שקופיות]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "היכן: שם הקובץ הוא שם קובץ מדיה או גיבוי.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "זמן ההתחלה : זמן התחלת שם הקובץ הרצוי בשניות\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "שקופיות : מספר שקופיות מירבי לפתיחה\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "האפשרויות יכולות להיות:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : הצגת טקסט העזרה ויציאה מהתוכנית\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : טעינה אוטומטית של אוסף הקטעים שהוגדרו כ־setname\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : אין לטעון כל אוסף בהתחלה\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : אילוץ התוכנה לא  לטעון את שחזור הקריסה\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : אילוץ התוכנה לטעון את שחזור הקריסה\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : לא יוצג מנשק המשתמש הגרפי\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : start in clip editor mode\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : start in multitrack mode\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <פתחה> : הפעלת מאזין ה־OSC ביציאת ה־UDP <פתחה>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : לא להפעיל את מאזין ה־OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr "-aplayer <יישום> : הפעלת נגן המוזיקה הנבחר.<יישום> יכול להיות mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox או jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -397,29 +460,29 @@
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " או sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autoload devicemap\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "מפעיל את מנשק המשתמש הגרפי..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -427,25 +490,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"לא ניתן לאתר את ערכת הנושא שהתבקשה. יש לוודא כי ערכת הנושא מותקנת תחת\n"
-"%s/%s.\n"
-"(יתכן שתצטרך לשנות את הערך <prefix_dir> בקובץ ה־~/.lives שלך)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES כשל בעת כתיבת קובץ קטן אל /tmp\n"
-"יש לוודא כי שבאפשרותך לכתוב אל התיקייה /tmp ולנסות שוב.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -459,54 +515,37 @@
 "יש לסקרוא את קובץ ה־README המגיע עם חבילה זו\n"
 "לפני הרצת LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"ל־LiVES לא היתה אפשרות לקרוא מקובץ ההגדרות העצמי\n"
-"%s/.lives\n"
-"\n"
-"יש לבדוק את הרשאות הקובץ ולנסות שוב.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"ל־LiVES לא היתה אפשרות לקרוא מקובץ ההגדרות העצמי\n"
-"%s/.lives\n"
-"\n"
-"יש לבדוק את הרשאות הקובץ עבור הקובץ והתיקייה הנ\"ל\n"
-"ולנסות שוב.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"אין אפשרות להשתמש בתיקייה הזמנית\n"
-"%s\n"
-"יש לבדוק את <tempdir> המוגדר תחת \n"
-"%s/.lives\n"
-"ולנסות שוב.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -514,10 +553,8 @@
 "\n"
 "%s"
 msgstr ""
-"ל־LiVES לא הית אפשרות ללכוד תמונה זו\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -535,7 +572,7 @@
 "\n"
 "תודה.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -545,7 +582,14 @@
 "LiVES מחייב שימוש ב־'mplayer' או 'sox' לפעולה תקינה. יש להתקין את אחד מאלה "
 "ולנסות שוב.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -555,7 +599,7 @@
 "ל־LiVES לא היתה אפשרות לאתר את 'mplayer'. באפשרותך להתקין את mplayer כדי "
 "להשתמש בתכונות נוספות של LiVES.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -565,7 +609,7 @@
 "לא ניתן לאתר את 'convert'. ניתן להתקין את convert  ו־image-magick במידת "
 "הצורך באפקטים מוכנים.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -575,7 +619,7 @@
 "לא ניתן לאתר את 'composite'. ניתן להתקין את composite ו־image-magick במידת "
 "הצורך בפונקציית merge.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -585,7 +629,7 @@
 "ל־LiVES לא היתה אפשרות לאתר את 'sox'. תכונות מסויימות הקשורות לשמע לא יעבדו. "
 "ניתן להתקין את 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -593,68 +637,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"ל־LiVESלא היתה אפשרות למצוא תוספים למקודד.\n"
-"יש לבדוק שהתוספים הרצויים מותקנים כראוי תחת\n"
-"%s%s%s/\n"
-"לא ניתן לשמור את הקובץ בלעדיהם.\n"
-"יתכן שיהיה צורך לשנות את הערך של <libdir> תחת ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "מתבצעת טעינה אוטומטית של האוסף %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "נגן שמע בלתי תקין %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s <ללא שם%d> %dx%d : %d שקופיות %d bpp %.3f שקופיות לשנייה"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s <%s> %dx%d : ??? שקופיות ??? bpp %.3f שקופיות לשנייה"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s <%s> %dx%d : %d שקופיות %d bpp %.3f שקופיות לשנייה"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s <ללא קובץ>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "הקלטה %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!הקלטה %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "נגן"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -662,35 +700,35 @@
 "ל־LiVES לא הית אפשרות ללכוד תמונה זו\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "הקובץ %s נסגר\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_ביטול"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "ב_צע שוב"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "וידאו"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "ערוץ שמע שמאלי"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "ערוץ שמע ימני"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -703,27 +741,12 @@
 "ל־LiVES אין אפשרות לעבור בין קטעים בעת הפתיחה באם נגן השמע מוגדר כ־mplayer.\n"
 "נא לכוון את אפשרויות הנגינה בהעדפות ולנסות שוב.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - חלון הנגינה"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - חלון הנגינה"
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -731,14 +754,9 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"תיקייה בשם\n"
-"%s\n"
-"כבר קיימת. האם להשתמש בתיקייה זו ?\n"
-"\n"
-"(מקום פנוי: %.2f ג\"ב)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -746,14 +764,9 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"תיקייה בשם\n"
-"%s\n"
-"כבר קיימת. האם להשתמש בתיקייה זו ?\n"
-"\n"
-"(מקום פנוי: %.2f ג\"ב)\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -762,13 +775,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"האם ליצור את התיקייה\n"
-"%s\n"
-"?\n"
-"\n"
-"(מקום פנוי: %.2f ג\"ב)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -777,11 +785,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "שם התיקייה ארוך מדי !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -789,7 +797,7 @@
 "ארע כשלון בנסיון להפעיל את נגן השמע שנבחר !\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -799,7 +807,7 @@
 "\n"
 "Pulse Audio מומלץ לרוב המשתמשים."
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -807,7 +815,7 @@
 ", אולם גרסה זו של LiVES לא הודרה עם תמיכה ב־pulse audio.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -817,11 +825,11 @@
 " מומלץ להתקין אותו לפני הרצת LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK מומלץ למשתמשים מקצועיים"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -829,7 +837,7 @@
 ", אולם גרסה זו של LiVES לא הודרה עם תמיכה ב־jack.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -839,7 +847,7 @@
 "LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -850,11 +858,11 @@
 "אם LiVES לא יפעל עם jack, ניתן להפעילו מחדש עם נגן שמע אחר.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "ניתן להשתמש ב־SOX אם אף אחד מהנגנים האחרים לא עובד, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -862,7 +870,7 @@
 "אולם תכונות מסוימות הקשורות לשמע ינוטרלו.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -872,7 +880,7 @@
 "רצוי להתקינו לפני הרצת LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -880,132 +888,140 @@
 "נגן השמע MPLAYER מומלץ רק למטרות בדיקה.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - בחירת נגן שמע"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "שימוש בנגן השמע _pulse"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "שימוש בנגן השמע _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "שימוש בנגן השמע _sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "שימוש בנגן השמע _mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_הבא"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "דולג"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "עבר בהצלחה"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "נכשל"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - בודק את התצורה"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - פתרון בעיות"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES יריץ כעת מספר בדיקות תצורה בסיסיות\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "בודק האם \"sox\" מותקן"
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr "יש להתקין את sox כדי להשתמש בכל תכונות השמע ב־LiVES."
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "בודק האם sox יכול להמיר שמע"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "אין אפשרות להפעיל את המחולל %s\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "יש להתקין את sox_fmt_all או דומה לו"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "בודק אם \"mplayer\" מותקן"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr "יש להתקין את mplayer כדי להשתמש בכל תכונות הפענוח של LiVES."
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "בודק אם mplayer יכול להמיר שמע"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "יש להתקין את mplayer עם תמיכה ב־pcm/wav"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "בודק אם mplayer יכול לפענח ל־png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "אולי תבקשו לשדרג את mplayer לגרסה עדכנית יותר"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "בודק אם mplayer יכול לפענח ל־jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "יש להתקין את mplayer עם תמיכה ב־png/alpha או jpeg"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "אולי תבקשו להוסיף תמיכה בפלט jpeg ל־mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "בודק האם \"convert\" מותקן"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "יש להתקין את imageMagick כדי להשתמש בכל האפקטים המוכנים"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1017,7 +1033,7 @@
 "    לחצו על \"ביטול\" כדי לצאת ולהתקין את הרכיבים החסרים, או על \"הבא\" כדי "
 "להמשיך    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1027,7 +1043,7 @@
 "\n"
 "לבסוף, תוכלו לבחור את מנשק ההפעלה כברירת מחדל של LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1037,7 +1053,7 @@
 "\n"
 "ל־LiVES ישנם שני מנשקים ראשיים ותוכלו להפעילו עם כל אחד מהם.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1047,74 +1063,73 @@
 "\n"
 "ניתן לשנות את ברירת־המחדל בכל עת מההעדפות.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - בחירת מנשק ההפעלה"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "הפעלה במצב _עריכת קטע"
 
-#: src/startup.c:1042
-#, fuzzy
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
-msgstr "זוהי הבחירה הטובה ביותר עבור משימות עריכה פשוטות או עבור משתמשי VJ\n"
+msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "הפעלה במצב _ריבוי רצועות"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr "זוהי בחירה טובה יותר עבור משימות עריכה מורכבות שכוללות קטעים מרובים.\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_סיום"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "מתן האפשרות ל־LiVES להגדיר את סיומת ה_קובץ"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "מתן האפשרות ל־LiVES להגדיר את סיומת ה_קובץ"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "החלת Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "באם מוגדר, תבוצע פעולת deinterlace על השקופיות בעת הייבוא."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "יש ללחוץ כאן כדי _להציג כל קטע וידאו, תמונה או שמע שנבחרו"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "יש ללחוץ כאן כדי _להציג כל קטע שמע שנבחר"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "יש ללחוץ כאן כדי _להציג את הוידאו"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - בתהליכי עיבוד..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1128,8 +1143,8 @@
 "\n"
 "נא לזכור לכבות את האפקטים (Ctrl-0) לאחר מכן !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1137,107 +1152,114 @@
 "\n"
 "נא להמתין"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "הצגת פרטים"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_מספיק"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_תצוגה מקדימה"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "הש_הייה"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "השהייה/_מספיק"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "מבנה"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "גודל השקופית"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "גודל הקובץ"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "גודל הבית"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "זמן כולל"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "שקופיות לשנייה"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "שקופיות"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "אירועים"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "שמע"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "קצב/גודל"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "ערוץ שמע ימני"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES : - אפשרויות קידוד"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "-------------> (יש לבדוק את התיבה לשינוי גודל כמוצע)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "-------------> (יש לבדוק את התיבה לשימוש בגודל המומלץ)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "ש_מירת ההגדרות האישיות"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "שימוש בהגדרות מ_ומלצות"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1245,76 +1267,75 @@
 "אין להציג אזהרה זאת עוד\n"
 "(ניתן להפעיל שוב תחת העדפות/אזהרות)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "הצגת _פרטים"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_סגירת החלון"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_שמירה לקובץ"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - הוספה"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_מספר הפעמים להוספה"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "הוס_פה להתאמת הצליל"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "הוספה _לפני הבחירה"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "הוספת תוכן לוח הגזירים לפני השקופיות הנבחרות"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "הוספה ל_אחר הבחירה"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "הוספת תוכן לוח הגזירים לאחר השקופיות הנבחרות"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "הוספה עם _צליל"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "הוספה ל_לא צליל"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - פתיחת הבחירה"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    זמן התחלת הקטע הנבחר (שניות)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    מספר שקופיות לפתיחה"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
+
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - פתיחת מיקום"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: -שינוי שם של קטע"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1329,7 +1350,7 @@
 "בנוסף, יש לוודא כי רוחב הפס העצמי הוגדר תחת העדפות|מדיה זורמת\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1338,47 +1359,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "כתובת אינטרנט : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "כתובת אינטרנט : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "אין לשלוח מידע אודות רוחב הפס"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "ניתן לנסות הגדרה זו אם צצות בעיות בקבלת תזרים מדיה."
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: -שינוי שם של קטע"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - הזנת שם לאוסף"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - בחר מדריך עבודה"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1390,7 +1426,7 @@
 "יש להזין את השם המבוקש עבור האוסף.\n"
 "ב־LiVES תופיע תזכורת לשמירת אוסף הקטעים עם כל נסיון ליציאה.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1398,7 +1434,7 @@
 "על מנת לייצא מיזם זה, יש להזין שם עבור אוסף קטעים זה.\n"
 "השם ישמש כמו כן כשם המיזם.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1408,245 +1444,200 @@
 "אשף ההפעלה הזה ידריך אותך במהלך\n"
 "ההתקנה, כך שתוכל לקבל את המיטב מיישום זה.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"קודם כל, יש לבחור תיקיית עבודה עבור LiVES.\n"
-"תיקייה זו צריכה להיות עם מקום פנוי רב.\n"
-"הערה: במערכות רבות, מתבצעת מחיקה של כל התוכן בתיקייה /tmp בכיבוי, כך שלא "
-"מומלץ ליצור את התיקייה שם.\n"
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: -שינוי שם של קטע"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - הזנת שם לאוסף"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - הזנת שם לאוסף"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - בחר מדריך עבודה"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "שם חדש "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "שם האוסף "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "שימוש בברי_רות המחדל"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_מתקדם"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- טעינת רצועה מהתקליטור"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- בחירת פרק/קטע מ־DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- בחירת קטע מ־VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- שינוי מספר הרצועות הגלויות המירבי"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- נתוני התקן"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "רצועה לטעינה (מ־%s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "כותרת ה־DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "כותרת ה־VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "מספר מירבי של רצועות לתצוגה"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "התקן: /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "התקן: קושחה:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "פרק  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "ערוץ  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "מזהה השמע  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "מספר קלט"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "שימוש ברוחב, בגובה ובמספר השקופיות לשנייה המוגדרים כברירת מחדל"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "רוחב"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "גובה"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "מנהל התקן"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "סוג קובץ פלט"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- החלת אפקט עמעום פנימה על שמע"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "החלת אפקט עמעום עד להשתקה על שמע"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "החל אפקט עמעום פנימה מעבר  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "ראשון"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "החל אפקט עמעום עד להשתקה מעבר  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "אחרון"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "שניות."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "בחירה."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - נגינת מוזיקה אקראית"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "מספר הרצועות המבוקש:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "תיקייה:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "הכללת תת־תיקיות"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "גודל הקובץ המזערי (מ\"ב)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "גודל הקובץ המירבי (מ\"ב)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "בחירה"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - הערות קובץ (רשות)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "כותרת/שם : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "יוצר/אמן : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "הערות : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_שמירה לקובץ"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: בחירת תיקייה"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: בחירת קובץ"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - ביטול/התעלמות/שמירה"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1656,7 +1647,7 @@
 "הפריסה הנוכחית לא נשמרה.\n"
 "איזו פעולה יש לבצע?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1666,7 +1657,7 @@
 "הפריסה הנוכחית שונתה מאז שנשמרה לאחרונה.\n"
 "איזו פעולה יש לבצע?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1676,7 +1667,7 @@
 "ניתן לשמור את אוסף הקטעים הנוכחי.\n"
 "איזו פעולה יש לבצע?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1684,7 +1675,7 @@
 "אוסף הקטעים הנוכחי לא נשמר.\n"
 "איזו פעולה יש לבצע ?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1692,7 +1683,7 @@
 "הפריסה הנוכחית לא נשמרה.\n"
 "איזור פעולה יש לבצע ?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1700,7 +1691,7 @@
 "הפריסה הנוכחית השתנתה מאז שנשמרה לאחרונה.\n"
 "מה ברצונך לעשות ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1708,7 +1699,7 @@
 "הפריסה הנוכחית מכילה שקופיות שנוצרו ולא ניתן לשמור אותן.\n"
 "מומלץ לעבד אותה לפני יציאה ממצב ריבוי־הרצועות\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1718,43 +1709,43 @@
 "הפריסה הנוכחית כוללת שקופיות שנוצרו ולא ניתן לשמור אותן.\n"
 "מה ברצונכם לעשות ?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_שם אוסף הקטעים"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_טעינה אוטומטית בפעם הבאה"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_מחיקת פריסה"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "ה_תעלמות מהשינויים"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_מחיקת אוסף הקטעים"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_מחיקת פריסה"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "שמירת _פריסה"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "שמירת אוסף ה_קטעים"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: האם לשחזר את הפריסה?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1764,78 +1755,69 @@
 "LiVES זיהה פריסה מרובת־רצועות מהפעלה קודמת.\n"
 "האם ברצונך לנסות לשחזרה ?/n\n"
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES : - אפשרויות קידוד"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "ניקוי _סימונים מציר הזמן"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_איפוס ערכים"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "מתבצעת שמירה כאוסף %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "בחירת קובץ"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "מתבצעת טעינה אוטומטית של האוסף %s..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "מנקה קטע"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"\n"
-"ל־LiVES לא הייתה אפשרות למצוא את התוכנה %s.\n"
-"נא לבדוק שתוכנה זו נמצאת בנתיב הנכון וכן בעלת הרשאות הרצה.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "קובץ זה"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1843,7 +1825,7 @@
 ",\n"
 " - כולל הפריסה הנוכחית - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1858,7 +1840,7 @@
 "\n"
 "האם לסגור אותו בכל־זאת?"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1873,14 +1855,14 @@
 "\n"
 "האם לסגור אותו?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1888,7 +1870,7 @@
 "\n"
 "קובץ פרוייקט לא תקין.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1908,33 +1890,33 @@
 "לאחר מכן קובץ|סגירה\\שמירת כל הקטעים ונתינת שם חדש לאוסף או ביטולו.\n"
 "בסיום תהליך זה ניתן לייבא את הפרויקט החדש.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "מתבצע ייבוא הפרוייקט %s כאוסף %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "ייבוא פרוייקט"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "מתבצע ייצוא הפרוייקט %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "ייצוא פרוייקט"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "שיחזור קובץ .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "גיבוי כקובץ .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "שיחזור קובץ .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1946,90 +1928,90 @@
 "האוסף יימחק מהכונן הקשיח.\n"
 "האם לבצע זאת ?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "מתבצעת מחיקת האוסף..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "מתבצעת מחיקת האוסף..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "מחיקת אוסף"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "האוסף %s נמחק לצמיתות מהכונן הקשיח.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "הוספת שקט"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "ביטול פעולה"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "שיחזור שמע..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "פינוי התמונות מהשקופיות"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "כעת אורך הוידאו הוא %d שקופיות ב־%.3f שקופיות לשנייה.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "לוח הגזירים נדגם מחדש ל־%d שקופיות.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "מבצע מחדש"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "מעתיק שקופיות מ־%d ־ל%d%s וללוח הגזירים..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "מושך שקופיות מהקטע"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "מעתיק ללוח הגזירים"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "גזירה"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "מדביק"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2039,7 +2021,7 @@
 "נא להתקין את התסריט 'convert' מתוך החבילה Image-magic ולאחר מכן להפעיל מחדש "
 "את LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2053,7 +2035,7 @@
 "ניתן לנסות לבחור את כל השקופיות ולהשתמש \n"
 "ב־'סידור שמע' הניתן להפעלה מתפריט השמע."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2061,7 +2043,7 @@
 "לא ניתן להוסיף את הקובץ המבוקש משום שקצב דגימות השמע לא מותאם.\n"
 "יש להתקין את 'sox' ולנסות שנית."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2071,7 +2053,7 @@
 "הוספת הקובץ המבוקש תזיז את השקופיות בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2081,11 +2063,11 @@
 "הוספת הקובץ המבוקש תזיז את השמע בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "דוגם מחדש את השמע בלוח הגזירים"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2097,7 +2079,7 @@
 "לא הייתה אפשרות לדגום מחדש את השמע בלוח הגזירים. \n"
 "השמע בלוח הגזירים נמחק.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2111,30 +2093,30 @@
 "האם ברצונך להמשיך עם ההוספה  \n"
 "באמצעות שמע שלא שונה ?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "מכניס %d%s שקופיות מלוח הגזירים..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "מוסיף"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "מכניס %d פעמים מלוח הגזירים %s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "מכניס %d שקופיות  מלוח הגזירים %s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "הכנסה"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2144,7 +2126,7 @@
 "מחיקת כל השקופיות תסגור את קובץ זה.\n"
 "האם ברצונך להמשיך ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2154,8 +2136,8 @@
 "עקב המחיקה תיתכנו שקופיות חסרות בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2165,7 +2147,7 @@
 "עקב המחיקה ייתכן שקטעי קול מסויימים יוחסרו בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2175,7 +2157,7 @@
 "המחיקה תזיז את השקופיות בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2185,20 +2167,20 @@
 "המחיקה תזיז את השמע בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "מוחק את השקופיות %d ל־%d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "מוחק"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "מחיקה"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2208,7 +2190,7 @@
 "\n"
 "הבחירה נעולה.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2218,11 +2200,11 @@
 "מוכן להקלטה. השתמש ב־'control' ובכפתורי העכבר בעת הנגינה להקלטת ביצועיך.\n"
 "(לביטול, הקש על 'r' או לחץ על נגן|הקלט ביצועים שוב לפני נגינה.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "ההקלטה בוטלה.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2235,7 +2217,7 @@
 "התוסף '%s' מדווח:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2248,7 +2230,7 @@
 "לא ניתן למצוא את שיטת 'init' בתוסף %s.\n"
 "ייתן שהתוסף לא תקין או לא מותקן כראוי."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2260,22 +2242,22 @@
 "\n"
 "יש ללחוץ על 'ביטול' אם אין ברצונך לבצע את פעולה זו.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "שומר אוסף %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "טוען קטע מהאוסף %s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d קטעים שוחזרו מהאוסף (%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2286,41 +2268,37 @@
 "עליך להריץ זאת רק אם אין לך עותקים של LiVES הרצים על מכונה זו.\n"
 "לחץ על אישור בכדי להמשיך.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "מנקה שטח כונן..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "מנקה שטח כונן"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d משטח הכונן שוחזר.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "מאפס את קצבי וערכי השקופיות..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"חיצוני: %s\n"
-"פנימי: %s (%d סיביות לפיקסל)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "נאגר"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2328,7 +2306,7 @@
 "\n"
 "  פותח..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2337,7 +2315,7 @@
 "\n"
 "(%d מדומה)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2346,7 +2324,7 @@
 "\n"
 "(%d פוענח)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2355,7 +2333,7 @@
 "\n"
 "  %.2f שניות."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2363,23 +2341,23 @@
 "\n"
 "  לא ידוע"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "לא מסומן"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "מסומן"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "סידור בתים עולה"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "סידור בתים יורד"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2388,8 +2366,7 @@
 "  %d הרץ, %d סיביות\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2405,25 +2382,25 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"תוכנה זו הינה חופשית; באפשרותך להפיצה מחדש ו/או לשנותה\n"
-"תחת תנאי הרשיון הציבורי הכללי של GNU שמפורסם על־ידי \n"
-"הקרן לתוכנה חופשית; גרסת הרישיון שבשימוש היא 3, או\n"
-"(לפי החלטתך) כל גרסה מאוחרת יותר.\n"
-"\n"
-"תוכנה זו מופצת במטרה להיות שימושית, אולם\n"
-"ללא כל אחריות; אין אחריות לכל נזק שייגרם\n"
-"כתוצאה משימוש בתוכנה זו. עיין\n"
-"ברישיות הציבורי הכללי של GNU לפרטים נוספים.\n"
-"\n"
-"קיבלת עותק של הרישיון הציבורי הכללי של GNU\n"
-"עם תוכנה זו; אם לא, יש לפנות לקרן לתוכנה חופשית\n"
-"ברחוב Temple Place 56 - סוויטת 330, בוסטון, ת.ד 02111-1307, ארה\"ב.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "עורך וידאו ותוכנת VJ."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Liel Fridman https://launchpad.net/~lielft\n"
+"  Yaron https://launchpad.net/~sh-yaron\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2437,7 +2414,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2447,14 +2424,14 @@
 "\n"
 "יש להתקין את mplayer בכדי להציג את קובץ זה.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2465,168 +2442,180 @@
 "טעינת שמע חדש תגרום לאיבוד שמע בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?"
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "פותח שמע %s, סוג %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "פותח שמע"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "מבטל"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "שמע חדש: %d Hz %d ערוצים %d סיביות לשנייה\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "מפקיד שמע"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "שמע חדש"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d שקופיות מספיקות !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - פלט ניפוי שגיאות של המקודד"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "נגינה במסך מלא (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "כיבוי נגינה במסך מלא (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "גודל כפול (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "גודל יחיד (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "הסתרת חלון הנגינה (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "הצגת חלון הנגינה (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "נגינה בחלון נפרד (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "כיבוי הלולאה המתמשכת (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "הפעלת את הלולאה המתמשכת (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "עוצמת הקול (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "הפעלת השמע שנית (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "השתקת השמע (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "הופך את לוח הגזירים..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "הופך את לוח הגזירים"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "בחירת קובץ שמע"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "נא לקבוע את התקן נגינת התקליטורים שלך בכלים | העדפות | שונות\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "פותח רצועה %d מתקליטור %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "רצועת תקליטור %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "פותח רצועת תקליטור..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "שגיאה בטעינת רצועת תקליטור\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "בוחר רצועות"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "שגיאות פריסה"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "סגירת _חלון"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "ניקוי _שגיאות"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_מחיקת פריסות ששונו"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "המשך"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2636,27 +2625,27 @@
 "מושהה\n"
 "(יש ללחוץ על כפתור ההמשך כדי להמשיך בתהליך)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "מושהה..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "השהיה"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "ממשיך..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "שמירה"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "מספיק"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2668,30 +2657,28 @@
 "(לחץ על כפתור השמירה כדי לשמור את העבודה ולהפסיק)\n"
 "(בנוסף, ישנה אפשרות ללחוץ על המשך כדי להמשיך בעיבוד)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_עצירה"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: שקופית נבחרת"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "שומר שקופית כ־%s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2700,7 +2687,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2712,7 +2699,7 @@
 "עליך להתקין את \"xwininfo\" כדי להשתמש בתכונה זו\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2720,7 +2707,7 @@
 "\n"
 "זמן ההקלטה חייב להיות גדול מ־0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2734,11 +2721,11 @@
 "לאחר מכן ללחוץ על 'ביטול' לביטול\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "החלון הנוסף שוחרר.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2746,7 +2733,7 @@
 "יש ללחוץ על חלון כדי ללכוד אותו\n"
 "יש ללחוץ על 'q' כדי להפסיק את ההקלטה"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2762,19 +2749,19 @@
 "\n"
 "(LiVES ישתמש בברירת המחדל: %.3f שקופיות לשנייה.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES כשל בלכידת חלון זה. עמכם הסליחה.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "מייצא את השמע הנבחר כ..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "מייצא שמע כ..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2788,81 +2775,86 @@
 "יש ללחוץ על 'אישור' כדי לייצא במהירות החדשה,או על 'ביטול' לייצוא בקצב "
 "המקורי.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "מייצא שקופיות שמע %d ל־%d כ־%s"
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "מייצא שמע כ־%s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "ייצוא שמע"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "צירוף קובץ שמע..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "מצרף את קובץ השמע %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "מצרף שמע"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "צירוף שמע"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "מתקן שמע מ־%.2f ל־%.2f שניות..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "מתקן\\מרפד שמע"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "תיקון\\ריפוד שמע"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "מחיל אפקט Fade In על השמע"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "החלת אפקט Fade In על השמע"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "מחיל אפקט Fade Out על השמע"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "החלת אפקט Fade Out על השמע"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s מעל %.1f שניות..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s מזמן %.2f שניות ל־%.2f שניות..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "מפעיל אפקט Fade על השמע"
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2872,674 +2864,636 @@
 "מחיקת כל השמע תסגור את קובץ זה.\n"
 "האם ברצונך להמשיך ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "מוחק את כל השמע"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "מוחק שמע מ־%.2f ל־%.2f שניות..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "מוחק שמע"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "מחק שמע"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "הקלט שמע חדש"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "מכניס שקט מ־%.2f ל־%.2f שניות..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "מכניס שקט"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"מחיקת הפריסה(ות) %d...האם להמשיך ?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "לא ניתן למצוא את קובץ מפת הסמלים: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - מיזוג"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "ניתן למזג את לוח הגזירים [%d שקופיות] עם הבחירה [%d שקופיות]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "ניתן למזג את לוח הגזירים [ %d שקופיות (נדגמו מחדש) ] עם הבחירה [ %d שקופיות ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "יישור_מתחיל"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "יישור _מסתיים"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "מה לעשות עם שקופיות לוח הגזירים הנוספות -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_הכנסת שקופיות"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_מחיקת שקופיות"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "מספר פעמים ללולאת לוח הגזירים_"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_יצירת לולאת לוח גזירים כדי להתאימו לבחירה"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "שיטת _מעבר"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "מיזוג לוח הגזירים עם הבחירה..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "מכניס %d שקופיות נוספות לפני מיזוג\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "מכניס כעת %d שקופיות נוספות\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "המיזוג הסתיים.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "אפקטים _מותאמים אישית"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "_כלי שירות מותאמים אישית"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_קובץ"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_פתיחת קובץ\\תיקייה"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "קבצים _אחרונים..."
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "פתיחת מיקום\\זרם"
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "ייבוא בחירה מ _DVD\\VCD"
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "ייבוא בחירה מ_DVD"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "_ייבוא מהתקן"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "_ייבוא מהתקן"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "ייבוא מהתקן _Firewire (DV)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "ייבוא מהתקן _Firewire (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
-#, fuzzy
+#: src/gui.c:459
 msgid "Add _Unicap Device"
-msgstr "הוספת התקן _טלוויזיה חי"
+msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr "הוספת התקן _Firewire חי"
 
-#: src/gui.c:461
-#, fuzzy
+#: src/gui.c:478
 msgid "Add _TV Device"
-msgstr "הוספת התקן _טלוויזיה חי"
+msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "קבצים _אחרונים..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_טעינת אוסף הקטעים..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "סגירת\\שמ_ירת כל הקטעים"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "_קידוד הקטע כ..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "קידוד _בחירה כ..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_סגירת  קטע זה"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_גיבוי הקטע כ־.lv1"
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_שיחזור קטע מ־.lv1"
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "קידוד\\טעינה\\גיבוי _עם קול"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "_ניקוי שטח כונן"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "מצב _רב־רצועתי"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "העתקת בחירה"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "גזירת בחירה"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_הכנסה מלוח הגזירים..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "הדבקה כ־_חדש"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_מיזוג לוח הגזירים עם הבחירה"
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_מחיקת בחירה"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "הפרד את ה_וידאו מהשמע"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_בחירה..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "בחירת _כל השקופיות"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "שקופית _התחלה בלבד"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "שקופית _סיום בלבד"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "בחירה מהמסגרת _הראשונה"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "בחירה למסגרת _האחרונה"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "בחירת הכנסה אחרונה/_מיזוג"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "בחירת _האפקט האחרון"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_הפיכת בחירה"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_נעילת אורך הבחירה"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_נגינה"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_נגן הכל"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "נג_ינת בחירה"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "נגינה מ_לוח הגזירים"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_עצירה"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "_העברה _קדימה"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_מסך מלא"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "גודל _כפול"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "נגינה בחלון _נוסף"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "רקע _שחור"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(אוטומטי) _יצירת לולאת וידאו (כדי להתאימו לרצועת השמע)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "יצירת לולאה מתמשכת"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong לולאות"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_השתק"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "הפרדת חלון במצב 'ד_ביק'"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "ה_צגת מונה השקופיות"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "אפקט_ים"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "האפקטים מוחלים על הבחירה הנוכחית"
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_הרצת בדיקת האפקט, הכלי או המחולל..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_כלים"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "הכלים חלים על קטעים שהושלמו."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_הפיכת הגזירים"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_שינוי מהירות הנגינה או השמירה..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "_דגימה מחדש של ה_וידאו למהירות שקופיות חדשה..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_כלי שירות"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_ייצר"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "_כלים מותאמים אישית"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_ייצר"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "טעינת תוספים לאפקטים מוכנים..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "לכידת חלון _חיצוני... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_העדפות..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_שמע"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "טעינת שמע _חדש לקטע"
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "טעינת רצועה מ_תקליטור..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "ה_וצאת תקליטור"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "הקלטת שמע _חיצוני..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "ל_קטע חדש..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "ל_בחירה"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "החלת אפקט Fade _In על השמע"
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "החל אפקט Fade _Out על השמע..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_ייצוא שמע..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "_ייצוא שמע _נבחר..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "ייצוא _כל השמע..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_צירוף שמע..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_תיקון\\ריפוד שמע"
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "_תיקון\\ריפוד שמע ל_בחירה"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "תיקון\\ריפוד שמע מההתחלה ל_תחילת הנגינה"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_מחיקת שמע..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "מחיקת שמע _נבחר"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "מחיקת  _כל השמע"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "הכנסת _שקט לבחירה"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_דגימת שמע מחדש"
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "נגינת _מוזיקה באמצעות xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "מוזיקה אקראית _באמצעות xmms..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "הפסקת _נגינה ב־xmms"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_מידע"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "הצגת _מידע קטע"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "הצגת\\_עריכת הערות הקובץ"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "הצגת מידע על _לוח הגזירים"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "הצגת _הודעות"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "הצגת שגיאות _פריסה"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_קטעים"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_שינוי שם הקטע הנוכחי בתפריט..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "מ_תקדם"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "אפקטים\\כלים\\כלי שירות של _RFX"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "תסריט בדיקת RFX _חדש..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_העתקת תסריט RFX לבדיקה..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_עריכת תסריט בדיקת ה־RFX..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "שינוי _שם לתסריט בדיקת ה־RFX..."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_מחקית תסריט בדיקת RFX..."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "העלאה לבדיקה של אפקט\\כלי\\מחולל מוכן..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_ייבוא תסריט RFX מותאם אישית..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "י_יצוא תסריט RFX מותאם אישית..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "מ_חיקת תסריט RFX מותאם אישית..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "בנ_ייה מחדש של כל תוספי ה־RFX"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "_קבלת זרימת _LiVES מ..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_שליחת זרימת LiVES ל..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "פתיחת זרימת _yuv4mpeg מ־%sstream.yuv..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_ייבוא פרויקט (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "יי_צוא פרויקט (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "מיפוי _אפקט בזמן אמת"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "שיוך אפקטים בזמן אמת למקשי ctrl-number"
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "קביעת אפקט בזמן אמת ל_ברירת מחדל"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "קביעת ערך ברירת המחדל עבור אפקטים בזמת אמת."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "שמירת _ברירת המחדל של אפקטים בזמן אמת"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3547,144 +3501,144 @@
 "שמור את ברירת המחדל של אפקטים בזמן אמת כדי שיהיו ניתנים לשחזור בכל שימוש ב־"
 "LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_איפוס  כל מהירויות ומיקומי  הנגינה"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr "איפוס את כל מיקומי הנגינה למסגרת 1 ואת כל מהירויות הנגינה."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "מנשק _MIDI\\מוט היגוי"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "לומד _MIDI\\מוט היגוי"
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_שמירת מיפוי התקן..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_טעינת מיפוי התקן..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "הצגת _מקשי VJ"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "צעצ_ועים"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_ללא"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_שיגוע שקופיות"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "טלוויזית _LiVES (פס רחב)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_עזרה"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_מדריך (נפתח בדפדפן)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_תרומה למיזם"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_שליחת דוא\"ל לכותב התוכנה"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "דיווח על _באג"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "הצעת _תכונה חדשה"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "לסייע _בתרגום"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_איתור תקלות"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_אודות"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "חזרה להתחלה (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "נגן הכל (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "הפסקת נגינה (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "נגן בחירה (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "עוצמת קול"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "עוצמת שמע (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "רקע שאינו ריק (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "נגינה איטית יותר (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "נגינה מהירה יותר (ctrl-up)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "דילוג אחורה (ctrl-left)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "דילוג קדימה (ctrl-right)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "הצגת מידע על הקטע (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "החבאת סרגל כלים זה"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3693,162 +3647,162 @@
 "על \"q\" כדי לעצור."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     מהירות נגינת הוידאו (שקופיות לשנייה)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "שינוי מהירות הוידאו"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "שקופית ראשונה"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "שקופית אחרונה"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "השקופית הראשונה שנבחרה בקטע זה"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "השקופית האחרונה שנבחרה בקטע זה"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "מתחיל...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    יש ללחוץ על 'q' כדי להפסיק את ההקלטה. אין לכסות את חלון הנגינה !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "מספר שקופיות להצגה"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_פנוי"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "בחירה חופשית של מספרי שקופיות"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_התחלה"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "מספר השקופיות מקושר לשקופית ההתחלה"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_סוף"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "מספר השקופיות מקושר לשקופית הסיום"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_מצביע"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "מספר השקופיות מקושר למצביע הנגינה"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "הרצה אחורנית"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "נגן הכל"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "נגינת בחירה"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "הפעלת\\כיבוי לולאה"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "התחלת _הקלטה"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "הפסקת _הקלטה"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "_הקלטת ביצועים"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "החבאת חלון נגינה"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "הצגת חלון נגינה"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
-#, fuzzy, c-format
+#: src/utils.c:500
+#, c-format
 msgid "%.2f KiB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "מנקה את לוח הגזירים"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3859,7 +3813,7 @@
 "==============================\n"
 "מותג לקטע %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3869,18 +3823,18 @@
 "========================================\n"
 "מותג לקטע ריק\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(ריק)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr "שם האוסף שונה מ־%s ל־%s.  פריסות מושפעות עודכנו בהתאם\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3889,7 +3843,7 @@
 "הקטע %s חסר באוסף.\n"
 "הפריסות הבאות מחייבות שימוש בו:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3898,7 +3852,7 @@
 "הקטע %s נסגר.\n"
 "הפריסות הבאות מחייבות שימוש בו:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3907,7 +3861,7 @@
 "השקופיות הוזחו מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3916,7 +3870,7 @@
 "השקופיות נמחקו מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3925,7 +3879,7 @@
 "השמע נמחק מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3934,7 +3888,7 @@
 "השמע הוזז מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3943,7 +3897,7 @@
 "השמע שונה בקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3952,7 +3906,7 @@
 "השקופיות שונו בקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3963,7 +3917,7 @@
 "לא נפתח משום שהוא בשימוש\n"
 "ע\"י עותק אחר של LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3974,7 +3928,7 @@
 "האוסף %s נמצא כרגע בשימוש ע\"י עותק אחר של LiVES.\n"
 "נא לבחור שם אחר לאוסף.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3982,16 +3936,13 @@
 "\n"
 "שמות האוסף לא יכולים להיות ריקים.\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"שמות האוסף לא יכולים להכיל רווחים או תווים%s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -4000,13 +3951,13 @@
 "\n"
 "שמות האוסף לא יכולים להכיל רווחים או תווים%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4017,68 +3968,68 @@
 "האוסף %s כבר קיים.\n"
 "נא לבחור שם אחר לאוסף.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "מסיר פריסה %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "וידאו [פותח...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "וידאו[%.2f שניות]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(לא מוגדר)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(אין וידאו)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(אין שמע)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "ערוץ אחד [פותח...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "ערוץ שמאלי [פותח...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "ערוץ אחד [%.2f שניות]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "ערוץ שמאלי [%.2f שניות]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "ערוץ ימני [פותח...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "ערוץ ימני [%.2f שניות]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "אין אפשרות לשנות ל־mplayer כל עוד הקטעים בתהליך טעינה."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "מנקה קטע"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4093,54 +4044,65 @@
 "\n"
 "לשכתבו ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_ביטול %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_ביצוע מחדש %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "------------בחירה----------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " שניות [ --------בחירה--------] "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " שקופיות ] --------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "בוחן כותרת קובץ"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "פותח את %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "פותח את %s בזמן התחלה %.2f שניות. %d שקופיות"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " ללא קול"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "פותח שמע עבור %s"
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -4150,19 +4112,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"כרגע LiVES לא מותאם לקבצים גדולים יותר.\n"
-"מומלץ (נכון לעכשיו) להתחיל עם נפח קטן יותר, או להשתמש באפשרות 'פתיחת  בחירת "
-"קובץ'.\n"
-"(גודל קובץ: %.2f MB)\n"
-"\n"
-"האם ברצונך להמשיך?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - נא להתאזר בסבלנות"
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4174,7 +4129,7 @@
 "אין אפשרות לחלץ שמע או וידאו אחרים.\n"
 "נא לבדוק את חלון המסוף לפרטים נוספים.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4184,7 +4139,7 @@
 "\n"
 "מחובתך להתקין את mplayer כדי לפתוח את קובץ זה.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4196,32 +4151,29 @@
 "נא לבדוק את הגדרות פקודת פתיחת הוידאו ב\n"
 "כלים|העדפות|פענוח\n"
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "מפעיל אפקט Fade על השמע"
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "שומר שקופית כ־%s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "שומר שקופית כ־%s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: -שינוי שם של קטע"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4233,33 +4185,29 @@
 "\n"
 "האם ברצונך להמשיך אף על פי כן?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "בחירה"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "מקשר בחירה"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (ללא קול)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "שומר שקופיות %d ל־%d%s כ־\"%s\" : מקודד = %s : סוג = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "שומר שקופיות 1 ל־%d%s כ־\"%s\" : מקודד %s: סוג = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "שומר [עלול לקחת זמן רב]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4269,34 +4217,33 @@
 "\n"
 "שגיאת מקודד - קובץ הפלט לא נוצר !\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "מנקה את לוח הגזירים"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "גודל הקובץ"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "ההקלטה נעצרה ע\"י התצוגה המקדימה.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "ההקלטה נעצרה ע\"י נגינת לוח הגזירים.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "מקליט ביצועים..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "קצב השקופיות לשנייה הממוצע היה %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4310,16 +4257,16 @@
 "באפשרותך ללחוץ על כלים--->שנה גודל כולל\n"
 "ולשנות את גודלן של כל השקופיות לגודל הנוכחי\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "חסר כותרת%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4327,7 +4274,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4338,12 +4285,12 @@
 "מהירות הנגינה לא נכונה ! משתמש במהירות ברירת המחדל של %.3f שקופיות לשנייה. \n"
 "ניתן לקבוע את ברירת המחדל לערך אחר בכלים | העדפות | שונות.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr "מהירות הנגינה כוונה ל־%.3f שקופיות לשנייה כדי להתאימו לשמע.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4353,7 +4300,7 @@
 "%.3f\n"
 "שמע:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4362,49 +4309,44 @@
 "שקופיות=%d סוג=%s גודל=%dx%d סיביות לפיקסל=%d שקופיות לשנייה=%.3f\n"
 "שמע:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "ללא %s\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d ערוצים %d סיביות לפיקסל\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - הערה: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "שומר שקופית %d כ־%s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "מגבה את %s ל־%s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "מגבה"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "נתוני הביצועים גובו..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "משחזר את %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "משחזר"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4418,34 +4360,30 @@
 "לא הייתה אפשרות לשחזרו.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "הקלטה %.2f מ\"ב"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!הקלטה %.2f מ\"ב"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
-#, fuzzy
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
-msgstr "הקלטה %.2f מ\"ב"
+msgstr ""
 
-#: src/saveplay.c:4819
-#, fuzzy, c-format
+#: src/saveplay.c:5058
+#, c-format
 msgid ""
 "\n"
 "RECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %ld GB !\n"
 "Record stop level can be set in Preferences.\n"
 msgstr ""
-"\n"
-"ההקלטה הושהתה מכיוון שהשטח הפנוי בכונן הינו מתחת ל־%ld ג\"ב !\n"
-"ניתן לקבוע את השלב שבו ההקלטה נעצרת בהעדפות.\n"
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4455,64 +4393,59 @@
 "נמצאו קבצים מהרצה קודמת של LiVES.\n"
 "האם ברצונך לשחזרם ?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "משחזר קבצים"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "משחזר קבצים..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "הצגת פריסות _מושפעות"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "מנקה שטח כונן"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "הגדרות %s מתקדמות"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - אזהרה !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "אזהרה"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - בחירת צבע"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "ניקוי _שגיאות"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_אודות"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4523,7 +4456,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4535,11 +4468,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "לא ניתן לבחור נגני שמע אחרים בזמן נגינה."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4551,20 +4484,18 @@
 "ל־LiVES לא הייתה אפשרות לבצע פעולה זו בגלל נפח זיכרון מוגבל.\n"
 "נא לנסות לסגור יישומים אחרים קודם.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% הסתיים. הזמן שנותר: %u שניות\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4573,7 +4504,7 @@
 "\n"
 "%d/%d שקופיות נפתחו. נותרו %u שניות.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4582,7 +4513,7 @@
 "\n"
 "%d/%d שקופיות נפתחו.\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4591,7 +4522,7 @@
 "\n"
 "נפתחו %d שקופיות.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4600,7 +4531,7 @@
 "\n"
 "הזמן שנותר: %d שניות"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4542,7 @@
 "מצטערים, LiVES יכול לפתוח רק %d קבצים בכל פעם.\n"
 "נא לסגור קובץ ולנסות שוב."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4630,7 +4561,7 @@
 "\n"
 "נא לוודא שניתן לכתוב לתקייה זו."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4640,7 +4571,7 @@
 "נא להתקין את החבילה 'sox'\n"
 "או לשנות מקודד בכלים | העדפות | קידוד\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4652,7 +4583,7 @@
 "המקודד אינו יכול להשתמש במקודד השמע שסופק.\n"
 "נא לקבוע את מקודד השמע בכלים | העדפות | קידוד\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4660,16 +4591,13 @@
 "פריסה זו כולל שקופיות מחוללות.\n"
 "לא ניתן לשמור אותה, עליך לאגדה לקטע קודם.\n"
 
-#: src/dialogs.c:1820
-#, fuzzy
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
-"פריסה זו כולל שקופיות מחוללות.\n"
-"לא ניתן לשמור אותה, עליך לאגדה לקטע קודם.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4680,7 +4608,7 @@
 "\n"
 "בגלל ההחמרה בסוג %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4688,43 +4616,43 @@
 "אנו ממליצים על ההגדרות הבאות:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", רשום"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", לא רשום"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", שימוש בנפח קטן"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", שימוש בנפח גדול"
 
-#: src/dialogs.c:1867
-#, fuzzy, c-format
+#: src/dialogs.c:2004
+#, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
-msgstr "שימוש בתדר שמע של %d הרץ%s\n"
+msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "קביעת קצב הוידאו ל־%.3f שקופיות לשנייה\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "קביעת קצב הוידאו ל־%d:%d שקופיות לשנייה\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "קביעת גודל הוידאו ל־ %d על %d פיקסלים\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4732,35 +4660,35 @@
 "\n"
 "באפשרותך:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "לשנות את גודל הוידאו ל־%d על %d פיקסלים\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "לנטרל את השמע, בגלל שמקודד המטרה אינו מקודד שמע\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES חייב:\n"
 
-#: src/dialogs.c:1974
-#, fuzzy, c-format
+#: src/dialogs.c:2112
+#, c-format
 msgid "resample audio to %d Hz%s%s\n"
-msgstr "דגימה מחדש של השמע לתדר של %d הרץ%s\n"
+msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "לדגום מחדש את הוידאו ל־%.3f שקופיות לשנייה\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "לדגום מחדש את הוידאו ל־%d:%d שקופיות לשנייה\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4774,7 +4702,7 @@
 "יש ללחוץ על `אישור` להמשך, או על `ביטול` לביטול.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4784,7 +4712,7 @@
 "השינויים שחלו לבחירה לא יהיו תמידיים.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4797,7 +4725,7 @@
 "לא הייתה אפשרות להקליט את הביצועים. כרגע אין מספיק נפח זיכרון פנוי.\n"
 "באפשרותך לנסות להקליט רק עבור בחירת הקובץ."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4815,7 +4743,7 @@
 "\n"
 "יש ללחוץ על ביטול כדי לעצור את ההכנסה, או על אישור כדי להמשיך."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4828,11 +4756,11 @@
 "LiVES יודיע לך כשהשקופיות יתקבלו.\n"
 "לחץ על אישור אם הבנת במה מדובר, אחרת, לחץ על ביטול."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "הצגת מקשים"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4912,11 +4840,11 @@
 "d                             גודל כפול\n"
 "g                             לולאת Ping Pong\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "מקשים רב־רצועתיים"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4938,19 +4866,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "היסטורית הודעות"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"לאחר התקנה\\שדרוג, ייתכן שיהיה צורך לשנות את הגדרת ה־<prefix_dir> בקובץ ~/."
-"lives"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4958,16 +4885,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES לא הצליח למצוא שום תוספים לאפקטים מוכנים.\n"
-"נא לוודא שהם מותקנים ב־\n"
-"%s%s%s\n"
-"או לשנות את הערך של <lib_dir> ב־~/.lives\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4977,18 +4898,18 @@
 "\n"
 "(שמות הקבצים חייבים להסתיים ב: .mp3, .ogg, .wav, .mod, .xm או .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "נכשל (סוג לא ידוע)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -5001,7 +4922,7 @@
 "יש ללחוץ על אישור כדי להוסיף את הקטעים הנוכחיים והפריסות לאוסף הנוכחי. \n"
 "או לחילופין על ביטול כדי לבחור שם חדש.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5013,7 +4934,7 @@
 "האם ברצונך להמשיך בכל זאת ?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5025,8 +4946,8 @@
 "האם ברצונך להמשיך בכל זאת ?\n"
 "."
 
-#: src/dialogs.c:2170
-#, fuzzy, c-format
+#: src/dialogs.c:2310
+#, c-format
 msgid ""
 "\n"
 "The original file\n"
@@ -5035,15 +4956,8 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
-"\n"
-"לא ניתן למצוא\n"
-"את הקובץ המקורי\n"
-"%s\n"
-"אם קובץ זה הוסר, נא להעתיק אותו בחזרה למיקומו המקורי\n"
-"וללחוץ על 'אישור' כדי לנסות שוב.\n"
-"לחילופין, ניתן ללחוץ על 'ביטול' כדי לדלג על טעינת קובץ זה.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5058,7 +4972,7 @@
 "%s\n"
 "לא ניתן לאתר את הקטע.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5066,7 +4980,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5075,13 +4989,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5092,7 +5006,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5100,7 +5014,7 @@
 "\n"
 "לחילופין, באפשרותך להפעיל מחדש את LiVES ולבחור בנגן שמע אחר.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5115,20 +5029,16 @@
 "באפשרותך לשנות את הערך בהעדפות\\רב־רצועתי\n"
 "מומלץ לשנותו ללפחות %d מ\"ב"
 
-#: src/dialogs.c:2221
-#, fuzzy, c-format
+#: src/dialogs.c:2361
+#, c-format
 msgid ""
 "\n"
 "Some old layouts for the set %s already exist.\n"
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 msgstr ""
-"\n"
-"פריסות ישנות מסוימות עבור האוסף %s עדיין קיימות.\n"
-"מומלץ למחוק אותן.\n"
-"יש ללחוץ על 'אישור' כדי למחוק אותם, או על 'ביטול' כדי להשאירם בכונן הקשיח.\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5140,7 +5050,7 @@
 "ניתן לסגור יישומים אחדים, או להגדיל את מכסת הזיכרון\n"
 "בהעדפות\\רב־רצועתי\\זיכרון לביטול פעולות\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5152,7 +5062,7 @@
 "ייתכן ויהיה צורך להגדיל את מכסת הזיכרון\n"
 "בהעדפות\\רב־רצועתי\\זיכרון לביטול פעולות\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5161,19 +5071,19 @@
 "ל־LiVES לא הייתה אפשרות להשתמש במספיק זיכרון לחוצץ ביטול פעולות רב־"
 "רצועתיות.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "או להכניס ערך קטן יותר.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "אפשר לנסות שוב מעורך הקטעים, או לנסות לסגור יישומים אחרים\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "ניתן לנסות לסגור יישומים אחרים\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5181,12 +5091,12 @@
 "המצב הרב־רצועתי נקבע ל־0 ערוצי שמע, אבל פריסה זו מכילה שמע.\n"
 "באפשרותך לכוון את הגדרות השמע מתפריט הכלים.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr "הפריסה הנוכחית מכילה אודיו, לכן לא מומלץ שמספר הערוצים ייקבע לאפס.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5196,7 +5106,7 @@
 "נגן השמע \"jack\" או \"pulse audio\".\n"
 "באפשרותך לקבוע זאת בתפריט כלים|העדפות|נגינה."
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5206,7 +5116,7 @@
 "של LiVES).\n"
 "האם לנסות לתקן את עותק הכונן של הפריסה ?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5214,7 +5124,7 @@
 "LiVES אין אפשרות לטעון את הפריסה.\n"
 "מצטער.\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5224,7 +5134,7 @@
 "\n"
 "תדר השמע חייב להיות גדול מ־0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5236,7 +5146,7 @@
 "והצגתה עלולה לקחת זמן רב.\n"
 "האם ברצונך להציגה בכל זאת ?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5246,7 +5156,7 @@
 "\n"
 "מחובתך להתקין את 'dvgrab' כדי להשתמש בתכונה זו.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5260,25 +5170,25 @@
 "נגן השמע \"jack\" או \"pulse audio\".\n"
 "באפשרותך לבחור אחת מאפשרויות אלו בתפריט כלים|העדפות|נגינה.\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "תוסף נגינת הוידאו נכשל בהצגת הלוח !\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "תוסף המקודד נכשל בהצגת לוח הצבעים !\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "ל־LiVES לא הייתה אפשרות לקבוע את קצב השקופיות של תוסף הוידאו\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5291,34 +5201,34 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmnem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "בוטל.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "נכשל.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "הסתיים.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "שגיאה בקובץ. נכשל.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5326,13 +5236,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5340,13 +5246,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5354,26 +5256,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5381,26 +5275,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5408,17 +5294,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-"%s\n"
-"נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5427,7 +5309,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5440,7 +5322,7 @@
 "%s\n"
 "נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5449,19 +5331,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"האוסף יימחק מהכונן הקשיח.\n"
-"האם לבצע זאת ?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5469,13 +5354,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5485,27 +5370,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5514,14 +5399,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5532,19 +5417,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5552,7 +5437,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5560,7 +5445,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5572,45 +5457,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"ברוכים הבאים ל־LiVES גרסה %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5619,203 +5502,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "מחולל"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "מחוללים"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "מחולל"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "מחוללים"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "מעבר"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "מעברים"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "אפקט"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "אפקטים"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "כלי שירות"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "כלי שירות"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "מחבר"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "מחברים"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "ברז"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "ברזים"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "מפצל"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "מפצלים"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "ממיר"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "ממירים"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "שמע/וידאו"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "מעברי וידאו\\שמע"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "וידאו בלבד"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "מעברי וידאו בלבד"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "שמע בלבד"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "מעברי שמע בלבד"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "שמע"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "מערבלי שמע"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "ניהול פרוייקט"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "בקר עוצמת שמע"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "בקרי עוצמת שמע"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "וידאו בלבד"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "וידאו בלבד"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "שמע בלבד"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "פרמטרי שמע"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s כל השקופיות..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s מלוח הגזירים לשקופיות %d ל־%d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s ללוח הגזירים..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s לקטע חדש..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s שקופיות %d ל־%d"
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s לוח הגזירים עם בחירה"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s ללוח הגזירים"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s לקטע חדש"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s שקופיות %d ל־%d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5823,17 +5747,46 @@
 "\n"
 "לא נוצרו שקופיות.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "שגיאה: אין לתוסף %s אפשרות weed_setup();\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5842,131 +5795,310 @@
 "מידע: אין אפשרות לטעון את התוסף %s\n"
 "השגיאה הייתה: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "הכללת תת־תיקיות"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "%d רכיבי תכנה נטענו בהצלחה\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "אירעה שגיאה בנסיון להתחלת המופע %s, קוד שגיאה %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "אין אפשרות להפעיל את המחולל %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "נכשל בנסיון להפעיל את המחולל %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "נכשל בנסיון להפעיל את המחולל %s, שגיאה %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "באפשרותך ללחוץ על 'תצוגה מקדימה' כדי לשנות את ערכים אלו"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_איפוס ערכים"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _שקופית"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "אחזקת היחס של השקופית המקורית"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "אחזקת ה_יחס"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: בחירת קובץ"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "אחזקת היחס של השקופית המקורית"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "מעבר _פנימה"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "מעבר פנימה"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "החלת מעבר Crossfade על השמע"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "יש ללחוץ על הקופסה כדי להחיל מעבר שמע עם הוידאו"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "החלת מעבר Crossfade על השמע"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "מעבר _החוצה"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "מעבר החוצה"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "מספר יעד של שקופיות לשנייה (תוסף אולי יסתור את הגדרות אלו)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : גודל"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "גודל חדש (פיקסלים)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_רוחב"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_גובה"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "יצירה ל_לוח הגזירים"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "יצירת שקופיות ללוח הגזירים"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "יצירה לקטע _חדש"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "יצירת שקופיות לקטע חדש"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5977,62 +6109,59 @@
 "מחובתך לבחור לפחות %d שקופיות כדי להשתמש באפקט זה.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "קביעה כברירת מחדל"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "סגירת _חלון"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "אין פרמטרים"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "פרמטר לא תקין"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - בחירת צבע"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "יש ללחוץ כאן כדי לבחור צבע"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "ב_צע שוב"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "ערך האדום (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "ירוק"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "ערך הירוק(0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "כחול"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "ערך הכחול (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -6041,12 +6170,12 @@
 "\n"
 "שגיאת תוסף: %s נכשל עם הקוד %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : ההודעה הייתה %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6061,17 +6190,17 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "מעדכן את ברירות המחדל של נגינת הוידאו ב%s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "טוען את ברירת המחדל של נגינת הוידאו מ%s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6086,32 +6215,32 @@
 "כלים|העדפות|תוספי נגינה מתקדמים\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "קצב שקופיות קבוע לתוסף.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_שקופיות לשנייה"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "קלט מרחב צבעים לתוסף.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "קצב שקופיות קבוע לתוסף.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "_מרחב צבעים"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "קלט מרחב צבעים לתוסף.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6124,16 +6253,7 @@
 "כשל בנסיון לפתוח את תוסף הנגינה %s\n"
 "השגיאה הייתה %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"לא ניתן להפעיל את תוסף הנגינה.\n"
-"השגיאה הייתה: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6148,7 +6268,16 @@
 "אינו מכיל תכונה הכרחית.\n"
 "לכן,לא ניתן להשתמש בו.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"לא ניתן להפעיל את תוסף הנגינה.\n"
+"השגיאה הייתה: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6158,37 +6287,33 @@
 "אזהרה ! תוסף נגינת הוידאו לא ישלח לחיצות מקשים. המקלדת עלולה להיות מנוטרלת "
 "בזמן השימוש בו !\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr "*** שימוש בתוסף %s עבור נגינת fs, מאושר לסוג הלוח %d (%s). ***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"ל־LiVES לא הייתה אפשרות למצוא את תוספי המקודדים שלו. נא לוודא שהתוסף...\n"
-"%s%s%s\n"
-"נמצא\n"
-"או לשנות את הערך של <lib_dir> ב ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6201,11 +6326,11 @@
 "%s%s%s\n"
 "או להחליף לתוסף אחר בכלים|העדפות|קידוד\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "אין אפשרות לשנות גודל, נא להתקין את imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6218,7 +6343,7 @@
 "נכשל בנסיון לפתוח את תוסף המפענח %s\n"
 "השגיאה הייתה %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6233,187 +6358,170 @@
 "אינו מכיל אפשרות הכרחית.\n"
 "לא ניתן להשתמש בו.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "\\לא ידוע"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES : - אפשרויות קידוד"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "נכשל בטעינת %s, המעברים עלולים לא לשנות גודל.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "הגדרות %s מתקדמות"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - בדיקת RFX חדשה"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - עריכת בדיקת RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "סוג:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "אפקט -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "מעבר -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "מחולל -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "כלי -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "כלי שירות -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "שם:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "שם התוסף. אין להשתמש ברווחים."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "גרסה:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "גרסת התסריט."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    יוצר:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "יוצר התסריט."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    כתובת אינטרנט (רשות):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "כתובת האינטרנט של מתחזק התוסף."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "טקסט התפריט:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "הטקסט להצגה בתפריט."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "תיאור פעולה:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "מה התוסף עושה. לדוגמה \"זיהוי פינות\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "מספר שקופיות מינימלי:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "מספר שקופיות מינימלי שניתן להחיל עליהם כלי\\אפקט . בד\"כ 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_דרישות..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "כל קובץ שנדרש לפעולה תקינה של התוסף."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "קביעת מאפיינים לתוסף. רשות."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_פרמטרים..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "קביעת פרמטרים לשימוש ב קוד לפני\\לולאה\\אחרי\\הוגדר. רשות."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "הפרמטר _רמזי חלון..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "קביעת רמזים אודות כיצד להתכונן לפרמטר החלון. רשות."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "קוד שפה:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "שפה ללפני\\לולאה\\אחרי\\אירועים. רשות."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "קוד _לפני לולאה..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "קוד שיורץ לפני הלולאה. רשות."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "קוד _לולאה..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "קוד לולאה שיוחל על כל שקופית."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "קוד _אחרי לולאה..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "קוד שיורץ אחרי הלולאה. רשות."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "קוד _גורם..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6421,7 +6529,7 @@
 "קביעת קוד גורם עבור תרחיש שבו חלון הפרמטרים מוצג, או כאשר פרמטר שונה. רשות "
 "(צפוי לכלי שירות)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6436,55 +6544,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - דרישות RFX"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - פרמטרים של RFX"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - פרמטר רמזי חלון של RFX"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - גורמי RFX"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "ערך _חדש"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_עריכת ערך"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_מחיקת ערך"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "הזזה _למעלה"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "הזזה _למטה"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - מאפייני RFX"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "_איטי (רמז למנשק המשתמש הגרפי)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "מחולל מצב _אצווה"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6498,7 +6606,7 @@
 "נא להסיר את הגורם קודם.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6510,196 +6618,184 @@
 "גורמים אחדים כוונו.\n"
 "נא לבדוק את קוד הגורם.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - פרמטר RFX חדש"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - עריכת פרמטר RFX"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_שם:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "שם הפרמטר, חייב להיות יחודי בתוסף."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_תווית:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr "תווית שתוצג ע\"י הפרמטר. ייחודיות מציגה מאיץ זיכרון."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "_קבוצת כפתורים: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "ערך גדול מ־0 הניתן לשימוש כדי לקבץ כפתורי רדיו."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_סוג:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "סוג פרמטר (ניתן לבחירה מרשימה)"
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "_מקומות שבר עשרוני: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "ערך _ברירת מחדל:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_ברירת מחדל: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "_קבוצת כפתורים: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "ערך גדול מ־0 הניתן לשימוש כדי לקבץ כפתורי רדיו."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "ערך _מינימלי: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "ערך מקס_ימלי: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     גודל _צעד:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "כמה הפרמטר מכוון כאשר חצי כפתור הסחרור נלחצים."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_גלישה: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "אם הערך גולש לגבול העליון-> דקה ודקה->גבול עליון."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "קביעת _ערכים"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "ערך ברירת מחדל:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "ערך מינימלי: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "ערך מקסימלי: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "ברירת מחדל של _אדום:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "ברירת מחדל של _ירוק:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "ברירת מחדל של _כחול: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "קביעה כ_ברירת מחדל"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "ערך ברירת מחדל  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "אורך מקסימלי (תווים): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - פרמטר RFX חדש של חלון רמז"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - עריכת פרמטר RFX של חלון רמז"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "מילת מפתח:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "סוג מיוחד:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "תת־סוג מיוחד:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
+
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "שורה:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "פרמטרים מקושרים (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "פרמטרים מקושרים (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "פרמטרים מקושרים (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - גורם RFX חדש"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: עריכת גורם RFX"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "כאשר:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - קוד לפני לולאה"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - קוד לולאה"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - קוד אחרי לולאה"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: -(%d טקסט ברירת מחדל (אורך מקסימלי"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - הכנסת ערכים, אחד בכל שורה"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6709,7 +6805,7 @@
 "\n"
 "אין להכניס שם ריק.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6719,7 +6815,7 @@
 "\n"
 "אין להכניס רווחים לשם.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6729,7 +6825,7 @@
 "\n"
 "אין להשאיר את טקסט התפריט ריק.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6739,7 +6835,7 @@
 "\n"
 "אין להשאיר את תיאור הפעולה ריק.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6749,7 +6845,7 @@
 "\n"
 "אין להשאיר את שדה היוצר ריק.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6761,7 +6857,7 @@
 "כבר יש תוסף עם שם זה.\n"
 "השם חייב להיות ייחודי.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6771,7 +6867,7 @@
 "\n"
 "לא מומלץ להשאיר את קוד הלולאה ריק.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6781,7 +6877,7 @@
 "\n"
 "לא מומלץ להשאיר את קוד הגורם ריק עבור כלי שירות.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6791,7 +6887,7 @@
 "\n"
 "אין להשאיר את שם הפרמטר ריק.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6804,41 +6900,41 @@
 "אותרו כפילויות בשמות פרמטרים. שמות הפרמטרים חייבים להיות ייחודיים בתוסף.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "כותב קובץ תסריט %s..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "לא נמצא אזור <define> בתסריט.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "גרסת תסריט שגויה.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "לא נמצא אזור <name> בתסריט.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "לא נמצא אזור <version> בתסריט.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "לא נמצא אזור <author> בתסריט.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "לא נמצא אזור <description> בתסריט.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "תיאור גרוע (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6853,27 +6949,27 @@
 "נמצא בתסריט.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "בונה מחדש את כל תסריטי ה־RFX...נבנה..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "בונה מחדש תסריטים"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "מותאם אישית..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "בדיקה..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "בונה מחדש את ערכי התפריטים הפעילים..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6886,7 +6982,7 @@
 "ל־LiVES לא הייתה אפשרות למצוא את התוכנה %s.\n"
 "נא לבדוק שתוכנה זו נמצאת בנתיב הנכון וכן בעלת הרשאות הרצה.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6901,12 +6997,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "מוחק את תסריט הRFX %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6921,7 +7017,7 @@
 "%s\n"
 "קוד השגיאה היה %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6936,12 +7032,12 @@
 "כבר קיים.\n"
 "נא למחוק אותו קודם, או לשנות את שם תסריט הבדיקה.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "מקדם את תוסף הבדיקה של rfx %s למותאם אישית..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6949,29 +7045,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"כשל בניסיון להעביר את תסריט התוסף מ\n"
-"%s ל\n"
-"%s\n"
-"הקוד שהוחזר היה %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "ייבוא תסריט מ..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "ייצוא תסריט ל..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "מעתיק את %s ל%s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6986,55 +7076,43 @@
 "כבר קיים.\n"
 "נא למחוק אותו קודם, או לשנות את שם תסריט הייבוא.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "מובנה"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "מותאם אישית"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "בדיקה"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: העתקת תסריט RFX"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "מסוג:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   תסריט:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - שינוי שם תסריט RFX"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "מתסריט: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - שם תסריט RFX"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "שם תסריט: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "שם חדש: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "שם תסריט חדש: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7046,26 +7124,43 @@
 "כבר יש תסריט בדיקה עם שם זה.\n"
 "שם התסריט חייב להיות ייחודי.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "משנה את שם תסריט  בדיקת הRFX %s ל%s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"כשל בניסיון להעביר את תסריט התוסף מ\n"
+"%s ל\n"
+"%s\n"
+"הקוד שהוחזר היה %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_החלת אפקטים בזמן אמת על הבחירה"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "טוען אפקט מוכן %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr "ניתן לראות: VJ - הצגת מקשי VJ. קביעת אפקטים בזמן אמת והחלתם כאן."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7077,7 +7172,7 @@
 "תוספי נגינת הוידאו מופעלים רק במצב\n"
 "מסך מלא וחלון נפרד (fs)\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7085,51 +7180,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"האם ליצור את התיקייה\n"
-"%s\n"
-"?\n"
-"\n"
-"(מקום פנוי: %.2f ג\"ב)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"התיקייה הזמנית היא תיקיית העבודה של־LiVES במקום שבו קטעים פתוחים ואוספים "
-"נשמרים.\n"
-"תיקייה זו חייבת להיות במחיצה עם שפע מקום פנוי."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"לא ניתן ליצור או לכתוב לתיקייה הזמנית החדשה.\n"
-"ניתן ליצור אותה כמשתמש־על, לדוגמה:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"התיקייה לא תשתנה כעת.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7147,7 +7235,7 @@
 "\n"
 "לחילופין, ניתן ללחוץ על ביטול כדי לשחזר את התיקייה הזמנית להגדרתה המקורית."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7157,7 +7245,7 @@
 "לא ניתן להחליף את נגן השמע לjack - jackd חייב להיות מותקן קודם.\n"
 "למידע נוסף, ניתן להיכנס לאתר http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7165,7 +7253,7 @@
 "\n"
 "החלפת נגן השמע מחייבת הפעלה מחדש (אסור שjackd ירוץ)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7177,367 +7265,380 @@
 "חובה להתקין את pulseaudio קודם.\n"
 "למידע נוסף: http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM(האיכות הגבוהה ביותר; הקבצים הגדולים ביותר)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - העדפות"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "פתיחת בחירת קובץ בגודל מלא"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "הצגת הקבצים האחרונים בתפריט הקובץ"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "הפסקת שומר המסך בעת נגינה    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "פתיחת החלון הראשי בגודל מלא"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "הצגת סרגל הכלים כשהרקע ריק"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "מתן אפשרות  להחלפת קטעים באמצעות גלגלת העכבר"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "מצב עלייה:"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "_עורך קטעים"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "_מצב מרובה רצועות"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "תמיכה בריבוי צגים"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " מספר צגים עבור הממשק של LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " מספר צגים לנגינה"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "הכרחת שימוש בצג בודד"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "הכרחת מצב צג בודד"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "מנשק"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "כאשר נכנסים למצב המרובה־רצועות:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_מתן אפשרות לקבוע  רוחב, גובה, שקופיות לשנייה והגדרות שמע"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_שימוש בערכים הבאים:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "שימוש באותם _ערכים עבור עיבוד הוידאו והשמע לקטע חדש"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_רוחב           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _גובה      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "הצגת רצועת מוזיקת רקע"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "רצועת שמע לכל רצועת וידאו"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _ביטול גודל החוצץ (מ\"ב)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "_יציאה ממצב מרובה־רצועות אחרי עיבוד תמונה ושמע"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "גיבוי פריסות אוטומטי"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_בכל"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "שניות"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "לאחר כל _שינוי"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_לעולם לא"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "ריבוי רצועות\\עיבוד תמונה ושמע"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "שימוש בפתיחה מיידית כשהדבר אפשרי"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr "אפשור פתיחה מיידית של סוגי קבצים מסויימים בעזרת תוספים למפענח"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "פקודת פתיחת הוידאו             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "פתיחה\\עיבוד דחיסה                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
+
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " % ( נמוך יותר = איטי יותר, קבצים גדולים יותר; ל־jpeg, איכות גבוהה יותר )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "ברירת המחדל של סוג התמונה          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr "עמרי"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "אפשור פירוק אוטומטי כשהדבר אפשרי"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "אפשור פירוק שקופיות כאשר תוסף מבקש זאת"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "בפתיחת קבצים מרובים, יש לאחד את התמונות לקטע אחד"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "פענוח"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr "איכות תצוגת נגינת הוידאו - משפיע על שינויי גודל"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "_איכות תצוגה"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "נמוך - יכול לשפר את הביצועים במחשבים איטיים יותר"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "רגיל - מומלץ לרוב המשתמשים"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "גבוה - יכול לשפר את האיכות במחשבים מהירים מאד"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "_איכות תצוגה"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr "איכות תצוגת נגינת הוידאו - משפיע על שינויי גודל"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "הצגת נתונים סטטיסטיים לגבי השקופיות לשנייה"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_תוסף"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "וידאו"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_נגן"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "_פקודת נגינת שמע"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- פנימי -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "התאמת השמע ל_קצב\\כיוון הוידאו"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "התאמת השמע למיתוג _קטעים"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "שמע"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "נגינה"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      מה להקליט כאשר 'r' נלחץ   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "שינויי _שקופיות"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "שינויי ש_קופיות לשנייה"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "אפקטים בזמן _אמת"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "החלפה בין _קטעים"
 
-#: src/preferences.c:3507
-#, fuzzy
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_שמע (אפשרות זו מחייבת את נגן השמע jack או pulse )"
-
-#: src/preferences.c:3529
-#, fuzzy
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_שמע (אפשרות זו מחייבת את נגן השמע jack או pulse )"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "ג\"ב"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "מקליט"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      מקודד                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "סוג קובץ פלט"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "מקודד שמע"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "מקודד"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "שימוש ב_החלקת עקומות בעת שינויי גודל"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "מספר מקשי אפקטים בזמן _אמת"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7545,161 +7646,176 @@
 "מספר מקשים \"מדומים\" של אפקטים בזמן אמת. ניתן לשלוט בהם דרך חלון האפקטים "
 "בזמן אמת, או דרך הרשת (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      תיקיית טעינת וידאו (ברירת מחדל)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      תיקיית שמירת וידאו (ברירת מחדל) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      תיקיית טעינת שמע (ברירת מחדל) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      תיקיית תמונה (ברירת מחדל) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      גיבוי\\שחזור תיקייה (ברירת מחדל) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      תיקייה זמנית (אין להסירה) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "תיקיית ברירת המחדל ממנה טוענים קטעים"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "תיקיית ברירת המחדל לשמירת קטעים מקודדים."
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "תיקיית ברירת המחדל לטעינת ושמירת שמע"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "תיקיית ברירת המחדל לשמירת תצלומי שקופיות"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr "תיקיית ברירת המחדל לגיבוי\\שחזור קטעים בודדים"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "תיקיית העבודה של LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "תיקיות"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr "אזהרה בהוספה\\מיזוג אם קצב ה_שקופיות לא מתאים לקצב של הבחירה"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "הצגת אזהרה בפתיחה אם _גודל הקובץ עובר את "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " מ\"ב"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "הצגת אזהרה לפני שמירת א_וסף"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "הצגת אזהרה אם לא נמצאו אפקטים _מוכנים בהפעלה."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "הצגת אזהרה אם לא נמצאו תוספים _למקודד בהפעלה."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "הצגת אזהרה אם ישנה _כפילות בשם האוסף שהוכנס."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "הצגת אזהרה לגבי קטעים חסרים ב_פריסות כשאוסף נטען."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "הצגת אזהרה אם קטע שנמצא באחת הפריסות עומד להיסגר."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "הצגת אזהרה אם שקופיות הנמצאות בשימוש ע\"י פריסה עומדות להימחק."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "הצגת אזהרה אם שקופיות הנמצאות בשימוש ע\"י פריסה עומדים לזוז."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "הצגת אזהרה אם השקופיות הנמצאות בשימוש ע\"י פריסה עומדות להשתנות."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "הצגת אזהרה אם שמע הנמצא בשימוש ע\"י פריסה עומד להימחק."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "הצגת אזהרה אם שמע הנמצא בשימוש בפריסה עומד לזוז."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "הצגת אזהרה אם שמע הנמצא בשימוש בפריסה עומד להשתנות."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "הצגת אזהרה אם הפריסה לא נשמרה בעת יציאה ממצב ריבוי הרצועות"
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr "הצגת אזהרה אם ריבוי הרצועות אינו מכיל ערוצי שמע, ופריסה עם שמע נטענה."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7707,246 +7823,216 @@
 "הזהר אם ריבוי הרצועות מכיל ערוצי שמע ונגן השמע שלך אינו \"jack\" או \"pulse "
 "audio\"."
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "הצגת הודעת מידע אחרי ייבוא מהתקן firewire"
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "הצגת אזהרה לפני פתיחת זרימת yuv4mpeg (מתקדם)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "הצגת אזהרה כשריבוי הרצועות דל בשטח גיבוי."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr "הצג אזהרה מייעץ ניקוי שטח דיסק לאחר התרסקות."
 
-#: src/preferences.c:4660
-#, fuzzy
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
-msgstr "הצגת אזהרה אם לא נמצאו תוספים _למקודד בהפעלה."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "אזהרות"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "סינכרון Midi (מחייב את הקבצים midistart ו־midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "כאשר מוסיפים\\ממזגים שקופיות:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_האצה\\האטה של התוספת"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_דגימת התוספת מחדש"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "השהיית xmms בזמן נגינת שמע"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "התקן תקליטורים           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: בחירת התקן תקליטורים"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES יכול לטעון רצועות שמע מתקליטור זה"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "ברירת מחדל של שקופיות לשנייה        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "מספר שקופיות לשנייה לשימוש כאשר לא סופק אחר"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "שונות"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "ערכת נושא חדשה:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "רוחב פס הורדה (ק\"ב\\שנייה)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "חובה להדר את LiVES בלי \"configure --disable-OSC\" כדי להשתמש ב־OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "שליטה מרחוק על OMC מאופשרת"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "פותחת UDP       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "הפעלת OMC בהפעלת LiVES"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "זרימה\\רשת"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "העברת Jack"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 "חובה להדר את LiVES עם jack/transport.h וjack\\jack.h כדי להשתמש בהעברת Jack"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "קובץ הגדרות _תעבורת Jack"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "שם שרת ה־Jack שיכול לשלוט על התעבורה של LiVES."
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "הפעלת ה_שרת בהפעלת LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "שמע Jack"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "חובה להדר את LiVES עם jack\\jack.h כדי להשתמש בשמע jack"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr "מחובתך לקבוע את נגן השמע ל\"jack\" בלשונית הנגינה כדי להשתמש בשמע jack"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "קובץ הגדרות שרת ה_שמע Jack"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "שם שרת הjack לשמע"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "שילוב עם Jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "אירועים להגבה:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "אירועי _מוט היגוי"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "התקן _מוט היגוי"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "התקן מוט ההיגוי, לדוגמה /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: בחירת התקן מוט היגוי"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "אירועי _MIDI"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr "יצירת ערוץ MIDI ב־ALSA שאליו יכולים להתחבר התקני MIDI אחרים"
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "שימוש ב־MIDI של _ALSA"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr "יצירת ערוץ MIDI ב־ALSA שאליו יכולים להתחבר התקני MIDI אחרים"
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "שימוש ב־MIDI לא דחוס"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "קריאה ישירות מהתקן ה־MIDI"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "התקן _MIDI"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "התקן הMIDI, לדוגמה /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: בחירת התקן MIDI"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "_תדר בדיקת MIDI"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -7954,24 +8040,23 @@
 "מספר בדיקות MIDI לכל נקישת מקלדת. העלאת התדר אולי תגרום לשיפור תגובות הMIDI, "
 "אבל עלולה להאט את הנגינה."
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "ביצוע חוזר של MIDI"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "מספר אי־קריאות מותר בין קריאות מוצלחות"
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(אזהרה: הגדלה מוגזמת של ערך זה עלולה להאט את הנגינה.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "לומד MIDI\\מוט היגוי"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7982,68 +8067,68 @@
 "LiVES יכבה עכשיו. יש צורך להפעילו מחדש כדי ששינוי התיקייה יחול.\n"
 "נא ללחוץ על אישור.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "שינויי ערכת הנושא לא ישפיעו עד הפעלת LiVES הבאה."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "אפשרויות הJack לא יישתנו עד ההפעלה הבאה של LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "מסנכרן לקצב שקופיות חיצוני של %.8f שקופיות לשנייה.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "לא ניתן לאתחל את מקלט ה־OSC\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "אזהרה: לא ניתן להפעיל את שרת הOSC בפותחת הUDP %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "שרת הOSC הופעל בפותחת הUDP %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "לא ניתן להפעיל את שרת הOSC/UDP בפותחה %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "משנה את גודל השקופיות 1 עד %d"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "משנה את גודל השקופיות 1 עד %d"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "שינוי גודל"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "דגימה מחדש"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "אורך הוידאו כעת הינו %d שקופיות.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8053,154 +8138,146 @@
 "\n"
 "הקצב החדש חייב להיות גדול מ0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "דגימת שמע מחדש"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "ל־LiVES לא הייתה אפשרות לדגום מחדש את השמע כפי שבוקש.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "דגימת שמע מחדש"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "השמע נדגם מחדש ל%d ׁHz, %d ערוצים ו%d סיביות"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "דוגם את הוידאו מחדש ב%.8f שקופיות לשנייה"
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "דוגם את הוידאו מחדש ב%.3f שקופיות לשנייה..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "שגיאת סידור מחדש !\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "דגימה מחדש"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: דגימת שמע מחדש"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - הוספת שקט"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - קטע שמע חדש"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - הגדרות קטע חיצוני"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "קצב (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         ערוצים "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        גודל דגימה "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
+
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "חתום"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "לא חתום"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "נוכחי"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_הפעלת שמע"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_תדר "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _ערוצים "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    ערוצים "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    גודל _דגימה "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    גודל דגימה "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "חדש"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_שקופיות לשנייה "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "זמן הקלטה מקסימלי:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " שעות  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " דקות  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " שניות  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "בלתי־מוגבל"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "יש ללחוץ על אישור כדי להתחיל בהקלטה, או על ביטול כדי לצאת"
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - שינוי מהירות הנגינה"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - דגימת וידאו מחדש"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8217,7 +8294,7 @@
 "נא להכניס את מהירות הנגינה הרצויה\n"
 "ב _שקופיות"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8234,15 +8311,15 @@
 "נא להכניס את הקצב ש_נדגם מחדש\n"
 "בשקופיות לשנייה"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "או להכניס את אורך הקטע הרצוי ב_שניות"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "שינוי מהירות ה_שמע בנוסף"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8252,7 +8329,7 @@
 "העלאת מהירות הקטע תגרום לשקופיות חסרות בפריסות מרובות־רצועות מסוימות.\n"
 "האם לשנות את המהירות?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8262,55 +8339,47 @@
 "העלאת מהירות הקטע תגרום לשמע חסר בפריסות מרובות־רצועות מסוימות.\n"
 "האם לשנות את המהירות ?\n"
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"שינוי המהירות יזיז את השקופיות בפריסות מרובות־רצועות מסוימות.\n"
-"האם להמשיך ?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"שינוי המהירות יזיז את השמע בפריסות מרובות־רצועות מסוימות.\n"
-"האם להמשיך ?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "שינוי מהירות"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "מהירות הנגינה שונתה ל%.3f שקופיות לשנייה והשמע שונה ל %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "מהירות הנגינה שונתה ל%.3f שקופיות לשנייה.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "דוגם מחדש וידאו"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "דוגם מחדש את הוידאו הנמצא בלוח הגזירים"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "מסדר מחדש שקופיות"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8320,20 +8389,20 @@
 "\n"
 "ל־LiVES לא הייתה אפשרות לסדר מחדש את השקופיות"
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "יוצר אי־סדר בשקופיות"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "שגיאת דגימה מחדש"
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "סוג: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8349,7 +8418,7 @@
 "האם ברצונך לעשות זאת ?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8361,12 +8430,12 @@
 "יש ללחוץ על 'אישור' כדי לשמור את מפת המקשים כברירת מחדל\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "שומר מפת מקשים ל%s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8375,8 +8444,8 @@
 "\n"
 "מעדכן את קובץ מפת המקשים %s..."
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -8384,18 +8453,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"לא ניתן לכתוב את קובץ מפת המקשים\n"
-"%s\n"
-"קוד שגיאה %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "שומר את ברירת המחדל של האפקטים בזמן אמת ל%s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8410,22 +8474,22 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "טוען את ברירות המחדל של האפקטים בזמן אמת מ%s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "טוען את גדלי ברירת המחדל של המחולל מ%s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "טוען את מפת המקשים המוגדרת כברירת מחדל מ%s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8440,43 +8504,48 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "השורה %d ב%s לא תקינה\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "המקש %d ב%s לא תקין\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "האפקט %s ב%s לא תקין\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr "גרסה זו של LiVES לא יכולה לערבב מחוללים\\לא־מחוללים במקש אחד (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "יותר מדי אפקטים שויכו למקש %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "דרוש עדכון.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8488,40 +8557,45 @@
 "לא ניתן לאתר אפקטים אחדים.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "אין תיאור"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: מידע עבור %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "שם אפקט: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "שם תוסף: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "יוצר: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "גרסה: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "תיאור: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8534,65 +8608,69 @@
 "גרסה זו של LiVES לא מאפשרת ערבוב של מחוללים ולא־מחוללים באותו מקש.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "לא ניתן לאתר את האפקט %s\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: מיפוי אפקט בזמן אמת"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "קליטת מקש"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "מקש פעיל"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "קליטת מקש"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "קליטת המקלדת עבור מקש אפקט זה"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_ניקוי כל האפקטים"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "מצב פעיל"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "מידע"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "קביעת פרמטרים"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "ניקוי"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "שם אפקט:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_שמירה כברירת מחדל של מפת מקשים"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_טעינת מפת מקשים המוגדרת כברירת מחדל"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8644,11 +8722,6 @@
 msgid "none\n"
 msgstr "ללא\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d ערוצים %d סיביות לשנייה\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8668,64 +8741,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "גיבוי אוטומטי"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "מוזיקת רקע"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "רצועה נוכחית: %s (שכבה %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "רצועה נוכחית: מוזיקת רקע\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "רצועה נוכחית: שמע השכבה %d\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f שניות.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "מקור: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "יש ללחוץ על לחצן העכבר הימני עבור תפריט אפשרויות.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8734,7 +8807,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8742,7 +8815,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8752,7 +8825,7 @@
 "\n"
 "קליפים לא טעון.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8762,7 +8835,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8771,12 +8844,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f שניות ל%.2f שניות.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8784,183 +8857,184 @@
 "יש ללחוץ לחיצה בודדת על ציר הזמן\n"
 "כדי לבחור שקופית.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "כדי לבחור איזור זמן.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: קטע נבחר"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "_הצג מידע קליפ"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "_סגירת קטע זה"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "מערבל שמע (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "לחיצה בודדת על ציר הזמן"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "כדי לבחור מסגרת."
 
-#: src/multitrack.c:3822
-#, fuzzy
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
-msgstr "לחיצה כפולה על ציר הזמן"
+msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "כדי לבחור בלוק."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "ניתן לגרור קטעים"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "לציר הזמן."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "העכבר נמצא במצב: הזזה"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "ניתן להזיז קטעים."
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "העכבר נמצא במצב: בחירה."
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "ניתן לגרור עם העכבר את ציר הזמן"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "כדי לבחור מסלולים הזמן."
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "מצב _עכבר: הזזה"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "מצב _עכבר: בחירה"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "סגירת הרווחים הראשונים בזמן\\רצועות הנבחרות"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "סגירת פערים"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "הזזת מקטע"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "הזזת מקטע שמע"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "מחיקת מקטע"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "מחיקת מקטע שמע"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "פיצול רצועות"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "פיצול מקטע"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "החלת %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "מחיקת %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "הוספת מקטע"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "הוספת פער"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "הוספת מקטע שמע"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "סדר שינוי האפקט"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "לא רשום "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "רשום "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "big endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "little endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -8969,15 +9043,15 @@
 "ערכי ריבוי הרצועות נקבעו ל %.3f שקופיות לשנייה, גודל שקופית %dx%d, %d ערוצי "
 "שמע, תדר שמע %d, גודל דגימת השמע %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "רשימת אירועים לא תקינה. נכשל.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "נמצא קצב שקופיות לשנייה לא תקין ברשימת האירועים. נכשל.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8992,7 +9066,7 @@
 "לסגור את האוסף הנוכחי\n"
 "ולטעון את האוסף החדש מתפריט קובץ.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -9003,432 +9077,439 @@
 "זהו לא מספר ערוצי שמע תקין (%d) עבור LiVES.\n"
 "לא ניתן לטעון אותו..\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: ריבוי רצועות %dx%d : %d סיביות לפיקסל %.3f שקופיות לשנייה"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "קטעים"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "פרמטרים."
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_פתיחה..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "פ_תיחת בחירת הקובץ..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "ייבוא בחירה מ _DVD\\VCD"
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "ייבוא בחירה מ_DVD"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "ייבוא בחירה מ_VCD"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_ייבוא מהתקן"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "_סגור את הקליפ הנבחר"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_שמירת פריסה כ..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_טעינת פריסה..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_ניקוי\\מחיקת פריסה..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_התעלמות מערכי רוחב,גובה ושמע הנמצאים בפריסות שנטענו"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_עורך הקטעים"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_הוספת קטע נבחר"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_הוספת השמע של הקטע הנבחר"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_מחיקת המקטע הנבחר"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_קפיצה לגבול המקטע הקודם"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_קפיצה לגבול המקטע הבא"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "ניקוי _סימונים מציר הזמן"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "התעלמות ממגבלות הבחירה בהוספה"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "_נגינה מהמיקום בציר הזמן"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_הזזת האפקטים עם המקטעים"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "הצגת\\_עריכת האפקט הנבחר"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_מחיקת האפקט הנבחר"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "החלת אפקט ל_מקטע..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "החלפ אפקט ל_איזור..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_רצועות"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "בחירת רצועת מוזיקת הרקע כנוכחית"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "הוספת רצועת וידאו מ_אחור"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "הוספת רצועת וידאו מ_לפנים"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "_פיצול הרצועה הנוכחית בסימון"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_פיצול רצועות הוידאו הנבחרות"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "הכנסת רווח בזמן\\רצועות הנבחרות"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "הכנסת רווח ברצועה הנוכחית\\בזמן הנבחר"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "סגירת כל ה_רווחים בזמן\\רצועות הנבחרות"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "בח_ירה"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_בחירת הרצועה הנוכחית"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "בחירת _כל רצועות הוידאו"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "_ביטול סימון כל רצועות הוידאו"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "בחירת הכל"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "בחירה מ_ההתחלה"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "בחירה ל_סוף"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_העתקה..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_קוד זמן לתחילת האיזור"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_קוד זמן לסיום האיזור"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "_התחלת האיזור לקוד זמן"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "_סיום האיזור לקוד זמן"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_שינוי ערכי הרוחב, הגובה והשמע..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_עיבוד"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_עיבוד הכל לקטע חדש"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "עיבוד _וידאו"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "עיבוד _שמע"
 
-#: src/multitrack.c:6386
-#, fuzzy
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
-msgstr "_קדם־עיבוד שמע"
+msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "_קדם־עיבוד שמע"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_תצוגה"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "נקודות _כניסה\\יציאה של המקטע"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_אפקטים בנוכחי"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "פרמטרי שמע"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "הצגת רצועת _מוזיקת רקע"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "תצוגה חסכנית"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "מספר רצועות מקסימלי להצגה..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "גלילה כדי לעקוב אחרי הנגינה"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_מרכוז על הסמן"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_התקרבות"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_התרחקות"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_נתוני ריבוי רצועות"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "חלון _אירועים"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "_חלון אירועים (בזמן הנבחר בלבד)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_הצגת אירועי שקופיות"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_הצגת מקשי ריבוי רצועות"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "מצב עכבר: _הזזה"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "מצב עכבר: _בחירה"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "תצוגה מורחבת (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "תצוגה חסכונית (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "קטעים"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "פרמטרים."
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_החלה"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "זמן"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_מחיקת צומת"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "הצומת _הבא"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "הצומת _הקודם"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "_היפוך נגינה  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_מהירות  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "עיגון נקודת ההתחלה לציר הזמן"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "עוגן _התחלה"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "עיגון נקודת ההתחלה לציר הזמן"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "שקופית התחלה"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "עיגון נקודת הסיום לציר הזמן"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "עוגן _סוף"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "עיגון נקודת הסיום לציר הזמן"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "שקופית סיום"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "גלילה"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9438,91 +9519,91 @@
 "==============================\n"
 "מותג למצב עריכת קטע\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "ציר זמן (שניות)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " מוזיקת רקע"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " שמע בשכבה %d"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "שמע בשכבה %d"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (שכבה %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "בחירת רצועה"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "וידאו %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (שכבה %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: אפקט נבחר"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_הצגת\\עריכת אפקט זה"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_הצגת אפקט זה"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_מחיקת אפקט זה"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "לא ניתן להוסיף לאחר השפעה זו"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "אפקט זה לא ניתן להעביר"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d ל־%d נבחר...  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f שניות."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d שקופיות"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9532,65 +9613,65 @@
 "==============================\n"
 "מותג למצב ריבוי רצועות\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "אפקט אין פרמטרים.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "פלט %s"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "שכבה %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "רצועת שמע"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s ל־%s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "מפת המסננים _הקודמת"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "הוספה _לפני"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "הוספה _אחרי"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "מפת המסננים _הבאה"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9602,84 +9683,80 @@
 "אין השפעות על המסלול הנוכחי,\n"
 "הזמן הנוכחי.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: מקטע\\שקופית נבחרים"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_בחירת מקטע זה"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_פיצול המקטע כאן"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "רשימת _האפקטים המוחלים כאן"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_כיוון %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_מחיקת מקטע זה"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_הוספה כאן"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_הוספת שמע כאן"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "נוסף מרווח ברצועות הנבחרות מהזמן %.4f ל־%.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "נוסף מרווח ברצועה %s מהזמן %.4f ל־%.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "ביטול הפעולה %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "ביצוע הפעולה %s מחדש\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "נתוני ריבוי־רצועות"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9687,76 +9764,82 @@
 "\n"
 " (משתנה)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "הרצועה %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "הרצועות %s ו־%s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "רצועות נבחרות"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "נוסף %s ל־%s ל־%s מ־%.4f ל־%.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "נוסף האפקט %s לרצועה %s מ־%.4f ל־%.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "עובדו %d שקופיות לקטע חדש.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "מנקה..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_השהיה"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "השהיה (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "יש ללחוץ על 'm' בזמן נגינה"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "כדי לסמן את המיקום הנוכחי על ציר הזמן"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr "נוסף שמע %.4f ל־%.4f מהקטע %s למוזיקת הרקע מהזמן %.4f עד %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr "נוספו שקופיות %d ל־%d מהקטע %s לרצועה %s מהזמן %.4f עד %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9764,111 +9847,101 @@
 "יש לבחור רצועה אחת או יותר\n"
 "כדי ליצור איזור.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "נבחרו %d רצועות וידאו.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "או בכפתורי הכנסה אחרי כדי להזיזו."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "כדי לבחור איזור זמן.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "לחץ על אפקט אחר,"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "אחריו.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "לפניו.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "הוסרו ערכי הפרמטר עבור האפקט %s בזמן %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "ערכי הפרמטר נקבעו ל־%s %s על  %s בזמן %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_טעינה אוטומטית מחדש כל פעם"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "הפריסה נשמרה ל־%s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "קטעים ושקופיות"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "קטעים"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "שקופיות"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9876,7 +9949,7 @@
 "\n"
 "טעינת פריסה אוטומטית.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9887,11 +9960,11 @@
 "כמה %s אינם נמצאים בפריסה %s\n"
 "בעקבות כך הוא לא ייטען כראוי.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9900,43 +9973,43 @@
 "\n"
 "לא ניתן לטעון את קובץ הפריסה %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "טוען פריסה מ־%s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "התקבלו %d אירועים...מעבד..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "בודק ובונה מחדש את רשימת האירועים"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "אותרו %d שגיאות.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "השקופיות לשנייה בריבוי הרצועות נקבעו ל־%.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: מערבל שמע עבור ריבוי רצועות"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_איפוס ערכים"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_סגירת המערבל"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -9944,191 +10017,179 @@
 "_היפוך מוזיקת הרקע\n"
 "ועוצמות השמע בשכבה"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "כיוון ערכי מוזיקת הרקע והשמע בשכבה כך שהם יגיעו לסכום 1.0"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "_חיבור שכבת השמע"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "כיוון כל ערכי שכבת השמע לאותו ערך"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "הופעל שרת השמע JACK\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "לא ניתן להתחבר לשרת השמע JACK\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "הופעלה תת־מערכת השמע של jack.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "הופעל קורא השמע של jack.\n"
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "מתחבר לשרת התעבורה של jack..."
+msgstr ""
 
-#: src/pulse.c:85
-#, fuzzy
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 "Falling back to sox audio player.\n"
 "You can change this in Preferences/Playback.\n"
 msgstr ""
-"תצוגת שמע מקדימה במצב ריבוי רצועות זמינה רק עם\n"
-"נגן השמע \"jack\" או \"pulse audio\".\n"
-"באפשרותך לקבוע זאת בתפריט כלים|העדפות|נגינה."
 
-#: src/pulse.c:89
-#, fuzzy
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 "Falling back to mplayer audio player.\n"
 "You can change this in Preferences/Playback.\n"
 msgstr ""
-"תצוגת שמע מקדימה במצב ריבוי רצועות זמינה רק עם\n"
-"נגן השמע \"jack\" או \"pulse audio\".\n"
-"באפשרותך לקבוע זאת בתפריט כלים|העדפות|נגינה."
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "לא ניתן להתחבר לשרת השמע JACK\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - בחירת נגן שמע"
+msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "מתחבר לשרת התעבורה של jack..."
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "לחוץ"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "לא לחוץ"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "מגיב לאירועי מוט היגוי מ־%s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr "יוצר ערוץ Alsa seq..."
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "מגיב לאירועי MIDI מ־%s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "נתונים"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "מהירות"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "תו"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "ערך"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "מצב"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "משתנה"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "משתנים"
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "ערוץ MIDI %d תו דלוק"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "ערוץ MIDI %d תו כבוי"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "ערוץ MIDI %d בקר %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "גובה צליל של ערוץ ה־MIDI %d"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "כפתור %d במוט ההיגוי"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "ידית %d במוט ההיגוי"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "טווח"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ היסט 1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* מידות"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ היסט 2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10136,199 +10197,207 @@
 "\n"
 "יש ללחוץ על אישור כדי למחוק את כל הרשומות\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: לומד OMC"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "ניקוי אירועים _לא מותאמים"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "מ_חיקת הכל"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "הפעלת נגינת וידאו"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "הפסקת נגינת הוידאו"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "בחירת הקטע <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "החלפת קטע הקדמה לקטע ה־nth התקין"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "נגינה קדימה"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "נגינה בכיוון קדימה"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "נגינה אחורה"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "נגינה בכיוון אחורה"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "היפוך כיוון הנגינה"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "היפוך כיוון נגינת הוידאו"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "נגינת וידאו מהר יותר"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "נגינת הוידאו מעט יותר מהר"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "נגינת וידאו לאט יותר"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "נגינת הוידאו מעט יותר לאט"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "שינוי קיפאון וידאו"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "הקפאת וידאו או ביטול הקפאתו"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "קביעת קצב השקופיות ל־<fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "קביעת קצב השקופיות של קטע הקדמה ל־<float fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "התחלת הקלטה"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "הפסקת הקלטה"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "שינוי מצב הקלטה"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "החלפה בין קטעי הקדמה והרקע"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "איפוס מקשי האפקטים"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "כיבוי כל האפקטים."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "הפעלת מקש האפקט <key>"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "ביטול מקש האפקט <מקש>"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "החלפת מצב מקש האפקט <מקש>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "הגדרת ערך לפרמטר <מקש> <מס_פרמטר> = <ערך>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "החלפת הקדמה בסרטון הבא"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "החלפת הקדמה בסרטון הקודם"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "הגדרת קצב השקופיות של הווידאו ליחס <יחס_fps>"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "מספר קטע"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "שקופיות לשניה"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "מפתח"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "מס_פרמטר"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "יחס_fps"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "מתבצעת שמירת מיפוי ההתקן לקובץ %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10341,7 +10410,7 @@
 "שגיאה בפענוח הקובץ\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10354,12 +10423,12 @@
 "גרסה לא תקינה בקובץ\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "טוען מיפוי התקן מהקובץ %s..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10573,10 +10642,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "החלת אפקט Fade Out על השמע"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "החלת אפקט Fade Out על השמע"
-
 #~ msgid "Fade"
 #~ msgstr "עמעום"
 
@@ -10867,7 +10932,7 @@
 
 #, fuzzy
 #~ msgid "Step per _Frame"
-#~ msgstr "    _שקופית"
+#~ msgstr "שקופית התחלה"
 
 #, fuzzy
 #~ msgid "Swirl _start"
@@ -11098,9 +11163,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "מעתיק ללוח הגזירים"
 
-#~ msgid "_Top"
-#~ msgstr "_למעלה"
-
 #, fuzzy
 #~ msgid "_Vertical segments"
 #~ msgstr "_קטעי אופקי"
@@ -11362,125 +11424,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "יש להגדיר את כונן התקליטורים תחילה בהעדפות."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LiVES לא הצליח למצוא מספיק רצועות המתאימות לבקשתך."
-
-#~ msgid "Try again with different values."
-#~ msgstr "יש לנסות שוב עם ערכים אחרים."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name נכשל:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "לא ניתן להתחבר לשרת השמע JACK\n"
-
-#~ msgid "Red"
-#~ msgstr "אדום"
-
-#~ msgid "error.\n"
-#~ msgstr "שגיאה.\n"
-
-#~ msgid "Plugin timed out on message %s\n"
-#~ msgstr "נגמר זמן התוסף בהודעה %s\n"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "אין אפשרות לקרוא את הקובץ\n"
-#~ "%s\n"
-#~ "קוד שגיאה %d\n"
-
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "לא ניתן לקרוא את קובץ ברירות המחדל\n"
-#~ "%s\n"
-#~ "קוד שגיאה %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to read sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "לא ניתן לקרוא את קובץ הגדלים\n"
-#~ "%s\n"
-#~ "קוד שגיאה %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "ל־LiVES לא הייתה אפשרות לכתוב לקובץ:\n"
-#~ "%s\n"
-#~ "נא לבדוק את הרשאות הקובץ ולנסות שוב."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write script file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "לא ניתן לכתוב קובץ תסריט\n"
-#~ "%s\n"
-#~ "קוד שגיאה %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write filter defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "לא ניתן לכתוב את קובץ ברירות המחדל\n"
-#~ "%s\n"
-#~ "קוד שגיאה %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "לא ניתן לכתוב את קובץ גדלי ברירת המחדל\n"
-#~ "%s\n"
-#~ "קוד שגיאה %d\n"
-
-#~ msgid "No clips were recovered for set (%s).\n"
-#~ msgstr "אין קטעים ששוחזרו לאוסף (%s).\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "No effect selected.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "לא נבחרו אפקטים.\n"
+#~ msgid "Default value:    "
+#~ msgstr "ערך ברירת מחדל:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "ערך מינימלי: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "ערך מקסימלי: "

LiVES-1.6.1.tar.bz2/po/hr.po -> LiVES-2.0.3.tar.bz2/po/hr.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 11:59+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Hvala. Oporavak bi trebao biti moguće ako se ponovno LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "Kada izvještavanje crashes, molimo uključite detalje vašeg operacijskog "
 "sustava, distribucije, a LiVES verzija ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "i sve podatke prikazane u nastavku:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "prikupljanja više infomacija.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Očuvanje set.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Promjena veličine"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Bilo koji"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Nijedan"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "preporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "isključeno !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Trenutni izgled**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr ""
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...pronađen..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIJE PRONAĐEN..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...otkriti..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIJE OTKRIVENA..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...pronađen\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIJE PRONAĐEN...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...pronađen..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIJE PRONAĐEN..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...pronađen..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIJE PRONAĐEN..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...otkriti..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIJE PRONAĐEN..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...otkriti..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python......NIJE PRONAĐEN..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...otkriti..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NIJE PRONAĐEN..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...otkriti..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NIJE PRONAĐEN..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,22 +276,48 @@
 "\n"
 "Uređivač prozora prijavljuje kao \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "Pronađen broj zaslona: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Temp direktorij je %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -264,15 +327,15 @@
 "jack ili pulse audio podršku.\n"
 "Mnogi audio značajke neće biti dostupna.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Kompiliran s jack podrškom, dobro !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Kompliliran s pulse audio podrškom, odlično !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -281,135 +344,135 @@
 "Dobrodošli u LiVES verziju %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "FRAMES : maksimalni broj okvira za otvaranje\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts mogu biti:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : pokaži ovaj tekst za pomoć i izađi\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : ne učitavanje bilo postaviti na početak\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : nemoj prikazati korisničko grafičko sučelje\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : ne pokazuju prozor igrati\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox ili jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " ili sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Početna GUI..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -417,17 +480,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -436,37 +500,37 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -474,10 +538,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -488,42 +550,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -531,62 +600,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Bez naslova%d> %dx%d : %d okvira %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? okviri ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d okviri %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nema datoteka>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Reproduciraj"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -594,35 +663,35 @@
 "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Zatvoreno datoteke %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Poništi"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -631,27 +700,12 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES:- Uređaj detalje"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -659,14 +713,9 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"Katalog pod nazivom\n"
-"%s\n"
-"već postoji. Želite li koristiti ovaj direktorij?\n"
-"\n"
-"(Slobodan prostor= %.2f GB)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -674,14 +723,9 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"Katalog pod nazivom\n"
-"%s\n"
-"već postoji. Želite li koristiti ovaj direktorij?\n"
-"\n"
-"(Slobodan prostor= %.2f GB)\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -690,13 +734,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Stvaranje imenika\n"
-"%s\n"
-"?\n"
-"\n"
-"(Slobodan prostor= %.2f GB)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -705,54 +744,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Imenik ime je predug!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -760,11 +799,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX mogu se koristiti ako niti jedan od prethodnih igrača radu, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -772,145 +811,153 @@
 "ali neke audio značajke bit će onemogućene.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Slijedeće"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Preskočen"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Prošao"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Nije uspjelo"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Rješavanje problema"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Vi svibanj želite nadograditi mplayer na noviju verziju"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Instalirajte ImageMagick da biste mogli koristiti sve donio efekte"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -922,7 +969,7 @@
 "    Kliknite na Odustani za izlaz i instalirati bilo koji nedostaju "
 "dijelovi, ili Sljedeće za nastavak    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -932,88 +979,87 @@
 "\n"
 "Konačno, možete odabrati zadani sučelje za LiVES pokretanje.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Odaberite pokretanja sučelja"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
-#, fuzzy
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
-msgstr "To je najbolji izbor za jednostavne zadatke uređivanja ili za VJ\n"
+msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Završi"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Primijeni raspletati"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Pregled"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1022,8 +1068,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1031,183 +1077,188 @@
 "\n"
 "Pričekajte"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Prikaži detalje"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Dovoljno"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Pauz_a"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "Pauza/_Dosta"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Oblik"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Veličina datoteke"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Ukupno vrijeme"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Okvira"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Događaji"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Ocijenite/veličina"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
-"<------------- (Provjerite okvir za promjenu veličine kao što je sugerirano)"
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<------------- (Provjerite okvir za korištenje veličinu preporuku)"
+msgstr ""
+
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Držite _moje postavke"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Koristi _preporučene postavke"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Prikaži _Detalje"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Spremi u datoteku"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Umetni"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Broj puta za umetanje"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Umetni _sa zvukom"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Umetni _bez zvuka"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Otvori za odabir"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Broj okvira za otvaranje"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Otvori Lokacija"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Preimenuj Clip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1217,7 +1268,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1226,47 +1277,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Nemojte slati propusnost informacija"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Isprobajte ovu postavku ako imate problema s dobivanje potok"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Preimenuj Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Unesite Postavi Naziv"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Odaberite radni imenik"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1274,13 +1340,13 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1290,254 +1356,214 @@
 "Ovo pokretanje čarobnjak će vas voditi kroz\n"
 "početno instalirati tako da možete dobiti najviše iz ovog programa.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Preimenuj Clip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Unesite Postavi Naziv"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Unesite Postavi Naziv"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Odaberite radni imenik"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Novi naziv "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Uređaj detalje"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Poglavlje  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Kanal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Širina"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Visina"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Upravljački program"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "prvi"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "posljednjoj"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekundi."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "odabir."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Direktorij:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Datoteka Komentari (opcionalno)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Naslov/Ime: "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Izvođač: "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Komentari: "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "Spremi titlovi za datoteke"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "Podnaslov varalica"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "Pregledaj..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: odaberite direktorij"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: odabrati datoteku"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Odustani/Odbaci/Spremi"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1547,7 +1573,7 @@
 "Trenutni isječak set mogu biti spremljene.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1555,7 +1581,7 @@
 "Trenutni isječak set nije spremljena.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1563,120 +1589,119 @@
 "Trenutni izgled nije spremljena.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Obrišite izgled"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Zanemari promjene"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Izbriši isječak skup"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Brisanje izgled"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Spremi izgled"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Spremi isječak skup"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES:- Uređaj detalje"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Odaberi datoteku"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1684,11 +1709,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Ova datoteka"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1696,7 +1721,7 @@
 ",\n"
 " - uključujući i današnji izgled - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1706,7 +1731,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1721,14 +1746,14 @@
 "\n"
 "Stvarno je blizu?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1736,7 +1761,7 @@
 "\n"
 "Neispravna datoteka projekt.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1749,33 +1774,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Uvoz projekta"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Izvoz projekta %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Izvoz projekta"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1783,97 +1808,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Izvoz projekta %s..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Umetanje Tišina"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Lijepljenje"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "...dodao audio..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1882,31 +1907,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1914,7 +1939,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1923,79 +1948,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Umetanje"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Umetni"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Brisanje"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2005,7 +2030,7 @@
 "\n"
 "Izbor je zaključana.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2013,11 +2038,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Snimanje otkazano.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2026,7 +2051,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2035,7 +2060,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2044,22 +2069,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2067,67 +2092,64 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Vanjski: %s\n"
-"Interni: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2135,23 +2157,23 @@
 "\n"
 "  Nepoznat"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2160,8 +2182,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2177,25 +2198,23 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"Ovaj program je slobodan softver, možete ga redistribuirati i/ili mijenjati\n"
-"to pod uvjetima GNU General Public License kako ju je objavio\n"
-"Free Software Foundation; ili verzija od 3 licence, ili\n"
-"(Po vašem izboru) bilo koje kasnije verzije.\n"
-"\n"
-"Ovaj program se distribuira u nadi da će biti koristan,\n"
-"ali BEZ IKAKVIH GARANCIJA; čak i bez podrazumijevanog jamstva\n"
-"Ili POGODNOSTI ZA NEKU ODREĐENU NAMJENU. Pogledajte\n"
-"GNU General Public License za više detalja.\n"
-"\n"
-"Trebali ste dobiti primjerak GNU Opće javne licence\n"
-"uz ovaj program, ako ne, javite se Free Software\n"
-"Foundation, Inc, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Video editor i VJ programom."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Edgar Buršić https://launchpad.net/~edgar\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2209,21 +2228,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2231,168 +2250,180 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Otkazivanje"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nova audio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d okviri su dovoljno!\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Dionički reprodukcije (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Igrajte u zasebnom prozoru (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "Titlovi su bili izbrisani.\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Odaberite audio datoteka"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Zatvori _prozor"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Vedro _pogreške"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Brisanje pogođene izgledima"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Nastavi"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2402,27 +2433,27 @@
 "Zaustavljeno\n"
 "(Kliknite na Nastavi za nastavak obrade)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pauzirana..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "nastavio..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Zadrži"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "Dosta"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2434,29 +2465,28 @@
 "(Kliknite Zadrži zadržati ono što imate i stop)\n"
 "(Kliknite na Nastavi za nastavak obrade)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Odustani"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Spremi okvir kao %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2465,7 +2495,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2473,13 +2503,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2488,17 +2518,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2508,19 +2538,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Izvoz odabranih Audio kao..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Izvoz Audio kao..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2529,1050 +2559,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "Uvoz projekta"
+msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
+#: src/gui.c:1109
+msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1084
-msgid "Custom _Tools"
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3580,81 +3585,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3662,7 +3667,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3670,32 +3675,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3703,68 +3708,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3774,53 +3779,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3832,11 +3848,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3844,14 +3860,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3859,31 +3875,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Spremi okvir kao %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Spremi okvir kao %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Preimenuj Clip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3891,66 +3905,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Veličina datoteke"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3959,16 +3969,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3976,7 +3986,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3984,68 +3994,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4055,22 +4060,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4078,68 +4083,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr ""
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Umetni"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Vedro _pogreške"
+msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4150,7 +4153,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4162,11 +4165,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4174,46 +4177,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4221,7 +4224,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4233,14 +4236,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4248,19 +4251,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4268,83 +4271,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4353,14 +4356,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4369,7 +4372,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4380,7 +4383,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4389,11 +4392,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4435,11 +4438,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4461,17 +4464,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4479,28 +4483,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4509,7 +4513,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4517,7 +4521,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4525,7 +4529,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4536,7 +4540,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4546,7 +4550,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4554,7 +4558,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4563,13 +4567,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4580,13 +4584,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4596,7 +4600,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4605,7 +4609,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4613,7 +4617,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4621,63 +4625,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4685,14 +4689,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4701,25 +4705,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4728,34 +4732,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4763,11 +4767,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4775,11 +4777,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4787,10 +4787,8 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4799,8 +4797,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4808,10 +4806,8 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4820,8 +4816,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4829,15 +4825,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4846,7 +4840,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4855,7 +4849,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4864,14 +4858,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4879,13 +4881,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4895,27 +4897,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4924,14 +4926,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4942,19 +4944,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4962,7 +4964,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4970,7 +4972,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4982,45 +4984,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Dobrodošli u LiVES verziju %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5029,343 +5029,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr ""
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5373,72 +5629,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Ponovi"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5448,17 +5703,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5468,32 +5723,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5502,14 +5757,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5519,40 +5767,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5561,11 +5816,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5574,7 +5829,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5584,193 +5839,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES:- Uređaj detalje"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5780,55 +6018,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5837,7 +6075,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5845,231 +6083,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6077,28 +6303,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6107,41 +6333,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6151,27 +6377,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6180,7 +6406,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6190,12 +6416,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6205,7 +6431,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6215,12 +6441,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6228,23 +6454,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6254,55 +6480,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr ""
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr ""
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr ""
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6310,26 +6524,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6337,7 +6562,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6345,42 +6570,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Stvaranje imenika\n"
-"%s\n"
-"?\n"
-"\n"
-"(Slobodan prostor= %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6392,20 +6619,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6413,790 +6640,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7204,222 +7431,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7430,7 +7649,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7441,89 +7660,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7533,7 +7752,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7541,20 +7760,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7562,15 +7781,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
-"\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7580,22 +7797,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7605,43 +7822,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7649,40 +7871,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr ""
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7691,65 +7918,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7799,11 +8030,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7821,64 +8047,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7887,7 +8113,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7895,14 +8121,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7912,7 +8138,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7921,208 +8147,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8132,7 +8360,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8140,587 +8368,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8728,275 +8964,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9004,95 +9232,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "Spajanje na jack transport server..."
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9100,7 +9327,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9108,329 +9335,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Pokrećem pulse audio poslužitelj..."
+msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "Spajanje na jack transport server..."
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9439,7 +9672,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9448,12 +9681,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9474,18 +9707,10 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Blank _Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Blank frames"
 #~ msgstr "Okvira"
 
 #, fuzzy
-#~ msgid "Border _Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Brightness _end"
 #~ msgstr "_Zanemari promjene"
 
@@ -9506,14 +9731,6 @@
 #~ msgstr "_Zanemari promjene"
 
 #, fuzzy
-#~ msgid "Checkerboard"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Checkerboarding"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Colorize"
 #~ msgstr "Promjena veličine"
 
@@ -9542,18 +9759,6 @@
 #~ msgstr "Promjena veličine"
 
 #, fuzzy
-#~ msgid "Cycle _Step"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Deinterlace"
-#~ msgstr "Primijeni raspletati"
-
-#, fuzzy
-#~ msgid "Deinterlacing"
-#~ msgstr "Primijeni raspletati"
-
-#, fuzzy
 #~ msgid "Enhance"
 #~ msgstr "Odustani"
 
@@ -9562,42 +9767,14 @@
 #~ msgstr "Odustani"
 
 #, fuzzy
-#~ msgid "Fade _colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Fade _end"
 #~ msgstr "_Zanemari promjene"
 
 #, fuzzy
-#~ msgid "Fade _in"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Fade _out"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Fade"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Fina_l frame"
 #~ msgstr "Okvira"
 
 #, fuzzy
-#~ msgid "Flash _colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Frame Calculator"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Frame _Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Frames _per second (FPS)"
 #~ msgstr "sekundi."
 
@@ -9646,26 +9823,10 @@
 #~ msgstr "Okvira"
 
 #, fuzzy
-#~ msgid "Hue _end"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Hue _start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Hue change"
 #~ msgstr "_Zanemari promjene"
 
 #, fuzzy
-#~ msgid "Hue end"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Hue start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Modulate (BSH)"
 #~ msgstr "Lijepljenje"
 
@@ -9691,7 +9852,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Broj okvira za otvaranje"
+#~ msgstr "_Broj puta za umetanje"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -9718,10 +9879,6 @@
 #~ msgstr "Lijepljenje"
 
 #, fuzzy
-#~ msgid "S_tart %"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Saturation _end"
 #~ msgstr "_Zanemari promjene"
 
@@ -9754,30 +9911,6 @@
 #~ msgstr "Promjena veličine"
 
 #, fuzzy
-#~ msgid "Step _Value"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Step per _Frame"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Swirl _start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Swirl s_tep"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Swirl"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "Tunnel"
 #~ msgstr "Otkazivanje"
 
@@ -9786,50 +9919,10 @@
 #~ msgstr "Otkazivanje"
 
 #, fuzzy
-#~ msgid "_Background Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Background colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Cycle Start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_End Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_End amount"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Fade level"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Fade start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Fill colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "_First frame"
 #~ msgstr "Okvira"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "_Frames per second"
 #~ msgstr "sekundi."
 
@@ -9838,50 +9931,22 @@
 #~ msgstr "Okvira"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "_Negate"
 #~ msgstr "Lijepljenje"
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Broj okvira za otvaranje"
+#~ msgstr "_Broj puta za umetanje"
 
 #, fuzzy
 #~ msgid "_Point size"
 #~ msgstr "Veličina datoteke"
 
 #, fuzzy
-#~ msgid "_Radius end"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Radius start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Radius"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Random colour each frame"
-#~ msgstr "Okvira"
-
-#, fuzzy
 #~ msgid "_Right"
 #~ msgstr "Visina"
 
 #, fuzzy
-#~ msgid "_Sigma end"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Sigma start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "_Skip ahead"
 #~ msgstr "Preskočen"
 
@@ -9890,42 +9955,10 @@
 #~ msgstr "Preskočen"
 
 #, fuzzy
-#~ msgid "_Source Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Start Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Start Value"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Start amount"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Stroke colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Target Colour"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "_Time (seconds)"
 #~ msgstr "sekundi."
 
 #, fuzzy
-#~ msgid "_X Start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "_Y Start"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "blank_frames"
 #~ msgstr "Okvira"
 
@@ -9942,26 +9975,10 @@
 #~ msgstr "Promjena veličine"
 
 #, fuzzy
-#~ msgid "colour_replace"
-#~ msgstr "Promjena veličine"
-
-#, fuzzy
-#~ msgid "deinterlace"
-#~ msgstr "Primijeni raspletati"
-
-#, fuzzy
 #~ msgid "enhance"
 #~ msgstr "Odustani"
 
 #, fuzzy
-#~ msgid "fade_in_out"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "gamma_change"
 #~ msgstr "_Zanemari promjene"
 
@@ -9970,10 +9987,6 @@
 #~ msgstr "Okvira"
 
 #, fuzzy
-#~ msgid "gen_clip_from_image"
-#~ msgstr "Okvira"
-
-#, fuzzy
 #~ msgid "gen_coloured_frames"
 #~ msgstr "Okvira"
 
@@ -10018,26 +10031,6 @@
 #~ msgstr "Promjena veličine"
 
 #, fuzzy
-#~ msgid "swirl"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "transition_bwthresh"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "transition_checkerboard"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "transition_fade2"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
-#~ msgid "transition_splice"
-#~ msgstr "_Zanemari promjene"
-
-#, fuzzy
 #~ msgid "trim_frames"
 #~ msgstr "Okvira"
 
@@ -10053,7 +10046,9 @@
 
 #, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES: odabrati datoteku"
+#~ msgstr ""
+#~ "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
+#~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was unable to open it."
@@ -10066,20 +10061,3 @@
 #~ msgstr ""
 #~ "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
 #~ "\n"
-
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Umetni"
-
-#~ msgid "Try again with different values."
-#~ msgstr "Pokušajte ponovno s različitim vrijednostima."
-
-#, fuzzy
-#~ msgid "$error"
-#~ msgstr "Vedro _pogreške"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Pokrećem pulse audio poslužitelj..."

LiVES-1.6.1.tar.bz2/po/hu.po -> LiVES-2.0.3.tar.bz2/po/hu.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 11:58+0000\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2012-08-08 08:49+0000\n"
 "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n"
 "Language-Team: Magyar <lisovszki@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2012-08-15 00:36+0000\n"
+"X-Generator: Launchpad (build 15801)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Köszönjük. A LiVES újraindításával helyreállítható a program.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "Összeomlások bejelentésénél kérjük add meg a rendszered adatait és a LiVES "
 "verziószámát. ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "és minden lent szereplő információt:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "beiktatásával, hogy további információkat tudhass meg.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Tartós beállítás.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Átméretezés"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Minden képkocka átméretezése"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Bármely"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Nincs"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "ajánlott"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "tíltva!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**A jelenlegi kimenet**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Beépített"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Egyéni"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Teszt"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...megtalálva"
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEM TALÁLOM"
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...megtalálva..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEM TALÁLOM"
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...megtalálva\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEM TALÁLOM\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...megtalálva..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NEM TALÁLOM..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...megtalálva..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEM TALÁLOM..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...megtalálva..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NEM TALÁLOM..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...megtalálva..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NEM TALÁLOM..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...megtalálva..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NEM TALÁLOM..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...megtalálva..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NEM TALÁLOM..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,22 +276,48 @@
 "\n"
 "Az ablakkezelő jelenti: \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "monitorok száma: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, fuzzy, c-format
+msgid "Number of CPUs detected: %d "
+msgstr "monitorok száma: %d\n"
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "kicsi endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "nagy endian"
+
+#: src/main.c:1732
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Az átmeneti könyvtár: %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -264,15 +327,15 @@
 "jack hangrendszer nélkül lett szerkesztve.\n"
 "A legtöbb hangszerkesztési lehetőség nem lesz elérhető.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Jack támogatással összeállítva. Jóó !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Pulse audio támogatással összeszerkesztve. Csodálatos :)!\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -281,7 +344,7 @@
 "Légy üdvözölve a LiVES %s verziójában.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -290,85 +353,85 @@
 "\n"
 "Az indító szintax: %s [opts] [fájlnév [eleje] [képkockák]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Ahol: a fájlnév a média, vagy a biztonsági mentés fájl neve.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "eleje : a fájlnév eleje másodpercben\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "képkockák : a maximálisan megnyitott képkockák száma\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts lehet:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help             : mutasd ezt a súgó szöveget, majd lépj ki\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set<setname>    :automatikusan betölti a klip beállításait\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : ne töltsön be semmiféle beállítást az indításnál\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : nem töltsön be sérült helyreállítást\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : sérült visszaállítás betöltése\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : ne legyen grafikus felület\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : indítás klip szerkesztő módban\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : indítás multitrack módban\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : OSC hallgató indítása az UDP porton <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : ne indítsd el az OSC hallgatót\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -376,15 +439,15 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox vagy jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -394,31 +457,31 @@
 "kliens, 2 = jack átvitel master, 4 = jack átviteli szerver indítása, 8 = "
 "hang szünetelése mikor a videó szünetel, 16 = jack hang szerver indítása] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " vagy sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapneve> : automatikusan betölti a eszköztérképet\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : megpróbálja kideríteni az összeomlás okát ('gdb' program megléte "
 "szükséges)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Grafikus felhasználói felület indítása..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -426,27 +489,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"A kért téma nem található. Kérlek ellenőrizd, hogy a téma telepítve van-e "
-"ide:\n"
-"%s/%s.\n"
-"(Talán meg kellen változtatnod a <prefix_dir> értékét a ~/.lives fájlban)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"A LiVES nem képes egy apró fájlt a /tmp könyvtárba írni\n"
-"Kérlek ellenőrizd az írási jogosultságaidat a /tmp könyvtárhoz, és próbáld "
-"újra.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -460,55 +514,37 @@
 "Kérlek olvasd el a README fájlt, hogy mi érkezik ezzel a csomaggal,\n"
 "mielött fiuttatnád a LiVES-t.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"A LiVES nem képes beolvasni a %s/.lives konfigurációs\n"
-" fájlt\n"
-"\n"
-"Kérlek ellenőrizd a fájl jogosultságait, majd próbáld újra.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"A LiVES nem képes írni a %s/.lives konfigurációs\n"
-"fájltba.\n"
-"\n"
-"Kérlek ellenőrizd a fájl jogosultságait ennek a fájlnak\n"
-"és könyvtárnak, majd próbáld újra.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"A LiVES nem képes használni a %s átmeneti\n"
-"könyvtárt\n"
-"\n"
-"Kérlek eelenőrizd a <tempdir> beállításait a \n"
-"%s/.lives-ban,\n"
-"majd próbáld újra.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -516,10 +552,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES nem tudja rögzíteni ezt a képet\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -537,7 +571,7 @@
 "\n"
 "Köszönöm.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -547,7 +581,14 @@
 "LiVES-nak szüksége van az 'mplayer' vagy a 'sox' valamelyikére. Kérlek "
 "telepíts egyet ezek közül, majd próbáld újra.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -557,7 +598,7 @@
 "A LiVES nem találja az 'mplayert'. Ha azt szeretnéd, hogy jobban működjön a "
 "LiVES akkor telepítsd fel.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -567,7 +608,7 @@
 "A LiVES nem találja a 'convert'-et. Fel kell telepítened a convert-et és az "
 "image-magick-et, ha szeretnéd használni a létrehozott effekteket.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -577,7 +618,7 @@
 "A LiVES nem találja a 'composite'-ot. Fel kell telepítened az image-magic-"
 "kel együtt, ha szeretnéd használni az egyesítés funkciót.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -587,7 +628,7 @@
 "A LiVES nem találja a 'sox'-ot. Néhány hang tulajdonság nem fog működni. "
 "Telepítsd fel a 'sox'-ot.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -595,68 +636,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES nem talált dekódoló bővitményt.\n"
-"Kérlek ellenőrizd, hogy jól telepítetted fel őket\n"
-"%s%s%s/ -ben\n"
-"Nem tudsz majd menteni nélkülük.\n"
-"A <lib_dir> értékét a ~./lives-ban meg kellene változtatni\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "%s beállítás automatikus betöltése..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Érvénytelen zene lejátszó %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Névtelen%d> %dx%d : %d képkockák %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? képkocka ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d képkocka %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nincs fájl>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -664,35 +699,35 @@
 "LiVES nem tudja rögzíteni ezt a képet\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "%s fájl bezárva\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Visszavonás"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "Új_ra"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Videó"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Bal oldali hang"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Jobb oldali hang"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -706,26 +741,11 @@
 "lejátszó az mplayer.\n"
 "Kérlek állítsd be a lejátszási beállításokat, majd próbáld újra.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Lejátszó Ablak"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Lejátszó Ablak"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -735,7 +755,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -745,7 +765,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -756,7 +776,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -765,11 +785,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -777,7 +797,7 @@
 "A LiVES-NAK NEM SIKERÜLT MEGNYITNI A KIVÁLASZTOT AUDIO LEJÁTSZÓT!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -787,7 +807,7 @@
 "\n"
 "PULSE AUDIO ajánlott a legtöbb felhasználónak"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -795,7 +815,7 @@
 ", de a LiVES ezen verziója sajnos pulse audio támogatás nélkül készült.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -806,11 +826,11 @@
 "futtatása elött.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio ajánlott a profi felhasználóknak"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -819,7 +839,7 @@
 "beforgatva.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -829,7 +849,7 @@
 "mielött használnád a LiVES-t.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -841,12 +861,12 @@
 "helyette.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX esetleg használható abban az esetben, ha az előző lejátszó működik, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -854,7 +874,7 @@
 "de néhány  hangszerkesztési lehetőség le lesz tiltva.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -864,7 +884,7 @@
 "Szeretnélek figyelmeztetni, hogy telepítsd a LiVES használata előtt.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -872,132 +892,140 @@
 "Az MPLAYER lejátszó csak tesztelésre ajánlott.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Válassz egy lejátszót"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "_pulse lejátszó használata"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "_jack lejátszó használata"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "_sox lejátszó használata"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "_mplayer használata"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Következő"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "Nem lehet elindítani a %s generátort\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1005,96 +1033,97 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "A LiVES állítsa be a fájl kiterjesztéseket"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "A LiVES állítsa be a fájl kiterjesztéseket"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+#, fuzzy
+msgid "Apply _Deinterlace"
 msgstr "Deinterlace engedélyezése"
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Ha ez be van állítva, a képkockák deinterlacelve lesznek amint importálják "
 "őket."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "Kattints ide a kiválasztott video, kép vagy hang előnézetéhez"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Kattints ide a kiválasztott hang előnézetéhez"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Kattints ide a video előnézetéhez"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Feldolgozás..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1108,8 +1137,8 @@
 "\n"
 "Ne felejtsd el kikapcsolni az effekteket (ctr-0) utána!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1117,107 +1146,116 @@
 "\n"
 "Kis türelmet"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Részletek megjelenítése"
+#: src/interface.c:241
+#, fuzzy
+msgid "Show Details"
+msgstr "_Részletek megjelenítése"
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Elég"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Előnézet"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, fuzzy, c-format
+msgid "LiVES: - %s"
+msgstr "LiVES: - Beszúrás"
+
+#: src/interface.c:358
+#, fuzzy
+msgid "LiVES: - Multitrack details"
+msgstr "Multitrack részletek"
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formátum"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Képkocka mérete"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Fájl mérete"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Bájt méret"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Idő (összesen)"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Képkockák"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Események"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Hang"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Sebesség/méret"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Jobb oldali hang"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Kódolási beállítások"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------ (Jelöld be, hogy újraméretezd a kijelöltet)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<................. (Jelöld be, hogy a javasolt méretet használja)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Tartsd meg a _beállításaim"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Használd a _javasolt beállításokat"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1225,76 +1263,77 @@
 "_Ne mutasd ezt a figyelmeztetést többet\n"
 "(visszakapcsolható a beállítások/figyelmeztetések-nél)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "_Részletek megjelenítése"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "Ablak _bezárása"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Mentés fájlba"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Beszúrás"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_A belillesztéshez idő száma"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Beillesztés a megfeleő hanghoz"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Beszúrás a kijelölés _előtt:"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Helyezd vágólapra mielőtt kijelölnéd a képkockákat"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Beszúrás a kijelölés _után:"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Helyezd vágólapra miután kijelölted a képkockákat"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Beszúrás _hanggal"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Beszúrás hang _nélkül"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Kijelölés megnyitása"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+#, fuzzy
+msgid "Selection start time (sec)"
 msgstr "    Kijelölés kezdete (másodperben)"
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+#, fuzzy
+msgid "Number of frames to open"
 msgstr "    Megnyitott képkockák száma"
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Hely megnyitása"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Klip átnevezése"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1310,7 +1349,7 @@
 "Ne feledd leellenőrini a beállításokat a beállítások|adatfolyamok menüben\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1319,47 +1358,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Ne küldd el a sávszélesség információkat"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Próbáld ezt a beállítást, ha problémád van a lejátszással"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Klip átnevezése"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Beállítás neve:"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+#, fuzzy
+msgid "LiVES: - Rename Current Track"
+msgstr "LiVES: - Klip átnevezése"
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1372,7 +1427,7 @@
 "A LiVES emlékeztetni fog, hogy kilépés elött ne felejtsd el elmenteni a "
 "beállításokat.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1380,247 +1435,210 @@
 "A projekt exportálásához, be kell írnod egy nevet a klip beállításhoz.\n"
 "Ez lesz használva ehhez a projekthez.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Klip átnevezése"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Beállítás neve:"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Beállítás neve:"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Új név "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Beállítás név "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Haladó"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES: - CD szám betöltése"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES: - DVD cím/fejezet kiválasztása"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES: - VCD cím kiválasztása"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES: - Maximálisan látható sávok megváltoztatása"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Szám betöltése (innen:%s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD cím"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD cím"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Maximálisan megjelenített számok"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Fejezet  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Hang ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Kimeneti formátum"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES: - Fokozatos hangerősödés"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES: - Fokozatos halkulás"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Fokozatos hangerősödés végig  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "első"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Fokozatos hanggyengülés végig  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "utolsó"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "másodperc"
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "válogatás."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Véletlenszerű zene lejátszás"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Kért számok mennyisége:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Könyvtár:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Almappákat is beleértve"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimum fájl méret (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maximum fájl méret (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "kiválasztás"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Fájl megjegyzések (opcionális)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Cím/név : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Szerző/előadó : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Megjegyzések : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Mentés fájlba"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+#, fuzzy
+msgid "LiVES: - choose a device"
+msgstr "LiVES: Válassz CD meghajtót"
+
+#: src/interface.c:2336
+#, fuzzy
+msgid "LiVES: - choose a directory"
 msgstr "LiVES: válassz egy könyvtárt"
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2339
+#, fuzzy
+msgid "LiVES: - choose a file"
 msgstr "LiVES: válassz egy fájlt"
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Mégse/eldobás/mentés"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1630,7 +1648,7 @@
 "A jelenlegi kimenet nincs elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1640,7 +1658,7 @@
 "A jelenlegi kimenet megváltozott az előző mentéshez képest.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1650,7 +1668,7 @@
 "A jelenlegi klip beállítások elmenthetők.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1658,7 +1676,7 @@
 "A jelenlegi klip beállítások nincsenek elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1666,7 +1684,7 @@
 "A jelenlegi kimenet még nincs elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1674,7 +1692,7 @@
 "Az aktuális kimenet a legutóbbi mentés óta nem változott.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1683,7 +1701,7 @@
 "alkalmazni.\n"
 "mielőtt kilépnél a multitrack módból rendereld/fűzd össze/kódold.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1694,43 +1712,43 @@
 "alkalmazni.\n"
 "Mit szeretnél tenni?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "Klip beállítás _neve"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Automatikus újratöltés legközelebb"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Kimenet törlése"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Változtatások elvetése"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Klip beállítás törlése"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Kimenet törlése"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Kimenet mentése"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Klip beállítás mentése"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: kimenet helyreállítása?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1740,78 +1758,69 @@
 "A LiVES megtalált néhány előző anyagot.\n"
 "Szeretnéd megpróbálni helyreállítani?\n"
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Kódolási beállítások"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "_Kijelölések eltávolítása az idővonalról"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Értékek visszaállítása"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Mentés mint %s"
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Fájl kiválasztása"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "%s beállítás automatikus betöltése..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "klip kipucolása"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"\n"
-"A LiVES nem képes megtalálni a %s programot.\n"
-"Kérlek ellenőrizd a program elérhetőségét, és futtathatóságát.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Ez a fájl"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1819,7 +1828,7 @@
 ",\n"
 " - tartalmazza az aktuális kimenetet - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1834,7 +1843,7 @@
 "\n"
 "Biztosan bezárja?"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1849,14 +1858,14 @@
 "\n"
 "Biztosan bezárja?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1864,7 +1873,7 @@
 "\n"
 "Érvénytelen projekt fájl.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1886,33 +1895,33 @@
 "elveted.\n"
 "Ha kész vagy ezzel, akkor már importálhatod az új projektet.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "%s projekt importálása a %s beállítással..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Projekt importálása"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "%s projekt exportálása..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Projekt exportálása"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr ".lv1 fájl helyreállítása"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr ".lv1 fájl biztonsági mentése"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr ".lv1 fájl helyreállítása"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1924,90 +1933,90 @@
 "A beállítás törlődik a lemezről.\n"
 "Biztos vagy benne?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Beállítás törlése..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Beállítás törlése..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Beállítás törlése"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "%s beállítás törölve lett a lemezről.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Csend beszúrása"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Kibontás"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Hang viszaállítás..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Képkockák képeinek törlése"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Felesleges képkockák törlése"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "A videó hossza jelenleg %d képkocka, %.3f kocka/másodperccel.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "A vágólap újramintázva %d képkockával.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Újra"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "%d képkockák másolása ide:%d%s a vágólapra..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Képkockák kiemelése a klipből"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Másolás a vágólapra"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Beillesztés"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2017,7 +2026,7 @@
 "Kérlek telepítsd fel a 'convert'-et az Image-magic csomagból, és indítsd "
 "újra a LiVES-t.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2031,7 +2040,7 @@
 "Próbáld meg azt, hogy kiválasztod az összes képkockát\n"
 "majd használd a 'Hang egyensúly' lehetőséget a hang menüből."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2039,7 +2048,7 @@
 "A LiVES nem tudja beilleszteni, mert a hang ráták nem egyeznek.\n"
 "Kérlek telepítsd a 'sox'-ot, majd próbáld újra."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2050,7 +2059,7 @@
 "multitrack kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2061,11 +2070,11 @@
 "kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Vágólap hang újramintázása"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2077,7 +2086,7 @@
 "A LiVES nem képes újramintázni a vágólapi hangot. \n"
 "A vágólap hang törölve lesz.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2091,30 +2100,30 @@
 "Szeretnéd folytatni a beillesztést\n"
 "a változatlan hanggal?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "%d%s képkockák beillesztése a vágólapról..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Beszúrás"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "%d idők beillesztése a %s vágólapról..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "%d képkockák beillesztése a %s vágólapról..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2124,7 +2133,7 @@
 "Minden kocka törlése a fájl bezárását eredményezi.\n"
 "Biztos vagy benne?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2134,8 +2143,8 @@
 "A törlés hiányzó képkockákat eredményezhet a kimeneteken.\n"
 "Biztosan szeretnéd folytatni?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2145,7 +2154,7 @@
 "A törlés hiányzó hangot eredményezhet a kimeneteken.\n"
 "Biztosan szeretnéd folytatni?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2156,7 +2165,7 @@
 "kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2167,20 +2176,20 @@
 "kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "%d képkockák törlése eddig: %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Törlés"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2190,7 +2199,7 @@
 "\n"
 "Kijelölés zárolva.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2202,11 +2211,11 @@
 "(A megszakításhoz nyomd meg az 'r' gombot, vagy a Lejátszás|előadás "
 "rögzítése gombot, mielött lejátszanád.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Felvétel megszakítva.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2219,7 +2228,7 @@
 "A '%s' bővítmény jelentései:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2232,7 +2241,7 @@
 "Nem találom az 'init' metódust a %s bővítményben.\n"
 "A bővítmény valószínüleg sérült, vagy nincs megfelelően feltelepítve."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2244,22 +2253,22 @@
 "\n"
 "Kérlek nyomj 'Mégse'-t, ha nem ezt szeretted volna.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "%s beállítás mentése"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Klipek betöltése a %s beállításból"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d klipeket találtam a(z) (%s) beállításból.\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2270,41 +2279,37 @@
 "Csak akkor használd, ha nincs még egy futó példány a LiVES-ból a gépen.\n"
 "Jóváhagyáshoz nyomj 'OK'-t\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Lemez terület felszabadítása..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Lemez terület takarítása"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d MB terület a lemezen felszabadítva.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Képkocka arány és képkocka értékek alapértékre állítása..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Külső: %s\n"
-"Belső: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2312,7 +2317,7 @@
 "\n"
 "  Megnyitás..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2321,7 +2326,7 @@
 "\n"
 "(%d virtualis)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2330,7 +2335,7 @@
 "\n"
 "(%d dekódolva)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2339,7 +2344,7 @@
 "\n"
 "  %.2f mp."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2347,23 +2352,23 @@
 "\n"
 "  Ismeretlen"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "aláíratlan"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "aláírt"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "nagy-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "kicsi endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2372,8 +2377,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2389,25 +2393,20 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"Ez egy ingyenes alkalmazás; bárki szabadon terjesztheti, másolhatja,\n"
-"módosíthatja a GNU General Public Licenc\n"
-"(3-as, vagy annál újabb kiadás szabályai szerint),\n"
-"amelyet az FSF (Free Software Foundation) bocsáltott ki.\n"
-"\n"
-"Ez a program azzal a reménnyel készült, hogy használható lesz.\n"
-"A fejlesztő semmiféle garanciát nem vállal, a programot mindenki\n"
-"a saját felelősségére telepíti fel, illetve használja.\n"
-"További információkért kérlek olvasd el a GNU licenc-t.\n"
-"\n"
-"A programmal együtt kapnod kellett egy másolatot a licencből.\n"
-"Nem kaptál? Akkor kérlek írj az FSF-nek: Free Software\n"
-"Foundation, Inc., 59 Temple Place - suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Videoszerkesztő és mixelő alkalmazás."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2421,7 +2420,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2431,14 +2430,14 @@
 "\n"
 "A fájl előnézetéhez fel kell telepítened az mplayert.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2451,197 +2450,210 @@
 "Biztosan folytatni szeretnéd?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "%s megnyitása, formátuma: %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Hang megnyitása"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Megszakítás"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Új hang: %d Hz %d csatorna %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Hang hozzáadása"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Új hang"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d képkoca elég!\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Kódoló figyelő kimenet"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Teljes képernyős visszajátszás (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Teljes képernyős visszajátszás ki (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Dupla méret (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Normál méret (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Lejátszó ablak(ok) elrejtése"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Lejátszó ablak(ok) mutatása"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Lejátszás külön ablak(ok)ban"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Folytatólagos kötés kikapcsolása (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Folytatólagos kötés bekapcsolása (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Hangerő (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Hang némítás ki (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Hang némítás be (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Vágólap megfordítása..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Vágólap megfordítása"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+#, fuzzy
+msgid "LiVES: - Select Audio File"
 msgstr "Hang fájl kiválasztása"
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Kérlek állítsd be a CD lejátszó eszközöd az Eszközök | Beállítások | Vegyes "
 "menüben\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "%d CD szám megnyitása innen: %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CD szám: %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "CD szám megnyitása..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Hiba a CD szám megnyitása közben\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Számok kiválasztása"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "kimeneti hibák"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "_Ablak bezárása"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "_Hibák törlése"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Érintett kimenetek törlése"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Folytatás"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "megállítva..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Megállítás"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "folytatva..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Megtartás"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2653,30 +2665,28 @@
 "(Kattints a 'Megtartás' gombra, hogy megtartsd amit készítettél)\n"
 "(Kattints a 'Folytatás' gombra, hogy folytatódjon a folyamat)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Mégse"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Leállítás"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Kijelölt képkocka"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Képkocka mentése mint: %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2685,7 +2695,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2697,7 +2707,7 @@
 "Fel kell telepítened az \"xwininfo\"-t ezen képesség használatához\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2705,7 +2715,7 @@
 "\n"
 "A rögzítési időnek nagyobbnak kell lennie 0-nál.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2719,11 +2729,11 @@
 "Nyomj 'Mégse'-t a megszakításhoz\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Külső ablak felszabadítva.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2731,7 +2741,7 @@
 "Kattints az ablakra a rögzítéshez\n"
 "nyomj 'q'-t a felvétel megállításához"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2746,19 +2756,19 @@
 "Stop vagy 'q' a befejezéshez.\n"
 "(Az alapértelmezett %.3f képkocka/másodperc lesz használva.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "A LiVES nem képes rögzíteni ezt az ablakot. Elnézést.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Kijelölt hang exportálása mint..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Hang exportálása mint..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2771,81 +2781,87 @@
 "A hanglejátszás sebessége meg lett változtatva a klipben.\n"
 "'OK' az új sebesség exportálásához, vagy 'Mégse' az eredeti exportálásához.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "%d hang exportálása ide: %d, mint: %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Hang exportálása mint %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Hang exportálása"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+#, fuzzy
+msgid "LiVES: - Append Audio File"
 msgstr "Hang fájl hozzáfűzése..."
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "%s hang fájl hozzáfűzése..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Hang hozzáfűzése"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Hang hozzáfűzés"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Hang vágása %.2f -től %.2f másodpercig..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Hang nyesés/kitöltés"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Hangot nyes/kitölt"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Fokozatosan erősödő hang"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Fokozatosan erősödő hang"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Fokozatosan halkuló hang"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Fokozatosan halkuló hang"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s %.1f másodpercen túl..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s : %.2f másodperctől %.2f másodpercig..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Halkuló hang..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2855,61 +2871,52 @@
 "Az összes hang törlése bezárja a fájlt.\n"
 "Biztos vagy benne?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Minden hang törlése..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Hang törlése %.2f-től %.2f másodpercig..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Hang törlése"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Hang törlése"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Új hang rögzítése"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Csend beszúrása a %.2f-től a %.2f másodpercig..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Csend beszúrása"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"%d kimenet(ek) törlése...biztos vagy benne?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nem találom a(z) %s pixmap fájlt."
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Összeolvasztás"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Vágólap összeolvasztása [ %d képkockák ]       A kijelölttel [ %d képkockák ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2917,612 +2924,585 @@
 "Vágólap összeolvasztása [ %d képkockák (újramintázott)]       A kijelölttel "
 "[ %d képkockák ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "_Kezdőpontok igazítása"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "_Végek igazítása"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Mit csináljak az extra vágólap képkockákkal -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Képkockák beillesztése"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Képkockák eldobása"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "A vágólap ismétlődésének számai"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Vágólap ismétlése a jelen kijelöléshez"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Átmenet metódusa:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "A vágólap összeolvasztása a kijelöltekkel..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "%d extra képkockák beillesztése az összeolvasztás elött\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "most beillesztem a %d extra képkocká(kat)t\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Összeolvasztás kész.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Egyéni effektek"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "Egyéni _segédprogramok"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Fájl/könyvtár megnyitása"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "_Legutóbbi fájlok..."
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "_Hely/adatfolyam megnyitása..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "Importálás innen: _dvd/vcd..."
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "Importálás innen: _dvd"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "_Importálás eszközről"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "_Importálás eszközről"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importálás innen: _firewire eszköz (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importálás innen: _firewire eszköz (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Legutóbbi fájlok..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_Klip beállítás újratöltése..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "_Bezárás/összes klip mentése"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "_Kijelöltek kódolása mint..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Klip bezárása"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Biztonsági mentés a klipről mint .lv01..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Klip helyreállítása .lv1..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Kódolás/mentés _hanggal"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "_Lemezterület felszabadítása"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Szerkesztés"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK mód"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Kijelöltek másolása"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "_Kijelöltek kivágása"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Beillesztés a vágólapról..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Beillesztés _újként"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Vágólap összeolvasztása a kijelöltekkel..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Kijelölés törlése"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "_Videó elválasztása a hangtól"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Kijelölés..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "_Minden képkocka kijelölése"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "_Csak az első képkockát"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_Csak az utolsó képkockát"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "_Kijelölés az első képkockától"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "_Kijelölés az utolsó képkockáig"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "legutóbbi kijelölés kiválasztása/_összefűzés"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "_Utolsó effekt kiválasztása"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Kijelölés megfordítása"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_Kijelöltek zárolása"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Mind lejátszása"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "_Kijelöltek lejátszása"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "_Vágólap lejátszása"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Leállítás"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "_Előre"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Teljes képernyő"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Dupla méret"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Lejátszás _önálló ablakban"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Üres háttér"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Automatikus)_videó rendezés (hogy kitöltse a zenét)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "_Folytatólagos hurok"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "_Ping pong hurkok"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Elnémítás"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Önálló ablak, 'r_agadós' mód"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "_Mutasd a képkocka számlálót"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "_Effektek"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Az effektek az aktuális kijelölésnél lesznek alkalmazva."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Effekt/Eszköz/Generátor teszt futtatása..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Eszközök"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Az eszközök csak a teljes klipekhez használhatók."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Fordított vágólap"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Lejátszási/mentési sebesség megváltoztatása..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "_Video újramintázása új képarány értékre..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Segédprogramok"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Létrehozás"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Egyéni _eszközök"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Létrehozás"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Effekt bővítmények betöltése..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Felvétel _külső ablakban... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Beállítások..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Hang"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "_Új hang betöltése a kliphez..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "_CD szám betöltése..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "_CD kiadása"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "_Külső hang rögzítése..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "Az új _klipnek..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "a _kijelölteknek"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "_Fokozatos hangerősödés..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "_Fokozatos elhalkulás..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Hang exportálása..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "_Kijelölt hang exportálása..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "_Minden hang exportálása..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Hang hozzáfűzése..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Hang nyesés/kitöltés..."
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Hang nyesés/kitöltés a _kijelöltnek"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Hang nyesés/kitöltés az elejétől a _lejátszás Indításáig"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Hang törlése..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "_Kijelölt hang törlése"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "_Minden hang törlése"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "_Csend beszúrása a kijelölésbe"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Hang újramintázása..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "_Zene lejátszása az xmms-sel..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Véletlenszerű zene az _xmms-sel..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "xmms _lejátszás leállítása"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Klip tulajdonságainak mutatása"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Fájl kommentek megjelenítése/_szerkesztése"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "_Vágólap információ megjelenítése"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "_Üzenetek megjelenítése"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "_Kimeneti hibák mutatása"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Klipek"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Klip átnevezése a menüben"
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Haladó"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Effektek/Eszközök/Segédprogramok"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Új teszt RFX szkript..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_RFX szkript másolása a tesztbe..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Teszt RFX szkript szerkesztése..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "_Teszt RFX szkript átnevezése..."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Teszt RFX szkript törlése..."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Effekt/Eszköz/Generátor teszt előrehozatala..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Egyéni RFX szkript importálása..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "_Egyéni RFX szkript exportálása..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "_Egyéni RFX szkript törlése..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "_Az összes RFX bővítmény újraépítése"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "_LiVES adafolyam fogadása innen..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_LiVES adadfolyam küldése ide..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "_yuv4mpeg adatfolyam megnyitása ezen: %sstream.yuv..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Projekt importálása (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "_Projekt exportálása (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Valós idejű _effekt leképezés"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "A valós idejű effektek hozzárendelése a ctrl-szám billentyűkhöz."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Alapértelmezett beállítások használata"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Az alapértelmezett paraméter értékek beállítása."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Beállítások mentése alapértelmezettként"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3530,309 +3510,309 @@
 "Mentsd el a valós idejű effekt alapbeállításait, így azok minden LiVES "
 "indításnál visszaállítódnak."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Minden lejátszó sebesség és pozíció visszaállítása"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Minden lejátszási helyzet visszaállítása az első képkockához, és minden "
 "képarány visszaállítása."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/joystick felület"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/joystick oktató..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_Eszköz lista mentése..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_Eszköz lista betöltése..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "VJ _billenytűk mutatása"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Játékok"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Nincs"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_Őrült képkockák"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (szélessávú)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Súgó"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Kézikönyv (böngészőben nyílik meg)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Támogasd a projektet!"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Levél a fejlesztőnek"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Hiba bejelentése"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "_Képesség ajánlása a fejlesztőnek"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Segítség a _fordításban"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Hibaelhárítás"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Névjegy"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "_Visszatekerés az elejére (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Mind lejátszása (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Leállítás (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Kijelöltek lejátszása (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Hangerő"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Hangerő (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Üres háttér (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Lejátszás lassabban (ctrl-le)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Lejátszás gyorsabban (ctrl-fel)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Ugrás vissza (ctrl-bal)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Ugrás előre (ctrl-jobb)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Klip tuajdonságainak megjelenítése (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Eszköztár elrejtése"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Videó lejátszás sebessége (másodpercenkénti képkockák)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Videó sebesség változtatása"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Első képkocka"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Utolsó képkocka"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "A legelső kijelölt képkocka ebben a klipben"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "Az utolsó kijelölt képkocka ebben a klipben"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Indulás folyamatban...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Nyomj 'q'-t a felvétel leállításához.  NE TAKARD EL A LEJÁTSZÓ "
 "ABLAKOT!   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Előnézeti képkockák száma"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Szabad"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Szabadon választható a mennyiség"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Indítás"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "Képkocka szám hozzárendelve az elsőhöz"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Befejezés"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "Képkocka szám hozzálinkelve az utolsó képkockához"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Mutató"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "Képkocka mennyiség hozzárendelve a lejátszó mutatóhoz (csúszkához)"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Visszatekerés"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Mind lejátszása"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Kijelölt rész lejátszása"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Ismétlődés Be/Ki"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "_Felvétel indítása"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "_Felvétel leállítása"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "_Előadás felvétele"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Lejátszó ablak elrejtése"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Lejátszó ablak megjelenítése"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "%.2f mp."
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "%.2f mp."
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "%.2f mp."
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "%.2f mp."
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "%.2f mp."
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Vágólap letakarítása"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3843,7 +3823,7 @@
 "==============================\n"
 "Váltás a %s klipre\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3853,11 +3833,11 @@
 "==============================\n"
 "Váltás üres klipre\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(üres)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3866,7 +3846,7 @@
 "A beállítás neve %s-ről megváltozott %s-re. Az érintett kimenetek ennek "
 "megfelelően frissítve lettek.\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3875,7 +3855,7 @@
 "A %s klip hiányzik ebből a beállításból.\n"
 "Viszont szükséges a következő kimenetek miatt:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3884,7 +3864,7 @@
 "A %s klip be lett zárva.\n"
 "Ez szükséges a következő kimenetek által:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3893,7 +3873,7 @@
 "A képkockák a %s-ben meg lettek változtatva.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3902,7 +3882,7 @@
 "Képkockák ki lettek törölve a %s klipből.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3911,7 +3891,7 @@
 "Hang törölve a %s klipből.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3920,7 +3900,7 @@
 "A hang meváltozott a %s klipben.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3929,7 +3909,7 @@
 "A hang meg lett változtatva a %s klipben.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3938,7 +3918,7 @@
 "A képkockák meg lettek változtatva a %s klipben.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3949,7 +3929,7 @@
 "nem lehet megnyitni, mivel azt a LiVES\n"
 "egy másik megnyitott példánya használja\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3960,7 +3940,7 @@
 "A %s beállítást a LiVES egy másik futó példánya már használja.\n"
 "Kérlek válasz másik beállítást.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3968,16 +3948,13 @@
 "\n"
 "A beállítás név nem lehet üres.\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"A beállítás nevében nem lehet szóköz, és a következő jelek: %s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3986,13 +3963,13 @@
 "\n"
 "A beállítás nevében nem lehet szóköz, és a következő jelek: %s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4003,69 +3980,69 @@
 "A %s beállítás már létezik.\n"
 "Kérlek válassz másikat.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "%s kimenet eltávolítása\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Videó [megnyitás...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Videó [%.2f másodperc]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Nem definiált)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Nincs videó)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Nincs hang)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Monó  [megnyitás...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Bal oldal [megnyitás...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Monó [%.2f másodperc]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Bal oldal [%.2f másodperc]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Jobb oldal [megnyitás...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Jobb oldal [%.2f másodperc]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES addig nem képes átváltani az mplayerre, amíg a klipek be vannak töltve."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "klip kipucolása"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4080,54 +4057,65 @@
 "\n"
 "Felülírod?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_%s visszavonása"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "\"%s\" _újra"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Kijelölés-------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " mp ] ----------Kijelölés----------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " képkockák ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Fájl fejléc vizsgálata"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "%s megnyitása"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "%s megnyitása. Kezdés ideje %.2f mp. képkockák %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " hang nélkül"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Hang megnyitása ehhez: %s"
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -4137,19 +4125,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"A LiVES jelenleg nincs optimalizálva a nagy méretű fájlokra.\n"
-"Megnyithatsz (spec most) kis fájlokat, vagy használd a 'Fájl kiválasztás "
-"megnyitása' opciót.\n"
-"(Fájlméret=%.2fMB)\n"
-"\n"
-"Biztosan szeretnéd folytatni?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - kérlek légy türelemmel."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4161,7 +4142,7 @@
 "A LiVES nem tud hang, vagy videó fájlt kitömöríteni.\n"
 "Kérlek nézd meg a terminál ablakot a további információkért.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4171,7 +4152,7 @@
 "\n"
 "Telepítened kell az mplayert a fájl megnyitásához.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4183,32 +4164,29 @@
 "Kérlek ellenőrizd a Videó megnyitó parancs beállításait az\n"
 "Eszközök|Beállítások|Kódolás menüben\n"
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Halkuló hang..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Képkocka mentése mint: %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Képkocka mentése mint: %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Klip átnevezése"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4220,35 +4198,31 @@
 "\n"
 "Még mindig akarod folytatni?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "kiválasztás"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Linkek létrehozása: kiválasztás"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (hang nélkül)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "%d képkockák mentése ide: %d%s, mint \"%s\" : kódoló = %s : formátum = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Képkockák elmentése 1 től %d%s-ig mint \"%s\" : kódoló %s : formátum = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Mentés [ sok időbe telhet]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4258,34 +4232,33 @@
 "\n"
 "Kódolási hiba - a kimeneti fájl nem készült el!\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "Vágólap letakarítása"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Fájl mérete"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "felvétel megszakítva az előnézet miatt.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "felvétel megszakítva a vágólap visszajátszása miatt.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Felvétel minősége..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Az átlagos FPS %.4f volt\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4299,16 +4272,16 @@
 "Kattints rá az Eszközök--->Mind átméretezése\n"
 "opcióra, majd minden képkockát méretezz át a megfelelő méretre.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Névtelen%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4316,7 +4289,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4329,14 +4302,14 @@
 "Az alapértelmezett sebesség beállítható az Eszközök | Beállítások | Vegyes "
 "részben.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "A lejátszás sebessége %.3f fps-re lett beállítva, ezáltal a videó "
 "hozáilleszkedik a hanghoz.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4345,7 +4318,7 @@
 "Képkockák=%d típus=%s méret=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Hang:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4354,49 +4327,44 @@
 "Képkockák=%d típus=%s méret=%dx%d bpp=%d fps=%.3f\n"
 "Hang:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s nincs\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d csatorna(k) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Megjegyzés: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "%d képkocka mentése mint %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "%s mentése eddig: %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Mentés"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "minőségi adatok el lettek mentve..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "%s helyreállítása..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Helyreállítás"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4410,22 +4378,22 @@
 "A LiVES nem tudja helyreállítani.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4433,7 +4401,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4443,64 +4411,59 @@
 "A LiVES előző futtatásából előkerült néhány fájl.\n"
 "Szeretnéd helyreállítani őket?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Fájlok visszaállítása"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Visszaszerzés fájlokat..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Érintett _kimenetek megjelenítése"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Lemez terület takarítása"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s haladó beállítások"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Figyelmeztetés!"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "figyelmeztetés"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr "LiVES: - Kérdés"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Szín Kiválasztása"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "_Hibák törlése"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Névjegy"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4511,7 +4474,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4523,11 +4486,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Nem lehet zene lejátszót váltani a lejátszás alatt."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4539,20 +4502,18 @@
 "A LiVES nem tudja ezt a műveletet elvégezni kellő memória hiányában.\n"
 "Kérlek próbálj meg néhány alkalmazást bezárni.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% kész. Hátralévő idő:%u másodperc\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4561,14 +4522,14 @@
 "\n"
 "%d/%d képkocka megnyitva. A hátralévő idő %u másodperc.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4577,7 +4538,7 @@
 "\n"
 "%d képkocka megnyitva.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4586,7 +4547,7 @@
 "\n"
 "Hátralévő idő: %d mp"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4597,7 +4558,7 @@
 "Elnézést, de a LiVES csak %d fájlt tud megnyitni egyszerre.\n"
 "Kérlek zárj be egy fájlt, majd próbáld újra."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4616,7 +4577,7 @@
 "\n"
 "Kérlek ellenőrizd az írási jogosultságaidat."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4626,7 +4587,7 @@
 "Kérlek telepítsd a 'sox'-ot,\n"
 "vagy válts egy másik kódolóra az Eszközök | Beállítások | Kódolás menüben\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4638,7 +4599,7 @@
 "Ez a kódoló/formátum nem használható a kért hang kódekhez. \n"
 "Kérlek állítsd be a hang kódolót az Eszközök|Beállítások|kódolás menüben.\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4646,16 +4607,13 @@
 "Ez a kimenet generált képkockákat tartalmaz.\n"
 "Nem menthető, először egy klippé kell alakítanod.\n"
 
-#: src/dialogs.c:1820
-#, fuzzy
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
-"Ez a kimenet generált képkockákat tartalmaz.\n"
-"Nem menthető, először egy klippé kell alakítanod.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4666,7 +4624,7 @@
 "\n"
 "Kellő korlátozások a %s formátumban.\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4674,43 +4632,43 @@
 "A LiVES a következő beállításokat ajánlja:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", aláírt"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", aláíratlan"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", kicsi-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", nagy-endian"
 
-#: src/dialogs.c:1867
-#, fuzzy, c-format
+#: src/dialogs.c:2004
+#, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
-msgstr "%d Hz%s hangráta használata\n"
+msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Videó arány beállítása erre: %.3f fps-re\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Videó arány beállítása erre: %d:%d fps-re\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Videó méretének beállítása erre: %d x %d pixel\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4718,35 +4676,35 @@
 "\n"
 "Szeretnéd:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "videó átméretezése %d x %d pixelre\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "hang letiltva, mivel a kijelölt kodek nem képes kezelni a hangot\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "A LiVES-nak szükséges a:\n"
 
-#: src/dialogs.c:1974
-#, fuzzy, c-format
+#: src/dialogs.c:2112
+#, c-format
 msgid "resample audio to %d Hz%s%s\n"
-msgstr "hang újramintázása erre: %d Hz%s\n"
+msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "videó újramintázása %.3f fps-re\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "videó újramintázása %d:%d fps-re\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4760,7 +4718,7 @@
 "'OK' a jóváhagyáshoz, 'Mégse' az elvetéshez.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4770,7 +4728,7 @@
 "A változások a kijelölésben nem lesznek maradandóak.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4784,7 +4742,7 @@
 "elérhető memória.\n"
 "Próbálj meg csak egy kijelölt részt rögzíteni a fájlból."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4802,7 +4760,7 @@
 "\n"
 "Kérlek nyomj 'Mégse'-t a beillesztés megszakításához, 'OK'-t a folytatáshoz."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4816,11 +4774,11 @@
 "Csak nyomj 'OK'-t ha tudod mit kell tenned, minden más esetben válaszd a "
 "'Mégse' opciót."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Billentyűk mutatása"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4900,11 +4858,11 @@
 "d                             dupla méret\n"
 "g                             ping pong ismétlés\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Multitrack billenytűk"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4926,19 +4884,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Üzenet előzmények"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Frissítés/telepítés után ellenőzizd a <prefix_dir> beállításokat a ~/.lives "
-"könyvtáradban"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4946,16 +4903,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"Nem találok egyetlen egy létrehozott effekt bővítményt sem.\n"
-"Kérlek ellenőrizd, hogy fel vannak-e telepítve ide:\n"
-"%s%s%s\n"
-"vagy változtasd meg a tartalmazó mappa <lib_dir> helyét itt: ~/.lives\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4965,18 +4916,18 @@
 "\n"
 " (használható fájltípusok:.mp3, .ogg, .wav, .mod, .xm, .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "nem sikerült (ismeretlen típus)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4990,7 +4941,7 @@
 "beállításhoz.\n"
 "'Mégse' egy új létrehozásához.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5002,7 +4953,7 @@
 "Biztosan szeretnéd folytatni?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5014,8 +4965,8 @@
 "Biztosan folytatni szeretnéd?\n"
 "."
 
-#: src/dialogs.c:2170
-#, fuzzy, c-format
+#: src/dialogs.c:2310
+#, c-format
 msgid ""
 "\n"
 "The original file\n"
@@ -5024,15 +4975,8 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
-"\n"
-"Az eredeti fájl\n"
-"%s\n"
-"nem található.\n"
-"Ha a fájl áthelyezve lett, kérlek másold vissza az eredeti helyre\n"
-"és kattints az 'OK'-ra.\n"
-"Ellenkező esetben kattints a 'Mégse' gombra a fájl betöltés kihagyásához.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5047,7 +4991,7 @@
 "%s\n"
 "A klipet nem lehet betölteni.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5055,7 +4999,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5064,13 +5008,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5081,7 +5025,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5090,7 +5034,7 @@
 "Más megoldásként, indítsd újra a LiVES-t, majd válassz egy másik "
 "hangmeghajtót.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5105,20 +5049,16 @@
 "Növelheted az értéket a Beállítások/Multitrac menüben.\n"
 "Az ajánlott érték legalább %d MB"
 
-#: src/dialogs.c:2221
-#, fuzzy, c-format
+#: src/dialogs.c:2361
+#, c-format
 msgid ""
 "\n"
 "Some old layouts for the set %s already exist.\n"
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 msgstr ""
-"\n"
-"A %s beállítás néhány régi kimenete már létezik.\n"
-"Ajánlott törölni őket.\n"
-"'Ok' a törlésükhöz, 'Mégse' a meghagyásukhoz.\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5130,7 +5070,7 @@
 "Zárj be néhány más alkalmazást a memória felszabadításához.\n"
 "Használd a Beállítások/Multitrack/Visszaállítási memória opciót\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5142,7 +5082,7 @@
 "Meg kell növelned a visszaállítási memóriát\n"
 "használd a Beállítások/Multitrack/Visszaállítási memóriát\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5151,21 +5091,21 @@
 "A LiVES nem képes elég memóriát biztosítani a multitrack visszállító "
 "pufferéhez.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "vagy adj meg egy kisebb értéket.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Próbáld meg ismét a klip szerkesztőböl. Próbálj meg bezárni néhány egyéb "
 "alkalmazást\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Zárj be néhány egyéb alkalmazást\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5173,13 +5113,13 @@
 "A Multitrack értéke 0 csatornát jelez, de a kimenetnek van hangja.\n"
 "Ellenőrizd a hang beállításokat az Eszközök menüben.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "A jelenlegi kimenetnek van hangja, ezért a csatornák száma nem lehet 0.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5189,7 +5129,7 @@
 "illetve \"pulse audio\" lejátszókkal lehetséges.\n"
 "Ezt beállíthatod az Eszközök|Beállítások|Lejátszás menüben."
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5199,7 +5139,7 @@
 "egy régebbi verziója miatt is).\n"
 "Megpróbálhatom megjavítani a kimenet másolatát?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5207,7 +5147,7 @@
 "A LiVES nem képes betölteni a kimenetet.\n"
 "Sajnálom.\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5217,7 +5157,7 @@
 "\n"
 "A hang aránynak 0-nál nagyobbnak kell lennie.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5229,7 +5169,7 @@
 "és sokáig tart megjeleníteni.\n"
 "Biztosan meg szeretnéd nézni?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5239,7 +5179,7 @@
 "\n"
 "Telepítened kell a 'dvgab'-et a funkció használatához.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5254,25 +5194,25 @@
 "Ki kell egyet választanod ezek közül az Eszközök/Beállítások/Lejátszás "
 "menüben.\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "A videólejátszó bővítmény nem tudja inicializálni a palettát!\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Nem sikerült inicializálnia a palettát a dekóder bővítménynek!\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Nem lehet beállítani videó bővítmény képkocka arányát\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr "Öszeomlás után\n"
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5285,34 +5225,34 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "megszakítva.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "nem sikerült.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "hiba a fájlban. Sikertelen.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5320,13 +5260,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5334,13 +5270,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5348,26 +5280,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5375,26 +5299,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5402,17 +5318,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"A LiVES nem tud ebbe a fájlba írni:\n"
-"%s\n"
-"Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5421,7 +5333,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5434,7 +5346,7 @@
 "%s\n"
 "Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5443,19 +5355,25 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Abort and exit immediately from LiVES\n"
-"Are you sure ?\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
 msgstr ""
 "\n"
 "\n"
-"A beállítás törlődik a lemezről.\n"
-"Biztos vagy benne?\n"
+"A LiVES nem képes újrarendezni a képkockákat."
+
+#: src/dialogs.c:2973
+msgid ""
+"\n"
+"Abort and exit immediately from LiVES\n"
+"Are you sure ?\n"
+msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5466,13 +5384,13 @@
 "A %s nem képes klipet készíteni ezekkel a képekkel: %s\n"
 "Kérlek válassz egy másik kódolót a listából.\n"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5482,27 +5400,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5511,14 +5429,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5529,19 +5447,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5549,7 +5467,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5557,7 +5475,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5569,45 +5487,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Légy üdvözölve a LiVES %s verziójában.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5616,203 +5532,246 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generátor"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Generátorok"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generátor"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Generátorok"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "átmenet"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Átmenetek"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "hatás"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Effektek"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "segédprogram"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Segédprogramok"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Compositorok"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "csap"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Csapok"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "osztó"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Osztók"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "konvertáló"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Konvertálók"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "hang/videó"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Hang/videó átmenetek"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "csak videó"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Csak videó átmenetek"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "csak hang"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Csak hang átmenetek"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "hang"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Hang keverők"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Hang effektek"
 
-#: src/effects.c:104
+#: src/effects.c:122
+#, fuzzy
+msgid "video"
+msgstr "Videó"
+
+#: src/effects.c:123
+#, fuzzy
+msgid "Video Effects"
+msgstr "Hang effektek"
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "hangerőszabályzó"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Hangerőszabályzók"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "csak videó"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "csak videó"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "csak hang"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "_Hang paraméterek"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s összes képkocka..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s vágólap %d képkockákban eddig: %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s a vágólapra..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s az új klippbe..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s képkockák %d eddig %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s vágólap kijelöléssel"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s a vágólapra"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s az új klipbe"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s képkockák %d eddig %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5820,17 +5779,49 @@
 "\n"
 "Nincsenek képkockák generálva.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+#, fuzzy
+msgid "integer"
+msgstr "_Mutató"
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+#, fuzzy
+msgid "string"
+msgstr "Helyreállítás"
+
+#: src/effects-weed.c:423
+#, fuzzy
+msgid "pointer"
+msgstr "_Mutató"
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Hiba: a(z) %s bővítménynek nincsenek beállításai.\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5839,131 +5830,317 @@
 "Információ: Nem lehet betölteni a következő bővítményt: %s\n"
 "A hiba a következő volt: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Almappákat is beleértve"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Sikeresen betöltött %d Weed szűrők\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, fuzzy, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5157
+#, fuzzy, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5168
+#, fuzzy, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5182
+#, fuzzy, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5209
+#, fuzzy, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5243
+#, fuzzy, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5276
+#, fuzzy, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5287
+#, fuzzy, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5305
+#, fuzzy, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5317
+#, fuzzy, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5328
+#, fuzzy, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5342
+#, fuzzy, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5370
+#, fuzzy, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5381
+#, fuzzy, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5399
+#, fuzzy, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5409
+#, fuzzy, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5427
+#, fuzzy, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr "Érvénytelen %s effekt a %s-ben\n"
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, fuzzy, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr "Sikeresen betöltött %d Weed szűrők\n"
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Nem sikerült elindítani a(z) %s eseményt, hiba kód: %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Nem lehet elindítani a %s generátort\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Nem lehet elindítani a %s generátort\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Nem lehet elindítani a %s generátort, %d hiba\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+#, fuzzy
+msgid "Alpha Channel Connections"
+msgstr "LiVES: - RFX paraméter ablak tippek"
+
+#: src/effects-data.c:2897
+#, fuzzy
+msgid "Parameter Data Connections"
+msgstr "Ki_jelölés"
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+#, fuzzy
+msgid "Autoscale"
+msgstr "* skála"
+
+#: src/effects-data.c:3342
+#, fuzzy
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr "LiVES: - RFX paraméter ablak tippek"
+
+#: src/effects-data.c:3351
+#, fuzzy
+msgid "Auto Connect Channels"
+msgstr "Ki_jelölés"
+
+#: src/effects-data.c:3363
+#, fuzzy
+msgid "Auto Connect Parameters"
+msgstr "Paraméterek beállítása"
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Csak kattints az előnézetre az értékek megváltoztatásához"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Értékek visszaállítása"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Képkocka"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Eredeti képarány használata"
+#: src/framedraw.c:267
+#, fuzzy
+msgid "_Frame"
+msgstr "_Képkockák"
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "_Képarány fenntartása"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Fájl kiválasztása"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Eredeti képarány használata"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "Átmenet _Be"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Átmenet be"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "Hang a hangban"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "Pipa a kis dobozba a hang/videó átmenet készítéséhez"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "Hang a hangban"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Átmenet _Ki"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Átmenet ki"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "Cél _FPS (a bővítmény felülírhatja)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : méret"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Új méret (képpont)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Szélesség"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Magasság"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "_A vágólapra"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Elkészítés a vágólapra"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Elkészítés _új klipként"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Képkockák elkészítése egy új klipbe"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5974,62 +6151,59 @@
 "Ki kell választanod legalább %d képkockát az effekt használatához.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Legyen ez az alapértelmezés"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "_Ablak bezárása"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Nincsenek paraméterek"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Érvénytelen paraméter"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Szín Kiválasztása"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Kattintás a szín beállításához"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "Új_ra"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "A vörös értéke (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Zöld"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "A zöld értéke (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Kék"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "A kék értéke (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -6038,12 +6212,12 @@
 "\n"
 "Bővítmény hiba: %s hiba, ezzel a kóddal: %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : az üzenet ez volt: %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6058,17 +6232,17 @@
 "%s\n"
 "Hiba kód: %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Videólejátszó bővítmény alapértelmezéseinek frissítése itt: %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Videólejátszó bővítmény alapértelmezéseinek betöltése innen: %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6083,32 +6257,32 @@
 "Eszközök|Beállítások|Lejátszás|Haladó bővítmények menüben\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Állandó képkocka-arány a bővítménynek.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Színtér bevitel a bővítménybe.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Állandó képkocka-arány a bővítménynek.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "_Színtér"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Színtér bevitel a bővítménybe.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6121,16 +6295,7 @@
 "Nem sikerült megnyitni ezt a bővítményt: %s\n"
 "A hiba oka %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"Nem sikerült inicializálni a bővítményt.\n"
-"A hiba oka: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6145,7 +6310,16 @@
 "hiányzik egy kötelező funkciója.\n"
 "Nem lehet használni.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"Nem sikerült inicializálni a bővítményt.\n"
+"A hiba oka: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6155,7 +6329,7 @@
 "Figyelmeztetés! A lejátszó bővítmény nem küld billentyű lenyomatokat. Lehet, "
 "hogy le van tiltva a billentyűzeted a bővítmény használata közben!\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6164,30 +6338,26 @@
 "***%s bővítmény használata az fs lejátszáshoz, a %d (%s) paletta típus "
 "használata engedélyezve. ***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"A LiVES nem találja a kódoló bővítményeit. Kérlek ellenőrizd a meglétüket a "
-"rendszereden itt\n"
-"%s%s%s\n"
-"vagy változtasd meg az útvonalát ennek <lib_dir> a ~/.lives -ban\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6200,11 +6370,11 @@
 "%s%s%s\n"
 "vagy válassz egy másik bővítményt az Eszközök|Beállítások|Kódolás menüben\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Nem lehet átméretezni, kérlek telepítsd fel az imageMagick-et\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6217,7 +6387,7 @@
 "Nem sikerült megnyitni a következő dekóder bővítményt: %s\n"
 "A hiba oka: %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6232,189 +6402,172 @@
 "hiányzik egy kötelező funkciója.\n"
 "Nem lehet használni.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/ismeretlen"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Kódolási beállítások"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Nem lehet betölteni ezt: %s, az átmenet nem lesz átméretezve.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s haladó beállítások"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Új teszt RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Teszt RFX szerkesztése"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Effekt -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Átmenet -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generátor -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Eszköz -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Segédprogramok -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Név:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "A bővitmény neve. Nincs elég hely."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Verzió:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "A szkript verzió."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Szerző:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "A szkript szerzője."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (opcionális):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "A bővítmény karbatartójának URL-je."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menü szöveg:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "A szöveg, ami a menüben lesz."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Művelet leírás:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "A bővítmény működésének leírása. PL.:\"Él detektálás\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Minimum képkockák:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "Az effekt által alkalmazott minimum képkockák. Normál az 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Követelmények..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Írj be bármilyen binárist, amit a bővítmény igényel."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "A bővítmény tulajdonságainak beállítása. Opcionális."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Paraméterek..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "A pre/loop/post/trigger kódok által használt parméterek beállítása. "
 "Opcionális."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Paraméter _Ablak tippek..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Állítsd be, hogyan jelenjen meg a paraméter ablak. Opcionális."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Nyelv kód:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "A pre/loop/post/triggers nyelve. Opcionális."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "_Elő ismétlődés kód..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "A kód az ismétlődés előtt lesz végrehajtva. Opcionális."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "_Ismétlődés kód..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Ismétlődés kód minden képkockánál alkalmazva."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "_Ismétlődés kód küldése..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "A kód az ismétlés után lesz végrehajtva. Opcionális."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "_Programindító kód..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6422,7 +6575,7 @@
 "Prigramindító kód beállítása, ha a paraméter ablak megjelenik, vagy amikor a "
 "paraméter megváltozik."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6437,55 +6590,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX követelmények"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX paraméterek"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX paraméter ablak tippek"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX programindítók"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Új bejegyzés"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Bejegyzés szerkesztése"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Bejegyzés eltávolítása"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Mozgatás _fel"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Mozgatás _le"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX tulajdonságok"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "_Lassú"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "_Batch mód generátor"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6499,7 +6652,7 @@
 "Előbb távolítsd el a programindítót.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6511,27 +6664,27 @@
 "Néhány programindító korrigálva lett.\n"
 "Kérlek ellenőrizd a kódot.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Új RFX paraméter"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - RFX paraméter szerkesztése"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Név:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "A paraméter neve, egyedinek kell lennie a bővítményben."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Címke:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6539,172 +6692,161 @@
 "Egy címke mutatva lesz a paraméter által. Egy aláhúzott bemutatott mnemonic "
 "gyorsító."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "Gomb _csoport: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "A nem-nulla érték használható a csoport rádió gombokhoz."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Típus:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Paraméter típus (kijelölése a listából)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Decimális _helyek: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "_Alapértelmezett érték:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_Alapértelmezett: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "Gomb _csoport: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "A nem-nulla érték használható a csoport rádió gombokhoz."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "_Minimum érték: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "_Maximum érték: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     _Lépés méret:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "Mennyire van korrigálva a paraméter akkor, amikor a pörgöbomb nyilak le "
 "vannak nyomva."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+#, fuzzy
+msgid "_Wrap value"
 msgstr "_Körbe: "
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Ha az érték max->min és min->max."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "_Értékek beállítása"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Alapértelmezett érték:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Minimum érték: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Maximum érték: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Alapértelmezett _vörös:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Alapértelmezett _zöld:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Alapértelmezett _kék: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "_Alapértelmezett beállítása"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Alapértelmezett érték:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Maximum hossz (karakterek): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Új RFX paraméter ablak tipp"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - RFX paraméter ablak tipp szerkesztése"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Kulcsszó:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Speciális típus:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Speciális altípus:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
+
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Sor:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Kapcsolt paraméterek (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Kapcsolt paraméterek (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Kapcsolt paraméterek (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Új RFX programindító"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - RFX programindító szerkesztése"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Mikor:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Elő ismétlődés kód"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Ismétlődés kód"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Ismétlődés kód küldése"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Alapértelmezett szöveg (max. hossz %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Adj meg értékeket, soronként"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6714,7 +6856,7 @@
 "\n"
 "A név nem lehet üres.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6724,7 +6866,7 @@
 "\n"
 "A név nem tartalmazhat szóközt.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6734,7 +6876,7 @@
 "\n"
 "A menü szöveg nem lehet üres.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6744,7 +6886,7 @@
 "\n"
 "A folyamat leírás nem lehet üres.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6754,7 +6896,7 @@
 "\n"
 "A szerző rész nem lehet üres.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6766,7 +6908,7 @@
 "Már létezik ezzel a névvel bővítmény.\n"
 "A névnek egyedinek kell lennie.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6776,7 +6918,7 @@
 "\n"
 "Ismétlödő kód nem lehet üres.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6786,7 +6928,7 @@
 "\n"
 "A programindító kódja nem lehet üres egy alkalmazásnak.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6796,7 +6938,7 @@
 "\n"
 "A paraméter nem lehet üres.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6810,41 +6952,41 @@
 "lennie a bővítményben.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "%s parancsfájl írása..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "Nem találtam <define> részt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Rossz parancsfájl verzió.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "Nem találtam <name> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "Nem találtam <version> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "Nem találtam <author> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "Nem találtam <description> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Rossz leírás. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6859,27 +7001,27 @@
 "találtam a parancsfájlban.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Összes RFX parancsfájl újraépítése...builtin...."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Parancsfájlok újraépítése"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "egyéni..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "teszt..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "dinamikus menübejegyzések újraépítése..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6892,7 +7034,7 @@
 "A LiVES nem képes megtalálni a %s programot.\n"
 "Kérlek ellenőrizd a program elérhetőségét, és futtathatóságát.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6907,12 +7049,12 @@
 "parancsfájlokat?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "%s rfx parancsfájlok törlése..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6927,7 +7069,7 @@
 "parancsfájlt\n"
 "Hiba kód: %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6942,12 +7084,12 @@
 "már létezik.\n"
 "Először töröld ezt, vagy nevezd át.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "%s rfx teszt bővítmény promotálása egyénire..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6955,29 +7097,25 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Nem tudom áthelyezni a bővítmény parancsfájlt\n"
-"innen: %s\n"
-"ide: %s\n"
-"A kód %d volt\n"
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Parancsfájl importálása innen..."
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+#, fuzzy
+msgid "LiVES: - Export Script to..."
 msgstr "Parancsfájl exportálása ide..."
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s másolása ide: %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+#, fuzzy
+msgid "LiVES: Import Script from..."
+msgstr "Parancsfájl importálása innen..."
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6992,55 +7130,43 @@
 "már létezik.\n"
 "Először töröld, vagy nevezd át az import parancsfájlt.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Beépített"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Egyéni"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Teszt"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - RFX parancsfájl másolása"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Típusból:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Parancsfájl:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Teszt RFX parancsfájl átnevezése"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Parancsfájlból: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFX parancsfájl név"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Parancsfájl név: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Új név: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Új parancsfájl név: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7052,28 +7178,45 @@
 "Már létezik teszt parancsfájl ezzel a névvel.\n"
 "A parancsfájl nevének egyénileg kell lennie.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "%s RFX teszt parancsfájl átnevezése erre: %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Nem tudom áthelyezni a bővítmény parancsfájlt\n"
+"innen: %s\n"
+"ide: %s\n"
+"A kód %d volt\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Azonnali effekt alkalmazása a kijelöléshez"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "%s effekt betöltése..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Lásd: VJ - mutasd a VJ billentyűket. Állítsd be az azonnali effekteket, majd "
 "alkalmazd őket ott."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7085,7 +7228,7 @@
 "A lejátszó bővítmények csak teljes képernyőn\n"
 "aktiválódnak, különálló ablak (fs) módban\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7093,7 +7236,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -7102,39 +7245,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"A temp könyvtár a LiVES munkakönyvtára, ahol a megnyitott klipeket és "
-"beállításokat tárolja.\n"
-"Ez lehet egy partíció is, ahol rengeteg szabad hely van.\n"
-"\n"
-"Tipp:"
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Nem lehet létrehozni vagy írni az új átmeneti könyvtárt. \n"
-"Először root felhasználóként létre kell hoznod, mint pl.:\n"
-"\n"
-"mkdir %s, chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"A könyvtár most még nem lett megváltoztatva.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7154,7 +7293,7 @@
 "Más esetben nyomj 'Mégse'-t, hogy visszaállítsd az átmeneti könyvtárt az "
 "alap beállításra."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7165,7 +7304,7 @@
 "jack-et.\n"
 "Lásd http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7173,7 +7312,7 @@
 "\n"
 "A zene lejátszó váltás újraindítást igényel\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7185,301 +7324,325 @@
 "először fel kell telepíteni a pulseaudio-t.\n"
 "Bővebb info a http://www.pulseaudio.org oldalon található\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (magas minőségű, nagy méretű fájlok)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Beállítások"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Maximalizált fájl kiválasztás megnyitása"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Előző fájlok mutatása a fájl menüben"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Képernyővédeő kikapcsolása a lejátszás alatt    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Maximalizált fő ablak mutatása"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Mutasd az eszköztárat, ha a háttér üres"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Klipek váltása az egérgörgővel"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Indítási mód:"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "_Klip szerkesztő"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "_Multitrack mód"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Multi-head támogatás"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " LiVES felületéhez rendelt monitorok száma"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " lejátszáshoz használt monitorok száma"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Csak egyetlen monitor"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Egy monitoros mód kikényszerítése"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Amikor belépsz a multitrack módba:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 "_Értesíts a videó szélességi, hosszúsági értékeiről, fps-ről és a hang "
 "beállításokról"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_Mindig a következő értékek használata:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Ugyanezen _értékek használata a klip megjelenítésénél is"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Szélesség           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Magasság      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Zene a háttérben engedélyezve"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Egy hang egy videó"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Puffer méret visszavonása (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Kilépés a multitrack módból a megjelenítés után"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Automata háttérkimenetek"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Minden"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "másodpercben"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Minden _váltás után"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Soha"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Multitrack/renderelés"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Instant megnyitás használata ha lehetséges"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Néhány dekóder bővítményt használó fájl instant megnyitásának engedélyezése"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+#, fuzzy
+msgid "Video open command (fallback)"
 msgstr "Videó megnyitás parancs             "
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+#, fuzzy
+msgid "Open/render compression"
 msgstr "Tömörítés megnyitása/adása                  "
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %      ( alacsonyabb = lassabb, hosszabb fájlok, jpeg-nek, magas minőség )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+#, fuzzy
+msgid "Default image format"
 msgstr "Alapértelmezett kép formátum          "
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Automatikus deinterlacing engedélyezése, ha lehetséges"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Automatikus deinterlace képkockák, amikor a bővítmény kéri"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 "Amikor összetett fájlokat nyitsz meg, akkor összefűzi a képeket egy klipbe"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Dekódolás"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr "A videó lejátszás előnézeti minősége - hatással van az átméretezésre"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Előnézet _minősége"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Alacsony - kis teljesítményű gépekhez ajánlott"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normál - a legtöbb felhasználónak ez ajánlott"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Magas - csak nagyon erős gépekhez ajánljuk"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Előnézet _minősége"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr "A videó lejátszás előnézeti minősége - hatással van az átméretezésre"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_FPS statisztika mutatása"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Bővítmény"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Lejátszó"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr "(Lásd még: Jack integrációs fül, a jack indítási opcióknál)"
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "Hang lejátszás _parancs"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- belső -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "A hang követi a videó _arányt/irányt"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "A hang követi a _klip változásokat"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+#, fuzzy
+msgid "Source:"
+msgstr "Forrás: %s"
+
+#: src/preferences.c:2798
+#, fuzzy
+msgid "_Internal"
+msgstr "- belső -"
+
+#: src/preferences.c:2803
+#, fuzzy
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+"Hang rögzítése külső ablak elkapásakor\n"
+"(jack vagy pulse audio szükséges hozzá)"
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "HANG"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7487,71 +7650,69 @@
 "Hang rögzítése külső ablak elkapásakor\n"
 "(jack vagy pulse audio szükséges hozzá)"
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Mi legyen felvéve, amikor az 'r' le van nyomva   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "_Képkocka változások"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "F_PS változások"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "_Azonnali effektek"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "_Klip váltók"
 
-#: src/preferences.c:3507
-#, fuzzy
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_Hang (jack vagy pulsevaudio lejátszó szükséges)"
-
-#: src/preferences.c:3529
-#, fuzzy
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_Hang (jack vagy pulsevaudio lejátszó szükséges)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Felvétel"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Kódoló                  "
+#: src/preferences.c:2985
+#, fuzzy
+msgid "Encoder"
+msgstr "Kódolás"
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Kimeneti formátum"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Hang kodek"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "_antialiasing használata az átméretezés alatt"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Azonnali effekt effekt gombjainak a száma"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7559,80 +7720,95 @@
 "A \"virtuális\" azonnali effekt billentyűk száma. Ezeket az azonnali effekt "
 "ablakon, vagy a (OSC) hálózaton keresztül lehet vezérelni."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Videók helye (alapértelmezett)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Mentés helye (alapértelmezett) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Hangok lelőhelye :) (alapértelmezett) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Képek helye (alapértelmezett) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Mentés/helyreálltás mappa  (alapértelmezett) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Átmeneti könyvtár (ne távolítsd el) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "Az a könyvtár, ahonnan a videók alap esetben betöltődnek"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "Az a könyvtár, ahová alap esetben a kódolt klippek mentésre kerülnek"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "Az a könyvtár, ahonnan betölti, illetve menti a hangokat a program"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "Az a könyvtár, ahová a pillanatképek mentésre kerülnek"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr "Klippek biztonsági mentésére/helyreállítására szolgáló mappa"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "A LiVES munkakönyvtára"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Könyvtárak"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7640,19 +7816,19 @@
 "Figyelmeztess a beillesztésnél / összeolvasztásnál, ha a vágólapon lévő "
 "képarány nem egyezik a kiválasztással"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Figyelmeztess megnyitásnál, ha a fájl _méret túl nagy "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Figyelmeztess mielőtt elmentenék egy beállítást"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
@@ -7660,71 +7836,71 @@
 "Mutatnak figyelmeztetést, ha _mplayer, sox, composite vagy cnvert nem "
 "található, ha LiVES nem indul."
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "Figyelmeztess, ha az indításkor nem található _renderelési effekt."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Figyelmeztess, ha az indításkor nem találhatók _kódoló bővítmények."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Figyelmeztess, ha _kettőzött beállítás név kerül beírásra"
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Ha egy beállítás betöltődik, akkor figyelmeztess, ha a klipek hiányoznak a "
 "_kimenetekből."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Figyelmeztess, ha egy klipet használó kimenetet készülök bezárni."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Figyelmeztess, ha egy klipet használó kimenetet készülök törölni."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Figyelmeztess, ha egy képkockákat használó kimenetről akarok váltani."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 "Figyelmeztess, ha egy képkockákat használó kimenetet akarok megváltoztatni."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Figyelmeztess, ha egy hangot használó kimenetet akarok törölni."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Figyelmeztess, ha egy hangot használó kimenetről akarok váltani."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Figyelmeztess, ha egy hangot használó kimenetet akarok megváltoztatni."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr "Kimeneti hibák kijelzése a változtatások után."
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Figyelmeztess, ha egy elmentetlen kimenettel akarok kilépni a multitrack "
 "módból."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Figyelmeztess, ha a multitracknek nincs hangja, viszont egy kimenet hanggal "
 "be van töltve."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7732,118 +7908,105 @@
 "Figyelmeztess, ha a multitrack rendelkezik hanggal és a lejátszó nem \"jack"
 "\" vagy \"pulse audio\""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Üzenet megjelenítése a firewire eszközről való importálás után."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Figyelmeztetés yuv4mpeg adatfolyam megnyitása előtt (haladó)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "Figyelmeztetés helyszűkekor"
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr "Lemez takarítási figyelmeztetés megjelenítése az összeomlás után."
 
-#: src/preferences.c:4660
-#, fuzzy
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
-msgstr "Figyelmeztess, ha az indításkor nem találhatók _kódoló bővítmények."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Figyelmeztetések"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi szinkronizáció (midistart és midistop fájlok szükségesek)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Képkockák beillesztésénél/összefűzésénél:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Beillesztés _gyorsítása/lassítása"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Beillesztés újramintázása"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Xmms szüneteltetése a lejátszás alatt"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD eszköz           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Válassz CD meghajtót"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "A LiVES képes betölteni számokat erről a CD-ről"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "Alapértelmezett FPS        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "FPS lesz használva, ha nincs megadva más"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Új téma:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Témák"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Letöltés sávszélessége (Kb/mp)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "A LiVES-t \"configure --disable-OSC)\" nélkül kell beállítani az OMC "
 "használatához"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "OMC távvezérlés bekapcsolva"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP Port       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "OMC indítása program induláskor"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Adatfolyam/hálózat"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Jack átvitel"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7851,48 +8014,44 @@
 "A jack átvitel használatáshoz a LiVES-t a jack/transport.h és jack/jack "
 "opcióval kell beállítani"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Jack _átvitel beállításfájlja"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "A LiVES átvitelt vezérlő jack szerver neve"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "_Szerver indítása a LiVES indulásakor"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr "Jack átvitel _mester (indítás és leállítás)"
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr "Jack átvitel _kliens (indítás és leállítás)"
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr "Jack átvitel beállítások induló pozíciója"
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr "(Lásd még: Lejátszás -> Hang kövesse a videó arányt/irányt)"
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Jack hang"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "A jack hang használatához a LiVES-t a jack/jack.h opcióval kell beállítani"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -7900,85 +8059,72 @@
 "A zenelejátszót a lejátszó ablakban a \"jack\"-re kell beállítanod a jack "
 "hang használatához"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Jack _hangszerver konfig fájl"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "A hang jack szerverének neve"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr "Hang lejátszása az átvitel _szüneteltetésekor"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Jack integráció"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Események jelentése itt:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "_Joystick műveletek"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Joystick eszköz"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "A joystick eszköz, Pl.: /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Válassz joystick-ot"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "_MIDI műveletek"
 
-#: src/preferences.c:5498
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
+msgstr "_ALSA MIDI használata (ajánlott)"
+
+#: src/preferences.c:3987
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "ALSA MIDI port létrehozása, ahová más MIDI eszközöket lehet csatlakoztatni"
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
-msgstr "_ALSA MIDI használata (ajánlott)"
-
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "_raw MIDI használata"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Közvetlenül a MIDI eszközről olvass be"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_MIDI eszköz"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "A MIDI eszköz Pl.: /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Válassz MIDI eszközt"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "MIDI ellenőrzési _időköz"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -7986,25 +8132,24 @@
 "MIDI ellenőrzések száma a billentyűzet leütésének arányában. Lelassíthatja a "
 "lejátszást."
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "MIDI ismétlés"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Az olvasatlanok mennyisége a beolvasottak között."
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Figyelmeztetés: az érték túl magasra állítása lelassíthatja a lejátszást.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "MIDI/joystick gyorstalpaló"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8016,68 +8161,68 @@
 "lépéséhez.\n"
 "Nyomj 'OK'-t a folytatáshoz.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "A téma változások csak a LiVES következő indításakor lépnek érvénybe."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "A jack beállítások csak a LiVES következő indításakor lépnek érvénybe."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "A külső képkocka arány szinkronizálása %.8f fps-re.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Nem tudom azonosítani az OSC fogadót\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "FIGYELMEZTETÉS: Nem tudom elindítani az OSC szervert a %d UDP porton\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "OSC szerver elindítva a %d UDP porton\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Nem tudom elindítani az OSC/UDP szervert a %d porton \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Képkockák átméretezése 1-től %d-ig"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Képkockák átméretezése 1-től %d-ig"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Átméretezés"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Újramintázás/átméretezés"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "A videó hossza most %d képkocka.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8087,154 +8232,151 @@
 "\n"
 "Az új aránynak 0-nál nagyobbnak kell lennie\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Hang újramintázása"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES nem képes a kért módon újramintázni a hangot.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Hang újramintázása"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Hang újramintázva erre: %d Hz, %d csatorna, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Videó újramintázása %.8f fps-re..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Videó újramintázása %.3f fps-re..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Újrarendezés hiba!\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Újramintáz"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Hang újramintázása"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Csend beszúrása"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Új klip hang"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Külső klip beállítások"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Frekvencia (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Csatornák "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Minta méret "
+#: src/resample.c:1245 src/resample.c:1372
+#, fuzzy
+msgid "Channels"
+msgstr "    Csatornák "
+
+#: src/resample.c:1252
+#, fuzzy
+msgid "Sample Size "
+msgstr "    Minta méret "
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Digitálisan aláírt"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Aláíratlan"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Kicsi endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Nagy endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Jelenlegi"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Hang engedélyezése"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Frekvencia (Hz) "
-
-#: src/resample.c:1545
-msgid "    _Channels "
+#: src/resample.c:1372
+#, fuzzy
+msgid "_Channels"
 msgstr "    _Csatornák "
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Csatornák "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+#, fuzzy
+msgid "_Sample Size"
 msgstr "    _Minta méret "
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+#, fuzzy
+msgid "Sample Size"
 msgstr "    Minta méret "
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Új"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Másodpercenkénti képkockák (FPS) "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Maximális felvétel:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " óra  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " perc  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " másodperc  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Korlátlan"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "A felvétel kezdéséhez nyomj 'Ok'-t, vagy 'Mégse'-t a kilépéshez."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Lejátszás sebességének megváltoztatása"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Videó újramintázása"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8251,7 +8393,7 @@
 "Kérlek add meg a kívánt sebesség értéket\n"
 "_fps-ben"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8268,15 +8410,15 @@
 "Kérlek add meg az _újramintázott sebesség\n"
 "értéket fps-ben"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "VAGY add meg a kívánt klip hosszúságát _másodpercben"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "_Hang sebességének megváltoztatása, amennyire lehet"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8286,7 +8428,7 @@
 "A klip felgyorsítása hiányzó képkockákat eredményezhet.\n"
 "Biztosan meg szeretnéd változtatni a sebességet?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8296,58 +8438,49 @@
 "A klip felgyorsítása hiányzó hangokat eredményezhet.\n"
 "Biztosan meg szeretnéd változtatni a sebességet?\n"
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"A sebesség megváltoztatása néhány képkocka változását okozhatja a "
-"kimenetekben.\n"
-"Biztosan folytatni szeretnéd?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"A sebesség megváltoztatása a hang változását okozhatja a kimenetekben.\n"
-"Biztosan folytatni szeretnéd?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Sebesség módosítása"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "A lejátszás sebességének megváltoztatása %.3f fps-re, a hangot pedig %d Hz-"
 "re.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "A lejátszás sebességének megváltoztatása %.3f fps-re.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Videó újramintázása"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Vágólap-videó újramintázása"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Képkockák újrarendezése"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8357,20 +8490,20 @@
 "\n"
 "A LiVES nem képes újrarendezni a képkockákat."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Képkockák visszarendezése"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "újramintavételezési hiba..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8386,7 +8519,7 @@
 "Biztos vagy benne?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8398,12 +8531,12 @@
 "'Ok' a billentyűzet kiosztás alapértelmezettként való elmentéséhez\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Billentyűzet kiosztás mentése ide: %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8412,8 +8545,8 @@
 "\n"
 "Billentyűzet kiosztás %s frissítése..."
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -8421,17 +8554,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"Nem lehet írni a %s billentyűkiosztás fájlt\n"
-"Hiba kód %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Azonnali effekt alapértelmezéseinek mentése ide: %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8446,22 +8575,22 @@
 "fájlt\n"
 "Hiba kód %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Azonnali effekt alapértelmezéseinek betöltése innen: %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Generátor alapértelmezett méretének betöltése innen: %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Alapértelmezett billentyűzet kiosztás betöltése innen: %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8476,27 +8605,27 @@
 "fájlt\n"
 "Hiba kód %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Érvénytelen %d sor a %s-ben\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Érvénytelen %d kulcs a %s-ben\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8505,16 +8634,21 @@
 "A LiVES ezen verziója nem tudja mixelni a generátorokat/nem-generátorokat "
 "ugyanazzal a billentyűvel (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Túl sok effekt kötés van erre a gombra: %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "frissítés szükséges.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, fuzzy, c-format
+msgid "Loading data connection map from %s..."
+msgstr "Alapértelmezett billentyűzet kiosztás betöltése innen: %s..."
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8526,40 +8660,45 @@
 "Néhány effektet nem találok.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Nincs leírás"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Információ erről: %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Effektus név: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Bővítmény név: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Szerző: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Verzió: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Leírás: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8573,65 +8712,70 @@
 "ugyanazzal a billentyűvel.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES nem találja a %s effektet.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Azonnali effekt leképezés"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Billentyű elkapás"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Billentyű aktív"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Billentyű elkapás"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "Effekthez rendelt billentyű"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Minden effekt kitörlése"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Mód aktív"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Információ"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Paraméterek beállítása"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+#, fuzzy
+msgid "Set Connections"
+msgstr "Ki_jelölés"
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Törlés"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Effekt név:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Mentés alapértelmezett billentyűzet kiosztásként"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_Alapértelmezett billentyűzet kiosztás betöltése"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8683,11 +8827,6 @@
 msgid "none\n"
 msgstr "nincs\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d csatorna(k) %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8707,58 +8846,58 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "Automatikus biztonsági mentés"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Háttérzene"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Jelenlegi szám: %s (%d réteg)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Jelenlegi szám: Háttér hang\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Aktuális szám: %d réteg hang\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f mp.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Forrás: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Jobb gomb a tartalom menüért.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -8766,8 +8905,7 @@
 "Kijelöléshez kattints kétszer\n"
 "a blokkra."
 
-#: src/multitrack.c:2884
-#, fuzzy
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8775,24 +8913,16 @@
 "in the timeline by\n"
 "right or double clicking on it.\n"
 msgstr ""
-"\n"
-"\n"
-"Kérlek válassz egy blokkot\n"
-"az idővonalon úgy,\n"
-"hogy kétszer rákattintasz.\n"
 
-#: src/multitrack.c:2887
-#, fuzzy
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
 "No effect selected.\n"
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
-"Kattints duplán az effektre\n"
-"a szerkesztéséhez."
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8802,7 +8932,7 @@
 "\n"
 "Nincsenek klipek betöltve.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8812,7 +8942,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8826,12 +8956,12 @@
 "kell kijelölnöd a kompozitorok\n"
 "alkalmazásához.\n"
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f mp-től %.2f mp-ig.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8839,183 +8969,186 @@
 "Egyszerű kattintás az idővonalra\n"
 "a képkocka kiválasztásához.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+"Csak egy klikk, és már húzhatod\n"
+"is alul az idővonalon"
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ", hogy kijelölj egy idő területet.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Kijelölt klip"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "_Kezdő és végpont meghatározása"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr "_Szerkesztés/kódolás a klip szerkesztőben"
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "_Klip információk megjelenítése"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "_Klip bezárása"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Keverő (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "Egy kattintás az idővonalon"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "egy képkocka kijelöléséhez."
 
-#: src/multitrack.c:3822
-#, fuzzy
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
-msgstr "Dupla kattintás az idővonalon"
+msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "egy blokk kijelöléslhez."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "A klipek kiemelhetők/mozgathatók"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "az idővonalon."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "Egér mód most: Mozgatás"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "a klipek ide-oda mozgathatók."
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "Egér mód most: Kijelöl."
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "Húzd az egérrel az idővonalon"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "számok és az idő kijelöléséhez."
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "_Illesztési mód: Normál"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Egér mód: mozgatás"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Egér mód: kijelölés"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "_Gravitáció/súlyosság: Normál"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "_Gravitáció/súlyosság: Bal"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "_Gravitáció/súlyosság: Jobb"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Az _első hézag(ok) bezárása a kijelöltekben"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Hézagok bezárása"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Tömb mozgatása"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Hang tömb mozgatása"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Blokk törlése"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Hang blokk törlése"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Megosztott számok"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Megosztott tömbök"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Alkalmaz %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "%s törlése"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Tömb beszúrása"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Beszúrás"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Hang blokk beszúrása"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Effekt utasítás változás"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "aláíratlan "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "aláírt "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "nagy endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "kicsi endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9024,15 +9157,15 @@
 "Multitrack értékek beálítva erre: %.3f fps, képkocka méret %d x %d, hang "
 "csatornák %d, hang arány %d, hang minta méret %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "érvénytelen esemény lista. Sikertelen.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "esemény lista érvénytelen fps-t tartalmaz. Sikertelen.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -9047,7 +9180,7 @@
 "zárd be az aktuális beállítást,\n"
 "majd töltsd be az újat a fájl menüből.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -9058,334 +9191,362 @@
 "Ez egy LiVES számára érvénytelen hang (%d) csatorna számot tartalmaz.\n"
 "Nem lehet betölteni.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr "Kimenet törölve.\n"
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Klipek"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr "Be/ki"
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr "FX halom"
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Paraméterek."
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Megnyitás..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "_Kijelölt fájl megnyitása..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importálás innen: _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importálás innen: _dvd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importálás innen: _vcd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Importálás eszközről"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "_Kijelölt klip bezárása"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Kimenet mentése mint..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Szerkezet betöltése"
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Törlés/kimenet törlése..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 "_Szélesség, magasság és hang értékek figyelmen kívűl hagyása az elmentett "
 "kimenetben"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_KLIP SZERKESZTŐ"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "_Kiválasztott klip kezdő/végpontjának meghatározása"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Kijelölt klip beillesztése"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_Kijelölt hang beillesztése"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Kijelölt tömb törlése"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_Ugrás az előző tömb határra"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_Ugrás a következő tömb határra"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "_Kijelölések eltávolítása az idővonalról"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Kijelölési limit mellőzése beillesztéskor"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "_Lejátszás innen: Idővonal pozíció"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Effektek mozgatása a tömbökkel"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Kijelölt effekt megtekintése/_szerkesztése"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Kijelölt effekt eltávolítása"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Effekt alkalmazása a _tömbre..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Effekt alkalmazása a _területre..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Sávok"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+#, fuzzy
+msgid "Rename current track"
+msgstr "_Jelenlegi sáv kiválasztása"
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "_Háttér zene készítése az aktuális számból"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Videó sáv hozzáadás _hátra"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Videó sáv hozzáadás _előre"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "_Sáv szétválasztása a kurzornál"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_Kijelölt videó sávok szétválasztása"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Hézag beillesztése a kijelölt számba"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Hézag beszúrása a kijelölt számba/kiválasztott időnél"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Minden _hézag bezárása a kijelöltekben"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Ki_jelölés"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Jelenlegi sáv kiválasztása"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "_Minden videó kijelölése"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "_A _nem videók kijelölése"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Teljes _idő kijelölése"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Kjelölés a _zero ponttól"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Kijelölés a _záró pontig"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Másolás..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Időkód a terület indításhoz"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Időkód a terület végéhez"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "_Terület indítás az időkódhoz"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "_Terület vég az időkódhoz"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Szélességi, magassági és hang értékek módosítása..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Elkészítés"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Mindet új klipbe"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "_video elkészítése"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "_hang átalakítása"
 
-#: src/multitrack.c:6386
-#, fuzzy
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
-msgstr "_Hang visszaállítása"
+msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "_Hang visszaállítása"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Nézet"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Tömb _be/ki pontjai"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Effektek - jelenlegi"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "_Hang paraméterek"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "_Háttér hang sáv mutatása"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Apró nézet"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Maximális megjelenített sáv..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Görgetés a lejátszás követéséhez"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Közép a kurzoron"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Nagyítás"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Kicsinyítés"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "Multitrack _részletek"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "_Esemény ablak"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "_Folyamat ablak (csak a kijelölt ideig)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_KÉPKOCKA események megjelenítése"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Multitrack billentyűk mutatása"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Egér mód:  _Mozgatás"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Egér mód: _Kijelölés"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "Illesztési mód: _Normál"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Beillesztés _hanggal"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 "Kiválaszthatod, hogy a videók a hangjukkal együtt legyenek beillesztve/"
 "mozgatva, vagy azok nélkül"
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Beillesztés _hanggal"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "_Átfedés kiválasztása"
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
@@ -9393,103 +9554,83 @@
 "Beállíthatod, hogy az kijelölt idővonalbilincsek átfedést biztosítsanak a "
 "kijelölt számok között vagy sem"
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "_Átfedés kiválasztása"
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Kitöltött nézet (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Apró nézet (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "_Gravitáció/súlyosság: _Normál"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "_Gravitáció/súlyosság: _Bal"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "_Gravitáció/súlyosság: _Jobb"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Klipek"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr "Be/ki"
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr "FX halom"
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Paraméterek."
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Idő"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Tartalom törlése"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "_Következő tartalom"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "_Előző tartalom"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "_Lejátszás visszafelé  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Sebesség  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Kezdőpont lefixálása az idővonalon"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "_Indítási pont"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Kezdőpont lefixálása az idővonalon"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Kezdő képkocka"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "A végpont megadása az idővonalon"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "Horgony _vége"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "A végpont megadása az idővonalon"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Utolsó képkocka"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9499,91 +9640,91 @@
 "==============================\n"
 "Klip szerkesztő módba váltott\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Idővonal (másodpercek)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Háttér hang"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " %d hang réteg"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "Hang információinak megjelenítése/eérejtése"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "%d hang réteg"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (réteg %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Szám kiválasztása"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Hang megjelenítése/elrejtése"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Videó %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (réteg %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Kijelölt effekt"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_Nézet/effekt szerkesztése"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Effekt megtekintése"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Effekt törlése"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "Nem lehet beszúrni után ez a hatás"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Ez a hatás nem lehet mozgatni"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d-tól %d-ig kijelölt  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f mp."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d képkockák"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9593,19 +9734,19 @@
 "==============================\n"
 "Váltás Multitrack módra\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr "Húzd oda az idő csúszkát ahol"
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "be szeretnéd állítani az effekt paramétereit"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Állítsd be az értékeket, majd nyomd meg az \"Alkalmaz\" gombot\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9615,46 +9756,46 @@
 "a paraméterek be lettek állítva.\n"
 "A Nodes törölhető."
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "Az effektnek nincsenek értékei.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s kimenet"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "%d réteg"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "zene szám"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s és %s között"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "_Előző szűrő térkép"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Beszúrás _előtte:"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Beszúrás _utána"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "_Következő szűrő térkép"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9666,7 +9807,7 @@
 "Nincs effekt a jelenlegi klipnél,\n"
 "és időnél.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -9676,7 +9817,7 @@
 "bárhol ahhoz, hogy\n"
 "alkalmazhasd a kijelölt területrre."
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -9686,7 +9827,7 @@
 "bárhol ahhoz, hogy\n"
 "alkalmazhasd a kijelölt területrre."
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -9694,64 +9835,60 @@
 "Az effektek elhúzhatók\n"
 "a blokkokon az egész idővonalon."
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES :Kijelölt tömb/képkocka"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Tömb kiválasztása"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Tömb szétválasztása itt"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "_Effektek listázása itt"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Igazítás %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Tömb törlése"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Beszúrás ide"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Hang beszúrása ide"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Beillesztett hézag a kijelölt számokban innentől: %.4f , idáig: %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Beillesztett hézag itt: %s innentől: %4.f , idáig: %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "%s vissza\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "%s újra\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Multitrack részletek"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9759,56 +9896,62 @@
 "\n"
 " (változó)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "%s sáv"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "%s és %s sávok"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "kijelölt sávok"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Hozzáadva %s %s eddig %s innen: %.4f eddig %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "%s effekt hozzáadása  a%s sávhoz innentől: %.4f idáig %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, fuzzy, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr "Hozzáadva %s %s eddig %s innen: %.4f eddig %.4f\n"
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderelt %d képkockák az új kliphez.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Takarítás..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Szünet"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Szünet (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Nyomd meg az 'm'-et a lejátszás alatt"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "hogy kijelölést tehess az idővonalra"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9817,7 +9960,7 @@
 "Beillesztett %.4f hang ide: %.4f a %s klipből háttér hangnak a %.4f időtől, "
 "idáig: %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -9825,7 +9968,7 @@
 "Beillesztett %d képkockák ide:%d, %s klipből, a %s sávba a %.4f-től a %.4f-"
 "ig\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9834,7 +9977,7 @@
 "%.3f -től %.3f -ig\n"
 "kijelölve.\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9842,12 +9985,12 @@
 "egy vagy több sáv kiválasztása\n"
 "egy terület létrehozásához.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d videó sávok kijelölve.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9855,7 +9998,7 @@
 "Dupla katt az idővonalo\n"
 "a kijelölés megszüntetéséhez."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9863,7 +10006,7 @@
 "Kattints az effektre a\n"
 "kijelöléséhez."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9871,7 +10014,7 @@
 "Kattints duplán az effektre\n"
 "a szerkesztéséhez."
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9879,7 +10022,7 @@
 "Jobb egér gomb megnyomásával\n"
 "a context menübe lépsz.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -9887,33 +10030,21 @@
 "Az effekt utasítások megváltoztathatóak a\n"
 "SZŰRŐ TÉRKÉPEKNÉL"
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "vagy a BEILLESZTÉS UTÁNA gombot a mozgatásához."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-"Csak egy klikk, és már húzhatod\n"
-"is alul az idővonalon"
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ", hogy kijelölj egy idő területet.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "Kattints egy másik effektre,"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -9921,46 +10052,46 @@
 "és a kiválasztott\n"
 "beillesztésre kerül"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "ez után.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "ez előtt.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "%s effekt paraméterértékeinek eltávolítása a %.4f időnél\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Paraméter értékek beállításai erre: %s %s a %s-en %.4f-kor\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Autoújratöltés minden egyes alkalommal"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Kimenet mentése mint:%s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "klipek és képkockák"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "klipek"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "képkockák"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9968,7 +10099,7 @@
 "\n"
 "Kimenet automatikus újratöltése.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9979,11 +10110,11 @@
 "Néhány %s hiányzik a(z) %s kimenetből\n"
 "Ezért nem lehet megfelelően betölteni.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "automatikus biztonsági mentés"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9992,43 +10123,43 @@
 "\n"
 "Nem lehet betölteni a %s kimeneti fájlt\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Kimenet betöltése innen: %s...."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d események vannak...feldolgozás..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Folyamat lista ellenőrzése és újratöltése"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d hibákat találtam.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps beállítása erre: %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack hangkeverő"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Értékek visszaállítása"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Keverő bezárása"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10036,189 +10167,179 @@
 "_Háttér hang\n"
 "és szűrő hangértékek felcserélése"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "Háttér hang és hangréteg értékek megadása, amely összesen 1.0 lehet"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "_Gang hang réteg"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Minden hang réteg értékének beállítása ugyanarra az értékre"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "Jack szerver elindítva\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Nem tudok csatlakozni a JACK szerverre\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Jack hang alrendszer elindítva.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Jack hang olvasó elindítva.\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
-#, fuzzy
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 "Falling back to sox audio player.\n"
 "You can change this in Preferences/Playback.\n"
 msgstr ""
-"A multitrack hang előnézet csak a \"jack\"\n"
-"illetve \"pulse audio\" lejátszókkal lehetséges.\n"
-"Ezt beállíthatod az Eszközök|Beállítások|Lejátszás menüben."
 
-#: src/pulse.c:89
-#, fuzzy
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 "Falling back to mplayer audio player.\n"
 "You can change this in Preferences/Playback.\n"
 msgstr ""
-"A multitrack hang előnézet csak a \"jack\"\n"
-"illetve \"pulse audio\" lejátszókkal lehetséges.\n"
-"Ezt beállíthatod az Eszközök|Beállítások|Lejátszás menüben."
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Nem tudok csatlakozni a JACK szerverre\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - Válassz egy lejátszót"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "összefogatlan"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "összefogott"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Joystick műveletet észleltem innen: %s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr "ALSA seq port létrehozása..."
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "MIDI műveletet észleltem innnen: %s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "adat"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "sebesség"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "feljegyzés"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "érték"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "állapot"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "változtatható"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "változatok."
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "%d MIDI csat. feljegyzés be"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "%d MIDI csat. feljegyzés ki"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "%d MIDI csat. %d vezérlő"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "%d MIDI csat. csúcs görbe"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "%d MIDI csat pgm változó"
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "%d Joystick gomb"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "%d Joystick irány"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "érték határ"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ eltolás1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* skála"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ eltolás2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10226,205 +10347,213 @@
 "\n"
 "A bejegyzések törléséhez nyomd meg az 'OK' gombot\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMC oktató"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "_különbözők törlése"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Mind törlése"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Videó visszajátszás indítása"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Videó visszajátszás leállítása"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "<clipnum> klip kiválasztása"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Előtérben lévő klip váltása az n-edikre"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Lejátszás előre"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Videó lejátszása előrefelé"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Lejátszás visszafelé"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Videó lejátszása visszafelé"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Lejátszási irány megfordítása"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Videó visszajátszás irányának megfordítása"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Videó lejátszása gyorsabban"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Videó lejátszása egy kicsivel gyorsabb sebességgel"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Videó lejátszása lassabban"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Videó lejátszása egy kicsivel lassabb tempóban"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "Videó megfagyasztása"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 "Megállítja a videót egy adott ponton, vagy ha már áll, akkor újraindítja"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "Videó sebességének beállítása erre: <fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 "Az előtérben lévő videó sebességének beállítása a megadott értékre <float "
 "fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Felvétel indítása"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Felvétel megállítása"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "Váltás felvételi állásba"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "Előtérben lévő videók felcserélése a háttérben lévőkkel"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Effekt gombok alaphelyzetbe állítása"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "Minden effekt kikapcsolása."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "<key> effekt gomb engedélyezése"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "<key> effekt gomb tiltása"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "Váltás erre: <key>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Értékek beállítása: <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "<key> effekt gomb értékének beállítása: <value>."
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "előtér váltás a következő klipnél"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "előtér váltás az előző klipnél"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Videó sebességének beállítása erre az arányra: <fps_ratio>"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Előtérben lévő videó sebesség arányának beállítása erre: <float fps_ratio>"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "<clipnum> újra"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Előtérben lévő klip válltása az n-edik klipre, és a képkockák számának "
 "alapértékre való állítása"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr "<key> effekt gomb következő lehetősége"
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "<key> effekt gomb elöző lehetősége"
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "klip sorszáma"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps (másodpercenkénti képkockák száma)"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "gomb (billentyű)"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pszám"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_arány"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Eszközlista mentése ebbe a fájlba: %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10437,7 +10566,7 @@
 "%s\n"
 "fájl hiba\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10450,12 +10579,12 @@
 "Érvénytelen verzió itt:\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Eszközlista betöltése innen: %s..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10480,6 +10609,10 @@
 msgid "Opened device %s\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid " _Top  "
+#~ msgstr "_Fent"
+
 #~ msgid "180 _degrees             "
 #~ msgstr "180 _fok             "
 
@@ -10673,7 +10806,7 @@
 #~ msgstr "Fokozatosan halkuló hang"
 
 #, fuzzy
-#~ msgid "Fade video in or out"
+#~ msgid "Fade video to or from color"
 #~ msgstr "Fokozatosan halkuló hang"
 
 #~ msgid "Fade"
@@ -11158,9 +11291,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "_A bal felső a vágólap"
 
-#~ msgid "_Top"
-#~ msgstr "_Fent"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "_Függőleges szegmensek"
 
@@ -11421,125 +11551,138 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Először be kell állítanod a CD meghajtót a beállításokban."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "A LiVES nem talál a kérésednek megfelelő számokat."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Próbáld meg újra, más értékekkel."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$bővítőmodul_név nem sikerült:"
 
 #~ msgid "$error"
 #~ msgstr "$hiba"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Nem tudok csatlakozni a JACK szerverre\n"
+#~ msgid "Default value:    "
+#~ msgstr "Alapértelmezett érték:    "
 
-#~ msgid "Red"
-#~ msgstr "Vörös"
+#~ msgid "Minimum value: "
+#~ msgstr "Minimum érték: "
 
-#~ msgid "error.\n"
-#~ msgstr "hiba.\n"
+#~ msgid "Maximum value: "
+#~ msgstr "Maximum érték: "
 
-#~ msgid "Plugin timed out on message %s\n"
-#~ msgstr "Bővítmény időtullépés. Üzenet: %s\n"
+#~ msgid "Select File"
+#~ msgstr "Fájl kiválasztása"
 
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "nem lehet olvasni ezt a fájlt\n"
-#~ "%s\n"
-#~ "Hiba kód: %d\n"
+#~ msgid "LiVES: Select file"
+#~ msgstr "LiVES: Fájl kiválasztása"
 
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Nem lehet olvasni a\n"
-#~ "%s fájlt\n"
-#~ "Hiba kód %d\n"
+#~ msgid "LiVES: Choose joystick device"
+#~ msgstr "LiVES: Válassz joystick-ot"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to read sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nem leht olvasni a\n"
-#~ "%s fájlt\n"
-#~ "Hiba kód %d\n"
+#~ msgid "LiVES: Choose MIDI device"
+#~ msgstr "LiVES: Válassz MIDI eszközt"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "A LiVES nem tud ebbe a fájlba írni:\n"
-#~ "%s\n"
-#~ "Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
+#~ msgid "New audio: %d Hz %d channel(s) %d bps\n"
+#~ msgstr "Új hang: %d Hz %d csatorna %d bps\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "\n"
-#~ "Unable to write script file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
+#~ "Delete %d layout(s)...are you sure ?\n"
 #~ msgstr ""
 #~ "\n"
-#~ "\n"
-#~ "Nem lehet írni a parancsfájlt\n"
-#~ "%s\n"
-#~ "Hiba kód %d\n"
+#~ "%d kimenet(ek) törlése...biztos vagy benne?\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write filter defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nem lehet írni a %s\n"
-#~ "fájlt\n"
-#~ "Hiba kód %d\n"
+#~ msgid "inserting %d extra frame(s) before merge\n"
+#~ msgstr "%d extra képkockák beillesztése az összeolvasztás elött\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nem lehet írni a %s\n"
-#~ "fájlt\n"
-#~ "Hiba kód %d\n"
+#~ msgid "now inserting %d extra frame(s)\n"
+#~ msgstr "most beillesztem a %d extra képkocká(kat)t\n"
 
-#~ msgid "No clips were recovered for set (%s).\n"
-#~ msgstr "Nincsenek klipek a beállításban (%s).\n"
+#~ msgid "%s %d Hz %d channel(s) %d bps\n"
+#~ msgstr "%s %d Hz %d csatorna(k) %d bps\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "No effect selected.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nincs kijelölve effekt.\n"
+#~ msgid "    _Frame"
+#~ msgstr "    _Képkocka"
+
+#~ msgid "Effect -"
+#~ msgstr "Effekt -"
+
+#~ msgid "Transition -"
+#~ msgstr "Átmenet -"
+
+#~ msgid "Generator -"
+#~ msgstr "Generátor -"
+
+#~ msgid "Tool -"
+#~ msgstr "Eszköz -"
+
+#~ msgid "Utility -"
+#~ msgstr "Segédprogramok -"
+
+#~ msgid "      Encoder                  "
+#~ msgstr "      Kódoló                  "
+
+#~ msgid "         Channels "
+#~ msgstr "         Csatornák "
+
+#~ msgid "        Sample Size "
+#~ msgstr "        Minta méret "
+
+#~ msgid "%d Hz %d channel(s) %d bps\n"
+#~ msgstr "%d Hz %d csatorna(k) %d bps\n"
+
+#~ msgid "Show details"
+#~ msgstr "Részletek megjelenítése"
+
+#~ msgid "The name of the jack server which can control LiVES transport"
+#~ msgstr "A LiVES átvitelt vezérlő jack szerver neve"
+
+#~ msgid "The name of the jack server for audio"
+#~ msgstr "A hang jack szerverének neve"
+
+#~ msgid "selection."
+#~ msgstr "válogatás."
+
+#~ msgid "LiVES: - Play Random Music"
+#~ msgstr "LiVES: - Véletlenszerű zene lejátszás"
+
+#~ msgid "Number of Tracks Requested:    "
+#~ msgstr "Kért számok mennyisége:    "
+
+#~ msgid "Directory:"
+#~ msgstr "Könyvtár:"
+
+#~ msgid "Include subdirectories"
+#~ msgstr "Almappákat is beleértve"
+
+#~ msgid "Minimum File Size (MB)         "
+#~ msgstr "Minimum fájl méret (MB)         "
+
+#~ msgid "Maximum File Size (MB)        "
+#~ msgstr "Maximum fájl méret (MB)        "
+
+#~ msgid "Selecting tracks"
+#~ msgstr "Számok kiválasztása"
+
+#~ msgid "Play _Music Using xmms..."
+#~ msgstr "_Zene lejátszása az xmms-sel..."
+
+#~ msgid "Random Music _Using xmms..."
+#~ msgstr "Véletlenszerű zene az _xmms-sel..."
+
+#~ msgid "Stop xmms _Playing"
+#~ msgstr "xmms _lejátszás leállítása"
+
+#~ msgid "Pause xmms during audio playback"
+#~ msgstr "Xmms szüneteltetése a lejátszás alatt"
+
+#~ msgid "LiVES could not find enough tracks fitting your request."
+#~ msgstr "A LiVES nem talál a kérésednek megfelelő számokat."
+
+#~ msgid "Try again with different values."
+#~ msgstr "Próbáld meg újra, más értékekkel."
+
+#~ msgid "Transition in"
+#~ msgstr "Átmenet be"
+
+#~ msgid "Transition out"
+#~ msgstr "Átmenet ki"
+
+#~ msgid "Force single monitor mode"
+#~ msgstr "Egy monitoros mód kikényszerítése"

LiVES-1.6.1.tar.bz2/po/it.po -> LiVES-2.0.3.tar.bz2/po/it.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-01-13 19:56+0000\n"
-"Last-Translator: Guybrush88 <Unknown>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-14 13:17+0000\n"
-"X-Generator: Launchpad (build 14664)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Grazie. Dovrebbe essere possibile un recupero se riavvii LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "Durante la segnalazione di crash, fornisci informazioni sul tuo sistema "
 "operativo, la distribuzione e la versione di LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "e qualsiasi altra informazione mostrata qua sotto:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "informazioni.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Preservazione del set in corso.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Ridimensionamento"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Ridimensiona tutti i fotogrammi"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Qualsiasi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "consigliato"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "disabilitato !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Il layout corrente**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Integrato"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Personalizzato"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Test"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...rilevato..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON RILEVATO..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...rilevato..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON RILEVATO..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...rilevato...\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON RILEVATO...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...rilevato..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON RILEVATO..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...rilevato..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON RILEVATO..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "audio pulse...rilevato..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "audio pulse...NON RILEVATO..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...rilevato..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NON RILEVATO..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...rilevato..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON RILEVATO..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...rilevato..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON RILEVATO..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,22 +276,48 @@
 "\n"
 "Il gestore delle finestre riporta come \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numero di monitor rilevati: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "piccolo endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "grosso endian"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "La directory temporanea è %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -264,15 +327,15 @@
 "o a jack o pulse audio.\n"
 "Molte funzioni audio non saranno disponibili.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilato con il supporto jack, bene !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilato con il supporto pulse audio, magnifico !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -281,7 +344,7 @@
 "Benvenuti in LiVES versione %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -290,86 +353,86 @@
 "\n"
 "La sintassi dell'avvio è: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Dove: filename è il nome di un file multimediale o un file di backup.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : tempo di avvio di filename in secondi\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : numero massimo di fotogrammi da aprire\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts può essere:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : mostra questo testo di aiuto ed esce\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : carica automaticamente il nome set del set clip\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : non caricare nessun set all'avvio\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : forza il non-caricamento del recupero da un crash\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : forza il caricamento del recupero da un crash\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : non mostrare la gui\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : avvia in modalità editor clip\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : avvia in modalità multi-traccia\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : avvia l'ascoltatore OSC sulla porta UDP <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : non avviare l'ascoltatore OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -377,15 +440,15 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -396,31 +459,31 @@
 "trasporto jack, 8 = metti in pausa l'audio quando il video è in pausa, 16 = "
 "avvia il server audio jack] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " oppure sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-mappa dispositivo <mapname>          : carica automaticamente la mappa del "
 "dispositivo\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : prova a risolvere dei crash\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Avviamento della GUI in corso..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -428,28 +491,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Il tema che hai richiesto non è stato trovato. Per piacere assicurati di "
-"avere i temi installati in\n"
-"%s/%s.\n"
-"(Probabilmente devi cambiare il valore di <prefix_dir> nel tuo file ~/."
-"lives)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES non è stato in grado di scrivere un piccolo file in /tmp\n"
-"Per piacere assicurati di avere l'accesso di scrittura in /tmp e prova "
-"ancora.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -463,47 +516,36 @@
 "Per piacere riguarda il file LEGGIMI che è arrivato con questo pacchetto\n"
 "prima di avviare LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES non è stato in grado di leggere dal suo file di configurazione\n"
-"%s/.lives\n"
-"\n"
-"Per favore controlla i permessi file di questo file e prova ancora.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES non è stato in grado di scrivere nel suo file di configurazione\n"
-"%s/.lives\n"
-"\n"
-"Per piacere controlla i permessi file per questo file e directory\n"
-"e prova ancora.\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -513,7 +555,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -531,7 +573,7 @@
 "\n"
 "Grazie.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -541,7 +583,14 @@
 "LiVES attualmente richiede o 'mplayer' o 'sox' per funzionare. Per piacere "
 "installa uno o l'altro di questi, e prova ancora.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -551,7 +600,7 @@
 "LiVES non è stato in grado di trovare 'mplayer'. Dovresti installare mplayer "
 "per utilizzare LiVES in maniera più completa.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -561,7 +610,7 @@
 "LiVES non è stato in grado di trovare 'convert'. Dovresti installare convert "
 "e image-magick se vuoi usare effetti renderizzati.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -571,7 +620,7 @@
 "LiVES non è stato in grado di trovare 'composite'. Dovresti installare "
 "composite e image-magick se vuoi utilizzare la funzione di fusione.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -581,7 +630,7 @@
 "LiVES non è stato in grado di trovare 'sox'. Alcune funzioni audio "
 "potrebbero non funzionare. Dovresti installare 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -589,68 +638,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES non è stato di trovare alcun plugin codificatori.\n"
-"Per piacere controlla di averli installati correttamente in\n"
-"%s%s%s/\n"
-"Non sarai in grado di 'Salvare' senza di loro.\n"
-"Dovresti aver bisogno di cambiare il valore di <lib_dir> in ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Autocaricamento del set %s in corso..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Lettore audio %s non valido\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Senza titolo%d> %dx%d : %d fotogrammi %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? fotogrammi ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d fotogrammi %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nessun File>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -658,35 +701,35 @@
 "LiVES non è stato in grado di catturare questa immagine\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Chiuso il file %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Annulla"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Ripeti"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Audio Sinistro"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Audio Destro"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -700,26 +743,11 @@
 "impostato su mplayer.\n"
 "Per piacere regola le opzioni di riproduzione in Preferenze e prova ancora.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Finestra Di Riproduzione"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Finestra Di Riproduzione"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -729,7 +757,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -739,7 +767,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -750,7 +778,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -759,11 +787,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Il nome della directory è troppo lungo."
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -771,7 +799,7 @@
 "LiVES HA FALLITO L'AVVIO DEL TUO LETTORE AUDIO SELEZIONATO !\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -781,7 +809,7 @@
 "\n"
 "L'AUDIO PULSE è consigliato per la maggior parte degli utenti"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -790,7 +818,7 @@
 "pulse.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -800,11 +828,11 @@
 "Se stato avvisato di installare pulse audio pirma di lanciare LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "L'audio JACK è consigliato per gli utenti avanzati"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -813,7 +841,7 @@
 "jack.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -823,7 +851,7 @@
 "aviare LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -835,11 +863,11 @@
 "altro lettore audio.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX può essere utilizzato se nessuno dei lettori precedenti funziona, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -847,7 +875,7 @@
 "ma alcune funzioni audio saranno disabilitate.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -857,7 +885,7 @@
 "Faresti meglio ad installarlo prima di avviare LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -865,132 +893,140 @@
 "Il lettore audio MPLAYER è consigliato solamente per ragioni di test.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Scegli un lettore audio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Utilizza il lettore audio _pulse"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Utilizza lettore audio _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Utilizza il lettore audio _sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Utilizza il lettore audio _mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Successivo"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Saltato"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Superato"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Risoluzione problemi"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "Adesso LiVES eseguirà alcuni testi di base sulla configurazione\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -998,97 +1034,97 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Lascia che LiVES imposti l'estensione del _file"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Applica Deinterlacciamento"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Se questo viene impostato, i fotogrammi verranno deinterlacciati appena "
 "vengono importati."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clicca qui per vedere in An_teprima qualsiasi file video, immagine o audio"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clicca qui per vedere in _Anteprima qualsiasi file audio selezionato"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Clicca qui per vedere in A_nteprima il video"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES - Elaborazione in corso..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1102,8 +1138,8 @@
 "\n"
 "Ricordati di disattivare gli effetti (ctrl-0) dopo !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1111,105 +1147,114 @@
 "\n"
 "Per Piacere Attendi"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Mostra dettagli"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Abbastanza"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Anteprima"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Dimensione fotogramma"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Dimensione file"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Dimensione byte"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Tempo totale"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Fotogrammi"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eventi"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Valore/dimensione"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Audio destro"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opzioni di codifica"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Mantieni le _mie impostazioni"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Utilizza impostazioni _raccomandate"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1217,75 +1262,75 @@
 "_Non mostrare più questo avviso\n"
 "(può essere riattivato da Preferenze/Avvisi)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Mostra _Dettagli"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "Chiudi _finestra"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Salva nel file"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserisci"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Numero di volte da inserire"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Inserisci per adattare all'audio"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Inserisci _prima della selezione"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Inserisci appunti prima dei fotogrammi selezionati"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Inserisci _dopo la selezione"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Inserisci gli appunti dopo i fotogrammi selezionati"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Inserisci _con suono"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Inserisci sen_za suono"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Apri Selezione"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Tempo di avvio della selezione (in secondi)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Numero di fotogrammi da aprire"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
+
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Apri Posizione"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1302,7 +1347,7 @@
 "Flussi\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1311,47 +1356,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Non inviare informazioni sulla larghezza della banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Prova questa impostazione se stai avendo problemi ad ottenere un flusso"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Rinomina Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Inserisci Nome Set"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Scegli una Directory Di Lavoro"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1363,7 +1424,7 @@
 "Per piacere inserisci il nome set che vuoi usare.\n"
 "LiVES ti ricorderà di salvare il set clip più tardi quando provi ad uscire.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1372,7 +1433,7 @@
 "clip.\n"
 "Questo sarà anche usato per il nome del progetto.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1383,244 +1444,200 @@
 "l'installazione iniziale così potrai ottenere il maggior numero di cose da "
 "questa applicazione.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"Prima di tutto devi scegliere una directory di lavoro per LiVES.\n"
-"Questa dovrebbe essere una directory con molto spazio del disco "
-"disponibile.\n"
-"Attenzione, su molti sistemi, /tmp è svuotata allo spegnimento, per cui non "
-"è consigliabile crearla in /tmp.\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Rinomina Clip"
 
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Inserisci Nome Set"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Scegli una Directory Di Lavoro"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nuovo nome "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Nome set "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avanzate"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Carica Traccia CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Seleziona Titolo/Capitolo DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Seleziona Titolo VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Cambia Il Numero Massimo Di Tracce Visibili"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Traccia da caricare (da %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Titolo DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Titolo VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Numero massimo di tracce da mostrare"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Device: /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capitolo  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "ID audio  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Formato output"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Aumenta la dissolvenza dell'audio"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- diminuisci la dissolvenza dell'audio"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Aumenta la dissolvenza oltre  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "primo"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Diminuisci dissolvenza oltre  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "ultimo"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "secondi."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "selezione."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Riproduci Musica Casuale"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Numero di Tracce Richieste:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Directory:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Includi sotto-directory"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Dimensione Minima File (in MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Dimensione Massima File (in MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "selezione"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Commenti File (facoltativi)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Titolo/Nome : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autore/Artista : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Commenti : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: scegli una directory"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: scegli un file"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Annulla/Scarta/Salva"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1630,7 +1647,7 @@
 "Il layout attuale non è stato salvato.\n"
 "Cosa vuoi fare ?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1640,7 +1657,7 @@
 "Il layout attuale è stato modificato dall'ultimo salvataggio.\n"
 "Cosa vuoi fare ?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1650,7 +1667,7 @@
 "Il clip attuale può essere salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1658,7 +1675,7 @@
 "Il clip attuale non è stato salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1666,7 +1683,7 @@
 "Il layout attuale non è stato salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1674,7 +1691,7 @@
 "Il layout corrente non è cambiato dall'ultimo salvataggio.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1682,7 +1699,7 @@
 "Il layout corrente contiene frame generati e non può essere mantenuto.\n"
 "Potresti volere renderizzarlo prima di uscire dalla modalità multi-traccia.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1692,43 +1709,43 @@
 "Il layout corrente contiene frame generati e non può essere mantenuto.\n"
 "Cosa desideri fare ?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Nome set clip"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "Ricarica _automaticamente la prossima volta"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Cancella layout"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignora cambiamenti"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Elimina set clip"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Elimina layout"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Salva layout"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Salva set clip"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recuperare il layout ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1738,57 +1755,57 @@
 "LiVES ha riconosciuto un layout multi-traccia da una sessione precedente.\n"
 "Vuoi provare a recuperarlo ?\n"
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Salvataggio in corso come set %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Seleziona File"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1796,11 +1813,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Questo file"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1808,7 +1825,7 @@
 ",\n"
 " - incluso il layout corrente - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1823,7 +1840,7 @@
 "\n"
 "Chiuderlo davvero ?"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1838,14 +1855,14 @@
 "\n"
 "Chiuderlo davvero ?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1853,7 +1870,7 @@
 "\n"
 "File progetto non valido.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1874,33 +1891,33 @@
 "poi File|Chiudi/Salva tutti i Clip e fornire un nuovo nome set o scartarlo.\n"
 "Appena hai fatto ciò, sarai in grado di importare il nuovo progetto.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importazione del progetto %s in corso come set %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importazione del progetto in corso"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Esportazione del progetto %s in corso..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Esportazione del progetto in corso"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Ripristina file .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Crea un backup come file .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Ripristina file .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1912,92 +1929,92 @@
 "Il set sarà eliminato dal disco.\n"
 "Sei sicuro ?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Eliminazione del set in corso..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Eliminazione del set in corso"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Il set %s è stato eliminato definitivamente dal disco.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Inserisci Silenzio"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Disfacendo"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Audio in ripristino ..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Pulizia delle immagini dei fotogrammi in corso"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Eliminazione dei fotogrammi in eccesso in corso"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "La lunghezza del video è adesso di %d fotogrammi a %.3f fotogrammi al "
 "secondo.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Gli appunti sono stati ricampionati a %d fotogrammi.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Rifacimento in corso"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Copia dei fotogrammi da %d a %d%s dagli appunti in corso..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Togliendo i fotogrammi dal clip"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Copia negli appunti in corso"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Incollamento in corso"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2008,7 +2025,7 @@
 "Per piacere installa 'convert' dal pacchetto Image-magick, e poi riavvia "
 "LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2022,7 +2039,7 @@
 "Prova a selezionare tutti i fotogrammi, e poi usa \n"
 "la funzione 'Taglia Audio' dal menu Audio."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2030,7 +2047,7 @@
 "LiVES non può inserire perché i rapporti audio non corrispondono.\n"
 "Per favore installa 'sox', e prova ancora."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2041,7 +2058,7 @@
 "traccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2052,11 +2069,11 @@
 "traccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Ricampionando audio appunti"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2068,7 +2085,7 @@
 "LiVES non è stato in gradi di ricampionare l'audio degli appunti. \n"
 "L'audio degli appunti è stato eliminato.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2082,30 +2099,30 @@
 "Vuoi continuare con l'inserimento \n"
 "utilizzando l'audio non cambiato ?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserimento di %d%s fotogrammi dagli appunti in corso..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Inserimento in corso"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserendo %d volte dagli appunti%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserimento di %d fotogrammi dagli appunti%s in corso..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2115,7 +2132,7 @@
 "Eliminare tutti i fotogrammi chiuderà questo file.\n"
 "Sei sicuro ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2126,8 +2143,8 @@
 "traccia.\n"
 "Sei sicuro di voler continuare?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2137,7 +2154,7 @@
 "L'eliminazione causerà dell'audio mancante in alcuni layout multitraccia.\n"
 "Sei sicuro di voler continuare?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2148,7 +2165,7 @@
 "traccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2159,20 +2176,20 @@
 "multitraccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Eliminazione dei fotogrammi da %d a %d%s in corso..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Eliminazione in corso"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2182,7 +2199,7 @@
 "\n"
 "La selezione è bloccata.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2194,11 +2211,11 @@
 "(Per annullare, premi 'r' o clicca su Riproduci|Registra Esibizione ancora "
 "prima di riprodurre.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Registrazione annullata.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2211,7 +2228,7 @@
 "Il plugin '%s' riporta:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2224,7 +2241,7 @@
 "Non è stato possibile trovare il metodo 'init' nel plugin %s.\n"
 "Il plugin può essere corrotto o non installato correttamente."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2235,22 +2252,22 @@
 "Salvare il set farà in modo che copie tutti i clip caricati rimarranno sul "
 "disco%s.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Salvataggio del set %s in corso"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Caricamento dei clip dal set %s in corso"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2262,40 +2279,37 @@
 "questa macchina.\n"
 "Clicca OK per procedere.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Pulizia dello spazio del disco in corso..."
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Resettando i rapporti e i valori dei fotogrammi..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Esterno: %s\n"
-"Interno: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2303,7 +2317,7 @@
 "\n"
 "  Apertura in corso..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2312,7 +2326,7 @@
 "\n"
 "(%d virtuale)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2321,7 +2335,7 @@
 "\n"
 "(%d decodificato)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2330,7 +2344,7 @@
 "\n"
 "  %.2f sec."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2338,23 +2352,23 @@
 "\n"
 "  Sconosciuto"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "non firmato"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "firmato"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2363,7 +2377,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2380,11 +2394,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Un editor video e programma per VJ."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Luca Chiodini https://launchpad.net/~l-chiodini\n"
+"  salsaman https://launchpad.net/~salsaman\n"
+"  supervinx https://launchpad.net/~supervinx"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2398,7 +2425,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2409,14 +2436,14 @@
 "Devi installare mplayer per essere in grado di vedere l'anteprima di questo "
 "file.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2430,197 +2457,209 @@
 "\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Apertura audio %s, tipo %s in corso..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Apertura audio in corso"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Annullamento in corso"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Nuovo audio: %d Hz %d canale/i %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Perpetramento dell'audio in corso"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nuovo Audio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d fotogrammi sono sufficienti !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Output del debug del codificatore"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Riproduzione a schermo intero (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Riproduzione a schermo intero disattivata (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Dimensione doppia (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Dimensione singola (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Nascondi la finestra di riproduzione (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Mostra la finestra di riproduzione (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Riproduci in una finestra separata (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Ripetizione continua: off (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Ripetizione continua: on (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume audio (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Ripristina l'audio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Disattiva l'audio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Invertendo gli appunti..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Invertendo gli appunti"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Seleziona File Audio"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Per piacere imposta il tuo dispositivo di riproduzione CD in Strumenti | "
 "Preferenze | Miste\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Apertura della traccia CD %d da %s in corso..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Traccia CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Apertura della traccia CD in corso..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Errore durante il caricamento della traccia CD\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Selezione delle tracce in corso"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "errori di layout"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Chiudi _Finestra"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Pulisci _Errori"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Elimina layout affetti"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Riprendi"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "in pausa..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "ripreso..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Mantieni"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2632,28 +2671,28 @@
 "(clicca Mantieni per mantenere quello che hai e interrompere)\n"
 "(clicca Riprendi per continuare il processo)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Fotogramma selezionato"
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2662,7 +2701,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2674,7 +2713,7 @@
 "Devi installare \"xwininfo\" prima di poter usare questa funzione\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2682,7 +2721,7 @@
 "\n"
 "Il tempo della registrazione dev'essere maggiore di 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2696,11 +2735,11 @@
 "Clicca 'Annulla' per annullare\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "La finestra esterna è stata rilasciata.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2708,7 +2747,7 @@
 "Clicca su una finestra per catturarla\n"
 "Premi 'q' per interrompere la registrazione"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2724,19 +2763,19 @@
 "Interrompi o 'q' per finire.\n"
 "(Verranno usati in maniera predefinita %.3f fotogrammi al secondo.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES non è stato in grado di catturare questa finestra. Spiacente.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Esporta Audio Selezionato come..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Esporta Audio come..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2750,81 +2789,86 @@
 "Clicca 'OK' per esportare alla nuova velocità, o 'Annulla' per esportare al "
 "rapporto originale.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Esportazione dei fotogrammi audio da %d a %d come %s in corso..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Esportazione del file audio come %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Esportazione audio in corso"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Accoda File Audio..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Accodamento file audio %s in corso..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Accodamento audio in corso"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Accoda Audio"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Tagliando l'audio da %.2f a %.2f secondi..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Riducendo/Espandendo audio"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Riduci/Espandi Audio"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Aumentando la dissolvenza dell'audio"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Aumenta dissolvenza audio"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Diminuendo la dissolvenza dell'audio"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Diminuisci dissolvenza audio"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s oltre %.1f secondi..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s dal tempo %.2f secondi a %.2f secondi..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Dissolvenza dell'audio in corso..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2834,60 +2878,51 @@
 "Eliminare tutto l'audio chiuderà questo file.\n"
 "Sei sicuro ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Eliminazione di tutto l'audio in corso..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Eliminando l'audio da %.2f a %.2f secondi..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Eliminazione Audio In Corso"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Elimina audio"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Registra nuovo audio"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserimento silenzio da %.2f a %.2f secondi in corso..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Inserimento Silenzio In Corso"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Eliminare %d layout...sei sicuro?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Non è stato possibile trovare il file pixmap: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Unisci"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Unisci Appunti [ %d Fotogrammi ] Con Selezione [ %d Fotogrammi ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2895,609 +2930,587 @@
 "Unisci Appunti [ %d Fotogrammi (ricampionati) ] Con Selezione [ %d "
 "Fotogrammi ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Allinea I_nizi"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Allinea _Finali"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Cosa fare con fotogrammi appunti extra -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Inserisci Fotogrammi"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Abbandona Fotogrammi"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Numero di Volte da Mandare In Loop gli Appunti"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Manda in _Loop gli Appunti per Adattarli alla Selezione"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "Metodo Di _Transizione:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Fusione degli appunti con la selezione in corso..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "inserimento di %d fotogrammi extra prima della fusione in corso\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "inserendo adesso %d fotogrammi extra\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Fusione compiuta.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "Effetti _Personalizzati"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "U_tilità Personalizzate"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_File"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Apri File/Directory"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Apri _Posizione/Flusso..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importa da Dispositivo _Firewire (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importa da Dispositivo Fire_wire (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "File _Recenti..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_Ricarica Set Clip..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Chiudi/Sal_va Tutti I Clip"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Salva _Selezione Come..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "C_hiudi Questo Clip"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Crea un Backup Del Clip come .lv1..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Ripristina Clip da .lv1..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Salva/Carica/Crea Una Copia Di Backup _con Suono"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Pu_lisci Spazio Del Disco"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Modalità _MULTI-TRACCIA"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copia Selezione"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Ta_glia Selezione"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Inserisci dagli Appunti..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Incolla come _Nuovo"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Fondi Appunti con la Selezione..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Elimina Selezione"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Scindi _Video da Audio"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Seleziona..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Seleziona _Tutti I Fotogrammi"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "Solamente Il Fotogramma _Iniziale"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "Solamente Il Fotogramma _Finale"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Seleziona dal _Primo Fotogramma"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Seleziona dall'_Ultimo Fotogramma"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Seleziona Ultima Inser_zione/Fusione"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Seleziona Ultimo _Effetto"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inverti Selezione"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_Blocca Larghezza Selezione"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Riproduci"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "Ri_produci Tutto"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Ripro_duci Selezione"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Riproduci _Appunti"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Interrompi"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Riav_volgi"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Schermo Intero"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Dimensione _Doppia"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Riproduci in una Finestra _Separata"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Sfondo _Vuoto"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 "Manda In _Loop (Automaticamente) il Video (per adattarlo alla traccia audio)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "R_ipeti Continuamente"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Riproduzioni Pin_g Pong"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Silenzioso"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Separa Modalità 'A_ppiccicosa' Finestra"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "_Mostrare contatore fotogrammi"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Ef_fetti"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Gli effetti sono applicati alla selezione attuale."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Avvia Effetto Renderizzato/Strumento/Generatore..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Strumenti"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Gli strumenti vengono applicati per completare i clip."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Inverti Appunti"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Cambia Velocità di Salvataggio/Riproduzione..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Ricampiona il _Video al Nuovo Rapporto Dei Fotogrammi..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilità"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Genera"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Stru_menti Personalizzati"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Genera"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Caricando i plugin degli effetti renderizzati..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Cattura Finestra _Esterna... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferenze..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Carica _Nuovo Audio per il Clip..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Carica Traccia _CD..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "E_spelli CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Regista Audio Es_terno..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "nel Nuovo _Clip..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "nella _Selezione"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "_Aumenta Dissolvenza Audio..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "_Diminuisci Dissolvenza Audio..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Esporta Audio..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Esporta Audio _Selezionato..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Esporta _Tutto L'Audio..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Accoda Audio..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Riduci/Ingrandisci Audio..."
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Riduci/Ingrandisci Audio nella _Selezione"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Riduci/Ingrandisci Audio dall'Inizio all'Avvio Della _Riproduzione"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Elimina Audio..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Elimina Audio _Selezionato"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Elimina _Tutto L'Audio"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Inserisci _Silenzio nella Selezione"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Ricampiona Audio..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Riproduci _Musica Usando xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Musica Casuale _Usando xmms..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Interrompi La _Riproduzione Di xmms"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Informazioni"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Mostra _Informazioni Clip"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Mostra/_Modifica Commenti File"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Mostra Informazioni _Appunti"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Mostra M_essaggi"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Mostra Errori _Layout"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Clip"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Rinomina Clip Corrente nel Menu..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "A_vanzate"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Effetti _RFX/Strumenti/Utilità"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Nuovo Script Di Test RFX..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copia Script RFX nel Test..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Modifica Script Test RFX..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "Ri_nomina Script Test RFX..."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Elimina Script Test RFX..."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promuovi Effetto Renderizzato Test/Strumento/Generatore..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importa script RFX Personalizzato..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_sporta script RFX Personalizzato..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "Eli_mina script RFX Personalizzato..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Ri_costruisci tutti i plugin RFX"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Ricevi flusso _LiVES da..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Invia flusso LiVES a..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Apri flusso _yuv4mpeg in %sstream.yuv..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importa Progetto (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_sporta Progetto (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Mappatura _Effetto In Tempo Reale"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Lega gli effetti in tempo reale ai tasti ctrl-numero."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Imposta I _Predefiniti Dell'Effetto In Tempo Reale"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 "Imposta i valori dei parametri predefiniti per gli effetti in tempo reale."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Salva I _Predefiniti Dell'Effetto In Tempo Reale"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3505,146 +3518,146 @@
 "Salva i predefiniti degli effetti in tempo reale così verranno ripristinati "
 "ogni volta che usi LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Azzera tutte le velocità e posizioni di riproduzione"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reimposta tutte le posizioni di riproduzione al fotogramma 1, e azzera tutti "
 "i rapporti dei fotogrammi di riproduzione."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "Interfaccia _MIDI/joystick"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "Studente _MIDI/joystick..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_Salva mappatore dispositivo..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_Carica mappatore dispositivo..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Mostra _Tasti VJ"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Giocattoli"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Niente"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "Fotogrammi _Impazziti"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (banda larga)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manuale (verrà aperto nel browser)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Dona al progetto !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Contatta l'autore"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Segnala un _bug"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Suggerisci una _funzione"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Aiuta con le _traduzioni"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Risoluzione problemi"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Riguardo A..."
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Riavvolgi all'inizio (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Riproduci tutto (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Interrompi riproduzione (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Riproduci selezione (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Volume audio (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Rendi non vuoto lo sfondo (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Riproduci più lentamente (ctrl-giù)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Riproduci più velocemente (ctrl-su)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Manda indietro (ctrl-sinistra)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Manda avanti (ctrl-destra)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Mostra informazioni clip (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Nascondi questa barra degli strumenti"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3653,164 +3666,164 @@
 "performance migliorata, \"q\" per interrompere."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 "     Velocità di riproduzione del video (fotogrammi al secondo)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Varia la velocità del video"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Primo Fotogramma"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Ultimo Fotogramma"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "Il primo fotogramma selezionato in questo clip"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "L'ultimo fotogramma selezionato in questo clip"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Avvio in corso...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Premi 'q' per fermare la registrazione.  NON COPRIRE LA FINESTRA DI "
 "RIPRODUZIONE !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Numero di fotogrammi da vedere in anteprima"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Libero"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Scelta libera del numero di fotogrammi"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Inizio"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "Il numero di fotogrammi è collegato al fotogramma di partenza"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Fine"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "Il numero di fotogrammi è collegato al fotogramma finale"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Puntatore"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "Il numero di fotogrammi è collegato al puntatore di riproduzione"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Riavvolgi"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Riproduci tutto"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Riproduci Selezione"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Incomincia la re_gistrazione"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Interrompi la _registrazione"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "_Registra Esibizione"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Nascondi Finestra Di Riproduzione"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Mostra Finestra Di Riproduzione"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Pulizia degli appunti"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3821,7 +3834,7 @@
 "==============================\n"
 "Scambiato con il clip %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3831,11 +3844,11 @@
 "==============================\n"
 "Scambiato con un clip vuoto\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(vuoto)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3844,7 +3857,7 @@
 "Il nome del set è stato cambiato da %s a %s. I layout affetti sono stati "
 "aggiornati in maniera pertinente\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3853,7 +3866,7 @@
 "Il clip %s manca in questo set.\n"
 "È richiesto dai layout seguenti:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3862,7 +3875,7 @@
 "Il clip %s è stato chiuso.\n"
 "È richiesto dai layout seguenti:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3871,7 +3884,7 @@
 "Dei fotogrammi sono stati spostati nel clip %s.\n"
 "I seguenti layout sono coinvolti:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3880,7 +3893,7 @@
 "Dei fotogrammi sono stati cancellati dal clip %s.\n"
 "I seguenti layout sono coinvolti:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3889,7 +3902,7 @@
 "L'audio è stato cancellato dal clip %s.\n"
 "I seguenti layout sono affetti:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3898,7 +3911,7 @@
 "L'audio è stato spostato nel clip %s.\n"
 "I seguenti layout sono affetti:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3907,7 +3920,7 @@
 "L'audio è stato alterato nel clip %s.\n"
 "I layout seguenti sono affetti:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3916,7 +3929,7 @@
 "Dei fotogrammi sono stati alterati nel clip %s.\n"
 "I layout seguenti sono coinvolti:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3927,7 +3940,7 @@
 "non può essere aperto, dato che sta venendo usato\n"
 "da un'altra copia di LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3938,7 +3951,7 @@
 "Il set %s è attualmente in uso da un'altra copia di LiVES.\n"
 "Per piacere scegli un altro nome set.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3946,13 +3959,13 @@
 "\n"
 "I nomi dei set non possono essere vuoti.\n"
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3961,13 +3974,13 @@
 "\n"
 "I nomi dei set non possono contenere spazi o i caratteri%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3978,68 +3991,68 @@
 "Il set %s esiste già.\n"
 "Per piacere scegli un altro nome set.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Rimuovendo il layout %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [apertura in corso...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f secondi]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Indefinito)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Nessun video)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Nessun audio)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono [apertura in corso...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Audio Sinistro [apertura in corso...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f secondi]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Audio Sinistro [%.2f secondi]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Audio Destro [apertura in corso...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Audio Destro [%.2f secondi]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES non può passare a mplayer mentre i clip si stanno caricando."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Pulizia del clip in corso"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4054,53 +4067,64 @@
 "\n"
 "Sovrascrivere ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Annulla %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Rifai %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Selezione------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " secondi ] ----------Selezione---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " fotogrammi ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Esaminando l'intestazione del file"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s in corso"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Aprendo %s tempo di partenza %.2f secondi %d fotogrammi"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " senza suono"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Apertura dell'audio per %s in corso"
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4112,11 +4136,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - per piacere sii paziente."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4128,7 +4152,7 @@
 "LiVES non è stato in grado di estrarre il video oppure l'audio.\n"
 "Per piacere controlla la finestra del terminale per ulteriori dettagli.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4138,7 +4162,7 @@
 "\n"
 "Dovresti aver bisogno di installare mplayer per aprire questo file.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4150,29 +4174,29 @@
 "Per piacere controlla l'impostazione del comando dell'apertura del Video in\n"
 "Strumenti|Preferenze|Decodifica\n"
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4184,37 +4208,33 @@
 "\n"
 "Vuoi continuare ancora ?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "selezione"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Collegando la selezione"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (con nessun suono)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Salvando i fotogrammi da %d a %d%s come \"%s\" : codificatore = %s : formato "
 "= %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Salvando i fotogrammi da 1 a %d%s come \"%s\" : codificatore = %s : formato "
 "= %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Salvataggio in corso [può impiegare molto tempo]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4224,33 +4244,33 @@
 "\n"
 "Errore del codificatore - il file di output non è stato creato !\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "registrazione fermata dall'anteprima.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "registrazione fermata dalla riproduzione degli appunti.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Registrando l'esibizione..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Gli FPS medi sono stati %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4264,16 +4284,16 @@
 "Dovresti cliccare su Strumenti--->Ridimensiona Tutto\n"
 "e ridimensionare tutti i fotogrammi alla dimensione corrente.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Senza titolo%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4281,7 +4301,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4293,14 +4313,14 @@
 "predefinito di %.3f fps. \n"
 "Il predefinito può essere impostato in Strumenti | Preferenze | Miste.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "La velocità di riproduzione è stata regolata a %.3f fotogrammi al secondo "
 "per adattarsi all'audio.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4309,7 +4329,7 @@
 "Fotogrammi=%d tipo=%s dimensione=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4318,49 +4338,44 @@
 "Fotogrammi=%d tipo=%s dimensione=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s niente\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d canale/i %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Commento: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Salvataggio del fotogramma %d come %s in corso..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Creando un backup da %s a %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Creando un backup"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "i dati dell'esibizione hanno ricevuto un backup..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Ripristinando %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Ripristino in corso"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4374,22 +4389,22 @@
 "LiVES non è stato in grado di ripristinarlo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4397,7 +4412,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4407,59 +4422,59 @@
 "Sono stati trovati dei file da un precedente avvio di LiVES.\n"
 "Vuoi provare a recuperarli?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Recupero dei file in corso"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Recupero dei file in corso..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Mostra i _layout colpiti"
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Attenzione !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "attenzione"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4470,7 +4485,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4482,11 +4497,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "I lettori audio non possono essere scambiati durante la riproduzione."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4499,20 +4514,18 @@
 "insufficiente.\n"
 "Per piacere prova a chiudere prima altre applicazioni.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% fatto. Tempo rimanente: %u secondi\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4521,14 +4534,14 @@
 "\n"
 "%d/%d fotogrammi aperti. Tempo rimanente %u secondi.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4537,7 +4550,7 @@
 "\n"
 "%d fotogrammi aperti.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4546,7 +4559,7 @@
 "\n"
 "Tempo rimanente: %d secondi"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4557,7 +4570,7 @@
 "Spiacente, LiVES può aprire soltanto %d file alla volta.\n"
 "Per piacere chiudi un file e poi prova ancora."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4576,7 +4589,7 @@
 "\n"
 "Per piacere assicurati di poter scrivere in questa directory."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4587,7 +4600,7 @@
 "Oppure passa ad un altro formato di codifica in Strumenti | Preferenze | "
 "Codifica\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4599,7 +4612,7 @@
 "Questo codificatore/formato non può utilizzare il codec audio richiesto.\n"
 "Per piacere imposta il codec audio in Strumenti|Preferenze|Codifica\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4607,13 +4620,13 @@
 "Questo layout include fotogrammi generati.\n"
 "Non può essere salvato, devi prima renderizzarlo in un clip.\n"
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4624,7 +4637,7 @@
 "\n"
 "Grazie a restrizioni nel formato %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4632,43 +4645,43 @@
 "LiVES raccomanda le seguenti impostazioni:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", firmato"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", non firmato"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", piccolo-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", grande-endian"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Imposta il rapporto del video a %.3f fotogrammi al secondo\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Imposta il valore del video a %.d:%d fotogrammi al secondo\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Imposta la dimensione del video a %d x %d pixel\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4676,37 +4689,37 @@
 "\n"
 "Potresti volere:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "ridimensionare il video a %d x %d pixel\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "disattivare l'audio, in quanto il codificatore bersaglio non può codificare "
 "l'audio\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES deve:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "ricampiona video a %.3f fotogrammi al secondo\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "ricampiona video a %d:%d frame al secondo\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4720,7 +4733,7 @@
 "Schiaccia `OK` per procedere, `Annulla` per uscire.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4730,7 +4743,7 @@
 "I cambiamenti applicati alla selezione non saranno permanenti.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4744,7 +4757,7 @@
 "disponibile è insufficiente.\n"
 "Prova a registrare solamente una selezione del file."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4763,7 +4776,7 @@
 "oppure\n"
 "OK per continuare"
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4779,11 +4792,11 @@
 "altrimenti\n"
 "premere Annulla."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Mostra Tasti"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4865,11 +4878,11 @@
 "d                             dimensione doppia\n"
 "g                             riproduzione ping pong\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Tasti Multi-traccia"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4891,19 +4904,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Cronologia Messaggi"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Dopo l'aggiornamento/installazione, dovresti aver bisogno di regolare "
-"l'impostazione <prefix_dir> nel tuo file ~/.lives"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4911,16 +4923,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES non è riuscito a trovare alcun plugin effetto renderizzato.\n"
-"Per piacere assicurati di averli installati in\n"
-"%s%s%s\n"
-"o cambia il valore di <lib_dir> in ~/.lives\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4930,18 +4936,18 @@
 "\n"
 " (I nomi dei file devono finire in .mp3, .ogg, .wav, .mod, .xm oppure .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "fallito (tipo sconosciuto)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4954,7 +4960,7 @@
 "Clicca OK per aggiungere i clip e i layout correnti al set esistente.\n"
 "Clicca Annulla per scegliere un nuovo nome.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4966,7 +4972,7 @@
 "Sei sicuro di voler continuare ?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4978,7 +4984,7 @@
 "Sei sicuro di voler continuare ?\n"
 "."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4989,7 +4995,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5004,7 +5010,7 @@
 "%s\n"
 "Il clip non è stato caricato.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5012,7 +5018,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5021,13 +5027,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5038,7 +5044,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5046,7 +5052,7 @@
 "\n"
 "In alternativa, puoi riavviare LiVES e selezionare un altro lettore audio.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5061,7 +5067,7 @@
 "Puoi aumentare il valore in Preferenze/Multi-traccia.\n"
 "È consigliato di aumentarlo ad almeno %d MB"
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -5070,7 +5076,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5084,7 +5090,7 @@
 "utilizzando Preferenze ->Multitraccia/Render->Memoria per l'annullamento "
 "(Undo)\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5096,7 +5102,7 @@
 "Dovresti aver bisogno di aumentare la memoria di annullamento\n"
 "utilizzando Preferenze/Multi-traccia/Memoria Di Annullamento\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5105,20 +5111,20 @@
 "LiVES non è stato in grado di riservare abbastanza memoria per il buffer di "
 "annullamento della multi-traccia.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "o inserisci un valore più piccolo.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Prova ancora dell'editor clip, prova chiudendo qualche altra applicazione\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Prova a chiudere altre applicazioni\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5127,14 +5133,14 @@
 "dell'audio.\n"
 "Dovresti regolare le impostazioni audio dal menu Strumenti.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "Il layout corrente contiene dell'audio, quindi i canali audio non possono "
 "essere impostati a zero.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5144,7 +5150,7 @@
 "lettore audio \"jack\" o \"pulse audio\".\n"
 "Puoi impostare ciò in Strumenti|Preferenze|Riproduzione."
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5154,7 +5160,7 @@
 "da un altro sistema o da una precedente versione di LiVES)\n"
 "Tentare di riparare la copia del layout presente sul disco ?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5162,7 +5168,7 @@
 "LiVES non è stato in grado di caricare il layout.\n"
 "Spiacente.\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5172,7 +5178,7 @@
 "\n"
 "Il rapporto dell'audio dev'essere maggiore di 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5184,7 +5190,7 @@
 "e può richiedere molto tempo mostrarlo.\n"
 "Sei sicuro di volerlo vedere ?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5194,7 +5200,7 @@
 "\n"
 "Devi installare 'dvgrab' per utilizzare questa funzione.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5209,22 +5215,22 @@
 "Potresti aver bisogno di selezionare uno di questi in Strumenti/Preferenze/"
 "Riproduzione.\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 "Il plugin di riproduzione del video ha fallito l'inizializzazione della "
 "tavolozza !\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 "Il plugin decodificatore ha fallito l'inizializzazione della tavolozza !\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Impossibile impostare il rapporto dei fotogrammi del plugin video\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5232,7 +5238,7 @@
 "Successivamente a un crash, è consigliabile pulire il disco con\n"
 "File|Pulisci spazio disco\n"
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5246,33 +5252,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "annullato.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "fallito.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "errore nel file. Fallito.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -5282,7 +5288,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -5292,7 +5298,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -5302,7 +5308,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -5311,7 +5317,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -5321,7 +5327,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5330,7 +5336,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5340,12 +5346,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5354,7 +5360,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5367,7 +5373,7 @@
 "%s\n"
 "Per favore controlla i permessi del file e prova ancora."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5380,14 +5386,22 @@
 "%s\n"
 "Per piacere controlla i permessi per la directory e prova di nuovo."
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5398,13 +5412,13 @@
 "Il %s non può codificare clip con il tipo di immagine %s.\n"
 "Per piacere seleziona un altro codificatore dall'elenco.\n"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5414,27 +5428,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5443,14 +5457,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5461,19 +5475,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5481,7 +5495,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5489,7 +5503,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5501,7 +5515,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5510,34 +5524,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5546,200 +5560,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generatore"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Generatori"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generatore"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Generatori"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "transizione"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transizioni"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "effetto"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Effetti"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "utilità"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilità"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositore"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Compositori"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "spina"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Spine"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "cuneo"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Cunei"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "convertitore"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Convertitori"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "audio/video"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Transizioni Audio/Video"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "solo video"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Transizioni solo Video"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "solamente audio"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Transizioni solo Audio"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mixer Audio"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Effetti Audio"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "controllatore volume audio"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Controllatori Volume Audio"
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Mixer Audio"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s tutti i fotogrammi..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s appunti nei fotogrammi da %d a %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s negli appunti..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s nel nuovo clip..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s fotogrammi da %d a %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s appunti con selezione"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s negli appunti"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s al nuovo clip"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s fotogrammi da %d a %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5747,17 +5805,46 @@
 "\n"
 "Nessun fotogramma è stato generato.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Errore: il plugin %s non ha la funzione weed_setup().\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5766,130 +5853,310 @@
 "Informazioni: Non è stato possibile caricare il plugin %s\n"
 "L'errore è stato: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Caricati con successo %d filtri Weed\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Fallito l'avvio dell'istanza %s, codice errore %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Non è stato possibile avviare il generatore %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Fallito l'avvio del generatore %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Fallito l'avvio del generatore %s, errore %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Puoi cliccare su Anteprima per cambiare questi valori"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Azzera Valori"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Fotogramma"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Mantieni il rapporto dell'aspetto del fotogramma originale"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Mantieni Rapporto Dell'_Aspetto"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Selezione file"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Mantieni il rapporto dell'aspetto del fotogramma originale"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "_Maggiore Transizione"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Maggiore transizione"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "Dissolvi l'audio in modo incrociato"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "Spunta la casella per rendere la transizione dell'audio con il video"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "Dissolvi l'audio in modo incrociato"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "_Minore Transizione"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Minore transizione"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "_FPS Bersaglio (il plugin può sovrascrivere questo)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : dimensione"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Nuova dimensione (pixel)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Larghezza"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Altezza"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Genera negli _Appunti"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Genera fotogrammi negli appunti"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Genera nel _Nuovo Clip"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Genera fotogrammi in un nuovo clip"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5900,59 +6167,59 @@
 "Devi selezionare almeno %d fotogrammi per utilizzare questo effetto.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Chiudi _finestra"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Nessun parametro"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Parametro non valido"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Seleziona Colore"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Clicca per impostare il colore"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Il valore del rosso (da 0 a 255)"
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Il valore del verde (da 0 a 255)"
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Il valore del blu (da 0 a 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -5961,12 +6228,12 @@
 "\n"
 "Errore plugin: %s ha fallito con il codice %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : il messaggio è stato %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5982,17 +6249,17 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Aggiornando i predefiniti del plugin di riproduzione del video in %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Caricando i predefiniti del plugin di riproduzione dei video da %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6007,32 +6274,32 @@
 " Strumenti|Preferenze|Riproduzione|Riproduzione avanzata plugin\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Corretto il rapporto di fotogrammi per il plugin.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Input dello spazio del colore nel plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Corretto il rapporto di fotogrammi per il plugin.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "_Spazio Del Colore"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Input dello spazio del colore nel plugin.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6045,16 +6312,7 @@
 "Fallita l'apertura del plugin di riproduzione %s\n"
 "L'errore è %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"Il plugin di riproduzione video ha fallito ad inizializzarsi.\n"
-"L'errore è: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6069,7 +6327,16 @@
 "manca una funzione necessaria.\n"
 "Non è possibile utilizzarlo.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"Il plugin di riproduzione video ha fallito ad inizializzarsi.\n"
+"L'errore è: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6079,7 +6346,7 @@
 "Attenzione ! Il plugin di riproduzione video non notifica la pressione dei "
 "tasti. La tastiera potrà essere disabilitata durante l'uso del plugin !\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6088,30 +6355,26 @@
 "*** Utilizzo il plugin %s per la riproduzione di  fs, utilizzando la palette "
 "%d ( %s ). ***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVES non riesce a trovare i suoi plugin per la codifica. Verificate di "
-"averli correttamente installati in\n"
-"%s%s%s\n"
-"o modificate il valore di <lib_dir> in ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6124,12 +6387,12 @@
 "%s%s%s\n"
 "o cambiate plugin utilizzando Strumenti|Preferenze|Codifica\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 "Non è stato possibile ridimensionare, per piacere installa imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6142,7 +6405,7 @@
 "Fallita l'apertura del plugin decodificatore %s\n"
 "L'errore è stato %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6157,193 +6420,177 @@
 "manca una funzione necessaria.\n"
 "Impossibile usarlo.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/sconosciuto"
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 "Fallito il caricamento di %s, le transizioni non possono venire "
 "ridimensionate.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "impostazioni avanzate %s"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nuovo Test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Modifica Test RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Effetto -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transizione -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generatore -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Strumento -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utilità -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Nome:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Il nome del plugin. Nessuno spazio permesso."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Versione:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "La versione dello script."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Autore:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "L'autore dello script."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (facoltativo):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL del mantenitore del plugin."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Testo del menu:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Il testo da mostrare nel menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Descrizione dell'azione:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Descrivi cosa fa il plugin. Ad esempio \"Riconoscimento dei contorni\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Fotogrammi minimi:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Numero minimo di fotogrammi su cui questo effetto/strumento si può "
 "applicare. Di norma 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Requisiti..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Inserisci qualsiasi binario richiesto dal plugin."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Imposta le proprietà del plugin. Facoltativo."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parametri..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Predispone i parametri utilizzati in /pre/loop/post/trigger code. "
 "Facoltativo."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Suggerimenti Della _Finestra Dei Parametri..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "Attiva i suggerimenti su come strutturare la finestra parametri. Facoltativo."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Codice della lingua:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Lingua perr pre/loop/post/triggers. Facoltativo."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "Codice _prima del loop..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Codice da eseguire prima del loop. Facoltativo."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "Codice _loop..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Il codice loop che deve essere applicato ad ogni fotogramma."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "Codice _dopo il loop..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Codice da essere eseguito dopo il loop. Facoltativo."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "Codice _trigger..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6352,7 +6599,7 @@
 "mostrata, o quando un parametro viene cambiato. Facoltativo (eccetto per le "
 "Utilità)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6367,55 +6614,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Requisiti RFX"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Parametri RFX"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Suggerimenti Finestra Parametri RFX"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Trigger RFX"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nuova Entrata"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Modifica Entrata"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Rimuovi Entrata"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Sposta In _Alto"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Sposta In _Basso"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Proprietà RFX"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "_Lento (suggerimento per la GUI)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "Generatore modalità _batch"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6429,7 +6676,7 @@
 "Per piacere rimuovi il trigger prima.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6441,27 +6688,27 @@
 "Alcuni trigger sono stati regolati.\n"
 "Per piacere controlla il codice trigger.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nuovo Parametro RFX"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Modifica Parametro RFX"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Nome:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Nome del parametro, deve essere univoco nel plugin."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Etichetta:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6469,174 +6716,162 @@
 "Etichetta da mostrare con il parametro. Il carattere di sottolineature "
 "rappresenta la scorciatoia da tastiera."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "_Gruppo Bottone: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-"Un valore diverso da zero può essere utilizzato per raggruppare i bottoni "
-"raggio."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Tipo:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Tipo del parametro (seleziona dall'elenco)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "_Luoghi decimali: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "Valore _predefinito:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_Predefinito: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "_Gruppo Bottone: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+"Un valore diverso da zero può essere utilizzato per raggruppare i bottoni "
+"raggio."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "Valore _minimo: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Valore mas_simo: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     Dimensione _cadenza:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "Determina quanto il parametro è modificato quando si preme la freccia sul "
 "potenziometro."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Avvolgi: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Se il valore avvolge massimo->minimo e minimo->massimo."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Imposta _valori"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Valore predefinito:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Valore minimo: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Valore massimo: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Predefinito _Rosso:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Predefinito _Verde:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Predefinito _Blu: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "Imposta _predefinito"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Valore predefinito:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Lunghezza massima (caratteri): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nuovo Suggerimento Finestra Parametri RFX"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Modifica Suggerimento Finestra Parametri RFX"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Parola Chiave:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Tipo Speciale:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Sottotipo Speciale:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Righa:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Parametri collegati (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Parametri collegati (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Parametri collegati (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nuovo Trigger RFX"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Modifica Trigger RFX"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Quando:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Codice Prima Del Loop"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Codice Loop"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Codice Dopo Il Loop"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Testo predefinito (lunghezza massima %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Inserisci valori, uno per linea"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6646,7 +6881,7 @@
 "\n"
 "Il nome non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6656,7 +6891,7 @@
 "\n"
 "Il nome non deve contenere spazi.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6666,7 +6901,7 @@
 "\n"
 "Il testo del menu non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6676,7 +6911,7 @@
 "\n"
 "La descrizione dell'azione non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6686,7 +6921,7 @@
 "\n"
 "L'autore non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6698,7 +6933,7 @@
 "Esiste già un plugin con questo nome.\n"
 "Il nome dev'essere univoco.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6708,7 +6943,7 @@
 "\n"
 "Il codice loop non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6718,7 +6953,7 @@
 "\n"
 "Il codice del trigger non deve essere vuoto per un'utilità.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6728,7 +6963,7 @@
 "\n"
 "Il nome del parametro non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6742,41 +6977,41 @@
 "univoci in un plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Scrittura del file script %s in corso..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "Nessuna sezione <definisci> trovata nello script.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Versione script errata.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "Nessuna sezione <nome> trovata nello script.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "Nessuna sezione <versione> trovata nello script.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "Nessuna sezione <autore> trovata nello script.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "Nessuna sezione <descrizione> trovata nello script.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Descrizione errata. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6791,27 +7026,27 @@
 "trovato nello script.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Ricostruendo tutti gli script RFX...integrato..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Ricostruendo gli script"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "personalizzato..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "ricostruendo entrate del menu dinamico..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6825,7 +7060,7 @@
 "Per favore controlla se questo programma è nel tuo percorso ed è "
 "esecutibile.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6840,12 +7075,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Eliminazione dello script rfx %s in corso..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6860,7 +7095,7 @@
 "%s\n"
 "Il codice dell'errore è %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6875,12 +7110,12 @@
 "esiste già.\n"
 "Per piacere eliminalo, o rinomina lo script test.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promuovendo il plugin test rfx %s a personalizzato..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6888,29 +7123,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Fallito lo spostamento dello script plugin da\n"
-"%s a\n"
-"%s\n"
-"Il codice di ritorno è %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importa Script da..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Esporta Script a..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copia di %s a %s in corso..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6925,55 +7154,43 @@
 "esiste già.\n"
 "Per piacere eliminalo, o rinomina lo script di importazione.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Integrato"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Personalizzato"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Test"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copia Script RFX"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Dal tipo:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Rinomina lo Script test RFX"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Dallo script: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nome Script RFX"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Nome script: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Nuovo nome: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Nuovo nome script: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6985,28 +7202,45 @@
 "C'è già uno script test con questo nome.\n"
 "Il nome dello script dev'essere univoco.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Rinominando lo script test RFX da %s a %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Fallito lo spostamento dello script plugin da\n"
+"%s a\n"
+"%s\n"
+"Il codice di ritorno è %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Applica Effetti In Tempo Reale alla Selezione"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Caricando l'effetto renderizzato %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Guarda: VJ - mostra tasti VJ. Imposta gli eventi in tempo reale, e poi "
 "applicali qui."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7018,7 +7252,7 @@
 "I plugin di riproduzione del video sono attivi solo nello\n"
 "schermo intero, modalità finestra separata (fs)\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7026,7 +7260,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -7035,40 +7269,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"La directory temporanea è la directory di lavoro di LiVES dove i clip e i "
-"set aperti vengono immagazzinati.\n"
-"Dovrebbe essere in una partizione con molto spazio del disco libero.\n"
-"\n"
-"Consiglio: evita di impostarla dentro /tmp, dato che /tmp viene pulita "
-"frequentemente allo spegnimento del sistema."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Non è stato possibile creare o scrivere nella nuova directory temporanea.\n"
-"Potresti aver bisogni di crearla prima come utente root, per esempio:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"La directory non sarà cambiata adesso.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7088,7 +7317,7 @@
 "In alternativa, premi Annulla per riportare la directory temporanea alla sua "
 "impostazione originaria."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7099,7 +7328,7 @@
 "installare jackd.\n"
 "Consulta http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7108,7 +7337,7 @@
 "Scambiare i lettori audio richiede il riavvio (jackd non deve essere in "
 "esecuzione)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7120,305 +7349,321 @@
 "prima bisogna installare pulseaudio.\n"
 "Consulta http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (qualità più alta; file più larghi)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferenze"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Apri la selezione del file massimizzata"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Mostra file recenti nel menu File"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Interrompi il salvaschermo durante la riproduzione    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Apri la finestra principale massimizzata"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Mostra la barra degli strumenti quando lo sfondo è reso vuoto"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Permetti alla rotella del mouse di scambiare i clip"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Modalità di avvio:"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "Editor _clip"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "Modalità _multi-traccia"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Supporto multi-testa"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " numero di schermi per l'interfaccia di LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " numero di schermi per la riproduzione"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Forza schermo singolo"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Forza modalità schermo singolo"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Quando si entra nella modalità Multi-traccia:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Suggeriscimi le impostazioni di audio, fps, larghezza e altezza"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "Utilizza _sempre i seguenti valori:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Utilizza questi stessi _valori per renderizzare un nuovo clip"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Larghezza           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Altezza      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Abilita la traccia audio di supporto"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Traccia audio per traccia video"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Annulla dimensione buffer (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Abbandona la modalità multi-traccia dopo aver renderizzato"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Recupera automaticamente i layout"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Ogni"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "secondi"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Dopo ogni _cambiamento"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Mai"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Multi-traccia/Render"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Utilizza l'apertura istantanea quando possibile"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Abilita l'apertura istantanea di alcuni tipi di file usando i plugin "
 "decodificatori"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Comando di apertura dei video             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Apri/renderizza compressione                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
+
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     (più basso = più lento, file larghi; per jpeg, qualità più alta)"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Formato dell'immagine predefinito          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "(Controlla in Aiuto/Risoluzione problemi per vedere quali formati di "
 "immagine sono supportati)"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Abilita il deinterlacciamento automatico quando possibile"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 "Deinterlaccia automaticamente i fotogrammi quando un plugin lo suggerisce"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Durante l'apertura di file multipli, concatena immagini in un clip"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Decodifica"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-"La qualità di anteprima per la riproduzione video - riguarda il "
-"ridimensionamento"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Visualizza in anteprima la _qualità"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Bassa - può migliorare l'esibizione sulle macchine più lente"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normale - consigliato per la maggior parte degli utenti"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Alta - può migliorare la qualità sulle macchine molto veloci"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Visualizza in anteprima la _qualità"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+"La qualità di anteprima per la riproduzione video - riguarda il "
+"ridimensionamento"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Mostra statistiche FPS"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Lettore"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 "(Guarda anche la scheda Integrazione Jack per le opzioni di avvio di jack)"
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "_Comando di riproduzione dell'audio"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- interno -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "L'audio segue il _valore/direzione del video"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "L'audio segue gli scambi dei _clip"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7426,71 +7671,68 @@
 "Registra l'audio durande la registrazione di una finestra es_terna\n"
 " (richiede jack o pulse audio)"
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Cosa registrare quando 'r' è premuto   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "Cambiamenti dei _fotogrammi"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "Cambiamenti degli F_PS"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "Effetti in tempo _reale"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "Scambi _clip"
 
-#: src/preferences.c:3507
-#, fuzzy
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_Audio (richiede un lettore audio jack o pulse)"
-
-#: src/preferences.c:3529
-#, fuzzy
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_Audio (richiede un lettore audio jack o pulse)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Registrazione in corso"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Codificatore                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Formato output"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Codec audio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Codificazione"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Utilizza l'_antialiasing durante il ridimensionamento"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Numero dei tasti degli effetti in tempo _reale"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7499,81 +7741,96 @@
 "essere controllati attraverso la finestra degli effetti in tempo reale, "
 "oppure tramite rete (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Directory di caricamento dei video (predefinita)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Directory di salvataggio dei video (predefinita) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Directory di caricamento dell'audio (predefinita) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Directory delle immagini (predefinita) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Directory di backup/ripristino (predefinita) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Directory temporanea (non eliminare) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "La directory predefinita da cui caricare i clip video"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "La directory predefinita in cui salvare i clip codificati"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "La directory predefinita per caricare e salvare l'audio"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "La directory predefinita in cui salvare le riprese"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "La directory predefinita per ripristinare/fare il backup dei clip singoli"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "Directory di lavoro di LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Directory"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7581,19 +7838,19 @@
 "Avvisa in Inserisci / Unisci se il rapporto dei _fotogrammi degli appunti "
 "non coincide con il rapporto dei fotogrammi della selezione"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avvisa nell'Apertura se la _dimensione del file eccede "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Mostra un avviso prima di salvare un se_t"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
@@ -7601,73 +7858,73 @@
 "Mostra un avviso se _mplayer, sox, composit o convert non sono trovati "
 "quando LiVES viene avviato."
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Mostra un avviso se nessun effetto _renderizzato viene trovato all'avvio."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Mostra un avviso se nessun plugin _codificatore viene trovato all'avvio."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Mostra un avviso se un nome set _duplicato viene inserito."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "Quando un set viene caricato, avvisa se dei clip mancano dai _layout."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Avvisa se un clip usato in un layout sta per venire chiuso."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 "Avvisa se dei fotogrammi utilizzati in un layout stanno per venire eliminati."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 "Avvisa se dei fotogrammi utilizzati in un layout stanno per venire spostati."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 "Avvisa se dei fotogrammi utilizzati in un layout stanno per venire alterati."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Avvisa se l'audio utilizzato in un layout sta per venire eliminato."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Avvisa se l'audio utilizzato in un layout sta per venire spostato."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Avvisa se l'audio utilizzato in un layout sta per venire alterato."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Avvisa se il layout non è stato salvato quando si lascia la modalità multi-"
 "traccia."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Avvisa se la multi-traccia non ha canali audio, e un layout con audio viene "
 "caricato"
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7675,120 +7932,108 @@
 "Avvisa se la multi-traccia ha canali audio, e se il tuo lettore audio non è "
 "\"jack\" o \"pulse audio\"."
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 "Mostra un messaggio di informazioni dopo aver importato da un dispositivo "
 "firewire."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Mostra un avviso prima di aprire un flusso yuv4mpeg (avanzato)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "Mostra un avviso quando la multi-traccia ha poco spazio di backup."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 "Mostra un avviso che consigli di pulire lo spazio del disco dopo un crash."
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Avvisi"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Sincronizzazione Midi (richiede i file midistart e midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Quando si inseriscono/uniscono fotogrammi:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Velocizza/Rallenta Inserzione"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Ricampiona Inserzione"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Metti xmms in pausa durante la riproduzione audio"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "Dispositivo CD           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Scegli dispositivo CD"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES può caricare tracce audio da questo CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "FPS Predefinito        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Fotogrammi al secondo da usare quando non viene specificato nulla"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Varie"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Nuovo tema:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temi"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Larghezza di banda dei download (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES dev'essere compilato senza \"configure --disable-OSC\" per utilizzare "
 "OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Controllo remoto OMC abilitato"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "Porta UDP       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Avvia OMC all'avvio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Streaming/Collegamento in rete"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Trasporto jack"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7796,48 +8041,44 @@
 "LiVES dev'essere compilato con jack/transport.h e jack/jack.h presenti per "
 "usare trasporto jack"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "File di configurazione di _trasporto jack"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "Il nome del server jack che può controllare il trasporto LiVES"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Avvia il _server all'avvio di LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr "_Client jack transport (inizio e fine)"
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr "Jack transport imposta la posizione di avvio"
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Audio jack"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "LiVES dev'essere compilato con presente jack/jack.h per usare l'audio jack"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -7845,86 +8086,73 @@
 "DEVI impostare il lettore audio in \"jack\" nella scheda Playback per usare "
 "l'audio jack"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "File di configurazione del server _audio jack"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Il nome del server jack per l'audio"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr "Riproduci l'audio anche quando transport è in _pausa"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Integrazione Jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Eventi a cui rispondere:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "Eventi _joystick"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "Dispositivo _joystick"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Il dispositivo joystick, per esempio /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Scegli dispositivo joystick"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "Eventi _MIDI"
 
-#: src/preferences.c:5498
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
+msgstr "Utilizza _ALSA MIDI (consigliato)"
+
+#: src/preferences.c:3987
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "Crea una porta ALSA MIDI a cui gli altri dispositivi MIDI si possono "
 "connettere"
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
-msgstr "Utilizza _ALSA MIDI (consigliato)"
-
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "Utilizza MIDI _grezzo"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Leggi direttamente dal dispositivo MIDI"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "Dispositivo MI_DI"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "Il dispositivo MIDI, per esempio /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Scegli dispositivo MIDI"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "_Valore di controllo MIDI"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -7932,26 +8160,25 @@
 "Numero di controlli MIDI per battuta di tastiera. L'aumento di questo può "
 "migliorare la risposta MIDI, ma può rallentare la riproduzione."
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "Ripetizione MIDI"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Numero di non-letture permesso tra letture successive."
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Attenzione: impostare questo valore troppo alto può rallentare la "
 "riproduzione.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "Studente MIDI/joystick"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7963,72 +8190,72 @@
 "della directory abbia effetto.\n"
 "Clicca OK per continuare.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "I cambiamenti di tema non avranno effetto fino al prossimo avvio di LiVES."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "Le opzioni di jack non avranno effetto fino al prossimo avvio di LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 "Sincronizzando con il valore dei fotogrammi esterno di %.8f fotogrammi al "
 "secondo.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Non è possibile inizializzare il ricevitore OSC\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "ATTENZIONE: Non è possibile avviare il server OSC sulla porta UDP %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Avviato il server OSC sulla porta UDP %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Non è possibile avviare il server OSC/UDP sulla porta %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Ridimensionamento dei fotogrammi da 1 a %d in corso"
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Ricampiona/Ridimensiona"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "La lunghezza del video è adesso di %d fotogrammi.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8038,154 +8265,146 @@
 "\n"
 "Il nuovo rapporto dev'essere maggiore di 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Ricampionando l'audio"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES non è stato in grado di ricampionare l'audio come richiesto.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Ricampiona Audio"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "L'audio è stato ricampionato a %d Hz, %d canali, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Ricampionando il video a %.8f fotogrammi al secondo..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Ricampionando il video a %.3f fotogrammi al secondo..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Errore di riordinamento !\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Ricampiona"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Ricampiona Audio"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Inserisci Silenzio"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nuovo Audio Clip"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Impostazioni Clip Esterne"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Valore (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Canali "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Dimensione Di Esempio "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Firmato"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Non Firmato"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Piccolo Endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Grande Endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Corrente"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Abilita audio"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Valore (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Canali "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Canali "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    Dimensione Di _Esempio "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Dimensione Di Esempio "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nuovo"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Fotogrammi Al Secondo "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Registra per un massimo di:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " ore  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minuti  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " secondi  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Illimitato"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Clicca OK per iniziare a registrare, o Annulla per uscire."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Cambia la velocità di riproduzione"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Ricampiona Video"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8202,7 +8421,7 @@
 "Per piacere inserisci la velocità di riproduzione desiderata\n"
 "in _fotogrammi al secondo"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8219,15 +8438,15 @@
 "Per piacere inserisci il valore _ricampionato\n"
 "in fotogrammi al secondo"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OPPURE inserisci la lunghezza desiderata del clip in _secondi"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Cambia anche la velocità dell'_audio"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8238,7 +8457,7 @@
 "traccia.\n"
 "Sei sicuro di voler cambiare la velocità ?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8249,49 +8468,49 @@
 "traccia.\n"
 "Sei sicuro di voler cambiare la velocità ?\n"
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Cambiamento Della Velocità"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Cambiata la velocità di riproduzione in %.3f fotogrammi al secondo e l'audio "
 "in %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Cambiata la velocità di riproduzione in %.3f fotogrammi al secondo.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Ricampionando il video"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Ricampionando il video degli appunti"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Riordinamento fotogrammi in corso"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8301,20 +8520,20 @@
 "\n"
 "LiVES non è stato in grado di riordinare i fotogrammi."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Disordinamento dei fotogrammi in corso"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "ricampionando l'errore..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8330,7 +8549,7 @@
 "Sei sicuro ?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8342,12 +8561,12 @@
 "Clicca 'OK' per salvare questa mappa dei tasti come predefinita\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Salvataggio della mappa dei tasti in %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8356,7 +8575,7 @@
 "\n"
 "Aggiornamento del file della mappa dei tasti %s in corso..."
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -8366,12 +8585,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Salvando i predefiniti degli effetti in tempo reale in %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8386,22 +8605,22 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Caricamento dei predefiniti degli effetti in tempo reale da %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Caricando le dimensioni predefinite del generatore da %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Caricamento della mappa dei tasti predefinita da %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8416,27 +8635,27 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Linea %d non valida in %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Tasto %d non valido in %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Effetto %s non valido in %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8445,16 +8664,21 @@
 "Questa versione di LiVES non può mescolare generatori/non-generatori nello "
 "stesso tasto (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Troppi effetti legati al tasto %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "aggiornamento richiesto.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8466,40 +8690,45 @@
 "Alcuni effetti non sono stati trovati.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Nessuna Descrizione"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informazioni su %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nome effetto: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nome plugin: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autore: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Versione: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8513,65 +8742,69 @@
 "generatori nello stesso tasto.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES non è stato in grado di trovare l'effetto %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Mappatura degli effetti in tempo reale"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Blocco tasto"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Tasto attivo"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Blocco tasto"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "Blocca la tastiera per questo tasto effetto"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Pulisci tutti gli effetti"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Modalità in corso di esecuzione"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Informazioni"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Imposta Parametri"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Nome effetto:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Salva come mappa dei tasti predefinita"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_Carica mappa dei tasti predefinita"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8624,11 +8857,6 @@
 msgid "none\n"
 msgstr "niente\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d canale/i %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8649,58 +8877,58 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "Backup automatico"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Audio di supporto"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Traccia corrente: %s (livello %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Traccia corrente: Audio di supporto\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Traccia corrente: Audio livello %d\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f secondi.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Fonte: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Clicca con il tasto destro per attivare il menu contestuale\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -8708,7 +8936,7 @@
 "Clicca due volte su un blocco\n"
 "per selezionarlo."
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8717,7 +8945,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8725,7 +8953,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8735,7 +8963,7 @@
 "\n"
 "Nessun clip caricato.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8745,7 +8973,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8759,12 +8987,12 @@
 "e una regione temporale\n"
 "per applicare i compositori.\n"
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "Dal secondo %.2f al secondo %.2f.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8772,182 +9000,186 @@
 "Click singolo sulla linea del tempo\n"
 "per selezionare un fotogramma.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+"Puoi cliccare e trascinare\n"
+"sotto la linea temporale"
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "per selezionare una regione temporale.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Clip selezionato"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "_Regola i punti di inizio e di fine"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr "_Modifica/codifica nell'editor clip"
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "_Mostra informazioni sul clip"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "_Chiudi questo clip"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mixer audio (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "Clicca una volta sulla linea temporale"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "per selezionare un frame."
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "per selezionare un blocco."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "I clip possono venire trascinati"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "sulla linea temporale."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "La modalità del mouse è: Sposta"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "i clip possono venire spostati in giro."
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "La modalità del mouse è: Seleziona."
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "Trascina col mouse sulla linea temporale"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "per selezionare tracce e tempo."
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "_Modalità di inserimento: Normale"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "Modalità del _mouse: Sposta"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "Modalità del m_ouse: Seleziona"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "_Gravità: Normale"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "_Gravità: Sinistra"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "_Gravità: Destra"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Chiudi il/i primo/i intervallo/i nel tempo e nelle tracce selezionate"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Chiudi intervalli"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Sposta blocco"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Sposta blocco audio"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Elimina blocco"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Elimina blocco audio"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Dividi tracce"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Dividi blocco"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Applica %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Elimina %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Inserisci blocco"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Inserisci intervallo"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Inserisci blocco audio"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Cambiamento dell'ordine dell'effetto"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "non firmato "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "firmato "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "grosso endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "piccolo endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -8956,15 +9188,15 @@
 "Valori multi-traccia impostati a %.3f fps, dimensione del fotogramma %d x "
 "%d, canali audio %d, tasso audio %d, dimensione audio di esempio %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "elenco di eventi non valido. Fallito.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "l'elenco degli eventi ha degli fps non validi. Fallito.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8979,7 +9211,7 @@
 "chiudere il set corrente,\n"
 "quindi caricare nel nuovo set dal menù File.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8990,431 +9222,439 @@
 "Questo ha un numero non valido di canali audio (%d) per LiVES.\n"
 "Non può essere caricato.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr "Il layout è stato eliminato.\n"
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multi-traccia %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Clip"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr "Pila FX"
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Parametri"
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "A_pri Selezione File..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importa Selezione da _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importa Selezione da d_vd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importa Selezione da v_cd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "I_mporta da Dispositivo"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "_Chiudi il clip selezionato"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Salva layout come..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Carica layout..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Pulisci/Elimina layout..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignora larghezza, altezza e valori audio dai layout caricati"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "EDITOR _CLIP"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "_Regola i punti del clip selezionato di inizio/fine"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Inserisci clip selezionato"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "In_serisci audio clip selezionato"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Elimina blocco selezionato"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_Vai al precedente blocco di confine"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_Vai al prossimo blocco di confine"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Pulisci _segni dalla linea del tempo"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Ignora i limiti della selezione durante l'inserimento"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "_Riproduci dalla Posizione Sulla Linea Del Tempo"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Muovi gli effetti con i blocchi"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Visualizza/_Modifica l'effetto selezionato"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Elimina l'effetto selezionato"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Applica l'effetto al _blocco..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Applica l'effetto alla _regione..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Tracce"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Rendi la traccia corrente Audio Di _Supporto"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Aggiungi Traccia Video al _Retro"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Aggiungi Traccia Video al _Fronte"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "_Dividi traccia corrente con il cursore"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_Dividi tracce video selezionate"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Inserisci intervallo nel tempo e nelle tracce selezionate"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Inserisci intervallo nella traccia corrente/tempo selezionato"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Chiudi tutti gli _intervalli nel tempo/tracce selezionate"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Se_lezione"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Seleziona Traccia Corrente"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Seleziona _tutte le tracce video"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "_Deseleziona tutte le tracce video"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Seleziona tutto il _tempo"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Seleziona dal tempo _zero"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Seleziona dal tempo _finale"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "Codice _temporale all'inizio della regione"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "Codice _temporale alla fine della regione"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "Avvio della _regione al codice temporale"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "Fine della _regione al codice temporale"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Cambia larghezza, altezza e valori audio..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderizza"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Renderizza tutto nel nuovo clip"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Renderizza _video"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Renderizza _audio"
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "_Pre-renderizza audo"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Blocca punti _Dentro/fuori"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Effetti correnti"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Parametri audio"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Mostra traccia _audio di supporto"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Visualizzazione compatta"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Tracce massime da mostrare..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Scorri per seguire la riproduzione"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Centra sul cursore"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Ingrandisci"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Rimpicciolisci"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_Dettagli multi-traccia"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "Finestra _Eventi"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "Finestra _Eventi (solamente il tempo selezionato)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_Mostra eventi FRAME"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Mostra tasti multi-traccia"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Modalità mouse: _Sposta"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Modalità mouse: Se_leziona"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "Modalità di inserimento: _Normale"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Inserisci con _audio"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Inserisci con _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Visualizzazione Estesa (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Visualizzazione Compatta (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "Gravità: _Normale"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "Gravità: _Sinistra"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "Gravità: _Destra"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Clip"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr "Pila FX"
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Parametri"
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Applica"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Tempo"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Elimina nodo"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "Nodo _successivo"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "Nodo _precedente"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "_Inverti riproduzione  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Velocità  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Ancora il punto di inizio alla linea del tempo"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "_Inizio ancora"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Ancora il punto di inizio alla linea del tempo"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Fotogramma iniziale"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Ancora il punto di fine alla linea del tempo"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "_Fine ancora"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Ancora il punto di fine alla linea del tempo"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Fotogramma finale"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Scorri"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9424,91 +9664,91 @@
 "==============================\n"
 "Passato alla modalità Modifica Clip\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Linea del tempo (secondi)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Audio di supporto"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Audio livello %d"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "Mostra/nascondi i dettagli dell'audio"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Audio livello %d"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (livello %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Seleziona traccia"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Mostra/nascondi audio"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (livello %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Effetto selezionato"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_Visualizza/Modifica questo effetto"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "Vis_ualizza questo effetto"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Elimina questo effetto"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "Non è possibile inserire dopo questo effetto"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Questo effetto non pù essere spostato"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  selezionato da %d a %d  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f secondi."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d fotogrammi"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9518,65 +9758,65 @@
 "==============================\n"
 "Passato alla modalità Multi-traccia\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr "Trascina il cursore del tempo dove"
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "vuoi impostare i parametri degli effetti"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Imposta i parametri, poi clicca \"Applica\"\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "L'effetto non ha parametri.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "output %s"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "livello %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "traccia audio"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "da %s a %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "Mappa dei filtri _precedente"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Inserisci pr_ima"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Inserisci _dopo"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "Mappa dei filtri _successiva"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9588,7 +9828,7 @@
 "Nessun effetto nella traccia corrente,\n"
 "tempo corrente.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -9598,7 +9838,7 @@
 "sulla linea temporale\n"
 "per applicarlo alla regione selezionata."
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -9608,7 +9848,7 @@
 "sulla linea temporale\n"
 "per applicarla alla regione selezionata."
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -9616,64 +9856,60 @@
 "Gli effetti possono essere trascinati\n"
 "in blocchi sulla linea temporale."
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Blocco/fotogramma selezionato"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Seleziona questo blocco"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Dividi il blocco qui"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Elenca gli _effetti qui"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Regola %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Elimina questo blocco"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Inserisci qui"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "In_serisci audio qui"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Intervallo inserito nelle tracce selezionate dal tempo %.4f a %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Intervallo inserito nella traccia %s dal tempo %.4f a %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Annullato %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Rifatto %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Dettagli multi-traccia"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9681,56 +9917,62 @@
 "\n"
 " (variabile)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "traccia %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "tracce %s e %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "tracce selezionate"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Aggiunti %s %s a %s da %.4f a %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Aggiunto l'effetto %s alla traccia %s da %.4f a %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderizzati %d fotogrammi nel nuovo clip.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Pulizia in corso..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Premi 'm' durante la riproduzione"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "per creare un segno sulla linea del tempo"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9739,7 +9981,7 @@
 "Audio inserito da %.4f a %.4f dal clip %s nell'audio di supporto dal tempo "
 "%.4f a %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -9747,7 +9989,7 @@
 "Fotogrammi inseriti da %d a %d dal clip %s nella traccia %s dal tempo da "
 "%.4f a %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9756,7 +9998,7 @@
 "Regione temporale da %.3f a %.3f\n"
 "selezionata\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9764,12 +10006,12 @@
 "seleziona una o più tracce\n"
 "per creare una regione.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d tracce video selezionate.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9777,7 +10019,7 @@
 "Clicca due volte sulla linea temporale\n"
 "per deselezionare la regione temporale."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9785,7 +10027,7 @@
 "Clicca una volta su un effetto\n"
 "per selezionarlo."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9793,7 +10035,7 @@
 "Clicca due volte su un effetto\n"
 "per modificarlo"
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9801,7 +10043,7 @@
 "Clicca col tasto destro del mouse su un effetto\n"
 "per il menù del contesto.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -9809,33 +10051,21 @@
 "L'ordine degli effetti può essere cambiato in\n"
 "MAPPE FILTRO"
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "o INSERISCI DOPO per spostarlo."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-"Puoi cliccare e trascinare\n"
-"sotto la linea temporale"
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "per selezionare una regione temporale.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "Clicca su un altro effetto,"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -9843,46 +10073,46 @@
 "e quello selezionato\n"
 "sarà inserito"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "dopo di esso.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "prima di esso.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Rimossi i valori del parametro per l'effetto %s al tempo %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Imposta i valori del parametro per %s %s su %s al tempo %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "Ricarica _automaticamente ogni volta"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Salvato il layout in %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "clip e fotogrammi"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "clip"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "fotogrammi"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9890,7 +10120,7 @@
 "\n"
 "Ricarica automaticamente il layout.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9901,11 +10131,11 @@
 "Alcuni %s mancano nel layout%s\n"
 "Quindi non può venire caricato correttamente.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "backup automatico"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9914,43 +10144,43 @@
 "\n"
 "Impossibile caricare il file layout %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Caricamento del layout da %s in corso..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Ottenuti %d eventi...processo in corso..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Controllando e ricostruendo l'elenco degli eventi"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d errori trovati.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Fps multi-traccia impostato a %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer audio multi-traccia"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Azzera valori"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Chiudi mixer"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -9958,43 +10188,43 @@
 "_Inverti l'audio di supporto\n"
 "e i volumi dei layer"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Regola i valori dell'audio di sostegno e di livello in modo che la loro "
 "somma sia pari a 1.0"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "_Riunisci audio livello"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Regola tutti i valori audio del layer allo stesso valore"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "Server JACK avviato\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Non è stato possibile connettersi al server JACK\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Sottosistema audio jack avviato.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Lettore audio jack avviato.\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10002,7 +10232,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10010,129 +10240,129 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "non accumulato"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "accumulato"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Rispondendo agli eventi del joystick da %s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr "Creazione porta sequenza ALSA in corso..."
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Rispondendo agli eventi MIDI da %s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "dati"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocità"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valore"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "stato"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variabile"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "Vers."
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "Note on sul canale MIDI %d"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "Note off sul canale MIDI %d"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "Canale MIDI %d, controller %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "Pitch bend sul canale MIDI %d"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "Cambiamento MIDI ch %d pgm"
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "Pulsante joystick %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Asse joystick %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "intervallo"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* scala"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10140,204 +10370,212 @@
 "\n"
 "Clicca OK per eliminare tutte le entrate\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: Studente OMC"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "Pulisci non _corrispondenti"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Elimina tutto"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Avvia riproduzione video"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Interrompi riproduzione video"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "Selezione clip <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Scambia il clip in primo piano con il n° clip valido"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Riproduci in avanti"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Riproduci video in avanti"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Riproduci all'indietro"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Riproduci video all'indietro"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Inverti la direzione di riproduzione"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Inverti la direzione della riproduzione del video"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Riproduci video più velocemente"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Riproduci il video con un valore un po' più veloce"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Riproduci video più lentamente"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Riproduci il video con un valore un po' più lento"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "Commuta congelamento video"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Congela video, o se è già congelato, scongelalo"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "Imposta il rapporto dei fotogrammi del video a <fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Imposta il valore dei fotogrammi del clip in primo piano a <float fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Avvia la registrazione"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Interrompi la registrazione"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "Commuta lo stato di registrazione"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "Scambia i clip in primo piano e in secondo piano"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Azzera i tasti degli effetti"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "Disattiva tutti gli effetti."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "Abilita tasto effetto <key>"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "Disabilita tasto effetto <key>"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "Commuta tasto effetto <key>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Imposta il valore del parametro <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 "Imposta <value> del parametro (numerico) p° per il tasto di effetto <key>."
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "Scambia primo piano nel prossimo clip"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "Scambia primo piano nel clip precedente"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Imposta il valore dei fotogrammi del video al rapporto <fps_ratio>"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Imposta il rapporto del valore dei fotogrammi del clip in primo piano a "
 "<float fps_ratio>"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "Reinnesca il clip <clipnum>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Scambia il clip in primo piano con il n° clip valido, e azzera il numero di "
 "fotogrammi"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr "Salta il ciclo alla modalità successiva per il tasto di effetto <key>"
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "Salta il ciclo alla modalità precedente per il tasto di effetto <key>"
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "numero clip"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "tasto"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Salvando la mappatura del dispositivo nel file %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10350,7 +10588,7 @@
 "Errore durante l'analisi del file\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10363,12 +10601,12 @@
 "Versione non valida nel file\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Caricando la mappatura del dispositivo dal file %s..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10585,10 +10823,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Diminuisci dissolvenza audio"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Diminuisci dissolvenza audio"
-
 #~ msgid "Fade"
 #~ msgstr "Dissolvi"
 
@@ -11072,9 +11306,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "La _cima sinistra è costituita dagli appunti"
 
-#~ msgid "_Top"
-#~ msgstr "_Cima"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "Segmenti _verticali"
 
@@ -11294,7 +11525,7 @@
 #~ msgstr "onda"
 
 #~ msgid "Unable to open output file !"
-#~ msgstr "Non è stato possibile aprire il file di output !"
+#~ msgstr "Impossibile aprire il file di output!"
 
 #~ msgid "LiVES could not write to $nfile."
 #~ msgstr "LiVES non ha potuto scrivere in $nfile."
@@ -11335,15 +11566,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Devi prima impostare il dispositivo CD in Preferenze."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVES non ha trovato abbastanza tracce che soddisfino la tua richiesta."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Prova ancora con valori diversi."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "Fallito $nome_plugin:"
 
 #~ msgid "$error"
 #~ msgstr "$errore"
+
+#~ msgid "Default value:    "
+#~ msgstr "Valore predefinito:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "Valore minimo: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "Valore massimo: "

LiVES-1.6.1.tar.bz2/po/ja.po -> LiVES-2.0.3.tar.bz2/po/ja.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-01-11 23:42+0000\n"
-"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-14 13:17+0000\n"
-"X-Generator: Launchpad (build 14664)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "してください。\n"
 "ご協力ありがとうございます。LiVESを再起動すれば復元が行われるでしょう。\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,7 +70,7 @@
 "クラッシュ報告する際は、使用しているOS・ディストリビューションやLiVESのバー"
 "ジョンなどの詳細も含めてください ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -62,7 +78,7 @@
 "また、以下の情報もお願いします:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,171 +88,184 @@
 "と共に実行してください。\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "セットの保護\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "リサイズ"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "全フレームのリサイズ(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "推奨"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "使用不能！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**現在のレイアウト**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "ビルトイン"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "カスタム"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "テスト"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "リアルタイムエフェクトプラグインを読み込み中..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "JACKサーバーの音声機能を開始しています..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "JACKサーバーのトランスポート機能を開始しています..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "JACKサーバーのトランスポート機能に接続しています..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
-"\n"
-"\n"
-"JACKサーバーを手動で起動する必要があります。JACKサーバーが起動しているか\n"
-"ファイル「~/.lives」の<jack_opts>の値を16に変更し\n"
-"LiVESを再起動してください。\n"
-"\n"
-"あるいは、LiVESを次のプログラムと共に起動して試してください: \"lives -"
-"jackopts 16\"、 "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "PulseAudioサーバーを開始しています..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "必ずしも必要ではない依存関係を確認しています:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convertが見つかりました..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convertは見つかりませんでした..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "compositeが見つかりました..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "compositeは見つかりませんでした..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "soxが見つかりました\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "soxは見つかりませんでした\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wavが見つかりました..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wavは見つかりませんでした..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackdが見つかりました..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackdは見つかりませんでした..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulseaudioが見つかりました..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulseaudioは見つかりませんでした..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "pythonが見つかりました..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "pythonは見つかりませんでした..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrabが見つかりました..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrabは見つかりませんでした..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfoが見つかりました..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfoは見つかりませんでした..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr "不明 - パッチを送ってください！"
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -247,22 +276,48 @@
 "\n"
 "ウィンドウマネジャーは \"%s\" です; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "検出されたモニタ数: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "検出されたCPU数: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "リトルエンディアン"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "ビッグエンディアン"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "一時ディレクトリは %s です。\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -272,15 +327,15 @@
 "サポートしない状態でコンパイルされています。\n"
 "そのため音声機能の多くが利用できません。\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "JACKサーバーをサポートした状態でコンパイルされています\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "PulseAudioをサポートする状態でコンパイルされています！\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -289,7 +344,7 @@
 "LiVES version %s へようこそ。\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -298,72 +353,72 @@
 "\n"
 "起動方法: %s [オプション] [ファイル名 [開始時刻] [フレーム]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "ファイル名は、メディアファイルもしくはバックアップファイルの名前です。\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "開始時刻 : ファイル名 開始時刻(秒)\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "フレーム : オープンする最大フレームの数\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "オプション:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : ヘルプを表示して終了\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr "-tmpdir <tempdir>: 別な作業用ディレクトリを使う(例 /var/ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : 自動読み込みするクリップをsetnameとする\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : 開始時にセットの読み込みをしない\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : 読み込み時にクラッシュからの復元を強制しない\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : 読み込み時にクラッシュからの復元を強制する\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr "-nothreaddialog  : 何も行いません - 後方互換性のために残しています\n"
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : GUIを表示しない\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : スプラッシュウィンドウを表示しない\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : プレイウィンドウを表示しない\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : クリップ編集モードで起動する\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : マルチトラックモードで起動する\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -371,29 +426,29 @@
 "-fxmodesmax <n>  : エフェクトキーそれぞれに <n> つのモードを許可する(最小は"
 "1、デフォルトは8)\n"
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : OSCリスナーをUDPポート<port>で開始する\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : OSCリスナーを起動しない\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr "-aplayer <ap> : 選択したオーディオプレーヤーを起動する。<ap>はmplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr "、soxまたはjack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -403,15 +458,15 @@
 "transport client, 2 = jack transport master,4 = start jack transport server, "
 "8 = pause audio when video paused,16 = start jack audio server] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " または sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autoload devicemap\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -419,16 +474,16 @@
 "-vppdefaults <file>          : 映像再生プラグインのデフォルトを<file> から読"
 "み込む(注: プラグインの種類ではなく設定のセットのみ)\n"
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : クラッシュのデバックを試みる (gdbのインストールが必要)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "GUIを開始..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -436,26 +491,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"要求したテーマを指定できませんでした。テーマが下記のディレクトリにインストー"
-"ルされていることを確認してください。\n"
-"%s/%s\n"
-"(おそらく、~/.livesで指定する<prefix_dir>の値を変更する必要があるでしょう)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVESはファイルを/tmpへ書き込むことができませんでした。\n"
-"/tmpに書き込みできることを確認して、再度試してください。\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -469,50 +516,36 @@
 "LiVESを実行する前に、パッケージに附属するREADMEファイルを\n"
 "確認してください。\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVESは設定ファイル %s/.lives を\n"
-"読み込むことができませんでした。\n"
-"\n"
-"ファイルパーミッションを確認してもう一度試してください。\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVESは設定ファイル %s/.lives に\n"
-"書き込むことができませんでした。\n"
-"\n"
-"ファイルとディレクトリのパーミッションを確認し\n"
-"もう一度試してください。\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"%s/.lives にある <tempdir> の\n"
-"設定を確認して\n"
-"再度試してください。\n"
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -527,7 +560,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -545,7 +578,7 @@
 "\n"
 "よろしくお願いします。\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -555,7 +588,14 @@
 "LiVESは現在のところ正しく動作するために'mplayer'または'sox'を必要とします。い"
 "ずれかひとつもしくは両方をインストールして、再び試してください。\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -565,7 +605,7 @@
 "LiVESは'mplayer'を検出できませんでした。LiVESをより完全に使うには、mplayerを"
 "インストールするとよいでしょう。\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -575,7 +615,7 @@
 "LiVESは'convert'を検出できませんでした。描画エフェクトを使いたい場合はconvert"
 "およびimageMagickをインストールしてください。\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -585,7 +625,7 @@
 "LiVESは'composite'を検出できませんでした。マージ機能を使いたい場合はcomposite"
 "およびimageMagickをインストールしてください。\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -595,7 +635,7 @@
 "LiVESはsoxを探すことができませんでした。いくつかの音声機能は使えません。soxを"
 "インストールしてください。\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -603,68 +643,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVESはエンコーダプラグインを見つけられませんでした。\n"
-"%s%s%s/ に正しくインストールされているかどうか\n"
-"確認してください。\n"
-"それがないと「保存」できないでしょう。\n"
-"また、~/.lives の <lib_dir> を変更する必要があるかもしれません。\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "セット %s を自動読み込み中..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "無効なオーディオプレーヤー %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <無題%d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <ファイル未設定>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "記録 %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!記録 %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "再生"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -672,35 +706,35 @@
 "LiVESはこの画像をキャプチャできませんでした\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "ファイル %s を閉じました\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "左音声"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "右音声"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -714,26 +748,11 @@
 "きません。\n"
 "「設定」の再生オプションを調整して、再度試してください。\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - 再生ウィンドウ"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - 再生ウィンドウ"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -748,7 +767,7 @@
 "\n"
 "(空き容量 = %s)\n"
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -763,7 +782,7 @@
 "LiVES はこのディレクトリに書き込んだり、空き領域を読み込めませんでした。\n"
 "他の場所を選択してください。\n"
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -780,7 +799,7 @@
 "\n"
 "(空き容量 = %s)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -793,11 +812,11 @@
 "%s\n"
 "再度試して、他の場所を指定してください。\n"
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "ディレクトリ名が長すぎます！"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -805,7 +824,7 @@
 "選択した音声の入出力先を開始できませんでした！\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -815,7 +834,7 @@
 "\n"
 "ほとんどのユーザーにはPulseAudioがお勧めです。"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -823,7 +842,7 @@
 "、ですがお使いのLiVESは、PulseAudioのサポートなしでコンパイルされています。\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -833,11 +852,11 @@
 " LiVESを起動する前にPulseAudioサウンドサーバーをインストールしてください。\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "プロのユーザー向けにはJACKサウンドサーバーの使用を推奨します"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -846,7 +865,7 @@
 "います。\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -856,7 +875,7 @@
 "JACKサウンドサーバーをインストールしてください。\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -868,11 +887,11 @@
 "声機能を試してください。\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOXは先進的なプレイヤーが動作しない場合に使えるでしょう、 "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -880,7 +899,7 @@
 "しかし、いくつかの音声機能は使えないでしょう。\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -890,7 +909,7 @@
 "LiVESを起動する前に sox をインストールする事を推奨します。\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -898,137 +917,145 @@
 "mplayerはテスト目的での使用を推奨します。\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - オーディオプレイヤーを選んでください"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "PulseAudioサウンドサーバーを使用する(_P)"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "JACKサウンドサーバーを使用する(_J)"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Sox音声プレイヤーを使用する(_S)"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "mplayerを使用する(_M)"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "スキップ"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "完了"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "失敗しました"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - 設定のテスト"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - トラブルシューティング"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVESの基本設定のテストを開始します\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "\"sox\" のインストールチェック"
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "LiVESですべての音声機能を利用できるようにするには sox をインストールしてくだ"
 "さい。"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "soxの音声変換機能のチェック"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "176400 バイトのメモリを割り当てられません。"
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "以下に書き込めません: %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr "コマンドの実行に失敗しました: %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "sox_fmt_all または同様のものをインストールしてください"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "\"mplayer\" のインストールチェック"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr "LiVESのデコード機能をすべて使うにはmplayerをインストールしてください"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "mplayerの音声変換機能のチェック"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "PCM/WAVフォーマットに対応したmplayerのインストールをおすすめします。"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
-msgstr "mplayerのpng/aplhaデコード機能のチェック"
+msgstr "mplayerのpng/alphaデコード機能のチェック"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "mplayer を最新バージョンにアップグレードすることを推奨します"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "mplayerのJPEGデコード機能のチェック"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 "アルファチャネル付きのPNGとJPEGに対応したmplayerをインストールしてください"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "JPEG出力が可能な mplayer の利用を推奨します"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "\"convert\" コマンドのインストールチェック"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 "すべてのレンダリングエフェクトを利用できるようにするにはImageMagick をインス"
 "トールしてください"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1040,7 +1067,7 @@
 "    キャンセルを押して終了し、不明なコンポーネントをインストールしてくださ"
 "い。もしくは次へを押すと進みます    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1050,7 +1077,7 @@
 "\n"
 "最後に、LiVESの起動時のデフォルトの画面を選択してください。\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1060,7 +1087,7 @@
 "\n"
 "LiVESには2種類のメイン画面があり、どちらの画面でも起動することができます。\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1070,76 +1097,76 @@
 "\n"
 "デフォルトの画面は、後で「設定」から変更することもできます。\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - 起動時の画面の選択"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "クリップ編集モードで起動(_C)"
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr "これは単純な編集作業や VJ 向けに最も良い選択です。\n"
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "マルチトラックモードで起動(_M)"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "複数のクリップを扱う複雑な映像編集を行う場合は、こちらを選択してください。\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "完了(_F)"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "LiVESにファイル拡張子を指定する(_F)"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr "LiVESがファイル拡張子を補完(.%s)(_F)"
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "インターレースの解除"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "これを設定すると、フレームがインポートされたときにインターレースを解除しま"
 "す。"
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "プレビュー"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "クリックで、選択された映像、画像、音声をプレビュー(_P)"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "クリックで、選択された音声をプレビュー(_P)"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "クリックで、映像をプレビュー(_P)"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - 処理中..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1153,8 +1180,8 @@
 "\n"
 "忘れないよう後でエフェクトを停止(ctrl-0)させてください!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1162,105 +1189,114 @@
 "\n"
 "お待ちください"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "詳細を表示"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
-msgstr "OK(_O)"
+msgstr "OK(_E)"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "プレビュー(_P)"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "一時停止(_E)"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "一時停止（_E）"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "フォーマット"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "フレームサイズ"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "ファイルサイズ"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "バイトサイズ"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "全時間"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "フレーム"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "イベント"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "音声"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "レート/サイズ"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "右音声"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - エンコーディングオプション"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr "<------------- (推奨サイズを適用する場合はチェックを入れて下さい(_S))"
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr "<------------- (推奨サイズを計算する場合はチェックを入れて下さい(_S))"
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr "アスペクト比を維持するためレターボックスを使用する(オプション)(_L)"
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr "画面が伸縮されないよう、画像の上部あるいは左右に黒い四角を配置します。"
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr "アスペクト比を維持するためレターボックスを使用する(オプション)(_L)"
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "設定を保存(_M)"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "推奨される設定を使用(_R)"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1268,75 +1304,75 @@
 "これ以上の警告を表示しない(_N)\n"
 "(「設定 | 警告」から変更可能です)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "詳細を表示(_D)"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "ウィンドウを閉じる(_C)"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "ファイルに保存(_S)"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - 挿入"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "挿入する回数(_N)"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "音声に合わせて挿入(_I)"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "選択範囲の前に挿入(_B)"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "選択したフレームの前にクリップボードを挿入"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "選択範囲の後に挿入(_A)"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "選択したフレームの後にクリップボードを挿入"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "音声と共に挿入(_W)"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "音声なしで挿入(_O)"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - 選択を開く"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    選択開始時間 (秒)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    開くフレーム数"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - 場所を開く"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: - Youtube クリップを開く"
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1352,7 +1388,7 @@
 "また、「設定 | ストリーミング」でバンド幅の設定も確認してください。\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1367,7 +1403,7 @@
 "このツールの最新バージョンをインストールしているか確認してください。\n"
 "\n"
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1377,39 +1413,55 @@
 "例: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr "Youtube URL : "
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "バンド幅情報を送らない"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "ストリームの取得に問題がある場合はこの設定を試してください"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr "ダウンロード先ディレクトリ(_D): "
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr "ディレクトリにダウンロード..."
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr "ダウンロードファイル名(_F): "
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - クリップの名称変更"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - セット名の入力"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr "LiVES: - 再読み込みするセット名を入力"
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - 作業ディレクトリの選択"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1421,7 +1473,7 @@
 "使いたい名前を入力してください。\n"
 "なお終了しようとするときに、LiVESは再度クリップセットの保存を促します。\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1430,7 +1482,7 @@
 "あります。\n"
 "また、これはプロジェクト名としても利用されます。\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1440,243 +1492,200 @@
 "このスタートアップウィザードでは、このアプリケーションをより活用できるよう\n"
 "初期インストールの案内をいたします。\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"まず初めにLiVESが利用する作業ディレクトリを選択する必要があります。\n"
-"このディレクトリは十分に空き容量のあるディレクトリにしてください。\n"
-"注 :多くのシステムでは /tmp はシャットダウン時に削除されますので/tmp には作成"
-"しないでください。\n"
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - クリップの名称変更"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - セット名の入力"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - 再読み込みするセット名を入力"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - 作業ディレクトリの選択"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "新しい名前 "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "セットの名前 "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "デフォルトを使用(_A)"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "詳細(_A)"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- 入力デバイスの選択"
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr "入力デバイスの選択:"
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- CDトラックの読み込み"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- DVDタイトル/チャプターの選択"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- VCDタイトルの選択"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- 表示するトラックの最大値変更"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- デバイスの詳細"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "(%sから)読み込みするトラック"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVDタイトル"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCDタイトル"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "表示するトラック数の最大値"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "デバイス:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "デバイス:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "チャプター  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "キャンセル  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "オーディオ ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "入力ポート数"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "デフォルトの幅、高さ、FPSを使用します"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "幅"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "高さ"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "ドライバ"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "出力フォーマット"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- 音声のフェードイン"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- 音声のフェードアウト"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "フェードイン  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "最初"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "フェードアウト  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "最後"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "秒"
 
-#: src/interface.c:2948
-msgid "selection."
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr "選択"
 
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - 音楽のランダム再生"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "要求するトラックの数:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "ディレクトリ:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "サブディレクトリを含む"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "最小ファイルサイズ (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "最大ファイルサイズ (MB)        "
-
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - ファイルコメント (オプション)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "タイトル/名前 : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "作者/アーティスト : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "コメント : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr "字幕をファイルに保存(_S)"
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "字幕ファイル"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "参照..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: ディレクトリの選択"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: ファイルの選択"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - キャンセル/破棄/保存"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1686,7 +1695,7 @@
 "現在のレイアウトは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1696,7 +1705,7 @@
 "現在のレイアウトは最後の保存から変更されています。\n"
 "どうしますか?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1706,7 +1715,7 @@
 "現在のクリップセットを保存することができます。\n"
 "どうしますか?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1714,7 +1723,7 @@
 "現在のクリップセットは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1722,7 +1731,7 @@
 "現在のレイアウトは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1730,7 +1739,7 @@
 "最後に保存され、現在のレイアウトが変更されていません。\n"
 "を行うにはどのような希望ですか？\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1738,7 +1747,7 @@
 "作成したフレームを含んだ現在のレイアウトは保存できません。\n"
 "マルチトラックモードを終了する前にレンダリングしておくのが良いでしょう。\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1748,43 +1757,43 @@
 "作成したフレームを含む現在のレイアウトは保存されません。\n"
 "どうしますか？"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "クリップセット名(_N)"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "次回、自動で再読み込みする(_A)"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "レイアウトの除去(_W)"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "変更を無視(_I)"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "クリップセットを削除(_D)"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "レイアウトを削除(_D)"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "レイアウトを保存(_S)"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "クリップセットを保存(_S)"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: レイアウトを復元？"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1794,57 +1803,57 @@
 "LiVESは、前回のセッションのマルチトラックモードのレイアウトを検出しました。\n"
 "再度このレイアウトを開き、復元しますか？\n"
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: - ディスク回復オプション"
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr "孤立したクリップを削除(_O)"
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "閉じたクリップのバックアップファイルを消去(_B)"
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr "レイアウトのみでクリップがないセットを削除(_L)"
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr "デフォルトに戻す(_R)"
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr "承認(_A)"
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "セット %s として保存しています..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "ファイルの選択"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "クリップを保存するファイル名を入力してください。\n"
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr "ダウンロードするには有効な URL を入力してください。\n"
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "%s を %s にダウンロード中..."
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr "クリップをダウンロード中"
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1856,11 +1865,11 @@
 "クリップの URL を確認した上で、最新の youtube-dl が\n"
 "インストールされているか確認してください。\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "このファイル"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1868,7 +1877,7 @@
 ",\n"
 " - 現在のレイアウトを含む - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1883,7 +1892,7 @@
 "\n"
 "本当に閉じますか？"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1898,7 +1907,7 @@
 "\n"
 "本当に閉じますか？"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1908,7 +1917,7 @@
 "\n"
 "本当に閉じますか？"
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1916,7 +1925,7 @@
 "\n"
 "無効なプロジェクトファイルです。\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1939,33 +1948,33 @@
 "いったんこの作業を行えば、新しいプロジェクトをインポートできるようになりま"
 "す。\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "プロジェクト %s をセット %s としてインポート..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "プロジェクトのインポート"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "プロジェクト %s をエクスポート..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "プロジェクトのエクスポート"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr ".lv1ファイルからリストア"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr ".lv1ファイルとしてバックアップ"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr ".lv1ファイルからリストア"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1977,90 +1986,90 @@
 "セットはディスクから消去されます。\n"
 "よろしいでしょうか?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr "セット %s を削除しています..."
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "セットの削除..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "セットの削除"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "セット %s はディスクから完全に削除されました。\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "無音部分の挿入"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "アンドゥします"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "音声のリストア..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "フレームイメージの消去"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "オーバーしたフレームを削除"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "ビデオの長さは現在%dフレームです(%.3fフレーム/秒)。\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "クリップボードは%dフレームにリサンプリングされました。\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "リドゥします"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "%dから%d%sフレームをクリップボードにコピーします..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "クリップからフレームを抽出"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
-msgstr "Copie vers le クリップボード"
+msgstr "クリップボードにコピー"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "カット"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "%d フレームを 新しいクリップ %s に貼り付けます..."
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "貼り付けます"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "...音声を追加..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2070,7 +2079,7 @@
 "Image-magickパッケージの'convert'コマンドをインストールして、LiVESを再起動し"
 "てください。\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2084,7 +2093,7 @@
 "すべてのフレームを選択して、音声メニューから\n"
 "「音声のトリミング」機能を選択しましょう。"
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2092,7 +2101,7 @@
 "音声レートが適合しなかったため、LiVESは挿入できませんでした。\n"
 "'sox'をインストールして再試行してください。"
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2103,7 +2112,7 @@
 "う。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2114,11 +2123,11 @@
 "う。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "クリップボードの音声をリサンプリング"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2130,7 +2139,7 @@
 "LiVESはクリップボードの音声をリサンプリングできませんでした。\n"
 "クリップボードの音声は消去されました。\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2143,30 +2152,30 @@
 "LiVESはクリップボードの音声をリサンプリングできませんでした。 \n"
 "変更前の音声を用いて、挿入を続けますか?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "クリップボードから%d%sフレームを挿入..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "挿入します"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "%d時間挿入します (クリップボード%sから)..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "%dフレーム挿入します (クリップボード%sから)..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "挿入"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2176,7 +2185,7 @@
 "全フレームを削除すると、このファイルを閉じます。\n"
 "構いませんか ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2186,8 +2195,8 @@
 "削除によってマルチトラックレイアウトからフレームが失われます。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2197,7 +2206,7 @@
 "削除することによって、マルチトラックレイアウトで音声が削除されるでしょう。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2207,7 +2216,7 @@
 "消去することによってフレームはマルチトラックレイアウト中で移動します。\n"
 "続けますか?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2217,20 +2226,20 @@
 "消去することによって音声はマルチトラックレイアウト中で移動します。\n"
 "続けますか?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "%dから%d%sフレームを削除..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "削除します"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "消去"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2240,7 +2249,7 @@
 "\n"
 "選択範囲をロックします。\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2252,11 +2261,11 @@
 "(キャンセルするには、'r'キーを押すか、再生を始める前に 再生|動作を記録 を再度"
 "クリックしてください。\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "記録はキャンセルされました。\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2269,7 +2278,7 @@
 "プラグイン'%s'の報告:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2282,7 +2291,7 @@
 "プラグイン%sの中に'init'メソッドが見つかりません。\n"
 "このプラグインは壊れているか、正しくインストールされていないようです。"
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2295,23 +2304,23 @@
 "\n"
 "コピーしたくない場合は、'キャンセル'を押してください。\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "セット %s の保存"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "セット %s からクリップを読み込み"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 "セット (%3$s) から %1$d 個のクリップと %2$d 個のレイアウトを回復しました。\n"
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2323,40 +2332,37 @@
 "動作させるようにしてください。\n"
 "OKをクリックすると先に進みます。\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "ディスクスペースの消去..."
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr "ディスク容量を回復"
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "%s のディスク容量を回復しました。\n"
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "フレームレートとフレーム値のリストア..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"外部: %s\n"
-"内部: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "バッファー内"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2364,7 +2370,7 @@
 "\n"
 "  開いています..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2373,7 +2379,7 @@
 "\n"
 "(%d バーチャル)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2382,7 +2388,7 @@
 "\n"
 "(%d デコード済み)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2391,7 +2397,7 @@
 "\n"
 "  %.2f 秒."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2399,23 +2405,23 @@
 "\n"
 "  不明"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "符号なし"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "符号付き"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "ビッグエンディアン"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "リトルエンディアン"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2424,7 +2430,7 @@
 "  %d Hz %d ビット\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2454,11 +2460,24 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "映像エディターとVJプログラム"
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Jun iio https://launchpad.net/~iiojun\n"
+"  OKANO Takayoshi https://launchpad.net/~kano\n"
+"  Shushi Kurose https://launchpad.net/~kuromabo\n"
+"  Takashi Sakamoto https://launchpad.net/~mocchi"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2481,7 +2500,7 @@
 "salsaman@gmail.com\n"
 "ホームページ: http://lives.sourceforge.net"
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2491,17 +2510,14 @@
 "\n"
 "このファイルをプレビューするにはmplayerをインストールする必要があります。\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
-"プレビュー機能はX11でなければ動きません。プレビューウィンドウのwindow idが必"
-"要です。\n"
-"やり方をご存知でしたらパッチを送ってください。\n"
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2513,168 +2529,180 @@
 "す。\n"
 "続けても構いませんか?"
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "音声%s, タイプ%sを開きます..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "音声を開きます"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "キャンセルします"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "新しい音声: %d Hz %d チャンネル %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "音声を収容します"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "新しい音声"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d フレームで十分です !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - エンコーダのデバッグ出力"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "フルスクリーン再生 (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "フルスクリーン再生オフ (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "ダブルサイズ (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "シングルサイズ (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "再生ウィンドウを隠す (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "再生ウィンドウを表示する (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "独立したウィンドウで再生 (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr "LiVES: - ストリーミング"
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "連続ループをオフ (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "連続ループをオン (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "音声ボリューム (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "音声ミュートをオフ (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "音声ミュートをオン (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "クリップボードを反転します..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "クリップボードを反転"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
-msgstr "LiVES: サブタイトルの読み込み先..."
+msgstr "LiVES: 字幕の読み込み先..."
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "字幕ファイルを読み込みます: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "字幕を削除しました。\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "音声ファイルの選択"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "「ツール|設定|その他」で、CD再生デバイスを設定してください。\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "CDトラック%dから%sを開きます..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CDトラック%d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "CDトラックを開く..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "CDトラックの読み込みエラー\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "トラックの選択"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "レイアウトエラー"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "ウィンドウを閉じる(_W)"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "エラーを消去(_E)"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "レイアウトを消去(_D)"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "再開"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2684,27 +2712,27 @@
 "一時停止\n"
 "(クリックすると処理を再開します)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "一時停止しています..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "一時停止"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "再開..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "維持"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "停止"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2716,28 +2744,28 @@
 "(現状を保つには「維持」をクリック)\n"
 "(処理を続ける場合は「再開」をクリック)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr "停止"
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: 選択したフレーム"
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr "フレームに名前を付けて保存(_S)..."
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr "音声が映像を%.4f秒上回っています。%dフレーム、%.4f fps\n"
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2751,7 +2779,7 @@
 "他のプラットフォームで動作させるにはパッチを送ってください。\n"
 "\n"
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2763,7 +2791,7 @@
 "この機能を利用するには xwininfo をインストールしなければなりません。\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2771,7 +2799,7 @@
 "\n"
 "記録時間は0より大きくなければなりません。\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2782,14 +2810,14 @@
 "外部ウインドウのキャプチャ:\n"
 "\n"
 "'OK'をクリックしてから、キャプチャしたいウィンドウをクリックしてください。\n"
-"キャンセルするには'Cancel'をクリックしてください。\n"
+"キャンセルするには'キャンセル'をクリックしてください。\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "外部ウィンドウを解放しました。\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2797,7 +2825,7 @@
 "キャプチャーしたいウィンドウをクリックしてください\n"
 "記録を終える場合は 'q' を押してください"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2813,19 +2841,19 @@
 "'q'キーで終了。\n"
 "(標準設定の%.3fフレーム/秒を使います)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVESはこのウィンドウをキャプチャできませんでした。ごめんなさい。\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "選択した音声をエクスポート..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "音声をエクスポート..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2839,81 +2867,86 @@
 "新しい速度でエクスポートするには'OK'をクリック。元の速度でエクスポートするに"
 "は'キャンセル'をクリックしてください。\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "%dから%dまでの音声フレームを%sとしてエクスポート..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "音声を%sとしてエクスポート..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "音声をエクスポートします"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "音声ファイルの追加..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "音声ファイル%sを追加します..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "音声を追加します"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "音声の追加"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "音声を%.2fから%.2f秒までトリミングします..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "音声をトリミング/パディングします"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "音声のトリミング"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "音声をフェードイン"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "音声をフェードイン"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "音声をフェードアウト"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "音声をフェードアウト"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s が %.1f 秒オーバー..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s は %.2f秒から%.2f秒まで..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "音声のフェード..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2923,60 +2956,51 @@
 "全音声を削除すると、このファイルを閉じます。\n"
 "構いませんか ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "全音声の削除..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "音声を%.2fから%.2f秒まで削除します..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "音声を削除します"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "音声の削除"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "新しい音声の記録"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "%.2fから%.2f秒まで無音部分を挿入します..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "無音部分を挿入します"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"%d レイアウトを削除します。...よろしいでしょうか?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "ピクスマップファイルを見つけられませんでした: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - 結合"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "クリップボード [ %d フレーム ]   選択範囲 [ %d フレーム ] を結合"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2984,607 +3008,585 @@
 "クリップボード [ %d フレーム (リサンプリング後)]   選択範囲 [ %d フレーム ]を"
 "結合"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "先頭に合わせる(_S)"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "最後に合わせる(_E)"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "クリップボードの余分なフレームについての処理 -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "フレームの挿入(_I)"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "フレームを落とす(_D)"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "ループクリップボードの回数"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "選択範囲に合わせてクリップボードをループさせる(_L)"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "トランジション方法(_T):"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "クリップボードと選択範囲を結合する..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "結合する前に余分な%dフレームを挿入する\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "余分な%dフレームを今すぐ挿入する\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "結合の完了。\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr "カスタムジェネレーター(_C)"
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "カスタムエフェクト(_C)"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "カスタムユーティリティ(_U)"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "ファイル/ディレクトリを開く(_O)"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr "ファイルの一部を開く(_P)..."
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "場所/ストリームを開く(_L)..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr "Youtube クリップを開く(_Y)..."
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr "DVDやビデオCDからインポート(_D)..."
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr "DVDからインポート(_D)"
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr "ビデオCDからインポート(_V)"
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr "Firewireデバイスからインポート(_I)"
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Firewireデバイスからインポート (dv)(_F)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Firewireデバイスからインポート (hdv)(_F)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr "ウェブカメラ/TVカードの追加(_A)..."
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr "Unicapデバイスの追加(_U)"
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr "Firewireのライブデバイスを追加する(_F)"
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr "TVデバイスの追加(_T)"
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "最近開いたファイル(_R)..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "クリップセットの再読み込み(_R)..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "全クリップを保存して閉じる(_V)"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "クリップを別名でエンコード(_E)..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "選択範囲を別名でエンコード(_S)..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "このクリップを閉じる(_C)"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "クリップを .lv1 としてバックアップ(_B)..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ".lv1からクリップをリストア(_R)..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "音声付きでエンコード/読み込み/バックアップする(_W)"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "字幕の自動読み込み"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "ディスク領域のクリーンアップ(_U)"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "マルチトラックモード(_M)"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "選択範囲をコピー(_C)"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "選択範囲をカット(_T)"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "クリップボードから挿入(_I)..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "新規として貼り付け(_N)"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "クリップボードと選択範囲をマージ(_M)..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "選択範囲を削除(_D)"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "音声と映像を切り離す(_V)"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "選択(_S)..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "全フレームを選択(_A)..."
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "開始フレームのみ(_S)"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "終了フレームのみ(_E)"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "先頭フレームから選択(_F)"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "最後尾フレームから選択(_L)"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "最後の挿入/マージを選択(_M)"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "最後のエフェクトを選択(_E)"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "選択範囲を反転(_I)"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "選択範囲の幅を固定(_L)"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "再生(_P)"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "すべて再生(_P)"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "選択範囲を再生(_Y)"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "クリップボードを再生(_C)"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "巻き戻し(_W)"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "全画面表示(_F)"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "二倍サイズ(_D)"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "独立ウィンドウで再生(_S)"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "空白のバックグラウンド(_B)"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "音声トラックに合わせてループ(_L)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "連続ループ(_O)"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "ピンポンループ(_G)"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "ミュート(_M)"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "独立ウィンドウの'スティッキー'モード(_T)"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "フレームカウンタの表示(_H)"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "字幕の表示"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr "レターボックスモード"
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "エフェクト(_S)"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "エフェクトは現在の選択範囲に適用されます。"
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "レンダリングエフェクト/ツール/ジェネレーターをテスト(_R)..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "ツール(_T)"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "ツールはクリップ全体に適用されます。"
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "クリップボードの反転(_R)"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "再生/保存スピードの変更(_C)..."
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "映像を新しいフレームレートでリサンプリング(_V)..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "ユーティリティ(_U)"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "生成(_G)"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "カスタムツール(_T)"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "生成(_G)"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "レンダリングエフェクトプラグインの読み込み中..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr "字幕をファイルから読み込む(_S)..."
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr "字幕の削除"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "外部ウィンドウのキャプチャ(_E)... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "設定(_P)..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "音声(_A)"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "クリップへ新しい音声を読み込み(_N)..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "CDトラックの読み込み(_C)..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "CDのイジェクト(_J)"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "外部音声を録音(_X)..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "新しいクリップへ(_C)..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "選択範囲へ(_S)"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "音声をフェードイン(_I)..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "音声をフェードアウト(_O)..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "音声のエクスポート(_E)..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "選択した音声のエクスポート(_S)..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "全音声のエクスポート(_A)..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "音声の追加(_A)..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "音声のトリミング/パディング(_T)..."
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "選択範囲への音声のトリミング/パディング(_S)"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "先頭から再生開始までへの音声のトリミング/パディング(_P)"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "音声の削除(_D)..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "選択した音声の削除(_S)"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "全音声の削除(_A)"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "選択範囲に無音声を挿入(_S)"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "音声のリサンプリング(_R)..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "xmmsによる音楽再生(_M)..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "xmmsによる音楽のランダム再生(_U)..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "xmmsの再生を停止(_P)"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "情報(_I)"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "クリップ情報を表示(_I)"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "ファイルコメントの表示/編集(_E)"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "クリップボード情報の表示(_C)"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "メッセージの表示(_M)"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "レイアウトエラーを表示(_L)"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "クリップ(_C)"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "メニューにある現在のクリップの名称変更(_R)..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "詳細(_D)"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "RFXエフェクト/ツール/ユーティリティ(_R)"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "新しいテストRFXスクリプト(_N)..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "RFXスクリプトをテストへコピー(_C)..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "テストRFXスクリプトの編集(_E)..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "テストRFXスクリプトの名称変更(_M)..."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "テストRFXスクリプトの削除(_D)..."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "レンダリングエフェクト/ツール/ジェネレーターをテストから昇格(_P)..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "カスタムRFXスクリプトのインポート(_I)..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "カスタムRFXスクリプトのエクスポート(_X)..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "カスタムRFXスクリプトの削除(_L)..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "全RFXプラグインの再構築(_B)"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "LiVESストリームを受信する(_L)..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "LiVESストリームを送信する(_S)..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "%sstream.yuvのyuv4mpegストリームを開く(_Y)..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "プロジェクトのインポート (.lv2) (_I)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "プロジェクトのエクスポート(.lv2)(_X)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "VJ(_V)"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "リアルタイムエフェクトマップ(_E)"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "リアルタイムエフェクトをコントロール-数字キーに設定します"
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "リアルタイムエフェクトのデフォルト値を設定(_D)"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "リアルタイムエフェクトのデフォルト値を設定します"
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "リアルタイムエフェクトをデフォルトとして保存(_D)"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3592,146 +3594,146 @@
 "リアルタイムエフェクトをデフォルトとして保存します。毎回、LiVESの起動時に復元"
 "されます。"
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "すべての再生スピードと位置をリセット(_R)"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "すべての再生位置をフレーム1にリセットし、すべてのフレーム再生レートをリセット"
 "する"
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "MIDI/ジョイスティックインタフェース(_M)"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "MIDI/ジョイスティックの登録(_M)..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "デバイスマップの保存(_S)..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "デバイスマップの読み込み(_L)..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "VJキーの表示(_K)"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "トイ(_Y)"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "なし(_N)"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr "Autolives(_A)"
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "熱狂フレーム(_M)"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "LiVES TV (ブロードバンド)(_L)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "マニュアル (ブラウザで開く)(_M)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "プロジェクトに寄付する!(_D)"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "作者にメールを送る(_E)"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "バグを報告する(_B)"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "機能を提案する(_F)"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "翻訳を手伝う(_T)"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "トラブルシューティング(_T)"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "LiVESについて(_A)"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "開始まで巻き戻す (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "すべて再生 (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "再生を停止 (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "選択範囲を再生 (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "ボリューム"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "音声ボリューム (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "空白でないバックグラウンド"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "遅く再生 (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "早く再生 (ctrl-up)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "前へスキップ (ctrl+left)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "前にスキップ (ctrl-right)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "クリップ情報を表示 (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "ツールバーを隠す"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3740,163 +3742,163 @@
 "てください。停止するには\"q\"を押してください。"
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     ビデオ再生スピード (フレーム/秒)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "映像の再生スピードの変更"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "先頭フレーム"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "最終フレーム"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "このクリップで選択した最初のフレーム"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "このクリップで選択した最後のフレーム"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "開始しています...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    記録を停止するには'q'を押してください。「再生ウィンドウを覆ってはいけませ"
 "ん！」   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "プレビューするフレーム数"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "解放(_F)"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "解放するフレーム数"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "開始(_S)"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "開始フレームのフレーム番号"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "終了(_E)"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "終了フレームのフレーム番号"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "ポインター(_P)"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "再生ポインターのフレーム番号"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "巻き戻し"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "すべて再生"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "選択範囲を再生"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "ループ On/Off"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "記録の開始(_R)"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "記録の停止(_R)"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "動作を記録(_R)"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "再生ウィンドウを隠す"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "再生ウィンドウの表示"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f EB"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f PB"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f TB"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f MB"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f KiB"
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr "%d バイト"
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "クリップボードを消去します"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3907,7 +3909,7 @@
 "==============================\n"
 "クリップ「%s」へ変更しました\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3917,11 +3919,11 @@
 "==============================\n"
 "空のクリップへ変更しました\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "（空白）"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3930,7 +3932,7 @@
 "セット名は %s から %s に変更されました。それに伴いレイアウトがアップデートさ"
 "れています。\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3939,7 +3941,7 @@
 "クリップ %s はこのセットにありません。\n"
 "次のレイアウトに必要です:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3948,7 +3950,7 @@
 "クリップ %s は既に閉じています。\n"
 "次のレイアウトに必要です:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3957,7 +3959,7 @@
 "クリップ %s からフレームが移動しました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3966,7 +3968,7 @@
 "クリップ %s からフレームが消去されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3975,7 +3977,7 @@
 "クリップ %s から音声が消去されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3984,7 +3986,7 @@
 "クリップ %s で音声が移動しました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3993,7 +3995,7 @@
 "クリップ %s で音声が変更されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -4002,7 +4004,7 @@
 "クリップ %s でフレームが変更されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4013,7 +4015,7 @@
 "LiVESの他のプロジェクトで使用されており\n"
 "開くことができません。\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -4024,7 +4026,7 @@
 "このセット %s はLiVESの他のプロジェクトで使用されています。\n"
 "他のセット名を選んでください。\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -4032,7 +4034,7 @@
 "\n"
 "セット名は空白にできません。\n"
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
@@ -4040,7 +4042,7 @@
 "\n"
 "セット名は128文字以上にはできません。\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -4049,7 +4051,7 @@
 "\n"
 "セット名に空白もしくは %s 文字を含まないようにしてください。\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
@@ -4057,7 +4059,7 @@
 "\n"
 "セット名は '.' で始まるものや '..' を含むものにはできません。\n"
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4068,68 +4070,68 @@
 "セット %s は既に存在します。\n"
 "他のセット名を選択してください。\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "レイアウト %s を削除\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "映像ファイル [開く...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "映像 [%.2f 秒]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(未定義)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(映像なし)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(音声なし)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "モノラル [開く...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "左音声 [開く...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "モノラル [%.2f 秒]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "左音声 [%.2f 秒]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "右音声 [開く...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "右音声 [%.2f 秒]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVESはクリップが読み込み時にmplayerを起動できませんでした。"
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "クリップを消去します"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4144,53 +4146,64 @@
 "\n"
 "上書きしますか ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "%sを元に戻す(_U)"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "%sをやり直す(_R)"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "------------- 選択範囲 ------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " 秒 ] ---------- 選択範囲 ---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " フレーム ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "ファイルヘッダを検査"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "%sを開きます"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "%sを開きます。開始時刻%.2f秒、%dフレーム"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " 音声なし"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "音声 %s を開く"
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4209,11 +4222,11 @@
 "\n"
 "本当に続けますか？"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - 我慢してください。"
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4225,7 +4238,7 @@
 "LiVESは、音声もしくは映像を取得できませんでした。\n"
 "詳細はターミナルウィンドウで確認してください。\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4235,7 +4248,7 @@
 "\n"
 "このファイルを開くにはmplayerをインストールする必要があります。\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4247,29 +4260,29 @@
 "「ツール | 設定 | デコーディング」で\n"
 "「映像ファイルを開くコマンド」の設定を確認してください。\n"
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr "画像を追加..."
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "字幕を以下のファイルに保存しました: %s\n"
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr "LiVES: %d フレームに名前を付けて保存..."
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr "LiVES: フレームに名前を付けて保存..."
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: クリップに名前を付けて保存..."
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4281,35 +4294,31 @@
 "\n"
 "それでも続けますか ?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "選択"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "リンクの選択"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (音声なし)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "フレーム%dから%d%sを\"%s\"として保存 : エンコーダ = %s : フォーマット = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "フレーム1から%d%sを\"%s\"として保存 : エンコーダ = %s : フォーマット = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "保存 [しばらく時間がかかるかもしれません]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4319,33 +4328,33 @@
 "\n"
 "エンコーダエラー - 出力ファイルは作成されませんでした !\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr "レターボックスの消去"
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr "ファイルサイズ %s\n"
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "プレビューにより記録は中止されました。\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "クリップボードの再生により記録は中止されました。\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "パフォーマンスを記録します..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "平均のFPSは%.4fです\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4359,16 +4368,16 @@
 "ツール--->すべてリサイズ をクリックして\n"
 "すべてのフレームを現在のサイズにリサイズしてください。\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "不明"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "無題%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4379,7 +4388,7 @@
 "クリップ %s のファイル情報の取得でエラーが発生しました。\n"
 "このクリップに問題が発生している可能性があります。\n"
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4390,12 +4399,12 @@
 "無効な再生速度です。 %.3ffpsの標準設定を使います。 \n"
 "標準値は「ツール | 設定 | その他」で指定できます。\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr "再生速度は音声に合わせて %.3f フレーム/秒に調整しました。\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4404,7 +4413,7 @@
 "フレーム=%d タイプ=%s サイズ=%dx%d *bpp=グレースケール* fps=%.3f\n"
 "音声:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4413,49 +4422,44 @@
 "フレーム=%d タイプ=%s サイズ=%dx%d bpp=%d fps=%.3f\n"
 "音声:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s なし\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d チャンネル %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - コメント: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "フレーム%dを%sとして保存..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "%sから%sへバックアップします"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "バックアップします"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "パフォーマンスのデータをバックアップしました..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "%sをリストアします..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "リストアします"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4469,22 +4473,22 @@
 "LiVESはリストアできませんでした。\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "%.2fMBを記録しました"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "%.2fMBを記録しました"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr "rec ?? MB"
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4495,7 +4499,7 @@
 "%s のディスクの空き領域が %ld GB を切ったため記録を停止しています！\n"
 "記録の停止レベルは「設定」で設定することができます。\n"
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4505,59 +4509,59 @@
 "LiVESを前回起動した際のファイルを発見しました。\n"
 "復元を試しますか?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "ファイルの復元"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "ファイルを復元しています..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "影響を受けるレイアウト(_L)"
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr "ディスク容量を回復(_R)"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr " 詳細設定(_A) >>"
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - 警告 !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "警告"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr "LiVES: - 質問"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr "質問"
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr "LiVES: - ファイルエラー"
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr "ファイルエラー"
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr "再試行(_R)"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4574,7 +4578,7 @@
 "\n"
 "(ディスク警告のレベルは「設定」で設定することができます。)"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4593,11 +4597,11 @@
 "(次回の警告は %s になると表示されます。ディスク警告のレベルは「設定」で設定す"
 "ることができます。)"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "再生中は音声プレーヤーを変更できません。"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4609,20 +4613,18 @@
 "LiVESはメモリ不足により、この操作を実行できませんでした。\n"
 "他のアプリケーションを終了させてから試してください。\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr "処理を一時停止しています。"
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% 終了。残り時間: %u 秒\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4631,7 +4633,7 @@
 "\n"
 "%d/%d フレームを開きました。残り時間は %u 秒です。\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4640,7 +4642,7 @@
 "\n"
 "%d/%d フレームを開いています。\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4649,7 +4651,7 @@
 "\n"
 "%d フレームを開きました。\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4658,7 +4660,7 @@
 "\n"
 "残り時間: %d 秒"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4669,7 +4671,7 @@
 "ごめん、LiVESはいちどに%d個のファイルしか開けません。\n"
 "ファイルを閉じてから、再び試してください。"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4688,7 +4690,7 @@
 "\n"
 "このディレクトリが書き込み可能であることを確認してください。"
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4699,7 +4701,7 @@
 "「ツール | 設定 | エンコーディング」で他のエンコーダフォーマットに変更してく"
 "ださい。\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4712,7 +4714,7 @@
 "ん。\n"
 "「ツール | 設定 | エンコーディング」で音声コーデックを指定してください。\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4721,7 +4723,7 @@
 "フレームは保存することができません。先にクリップへレンダリング出力してくださ"
 "い。\n"
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4729,7 +4731,7 @@
 "このレイアウトには、生成または記録された音声が含まれています。\n"
 "保存することができません。まずクリップにレンダリングする必要があります。\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4740,7 +4742,7 @@
 "\n"
 "%sフォーマットの制限によります\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4748,43 +4750,43 @@
 "LiVESは以下の設定を推奨します:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr "符号付き"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr "符号なし"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr "リトルエンディアン"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr "ビッグエンディアン"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "音声レート %d Hz%s%s\n"
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "映像のレートを %.3f フレーム/秒に設定\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "映像のレートを %d:%d フレーム/秒に設定\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "映像のサイズを %d x %d ピクセルに設定\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4792,36 +4794,36 @@
 "\n"
 "お好みの動作:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "映像を %d × %d ピクセルにリサイズします\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "音声を無効にします。ターゲットエンコーダは音声をエンコードできないためです\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES に必要:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr "音声を %d Hz%s%s にリサンプリング\n"
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "映像を %.3f フレーム/秒にリサンプリングします...\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "映像を %d:%d フレーム/秒にリサンプリングします...\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4835,7 +4837,7 @@
 "'OK'で続行、'キャンセル'で中止します。\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4845,7 +4847,7 @@
 "選択範囲に適用された変更は、永久なものではありません。\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4859,7 +4861,7 @@
 "現在、利用可能なメモリが不足しています。\n"
 "ファイルの選択範囲だけで記録してみてください。"
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4877,7 +4879,7 @@
 "\n"
 "続けるにはOKを、挿入を中止するにはキャンセルを押してください。"
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4885,17 +4887,17 @@
 "You should only click OK if you understand what you are doing, otherwise, "
 "click Cancel."
 msgstr ""
-"yubmpegストリームを開くときは、あらかじめfifoファイルを作成しそのファイルに対"
+"yuvmpegストリームを開くときは、あらかじめfifoファイルを作成しそのファイルに対"
 "してyuv4mpegフレームを書き込みます。\n"
 "フレームを受け取るまで、LiVESは操作不能となります。\n"
 "何をしようとしているかを理解している場合のみOKをクリックし、そうでない場合は"
 "キャンセルをクリックしてください。"
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "キーの表示"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4975,11 +4977,11 @@
 "d ダブルサイズ\n"
 "g ピンポンループ\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "マルチトラックキー"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5019,19 +5021,18 @@
 "\n"
 "ここに挙げた以外のキーに関しては、メニューを参照してください。\n"
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "メッセージの履歴"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"アップグレード/インストールした後はファイル「~/.lives」の中の<prefix_dir>を調"
-"整する必要があるでしょう。"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -5039,16 +5040,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVESはレンダリングエフェクトプラグインを発見できません。\n"
-"プラグインが以下にインストールされていることを確認してください。\n"
-"%s%s%s\n"
-"もしくは、ファイル「~/.lives」の<lib_dir>を変更してください。\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5059,11 +5054,11 @@
 " (ファイル名は .mp3, .ogg, .wav, .mod, .xm または .it で終わるものでなければ"
 "なりません)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "失敗 (不明なタイプ)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
@@ -5073,7 +5068,7 @@
 "このセットに関連付けられたレイアウトファイルを削除しますか？\n"
 "（レイアウトファイルはこのセットで利用できなくなります）\n"
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -5086,7 +5081,7 @@
 "現在のクリップとレイアウトを既存のセットに付け加えるときはOKを、\n"
 "新しい名前を付けるならキャンセルをクリックしてください。\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5098,7 +5093,7 @@
 "続けても構いませんか?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5110,7 +5105,7 @@
 "続けても構いませんか?\n"
 "."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -5129,7 +5124,7 @@
 "そうでなければ、キャンセルをクリックしてこのファイルの読み込みをスキップして"
 "ください。\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5144,7 +5139,7 @@
 "%s\n"
 "を見つけられません。このクリップは読み込みされません。\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5158,7 +5153,7 @@
 "てください。\n"
 "もしくは、設定で他の音声プレイヤーを選択してください。\n"
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5173,7 +5168,7 @@
 "い。\n"
 "JACKサーバーの自動起動は今回、無効となりました。\n"
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5182,7 +5177,7 @@
 "JACKサーバーに接続できません。JACKサーバーを起動してからLiVESを起動してくださ"
 "い。\n"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5199,7 +5194,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5207,7 +5202,7 @@
 "\n"
 "もしくは、LiVESを再起動して他の音声プレイヤーを選択してください。\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5223,7 +5218,7 @@
 "「設定 | マルチトラック」で値を増やしてください。\n"
 "少なくとも %d MB追加することをお勧めします。"
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -5236,7 +5231,7 @@
 "これらを削除することをお勧めします。\n"
 "これらを削除しますか？\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5249,7 +5244,7 @@
 "ファー」で\n"
 "アンドゥメモリーの量を減らしてください。\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5261,7 +5256,7 @@
 "「設定 | マルチトラック | アンドゥバッファー」を用いて\n"
 "アンドゥのためのメモリーを増加してください。\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5270,21 +5265,21 @@
 "LiVESは、マルチトラックアンドゥバッファーに十分なメモリを確保できませんでし"
 "た。\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "もしくは、もう少し小さな値を入力してください。\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "他のアプリケーションを終了させて、クリップエディターから再試行してくださ"
 "い。\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "他のアプリケーションを終了させてみてください。\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5293,14 +5288,14 @@
 "は音声があります。\n"
 "ツールメニューから音声設定を調整してください。\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "現在のレイアウトには音声があります。したがって、音声チャンネルはゼロにできま"
 "せん。\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5310,7 +5305,7 @@
 "JACKサーバーかPulseAudioサーバーでのみ利用できます。\n"
 "「ツール | 設定 | 再生」で設定を変更してください。"
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5320,7 +5315,7 @@
 "行が原因かもしれません)。\n"
 "レイアウトのディスクコピーを修復してみますか?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5328,7 +5323,7 @@
 "LiVESはレイアウトを読み込む事ができませんでした。\n"
 "申し訳ありません。\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5338,7 +5333,7 @@
 "\n"
 "音声レートは0より大きくなくてはいけません。\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5350,7 +5345,7 @@
 "表示するにはとても長い時間がかかるでしょう。\n"
 "それでも表示しますか?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5360,7 +5355,7 @@
 "\n"
 "この機能を使うには、'dvgrab'をインストールしなければなりません。\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5374,19 +5369,19 @@
 "JACKサーバーかPulseAudioサーバーでのみ可能です。\n"
 "「ツール | 設定 | 再生」で設定を変更してください。\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "映像プラグインはパレットの初期化に失敗しました。\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "デコーダープラグインはパレットの初期化に失敗しました。\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "映像プラグインのフレームレートを設定できません。\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5394,7 +5389,7 @@
 "クラッシュした場合、「ファイル | ディスクスペースのクリーンアップ」で\n"
 "ディスクをクリーンアップするとよいでしょう\n"
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5407,33 +5402,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "キャンセルされました。\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "失敗。\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "ファイルのエラー。失敗しました。\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "追加情報: %s\n"
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr "エラーの値は %d%s です\n"
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -5448,7 +5443,7 @@
 "エラーに関してシステムをチェックしてください。\n"
 "%s%s%s"
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -5463,7 +5458,7 @@
 "考えられるエラー原因を確認してください。\n"
 "%s"
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -5478,7 +5473,7 @@
 "考えられるエラー原因を確認してください。\n"
 "%s"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -5491,7 +5486,7 @@
 "%s\n"
 "考えられるエラー原因を確認してください。\n"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -5506,7 +5501,7 @@
 "エラーは以下の通りです\n"
 "%s\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5519,7 +5514,7 @@
 "%s\n"
 "考えられるエラー原因を確認してください。\n"
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5534,12 +5529,12 @@
 "エラーは以下の通りです\n"
 "%s\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr "\"%s\" の値を読み取れませんでした。"
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5552,7 +5547,7 @@
 "%s\n"
 "エラーに関してシステムを確認してください。\n"
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5565,7 +5560,7 @@
 "%s\n"
 "ファイルパーミッションを確認して、もう一度試してください。"
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5578,7 +5573,15 @@
 "%s\n"
 "ディレクトリの権限を確認した上で、再度試してください。"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5588,7 +5591,7 @@
 "処理を中止しLiVESを終了します\n"
 "よろしいですか？\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5599,7 +5602,7 @@
 "%sは%s形式でフォーマットされたクリップをエンコードすることができません。\n"
 "リストから他のエンコーダーを選択してください。\n"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5607,7 +5610,7 @@
 "\n"
 "このデバイスはすでに使用中で、何度も開くことはできません。\n"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5622,7 +5625,7 @@
 "- 他のプログラムによってこのデバイスが使用中かどうか確認してください。\n"
 "- このデバイスが本当に存在しているかどうか確認してください。\n"
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5632,7 +5635,7 @@
 "このファイルの字幕はすでに読み込まれています。\n"
 "以前の字幕を上書きしますか？\n"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5640,7 +5643,7 @@
 "\n"
 "LiVESでは、現在.srtと.sub形式の字幕ファイルのみサポートしています。\n"
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5650,7 +5653,7 @@
 "このクリップからすべての字幕ファイルを削除します。\n"
 "よろしいですか？\n"
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5663,7 +5666,7 @@
 "キャンセルをクリックして他のファイル名を指定するか\n"
 "OKをクリックした上で\"%s\"形式として保存してください。\n"
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5673,7 +5676,7 @@
 "現在のクリップセットを新しいディレクトリに移動しますか？\n"
 "（このメッセージの内容がよくわからない場合は、Yesをクリックしてください）\n"
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5689,7 +5692,7 @@
 "他のLiVESプロジェクトを閉じてからOKをクリックして続行してください。\n"
 "."
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5697,7 +5700,7 @@
 "\n"
 "映像入力のためのデバイスが見つかりません。\n"
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5705,7 +5708,7 @@
 "\n"
 "映像入力デバイスがすべて使用中です。\n"
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5717,7 +5720,7 @@
 "クリーニングとファイルのコピーを行っています。少し時間がかかります。\n"
 "LiVESを終了したり閉じたりしないでください！\n"
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5727,7 +5730,7 @@
 "セット名の綴りを確認して再度実行してください。\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5745,7 +5748,7 @@
 "ファイル -> ディスク領域をクリーン\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5758,7 +5761,7 @@
 "LiVES バージョン %s にようこそ！\n"
 "\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
@@ -5769,7 +5772,7 @@
 "ります。\n"
 "パッケージディストリビューターに相談してください。\n"
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
@@ -5778,7 +5781,7 @@
 "このトイを利用するには、少なくとも1個のクリップが読み込まれている必要がありま"
 "す。\n"
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -5788,7 +5791,7 @@
 "LiVES は JACK との接続が切れてしまい、再接続できませんでした。\n"
 "LiVES の再起動をお勧めします。\n"
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -5798,7 +5801,7 @@
 "LiVES は PulseAudio との接続が切れてしまい、再接続できませんでした。\n"
 "LiVES の再起動をお勧めします。\n"
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5811,200 +5814,244 @@
 "ローカルネットワーク接続を開こうとしています。 (UDP port %d)\n"
 "許可しますか? (このセッション限定です)\n"
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "ジェネレーター"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "ジェネレーター"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "ジェネレーター"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "ジェネレーター"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "トランジション"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "トランジション"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "エフェクト"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "エフェクト"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "ユーティリティ"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "ユーティリティ"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "コンポジット"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "コンポジット"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "タップ"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "タップ"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "スプリッター"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "スプリッター"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "コンバーター"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "コンバーター"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr "アナライザー"
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr "アナライザー"
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "音声/映像"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "音声/映像トランジション"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "映像のみ"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "映像のみのトランジション"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "音声のみ"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "音声のみのトランジション"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "音声"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "音声ミキサー"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "音声エフェクト"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "音声ボリュームコントローラー"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "音声ボリュームコントローラー"
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr "映像アナライザー"
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr "映像アナライザー"
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr "音声アナライザー"
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "音声アナライザー"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "不明"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s すべてのフレーム..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s クリップボードの %d フレームから %dフレーム..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s をクリップボードへ..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s を新しいクリップへ..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%sフレーム%dから%d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s クリップボードと選択範囲"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s をクリップボードへ"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s を新しいクリップへ"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%sフレーム%dから%d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -6012,17 +6059,46 @@
 "\n"
 "フレームは生成されませんでした。\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "エラー: プラグイン %s に weed_setup() がありません。\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr "プラグイン %s に使うことのできないフィルターが見つかりました\n"
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -6031,130 +6107,310 @@
 "情報: プラグイン %s を読み込みできませんでした。\n"
 "エラー: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr "プラグインディレクトリ"
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "%d Weedフィルターの読み込みに成功しました\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "インスタンス %s を開始できません。エラーコード %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "ジェネレーター%sを開始できません。\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "ジェネレーター %s を開始できません。\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "ジェネレーター %s を開始できません。エラーコード %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr "%s [不安定] (%s)"
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "これらの値を変更するにはプレビューをクリックします。"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "値のリセット(_R)"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    フレーム(_F)"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "オリジナルフレームのアスペクト比を維持"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "アスペクト比を保つ(_A)"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: ファイルの選択"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "オリジナルフレームのアスペクト比を維持"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr "パスワードの表示"
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "トランジションイン(_I)"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "トランジションイン"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "音声のクロスフェード"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "音声と映像をトランジションさせる場合はボックスをチェック"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "音声のクロスフェード"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "トランジションアウト(_O)"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "トランジションアウト"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "ターゲットFPS (プラグインに上書きされるでしょう)(_F)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : サイズ"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "新しいサイズ (ピクセル)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "幅(_W)"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "高さ(_H)"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "クリップボードに生成(_C)"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "クリップボードへフレームを生成"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "新しいクリップに生成(_N)"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "新しいクリップへフレームを生成"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -6165,59 +6421,59 @@
 "このエフェクトを利用するには、少なくとも%dフレームを選択してください。\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "デフォルトに設定"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr "リセット"
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "ウィンドウを閉じる(_W)"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "パラメータなし"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "無効なパラメータ"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES:- 色の選択"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "クリックでカラーを設定"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr "赤(_R)"
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "赤の値 (0 - 255)"
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr "緑(_G)"
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "緑の値 (0 - 255)"
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr "青(_B)"
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "青の値 (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -6226,12 +6482,12 @@
 "\n"
 "プラグインエラー: %sに失敗。(コード%d)"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : メッセージは%sでした。\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6246,17 +6502,17 @@
 "%s\n"
 "エラーコード %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "%s にあるデフォルト映像プラグインのアップデート\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "%s からデフォルト映像プラグインを読み込み中..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6271,32 +6527,32 @@
 "「ツール | 設定 | 再生 | 映像 | プラグイン」\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr "再生プラグインのデフォルトを%sに保存..."
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "プラグインのフレームレートを固定します。\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "FPS(_F)"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "プラグインに入力されるカラースペース\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "プラグインのフレームレートを固定します。\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "カラースペース(_C)"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "プラグインに入力されるカラースペース\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr "設定を別なファイルに保存します。\n"
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6309,16 +6565,7 @@
 "再生プラグイン %s を開けません。\n"
 "エラーは　%s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"映像プラグインを初期化できません。\n"
-"エラー: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6333,7 +6580,16 @@
 "必要とされる機能を持ちません。\n"
 "使用することができません。\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"映像プラグインを初期化できません。\n"
+"エラー: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6343,7 +6599,7 @@
 "警告! 映像プラグインはキー操作を送信できません。プラグインの利用中はキーボー"
 "ドが無効になります!\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6352,30 +6608,26 @@
 "*** 再生に %s プラグインを使います。パレットタイプは %d ( %s ) を使います。 "
 "***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr "音声ストリームは選択したフォーマット '%s' を利用できません\n"
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr "代わりに %s をフォーマットに使ってください。\n"
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVESはエンコーダープラグインを見つけられませんでした。以下のプラグインがイン"
-"ストールされているかどうかを確認してください。\n"
-"%s%s%s\n"
-"または、~/.lives における <lib_dir> の値を変更してください。\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6391,11 +6643,11 @@
 "もしくは、「ツール | 設定 | エンコーディング」で他のプラグインに変更してくだ"
 "さい。\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "リサイズできません。imageMagickをインストールしてください。\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6408,7 +6660,7 @@
 "デコーダプラグイン %s を開けません。\n"
 "エラーは %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6423,190 +6675,174 @@
 "必須の機能がありません。\n"
 "利用することができません。\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/不明"
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr "LiVES: - デコーダープラグイン"
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr "映像デコーダーを有効にする（チェックを外すと無効）"
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "%sの読み込みに失敗しました。トランジションはリサイズされません。\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s 高度な設定"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - RFXの新しいテストスクリプト"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - RFXのテストスクリプトの編集"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "タイプ:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "エフェクト -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "トランジション -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "ジェネレーター -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "ツール -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "ユーティリティ -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "名前:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "プラグインの名前。空白は入れられません"
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "バージョン:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "スクリプトバージョン"
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    作者:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "このスクリプトの作者"
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (オプション):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "プラグインメンテナンスのためのURL"
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "メニューのテキスト:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "メニューに表示するテキスト"
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "動作の記述:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 "このプラグインが何をするものかを記述します。例えば「エッジ検出」などです。"
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "最小フレーム数:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "このエフェクト/ツールが適用する最小のフレーム数。通常は1"
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "要求(_R)..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "このプラグインが要求するバイナリを入力します。"
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "プロパティー(_P)..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "このプラグインのプロパティーを指定します。オプションです。"
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "パラメーター(_P)..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "プリ/ループ/ポスト/トリガーの各コードで使用するパラメータを指定します。オプ"
 "ションです。"
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "パラメーター、ウィンドウヒント(_W)..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "パラメータウィンドウをどう配置するかのヒントを指定します。オプションです。"
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "プログラム言語:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "プリ/ループ/ポスト/トリガーの言語を指定。オプションです。"
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "プリループコード(_P)..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "ループの前に実行するコードです。オプションです。"
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "ループコード(_L)..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "各フレームに適用するループコードです。"
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "ポストループコード(_P)..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "ループの後に実行するコードです。オプションです。"
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "トリガーコード(_T)..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6614,7 +6850,7 @@
 "パラメータウィンドウが表示されたとき、またはパラメータが変更されたときに実行"
 "するトリガーコードを指定する。(ユーティリティ以外はオプション)"
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6629,55 +6865,55 @@
 "%s\n"
 "%s をパースできません\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFXの要件"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFXパラメータ"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFXパラメータのウィンドウヒント"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFXトリガー"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "新しいエントリ(_N)"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "エントリの編集(_E)"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "エントリの削除(_R)"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "上へ移動(_U)"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "下へ移動(_D)"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX属性"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "遅く (GUIへのヒント)(_S)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "バッチモードジェネレーター(_B)"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6691,7 +6927,7 @@
 "トリガーを先に削除してください。\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6703,27 +6939,27 @@
 "いくつかのトリガーが調整されました。\n"
 "トリガーのコードを確認してください。\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - 新しいRFXパラメータ"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - RFXパラメータの編集"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "名前(_N):    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "パラメータ名はプラグインの中で一意でなければなりません。"
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "ラベル(_L):    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6731,171 +6967,159 @@
 "パラメータとして表示されるラベル。アンダースコアはキーボードアクセラレータを"
 "表します。"
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "ボタングループ(_G): "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "ラジオボタングループにはゼロではない値を使います。"
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "タイプ(_T):         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "パラメータタイプ (リストから選択)"
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "小数点以下の位(_P): "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "デフォルト値(_D):    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "デフォルト(_D): "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "ボタングループ(_G): "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "ラジオボタングループにはゼロではない値を使います。"
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "最小値(_M): "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "最大値(_X): "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     ステップサイズ(_S):   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "スピンボタンの矢印が押されたときに、どのくらいパラメータが調節されるか。"
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "端数処理(_W): "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "端数が max->min かつ min->max に丸められるかどうか。"
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "値の設定(_V)"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "デフォルトの値:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "最小値: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "最大値: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "標準の赤(_R):  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "標準の緑(_G):"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "標準の青(_B): "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "デフォルトに設定(_D)"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "デフォルトの値:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "最大長(chars): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - 新しいRFXパラメータ、ウィンドウヒント"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - RFXパラメータ、ウィンドウヒントの編集"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "キーワード:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "スペシャルタイプ:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "スペシャルサブタイプ:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
+
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "列:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "リンクパラメータ (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "リンクパラメータ (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "リンクパラメータ (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - 新しいRFXトリガー"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - RFXトリガーの編集"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "いつ:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - プレループコード"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - ループコード"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - ポストループコード"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - 標準テキスト (最大長 %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - 一行ごとに値を入力"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6905,7 +7129,7 @@
 "\n"
 "名前が空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6915,7 +7139,7 @@
 "\n"
 "名前に空白が含まれてはいけません。\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6925,7 +7149,7 @@
 "\n"
 "メニューテキストが空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6935,7 +7159,7 @@
 "\n"
 "動作の記述が空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6945,7 +7169,7 @@
 "\n"
 "作者は空白ではいけません。\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6957,7 +7181,7 @@
 "この名前のプラグインが既に存在します。\n"
 "プラグイン名は一意でなければなりません。\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6967,7 +7191,7 @@
 "\n"
 "ループコードは空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6977,7 +7201,7 @@
 "\n"
 "トリガーコードはユーティリティに利用するときは空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6987,7 +7211,7 @@
 "\n"
 "パラメータ名は空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -7001,41 +7225,41 @@
 "ればなりません。\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "スクリプトファイル%sを出力します..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "スクリプトに <define>　セクションがありません。\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "不適切なスクリプトのバージョン\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "スクリプトに <name> セクションがありません。\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "スクリプトに <version> セクションがありません。\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "スクリプトに <author> セクションがありません。\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "スクリプトに <description> セクションがありません。\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "不適切な記述 (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -7050,27 +7274,27 @@
 "スクリプトに発見しました。\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "再構築します。全RFXスクリプト...ビルトイン..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "スクリプトの再構築"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "カスタム..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "テスト..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "動的メニューエントリを再構築します..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -7083,7 +7307,7 @@
 "LiVESはプログラム %s を見つけられませんでした。\n"
 "このプログラムがパス中にあり、実行可能であることを確認してください。\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -7097,12 +7321,12 @@
 "本当にRFXスクリプト %s を削除しますか?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "RFXスクリプト %s を削除します...."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -7117,7 +7341,7 @@
 "\n"
 "エラーコードは%dです。\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -7132,12 +7356,12 @@
 "は既に存在します。\n"
 "消去するか、テストスクリプトの名前を変えてください。\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "RFXのテストスクリプト %s をカスタムスクリプトに昇格します..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -7145,29 +7369,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"プラグインスクリプトの\n"
-"%sから\n"
-"%sへの移動に失敗しました。\n"
-"戻り値は%dです。\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "スクリプトをインポートします..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "スクリプトをエクスポートします..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s を %s からコピーしています..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -7182,55 +7400,43 @@
 "は既に存在します。\n"
 "消去するか、インポートするスクリプトの名前を変えてください。\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "ビルトイン"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "カスタム"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "テスト"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - RFXスクリプトのコピー"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "タイプから:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   スクリプト:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: -RFXのテストスクリプトの名前を変更..."
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "スクリプトから: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFXのスクリプト名"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "スクリプト名: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "新しい名前: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "新しいスクリプト名: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7242,26 +7448,43 @@
 "この名前のテストスクリプトが既に存在します。\n"
 "スクリプト名は一意でなければなりません。\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "RFXのテストスクリプトの名称を%sから%sに変更..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"プラグインスクリプトの\n"
+"%sから\n"
+"%sへの移動に失敗しました。\n"
+"戻り値は%dです。\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "リアルタイムエフェクトを選択範囲に適用(_A)"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "レンダリングエフェクト %s の読み込み中..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr "参照: VJ - VJキーを表示。リアルタイムエフェクトを設定し、適用します。"
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7273,7 +7496,7 @@
 "映像プラグインは、フルスクリーンと\n"
 "分離ウィンドウ (fs) モードでのみ利用可能です。\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7285,7 +7508,7 @@
 "\n"
 "(空き領域 = 不明)"
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -7298,40 +7521,35 @@
 "\n"
 "(空き容量 = %s)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"一時ディレクトリはLiVESの作業ディレクトリであり、開かれたクリップやセットはそ"
-"こに保存されます。\n"
-"十分に空き容量のあるパーティションに作成してください。\n"
-"\n"
-"注意: /tmp 以下のディレクトリはシステムの終了時に削除されるため、/tmp 以下の"
-"ディレクトリは避けてください。"
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"新しい一時ディレクトリを作成あるいは書き込みができませんでした。\n"
-"まずroot権限でディレクトリを作成してください。例えば:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"今の時点では一時ディレクトリは変更されませんでした。\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7351,7 +7569,7 @@
 "あるいは、一時ディレクトリの指定をもとの設定に戻すために、キャンセルを押して"
 "ください。"
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7362,7 +7580,7 @@
 "いる必要があります。\n"
 "http://jackaudio.orgを参照してください。\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7370,7 +7588,7 @@
 "\n"
 "音声プレーヤーの変更は再起動が必要です(jackd が動作していてはいけません)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7382,67 +7600,67 @@
 "PulseAudioサーバーが前もってインストールされている必要があります。\n"
 "http://www.pulseaudio.orgを参照してください。\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (再高品質、ファイルサイズ最大)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - 設定"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "ファイル選択を最大化して開く"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "最近使ったファイルをファイルメニューに表示"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "再生時にスクリーンセーバーを停止    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "起動時にメインウィンドウを最大化"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "バックグラウンドなしの場合にツールバーを表示"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "マウスホイールでクリップを切り替える"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr "プレビューを画面に合わせて調整"
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "起動時のウィンドウ"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "クリップエディター(_C)"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "マルチトラック(_M)"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "マルチヘッドのサポート"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
-msgstr " LiVES画面のモニター数"
+msgstr " LiVES用のモニター番号"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
-msgstr " 再生モニター数"
+msgstr " 再生用のモニター番号"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7450,236 +7668,252 @@
 "0 に設定すると利用可能なすべてのモニタを使用します(一部のプレイバックプラグイ"
 "ンのみ動作)。"
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "シングルモニターにする"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "シングルモニターモードにする"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "マルチトラックモードに入るとき:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "幅、高さ、fps、音声の設定を求める(_P)"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "常に次の値を使う(_A):"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "新しいクリップのレンダリングにこれらの同じ値を使う(_V)"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "幅(_W)           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          高さ(_H)      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr "          FPS(_F)"
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "音声トラックを逆再生時も有効にする"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "音声/映像トラック"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    アンドゥバッファのサイズ(_U) (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "レンダリング後にマルチトラックモードを終了(_E)"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "レイアウトを自動でバックアップ"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "すべての(_E)"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "秒"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "すべての変更を行った後(_C)"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "しない(_N)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "マルチトラック/レンダリング"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "可能な場合にインスタントオープンを使用"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "いくつかのファイルタイプ対し、デコーダープラグインを使ってインスタントオープ"
 "ンを有効とする"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "映像を開くコマンド             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "映像の圧縮率（展開/レンダリング時）                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
+
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " % （小さな値だと処理時間が長くファイルも大きくなりますがJPEGは画質が上がりま"
 "す）"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "デフォルトの画像フォーマット          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "jpeg(_J)"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "png(_P)"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "（どの画像フォーマットが使用可能かどうか、「ヘルプ | トラブルシュート」で確認"
 "してください）"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "可能な場合にインターレースの自動解除を有効にする"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "プラグインの提案をするときはフレームのインターレース自動解除を行う"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr "可能ならブランクボーダーを無視"
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr "可能ならフレームからブランクボーダーを取り除く"
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "複数ファイルを開くとき、画像を一つのクリップに結合する"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "デコード"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr "映像のプレビュー品質 - リサイズに影響"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "プレビュー品質(_Q)"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "低 - 遅いマシンで性能が向上します"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "通常 - 多くのユーザーに推奨"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "高 - 速いマシンで品質が向上します"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "プレビュー品質(_Q)"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr "映像のプレビュー品質 - リサイズに影響"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "FPS統計を表示する(_S)"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "プラグイン(_P)"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr "音声ストリーム"
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr "再生プラグインへの音声ストリーム"
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "映像"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "プレーヤー(_P)"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr "(JACKサーバー統合タブで、JACKサーバーの起動オプションを変更できます)"
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "音声再生コマンド(_C)"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- 内部 -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "音声を映像のフレームレート/方向に合わせる(JACKのみ)(_R)"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "音声をクリップスイッチに合わせる(JACKのみ)(_C)"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "音声"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "再生"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7687,71 +7921,68 @@
 "外部ウィンドウをキャプチャーするとき、音声も記録する(_X)\n"
 "(JACKサーバーかPulseAudioサーバーが必要)"
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      ’r’が押されたときに記録するもの   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "フレーム変更(_F)"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "FPSの変更(_P)"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "リアルタイムエフェクト(_R)"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "クリップスイッチ(_C)"
 
-#: src/preferences.c:3507
-#, fuzzy
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "音声 (JACKサーバーかPulseAudioサーバーが必要)(_A)"
-
-#: src/preferences.c:3529
-#, fuzzy
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "音声 (JACKサーバーかPulseAudioサーバーが必要)(_A)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr "ディスクの空き容量が以下を下回ったら記録を停止します"
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "記録"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      エンコーダ                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "出力フォーマット"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "音声コーデック"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "エンコード"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "リサイズ時にアンチエイリアスを使用する(_A)"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "リアルタイムエフェクトキーの数(_R)"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7759,80 +7990,95 @@
 "\"バーチャル\"リアルタイムエフェクトキーの数。リアルタイムエフェクトウィンド"
 "ウやネットワーク(OSC)を介してコントロールされます。"
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr "エフェクトを適用する際、可能であればマルチスレッドを利用する(_T)"
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr "スレッドの数(_T)"
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      ビデオを読み込むディレクトリ (デフォルト)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      ビデオ保存ディレクトリ (デフォルト) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      音声を読み込むディレクトリ (デフォルト) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      画像ディレクトリ (デフォルト) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      バックアップ/リストアディレクトリ (デフォルト) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      一時ディレクトリ (削除不可能) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "ビデオクリップを読み込むデフォルトのディレクトリ"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "エンコードしたクリップを書き込むデフォルトのディレクトリ"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "音声を読み込み/保存するデフォルトのディレクトリ"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "フレームショットを保存するデフォルトのディレクトリ"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr "シングルクリップをバックアップ/リストアするデフォルトのディレクトリ"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "LiVES作業用ディレクトリ"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "ディレクトリ"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr "ディスク容量がこれ以下になった場合に警告: "
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr " MB [ 0 にすると無効]"
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr "ディスク容量が致命的なレベル: "
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7840,19 +8086,19 @@
 "クリップボードのフレームレートが選択範囲のフレームレートと合わない場合に警告"
 "(_F)"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "ファイルサイズが次を超えるときに警告する(_S) "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "セットを保存する前に警告を表示する(_T)"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
@@ -7860,70 +8106,70 @@
 "起動時にmplayer, sox, composite, convertの各コマンドを検出できないときに警告"
 "を表示する(_M)"
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "開始時にレンダリングエフェクトが見つからないときに警告を表示する(_R)"
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "開始時にエンコーダプラグインが見つからないときに警告を表示する(_E)"
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "同じセット名が入力されたときに警告を表示する(_D)"
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "セットが読み込みされたときに、クリップがレイアウトから失われるときに警告する"
 "(_L)"
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "レイアウトで使われているクリップが閉じられるときには警告する。"
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "レイアウトで使われているフレームが削除されるときには警告する。"
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "レイアウトで使われているフレームが移動するときには警告する。"
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "レイアウトで使われているフレームが変化するときには警告する。"
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "レイアウトで使われている音声が削除されるときには警告する。"
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "レイアウトで使われている音声が移動するときには警告する。"
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "レイアウトで使われている音声が変化するときには警告する。"
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr "クリップが変更された後のレイアウトエラーをポップアップ表示する。"
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "マルチトラックモードを抜けるときにレイアウトが保存されていないときは警告す"
 "る。"
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "マルチトラックモードに音声チャネルが無いのに音声付きレイアウトが読み込まれる"
 "ときには警告する。"
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7931,121 +8177,109 @@
 "複数のトラックが音声チャンネルを持っている場合はJACKサーバかPulseAudioサーバ"
 "を使うよう警告する"
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Firewireデバイスからのインポート後に情報メッセージを表示する"
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "yuv4mpegストリームを開く前に警告を出す(高度)"
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "マルチトラックが空き容量より足りない場合に警告を表示する"
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 "表示する警告がクラッシュした後、ディスクスペースをクリーニングするよう促しま"
 "す。"
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr "PulseAudioサーバーに接続できなかった場合に警告します。"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "警告"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 "MMC（MIDI Machine Control）を送信する（midistartおよびmidistopファイルが必要"
 "です）"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "フレームの挿入とマージをするときの処理:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "スピードアップ/スローダウンして挿入(_S)"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "リサンプリングして挿入(_R)"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "音声再生時にxmmsを一時停止する"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CDデバイス           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: CDデバイスの選択"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVESはこのCDから音声トラックを読み込むことができます"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "デフォルトのFPS        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "何も指定しないときのFPS"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "その他"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "新しいテーマ:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "ダウンロードバンド幅 (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "OMCを利用するには、\"configure --disable-OSC\"無しでLiVESをコンパイルしなけれ"
 "ばなりません。"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "OMCリモートコントロールを有効にする"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDPポート       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "起動時にOMCを開始する"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "ストリーミング/ネットワーキング"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "JACKトランスポート機能"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8053,51 +8287,47 @@
 "JACKサウンドサーバのトランスポート機能を使うには、jack/transport.h と jack/"
 "jack.h を使ってLiVESをコンパイルする必要があります"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "JACKサーバーの設定ファイル(_T)"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "LiVESのトランスポートを制御するJACKサーバーの名前"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "LiVES起動時にJACKサーバーを起動(_S)"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr "JACKサーバーのトランスポート機能のマスターとなる(_M)"
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr "JACKサーバーのトランスポート機能のクライアントとなる(_C)"
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr "JACKサーバーのトランスポート機能にスタート位置を合わせる"
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr "JACKサーバーのトランスポート機能に時間を合わせる"
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 "(「再生 | 音声を映像のフレームレート/方向に合わせる」オプションも確認してくだ"
 "さい)"
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "JACK音声機能"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "JACKサーバーの音声機能を使うためには、jack/jack.hを使ってLiVESをコンパイルす"
 "る必要があります"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8105,85 +8335,72 @@
 "JACk音声機能を使うには「設定 | 再生」の音声で、プレイヤーを\"jack\"に指定する"
 "必要があります"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "JACKサーバーの設定ファイル(_A)"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "音声入出力に使うJACKサーバーの名前"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr "JACKトランスポート機能が停止しても音声の再生を続けます(_P)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "JACKサーバー統合"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "反応するイベント:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "ジョイスティックイベント(_J)"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "ジョイスティックデバイス(_J)"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "ジョイスティックデバイス。例）/dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: ジョイスティックデバイスの選択"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "MIDI イベント(_M)"
 
-#: src/preferences.c:5498
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
+msgstr "ALSAシーケンサ機能を利用(_A) (推奨)"
+
+#: src/preferences.c:3987
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "MIDIデバイスを接続するために、ALSAシーケンサ機能にMIDIポートを作成します"
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
-msgstr "ALSAシーケンサ機能を利用(_A) (推奨)"
-
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "raw MIDIを利用(_R)"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "MIDIデバイスに対応するノードから直接信号を取得します"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "MIDI デバイス(_M)"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDIデバイス 例) /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: MIDIデバイスの選択"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "詳細"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "MIDIチェックレート(_R)"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8191,24 +8408,23 @@
 "キーボードによるMIDIチェックの数。この数を増やすとMIDIの反応が向上しますが、"
 "再生が遅くなるかもしれません。"
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "MIDIリピート"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "連続するリードにおける非リードの数"
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(警告: 高い値を設定すると、再生が遅くなります)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "MIDI/ジョイスティック登録"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8220,7 +8436,7 @@
 "す。\n"
 "OKのクリックで続けます。\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
@@ -8228,64 +8444,64 @@
 "ディレクトリの変更を適用するため、LiVESは設定ダイアログを閉じると再起動しま"
 "す。"
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "この変更は次にLiVESを起動するときまで影響を与えません。"
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "JACKサーバに関するオプションは、次にLiVESを開始するときまで変更が反映されませ"
 "ん"
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "外部フレームレート(%.8fフレーム/秒)に合わせる\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "OSCレシーバーを初期化できません。\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "警告: OSCサーバーをUDPポート %d で開始できません。\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "OSCサーバーをUDPポート %d で開始しました。\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "ポート%d番のOSC/UDPサーバーを起動できません。 \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "フレーム1を %d にリサイズ"
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr "フレーム1から%dを単純リサイズもしくはレターボックスを用いてリサイズ"
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "リサイズ"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "リサンプル/リサイズ"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "現在、映像の長さは %d フレームです。\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8295,154 +8511,146 @@
 "\n"
 "新しいレートは0より大きくなければなりません。\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "音声のリサンプリング"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVESは要求された音声のリサンプリングを実施できません。\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "音声のリサンプリング"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "音声は %d Hz、 %d チャンネル、%d ビットでリサンプリングされました。"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "%.8f フレーム/秒で映像をリサンプリング..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "%.3f フレーム/秒で映像をリサンプリング..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "リオーダリングエラー !\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "リサンプリング"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - 音声のリサンプリング"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - 無音声の挿入"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - 新しい音声クリップ"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - 外部クリップ設定"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "レート (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         チャンネル "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        サンプルサイズ "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "符号付き"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "符号なし"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "リトルエンディアン"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "ビッグエンディアン"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "現在"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "音声を有効にする(_E)"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "レート(Hz)(_R) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    チャンネル(_C) "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    チャンネル "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    サンプルサイズ(_S) "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    サンプルサイズ "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "新規"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "フレーム/秒(_F) "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "最大レコード:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " 時間  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " 分  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " 秒  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "無制限"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "記録の開始にはOKを、やめるにはキャンセルをクリック"
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - 再生速度の変更"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - 映像のリサンプリング"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8459,7 +8667,7 @@
 "要求する再生スピードをフレーム/秒の数値で\n"
 "入力してください(_f)"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8476,15 +8684,15 @@
 "要求するリサンプリングレートをフレーム/秒の数値で\n"
 "入力してください(_r)"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "もしくは、クリップの長さを秒単位で入力してください(_S)"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "音声スピードも変更(_A)"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8494,7 +8702,7 @@
 "速度を上げるとマルチトラックレイアウトでフレームを失う原因になります。\n"
 "速度を変更しますか?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8504,7 +8712,7 @@
 "速度を上げるとマルチトラックレイアウトで音声を失う原因になります。\n"
 "速度を変更しますか?\n"
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
@@ -8514,7 +8722,7 @@
 "スピードを変更すると一部のマルチトラックモードでフレームが移動されます。\n"
 "本当に続行しますか？\n"
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
@@ -8524,33 +8732,33 @@
 "スピードを変更すると一部のマルチトラックモードで音声が移動されます。\n"
 "本当に続行しますか？\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "スピード変更"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "再生スピードを %.3f フレーム/秒および音声 %d Hz に変更しました。\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "再生スピードを　%.3f フレーム/秒に変更しました。\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "映像をリサンプリングします"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "クリップボードの映像をリサンプリングします"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "フレームを並べ換えます"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8560,20 +8768,20 @@
 "\n"
 "LiVESはフレームを並べ換えられませんでした。"
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "フレームを再び並べ換えます"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "リサンプリングエラー..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "タイプ: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8589,7 +8797,7 @@
 "よろしいですか?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8601,12 +8809,12 @@
 "このキーマップをデフォルトとして保存するには'OK'をクリック\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "キーマップを %s に保存\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8615,7 +8823,7 @@
 "\n"
 "キーマップファイル %s をアップデート..."
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -8630,12 +8838,12 @@
 "%s\n"
 "エラーは %s です。\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "リアルタイムエフェクトのデフォルトを %s に保存..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8650,22 +8858,22 @@
 "\n"
 "エラーコード %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "リアルタイムエフェクトのデフォルトを %s から読み込み中..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "ジェネレーターのデフォルトサイズを %s から読み込み中..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "デフォルトキーマップを %s から読み込み中..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8680,27 +8888,27 @@
 "\n"
 "エラーコード %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "無効な行 %d : %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "無効なキー %d : %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "無効なエフェクト %s : %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr "不明なエフェクト %s が %sにあります\n"
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8709,16 +8917,21 @@
 "このバージョンのLiVESは、同じキー(%d)でジェネレーターと非ジェネレーターを混ぜ"
 "ることができません！\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "キー %d に結びつけられたエフェクトが多すぎます。\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "アップデートが必要です。\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8730,40 +8943,45 @@
 "いくつかのエフェクトが指定できません。\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "説明なし"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: %s の情報"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "エフェクト名: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "プラグイン名: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "作者: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "バージョン: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "説明: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8777,65 +8995,69 @@
 "とができません。\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVESはエフェクト %s を指定できません。\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: リアルタイムエフェクトマッピング"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "キーの割り当て"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "キーアクティブ"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "キーの割り当て"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "キーボードをこのエフェクトキーに割り当て"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "全エフェクトのクリア(_C)"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "モードアクティブ"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "情報"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "パラメータセット"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "クリア"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "エフェクト名:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "デフォルトキーマップとして保存(_S)"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "デフォルトキーマップの読み込み(_L)"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8887,11 +9109,6 @@
 msgid "none\n"
 msgstr "なし\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d チャンネル %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8911,58 +9128,58 @@
 msgid "TV card %d"
 msgstr "TVカード %d"
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "開かれたTVカード %d (%s)"
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewireカード %d"
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "開かれたFirewireカード %d"
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "自動バックアップ"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "バックグラウンド音声"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "現在のトラック: %s (レイヤー %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "現在のトラック: バックグラウンド音声\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "現在のトラック: レイヤー %d 音声\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f 秒\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "ソース: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "右クリックでコンテキストメニュー\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -8970,7 +9187,7 @@
 "ブロックをダブルクリックして\n"
 "選択します。"
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8984,7 +9201,7 @@
 "ダブルクリックして\n"
 "ブロックを選択してください。\n"
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8996,7 +9213,7 @@
 "エフェクトが選択されていません。\n"
 "パラメーターを確認するには、まずFXスタックでエフェクトを選択してください。\n"
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -9006,7 +9223,7 @@
 "\n"
 "読み込まれたクリップはありません。\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9022,7 +9239,7 @@
 "代わりに、クリップをタイムラインに挿入する前にあらかじめ\n"
 "メニューのエフェクトから、自動トランジションを有効にしてください。"
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -9035,12 +9252,12 @@
 "コンポジットを利用するには\n"
 "少なくともひとつのトラックと時間帯を選択してください。\n"
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f 秒を %.2f 秒に\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9048,182 +9265,186 @@
 "タイムライン上をクリックすると\n"
 "フレームを選択します。\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr "%s [不安定]"
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+"タイムライン上で\n"
+"クリックとドラッグをして"
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "時間帯を選択します。\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: 選択したクリップ"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "開始/終了地点の調整(_A)"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr "クリップエディターで編集/エンコード(_E)"
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "クリップ情報の表示(_S)"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "選択されたクリップを閉じます(_C)"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "音声ミキサー(ctrl + M)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "タイムライン上でクリックすると"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "フレームを選択します。"
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr "タイムライン上でダブルクリックまたは右クリックしてください。"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "ブロックを選択します。"
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "タイムライン上にクリップをドラッグして"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "配置します。"
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "\"移動\" マウスモードでは"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "クリックでクリップを移動します。"
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "\"選択\" マウスモードでは"
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "タイムライン上でマウスをドラックすることで"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "複数のトラックと時間帯を選択します。"
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "挿入モード: 標準(_I)"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "マウスモード: 移動(_M)"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "マウスモード: 選択(_M)"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "Gravity: 標準(_G)"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "Gravity: 左詰め(_G)"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "Gravity: 右詰め(_G)"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr "選択したトラックと時間の最後のギャップを詰める(_L)"
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "選択したトラックと時間の最初のギャップを詰める(_F)"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "ギャップ詰める"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "ブロックの移動"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "音声ブロックの移動"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "ブロックの消去"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "音声ブロックの消去"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "トラックの分割"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "ブロックの分割"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "%s を適用"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "%s を消去"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "ブロックの挿入"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "ギャップの挿入"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "音声ブロックの挿入"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "エフェクト順序の変更"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "符号なし "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "符号付き "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "ビッグエンディアン"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "リトルエンディアン"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9232,15 +9453,15 @@
 "マルチトラックの値を %.3f fps、フレームサイズ %d x %d 、音声チャネル %d 、音"
 "声レート %d, 音声のサンプルサイズ %d, %s に設定\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "無効なイベントリスト。失敗しました。\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "イベントリストには無効なfpsが含まれています。失敗しました。\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -9255,7 +9476,7 @@
 "現在のセットを閉じた後で、\n"
 "ファイルメニューから新しいセットを読み込んでください。\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -9266,432 +9487,439 @@
 "無効な数の音声チャネル(%d)を含んでいます。\n"
 "読み込みできません。\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr "レイアウトは除去されました。\n"
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: マルチトラック %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "クリップ"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr "イン/アウト"
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr "適用済エフェクト"
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "パラメータ"
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "ファイルを選択して開く(_P)..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "DVD/VCDから選択範囲をインポート(_D)..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "DVDから選択範囲をインポート(_D)"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "VCDから選択範囲をインポート(_V)"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "デバイスからインポート(_I)"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "選択されたクリップを閉じる(_C)"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "レイアウトを別名で保存(_S)..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "レイアウトの読み込み(_L)..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "レイアウトの除去(_W)..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "読み込んだレイアウトにおける幅、高さ、音声の値を無視(_I)"
 
-#: src/multitrack.c:5531
-#, fuzzy
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
-msgstr "字幕の自動読み込み"
+msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "クリップエディター(_C)"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "選択されたクリップの開始/終了点を調整(_A)"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "選択したクリップの挿入(_I)"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "選択したクリップ音声の挿入(_I)"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "選択したブロックの消去(_D)"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "前のブロック境界にジャンプ(_J)"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "次のブロック境界にジャンプ(_J)"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "タイムラインからマークをクリア(_M)"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "挿入時に選択の制限を無視"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "タイムラインの位置から再生(_P)"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr "選択した時間帯のみ再生(_Y)"
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "ブロックと共にエフェクトを移動(_M)"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr "自動トランジションエフェクトを選択(_A)..."
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "選択したエフェクトのビュー/編集(_E)"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "選択したエフェクトを削除(_D)"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "ブロックにエフェクトを適用(_B)..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "領域にエフェクトを適用(_R)..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "トラック(_T)"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "現在のトラックにバックグラウンド音声を作成(_B)"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "下にビデオトラックを追加(_R)"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "上にビデオトラックを追加(_F)"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "カーソルの場所で現在のトラックを分割(_S)"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "選択したビデオトラックを分割(_S)"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "選択したトラックと時間にギャップを挿入"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "現在のトラックと時間にギャップを挿入"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "選択したトラックと時間のすべてのギャップを詰める(_G)"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "選択(_L)"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "現在のトラックを選択(_S)"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "すべてのビデオトラックを選択(_A)"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "ビデオトラックを非選択(_N)"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "すべての時間を選択(_T)"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "ゼロ時刻から選択(_Z)"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "最終時刻まで選択(_E)"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "タイムコードから領域の最初へ(_T)"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "タイムコードから領域の最後へ(_T)"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "領域の最初からタイムコードへ(_R)"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "領域の最後からタイムコードへ(_R)"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "幅、高さ、音声値の変更(_C)..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "レンダリング(_R)"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "新しいクリップへすべてレンダリング(_R)"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "ビデオのレンダリング(_V)"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "音声のレンダリング(_A)"
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr "レンダリングした音声のノーマライズ(_N)"
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "音声のプリレンダリング(_P)"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "ビュー(_V)"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "ブロックの開始/終了点(_I)"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "現在のエフェクト(_E)"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "音声パラメータ"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
-msgstr "バックグラウンド音声トラック(_A)の表示"
+msgstr "バックグラウンド音声トラックの表示(_A)"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "コンパクトビュー"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "表示する最大トラック..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "再生に合わせてスクロール表示"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "カーソルを中心に再表示(_C)"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "拡大表示(_Z)"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "縮小表示(_Z)"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "マルチトラックの詳細(_D)"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "イベントウィンドウ(_E)"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "選択した時間帯のイベントウィンドウ(_E)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "フレームイベントを表示(_S)"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "マルチトラックキーを表示(_S)"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "マウスモード: 移動(_M)"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "マウスモード: 選択(_S)"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "挿入モード: 標準(_N)"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "音声ごと挿入(_A)"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr "挿入する/挿入したビデオクリップを音声とセットで扱うかどうかを選択"
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "音声ごと挿入(_A)"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "重複を選択(_O)"
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr "タイムライン上の選択範囲をクリップの重複に合わせるかどうかを選択"
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "重複を選択(_O)"
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "拡大ビュー (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "コンパクトビュー (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "Gravity: 標準(_N)"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "Gravity: 左詰め(_L)"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "Gravity: 右詰め(_R)"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "クリップ"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr "イン/アウト"
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr "適用済エフェクト"
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "パラメータ"
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "適用(_A)"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "時間"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "ノードの消去(_D)"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "次のモード(_N)"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "前のモード(_P)"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "逆再生(_R)  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "速度(_V)  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "タイムラインの始点をアンカー"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "アンカー始点(_S)"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "タイムラインの始点をアンカー"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "フレームの開始"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "タイムラインの終点をアンカー"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "アンカー終端(_E)"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "タイムラインの終点をアンカー"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "フレームの終了"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9701,91 +9929,91 @@
 "==============================\n"
 "クリップ編集モードに変更\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "タイムライン(秒)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " バックグラウンド音声"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " レイヤー %d 音声"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "音声の詳細表示の切り替え"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "レイヤー %d 音声"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (レイヤー %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "トラックの選択"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "オーディオ表示の切り替え"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "映像 %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (レイヤー %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: 選択したエフェクト"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "パラメータを表示(_V)"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "このエフェクトを表示(_V)"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "このエフェクトを消去(_D)"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "このエフェクトの下に挿入できませんでした。"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "このエフェクトは移動することができません。"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d から %d を選択  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f 秒"
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d フレーム"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9795,19 +10023,19 @@
 "==============================\n"
 "マルチトラックモードに変更\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr "パラメータを設定したい箇所に"
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "スライダーを移動してください。"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "パラメータ設定を反映するには、\"適用\"をクリックしてください。\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9817,46 +10045,46 @@
 "ノードとなります。\n"
 "ノードは削除することができます。"
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "エフェクトパラメータがありません。\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s 出力"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "レイヤー %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "音声トラック"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s から %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "前のフィルターマップ(_P)"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "上に挿入(_B)"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "下に挿入(_A)"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "次のフィルターマップ(_N)"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9868,7 +10096,7 @@
 "現在のトラックには\n"
 "このタイミングで有効なエフェクトはありません。\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -9878,7 +10106,7 @@
 "タイムライン上の選択した領域まで\n"
 "ドラッグしてください。"
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -9888,7 +10116,7 @@
 "タイムライン上の選択した領域まで\n"
 "ドラッグしてください。"
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -9896,64 +10124,60 @@
 "エフェクトを適用するには\n"
 "タイムライン上のブロックまでドラッグしてください。"
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: 選択したブロック/フレーム"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "このブロックを選択(_S)"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "ここでブロックを分割(_S)"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "適用可能なエフェクト(_E)"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "%s の調整(_A)"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "このブロックを削除(_D)"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "ここに挿入(_I)"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "ここに音声を挿入(_I)"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "選択したトラックにギャップを挿入(時間は %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "トラック %s にギャップを挿入(時間は %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "%s の取り消し\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "%s のやり直し\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "マルチトラックの詳細"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9961,56 +10185,62 @@
 "\n"
 " (変数)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "トラック %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "トラック %s および %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "選択したトラック"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "%s %s を %s に追加( %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "エフェクト %s をトラック %s に追加( %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "新しいクリップに %d フレームをレンダリング\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "クリーンアップ..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "一時停止(_P)"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "一時停止(p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "再生中に'm'を押すと"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "タイムラインにマークできます"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10019,7 +10249,7 @@
 "音声 %.4f から %.4f を挿入(クリップ %s の時間 %.4f から %.4f までを、バックグ"
 "ラウンド音声に挿入)\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -10027,14 +10257,14 @@
 "フレーム %d から %d を挿入(クリップ %s からトラック %s に挿入。時間は %.4f か"
 "ら %.4f まで)\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr "%.3f から %.3f までの時間帯が選択されています。\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10042,12 +10272,12 @@
 "時間帯を作成するために\n"
 "少なくともひとつのトラックを選択してください。\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d トラックが選択されています。\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10055,7 +10285,7 @@
 "タイムライン上でダブルクリックすると\n"
 "時間帯の選択を解除します。"
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10063,7 +10293,7 @@
 "エフェクトをクリックして\n"
 "選択します。"
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10071,7 +10301,7 @@
 "エフェクト上でダブルクリックして\n"
 "編集を行います。"
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10079,7 +10309,7 @@
 "エフェクト上で右クリックをすると\n"
 "編集メニューが開きます。\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10087,7 +10317,7 @@
 "このフィルターマップのエフェクトの順番は\n"
 "変更することができます。"
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -10095,27 +10325,15 @@
 "エフェクトを移動するには、選択した後に\n"
 "上に挿入 ボタンをクリックするか"
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "下に挿入 ボタンをクリックします。"
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-"タイムライン上で\n"
-"クリックとドラッグをして"
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "時間帯を選択します。\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "選択したエフェクトは"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10123,46 +10341,46 @@
 "移動先にあるエフェクトを\n"
 "クリックすると"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "その下に移動します。\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "その上に移動します。\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "エフェクト %s からパラメータ値を消去 (時間 %.4f )\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "パラメータ値を設定: %s %s, %s (時間 %.4f )\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "常に自動読み込み(_A)"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "%s へレイアウトを保存\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "クリップとフレーム"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "クリップ"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "フレーム"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10170,7 +10388,7 @@
 "\n"
 "レイアウトの自動読み込み\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -10181,11 +10399,11 @@
 "いくつかの %s がレイアウト %s から失われています。\n"
 "そのため正しく読み込まれないかもしれません。\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "自動バックアップ"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -10194,43 +10412,43 @@
 "\n"
 "ファイル %s からレイアウトを読み込みできません。\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "レイアウトを %s から読み込み中..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d イベントを取得...処理中..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "イベントリストのチェックとリビルド"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d エラーを検出しました。\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "マルチトラックfpsを %.3f に設定\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: マルチトラック音声ミキサー"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "値のリセット(_R)"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "ミキサーを閉じる(_C)"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10238,35 +10456,35 @@
 "バックグラウンド音声と\n"
 "レイヤー音量を反転(_I)"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "バックグラウンドとレイヤー音声の値を合計で1.0になるように調整"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "レイヤー音声をまとめる(_G)"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "すべてのレイヤーの音量を同じ値に揃える"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACKサーバーの開始\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "JACKサーバーに接続できません\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "JACKサーバーの音声機能を開始\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "JACKサーバーからの音声読み出しの開始\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
@@ -10274,7 +10492,7 @@
 "\n"
 "JACK の音声機能への接続をリセットしました。\n"
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10286,7 +10504,7 @@
 "sox オーディオプレーヤーにフォールバックします。\n"
 "この設定は、設定/プレイバック で変更できます。\n"
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10298,7 +10516,7 @@
 "mplayer オーディオプレーヤーにフォールバックします。\n"
 "この設定は、設定/プレイバック で変更できます。\n"
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10306,11 +10524,11 @@
 "\n"
 "PulseAudio サーバーに接続できませんでした。\n"
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES が終了すると、他のオーディオプレーヤーを選択できます。\n"
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -10318,113 +10536,113 @@
 "\n"
 "PulseAudio サーバーへの接続がリセットされました。\n"
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "非固定"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "固定"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "%s からのジョイスティックイベントへ反応\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr "ALSAシーケンサ機能にポートを開いています..."
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "%s からのMIDIイベントへ反応\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "データ"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "速度"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "ノート"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "値"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "状態"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "変数"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "変数"
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "MIDI ch %d　ノートオン"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "MIDI ch %d　ノートオフ"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "MIDI ch %d コントローラ %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "MIDI ch %d ピッチベンド"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "MIDI ch %d プログラムチェンジ"
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "ジョイスティックボタン %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "ジョイスティック軸 %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "範囲"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ オフセット1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* スケール"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ オフセット2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10432,200 +10650,208 @@
 "\n"
 "すべてのエントリを削除するには[OK]をクリックします\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMCラーナー"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "アンマッチのクリア(_U)"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "すべて削除(_D)"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "ビデオ再生の開始"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "ビデオ再生の停止"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "クリップ選択 <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "前景クリップを n番目の有効なクリップと変更"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "前に再生"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "ビデオを前方向に再生"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "後ろに再生"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "ビデオを後方向に再生"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "再生方向のリバース"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "ビデオ再生方向のリバース"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "さらに速くビデオを再生"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "少し速いレートでビデオを再生"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "さらに遅くビデオを再生"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "少し遅いレートでビデオを再生"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "ビデオ一時停止/再開"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "ビデオを一時停止、もしくは停止しているならば再開します。"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "映像のフレームレートを <fps> に設定"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "前景クリップのフレームレートを <float fps> に設定"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "記録の開始"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "記録の停止"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "記録状態のトグル"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "前景と背景クリップの交換"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "エフェクトキーのリセット"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "すべてのエフェクトをオフ"
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "エフェクトキー <key> を有効にする"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "エフェクトキー <key> を無効にする"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "エフェクトキー <key> のトグル"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "パラメータ値のセット　<key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 "エフェクトキー <key>　に対するp番目の(数値)パラメータを <value> にセット"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "前景を次のクリップに変更"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "前景を前のクリップに変更"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "映像のフレームレートを <fps_ratio> に設定"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr "前景クリップのフレームレート比を <float fps_ratio> にセット"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "クリップ<clipnum>のリトリガー"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr "前景のクリップをn番目の有効なクリップと交換し、フレーム番号をリセット"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr "エフェクトキー <key> を次のモードに切り替え"
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "エフェクトキー <key> を前のモードに切り替え"
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "クリップ番号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "キー"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "p番号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps比率(_R)"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "デバイスマップをファイル %s に保存..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10638,7 +10864,7 @@
 "ファイルのパースエラー\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10651,12 +10877,12 @@
 "無効なバージョンのファイル\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "デバイスマップをファイル %s から読み込み中..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10841,7 +11067,7 @@
 #~ msgstr "夢の適用"
 
 #~ msgid "E_nd %"
-#~ msgstr "終了 %s (_N)"
+#~ msgstr "終了% (_N)"
 
 #~ msgid "Edge detect"
 #~ msgstr "エッジ検出"
@@ -10882,9 +11108,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "フェードアウト(_O)"
 
-#~ msgid "Fade video in or out"
-#~ msgstr "映像のフェードイン/フェードアウト"
-
 #~ msgid "Fade"
 #~ msgstr "フェード"
 
@@ -11279,10 +11502,10 @@
 #~ msgstr "コントラストの増加(_I)"
 
 #~ msgid "_Init Size X:"
-#~ msgstr "X座標の初期値(_X):"
+#~ msgstr "X座標の初期値(_I):"
 
 #~ msgid "_Init Size Y:"
-#~ msgstr "Y座標の初期値(_Y):"
+#~ msgstr "Y座標の初期値(_I):"
 
 #~ msgid "_Levels"
 #~ msgstr "レベル(_L)"
@@ -11386,9 +11609,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "左上にクリップボード(_T)"
 
-#~ msgid "_Top"
-#~ msgstr "上(_T)"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "垂直セグメント(_V)"
 
@@ -11647,15 +11867,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "設定でCDデバイスを先に指定してください。"
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVESは要求に合致するだけの十分なトラックを見つけることができません。"
-
-#~ msgid "Try again with different values."
-#~ msgstr "違う値を試してください。"
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name は失敗しました:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
+
+#~ msgid "Default value:    "
+#~ msgstr "デフォルトの値:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "最小値: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "最大値: "

LiVES-1.6.1.tar.bz2/po/lives.pot -> LiVES-2.0.3.tar.bz2/po/lives.pot Changed

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 1.6.1\n"
+"Project-Id-Version: lives 2.0.3\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,8 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,7 +28,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -36,7 +52,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -44,176 +60,197 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr ""
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -221,172 +258,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -394,17 +457,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -413,36 +477,36 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -452,7 +516,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -463,42 +527,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -506,96 +577,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr ""
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr ""
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr ""
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr ""
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -604,26 +675,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr ""
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -633,7 +689,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -643,7 +699,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -654,7 +710,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -663,54 +719,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -718,155 +774,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -874,94 +938,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr ""
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -970,186 +1034,195 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 
-#: src/interface.c:403
-msgid "Show details"
+#: src/interface.c:241
+msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr ""
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr ""
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr ""
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr ""
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr ""
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr ""
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr ""
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr ""
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr ""
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1159,7 +1232,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1168,46 +1241,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1215,396 +1304,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr ""
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr ""
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr ""
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr ""
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1612,17 +1663,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1632,7 +1683,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1642,20 +1693,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1668,33 +1719,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1702,97 +1753,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr ""
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1801,31 +1852,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1833,7 +1884,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1842,86 +1893,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr ""
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1929,11 +1980,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1942,7 +1993,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1951,7 +2002,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -1960,22 +2011,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -1983,93 +2034,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2086,11 +2137,19 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2104,21 +2163,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2126,195 +2185,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr ""
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr ""
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr ""
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr ""
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2322,28 +2393,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr ""
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2352,7 +2423,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2360,13 +2431,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2375,17 +2446,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2395,19 +2466,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2416,1049 +2487,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
+#: src/gui.c:1109
+msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1084
-msgid "Custom _Tools"
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3466,81 +3513,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3548,7 +3595,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3556,32 +3603,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3589,68 +3636,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3660,53 +3707,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3718,11 +3776,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3730,14 +3788,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3745,29 +3803,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3775,66 +3833,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3843,16 +3897,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3860,7 +3914,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3868,68 +3922,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3939,22 +3988,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -3962,66 +4011,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr ""
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4032,7 +4081,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4044,11 +4093,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4056,46 +4105,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4103,7 +4152,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4115,14 +4164,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4130,19 +4179,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4150,83 +4199,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4235,14 +4284,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4251,7 +4300,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4262,7 +4311,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4271,11 +4320,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4317,11 +4366,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4343,17 +4392,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4361,28 +4411,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4391,7 +4441,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4399,7 +4449,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4407,7 +4457,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4418,7 +4468,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4428,7 +4478,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4436,7 +4486,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4445,13 +4495,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4462,13 +4512,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4478,7 +4528,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4487,7 +4537,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4495,7 +4545,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4503,63 +4553,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4567,14 +4617,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4583,25 +4633,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4610,33 +4660,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -4646,7 +4696,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -4656,7 +4706,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -4666,7 +4716,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4675,7 +4725,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -4685,7 +4735,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4694,7 +4744,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -4704,12 +4754,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4718,7 +4768,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4727,7 +4777,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4736,14 +4786,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4751,13 +4809,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4767,27 +4825,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4796,14 +4854,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4814,19 +4872,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4834,7 +4892,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4842,7 +4900,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4854,7 +4912,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -4863,34 +4921,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4899,343 +4957,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr ""
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5243,71 +5557,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5317,17 +5631,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5337,32 +5651,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5371,14 +5685,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5388,40 +5695,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5430,11 +5744,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5443,7 +5757,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5453,192 +5767,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5648,55 +5946,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5705,7 +6003,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5713,231 +6011,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -5945,28 +6231,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -5975,41 +6261,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6019,27 +6305,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6048,7 +6334,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6058,12 +6344,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6073,7 +6359,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6083,12 +6369,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6096,23 +6382,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6122,55 +6408,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr ""
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr ""
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr ""
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6178,26 +6452,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6205,7 +6490,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6213,7 +6498,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6222,28 +6507,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6255,20 +6547,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6276,790 +6568,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7067,222 +7359,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7293,7 +7577,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7304,89 +7588,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7396,7 +7680,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7404,19 +7688,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7426,12 +7710,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7441,22 +7725,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7466,43 +7750,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7510,40 +7799,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr ""
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7552,65 +7846,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7660,11 +7958,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7682,64 +7975,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7748,7 +8041,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7756,14 +8049,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7773,7 +8066,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7782,208 +8075,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -7993,7 +8288,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8001,587 +8296,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8589,275 +8892,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8865,94 +9160,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8960,7 +9255,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8968,327 +9263,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9297,7 +9600,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9306,12 +9609,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"

LiVES-1.6.1.tar.bz2/po/nl_NL.po -> LiVES-2.0.3.tar.bz2/po/nl_NL.po Changed

@@ -3,20 +3,21 @@
 "Project-Id-Version: LiVES 0.9.5cvs\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2010-01-12 10:14+0000\n"
-"Last-Translator: cumulus007 <cumulus0007@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-21 12:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-Language: Dutch\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +26,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -34,7 +50,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -42,178 +58,197 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Grootte aanpassen"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
-msgstr "Welke dan ook"
+msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
-msgstr "Geen"
+msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
-msgstr "aanbevolen"
+msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
-msgstr "uitgeschakeld"
+msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr ""
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
-msgstr "Jack audio server starten ..."
+msgstr ""
 
-#: src/main.c:1410
-#, fuzzy
+#: src/main.c:1567
 msgid "Starting jack transport server..."
-msgstr "Jack audio server starten ..."
+msgstr ""
 
-#: src/main.c:1411
-#, fuzzy
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
-msgstr "Jack audio server starten ..."
+msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
-msgstr "Optionele afhankelijkheden aan het controleren:"
+msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
-msgstr "mplayer...gevonden..."
+msgstr ""
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
-msgstr "mplayer...NIET GEDETECTEERD..."
+msgstr ""
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
-msgstr "convert...gedetecteerd..."
+msgstr ""
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
-msgstr "convert...NIET GEDETECTEERD..."
+msgstr ""
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
-msgstr "composite...gedetecteerd..."
+msgstr ""
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
-msgstr "composite...NIET GEDETECTEERD..."
+msgstr ""
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
-msgstr "sox...gedetecteerd\n"
+msgstr ""
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
-msgstr "sox...NIET GEDECTEERD\n"
+msgstr ""
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
-msgstr "cdda2wav...gedetecteerd..."
+msgstr ""
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
-msgstr "cdda2wav...NIET GEDETECTEERD..."
+msgstr ""
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -221,174 +256,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
-"Welkom bij LiVES version %s.\n"
-"\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -396,27 +455,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Het Thema waarom je verzocht hebt is niet gevonden. Vergewis je ervan dat je "
-"de Thema's geinstalleerd hebt in\n"
-"%s/%s.\n"
-"(Wellicht moet je de waarde van <prefix_dir> in je ~/.lives bestand "
-"veranderen)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat een klein bestand te schrijven naar /tmp\n"
-"Vergewis dat je schrijftoegang hebt tot /tmp en probeer opnieuw.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -424,61 +474,38 @@
 "Please review the README file which came with this package\n"
 "before running LiVES.\n"
 msgstr ""
-"\n"
-"`smogrify` moet in je pad staan en uitvoerbaar zijn\n"
-"\n"
-"Lees aub het README bestand van dit package\n"
-"voordat je LiVES draait.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat het configuratiebestand te lezen\n"
-"%s/.lives\n"
-"\n"
-"Controleer aub de toestemmingen voor dit bestand en probeer het opnieuw.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het configuratiebestand te schrijven\n"
-"%s/.lives\n"
-"\n"
-"Controleer aub de toestemmingen voor dit bestand en directory en probeer het "
-"opnieuw.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat het tijdelijke directory te gebruiken\n"
-"%s\n"
-"\n"
-"Controleer de <tempdir> instelling van \n"
-"%s/.lives\n"
-"en probeer het opnieuw.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -486,10 +513,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES niet in staat dit 'image' te 'capturen'\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -499,62 +524,50 @@
 "\n"
 "Thankyou.\n"
 msgstr ""
-"\n"
-"Een onjuiste versie van smogrify is in je pad gevonden.\n"
-"\n"
-"Lees aub het README bestand van dit package\n"
-"voordat je LiVES draait.\n"
-"\n"
-"Bedankt.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
+
+#: src/main.c:2366
+msgid ""
 "\n"
-"LiVES vereist momenteel 'mplayer' of 'sox' om te werken. Installeer aub een "
-"van beide en probeer opnieuw.\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
-"\n"
-"LiVES kon 'mplayer' niet vinden. Wellicht wil je mplayer installeren om "
-"LiVES vollediger te gebruiken.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
-"\n"
-"LiVES kon 'convert' niet vinden. Je moet convert en image-magick installeren "
-"als je rendered effects wilt gebruiken.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
-"\n"
-"LiVES kon 'composite' niet vinden. Je moet composite en image-magick "
-"installeren wanneer je de merge functie wilt gebruiken.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -562,98 +575,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
-msgstr "Afspelen"
+msgstr ""
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
-"LiVES niet in staat dit 'image' te 'capturen'\n"
-"\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
-msgstr "_Ongedaan maken"
+msgstr ""
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
-msgstr "Op_nieuw uitvoeren"
+msgstr ""
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
-msgstr "Beeld"
+msgstr ""
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
-msgstr "Audio Links"
+msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
-msgstr "Audio rechts"
+msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -662,26 +673,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Speel Willekeurige Muziek"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -691,7 +687,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -701,7 +697,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -712,7 +708,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -721,54 +717,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -776,167 +772,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
-#, fuzzy
+#: src/startup.c:422
 msgid "Skipped"
-msgstr "_Overslaan"
+msgstr ""
 
-#: src/startup.c:512
-#, fuzzy
+#: src/startup.c:437
 msgid "Passed"
-msgstr "Pauseren"
+msgstr ""
 
-#: src/startup.c:544
-#, fuzzy
+#: src/startup.c:461
 msgid "Failed"
-msgstr "_Bestand"
+msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
-#, fuzzy
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
-msgstr "Optionele afhankelijkheden aan het controleren:"
+msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
 msgstr ""
-"LiVES niet in staat dit 'image' te 'capturen'\n"
-"\n"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
-#, fuzzy
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
-msgstr "Optionele afhankelijkheden aan het controleren:"
+msgstr ""
 
-#: src/startup.c:775
-#, fuzzy
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
-"\n"
-"\n"
-"Je moet mplayer installeren voor een preview van dit bestand.\n"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
-#, fuzzy
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
-msgstr "Optionele afhankelijkheden aan het controleren:"
+msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -944,94 +936,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
-msgstr "Voorbeeld"
+msgstr ""
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1039,196 +1031,196 @@
 "\n"
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
-"\n"
-"\n"
-"Momentje geduld\n"
-"\n"
-"Vergeet niet naderhand de effecten uit te schakelen (ctrl-0)!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
-"\n"
-"Momentje geduld"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Details tonen"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
-msgstr "_Voorbeeld"
+msgstr ""
 
-#: src/interface.c:429
-#, fuzzy
+#: src/interface.c:256
 msgid "Paus_e"
-msgstr "Pauseren"
+msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
-msgstr "_Annuleren"
+msgstr ""
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
-msgstr "Formatteren"
+msgstr ""
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
-msgstr "Framegrootte"
+msgstr ""
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
-msgstr "Bestandsgrootte"
+msgstr ""
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
-msgstr "Totale tijd"
+msgstr ""
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
-msgstr "FPS"
+msgstr ""
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
-msgstr "Kaders"
+msgstr ""
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
-msgstr "Gebeurtenissen"
+msgstr ""
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
-msgstr "Geluid"
+msgstr ""
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr ""
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
-msgstr "Venster _sluiten"
+msgstr ""
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Hernoem Clip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1238,7 +1230,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1247,47 +1239,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
-msgstr "Verstuur geen informatie over bandbreedte"
+msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
-msgstr "Probeer dit als je problemen hebt om een stream te krijgen"
-
-#: src/interface.c:1827
-msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
+#: src/interface.c:1313
+msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1295,426 +1302,376 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Hernoem Clip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Voer Set Naam in"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Voer Set Naam in"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
-msgstr "Nieuwe naam "
+msgstr ""
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
-msgstr "Set naam "
+msgstr ""
 
-#: src/interface.c:2204
-#, fuzzy
+#: src/interface.c:1627
 msgid "Use def_aults"
-msgstr "Als standaard instellen"
+msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
-msgstr "_Geavanceerd"
+msgstr ""
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:2487
-#, fuzzy
+#: src/interface.c:1853
 msgid "Channel  "
-msgstr "Annuleren"
+msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
-#, fuzzy
+#: src/interface.c:1956
 msgid "Width"
-msgstr "_Breedte"
+msgstr ""
 
-#: src/interface.c:2659
-#, fuzzy
+#: src/interface.c:1962
 msgid "Height"
-msgstr "_Hoogte"
+msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Uitvoerformaat"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
-msgstr "eerste"
+msgstr ""
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
-msgstr "laatste"
-
-#: src/interface.c:2923
-msgid "seconds."
-msgstr "seconden."
-
-#: src/interface.c:2948
-msgid "selection."
 msgstr ""
 
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Speel Willekeurige Muziek"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
+#: src/interface.c:2121
+msgid "seconds."
 msgstr ""
 
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Map:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimale bestandsgrootte (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maximale bestandsgrootte (MB)        "
-
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
-msgstr "LiVES: - Commentaar (optioneel)"
+msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
-msgstr "Titel/Naam : "
+msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
-msgstr "Schrijver/Artiest: "
+msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
-msgstr "Commentaar: "
+msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "Details tonen"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Hernoem Clip"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "Als standaard instellen"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Selecteer Bestand"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat een klein bestand te schrijven naar /tmp\n"
-"Vergewis dat je schrijftoegang hebt tot /tmp en probeer opnieuw.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1724,7 +1681,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1734,26 +1691,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
-#, fuzzy
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
-"\n"
-"%s\n"
-"heeft geen back-up en is niet opgeslagen.\n"
-"\n"
-"Weet je zeker dat je het wilt sluiten?"
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1766,33 +1717,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1800,97 +1751,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Verwijder %s"
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
-msgstr "Lengte van de video is nu %d frames bij %.3f frames per seconde.\n"
+msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
-msgstr "Knippen"
+msgstr ""
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1899,31 +1850,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1931,7 +1882,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1940,86 +1891,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
-msgstr "Toevoegen"
+msgstr ""
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2027,11 +1978,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2040,7 +1991,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2049,7 +2000,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2058,22 +2009,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2081,93 +2032,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2184,11 +2135,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Rene Hasekamp https://launchpad.net/~hasekamp"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2202,24 +2164,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
-"\n"
-"\n"
-"Je moet mplayer installeren voor een preview van dit bestand.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2227,235 +2186,236 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
-msgstr "Annuleren"
-
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
 msgstr ""
 
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
-#, fuzzy
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
-msgstr "LiVES: - Waarschuwing !"
+msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
-msgstr "Stel aub je CD speler device in bij Tools | Preferences | Misc\n"
+msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
-msgstr "Doorgaan"
+msgstr ""
 
-#: src/callbacks.c:9198
-#, fuzzy
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
-"\n"
-"Gepauzeerd\n"
-"(click Keep om te stoppen en bewaren wat je hebt)\n"
-"(click Resume om door te gaan)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
-msgstr "Pauseren"
+msgstr ""
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
-msgstr "Behouden"
+msgstr ""
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
 "(click Keep to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 msgstr ""
-"\n"
-"Gepauzeerd\n"
-"(click Keep om te stoppen en bewaren wat je hebt)\n"
-"(click Resume om door te gaan)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr ""
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Stoppen"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2464,7 +2424,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2472,13 +2432,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2487,17 +2447,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2507,19 +2467,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2527,1057 +2487,1026 @@
 "Click 'OK' to export at the new speed, or 'Cancel' to export at the original "
 "rate.\n"
 msgstr ""
-"\n"
-"\n"
-"De audio afspeelsnelheid is in deze clip gewijzigd.\n"
-"Click 'OK' om met de nieuwe snelheid te exporteren, of 'Cancel' to met de "
-"originele snelheid te exporteren.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr "Kan pixmap bestand: %s niet vinden"
+msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
-msgstr "_Bestand"
+msgstr ""
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
-msgstr "_Bewerken"
+msgstr ""
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
-msgstr "Plakken als _nieuw beeld"
+msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
-msgstr "Selectie _verwijderen"
+msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
-msgstr "_Selecteren..."
+msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
-msgstr "Selectie in_verteren"
+msgstr ""
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
-msgstr "_Afspelen"
+msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
-msgstr "_Stoppen"
+msgstr ""
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
-msgstr "_Schermvullend"
+msgstr ""
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
-msgstr "_Dempen"
+msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
-#, fuzzy
+#: src/gui.c:1036
 msgid "Show Subtitles"
-msgstr "Details tonen"
+msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
-msgstr "_Gereedschappen"
+msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
-msgstr "_Gereedschap"
-
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Genereren"
+msgstr ""
 
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr ""
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
-#, fuzzy
+#: src/gui.c:1145
 msgid "Erase subtitles"
-msgstr "Details tonen"
+msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
-msgstr "_Voorkeuren..."
+msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
-msgstr "_Audio"
+msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
-msgstr "_Informatie"
+msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
-msgstr "_Geavanceerd"
+msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
-msgstr "_VJ"
+msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
-msgstr "_Speeltjes"
+msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
-msgstr "_Geen"
+msgstr ""
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
-msgstr "_Hulp"
+msgstr ""
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
-msgstr "I_nfo"
+msgstr ""
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
-msgstr "Jaargang"
+msgstr ""
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
-msgstr "                                                            "
+msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
-msgstr "_Vrij"
+msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
-msgstr "_Starten"
+msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
-msgstr "Terugspoelen"
+msgstr ""
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
-msgstr "Speel allemaal"
+msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3585,81 +3514,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3667,7 +3596,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3675,32 +3604,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3708,68 +3637,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
-msgstr "(Geen video)"
+msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
-msgstr "(Geen audio)"
+msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
-msgstr "LiVES kan niet naar mplayer overgaan terwijl er clips worden geladen."
+msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3779,54 +3708,65 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
-msgstr "%s op_nieuw uitvoeren"
+msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
-msgstr "%s wordt geopend"
+msgstr ""
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -3836,19 +3776,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"LiVES is momenteel niet geoptimaliseerd voor grotere bestanden.\n"
-"Het wordt (nog) aangeraden met een kleiner bestand te beginnen of om de "
-"'Open File Selection' optie te gebruiken.\n"
-"(Grootte=%.2fMB)\n"
-"\n"
-"Weet je zeker dat je verder wilt gaan?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
-msgstr " - momentje geduld alstublieft!"
+msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3856,17 +3789,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
-"\n"
-"\n"
-"Het is mogelijk dat je mplayer moet installeren om dit bestand te openen.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3874,30 +3804,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Hernoem Clip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3905,66 +3834,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Bestandsgrootte"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3973,16 +3898,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
-msgstr "Onbekend"
+msgstr ""
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
-msgstr "Naamloos%d"
+msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3990,7 +3915,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3998,68 +3923,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
-msgstr "Aan het backuppen"
+msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
-msgstr "Herstellen"
+msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4069,22 +3989,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4092,69 +4012,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
-msgstr "LiVES: - Waarschuwing !"
+msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
-msgstr "waarschuwing"
+msgstr ""
 
-#: src/dialogs.c:202
-#, fuzzy
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
-msgstr "LiVES: - Waarschuwing !"
+msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Waarschuwing !"
+msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "I_nfo"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4165,7 +4082,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4177,11 +4094,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4189,46 +4106,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4236,7 +4153,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4248,14 +4165,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4263,19 +4180,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4283,83 +4200,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4368,14 +4285,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4384,7 +4301,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4395,7 +4312,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4404,11 +4321,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4450,11 +4367,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4476,17 +4393,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4494,28 +4412,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4524,7 +4442,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4532,7 +4450,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4540,7 +4458,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4551,7 +4469,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4561,7 +4479,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4569,7 +4487,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4578,13 +4496,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4595,13 +4513,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4529,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4620,7 +4538,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4628,7 +4546,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4636,63 +4554,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4700,14 +4618,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4716,25 +4634,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4743,34 +4661,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
-msgstr "mislukt.\n"
+msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
-msgstr "gereed.\n"
+msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4778,13 +4696,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4792,13 +4706,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4806,26 +4716,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4833,26 +4735,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4860,17 +4754,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4879,7 +4769,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4887,12 +4777,8 @@
 "%s\n"
 "Please check the file permissions and try again."
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4901,14 +4787,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4916,13 +4810,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4932,27 +4826,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4961,14 +4855,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4979,19 +4873,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4999,7 +4893,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5007,7 +4901,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5019,45 +4913,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Welkom bij LiVES version %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5066,344 +4958,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
-msgstr "Overgangen"
+msgstr ""
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
-msgstr "effekt"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
-msgstr "Effekten"
+msgstr ""
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
-msgstr "Hulpmiddelen"
+msgstr ""
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
-msgstr "EigensplitterComponent"
+msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
-msgstr "audio"
+msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
-msgstr "Volumeregeling"
+msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Volumeregeling"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
-msgstr "onbekend"
+msgstr ""
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Breedte"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Hoogte"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5411,74 +5558,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
-msgstr "Als standaard instellen"
+msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
-msgstr "Venster sl_uiten"
+msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
-msgstr "Ongeldige parameter"
+msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "Op_nieuw uitvoeren"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Groen"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Blauw"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5488,17 +5632,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5508,32 +5652,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
-msgstr "_FPS"
+msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5542,14 +5686,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5559,40 +5696,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5601,11 +5745,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5614,7 +5758,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5624,193 +5768,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Hernoem Clip"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
-msgstr "Soort:"
-
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
 msgstr ""
 
-#: src/rfx-builder.c:248
-msgid "Tool -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
-msgstr "_Eigenschappen..."
+msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Taalcode:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5820,55 +5947,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
-msgstr "_Nieuw Item"
+msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
-msgstr "_Nummer verwijderen"
+msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
-msgstr "Naar _boven"
+msgstr ""
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
-msgstr "Naar _onderen"
+msgstr ""
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5877,7 +6004,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5885,231 +6012,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6117,28 +6232,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6147,41 +6262,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6191,27 +6306,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6220,7 +6335,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6230,12 +6345,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6245,7 +6360,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6255,12 +6370,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6268,23 +6383,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6294,55 +6409,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Ingebouwd"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Aangepast"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Toetsen"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6350,26 +6453,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6377,7 +6491,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6385,7 +6499,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6394,28 +6508,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6427,20 +6548,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6448,790 +6569,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
-msgstr "GUI"
+msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
-msgstr "seconden"
+msgstr ""
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
-msgstr "_Nooit"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
-msgstr "_jpeg"
+msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
-msgstr "_png"
+msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
-msgstr "Decoderen"
-
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
-msgstr "VIDEO"
+msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
-msgstr "mplayer"
+msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
-msgstr "Weergave"
+msgstr ""
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
-msgstr "Opname"
+msgstr ""
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
-msgstr "Audio codec"
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
-msgstr "Encoderen"
+msgstr ""
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
-msgstr "Mappen"
+msgstr ""
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
-msgstr " MB"
+msgstr ""
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
-msgstr "Waarschuwingen"
+msgstr ""
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
-msgstr "Aanvullend"
+msgstr ""
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
-msgstr "Thema's"
+msgstr ""
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
-msgstr "Geavanceerd"
+msgstr ""
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7239,224 +7360,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
-"Veranderingen in het Thema worden de volgende keer dat je LiVES start van "
-"kracht."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
-msgstr "Grootte wijzigen"
+msgstr ""
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
-msgstr "Opnieuw instellen"
+msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
-msgstr "Niet ondertekend"
+msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
-msgstr "Huidig"
-
-#: src/resample.c:1486
-msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
+#: src/resample.c:1340
+msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
-msgstr "Nieuw"
+msgstr ""
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
-msgstr "Onbegrensd"
+msgstr ""
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7467,7 +7578,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7478,89 +7589,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
-msgstr "Type: %s"
+msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7570,7 +7681,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7578,20 +7689,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7599,17 +7710,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"LiVES was niet in staat naar het bestand te schrijven:\n"
-"%s\n"
-"Controleer aub de toestemmingen en probeer het opnieuw."
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7619,22 +7726,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7644,43 +7751,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7688,40 +7800,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
-msgstr "Geen Beschrijving"
+msgstr ""
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
-msgstr "Auteur: %s"
+msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
-msgstr "Beschrijving: "
+msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7730,65 +7847,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
-msgstr "Ctrl-%d"
+msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
-msgstr "Informatie"
+msgstr ""
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
-msgstr "Wissen"
+msgstr ""
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7831,19 +7952,13 @@
 msgstr ""
 
 #: src/lives-yuv4mpeg.c:397
-#, fuzzy
 msgid "Audio: "
-msgstr "Geluid"
+msgstr ""
 
 #: src/lives-yuv4mpeg.c:400
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7861,64 +7976,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7927,7 +8042,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7935,14 +8050,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7952,7 +8067,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7961,208 +8076,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
-msgstr "Gaten opvullen"
+msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
-msgstr "Blok verwijderen"
+msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
-msgstr "Verwijder %s"
+msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8172,7 +8289,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8180,587 +8297,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
-msgstr "Sele_ctie"
+msgstr ""
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
-msgstr "_Kopiëren…"
+msgstr ""
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
-msgstr "_Renderen"
+msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
-msgstr "_Weergeven"
+msgstr ""
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
-msgstr "Compacte weergave"
+msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
-msgstr "Toep_assen"
+msgstr ""
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
-msgstr "Kader opstarten"
-
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr ""
+
+#: src/multitrack.c:8167
 msgid "End frame"
-msgstr "Kader afsluiten"
+msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
-msgstr "Scrollen"
+msgstr ""
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
-msgstr " %s"
+msgstr ""
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
-msgstr "%s tot %s"
+msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8768,275 +8893,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
-msgstr "Opschonen..."
+msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
-msgstr "_Pauseer"
+msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
-msgstr "beeldjes"
+msgstr ""
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9044,95 +9161,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "Jack audio server starten ..."
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9140,7 +9256,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9148,328 +9264,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "Jack audio server starten ..."
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
-msgstr "gegevens"
+msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
-msgstr "snelheid"
+msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
-msgstr "opmerking"
+msgstr ""
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
-msgstr "waarde"
+msgstr ""
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
-msgstr "staat"
+msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
-msgstr "variabel"
+msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
-msgstr "x"
+msgstr ""
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
-msgstr "bereik"
+msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
-msgstr "Verwijder Alles"
+msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
-msgstr "fps"
+msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
-msgstr "toets"
+msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
-msgstr "pnum"
+msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
-msgstr "fps_ratio"
+msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9478,7 +9601,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9487,12 +9610,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9503,16 +9626,14 @@
 msgstr ""
 
 #: src/videodev.c:539
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
-"LiVES niet in staat dit 'image' te 'capturen'\n"
-"\n"
 
 #: src/videodev.c:556
-#, fuzzy, c-format
+#, c-format
 msgid "Opened device %s\n"
-msgstr "%s wordt geopend"
+msgstr ""
 
 #~ msgid "Adjust contrast"
 #~ msgstr "Contrast aanpassen"
@@ -9527,11 +9648,7 @@
 
 #, fuzzy
 #~ msgid "Blank _Colour"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "Blank frames"
-#~ msgstr "Kader afsluiten"
+#~ msgstr "Vervagen"
 
 #~ msgid "Blanking"
 #~ msgstr "Wissen"
@@ -9553,27 +9670,7 @@
 
 #, fuzzy
 #~ msgid "Border _Colour"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "Brightness _end"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "Brightness _start"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "Brightness change"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "Brightness end"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "Brightness start"
-#~ msgstr "Overgangen"
+#~ msgstr "Vervagen"
 
 #~ msgid "Charcoal"
 #~ msgstr "Houtskool"
@@ -9585,14 +9682,6 @@
 #~ msgid "Checkerboarding"
 #~ msgstr "Schaakbord"
 
-#, fuzzy
-#~ msgid "Clipboard _over selection"
-#~ msgstr "Selectie in_verteren"
-
-#, fuzzy
-#~ msgid "Clipboard _under selection"
-#~ msgstr "Selectie in_verteren"
-
 #~ msgid "Colorize"
 #~ msgstr "Verkleuren"
 
@@ -9622,7 +9711,7 @@
 
 #, fuzzy
 #~ msgid "Cycle _Step"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #~ msgid "Deinterlace"
 #~ msgstr "De-interliniëren"
@@ -9667,7 +9756,7 @@
 
 #, fuzzy
 #~ msgid "Fade _colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "Fade _end"
@@ -9692,12 +9781,8 @@
 #~ msgstr "Vervaging"
 
 #, fuzzy
-#~ msgid "Fina_l frame"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
 #~ msgid "Flash _colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #~ msgid "Flip vertically"
 #~ msgstr "Verticaal spiegelen"
@@ -9708,23 +9793,19 @@
 
 #, fuzzy
 #~ msgid "Frame Calculator"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "Frame _Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "Frame _height"
-#~ msgstr "Framegrootte"
+#~ msgstr "_Hoogte"
 
 #, fuzzy
 #~ msgid "Frame _width"
-#~ msgstr "Framegrootte"
-
-#, fuzzy
-#~ msgid "Frames _per second (FPS)"
-#~ msgstr "seconden"
+#~ msgstr "_Hoogte"
 
 #, fuzzy
 #~ msgid "Gamma _end"
@@ -9732,51 +9813,19 @@
 
 #, fuzzy
 #~ msgid "Gamma _start"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "Gamma change"
 #~ msgstr "Vervagen"
 
 #, fuzzy
-#~ msgid "Generate blank frames"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generate clip from image"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generate coloured frames"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generate title frames"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generating blank frames"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generating clip from image"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generating coloured frames"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
-#~ msgid "Generating title frames"
-#~ msgstr "Kader afsluiten"
-
-#, fuzzy
 #~ msgid "Hue _end"
 #~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "Hue _start"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "Hue change"
@@ -9788,22 +9837,18 @@
 
 #, fuzzy
 #~ msgid "Hue start"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "Image overlay"
-#~ msgstr "elke"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "Keep _Centered"
-#~ msgstr "_Renderen"
+#~ msgstr "_Overig"
 
 #~ msgid "L_eft"
 #~ msgstr "L_inks"
 
 #, fuzzy
 #~ msgid "Making monochrome"
-#~ msgstr "Monochroom"
+#~ msgstr "monochrome"
 
 #, fuzzy
 #~ msgid "Modulate (BSH)"
@@ -9853,27 +9898,27 @@
 
 #, fuzzy
 #~ msgid "S_tart %"
-#~ msgstr "_Starten"
+#~ msgstr "Draaikolk"
 
 #, fuzzy
 #~ msgid "Saturation _end"
-#~ msgstr "Overgangen"
+#~ msgstr "Draaikolk"
 
 #, fuzzy
 #~ msgid "Saturation _start"
-#~ msgstr "Overgangen"
+#~ msgstr "Draaikolk"
 
 #, fuzzy
 #~ msgid "Saturation change"
-#~ msgstr "Overgangen"
+#~ msgstr "Schaakbord"
 
 #, fuzzy
 #~ msgid "Saturation end"
-#~ msgstr "Overgangen"
+#~ msgstr "Draaikolk"
 
 #, fuzzy
 #~ msgid "Saturation start"
-#~ msgstr "Overgangen"
+#~ msgstr "Draaikolk"
 
 #~ msgid "Sepia"
 #~ msgstr "Sepia"
@@ -9902,14 +9947,6 @@
 #~ msgid "Spinning"
 #~ msgstr "Tollen"
 
-#, fuzzy
-#~ msgid "Splice"
-#~ msgstr "Om een as draaien"
-
-#, fuzzy
-#~ msgid "Splicing"
-#~ msgstr "Tollen"
-
 #~ msgid "Spread"
 #~ msgstr "Spreiden"
 
@@ -9917,14 +9954,6 @@
 #~ msgstr "Spreiding"
 
 #, fuzzy
-#~ msgid "Step _Value"
-#~ msgstr "Kader opstarten"
-
-#, fuzzy
-#~ msgid "Step per _Frame"
-#~ msgstr "Kader opstarten"
-
-#, fuzzy
 #~ msgid "Swirl _start"
 #~ msgstr "Draaikolk"
 
@@ -9939,10 +9968,6 @@
 #~ msgid "Swirling"
 #~ msgstr "Draaikolk"
 
-#, fuzzy
-#~ msgid "Text Overlay"
-#~ msgstr "elke"
-
 #~ msgid "Trimming"
 #~ msgstr "Snijden"
 
@@ -9961,22 +9986,18 @@
 
 #, fuzzy
 #~ msgid "_Background Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_Background colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #~ msgid "_Bottom"
 #~ msgstr "_Onderkant"
 
 #, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "_Starten"
-
-#, fuzzy
 #~ msgid "_Cycle Start"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "_Decrease Contrast"
@@ -9984,11 +10005,11 @@
 
 #, fuzzy
 #~ msgid "_End Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_End amount"
-#~ msgstr "Kader afsluiten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_Fade level"
@@ -10000,55 +10021,19 @@
 
 #, fuzzy
 #~ msgid "_Fill colour"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "_First frame"
-#~ msgstr "Kader opstarten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_Flash for"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #~ msgid "_Font"
 #~ msgstr "_Lettertype"
 
 #, fuzzy
-#~ msgid "_Frames per second"
-#~ msgstr "seconden"
-
-#, fuzzy
-#~ msgid "_Frames"
-#~ msgstr "Kaders"
-
-#, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "_Image File"
-#~ msgstr "_Bestand"
-
-#, fuzzy
-#~ msgid "_Image"
-#~ msgstr "_Bestand"
-
-#, fuzzy
 #~ msgid "_Increase Contrast"
 #~ msgstr "contrast"
 
-#, fuzzy
-#~ msgid "_Levels"
-#~ msgstr "_Nooit"
-
-#, fuzzy
-#~ msgid "_Middle"
-#~ msgstr "_Bestand"
-
-#, fuzzy
-#~ msgid "_Midtone"
-#~ msgstr "_Dempen"
-
 #~ msgid "_Negate"
 #~ msgstr "_Negatief"
 
@@ -10060,10 +10045,6 @@
 #~ msgstr "_Overig"
 
 #, fuzzy
-#~ msgid "_Point size"
-#~ msgstr "Bestandsgrootte"
-
-#, fuzzy
 #~ msgid "_Radius end"
 #~ msgstr "_Straal"
 
@@ -10074,24 +10055,16 @@
 #~ msgid "_Radius"
 #~ msgstr "_Straal"
 
-#, fuzzy
-#~ msgid "_Random colour each frame"
-#~ msgstr "Kader afsluiten"
-
 #~ msgid "_Right"
 #~ msgstr "_Rechts"
 
 #, fuzzy
-#~ msgid "_Rotate Selection by"
-#~ msgstr "Selectie _verwijderen"
-
-#, fuzzy
 #~ msgid "_Sigma end"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "_Sigma start"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "_Skip ahead"
@@ -10102,43 +10075,28 @@
 
 #, fuzzy
 #~ msgid "_Source Colour"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "_Splice"
-#~ msgstr "Om een as draaien"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_Start Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_Start Value"
-#~ msgstr "Kader opstarten"
-
-#, fuzzy
-#~ msgid "_Start amount"
-#~ msgstr "Kader opstarten"
+#~ msgstr "Draaikolk"
 
 #, fuzzy
 #~ msgid "_Stroke colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "_Target Colour"
-#~ msgstr "_Starten"
+#~ msgstr "Vervagen"
 
 #~ msgid "_Text"
 #~ msgstr "_Tekst"
 
 #, fuzzy
-#~ msgid "_Time (seconds)"
-#~ msgstr "seconden"
-
-#~ msgid "_Top"
-#~ msgstr "_Bovenkant"
-
-#, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "Golven"
 
@@ -10147,40 +10105,24 @@
 
 #, fuzzy
 #~ msgid "_X Center"
-#~ msgstr "_Renderen"
+#~ msgstr "_Overig"
 
 #, fuzzy
 #~ msgid "_X Start"
-#~ msgstr "_Starten"
+#~ msgstr "_Straal"
 
 #, fuzzy
 #~ msgid "_Y Center"
-#~ msgstr "_Renderen"
-
-#, fuzzy
-#~ msgid "_Y Start"
-#~ msgstr "_Starten"
-
-#, fuzzy
-#~ msgid "_degrees"
-#~ msgstr "_Vrij"
-
-#, fuzzy
-#~ msgid "_then"
 #~ msgstr "_Overig"
 
 #, fuzzy
-#~ msgid "blank_frames"
-#~ msgstr "beeldjes"
+#~ msgid "_Y Start"
+#~ msgstr "_Straal"
 
 #~ msgid "blur"
 #~ msgstr "vervagen"
 
 #, fuzzy
-#~ msgid "brightness_change"
-#~ msgstr "Overgangen"
-
-#, fuzzy
 #~ msgid "charcoal"
 #~ msgstr "Houtskool"
 
@@ -10236,36 +10178,12 @@
 #~ msgstr "fc"
 
 #, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "_Starten"
-
-#, fuzzy
 #~ msgid "gamma_change"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "gen_blank_frames"
-#~ msgstr "beeldjes"
-
-#, fuzzy
-#~ msgid "gen_clip_from_image"
-#~ msgstr "Kader afsluiten"
+#~ msgstr "Vervagen"
 
 #, fuzzy
 #~ msgid "gen_coloured_frames"
-#~ msgstr "beeldjes"
-
-#, fuzzy
-#~ msgid "gen_text"
-#~ msgstr "_Tekst"
-
-#, fuzzy
-#~ msgid "hue_change"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "image_overlay"
-#~ msgstr "elke"
+#~ msgstr "Verkleuren"
 
 #, fuzzy
 #~ msgid "modulate"
@@ -10297,7 +10215,7 @@
 
 #, fuzzy
 #~ msgid "saturation_change"
-#~ msgstr "Overgangen"
+#~ msgstr "Schaakbord"
 
 #~ msgid "sepia"
 #~ msgstr "sepia"
@@ -10330,12 +10248,8 @@
 #~ msgstr "Draaikolk"
 
 #, fuzzy
-#~ msgid "textover"
-#~ msgstr "elke"
-
-#, fuzzy
 #~ msgid "transition_bwthresh"
-#~ msgstr "Overgangen"
+#~ msgstr "Schaakbord"
 
 #, fuzzy
 #~ msgid "transition_checkerboard"
@@ -10343,82 +10257,14 @@
 
 #, fuzzy
 #~ msgid "transition_fade2"
-#~ msgstr "Overgangen"
+#~ msgstr "Schaakbord"
 
 #, fuzzy
 #~ msgid "transition_splice"
-#~ msgstr "Overgangen"
-
-#, fuzzy
-#~ msgid "trim_frames"
-#~ msgstr "beeldjes"
+#~ msgstr "Schaakbord"
 
 #~ msgid "tunnel"
 #~ msgstr "tunnel"
 
-#, fuzzy
-#~ msgid "wave"
-#~ msgstr "Golven"
-
-#, fuzzy
-#~ msgid "Unable to open output file !"
-#~ msgstr ""
-#~ "LiVES niet in staat dit 'image' te 'capturen'\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "LiVES could not write to $nfile."
-#~ msgstr ""
-#~ "LiVES niet in staat dit 'image' te 'capturen'\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "LiVES was unable to open it."
-#~ msgstr ""
-#~ "LiVES niet in staat dit 'image' te 'capturen'\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "LiVES was not able to open the file"
-#~ msgstr ""
-#~ "LiVES niet in staat dit 'image' te 'capturen'\n"
-#~ "\n"
-
 #~ msgid "$file"
 #~ msgstr "$file"
-
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Waarschuwing !"
-
-#~ msgid "Red"
-#~ msgstr "Rood"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES was niet in staat naar het bestand te schrijven:\n"
-#~ "%s\n"
-#~ "Controleer aub de toestemmingen en probeer het opnieuw."
-
-#~ msgid "xmms...detected..."
-#~ msgstr "xmms...gedetecteerd..."
-
-#~ msgid "xmms...NOT DETECTED..."
-#~ msgstr "xmms...NIET GEDETECTEERD..."
-
-#, fuzzy
-#~ msgid "You need to install dvgrab to use this option."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Het is mogelijk dat je mplayer moet installeren om dit bestand te "
-#~ "openen.\n"
-
-#~ msgid "Starting GUI...\n"
-#~ msgstr "Start GUI...\n"

LiVES-1.6.1.tar.bz2/po/oc.po -> LiVES-2.0.3.tar.bz2/po/oc.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:12+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-29 15:04+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +53,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -45,7 +61,7 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -53,170 +69,191 @@
 "e tota autra informacion indicada çaijós :\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Marca posicionada.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
-msgstr "Redimensionament"
+msgstr "Requadratge"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Requadra Totes Los Imatges"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Quin que siá"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Pas cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "desactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**La configuracion actuala**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Integrat"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Personalizat"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Testar"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Inicializacion del servidor àudio pulse..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...PAS DETECTAT..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...PAS DETECTAT..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...PAS DETECTAT\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...PAS DETECTAT..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...PAS DETECTAT..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...PAS DETECTAT..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...PAS DETECTAT..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...PAS DETECTAT..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...PAS DETECTAT..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -227,37 +264,63 @@
 "\n"
 "Lo gestionari de fenèstras apareis coma essent  \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre d'ecrans trobats : %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Lo dorsièr temporari es %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilat amb lo supòrt de jack, plan !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -266,7 +329,7 @@
 "Benvenguda sus LiVES version %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -275,128 +338,128 @@
 "\n"
 "La sintaxi d'aviada es : %s [opcions] [nomfichièr [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "imatges : nombre maximal d'imatges de dobrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts pòt èsser :\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : avia lo programa sens l'interfàcia grafica.\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : aviar en mòde multipista\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart  : aviar pas l'escotador OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Aviada de l'interfàcia grafica..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -404,17 +467,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -423,46 +487,46 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
 "%s\n"
 "\n"
 "%s"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -473,42 +537,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -516,96 +587,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "En cargant automaticament lo set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Lector àudio invalid %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sens títol%d> %dx%d : %d quadres %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? quadres ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d quadres %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Pas de Fichièr>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
-msgstr "Lectura"
+msgstr "Legir"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Fichièr Tampat %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
-msgstr "An_ullar"
+msgstr "_Anullar"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Restablir"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vidèo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Àudio Esquèrra"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Àudio Drecha"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -614,26 +685,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Fenèstra de Lectura"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Fenèstra de Lectura"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -643,7 +699,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -653,7 +709,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -664,7 +720,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -673,54 +729,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Lo nom del dorsièr es tròp long !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -728,155 +784,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - causir un lector àudio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Utiliza lo lector àudio _pulse"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Utilizar lo lector àudio jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Utiliza lo lector àudio _sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Utiliza lo lector audui _mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Seguent"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
-msgstr "Ignorat"
+msgstr "Evitat"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Capitat"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
-msgstr "Fracassat"
+msgstr "Fracàs"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Verificacion de la preséncia de \"sox\""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Verifica se sox pòt convertir de son"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
-msgstr ""
+msgstr "La comanda a fracassat : %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Verifica se \"mplayer\" es present"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Verifica se mplayer pòt convertir de son"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -884,94 +948,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "Aca_bar"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Aplicar lo desentrelaçament"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
-msgstr "Apercebut"
+msgstr "Previsualizacion"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Tractament..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -980,8 +1044,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -989,180 +1053,188 @@
 "\n"
 "Pacientatz SVP"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Afichar los detalhs"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Pro"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
-msgstr "A_percebut"
+msgstr "_Previsualizacion"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Paus_a"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "Pausa/_Pro"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
-msgstr "A_nullar"
+msgstr "_Anullar"
+
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
 
-#: src/interface.c:607
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formatar"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
-msgstr "Talha del quadre"
+msgstr "Talha de l'enquadrament"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Talha del fichièr"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
-msgstr "Temps Total"
+msgstr "Durada totala"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
-msgstr "Quadres"
+msgstr "Tramas"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eveniments"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Àudio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Velocitat/talha"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Àudio drecha"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opcions d'encodatge"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Conservar mos reglatges"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Utilizar los paramètres recomandats"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Veire Los _Detalhs"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Tampar la fenèstra"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
-msgstr "_Salva al fichièr"
+msgstr "Enregi_strar dins un fichièr"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserís"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Inserís per correspondre al son"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Inserís _abans la seleccion"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Inserís aprèp la seleccion"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Inserís amb lo _son"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Inserís sens lo son"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Dobrir la Seleccion"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Començament de la seleccion (seg)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Nombre d'imatges de dobrir"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Dobrir l'emplaçament"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Tornar nomenar un Clip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1172,7 +1244,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1181,47 +1253,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
-msgstr "URL : "
+msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Tornar nomenar un Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Entrar lo nom dels paramètres"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1229,399 +1316,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Tornar nomenar un Clip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Entrar lo nom dels paramètres"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Entrar lo nom dels paramètres"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nom novèl "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Indicar nom "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avançat"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Cargar una pista CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Selecciona lo títol VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Pista de cargar (de %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Títol DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Títol VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Nombre maximal de pistas d'afichar"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capítol  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Àudio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Largor"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Nautor"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Pilòt"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Format de sortida"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
-msgstr "primièr"
+msgstr "primièra"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
-msgstr "darrièr"
+msgstr "darrièra"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "segondas."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "seleccion."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Dorsièr :"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Talha Minimum Fichièr (Mio)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Talha Maximun Fichièr (Mio)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "seleccion"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Commentaires Fichier (optionnel)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Títol/Nom  : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentaris : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
-msgstr ""
+msgstr "_Opcions"
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Salva al fichièr"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
+msgstr "Percórrer..."
+
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: causir un fichièr"
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Anullar/Contunhar/Salvar"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Nom de l'ensemble de clips"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignòra los cambiaments"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Suprimís la disposicion"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Salva la disposicion"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Salva l'ensemble de clips"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Opcions d'encodatge"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr ""
+msgstr "_Reïnicializar a las valors per defaut"
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
-msgstr ""
+msgstr "_Acceptar"
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Seleccionatz un fichièr"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "En cargant automaticament lo set %s..."
+msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1629,17 +1675,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Aqueste fichièr"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1649,7 +1695,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1659,14 +1705,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1674,7 +1720,7 @@
 "\n"
 "Fichièr de projècte invalid.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1687,33 +1733,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importar lo projècte %s en tant que %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "importacion del projècte"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportacion del projècte %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportacion del projècte"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Restablir lo fichièr .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Salvar coma fichièr .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Restablir lo fichièr .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1721,97 +1767,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Supression del set..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Supression del set..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Supression del set"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Anullacion"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Refar"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Copar"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Empegament"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1820,31 +1866,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1852,7 +1898,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1861,79 +1907,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
-msgstr "Insercion"
+msgstr "Insercion de"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
-msgstr "Inserir"
+msgstr "Insercion"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Escafament dels imatges %d a %d%s...."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Supression"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
-msgstr "Suprimir"
+msgstr "Levar"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -1943,7 +1989,7 @@
 "\n"
 "La seleccion es varrolhada.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1951,11 +1997,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1964,7 +2010,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1973,7 +2019,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -1982,22 +2028,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Salva %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Cargament dels clips dempuèi %s"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2005,41 +2051,37 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Netejatge de l'espaci de disc..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Netejatge de l'espaci de disc"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d Mio d'espaci de disc recuperat.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Exterior : %s\n"
-"Interior : %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2047,7 +2089,7 @@
 "\n"
 "  Dobertura..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2056,7 +2098,7 @@
 "\n"
 "(%d virtuals)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2065,7 +2107,7 @@
 "\n"
 "(%d desencodats)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2074,7 +2116,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2082,23 +2124,23 @@
 "\n"
 "  Desconegut"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "signat"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2107,7 +2149,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2124,11 +2166,21 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2142,21 +2194,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2164,195 +2216,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Anullacion"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Validacion del son"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Àudio novèl"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Talha simpla (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volum àudio (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Activar l'àudio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Desactivar l'àudio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Pista CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Dobertura de la pista CD...."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Seleccion de las pistas"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "Errors de sortida"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Contunhar"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "en espèra..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
-msgstr "Pausa"
+msgstr "Metre en pausa"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "represa..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
-msgstr "Gardar"
+msgstr "Conservar"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2360,30 +2424,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Anullar"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Arrestar"
+msgstr "Arrestar"
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Enregistra l'Imatge jos %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2392,7 +2454,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2400,13 +2462,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2415,17 +2477,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2435,19 +2497,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2456,1051 +2518,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportacion del son"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Apondre Fichièr Àudio..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Fondut àudio..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Escafament del son"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Impossible de trobar lo fichièr d'imatge : %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Union"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Alinhar Fin"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Inserir d'Imatges"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Ignorar los imatges"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Fusion acabada.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "Efièches Personalizats"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "_Utilitaris Personalizats"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Fichièr"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "Fichièrs _Recents...."
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Dobrir URL/Stream..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "importacion del projècte"
+msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "Fichièrs _Recents...."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Edicion"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Mòde multipistas"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copiar Seleccion"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "_Copar Seleccion"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "Primièr Imatge solament"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_Darrièr Imatge solament"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inversar la seleccion"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Lectura"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Arrestar"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "Ecran _complet"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Talha _Dobla"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Lectura Continua"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong (Lectura Continua)"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Mut"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Efièche_s"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Espleches"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitaris"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Genèra"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Genèra"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferéncias..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Àudio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "_Cargar una pista CD...."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "Ejectar CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Enregistrament àudio"
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "A_vançat"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Pas cap"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Depanatge"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_A prepaus"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volum"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Liure"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Aviar"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Retorn rapid"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "%.2f seg."
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "%.2f seg."
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "%.2f seg."
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "%.2f seg."
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "%.2f seg."
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3508,81 +3544,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3590,7 +3626,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3598,32 +3634,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3631,68 +3667,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3702,53 +3738,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Anullar %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Restablir %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Dobertura de %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3760,11 +3807,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3772,14 +3819,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3787,32 +3834,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Fondut àudio..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Enregistra l'Imatge jos %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Enregistra l'Imatge jos %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Tornar nomenar un Clip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3820,66 +3864,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "seleccion"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Talha del fichièr"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3888,16 +3928,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3905,7 +3945,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3913,68 +3953,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3984,22 +4019,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4007,70 +4042,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Netejatge de l'espaci de disc"
+msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "avertiment"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Union"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "$error"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_A prepaus"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4081,7 +4112,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4093,11 +4124,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4105,46 +4136,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4152,7 +4183,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4164,14 +4195,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4179,19 +4210,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4199,83 +4230,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4284,14 +4315,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4300,7 +4331,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4311,7 +4342,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4320,11 +4351,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4366,11 +4397,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4392,17 +4423,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4410,28 +4442,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4440,7 +4472,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4448,7 +4480,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4456,7 +4488,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4467,7 +4499,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4477,7 +4509,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4485,7 +4517,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4494,13 +4526,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4511,13 +4543,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4527,7 +4559,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4536,7 +4568,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4544,7 +4576,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4552,63 +4584,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4616,14 +4648,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4632,25 +4664,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4659,63 +4691,63 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "acabat.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
 "%s\n"
 "Please check your system for errors.\n"
 "%s%s%s"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 "%s"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 "%s"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4724,17 +4756,17 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "The error was\n"
 "%s.\n"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4743,22 +4775,22 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "The error was\n"
 "%s.\n"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4767,7 +4799,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4776,7 +4808,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4785,14 +4817,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4800,13 +4840,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4816,27 +4856,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4845,14 +4885,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4863,19 +4903,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4883,7 +4923,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4891,7 +4931,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4903,45 +4943,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Benvenguda sus LiVES version %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4950,345 +4988,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "Generador -"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Generador -"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transicions"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efièch"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efièches"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "utilitari"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilitaris"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Separadors"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "àudio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "desconegut"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Nautor"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5296,74 +5588,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Restablir"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Verd"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Blau"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5373,17 +5662,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5393,32 +5682,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5427,14 +5716,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5444,40 +5726,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5486,11 +5775,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5499,7 +5788,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5509,193 +5798,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Opcions d'encodatge"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipe :"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efièch -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transicion -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generador -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utilitari -"
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Proprietats..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Còde de lenga :"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5705,55 +5977,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Desplaçar cap a_mont"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Desplaçar cap a_val"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5762,7 +6034,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5770,231 +6042,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6002,28 +6262,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6032,41 +6292,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6076,27 +6336,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6105,7 +6365,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6115,12 +6375,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6130,7 +6390,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6140,12 +6400,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6153,23 +6413,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6179,55 +6439,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Integrat"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Personalizat"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Testar"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6235,26 +6483,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6262,7 +6521,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6270,7 +6529,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6279,28 +6538,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6312,20 +6578,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6333,790 +6599,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "Interfàcia grafica"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "segondas"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "Pas _jamai"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDÈO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "ÀUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Lectura"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "Gio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Enregistrament"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Format de sortida"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Encodatge"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Repertòris"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " Mo"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Avertiments"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Divèrs"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Tèmas"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7124,222 +7390,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Escafament dels imatges %d a %d%s...."
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Pas signat"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Novèl"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Illimitat"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7350,7 +7608,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7361,89 +7619,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7453,7 +7711,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7461,34 +7719,34 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Unable to write keymap file\n"
 "%s\n"
 "Error was %s\n"
-msgstr "LiVES: causir un fichièr"
+msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7498,22 +7756,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7523,43 +7781,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7567,40 +7830,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Pas cap de descripcion"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor : %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Version : %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7609,65 +7877,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Escafar"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7717,11 +7989,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7739,64 +8006,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f seg.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Font : %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7805,7 +8072,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7813,14 +8080,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7830,7 +8097,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7839,208 +8106,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Suprimir %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8050,7 +8319,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8058,587 +8327,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Dobrir..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Se_leccion"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Afichatge"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Ora"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Desfilament"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Vidèo %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f seg."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8646,275 +8923,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Netejatge..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "imatges"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8922,94 +9191,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9017,7 +9286,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9025,329 +9294,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Inicializacion del servidor àudio pulse..."
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - causir un lector àudio"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "donadas"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nòta"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "estat"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variabla"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "Airal"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "Tot _suprimir"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "imtg/seg"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "clau"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9356,7 +9631,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9365,12 +9640,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9588,11 +9863,11 @@
 
 #, fuzzy
 #~ msgid "Frame _height"
-#~ msgstr "Talha del quadre"
+#~ msgstr "Talha de l'enquadrament"
 
 #, fuzzy
 #~ msgid "Frame _width"
-#~ msgstr "Talha del quadre"
+#~ msgstr "Talha de l'enquadrament"
 
 #, fuzzy
 #~ msgid "Frames _per second (FPS)"
@@ -9692,7 +9967,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Nombre d'imatges de dobrir"
+#~ msgstr "_Ignorar los imatges"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -9886,10 +10161,6 @@
 #~ msgstr "_Quadres"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Fondut"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_Fichièr"
 
@@ -9907,7 +10178,7 @@
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Nombre d'imatges de dobrir"
+#~ msgstr "_Ignorar los imatges"
 
 #, fuzzy
 #~ msgid "_Other Center"
@@ -9952,7 +10223,7 @@
 
 #, fuzzy
 #~ msgid "_Skip ahead"
-#~ msgstr "Ignorat"
+#~ msgstr "Evitat"
 
 #~ msgid "_Skip"
 #~ msgstr "_Ignorar"
@@ -9992,9 +10263,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "segondas"
 
-#~ msgid "_Top"
-#~ msgstr "_Amont"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "Ondulacion"
@@ -10179,34 +10447,5 @@
 #~ msgid "tunnel"
 #~ msgstr "Tunèl"
 
-#, fuzzy
-#~ msgid "Unable to open output file !"
-#~ msgstr "LiVES: causir un fichièr"
-
-#, fuzzy
-#~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES: causir un fichièr"
-
-#, fuzzy
-#~ msgid "LiVES was unable to open it."
-#~ msgstr "LiVES: causir un fichièr"
-
-#, fuzzy
-#~ msgid "LiVES was not able to open the file"
-#~ msgstr "LiVES: causir un fichièr"
-
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Union"
-
 #~ msgid "$error"
 #~ msgstr "$error"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Inicializacion del servidor àudio pulse..."
-
-#~ msgid "Red"
-#~ msgstr "Roge"

LiVES-1.6.1.tar.bz2/po/pl.po -> LiVES-2.0.3.tar.bz2/po/pl.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-09-18 02:25+0000\n"
-"Last-Translator: pp/bs <Unknown>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-13 15:08+0000\n"
-"X-Generator: Launchpad (build 14124)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr "%s Ostrzeżenie: %s\n"
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr "%s Błąd krytyczny: %s\n"
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu życia.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -54,15 +70,15 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
-"oraz wszelkie informacje przedstawione poniżej:\n"
+"oraz wszelkie informacje poniżej:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -72,163 +88,184 @@
 "więcej informacji.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Skalowanie"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Skaluj Wszystkie Klatki"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Dowolny"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
-msgstr "Żaden"
+msgstr "Brak"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "zalecane"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "niepełnosprawnych !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Obecny układ**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Wbudowane"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Własne"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Przetestuj"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...wykrytych..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIE WYKRYTO..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...wykrytych..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIE WYKRYTO..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...wykrytych\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIE WYKRYTO\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...wykrytych..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIE WYKRYTO..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...wykrytych..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIE WYKRYTO..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykrytych..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIE WYKRYTO..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...wykrytych..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NIE WYKRYTO..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...wykrytych..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NIE WYKRYTO..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...wykrytych..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NIE WYKRYTO..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -239,37 +276,63 @@
 "\n"
 "Sprawozdania Menedżer okien jako \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "liczba wykrytych monitorów: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Liczba wykrytych procesorów: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Katalog tymczasowy jest %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Skompilowane z obsługą jack, dobre !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -278,135 +341,135 @@
 "Zapraszamy do LiVES wersja %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : maksymalna liczba klatek, aby otworzyć\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts może to być:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : pokaż ten tekst pomocy i wyjścia\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : nie ładuje żadnych ustawić na starcie\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : nie wykazują gui\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : uruchamia się w trybie edytor wideo\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -414,17 +477,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -433,46 +497,46 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
 "%s\n"
 "\n"
 "%s"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -483,42 +547,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -526,96 +597,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Powtórz"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Wideo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -624,26 +695,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Losowo Muzyka"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -653,7 +709,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -663,7 +719,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -674,7 +730,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -683,54 +739,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -738,11 +794,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -750,145 +806,153 @@
 "ale niektóre funkcje audio zostaną wyłączone.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Wybierz odtwarzacz audio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Użyj _jack odtwarzacz audio"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Użyj _sox odtwarzacz audio"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Użyj _mplayer odtwarzacz audio"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Pominięty"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Zaliczony"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Nieudany"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testowanie konfiguracji"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Rozwiązywanie problemów"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES wykona teraz podstawowe testy konfiguracji\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -896,7 +960,7 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -907,7 +971,7 @@
 "Na koniec możesz wybrać, który interfejs będzie domyślnie ustawiany po "
 "uruchomieniu programu LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -918,7 +982,7 @@
 "LiVES ma dwa główne interfejsy, więc możesz wybrać, który z nich będzie "
 "ustawiany po uruchomieniu.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -928,73 +992,73 @@
 "\n"
 "Domyślne ustawienie można później zmieniać w oknie Preferencje.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Podgląd"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1003,8 +1067,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1012,180 +1076,188 @@
 "\n"
 "Proszę czekać"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Wyświetl szczegóły"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Dość"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Podgląd"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Wielkość filmu"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Wielkość pliku"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Wielkość pliku w bajtach"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Całkowity czas"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "Klatki na sekundę"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Klatki"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Zachowaj _ustawienia"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Użyj ustawień _zalecanych"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Pokaż _szczegóły"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Zamknij okno"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Zapisz do pliku"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Wstaw"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Liczba klatek, aby otworzyć"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: odzyskać układu ?"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1195,7 +1267,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1204,47 +1276,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "Adres : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "Adres : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Nie wysyłaj przepustowości informacji"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Wypróbuj tę funkcję, jeśli mają problemy ze znalezieniem strumień"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1252,399 +1339,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr ""
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
 msgstr ""
 
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nowa nazwa "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Ustaw nazwę "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Zaawansowane"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Tytuł DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Tytuł VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Maksymalna liczba utworów do wyświetlenia"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Rozdział  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "ID Dźwięku  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Format wyjściowy"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "pierwszy"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "ostatnią"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekund."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "wyboru."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Losowo Muzyka"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Liczba utworów wniosek:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Ścieżka:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimalny rozmiar pliku (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maksymalny rozmiar pliku (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "zaznaczenie"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Nazwa / Imię i nazwisko : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor / wykonawcy : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Komentarze : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Zapisz do pliku"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: wybierz katalog"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: wybierz plik"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorowanie zmian"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Zapisz układ"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: odzyskać układu ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: odzyskać układu ?"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "Ustaw wartość z pola jako domyślną"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Wybór pliku"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1652,17 +1698,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Plik ten"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1672,7 +1718,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1682,14 +1728,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1697,7 +1743,7 @@
 "\n"
 "Nieprawidłowy plik projektu.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1710,33 +1756,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importowanie projektu"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Projekt eksportowanie"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Przywróć .lv1 plik"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Przywróć .lv1 plik"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1748,97 +1794,97 @@
 "Ustaw zostaną usunięte z dysku.\n"
 "Czy na pewno ?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Usuwanie zestawu..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Usuwanie zestawu..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Usuwanie zestawu"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Cofanie"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Czyszczenie ramy obrazów"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Usuwanie nadmiaru ramek"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1847,31 +1893,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1879,7 +1925,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1888,30 +1934,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Wstawianie"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -1921,7 +1967,7 @@
 "Usuwanie wszystkich klatek zamknie ten plik.\n"
 "Czy na pewno ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -1931,8 +1977,8 @@
 "Skreślenie spowoduje brak ramek w niektóre układy wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -1942,7 +1988,7 @@
 "Usunięcie może spowodować brak audio w niektórych układów wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -1952,7 +1998,7 @@
 "Usunięcie powoduje przesunięcie ramki w niektórych układów wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -1963,20 +2009,20 @@
 "wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Kasowanie"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -1986,7 +2032,7 @@
 "\n"
 "Wybór jest zablokowana.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1994,11 +2040,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Nagrywanie anulowane.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2007,7 +2053,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2016,7 +2062,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2025,22 +2071,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2048,93 +2094,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2151,11 +2197,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Marcin Borowczyk https://launchpad.net/~bormar2011\n"
+"  risto https://launchpad.net/~kml\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2169,21 +2228,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2191,195 +2250,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Anulowanie"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Przywróć"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Zatrzymaj"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2387,29 +2458,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Przerwij"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Zatrzymaj"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2418,7 +2488,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2426,13 +2496,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2441,17 +2511,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2461,19 +2531,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2482,1050 +2552,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można odnaleźć pliku z piksmapą: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "Importowanie projektu"
+msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Wklej jako _nowy"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Usuń zaznaczenie"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Wybierz..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Odwróć zaznaczenie"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Odtwarzanie"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Zatrzymaj"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Pełny ekran"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Wyciszenie"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Narzędzia"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Generuj"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Generuj"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferencje..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Dźwięk"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Informacje"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Zaawansowane"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "Za_bawki"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Brak"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Adnotacje o programie"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Głośność"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Pierwsza klatka"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Ostatnia klatka"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Darmowe"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Uruchom"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Przewiń"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Odtwórz wszystko"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3533,81 +3578,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3615,7 +3660,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3623,32 +3668,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3656,68 +3701,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3727,53 +3772,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Cofnij %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Ponów %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3785,11 +3841,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3797,14 +3853,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3812,29 +3868,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3842,66 +3898,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "zaznaczenie"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Wielkość pliku"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3910,16 +3962,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Dokument_%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3927,7 +3979,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3935,68 +3987,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Przywracanie"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4006,22 +4053,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4029,69 +4076,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "ostrzeżenie"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Wstaw"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "$error"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Adnotacje o programie"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4102,7 +4146,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4114,11 +4158,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4126,46 +4170,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4173,7 +4217,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4185,14 +4229,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4200,19 +4244,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4220,83 +4264,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4305,14 +4349,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4321,7 +4365,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4332,7 +4376,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4341,11 +4385,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4387,11 +4431,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4413,17 +4457,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4431,28 +4476,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4461,7 +4506,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4469,7 +4514,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4477,7 +4522,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4488,7 +4533,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4498,7 +4543,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4506,7 +4551,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4515,13 +4560,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4532,13 +4577,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4548,7 +4593,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4557,7 +4602,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4565,7 +4610,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4573,63 +4618,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4637,14 +4682,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4653,25 +4698,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4680,63 +4725,63 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "nieudane.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "zrobione.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
 "%s\n"
 "Please check your system for errors.\n"
 "%s%s%s"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 "%s"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 "%s"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4745,17 +4790,17 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "The error was\n"
 "%s.\n"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4764,22 +4809,22 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "The error was\n"
 "%s.\n"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4788,7 +4833,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4797,7 +4842,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4806,19 +4851,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"Ustaw zostaną usunięte z dysku.\n"
-"Czy na pewno ?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4826,13 +4874,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4842,27 +4890,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4871,14 +4919,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4889,19 +4937,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4909,7 +4957,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4917,7 +4965,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4929,45 +4977,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Zapraszamy do LiVES wersja %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4976,343 +5022,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Przejścia"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efekt"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efekty"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Narzędzia"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "liniaPodzialu"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "nieznane"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Szerokość"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Wysokość"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5320,74 +5622,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Ustaw wartość z pola jako domyślną"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Zamknij okno"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Niepoprawny parametr"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Powtórz"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Zielone"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Niebieski"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5397,17 +5696,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5417,32 +5716,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5451,14 +5750,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5468,40 +5760,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5510,11 +5809,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5523,7 +5822,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5533,193 +5832,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: odzyskać układu ?"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Kod języka:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5729,55 +6011,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nowy wpis"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Usuń"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Przesuń w _górę"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Przesuń w _dół"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5786,7 +6068,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5794,231 +6076,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6026,28 +6296,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6056,41 +6326,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6100,27 +6370,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6129,7 +6399,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6139,12 +6409,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6154,7 +6424,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6164,12 +6434,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6177,23 +6447,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6203,55 +6473,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Wbudowane"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Własne"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Przetestuj"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6259,26 +6517,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6286,7 +6555,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6294,7 +6563,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6303,28 +6572,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6336,20 +6612,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6357,790 +6633,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nigdy"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Dekodowanie"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Wtyczka"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Nagrywanie"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Format wyjściowy"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Kedek dźwięku"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Katalogi"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Ostrzeżenia"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Różne"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Motywy"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7148,222 +7424,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Zmień rozmiar"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Zmiana rozdzielczości"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Niepodpisany"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Bieżące"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nowa"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Nieograniczony"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7374,7 +7642,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7385,98 +7653,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Usunięcie powoduje przesunięcie ramki w niektórych układów wielościeżkowym.\n"
-"Czy na pewno chcesz kontynuować ?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Skreślenie spowoduje przesunięcie audio w niektórych układów "
-"wielościeżkowym.\n"
-"Czy na pewno chcesz kontynuować ?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7486,7 +7745,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7494,34 +7753,34 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Unable to write keymap file\n"
 "%s\n"
 "Error was %s\n"
-msgstr "LiVES nie był w stanie otworzyć pliku"
+msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7531,22 +7790,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7556,43 +7815,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7600,40 +7864,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Brak opisu"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Opis: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7642,65 +7911,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Informacje"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7750,11 +8023,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7772,64 +8040,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Źródło: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7838,7 +8106,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7846,14 +8114,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7863,7 +8131,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7872,208 +8140,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Zamykanie przerw"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Usuń blok"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Usuń %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8083,7 +8353,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8091,587 +8361,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "_Wybór"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopiuj..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderuj"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Widok"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Widok oszczędny"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Zastosuj"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Początek ramki"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Koniec ramki"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8679,275 +8957,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Sprzątanie..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Wstrzymaj"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "klatek"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8955,94 +9225,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9050,7 +9320,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9058,329 +9328,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Uruchamianie serwera pulse audio"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - Wybierz odtwarzacz audio"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "dane"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "prędkość"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "notatka"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "wartość"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "stan"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "zmienna"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "zakres"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Usuń wszystko"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Zatrzymaj zapisywanie"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "klucz"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9389,7 +9665,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9398,12 +9674,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9732,10 +10008,6 @@
 #~ msgstr "Normalizacja"
 
 #, fuzzy
-#~ msgid "Number of _frames"
-#~ msgstr "    Liczba klatek, aby otworzyć"
-
-#, fuzzy
 #~ msgid "Pixilate"
 #~ msgstr "Obrót"
 
@@ -9928,10 +10200,6 @@
 #~ msgstr "_Klatki"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Przejdź"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_Plik"
 
@@ -9948,10 +10216,6 @@
 #~ msgstr "Negatyw"
 
 #, fuzzy
-#~ msgid "_Number of frames"
-#~ msgstr "    Liczba klatek, aby otworzyć"
-
-#, fuzzy
 #~ msgid "_Other Center"
 #~ msgstr "_Inny"
 
@@ -10033,9 +10297,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr "sekundy"
 
-#~ msgid "_Top"
-#~ msgstr "_Góra"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "Fala"
@@ -10268,10 +10529,6 @@
 #~ msgid "$file"
 #~ msgstr "$file"
 
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Wstaw"
-
 #~ msgid "cdda2wav is required for this function."
 #~ msgstr "cdda2wav jest wymagane dla tej funkcji."
 
@@ -10281,17 +10538,5 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Musisz ustawić urządzenie CD pierwszy w Preferencje."
 
-#~ msgid "Try again with different values."
-#~ msgstr "Spróbuj ponownie z różnymi wartościami."
-
 #~ msgid "$error"
 #~ msgstr "$error"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Uruchamianie serwera pulse audio"
-
-#~ msgid "Red"
-#~ msgstr "Czerwień"

LiVES-1.6.1.tar.bz2/po/pt.po -> LiVES-2.0.3.tar.bz2/po/pt.po Changed

@@ -3,20 +3,21 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:00+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +26,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -39,7 +55,7 @@
 "group_id=64341&atid=5071 39\n"
 "Obrigado. A recuperação deve ser possível se você reiniciar LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -51,7 +67,7 @@
 "Quando falha de informação, por favor inclua detalhes de seu sistema "
 "operacional, a distribuição ea versão do LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,170 +75,191 @@
 "e todas as informações mostradas abaixo:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "desactivado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**O layout atual**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Builtin"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Customizado"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Teste"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectados..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NÃO DETECTADO..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detectado..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NÃO DETECTADO..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectado..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NÃO DETECTADO..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectado..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NÃO DETECTADO..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -233,37 +270,63 @@
 "\n"
 "Gerenciador de janelas: \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "o diretório temp utilizado é %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilado com suporte a JACK, bom!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -272,7 +335,7 @@
 "Bem vindo ao LiVES versão %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -282,85 +345,85 @@
 "A sintaxe de inicialização é: %s [opçoes] [nome_do_arquivo [tempo_inicial] "
 "[frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Onde: nome_do_arquivo é o nome do arquivo de mídia ou backup.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "tempo_inicial : tempo inicial do arquivo em segundos\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : número máximo de frames a abrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "as opções podem ser:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : mostra este texto de ajuda e sai\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <nome_do_set>   : autocarregar set de clips nome_do_set\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : não carregar set no início\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : forçar não carregamento da recuperação de crash\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : forçar carregamento da recuperação de crash\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : não mostrar a interface gráfica\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : iniciar no modo de editor clip\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : iniciar monitoramento de OSC na porta UDP <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : não iniciar monitoramento de OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -368,44 +431,44 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "A iniciar GUI..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -413,27 +476,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"O tema que você procura não foi encontrado. Por favor, certifique-se de ter "
-"os temas instalados em\n"
-"%s/%s.\n"
-"(Talvez você precise mudar o valor de <prefix_dir> em seu arquivo ~/.lives)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever um pequeno arquivo em /tmp\n"
-"Por favor, certifique-se que tem permissão de escrita em /tmp e tente "
-"novamente.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -447,55 +501,37 @@
 "Por favor, leia o arquivo README que vem com este pacote\n"
 "antes de rodar o LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu ler a partir de seu arquivo de configuração\n"
-"%s/.lives\n"
-"\n"
-"Reveja as permissões deste arquivos e tente novamente.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no seu arquivo de configuração\n"
-"%s/.lives\n"
-"\n"
-"Por favor, verifique as permissões deste arquivo e do diretório\n"
-"e tente novamente.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES está impossibilitado de usar o diretório temp\n"
-"%s\n"
-"\n"
-"Por favor verifique a configuração <tempdir> no\n"
-"%s/.lives\n"
-"e tente novamente.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -503,10 +539,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES não conseguiu capturar esta imagem\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -524,7 +558,7 @@
 "\n"
 "Obrigado.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -534,7 +568,14 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -544,7 +585,7 @@
 "LiVES não conseguiu encontrar 'mplayer'. Você deverá instalar o mplayer para "
 "utilizar o LiVES com todos os seus recursos.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -554,7 +595,7 @@
 "LiVES não conseguiu localizar 'convert'. Você deverá instalar o Convert e o "
 "Image Magick, caso deseje utilizar os efeitos rederizados.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -564,7 +605,7 @@
 "LiVES não conseguiu localizar 'composite'. Você deverá instalar o Composite "
 "e o Image Magick, caso deseje utilizar a função mesclar..\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -574,7 +615,7 @@
 "LiVES não foi capaz de localizar 'sox'. Alguns recursos de áudio podem não "
 "funcionar. Instale o 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -582,68 +623,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES não foi capaz de encontrar plugins de codificação.\n"
-"Por favor certifique-se se eles estão instalados corretamente em\n"
-"%s%s%s/\n"
-"Você não poderá 'Salvar' sem eles.\n"
-"Você pode precisar mudar o valor de <lib_dir> em ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Inicio automático definido %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "O reprodutor de áudio %s é inválido\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sem título %d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nenhum Arquivo>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "grv %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!grv %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Tocar"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -651,35 +686,35 @@
 "LiVES não conseguiu capturar esta imagem\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Arquivo %s fechado\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "Desfazer [_U]"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Áudio Esquerdo"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Áudio Direito"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -694,26 +729,11 @@
 "Por favor ajuste as opções de execução em 'Preferências | Execução' e tente "
 "novamente.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Tocador"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Tocador"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -723,7 +743,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -733,7 +753,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +764,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -753,54 +773,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -808,155 +828,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: escolha um reprodutor de áudio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Usar o reprodutor de áudio _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Próximo"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "Impossível iniciar gerador %s\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -964,97 +992,97 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Deixar LiVES definir a extensão do _file"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "Deixar LiVES definir a extensão do _file"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Aplicar Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem "
 "importados."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Visualizar"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clique aqui para _Previsualizar qualquer vídeo, áudio ou imagem selecionada"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clique aqui para _Previsualizar qualquer arquivo de áudio"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Clique aqui para _Previsualizar o vídeo"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Processando..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1068,8 +1096,8 @@
 "\n"
 "Lembre de desligar os efeitos (ctrl-0) depois!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1077,107 +1105,114 @@
 "\n"
 "Por favor aguarde"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Mostrar detalhes"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "Sufici_ente"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Pré-visualizar"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Tamanho do frame"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Tamanho do arquivo"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Tamanho do byte"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Tempo total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Frames"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Taxa/tamanho"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Áudio direito"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opções de codificação"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------- (Clique na caixa para usar o tamanho recomendado)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<------------- (Clique na caixa para usar o tamanho recomendado)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Mantenha _minhas configurações"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Usar configurações _recomendadas"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1185,76 +1220,75 @@
 "Não mostrar mais este aviso\n"
 "(pode ser ligado novamente em Preferências/Avisos)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr ""
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "Fechar janela [_C]"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserir"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Número de vezes a inserir"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Inserir até o fim do áudio"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Inserir antes da seleção [_B]"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Inserir área de transferência antes da seleção"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Inserir _após a seleção"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Inserir área de transferência depois da seleção"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Inserir com som [_W]"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Inserir sem s_om"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Abrir Seleção"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Tempo de início da seleção (seg)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Número de frames a abrir"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Stream"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Renomear Clipe"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1270,7 +1304,7 @@
 "Também certifique-se de ter marcado sua banda em Preferências|Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1279,47 +1313,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Não enviar informação de banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Tente esta configuração se está tendo problemas ao pegar um stream"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Renomear Clipe"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Entre com o Nome do Set"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1330,7 +1379,7 @@
 "Isso vai permitir recarregar o layout com os mesmos clipes depois.\n"
 "O LiVES lembrará você de salvar o set quando você for sair.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1338,246 +1387,207 @@
 "Para exportar este projeto, você deverá definir o nome deste set.\n"
 "Ele tambem será utilizado como nome do projeto.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Renomear Clipe"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Entre com o Nome do Set"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Entre com o Nome do Set"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Novo nome "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Nome do set "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Carregar trilha de CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Selecionar Título/Capítulo do DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Selecionar o Título do VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Modificar o máximo de trilhas visíveis"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Trilha a carregar (de %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Título do DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Título do VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de trilhas a visualizar"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capítulo  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Áudio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Formato de saída"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Fade Audio In"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Fade Audio Out"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Fade in sobre  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "primeiro"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Fade out sobre  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "segundos."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "selecção"
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Tocar Música Aleatória"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Número de Faixas Selecionadas:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Diretório:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Incluir subdiretórios"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Tamanho Mínimo de Arquivo (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Tamanho Máximo de Arquivo (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "seleção"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentários do arquivo (opcional)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Título/Nome: "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artista: "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentários: "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: escolha um diretório"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: escolha um arquivo"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Discartar/Salvar"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1587,7 +1597,7 @@
 "O layout atual não foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1597,7 +1607,7 @@
 "O layout atual foi modificado desde que foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1607,7 +1617,7 @@
 "O set de clipes atual pode ser salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1615,7 +1625,7 @@
 "O set de clipes atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1623,146 +1633,137 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Nome do set"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "Auto recarregar da próxima vez"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "Apagar layout [_W]"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorar mudanças"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Deletar set"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Deletar layout"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Salvar layout"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Salvar set"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Opções de codificação"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "Limpar _marcas da linha de tempo"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Reiniciar Valores"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "A Salvar set como %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Seleccionar Ficheiro"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Inicio automático definido %s..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "Limpando clipe"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES não conseguiu encontrar o programa %s.\n"
-"Por favor confirme se este programa está no PATH e é executável.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Este ficheiro"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1772,7 +1773,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1782,14 +1783,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1797,7 +1798,7 @@
 "\n"
 "Arquivo de projeto inválido.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1818,33 +1819,33 @@
 "delete-o.\n"
 "Uma vez que tenha feito isso, vai poder importar o novo projeto.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importando o projeto %s como set %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importando projeto"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportando projeto %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportando projeto"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Restaurar arquivo .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Backup como arquivo .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Restaurar arquivo .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1856,97 +1857,97 @@
 "O set será deletado do disco.\n"
 "Tem certeza?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "A apagar set..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "A apagar set..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "A apagar set..."
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "O set %s foi permanentemente apagado do disco.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Inserir Silêncio"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Desfazendo"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "A restaurar audio..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Limpando imagens de frames"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "O comprimento do vídeo é agora %d frames a %.3f FPS.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Área de transferência resampleada para %d frames.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Refazendo"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Copiando frames %d até %d%s para a área de transferência..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Pegando frames do clipe"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Copiando para a área de trasferência"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Colando"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1960,7 +1961,7 @@
 "Tente selecionar todos frames e usar\n"
 "a função 'Ajustar Áudio' do menu 'Áudio'."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -1968,7 +1969,7 @@
 "LiVES não pôde inserir porque as taxas de áudio não conferem.\n"
 "Por favor instale 'sox' e tente novamente."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -1979,7 +1980,7 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -1990,11 +1991,11 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Resampleando áudio da área de transferência"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2006,7 +2007,7 @@
 "LiVES não pode resamplear o áudio da área de transferência.\n"
 "O áudio da área de transferência foi deletado.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2019,30 +2020,30 @@
 "LiVES não pôde processar o áudio da área de transferência.\n"
 "Deseja continuar a inserção usando áudio não modificado?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserindo %d%s frames da área de transferência..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Inserindo"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserindo %d vezes da área de transferência%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserindo %d frames da área de transferência%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2052,7 +2053,7 @@
 "Deletar todos frames vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2062,8 +2063,8 @@
 "Deleção vai causar frames perdidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2073,7 +2074,7 @@
 "Deleção vai causar que o áudio se perca em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2083,7 +2084,7 @@
 "Deleção vai causar que frames sejam movidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2093,20 +2094,20 @@
 "Deleção vai causar que áudio seja movido em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Deletando frames %d até %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Deletando"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Deletar"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2116,7 +2117,7 @@
 "\n"
 "Seleção está travada.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2124,11 +2125,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Gravação cancelada.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2141,7 +2142,7 @@
 "O plugin '%s' diz:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2154,7 +2155,7 @@
 "Impossível achar o método 'init' no plugin %s.\n"
 "O plugin pode não funcionar ou estar instalado incorretamente."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2166,22 +2167,22 @@
 "\n"
 "Por favor aperte 'Cancelar' se não é o que quer.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Salvando set %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Carregando clipes do set %s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d clipes recuperados do set (%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2193,41 +2194,37 @@
 "nesta máquina.\n"
 "Aperte 'OK' para continuar.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Limpando espaço em disco..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Limpando espaço em disco"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d MB de espaço em disco foi recuperado.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Esternal: %s\n"
-"Internal: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2235,7 +2232,7 @@
 "\n"
 "  Abrindo..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2244,7 +2241,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2253,7 +2250,7 @@
 "\n"
 "(%d decodificado)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2262,7 +2259,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2270,23 +2267,23 @@
 "\n"
 "  Desconhecido"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2295,7 +2292,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2312,11 +2309,23 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  VJ Pixel https://launchpad.net/~vjpixel\n"
+"  nitrofurano https://launchpad.net/~nitrofurano-3t\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2330,7 +2339,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2340,14 +2349,14 @@
 "\n"
 "Instale o mplayer para poder vêr este arquivo.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2360,197 +2369,209 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Abrindo áudio %s, tipo %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Abrindo áudio"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Cancelando"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Novo áudio: %d Hz %d canal(is) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Transformando áudio"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Novo Áudio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d frames são suficientes!\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Tela Cheia (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Desativar tela Cheia (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Tamanho dobrado(d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Tamanho normal (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Esconder janela do tocador (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Mostrar janela do tocador (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Tocar em janela separada (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Desligar loop contínuo (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Ligar loop contínuo (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume do áudio (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Ligar o áudio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Desligar o áudio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Invertendo área de trabalho..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Invertendo área de trabalho"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Selecionar Arquivo de Áudio"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Por favor configure seu tocador de CD em 'Ferramentas | Preferências | "
 "Misc'\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Abrindo faixa do CD %d de %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Faixa do CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Abrindo faixa de CD..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Erro carregado faixa do CD\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Selecionando faixas"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "erros de layout"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Fechar Janela [_W]"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Limpar _Erros"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Deletar layouts afetados"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pausado..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "continuando..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Manter"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2562,30 +2583,28 @@
 "(clique 'Manter' para manter o que você tem e parar)\n"
 "(clique em 'Continuar' para continuar o processamento)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "Parar [_S]"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Frame selecionado"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Salvar Frame como %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2594,7 +2613,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2606,7 +2625,7 @@
 "Você deve instalar o \"xwininfo\" para usar este recurso\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2614,7 +2633,7 @@
 "\n"
 "Tempo de gravação deve ser maior que 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2628,17 +2647,17 @@
 "Clique em 'Cancelar' para cancelar\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "A janela externa foi solta.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2654,19 +2673,19 @@
 "'Parar' ou 'q' para terminar.\n"
 "(O padrão de %.3f frames por segundo vai ser usado.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES não conseguiu capturar esta janela. Desculpe.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Exportar Áudio Selecionado como..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Exportar Áudio como..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2680,81 +2699,86 @@
 "Clique em 'OK' para exportar na nova velocidade, ou 'Cancelar' para exportar "
 "na velocidade original.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportando frames de áudio %d até %d como %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportando áudio como %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportando áudio"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Inserir Arquivo de Áudio..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Inserindo arquivo de áudio %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Inserindo áudio"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Anexar Áudio"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Diminuindo áudio de %.2f para %.2f segundos..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Diminuindo/Aumentando áudio"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Ajustar Áudio"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Fading in áudio"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Fade in áudio"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Fading out áudio"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Fade out do áudio"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s sobre %.1f segundos..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Fading áudio..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2764,61 +2788,52 @@
 "Deletar todo áudio vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Deletando todo áudio..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Deletando áudio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Deletando Áudio"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Deletar Áudio"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Gravar áudio novo"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserindo silêncio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Inserindo Silêncio"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Deletar %d layout(s)... tem certeza?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Não foi possível encontrar o arquivo pixmap: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Mesclar"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Mesclar área de trabalho [ %d Frames ]       Com a seleção [ %d Frames ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2826,612 +2841,585 @@
 "Mesclar área de trabalho [ %d Frames (resampleada)]       Com a seleção [ %d "
 "Frames ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Alinhar Início_s"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Alinhar Finais [_E]"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "O que fazer com os frames que sobraram na área de trabalho -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Inserir Frames"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Deletar Frames"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Número de vezes a repetir área de transferência"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Repetir área de transferência para se encaixar à se_leção"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "Método de _Transição:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Mesclando área de transferência com seleção..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "inserindo %d frames adicionais antes da mesclagem\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "agora inserindo %d frames adicionais\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Mesclagem feita.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "Efeitos _Customizados"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "_Utilitários Customizados"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "Abrir Arquivo/Diretóri_o"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "Arquivos _Recentes"
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Abrir Stream... [_L]"
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "Importar trecho de _DVD/VCD"
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "Importar Trecho de _DVD"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "_Importar de Dispositivo"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "_Importar de Dispositivo"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importar de Dispositivo _Firewire (DV)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importar de Dispositivo _Firewire (HDV)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "Arquivos _Recentes"
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_Recarregar Set"
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Fechar/Sal_var Todos Clipes"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "Salvar Clip_e Como..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Salvar _Seleção Como..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "Fechar Este _Clipe"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Backup do Clip como .lv1"
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Restaurar Clip de .lv1"
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Salvar/Carregar/Backup com Som [_W]"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Limpar espaço em disco [_U]"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Modo _MULTIPISTA"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copiar Seleção"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Cor_tar Seleção"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Inserir da Área de Transferência"
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Colar como _Novo"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Mesclar Área de Transferência com Seleção"
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Deletar Seleção"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Separar Áudio e _Vídeo"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Selecionar"
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Selecionar Todos Fr_ames"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "Apena_s Frame Inicial"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "Apenas Fram_e Final"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Selecionar a partir do primeiro _frame"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Selecionar a partir do ú_ltimo frame"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Selecionar Última Inserção/_Mesclagem"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Selecionar Último _Efeito"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inverter Seleção"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "Travar _Largura da Seleção"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Tocar"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "Tocar Tudo [_P]"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Tocar Seleção [_Y]"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "To_car Área de Transferência"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "Parar [_S]"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Voltar [_W]"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "Tela Cheia [_F]"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Tamanho _Dobrado"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Tocar em Janela _Separada"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Fundo _Branco"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "Repetir vídeo (para caber na faixa de áudio)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Repetir C_ontinuamente"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Loops Pin_g Pong"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Mudo"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Modo 'S_ticky' de Janela"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "Mostrar Contador de Frames [_H]"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Efeito_s"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Efeitos são aplicados na seleção atual."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Rodar Efeito/Ferramenta/erador de Teste..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Ferramentas são aplicadas nos clipes inteiros."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Inverte_r área de transferência"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "Mudar velo_cidade de Execução/Salvar"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Resamplear _Vídeo para Nova Frame Rate"
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitários"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Gerar"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Ferramentas _Customizadas"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Gerar"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Carregando efeitos renderizados..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Capturar Janela _Externa "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferências"
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Áudio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Carregar _Novo Áudio para o Clipe"
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Carregar Faixa do _CD"
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "E_jetar CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Gravar Áudio E_xterno..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "para _Clip Novo..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "para _Seleção"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Fade _In Áudio..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Fade _Out Áudio..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Exportar Áudio"
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Exportar Áudio _Selecionado"
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Export_ar Todo Áudio"
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Anexar Áudio"
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Ajustar Áudio"
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Diminuir/Aumentar Áudio para _Selecão"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Ajustar Áudio do Início ao Começo da Execução [_P]"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Deletar Áudio"
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Deletar Áudio _Selecionado"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Deletar _Todo Áudio"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Inserir _Silêncio na Seleção"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Resamplear Áudio..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Tocar _Música Usando XMMS"
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Musica Aleatória _Usando XMMS"
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "_Parar XMMS"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Mostrar _Informação de Clipe"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Mostrar/_Editar Comentários do Arquivo"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Mostrar Info da Área de Transferên_cia"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Mostrar _Mensagens"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Mostrar Erros de _Layout"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Clipes"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renomear Clipe Atual no Menu"
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "A_vançado"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Efeitos/Ferramentas/Utilitários _RFX"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Novo Script RFX de Teste..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copiar Script RFX para Teste"
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Editar Script RFX de teste..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "Reno_mear Script RFX de Teste"
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Deletar Script RFX de Teste"
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promover Teste de Efeito/Ferramenta/Gerador Renderizado..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importar Script RFX Customizado"
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportar Script RFX Customizado"
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "De_letar Script RFX Customizado"
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Reconstruir todos plugins RFX [_B]"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Receber _LiVES stream de..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "Enviar LiVES _stream para..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Abrir _yuv4mpeg stream em %sstream.yuv"
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importar Projeto (.lv2)"
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportar Projeto (.lv2)"
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Mapeamento de _Efeitos de Tempo-Real"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Vincular efeitos em tempo real para ctrl mais teclas de número."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "_Definir Padrão de Efeitos em Tempo Real"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Definir padrão de valores de parâmetros para efeitos em tempo real."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Salvar Padrão _de Efeitos em Tempo Real"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3439,307 +3427,307 @@
 "Salvar padrão de efeitos de tempo real de modo que seja restaurado toda vez "
 "que o LiVES abrir."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Reiniciar todas as velocidades e posições de reprodução"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reiniciar todas posições de reprodução para o frame 1 e todas as framerates."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Mostrar Teclas de VJ [_K]"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Brinquedos"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "Fra_mes doidos"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "TV _LiVES (banda larga)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Doar ao projecto !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Ajudar com a _tradução"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Acerca"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Rebobinar para iniciar (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Tocar tudo (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Parar execução (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Tocar seleção (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Volume do áudio (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Remover fundo branco (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Tocar mais devagar (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Tocar mais rápido (ctrl-up)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Voltar (ctrl-left)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Avançar (ctrl-right)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Mostrar informação de clipe (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Esconder esta barra de ferramentas"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Velocidade de execução do vídeo (frames por segundo)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Variar a velocidade do vídeo"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Primeiro Frame"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Último Frame"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "O primeiro frame selecionado nesse clipe"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "O último frame selecionado nesse clipe"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Iniciando...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Aperte 'Q' para parar a gravação. NÃO CUBRA A JANELA DO TOCADOR!   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Número do frame a visualizar"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "Livre [_f]"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Escolha livre do número do frame"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "Início [_s]"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "O número do frame está ligado ao quadro inicial"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "Fim [_e]"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "O número do frame está ligado ao quadro final"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Ponteiro"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "O número do frame está ligado ao ponteiro de execução"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Voltar"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Tocar Tudo"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Tocar Seleção"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Iniciar g_ravação"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Parar de grava_r"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Esconder Janela do Tocador"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Mostrar Janela do Tocador"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
-#, fuzzy, c-format
+#: src/utils.c:500
+#, c-format
 msgid "%.2f KiB"
-msgstr "grv %.2f MB"
+msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Limpando a área de trasferência"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3750,7 +3738,7 @@
 "==============================\n"
 "Alternado para clipe %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3760,11 +3748,11 @@
 "==============================\n"
 "Alternado para clipe vazio\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(em branco)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3773,7 +3761,7 @@
 "O nome do set foi modificado de %s para %s. Layouts afetados foram "
 "atualizados\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3782,7 +3770,7 @@
 "O clipe %s está faltando no set.\n"
 "Ele é necessário para os seguintes layouts:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3791,7 +3779,7 @@
 "O clipe %s foi fechado.\n"
 "Ele é utilizado nos seguintes layouts:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3800,7 +3788,7 @@
 "Frames foram movidos no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3809,7 +3797,7 @@
 "Frames foram deletados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3818,7 +3806,7 @@
 "Frames foram deletados do clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3827,7 +3815,7 @@
 "Áudio foi movido no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3836,7 +3824,7 @@
 "Áduio foi alterado no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3845,7 +3833,7 @@
 "Frames foram alterados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3856,7 +3844,7 @@
 "não pode ser aberto porque está em uso\n"
 "por outra instância de LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3867,7 +3855,7 @@
 "O set %s está atualmente em uso por outra instância do LiVES.\n"
 "Escolha outro nome.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3875,16 +3863,13 @@
 "\n"
 "O nome de sets não pode ser vazio.\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"Nomes de set não podem conter espaços ou o caracter%s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3893,13 +3878,13 @@
 "\n"
 "Nomes de set não podem conter espaços ou o caracter%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3910,69 +3895,69 @@
 "O set %s já existe.\n"
 "Escolha outro nome.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Removendo layout %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Vídeo [abrindo...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Vídeo [%.2f seg]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Indefinida)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Sem vídeo)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Sem áudio)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [abrindo...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Áudio Esquerdo [abrindo...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f seg]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Áudio Esquerdo [%.2f seg]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Áudio Direito [abrindo...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Áudio Direito [%.2f seg]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES não pode mudar para o mplayer enquanto clipes estão sendo carregados."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Limpando clipe"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3987,54 +3972,65 @@
 "\n"
 "Sobrescrever?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "Desfazer %s [_U]"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refazer %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Seleção------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " seg ] ---------- Seleção ---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Examinando cabeçalho do arquivo"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Abrindo %s tempo inicial %.2f seg. frames %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " sem som"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Abrindo áudio para %s"
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -4044,19 +4040,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"LiVES não esta atualmente otimizado para arquivos grandes.\n"
-"Recomenda-se (por enquanto) comecar com um arquivo menor, ou usar 'Abrir "
-"Seleção de Arquivo'.\n"
-"(Tam. do Arquivo=%.2fMB)\n"
-"\n"
-"Tem certeza que quer continuar?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - por favor tenha paciência."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4068,7 +4057,7 @@
 "LiVES não conseguiu extrair nem vídeo nem áudio deste arquivo.\n"
 "Por favor verifique a janela de terminal para mais detalhes.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4078,7 +4067,7 @@
 "\n"
 "Talvez seja necessário ter o mplayer para abrir este arquivo.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4090,32 +4079,29 @@
 "Por favor confira as configurações de 'Comando de abertura de vídeo' em\n"
 "'Ferramentas | Preferências | Decodificação'\n"
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Fading áudio..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Salvar Frame como %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Salvar Frame como %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Renomear Clipe"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4127,35 +4113,31 @@
 "\n"
 "Tem certeza que quer continuar?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "seleção"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Ligando seleção"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (sem som)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Salvando frames %d até %d%s como \"%s\" : codificador = %s : formato = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Salvando frames 1 até %d%s como \"%s\" : codificador %s : formato = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "A guardar [pode levar algum tempo]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4165,34 +4147,33 @@
 "\n"
 "Erro de codificador -  arquivo de saída não foi criado!\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "Limpando a área de trasferência"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Tamanho do arquivo"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Gravando performance..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "FPS médio era %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4206,16 +4187,16 @@
 "Vá em 'Ferramentas | Redimensionar Todos'\n"
 "e redimensione todos frames para o tamanho atual.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Untitled%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4223,7 +4204,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4235,13 +4216,13 @@
 "FPS.\n"
 "O padrão pode ser ajustado em 'Ferramentas | Preferências | Misc'.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Velocidade de execução ajustada para %.3f fps para se encaixar no áudio.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4250,7 +4231,7 @@
 "Frames=%d tipo=%s tamanho=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4259,49 +4240,44 @@
 "Frames=%d tipo=%s tamanho=%dx%d bpp=%d fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s nenhum\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d canal(is) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comentário: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Salvando frame %d de %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Fazendo backup de %s até %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Fazendo backup"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "backup concluído dos dados da performance..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restaurando %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Restaurando"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4315,23 +4291,22 @@
 "LiVES não pode restaurá-lo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "grv %.2f MB"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!grv %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
-#, fuzzy
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
-msgstr "grv %.2f MB"
+msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4339,7 +4314,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4349,64 +4324,59 @@
 "Arquivos de uma execução anterior do LiVES foram encontrados.\n"
 "Quer tentar recuperá-los?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Recuperando arquivos"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Recuperando arquivos..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Limpando espaço em disco"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s configurações avançadas"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Aviso !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "aviso"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "Mostrar Compositor"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Limpar _Erros"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Acerca"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4417,7 +4387,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4429,11 +4399,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Tocadores de áudio não podem ser trocados durante a execução."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4446,20 +4416,18 @@
 "insuficiente.\n"
 "Por favor tente fechar outros aplicativos primeiro.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% feito. Tempo restante: %u seg\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4468,14 +4436,14 @@
 "\n"
 "%d/%d frames abertos. Tempo restante %u seg.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4484,7 +4452,7 @@
 "\n"
 "%d frames abertos.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4493,7 +4461,7 @@
 "\n"
 "Tempo restante: %d seg"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4504,7 +4472,7 @@
 "Desculpe, LiVES só pode abrir %d arquivos por vez.\n"
 "Por favor feche um arquivo e tente novamente."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4521,7 +4489,7 @@
 "\n"
 "Por favor tenha certeza de ter permissão de escrita neste diretório."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4532,7 +4500,7 @@
 "ou troque por outro formato de codificador em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4546,7 +4514,7 @@
 "Por favor mude o codec de áudio em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4554,16 +4522,13 @@
 "Este layout inclui frames gerados.\n"
 "Ele nãopode ser salvo, renderize como clipe primeiro.\n"
 
-#: src/dialogs.c:1820
-#, fuzzy
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
-"Este layout inclui frames gerados.\n"
-"Ele nãopode ser salvo, renderize como clipe primeiro.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4574,7 +4539,7 @@
 "\n"
 "Devido a restrições no formato %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4582,43 +4547,43 @@
 "LiVES recomenda as configurações a seguir:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Definir vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Definir vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4626,36 +4591,36 @@
 "\n"
 "Você pode querer:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "desabilite o áudio, uma vez que o codificador não pode codificar áudio\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES deve:\n"
 
-#: src/dialogs.c:1974
-#, fuzzy, c-format
+#: src/dialogs.c:2112
+#, c-format
 msgid "resample audio to %d Hz%s%s\n"
-msgstr "resamplear vídeo para %d:%d FPS\n"
+msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "resamplear vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "resamplear vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4669,7 +4634,7 @@
 "Aperte 'OK' para continuar e 'Cancelar' para abortar.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4679,7 +4644,7 @@
 "Mudanças aplicadas a seleção não serão permanentes.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4692,7 +4657,7 @@
 "LiVES não pôde gravar a performance. Não há memória suficiente disponível.\n"
 "Tente gravar apenas uma parte do arquivo."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4711,7 +4676,7 @@
 "\n"
 "Aperte 'Cancelar' para abortar a inserção, ou 'OK' para continuar."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4725,11 +4690,11 @@
 "Você deve apenas clicar em OK se você sabe o que está fazendo, em outro caso "
 "clique Cancelar."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Mostrar atalhos"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4811,11 +4776,11 @@
 "g                             faz o loop tocar ao contrário quando chegar no "
 "final\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Atalhos do Multipista"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4837,19 +4802,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Histórico de Mensagens"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Depois de fazer upgrade/instalação, deve-se ajustar o <prefix_dir> em seu "
-"arquivo ~/.lives"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4857,16 +4821,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES não conseguiu achar nenhum plugin de efeito renderizado.\n"
-"Por favor tenha certeza que os têm instalados em\n"
-"%s%s%s\n"
-"ou mude o valor de <lib_dir> no arquivo ~/.lives)\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4876,18 +4834,18 @@
 "\n"
 " (Nomes de arquivo devem terminar em .mp3, .ogg, .wav, .mod, .xm ou .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "falhou (tipo desconhecido)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4901,7 +4859,7 @@
 "existente.\n"
 "Clique em Cancelar para escolher um novo nome.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4913,7 +4871,7 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4925,8 +4883,8 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2170
-#, fuzzy, c-format
+#: src/dialogs.c:2310
+#, c-format
 msgid ""
 "\n"
 "The original file\n"
@@ -4935,15 +4893,8 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
-"\n"
-"O arquivo original\n"
-"%s\n"
-"não pôde ser encontrado.\n"
-"Se este arquivo foi movido, por favor o copie para seu local original\n"
-"e clique em 'OK' para tentar novamente.\n"
-"Ou clique em 'Cancelar' para não carregar este arquivo.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4958,7 +4909,7 @@
 "%s\n"
 "O clipe não pode ser carregado.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4966,7 +4917,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4975,13 +4926,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4992,13 +4943,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5013,20 +4964,16 @@
 "Você pode aumentar este valor em  Preferências/Multipista.\n"
 "É recomendado aumentá-lo em ao menos %d MB"
 
-#: src/dialogs.c:2221
-#, fuzzy, c-format
+#: src/dialogs.c:2361
+#, c-format
 msgid ""
 "\n"
 "Some old layouts for the set %s already exist.\n"
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 msgstr ""
-"\n"
-"Já existem alguns layouts antigos do set %s.\n"
-"É recomendável deletá-los.\n"
-"Clique em OK para deletar, ou Cancelar para deixá-los no disco.\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5038,7 +4985,7 @@
 "Feche alguns aplicativos ou reduza o tamanho da memória de desfazer\n"
 "Em 'Preferências > Multipista 'Memória de Desfazer'\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5050,7 +4997,7 @@
 "Você precisa aumentar o buffer de desfazer\n"
 "em 'Preferências > Multipista > Tamanho do buffer de desfazer'\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5058,19 +5005,19 @@
 "\n"
 "LiVES não conseguiu reservar memória sufiiciente para o buffer de desfazer.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "ou insira um valor menos.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Tente novamente do editor de clipes, tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5079,21 +5026,21 @@
 "áudio.\n"
 "Ajuste as configurações de áudio no menu Ferramentas.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "O layout atual tem áudio, de modo que canais de áudio não podem ser "
 "definidos como zero.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5103,13 +5050,13 @@
 "outro sistema, ou de uma versão mais antiga do LiVES).\n"
 "Tentar reparar a cópia em disco do layout?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5119,7 +5066,7 @@
 "\n"
 "A taxa de áudio deve ser maior que 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5131,7 +5078,7 @@
 "e pode demorar muito tempo para ser apresentada.\n"
 "Tem certeza que deseja visualizar?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5141,7 +5088,7 @@
 "\n"
 "Você deve instalar o 'dvgrab' para usar esta função.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5150,25 +5097,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "O plugin de execução de vídeo falhou em iniciar a palheta!\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "O plugin de decodificação de áudio falhou em inicializar a palheta!\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Impossível definir framerate do plugin de vídeo\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5181,34 +5128,34 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "cancelado.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "falhou.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "erro no arquivo. Falhou.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5216,13 +5163,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5230,13 +5173,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5244,26 +5183,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5271,26 +5202,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5298,17 +5221,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5317,7 +5236,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5330,7 +5249,7 @@
 "%s\n"
 "Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5339,19 +5258,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"O set será deletado do disco.\n"
-"Tem certeza?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5359,13 +5281,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5375,27 +5297,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5404,14 +5326,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5422,19 +5344,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5442,7 +5364,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5450,7 +5372,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5462,45 +5384,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Bem vindo ao LiVES versão %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5509,203 +5429,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "gerador"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Geradores"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "gerador"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Geradores"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "transição"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transições"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efeito"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efeitos"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "utilitário"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilitários"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Compositores"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Torneiras"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "divisor"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Divisores"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "conversor"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Conversores"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "áudio/vídeo"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Transições de Áudio e Vídeo"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "só vídeo"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Ver apenas Transições"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "áudio apenas"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Transições apenas de Áudio"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "áudio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mixers de Áudio"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Efeitos de Áudio"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "controle do volume de áudio"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Controles do Volume de Áudio"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "só vídeo"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "só vídeo"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "áudio apenas"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Parâmetros de áudio"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s todos frames..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s área de transferência em frames %d até %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s na área de transferência..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s em novo clipe..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s frames %d até %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s área de transferência com seleção"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s na área de transferência"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s em um novo clipe"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s frames %d até %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5713,17 +5674,46 @@
 "\n"
 "Nenhum frame foi gerado.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Erro: plugin %s não tem a função weed_setup().\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5732,131 +5722,310 @@
 "Info: Impossível carregar plugin %s\n"
 "Erro: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Incluir subdiretórios"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Carregado %d filtros de Weed com sucesso\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Falha ao iniciar instância %s, erro %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Impossível iniciar gerador %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Falha ao iniciar gerador %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Falha ao iniciar gerador %s, erro %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Clique em 'Preview' para mudar estes valores"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Reiniciar Valores"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Frame"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Manter aspecto do frame original"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Manter _Aspecto"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Seleccione o ficheiro"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Manter aspecto do frame original"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "_Inicio da transição"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Início da transição"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "Crossfade áudio"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "Clique na caixa para permitir fazer transmissão de áudio com vídeo"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "Crossfade áudio"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Fim da transiçã_o"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Fim da transição"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : tamanho"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Novo tamanho (pixels)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "Largura [_W]"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "Altura [_H]"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Gerar na Área de Transferên_cia"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Gerar frames na área de transferência"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Gerar em _Novo Clipe"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Gerar frames em um novo clipe"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5867,62 +6036,59 @@
 "Devem ser selecionados ao menos %d frames para usar este efeito.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Fechar janela [_W]"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Sem parâmetros"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Parametro inválido"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "Mostrar Compositor"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Clique para selecionar a cor"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Refazer"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Valor do vermelho (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Verde"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Valor do verde (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Azul"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Valor do azul (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -5931,12 +6097,12 @@
 "\n"
 "Erro de plugin: %s falhou com o código %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : mensagem era %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5951,17 +6117,17 @@
 "%s\n"
 "Código de erro %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Atualizando padrões de plugins de execução de vídeo em %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Carregando padrões de plugin de execução de vídeo de %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5976,32 +6142,32 @@
 " Ferramentas|Preferências|Execução|Plugins de Execução Avançados\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Framerate fixa para plugin.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Entrada de colorspace para o plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Framerate fixa para plugin.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Entrada de colorspace para o plugin.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6014,16 +6180,7 @@
 "Falhou em abrir o plugin de execução %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"O plugin de execução de vídeo falhou ao iniciar.\n"
-"O error: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6038,7 +6195,16 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"O plugin de execução de vídeo falhou ao iniciar.\n"
+"O error: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6048,7 +6214,7 @@
 "Aviso! O plugin de execução de vídeo não envia teclas pressionadas. O "
 "teclado deve estar desativado durante o uso!\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6057,30 +6223,26 @@
 "*** Usando o plugin %s pra execução em tela cheia, com a palheta tipo %d "
 "(%s). ***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVES não conseguiu achar seus plugins de codificação. Por favor confirme se "
-"tem os plugins instalados em\n"
-"%s%s%s\n"
-"ou mude o valor de <lib_dir> em ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6093,11 +6255,11 @@
 "%s%s%s\n"
 "ou troque de plugin em 'Ferramentas | Preferências | Codificação'\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Não foi possível redimensionar, por favor instale imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6110,7 +6272,7 @@
 "Falhou em abrir o plugin de decodificação %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6125,190 +6287,173 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/desconhecido"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Opções de codificação"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Falhou em carregar %s, as transições podem não redimensionar.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s configurações avançadas"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Novo RFX de Teste"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Editar RFX de Teste"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efeito -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transição -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Gerador -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Ferramenta -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utilitário -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Nome:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "O nome do plugin. Não são permitidos espaços."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Versão:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Versão do script."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Autor do script."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (opcional):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL do mantenedor do plugin."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Texto do menu:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "O texto a ser mostrado no menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Descrição da ação:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Descreva o que o plugin faz. Ex.: \"detecção de bordas\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Mínimo de frames:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Número mínimo de frames ao qual este efeito/ferramenta pode ser aplicado. "
 "Normalmente 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Requisitos..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Entre com os binários requeridos pelo plugin."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Definir propriedades para o plugin. Opcional."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parâmetros..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Configurando parâmetros usados em código pró/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Notas da Janela de Parâmetros [_W]"
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Criar notas sobre layout da janela de parâmetros. Opcional"
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Código de linguagem:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Língua para pré/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "Código _pré-loop..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Código a ser executado antes do loop. Opcional."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "Código de _loop..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Código de loop a ser aplicado em cada frame."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "Código _pós-loop..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Código para ser executado após o loop. Opcional"
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "Código de acionamen_to..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6316,7 +6461,7 @@
 "Configure o código gatilho para quando a janela de parâmetros for mostrada, "
 "ou quando um parâmetro for modificado. Opcional (exceto para Utilitários)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6331,55 +6476,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Requisitos RFX"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Parâmetros RFX"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Gatilhos RFX"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nova Entrada"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Editar Entrada"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Remover Entrada"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Mover Acima [_U]"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Move Abaixo [_U]"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Propriedades RFX"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "Lento (nota para GUI) [_S]"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "Gerador de modo _batch"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6393,7 +6538,7 @@
 "Favor remover o gatilho primeiro.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6405,197 +6550,185 @@
 "Alguns gatilhos foram ajustados.\n"
 "Por favor confirme o código gatilho.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Novo Parâmetro RFX"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Editar Parâmetro RFX"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Nome:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Nome do parâmetro, deve ser único no plugin."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Rótulo:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 "Rótulo a ser mostrado pelo parâmetro. Um sublinhado representa um atalho."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "_Grupo de botões: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "Um valor diferente de zero pode ser usado para agrupar botões rádio."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Tipo:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Tipo de parâmetro (selecione de uma lista)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Casas decimais [_P]: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "Valor pa_drão:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "Padrão [_D]: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "_Grupo de botões: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "Um valor diferente de zero pode ser usado para agrupar botões rádio."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "Valor _mínimo: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Valor má_ximo: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     Tamanho do pa_sso:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "Quanto do parâmetro é ajustado quando as setas são pressionadas."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Se o valor empacota max->min e min->max."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Definir _valores"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Valor padrão:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Valor mínimo: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Valor máximo: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Padrão ve_rmelho:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Padrão verde [_G]:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Padrão azul [_B]: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "_Definir padrão"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Valor padrão:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Comprimento máximo (caracteres): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Edição de Parâmetros RFX"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Palavra-chave:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Tipo especial:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Subtipo especial:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Linha:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Parâmetros atrelados (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Parametros atrelados (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Parâmetros atrelados (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Novo Gatilho RFX"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Editar Gatilho RFX"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Quando:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Código Pré-loop"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Codigo de Loop"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Codigo Pós-Loop"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Texto padrão (tam. máx. %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Entre com valores, um por linha"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6605,7 +6738,7 @@
 "\n"
 "O nome não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6615,7 +6748,7 @@
 "\n"
 "Nome não pode conter espaços.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6625,7 +6758,7 @@
 "\n"
 "Texto do menu não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6635,7 +6768,7 @@
 "\n"
 "Descrição da ação não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6645,7 +6778,7 @@
 "\n"
 "O nome do autor não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6657,7 +6790,7 @@
 "Já existe um plugin com este nome.\n"
 "O nome deve ser único.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6667,7 +6800,7 @@
 "\n"
 "Codigo do loop não deve estar em branco.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6677,7 +6810,7 @@
 "\n"
 "O código do gatilho não deve ser deixado em branco para um utilitário.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6687,7 +6820,7 @@
 "\n"
 "O nome do parâmetro não deve ser deixado em branco.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6701,41 +6834,41 @@
 "plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Escrevendo arquivo de script %s..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "A seção <define> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Versão do script ruim.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "A seção <name> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "A seção <version> não foi enonctrada no script.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "A seção <author> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "A seção <description> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Descrição ruim. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6750,27 +6883,27 @@
 "encontrado no script.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Reconstruindo todos scripts RFX..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Reconstruindo scripts"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "customizado..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "teste..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "reconstruindo entradas dinâmicas de menu..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6783,7 +6916,7 @@
 "LiVES não conseguiu encontrar o programa %s.\n"
 "Por favor confirme se este programa está no PATH e é executável.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6798,12 +6931,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Deletando script RFX %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6818,7 +6951,7 @@
 "%s\n"
 "Código do erro %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6833,12 +6966,12 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script de teste.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promovendo plugin rfx %s de teste para customizado..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6846,29 +6979,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Falha ao mover o script de plugin de\n"
-"%s para\n"
-"%s\n"
-"Código %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importar Script de..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Exportar Script para..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6883,55 +7010,43 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script a ser importado.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Builtin"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Customizado"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Teste"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copy RFX Script"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Do tipo:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Renomear Script RFX de Teste"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Do script: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nome do Script RFX"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Nome do script: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Novo nome: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Novo nome de script: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6943,28 +7058,45 @@
 "Já existe um script de teste com este nome.\n"
 "O nome do script deve ser único.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renomeando script RFX de teste %s para %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Falha ao mover o script de plugin de\n"
+"%s para\n"
+"%s\n"
+"Código %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Aplicar Efeitos em Tempo-Real para Seleção"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Carregando efeito renderizado %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Veja: VJ - mostrar atalhos'. Configure os efeitos em tempo-real, e depois "
 "aplique-os aqui."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6976,7 +7108,7 @@
 "Plugins de execução de vídeo só são ativados em\n"
 "tela cheia, modo de janela separada\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6984,7 +7116,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6993,40 +7125,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"O diretório temp é o diretório de trabalho do LiVES, onde clipes abertos e "
-"sets são armazenados.\n"
-"Ele deve estar em uma partição com muito espaço.\n"
-"\n"
-"Dica: evite confiurá-lo em /tmp, pois este diretório é esvaziado no "
-"desligamento."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Impossível criar ou escrever no novo diretório temp.\n"
-"Você deve criá-lo como root primeiro:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"O diretório não será mudado agora.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7046,7 +7173,7 @@
 "Ou aperte 'Cancelar' para restaurar o diretório temp para sua configuração "
 "original."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7057,7 +7184,7 @@
 "primeiro.\n"
 "Veja http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7065,7 +7192,7 @@
 "\n"
 "Trocar tocador de áudio requer reiniciar (jackd não deve estar rodando)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7073,370 +7200,385 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (qualidade melhor; arquivos maiores)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferências"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Abrir janela de seleção de arquivos maximizada"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Mostrar arquivos recentes no menu 'Arquivo'"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Parar screensaver quando tocando    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Abrir janela principal maximizada"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Mostrar barra de ferramentas quando o fundo estiver limpo"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Suporte multi-head"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " número do monitor para a interface do LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " número do monitor para execução"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Forçar monitor único"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Forçar mode de monitor unico"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Quando entrando no modo multipista"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Pergunte-me por configurações de largura, altura, FPS e de áudio"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "Sempre use os seguintes v_alores:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Use os mesmos _valores para renderizar um novo clip"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "Largura [_W]           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          Altura [_H]      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Habilitar faixa do áudio de fundo"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Trilha de áudio por trilha de vídeo"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Tamanho do b_uffer de desfazer (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "Sair do modo multipista depois d_e renderizar"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Cada"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Depois de _cada mudança"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nunca"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Multipista/Renderizar"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Use abertura imediata quando possível"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Ativar abertura imediata de alguns tipos de arquivo usando plugins de "
 "decodificação"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Comando de abrir vídeo             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Compressão de abertura/renderização                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
+
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     ( mais baixo = arquivos maiores e mais lentos; para jpeg, melhor "
 "qualidade )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Formato de imagem padrão          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Ativar desinterlaçamento automático quando possível"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Desinterlaça automaticamente frames quando um plugin o sugerir"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Quando abrir múltiplos arquivos, concatene as imagens em um clip"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Decodificação"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-"A qualidade da pré-visualização da execução de vídeo - afeta o "
-"redimensionamento"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "_Qualidade de Visualização"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Baixo - pode melhorar a performance em computadores mais lentos"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normal - recomendado para a maioria dos usuários"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Alto - pode melhorar a qualidade em computadores muito rápidos"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "_Qualidade de Visualização"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+"A qualidade da pré-visualização da execução de vídeo - afeta o "
+"redimensionamento"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Mostrar estatísticas de FPS"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "Tocador [_P]"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "_Comando para tocar áudio"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- interno -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "Áudio segue a velocidade/di_reção de vídeo"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "Áudio segue as mudanças de _clipe"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "ÁUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Execução"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      O que gravar quando 'r' for pressionado   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "Mudanças de _frame"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "Mudanças de F_PS"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "_Efeitos em tempo real"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Gravando"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Codificador                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Formato de saída"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Codec de áudio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Usar _antialiasing quando redimensionando"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Numero de teclas para efeitos tempo real"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7444,81 +7586,96 @@
 "O número de teclas de efeito em tempo real \"virtuais\". Podem ser "
 "controladas através da janela de efeitos em tempo real, ou via rede (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Diretório de vídeo a ser carregado (padrão)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Diretório de salvar vídeo (padrão) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Diretório de áudio a ser carregado (padrão) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Diretório de imagens (padrão) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Diretório de Backup/Restauração (padrão) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Diretório temp (não remova) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "O diretório padrão de onde carregar vídeos"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "O diretório padrão onde salvar vídeos codificados"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "O diretório padrão para carregar e salvar áudio"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "O diretório padrão para salvar amostras de frames"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "O diretório padrão para fazer backup e restauração de clipes individuais"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "diretório de trabalho do LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Diretórios"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7526,204 +7683,191 @@
 "Avisar ao Inserir/Mesclar se o _framerate da área de transferência não for "
 "igual ao da seleção"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avisar ao abrir arquivos de tamanho _superior a "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Mostrar um aviso antes de salvar um se_t"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Mostrar um aviso se nenhum efeito _renderizado for encontrado na "
 "inicialização."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Avisar se o  _mplayer não for encontrado quando o LiVES abrir."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Avisar se um nome de set _duplicado for digitado."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Quando um set é carregado, avise se clipes estiverem faltando dos _layouts."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Avise se um clipe usado em um layout está para ser fechado."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Avise se frames usados em um layout estão perto de serem deletados."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Avise se frames usados em um layout estão perto de serem movidos."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Avise se fames usados em um layout estão perto de serem alterados."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Avise se áudio usado em um layout está perto de ser deletado."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Avise se áudio usado em um layout está perto de ser movido."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Avise se áudio usado em um layout está perto de ser alterado."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "Avise se um layout não estiver salvo ao sair do modo multipista."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Avisar se multipista não tem canais de áudio e o layout com áudio está "
 "carregado."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 "Mostrar mensagem de informação depois de importar de dispositivo firewire."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Mostrar um aviso antes de abrir um stream yuv4mpeg (avançado)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Mostrar um aviso quando houver pouco espaço em disco no modo multipista."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
-#, fuzzy
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
-msgstr "Avisar se o  _mplayer não for encontrado quando o LiVES abrir."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Avisos"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Sincronia MIDI (requer os arquivos midistart e midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Quando inserindo/mesclando frames:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Aumentar/Diminuir Velocidade da In_serção"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Resamplear Inserção"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pausar xmms durante a execução de áudio"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "Dispositivo de CD           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Escolha o dispositivo de CD"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES pode carregar faixas de áudio deste CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "FPS padrão        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Frames por segundo para usar se nenhum for especificado"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Misc"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Novo tema:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Velocidade de download (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "LiVES deve ser compilado sem \"configure --disable-OSC\" para usar OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Controle remoto OMC ativado"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "Porta UDP       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Iniciar OMC ao abrir"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Streaming/Networking"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Transporte"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7731,48 +7875,44 @@
 "LiVES deve ser compilado com jack/transport.h e jack/jack.h presentes para "
 "usar transporte jack"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Arquivo de configuração do _transporte jack"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "O nome do servidor jack que pode controlar o transporte do LiVES"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Iniciar _servidor junto com o LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Áudio"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "LiVES deve ser compilado com jack/jack.h presente para usar áudio do jack"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -7780,109 +7920,95 @@
 "Você DEVE escolher o tocador de áudio \"jack\" na aba Execução para usar "
 "áudio do jack"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "_Arquivo de configuração do servidor de áudio jack"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Nome do servidor jack para áudio"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Integração com jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Responder aos eventos:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "_Eventos de Joystick"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Dispositivo de Joystick"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "O dispositivo de joystick, ex: /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Escolha o dispositivo de joystick"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "_Eventos MIDI"
 
-#: src/preferences.c:5498
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
+msgstr "Usar _ALSA MIDI (recomendado)"
+
+#: src/preferences.c:3987
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "Criar uma porta ALSA MIDI na qual outros dispositivos MIDI possam ser "
 "conectados"
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
-msgstr "Usar _ALSA MIDI (recomendado)"
-
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Ler directamente do dispositivo de MIDI"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_Dispositivo de MIDI"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "O dispositivo de MIDI, ex: /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Escolha o dispositivo de MIDI"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "Repetição MIDI"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7894,70 +8020,70 @@
 "diretório tenha efeito.\n"
 "Clique OK para continuar.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Mudanças de tema só surtirão efeito na próxima vez que o LiVES foi iniciado."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "As opções do jack só surtirão efeito da próxima vez que o LiVES for iniciado."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Sincronizando ao framerate externo de %.8f FPS.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Impossível inicializar receptor OSC\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "AVISO: Não foi possível iniciar o servidor OSC na porta UDP %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Servidor OSC iniciado na porta UDP %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Não foi possivel iniciar servidor OSC/UDP na porta %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionando frames 1 até %d"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Redimensionando frames 1 até %d"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Resamplear/Redimensionar"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Comprimento do vídeo é agora de %d frames.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -7967,154 +8093,146 @@
 "\n"
 "A nova taxa deve ser maior que 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Resampleando áudio"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES não conseguiu resamplear o áudio como requisitado.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Resamplear Áudio"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Áudio resampleado a %d Hz, %d canais, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resampleando vídeo a %.8f frames por segundo..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Resampleando vídeo a %.3f frames por segundo..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Erro de reordenação!\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Resamplear"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Resamplear Áudio"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Inserir Silêncio"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Novo Clip de Áudio"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Configurações Externas de Clipe"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Taxa (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Canais "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Tamanho da Amostra "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Não assinado"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Atual"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "Habilitar áudio [_e]"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "Taxa (Hz) (_r) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Canais "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Canais "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    Tamanho da Amo_stra "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Tamanho da amostra "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Novo"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Frames por segundo (FPS) "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Gravar para máximo:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " horass  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minutos  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " segundos  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Clique OK para começar a gravar ou Cancelar para sair."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "Tocar"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Resamplear Vídeo"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8131,7 +8249,7 @@
 "Por favor digite o framerate desejado\n"
 "em _frames por segundo"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8148,15 +8266,15 @@
 "Por favor digite o framerate desejado para _resamplear\n"
 "em frames por segundo"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OU entre a duração do arquivo em _segundos"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Mudar _a velocidade do áudio também"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8167,7 +8285,7 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8178,55 +8296,47 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Mudar a velocidade vai mover alguns layouts multipista.\n"
-"Tem certeza que quer continuar?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Mudar a velocidade vai mover o áudio em alguns layouts multipista.\n"
-"Tem certeza que quer continuar?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Mudança de Velocidade"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Velocidade de execução modificada para %.3f fps e áudio para %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Velocidade de execução modificada para %.3f fps.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Resampleando vídeo"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Resampleando vídeo da area de transferência"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Reordenando frames"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8236,20 +8346,20 @@
 "\n"
 "LiVES foi incapaz de reordenar os frames."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Desordenando frames"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "erro de sampling..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8265,7 +8375,7 @@
 "Tem certeza?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8277,12 +8387,12 @@
 "Aperte 'OK' para salvar este mapa de teclado como padrão\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Salvando mapa de teclado em %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8291,8 +8401,8 @@
 "\n"
 "Atualizando arquivo de mapa de teclado %s..."
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -8300,18 +8410,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"Impossível gravar mapa de teclado\n"
-"%s\n"
-"Erro %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Salvando padrão de efeitos em tempo-real para %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8326,22 +8431,22 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Carregando padrão de efeitos tempo-real de %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Carregando tamanhos padrão no gerador de %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8356,27 +8461,27 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Linha inválida %d em %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Chave inválida %d em %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Efeito inválido %s em %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8385,16 +8490,21 @@
 "Esta versão de LiVES não pode misturar geradores/não-geradores na mesma "
 "tecla (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Muitos efeitos ligados à tecla %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "atualização requerida.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8406,40 +8516,45 @@
 "Alguns efeitos não puderam ser localizados.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Sem descrição"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informação para %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nome do efeito: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nome do plugin: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Versão: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Descrição: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8453,65 +8568,69 @@
 "tecla.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES não pode localizar o efeito %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Mapeamento de Efeitos em Tempo-Real"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Pegar tecla"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Tecla ativa"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Pegar tecla"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "Trave o teclado para essa tecla de efeito"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "Limpar todos efeitos [_C]"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Modo ativo"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Atribuir parâmetros"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Nome do efeito:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Salvar como mapa de teclado padrão"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "Carregar mapa de teclado padrão [_L]"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8563,11 +8682,6 @@
 msgid "none\n"
 msgstr "nenhum\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d canal(is) %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8587,64 +8701,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Áudio de fundo"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Faixa selecionada: %s (camada %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Faixa atual: Áudio de fundo\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Faixa selecionada: camada %d\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f seg.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Fonte: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Clique com o botão direito para menu.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8653,7 +8767,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8661,7 +8775,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8671,7 +8785,7 @@
 "\n"
 "Sem clipes.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8681,7 +8795,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8690,12 +8804,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f seg. até %.2f seg.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8703,182 +8817,184 @@
 "Clique simples na linha de tempo\n"
 "para selecionar um frame.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "para selecionar uma região.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Clipe seleccionado"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "Mo_strar informacão de clipe"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "Fechar este _clipe"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mixer de Áudio (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "Modo _Ins:Normal"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Mouse: Mover"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Mouse: Selecionar"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "_Gravidade:Normal"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "_Gravidade:Esquerda"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "_Gravidade:Direito"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Fechar primeiro vão(s) nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Fechar vãos"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Mover bloco"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Mover bloco de áudio"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Deletar bloco"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Deletar bloco de áudio"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Dividir faixas"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Dividir bloco"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Aplicar %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Deletar %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Inserir bloco"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Inserir vão"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Inserir bloco de áudio"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Mudança da ordem de efeitos"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -8887,15 +9003,15 @@
 "Valores multipista definidos em %.3f fps, tamanho de frame %d x %d, canais "
 "de áudio %d, taxa de áudio %d, tamanho da amostra de áudio %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "lista de eventos inválida. Falha.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "a lista de eventos tem um FPS inválida. Falha.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8910,7 +9026,7 @@
 "fechar o set atual,\n"
 "e então carregue no novo set a partir do menu 'Arquivo'.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8921,432 +9037,439 @@
 "Há um número inválido de canais de áudio (%d) no LiVES.\n"
 "Não pode ser carregado.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Clipes"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Params."
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "Abrir Trecho de Arquivo [_P]"
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importar trecho de _DVD/VCD"
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importar Trecho de _DVD"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importar Trecho de _VCD"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Importar de Dispositivo"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Salvar layout como..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Carregar layout..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Descartar/Deletar layout..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorar largura, altura e valores de áudio dos layouts carregados"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "EDITOR DE _CLIPES"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Inserir clipe selecionado"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_Inserir áudio do clipe selecionado"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Deletar bloco Selecionado"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "Pular para limite de bloco anterior [_J]"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "Pular para o próximo limite de bloco [_J]"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Limpar _marcas da linha de tempo"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "Tocar a partir da _posição na linha de tempo"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Mover efeitos com blocos"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Ver/_Editar o efeito seleccionado"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Deletar efeito selecionado"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Aplicar efeito ao _bloco..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Aplicar efeito à _região..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Faixas"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Fazer áudio de fundo a faixa atual (_b)"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Adicionar faixa de vídeo at_rás"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Adicionar Faixa de Vídeo à _Frente"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "Dividir a trilha atual no cursor [_s]"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "Dividir faixas _selecionadas de vídeo"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Inserir vão nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Inserir vão na trilha atual e tempo selecionado"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Fechar todos vãos nas trilhas/tempo selecionados (_g)"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Se_leção"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Selecionar faixa atual"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Selecionar tod_as faixas de vídeo"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "_Não selecionar faixas de vídeo"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Selecionar todo _tempo"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Selecionar do tempo _zero"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Selecionar fim do t_empo"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Timecode para o início da região"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Timecode para o fim da região"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "Início da _região para timecode"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "Fim da _região para timecode"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "Mudar valores de largura, alltura e áudio..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Renderizar tudo para um novo clipe"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Renderizar _vídeo"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Renderizar _áudio"
 
-#: src/multitrack.c:6386
-#, fuzzy
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
-msgstr "_Pre-renderizar áudio"
+msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "_Pre-renderizar áudio"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Ver"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Bloquear pontos de entrada/sa_ida"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Efeitos no atual"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Parâmetros de áudio"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Mostrar faix_a do áudio de fundo"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Visão compacta"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Máximo de trilhas a inserir..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Rolar para seguir a execução"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Centralizar no cursor"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Zoom in"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Zoom out"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_Detalhes multipista"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "Janela de _Eventos"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "Mostrar evento_s de frame"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "Mostrar tecla_s multipista"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Modo do mouse: _Mover"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Modo do mouse: _Selecionar"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "Modo Ins:_Normal"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Inserir com _áudio"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Inserir com _áudio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Visão Expandida (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Visão Compacta (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "Gravidade:_Normal"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "Gravidade:_Esquerda"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "Gravidade:_Direito"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Clipes"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Params."
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Applicar"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Tempo"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Deletar nodo"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "Próximo _nodo"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "Nodo anterior [_P]"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "Execução _reversa  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Velocidade  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Ancorar o ponto de início à linha de tempo"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "Ancorar início [_S]"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Ancorar o ponto de início à linha de tempo"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Primerio frame"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Ancorar o ponto final à linha de tempo"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "Ancorar final [_E]"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Ancorar o ponto final à linha de tempo"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Último frame"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Rolar"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9356,91 +9479,91 @@
 "==============================\n"
 "Alternado para modo de edição de clipes\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Linha de tempo (segs.)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Áudio de fundo"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Áudio camada %d"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Áudio camada %d"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (cam. %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Seleccionar faixa"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Vídeo %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (cam. %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Efeito selecionado"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_Ver/Editar este efeito"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Ver este efeito"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Deletar este efeito"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d até %d selecionados  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f seg."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d frames"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9450,65 +9573,65 @@
 "==============================\n"
 "Alternado para modo multipista\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "Efeito não tem parâmetros.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s saída"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "camada %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "faixa de áudio"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s até %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "Mapa de filtro _ant"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Ins an_tes"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Ins apó_s"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "_Prox mapa de filtro"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9516,85 +9639,81 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Bloco/frame selecionado"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Selecionar este blog"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "Dividir bloco aqui [_S]"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Listar _efeitos aqui"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Ajustar %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Deletar bloco selecionado"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Inserir aqui"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Inserir áudio aqui"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 "Gap inserido nas trilhas selecionadas a partir do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Inserido vão na trilha %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Desfeito %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Refeito %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Detalhes multipista"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9602,56 +9721,62 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "pista %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "faixas %s e %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "faixas selecionadas"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Adiconados %s %s até %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Adicionado efeito %s na faixa %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderizados %d frames para um novo clipe.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "A limpar..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Aperte 'm' durante a execução"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "fazer uma marca na linha de tempo"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9660,21 +9785,21 @@
 "Inserido áudio %.4f até %.4f do clip %s no áudio de fundo, do tempo %.4f até "
 "%.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Inseridos frames %d até %d no clipe %s na faixa %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9682,111 +9807,101 @@
 "selecione uma ou mais faixas\n"
 "para criar a região.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d trilhas de vídeo selecionadas.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "ou o botão INSERIR DEPOIS para movê-lo."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "para selecionar uma região.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "depois deste.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "antes deste.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Removidos parâmetros de efeitos para o efeito %s no tempo %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Definir os valores de parâmetro para %s %s em %s no tempo %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Autorecarregar cada vez"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Mapa de teclado salvo em %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "clipes e frames"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "clipes"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "frames"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9794,7 +9909,7 @@
 "\n"
 "Auto recarregar layout.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9805,11 +9920,11 @@
 "Alguns %s estão faltando no layout%s\n"
 "Por isso não pode ser carregado corretamente.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9818,43 +9933,43 @@
 "\n"
 "Impossível carregar arquivo de layout %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Pegou %d eventos...processando..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Checando e reconstruindo lista de eventos"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d erros detectados.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "FPS multipista definido em %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer de áudio multipista"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Reiniciar valores"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Fechar mixer"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -9862,42 +9977,42 @@
 "_Invertendo volumes do\n"
 "áudio de fundo e da camada"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Ajustando valores de áudio de fundo e da camada para que possam somar 1.0"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Ajustar todos valores de áudio das camadas para o mesmo valor"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "servidor JACK iniciado\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Impossível conectar ao servidor JACK\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Iniciado subsistema de áudio jack.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Iniciado leitor de áudio jack.\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9905,7 +10020,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9913,329 +10028,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Impossível conectar ao servidor JACK\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: escolha um reprodutor de áudio"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "dados"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocidade"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variável"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "Vars."
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "×"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "intervalo"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Apagar tudo"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Parar gravação"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "Reiniciar clipe <clipenum>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "clipenum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "tecla"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10244,7 +10365,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10253,12 +10374,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10471,10 +10592,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Fade out do áudio"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Fade out do áudio"
-
 #~ msgid "Fade"
 #~ msgstr "Fade"
 
@@ -10954,9 +11071,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Superior esquerdo é a área de _transferência"
 
-#~ msgid "_Top"
-#~ msgstr "_Topo"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "Segmentos _verticais"
 
@@ -11212,127 +11326,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Você deve definir o dispositivo de CD primeiro em Preferências."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVES não consegue encontrar um número suficiente de trilhas atendendo "
-#~ "sua requisição."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Tente novamente com valores diferentes."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name falhou:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Impossível conectar ao servidor JACK\n"
-
-#~ msgid "Red"
-#~ msgstr "Vermelho"
-
-#~ msgid "error.\n"
-#~ msgstr "erro.\n"
-
-#~ msgid "Plugin timed out on message %s\n"
-#~ msgstr "Plugin não respondeu com a mensagem %s\n"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Impossível ler o arquivo\n"
-#~ "%s\n"
-#~ "Código de erro %d\n"
-
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Impossível ler arquivo com padrões\n"
-#~ "%s\n"
-#~ "Erro %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to read sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impossível ler arquivo de tamanhos\n"
-#~ "%s\n"
-#~ "Erro %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES não conseguiu escrever no arquivo:\n"
-#~ "%s\n"
-#~ "Por favor veja as permissões e tente novamente."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write script file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impossível escrever o arquivo do script\n"
-#~ "%s\n"
-#~ "Código de erro %d\n"
+#~ msgid "Default value:    "
+#~ msgstr "Valor padrão:    "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write filter defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impissível gravar arquivo de padrões\n"
-#~ "%s\n"
-#~ "Erro %d\n"
+#~ msgid "Minimum value: "
+#~ msgstr "Valor mínimo: "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impossível escrever arquivo de tamanhos padrão\n"
-#~ "%s\n"
-#~ "Erro %d\n"
-
-#~ msgid "No clips were recovered for set (%s).\n"
-#~ msgstr "Não foram encontrados clipes para o set (%s).\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "No effect selected.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nenhum efeito seleccionado.\n"
+#~ msgid "Maximum value: "
+#~ msgstr "Valor máximo: "

LiVES-1.6.1.tar.bz2/po/pt_BR.po -> LiVES-2.0.3.tar.bz2/po/pt_BR.po Changed

@@ -3,20 +3,21 @@
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:03+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,7 +26,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -39,7 +55,7 @@
 "group_id=64341&atid=507139\n"
 "Obrigado. Os dados podem ser recuperados se você reiniciar o LiVes.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -51,7 +67,7 @@
 "Ao reportar travamentos, por favor informe qual o seu sistema operacional, "
 "distribuição e a versão do LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -59,7 +75,7 @@
 "e toda informação mostrada abaixo:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -69,163 +85,184 @@
 "seja coletada mais informações.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "desativado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Layout atual**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Builtin"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Customizado"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Teste"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NÃO DETECTADO..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detectado..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NÃO DETECTADO..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectado..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NÃO DETECTADO..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectado..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NÃO DETECTADO..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -236,22 +273,48 @@
 "\n"
 "Gerenciador de janelas: \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "little endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "big endian"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Número de CPUs detectadas: %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "o diretório temp utilizado é %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -261,15 +324,15 @@
 "jack ou suporte ao pulse audio.\n"
 "Muitos recursos de áudio não estarão disponíveis.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilado com suporte a JACK, bom!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilado com o suporte ao pulse audio, maravilha !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -283,7 +346,7 @@
 "estudiolivre.org\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -293,85 +356,85 @@
 "A sintaxe de inicialização é: %s [opçoes] [nome_do_arquivo [tempo_inicial] "
 "[frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Onde: nome_do_arquivo é o nome do arquivo de mídia ou backup.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "tempo_inicial : tempo inicial do arquivo em segundos\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : número máximo de frames a abrir\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "as opções podem ser:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : mostra este texto de ajuda e sai\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <nome_do_set>   : autocarregar set de clips nome_do_set\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : não carregar set no início\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : forçar não carregamento da recuperação de crash\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : forçar carregamento da recuperação de crash\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : não mostrar a interface gráfica\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : iniciar no modo de edição de clipe\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : iniciar no modo de multi-trilhas\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : iniciar monitoramento de OSC na porta UDP <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : não iniciar monitoramento de OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -379,46 +442,46 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autocarregar devicemap\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : tentativa de debug falhou (necessita do 'gdb' "
 "instalado)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Iniciando interface gráfica..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -426,27 +489,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"O tema que você procura não foi encontrado. Por favor, certifique-se de ter "
-"os temas instalados em\n"
-"%s/%s.\n"
-"(Talvez você precise mudar o valor de <prefix_dir> em seu arquivo ~/.lives)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever um pequeno arquivo em /tmp\n"
-"Por favor, certifique-se que tem permissão de escrita em /tmp e tente "
-"novamente.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -460,55 +514,37 @@
 "Por favor, leia o arquivo README que vem com este pacote\n"
 "antes de rodar o LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu ler a partir de seu arquivo de configuração\n"
-"%s/.lives\n"
-"\n"
-"Reveja as permissões deste arquivos e tente novamente.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no seu arquivo de configuração\n"
-"%s/.lives\n"
-"\n"
-"Por favor, verifique as permissões deste arquivo e do diretório\n"
-"e tente novamente.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES está impossibilitado de usar o diretório temp\n"
-"%s\n"
-"\n"
-"Por favor verifique a configuração <tempdir> no\n"
-"%s/.lives\n"
-"e tente novamente.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -516,10 +552,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES não conseguiu capturar esta imagem\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -537,7 +571,7 @@
 "\n"
 "Obrigado.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -547,7 +581,14 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -557,7 +598,7 @@
 "LiVES não conseguiu encontrar 'mplayer'. Você deverá instalar o mplayer para "
 "utilizar o LiVES com todos os seus recursos.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -567,7 +608,7 @@
 "LiVES não conseguiu localizar 'convert'. Você deverá instalar o Convert e o "
 "Image Magick, caso deseje utilizar os efeitos rederizados.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -577,7 +618,7 @@
 "LiVES não conseguiu localizar 'composite'. Você deverá instalar o Composite "
 "e o Image Magick, caso deseje utilizar a função mesclar..\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -587,7 +628,7 @@
 "LiVES não foi capaz de localizar 'sox'. Alguns recursos de áudio podem não "
 "funcionar. Instale o 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -595,68 +636,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES não foi capaz de encontrar plugins de codificação.\n"
-"Por favor certifique-se se eles estão instalados corretamente em\n"
-"%s%s%s/\n"
-"Você não poderá 'Salvar' sem eles.\n"
-"Você pode precisar mudar o valor de <lib_dir> em ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Carregando automaticamente set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "O reprodutor de áudio %s é inválido\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sem título %d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nenhum Arquivo>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "grv %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!grv %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Tocar"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -664,35 +699,35 @@
 "LiVES não conseguiu capturar esta imagem\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Arquivo %s fechado\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "Desfazer [_U]"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Áudio Esquerdo"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Áudio Direito"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -707,27 +742,12 @@
 "Por favor ajuste as opções de execução em 'Preferências | Execução' e tente "
 "novamente.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Tocador"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Tocador"
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -735,14 +755,9 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"Um diretório chamado\n"
-"%s\n"
-"já existe. Você gostaria de usar este diretório?\n"
-"\n"
-"(Espaço Livre = %.2f GB)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -750,14 +765,9 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"Um diretório chamado\n"
-"%s\n"
-"já existe. Você gostaria de usar este diretório?\n"
-"\n"
-"(Espaço Livre = %.2f GB)\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -766,13 +776,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Criar o diretório\n"
-"%s\n"
-"?\n"
-"\n"
-"(Espaço Livre = %.2f GB)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -781,11 +786,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Nome do diretorio é muito longo !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -793,7 +798,7 @@
 "LiVES FALHOU AO INICIAR SEU TOCADOR DE ÁUDIO !\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -803,7 +808,7 @@
 "\n"
 "O PULSE AUDIO é o mais recomendável para a maior parte dos usuários."
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -811,7 +816,7 @@
 ", porém esta versão do LiVES não foi compilada com suporte ao pulse audio.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -821,11 +826,11 @@
 " É aconselhável instalar o pulse audio primeiro antes de iniciar o LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio é recomendável para usuários avançados"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -833,7 +838,7 @@
 ", porém esta versão do LiVES não foi compilada com suporte ao Jack.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -843,7 +848,7 @@
 "antes de iniciar o LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -851,11 +856,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "O SOX pode ser utilizado se nenhum dos outros players funcionarem, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -863,7 +868,7 @@
 "porém alguns recursos de áudio serão desabilitados\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -873,7 +878,7 @@
 "É aconselhável instalá-lo antes de iniciar o LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -881,92 +886,92 @@
 "O MPLAYER é recomendável apenas para testes.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: escolha um reprodutor de áudio"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Usar _pulse player de áudio"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Usar o reprodutor de áudio _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Usar _sox audio player"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Usar _mplayer audio player"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Próximo"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Pulado"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Passou"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Falhou"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Configuração de teste"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Resolução de problemas"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES irá fazer alguns testes de configuração básica\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Verificando a presença do \"sox\""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Você deve instalar o sox para ser capaz de usar todos os recursos de áudio "
 "no LiVES"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Verificando se o sox pode converter o audio"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "Impossível iniciar gerador %s\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "Você deve instalar sox_fmt_all ou similar"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Procurando por \"mplayer\""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -974,44 +979,52 @@
 "Você deve instalar mplayer para poder utilizar todas as funções de "
 "decodificação no LiVES"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Verificando se mplayer pode converter o audio"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Você deve instalar mplayer com suporte a pcm/wav"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Verificando se o mplayer pode decodificar para png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Talvez você queira atualizar o mplayer para a nova versão"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Verificando se o mplayer pode decodificar para jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Você deve instalar mplayer com suporte a png/alpha"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Você pode adicionar suporte a saída jpeg com mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Checando a presença do  \"converter\""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 "Instalar o ImageMagick para conseguir usar todos os efeitos pretendidos"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1023,7 +1036,7 @@
 "    Clique Cancelar para sair e instalar o componentes que estão faltando, "
 "ou Próximo para continuar    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1033,7 +1046,7 @@
 "\n"
 "Finalmente, você pode escolher a interface padrão para LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1044,7 +1057,7 @@
 "LiVES tem duas interfaces principais e você pode começar com qualquer uma "
 "delas.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1054,79 +1067,78 @@
 "\n"
 "O padrão pode ser alterado nas preferências.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Escolha a interface inicial"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "Inciando o _Clip no modo de edição"
 
-#: src/startup.c:1042
-#, fuzzy
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
-msgstr "Esta é a melhor escolha para tarefas simples de edição ou para VJs\n"
+msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "Iniciando no modo _Multitrack"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Esta é a melhor escolha para tarefas de edição complexa que envolve vários "
 "clipes.\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Deixar LiVES definir a extensão do _file"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "Deixar LiVES definir a extensão do _file"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Aplicar Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem "
 "importados."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Visualizar"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clique aqui para _Previsualizar qualquer vídeo, áudio ou imagem selecionada"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clique aqui para _Previsualizar qualquer arquivo de áudio"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Clique aqui para _Previsualizar o vídeo"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Processando..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1140,8 +1152,8 @@
 "\n"
 "Lembre de desligar os efeitos (ctrl-0) depois!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1149,107 +1161,114 @@
 "\n"
 "Por favor aguarde"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Exibir Detalhes"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "Sufici_ente"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Visualizar"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Pausar"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "Pausa/Sufici_ente"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Tamanho do frame"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Tamanho do arquivo"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Tamanho do byte"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Tempo total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Frames"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Taxa/tamanho"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Áudio direito"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opções de codificação"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------- (Cheque a caixa para redimensionar como sugerido)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<------------- (Clique na caixa para usar o tamanho recomendado)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Mantenha _minhas configurações"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Usar configurações _recomendadas"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1257,76 +1276,75 @@
 "Não mostrar mais este aviso\n"
 "(pode ser ligado novamente em Preferências/Avisos)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Exibir _Detalhes"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "Fechar janela [_C]"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Salvar para arquivo"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserir"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Número de vezes a inserir"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Inserir até o fim do áudio"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Inserir antes da seleção [_B]"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Inserir área de transferência antes da seleção"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Inserir _após a seleção"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Inserir área de transferência depois da seleção"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Inserir com som [_W]"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Inserir sem s_om"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Abrir Seleção"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Tempo de início da seleção (seg)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Número de frames a abrir"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
+
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Stream"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Renomear Clipe"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1342,7 +1360,7 @@
 "Também certifique-se de ter marcado sua banda em Preferências|Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1351,47 +1369,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Não enviar informação de banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Tente esta configuração se está tendo problemas ao pegar um stream"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Renomear Clipe"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Entre com o Nome do Set"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Escolha o diretório de trabalho"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1402,7 +1435,7 @@
 "Isso vai permitir recarregar o layout com os mesmos clipes depois.\n"
 "O LiVES lembrará você de salvar o set quando você for sair.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1410,7 +1443,7 @@
 "Para exportar este projeto, você deverá definir o nome deste set.\n"
 "Ele tambem será utilizado como nome do projeto.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1420,245 +1453,200 @@
 "Este Guia irá lhe ajudar\n"
 "durante a instalação inicial para que você tenha o máximo desta aplicação.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"Primeiro você precisa escolher um diretório de trabalho para LiVES.\n"
-"Este deve ser um diretório com muito espaço em disco disponível.\n"
-"Note que, em muitos sistemas, /tmp é apagado ao desligar, assim pode ser "
-"desaconselhável criá-lo em /tmp.\n"
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Renomear Clipe"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Entre com o Nome do Set"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Entre com o Nome do Set"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Escolha o diretório de trabalho"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Novo nome "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Nome do set "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Carregar trilha de CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Selecionar Título/Capítulo do DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Selecionar o Título do VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Modificar o máximo de trilhas visíveis"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Detalhes do dispositivo"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Trilha a carregar (de %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Título do DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Título do VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de trilhas a visualizar"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Dispositivo:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Dispositivo:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capítulo  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Áudio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "Número de Entrada"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "Usar largura padrão, altura e FPS"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Largura"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Altura"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Formato de saída"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Fade Audio In"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Fade Audio Out"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Fade in sobre  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "primeiro"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Fade out sobre  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "segundos."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "seleção."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Tocar Música Aleatória"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Número de Faixas Selecionadas:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Diretório:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Incluir subdiretórios"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Tamanho Mínimo de Arquivo (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Tamanho Máximo de Arquivo (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "seleção"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentários do arquivo (opcional)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Título/Nome: "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artista: "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentários: "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "_Opções"
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "Savar legendas em arquivo"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "Arquivo de legenda"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "Navegar..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: escolha um diretório"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: escolha um arquivo"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Discartar/Salvar"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1668,7 +1656,7 @@
 "O layout atual não foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1678,7 +1666,7 @@
 "O layout atual foi modificado desde que foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1688,7 +1676,7 @@
 "O set de clipes atual pode ser salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1696,7 +1684,7 @@
 "O set de clipes atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1704,7 +1692,7 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1712,13 +1700,13 @@
 "O Layout atual não foi salvo desde de a ultima alteração\n"
 "O que gostaria de fazer  ?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1728,121 +1716,112 @@
 "O layout atual contém frames gerados e não foram salvos.\n"
 "O que você gostaria de fazer?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Nome do set"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "Auto recarregar da próxima vez"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "Apagar layout [_W]"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorar mudanças"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Deletar set"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Deletar layout"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Salvar layout"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Salvar set"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recuperar layout ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Opções de codificação"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "Limpar _marcas da linha de tempo"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Reiniciar Valores"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Salvando como set %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Selecionar Arquivo"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Carregando automaticamente set %s..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "Limpando clipe"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES não conseguiu encontrar o programa %s.\n"
-"Por favor confirme se este programa está no PATH e é executável.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Este arquivo"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1850,7 +1829,7 @@
 ",\n"
 " - Incluindo o layout atual - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1860,7 +1839,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1870,14 +1849,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1885,7 +1864,7 @@
 "\n"
 "Arquivo de projeto inválido.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1906,33 +1885,33 @@
 "delete-o.\n"
 "Uma vez que tenha feito isso, vai poder importar o novo projeto.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importando o projeto %s como set %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importando projeto"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportando projeto %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportando projeto"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Restaurar arquivo .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Backup como arquivo .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Restaurar arquivo .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1944,90 +1923,90 @@
 "O set será deletado do disco.\n"
 "Tem certeza?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Deletando set..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Deletando set..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Deletando set"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "O set %s foi permanentemente apagado do disco.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Inserir Silêncio"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Desfazendo"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Restaurando áudio..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Limpando imagens de frames"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Apagar quadros em excesso"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "O comprimento do vídeo é agora %d frames a %.3f FPS.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Área de transferência resampleada para %d frames.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Refazendo"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Copiando frames %d até %d%s para a área de transferência..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Pegando frames do clipe"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Copiando para a área de trasferência"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Colando"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "...audio addicionado..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2037,7 +2016,7 @@
 "Por favor instale o software 'convert', o qual está presente no pacote Image-"
 "magick, e então reinicie o LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2051,7 +2030,7 @@
 "Tente selecionar todos frames e usar\n"
 "a função 'Ajustar Áudio' do menu 'Áudio'."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2059,7 +2038,7 @@
 "LiVES não pôde inserir porque as taxas de áudio não conferem.\n"
 "Por favor instale 'sox' e tente novamente."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2070,7 +2049,7 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2081,11 +2060,11 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Resampleando áudio da área de transferência"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2097,7 +2076,7 @@
 "LiVES não pode resamplear o áudio da área de transferência.\n"
 "O áudio da área de transferência foi deletado.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2110,30 +2089,30 @@
 "LiVES não pôde processar o áudio da área de transferência.\n"
 "Deseja continuar a inserção usando áudio não modificado?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserindo %d%s frames da área de transferência..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Inserindo"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserindo %d vezes da área de transferência%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserindo %d frames da área de transferência%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2143,7 +2122,7 @@
 "Deletar todos frames vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2153,8 +2132,8 @@
 "Deleção vai causar frames perdidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2164,7 +2143,7 @@
 "Deleção vai causar que o áudio se perca em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2174,7 +2153,7 @@
 "Deleção vai causar que frames sejam movidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2184,20 +2163,20 @@
 "Deleção vai causar que áudio seja movido em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Deletando frames %d até %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Deletando"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Deletar"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2207,7 +2186,7 @@
 "\n"
 "Seleção está travada.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2219,11 +2198,11 @@
 "(Para cancelar, aperte 'r' ou clique em Tocar|Gravar Performance novamente "
 "quando você tocar.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Gravação cancelada.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2236,7 +2215,7 @@
 "O plugin '%s' diz:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2249,7 +2228,7 @@
 "Impossível achar o método 'init' no plugin %s.\n"
 "O plugin pode não funcionar ou estar instalado incorretamente."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2261,22 +2240,22 @@
 "\n"
 "Por favor aperte 'Cancelar' se não é o que quer.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Salvando set %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Carregando clipes do set %s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d clipes recuperados do set (%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2288,41 +2267,37 @@
 "nesta máquina.\n"
 "Aperte 'OK' para continuar.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Limpando espaço em disco..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Limpando espaço em disco"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d MB de espaço em disco foi recuperado.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Reiniciando framerates..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Externo: %s\n"
-"Interno: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2330,7 +2305,7 @@
 "\n"
 "  Abrindo..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2339,7 +2314,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2348,7 +2323,7 @@
 "\n"
 "(%d decodificado)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2357,7 +2332,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2365,23 +2340,23 @@
 "\n"
 "  Desconhecido"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "não assinado"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "assinado"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2390,8 +2365,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2407,26 +2381,25 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo \n"
-"sob os termos da Licença Pública Geral GNU conforme publicada pela \n"
-"Free Software Foundation; tanto a versão 3 da Licença, como \n"
-"(a seu critério) qualquer versão posterior.\n"
-"\n"
-"Este programa é distribuído na expectativa de que seja útil, \n"
-"porém, SEM NENHUMA GARANTIA; nem mesmo a garantia implícita de \n"
-"COMERCIABILIDADE OU ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. \n"
-"Consulte a Licença Pública Geral do GNU para mais detalhes.\n"
-"\n"
-"Você deve ter recebido uma cópia da Licença Pública Geral do GNU \n"
-"junto com este programa; se não, escreva para a Free Software \n"
-"Foundation, Inc., no endereço 59 Temple Place, Suite 330, Boston, MA "
-"02111-1307 USA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Um editor de video e programa de VJ."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Marcelo Soares Souza https://launchpad.net/~soares-souza\n"
+"  VJ Pixel https://launchpad.net/~vjpixel\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2440,7 +2413,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2450,14 +2423,14 @@
 "\n"
 "Instale o mplayer para poder vêr este arquivo.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2470,198 +2443,209 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Abrindo áudio %s, tipo %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Abrindo áudio"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Cancelando"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Novo áudio: %d Hz %d canal(is) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Transformando áudio"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Novo Áudio"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d frames são suficientes!\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Saíde do debug do codificador"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Tela Cheia (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Desativar tela Cheia (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Tamanho dobrado(d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Tamanho normal (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Esconder janela do tocador (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Mostrar janela do tocador (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Tocar em janela separada (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Desligar loop contínuo (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Ligar loop contínuo (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume do áudio (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Ligar o áudio (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Desligar o áudio (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Invertendo área de trabalho..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Invertendo área de trabalho"
 
-#: src/callbacks.c:7893
-#, fuzzy
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
-msgstr "Carregar _Legenda do Arquivo..."
+msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Carregado arquivo de legenda: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Selecionar Arquivo de Áudio"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Por favor configure seu tocador de CD em 'Ferramentas | Preferências | "
 "Misc'\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Abrindo faixa do CD %d de %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Faixa do CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Abrindo faixa de CD..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Erro carregado faixa do CD\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Selecionando faixas"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "erros de layout"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Fechar Janela [_W]"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Limpar _Erros"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Deletar layouts afetados"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pausado..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "continuando..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Manter"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "Suficiente"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2673,30 +2657,28 @@
 "(clique 'Manter' para manter o que você tem e parar)\n"
 "(clique em 'Continuar' para continuar o processamento)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "Parar [_S]"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Frame selecionado"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Salvar Frame como %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2705,7 +2687,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2717,7 +2699,7 @@
 "Você deve instalar o \"xwininfo\" para usar este recurso\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2725,7 +2707,7 @@
 "\n"
 "Tempo de gravação deve ser maior que 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2739,11 +2721,11 @@
 "Clique em 'Cancelar' para cancelar\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "A janela externa foi solta.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2751,7 +2733,7 @@
 "Clique em uma janela para capturar\n"
 "Pressione 'q' para parar a gravação"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2767,19 +2749,19 @@
 "'Parar' ou 'q' para terminar.\n"
 "(O padrão de %.3f frames por segundo vai ser usado.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES não conseguiu capturar esta janela. Desculpe.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Exportar Áudio Selecionado como..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Exportar Áudio como..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2793,81 +2775,86 @@
 "Clique em 'OK' para exportar na nova velocidade, ou 'Cancelar' para exportar "
 "na velocidade original.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportando frames de áudio %d até %d como %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportando áudio como %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportando áudio"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Inserir Arquivo de Áudio..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Inserindo arquivo de áudio %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Inserindo áudio"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Anexar Áudio"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Diminuindo áudio de %.2f para %.2f segundos..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Diminuindo/Aumentando áudio"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Ajustar Áudio"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Fading in áudio"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Fade in áudio"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Fading out áudio"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Fade out do áudio"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s sobre %.1f segundos..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s do tempo %.2f segundos até %.2f segundos..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Fading áudio..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2877,61 +2864,52 @@
 "Deletar todo áudio vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Deletando todo áudio..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Deletando áudio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Deletando Áudio"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Deletar Áudio"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Gravar áudio novo"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserindo silêncio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Inserindo Silêncio"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Deletar %d layout(s)... tem certeza?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Não foi possível encontrar o arquivo pixmap: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Mesclar"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Mesclar área de trabalho [ %d Frames ]       Com a seleção [ %d Frames ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2939,612 +2917,585 @@
 "Mesclar área de trabalho [ %d Frames (resampleada)]       Com a seleção [ %d "
 "Frames ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Alinhar Início_s"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Alinhar Finais [_E]"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "O que fazer com os frames que sobraram na área de trabalho -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Inserir Frames"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Deletar Frames"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Número de vezes a repetir área de transferência"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Repetir área de transferência para se encaixar à se_leção"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "Método de _Transição:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Mesclando área de transferência com seleção..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "inserindo %d frames adicionais antes da mesclagem\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "agora inserindo %d frames adicionais\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Mesclagem feita.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "Efeitos _Customizados"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "_Utilitários Customizados"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "Abrir Arquivo/Diretóri_o"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "Arquivos _Recentes"
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Abrir Stream... [_L]"
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "Importar trecho de _DVD/VCD"
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "Importar Trecho de _DVD"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "_Importar de Dispositivo"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "_Importar de Dispositivo"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importar de Dispositivo _Firewire (DV)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importar de Dispositivo _Firewire (HDV)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "Arquivos _Recentes"
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "_Recarregar Set"
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Fechar/Sal_var Todos Clipes"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "Salvar Clip_e Como..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Salvar _Seleção Como..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "Fechar Este _Clipe"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Backup do Clip como .lv1"
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Restaurar Clip de .lv1"
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Salvar/Carregar/Backup com Som [_W]"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "Carregar legendas automaticamente"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Limpar espaço em disco [_U]"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Modo _MULTIPISTA"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Copiar Seleção"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Cor_tar Seleção"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Inserir da Área de Transferência"
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Colar como _Novo"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Mesclar Área de Transferência com Seleção"
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Deletar Seleção"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Separar Áudio e _Vídeo"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Selecionar"
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Selecionar Todos Fr_ames"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "Apena_s Frame Inicial"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "Apenas Fram_e Final"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Selecionar a partir do primeiro _frame"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Selecionar a partir do ú_ltimo frame"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Selecionar Última Inserção/_Mesclagem"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Selecionar Último _Efeito"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Inverter Seleção"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "Travar _Largura da Seleção"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Tocar"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "Tocar Tudo [_P]"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Tocar Seleção [_Y]"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "To_car Área de Transferência"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "Parar [_S]"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Voltar [_W]"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "Tela Cheia [_F]"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Tamanho _Dobrado"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Tocar em Janela _Separada"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Fundo _Branco"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "Repetir vídeo (para caber na faixa de áudio)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Repetir C_ontinuamente"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Loops Pin_g Pong"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Mudo"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Modo 'S_ticky' de Janela"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "Mostrar Contador de Frames [_H]"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "Mostrar legendas"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Efeito_s"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Efeitos são aplicados na seleção atual."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Rodar Efeito/Ferramenta/erador de Teste..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Ferramentas são aplicadas nos clipes inteiros."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Inverte_r área de transferência"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "Mudar velo_cidade de Execução/Salvar"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Resamplear _Vídeo para Nova Frame Rate"
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitários"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Gerar"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Ferramentas _Customizadas"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Gerar"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Carregando plugins de efeitos renderizados..."
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr "Carregar _Legenda do Arquivo..."
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr "Apagar legendas"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Capturar Janela _Externa "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Preferências"
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Áudio"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Carregar _Novo Áudio para o Clipe"
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Carregar Faixa do _CD"
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "E_jetar CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Gravar Áudio E_xterno..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "para _Clip Novo..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "para _Seleção"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Fade _In Áudio..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Fade _Out Áudio..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Exportar Áudio"
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Exportar Áudio _Selecionado"
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Export_ar Todo Áudio"
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Anexar Áudio"
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Ajustar Áudio"
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Diminuir/Aumentar Áudio para _Selecão"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Ajustar Áudio do Início ao Começo da Execução [_P]"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Deletar Áudio"
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Deletar Áudio _Selecionado"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Deletar _Todo Áudio"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Inserir _Silêncio na Seleção"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Resamplear Áudio..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Tocar _Música Usando XMMS"
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Musica Aleatória _Usando XMMS"
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "_Parar XMMS"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Mostrar _Informação de Clipe"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Mostrar/_Editar Comentários do Arquivo"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Mostrar Info da Área de Transferên_cia"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Mostrar _Mensagens"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Mostrar Erros de _Layout"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Clipes"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renomear Clipe Atual no Menu"
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "A_vançado"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Efeitos/Ferramentas/Utilitários _RFX"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Novo Script RFX de Teste..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copiar Script RFX para Teste"
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Editar Script RFX de teste..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "Reno_mear Script RFX de Teste"
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Deletar Script RFX de Teste"
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promover Teste de Efeito/Ferramenta/Gerador Renderizado..."
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importar Script RFX Customizado"
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportar Script RFX Customizado"
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "De_letar Script RFX Customizado"
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Reconstruir todos plugins RFX [_B]"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Receber _LiVES stream de..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "Enviar LiVES _stream para..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Abrir _yuv4mpeg stream em %sstream.yuv"
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importar Projeto (.lv2)"
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportar Projeto (.lv2)"
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Mapeamento de _Efeitos de Tempo-Real"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Vincular efeitos em tempo real para ctrl mais teclas de número."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "_Definir Padrão de Efeitos em Tempo Real"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Definir padrão de valores de parâmetros para efeitos em tempo real."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Salvar Padrão _de Efeitos em Tempo Real"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3552,307 +3503,307 @@
 "Salvar padrão de efeitos de tempo real de modo que seja restaurado toda vez "
 "que o LiVES abrir."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Reiniciar todas as velocidades e posições de reprodução"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reiniciar todas posições de reprodução para o frame 1 e todas as framerates."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "Interface _MIDI/joystick"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "Configuração _MIDI/joystick"
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_Salvar mapeamento de dispositivo"
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "Carregar mapeamento de dispositivo [_L]"
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Mostrar Teclas de VJ [_K]"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Brinquedos"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "Fra_mes doidos"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "TV _LiVES (banda larga)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manual (abre no browser)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Doação para o projeto !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Email do autor"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Reportar um _bug"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Sugira um _recurso"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Ajudar com a _traduçao"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "Resolução de Problemas"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "Sobre [_A]"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Rebobinar para iniciar (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Tocar tudo (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Parar execução (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Tocar seleção (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Volume do áudio (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Remover fundo branco (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Tocar mais devagar (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Tocar mais rápido (ctrl-up)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Voltar (ctrl-left)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Avançar (ctrl-right)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Mostrar informação de clipe (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Esconder esta barra de ferramentas"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Velocidade de execução do vídeo (frames por segundo)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Variar a velocidade do vídeo"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Primeiro Frame"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Último Frame"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "O primeiro frame selecionado nesse clipe"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "O último frame selecionado nesse clipe"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Iniciando...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Aperte 'Q' para parar a gravação. NÃO CUBRA A JANELA DO TOCADOR!   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Número do frame a visualizar"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "Livre [_f]"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Escolha livre do número do frame"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "Início [_s]"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "O número do frame está ligado ao quadro inicial"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "Fim [_e]"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "O número do frame está ligado ao quadro final"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Ponteiro"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "O número do frame está ligado ao ponteiro de execução"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Voltar"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Tocar Tudo"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Tocar Seleção"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Iniciar g_ravação"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Parar de grava_r"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "G_ravar Performance"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Esconder Janela do Tocador"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Mostrar Janela do Tocador"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "grv %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
-#, fuzzy, c-format
+#: src/utils.c:500
+#, c-format
 msgid "%.2f KiB"
-msgstr "grv %.2f MB"
+msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Limpando a área de trasferência"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3863,7 +3814,7 @@
 "==============================\n"
 "Alternado para clipe %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3873,11 +3824,11 @@
 "==============================\n"
 "Alternado para clipe vazio\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(vazio)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3886,7 +3837,7 @@
 "O nome do set foi modificado de %s para %s. Layouts afetados foram "
 "atualizados\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3895,7 +3846,7 @@
 "O clipe %s está faltando no set.\n"
 "Ele é necessário para os seguintes layouts:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3904,7 +3855,7 @@
 "O clipe %s foi fechado.\n"
 "Ele é utilizado nos seguintes layouts:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3913,7 +3864,7 @@
 "Frames foram movidos no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3922,7 +3873,7 @@
 "Frames foram deletados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3931,7 +3882,7 @@
 "Frames foram deletados do clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3940,7 +3891,7 @@
 "Áudio foi movido no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3949,7 +3900,7 @@
 "Áduio foi alterado no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3958,7 +3909,7 @@
 "Frames foram alterados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3969,7 +3920,7 @@
 "não pode ser aberto porque está em uso\n"
 "por outra instância de LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3980,7 +3931,7 @@
 "O set %s está atualmente em uso por outra instância do LiVES.\n"
 "Escolha outro nome.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3988,16 +3939,13 @@
 "\n"
 "O nome de sets não pode ser vazio.\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"Nomes de set não podem conter espaços ou o caracter%s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -4006,13 +3954,13 @@
 "\n"
 "Nomes de set não podem conter espaços ou o caracter%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4023,69 +3971,69 @@
 "O set %s já existe.\n"
 "Escolha outro nome.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Removendo layout %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Vídeo [abrindo...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Vídeo [%.2f seg]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Indefinida)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Sem vídeo)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Sem áudio)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [abrindo...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Áudio Esquerdo [abrindo...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f seg]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Áudio Esquerdo [%.2f seg]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Áudio Direito [abrindo...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Áudio Direito [%.2f seg]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES não pode mudar para o mplayer enquanto clipes estão sendo carregados."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Limpando clipe"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4100,54 +4048,65 @@
 "\n"
 "Sobrescrever?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "Desfazer %s [_U]"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refazer %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Seleção------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " seg ] ---------- Seleção ---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Examinando cabeçalho do arquivo"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Abrindo %s tempo inicial %.2f seg. frames %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " sem som"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Abrindo áudio para %s"
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -4157,19 +4116,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"LiVES não esta atualmente otimizado para arquivos grandes.\n"
-"Recomenda-se (por enquanto) comecar com um arquivo menor, ou usar 'Abrir "
-"Seleção de Arquivo'.\n"
-"(Tam. do Arquivo=%.2fMB)\n"
-"\n"
-"Tem certeza que quer continuar?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - por favor tenha paciência."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4181,7 +4133,7 @@
 "LiVES não conseguiu extrair nem vídeo nem áudio deste arquivo.\n"
 "Por favor verifique a janela de terminal para mais detalhes.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4191,7 +4143,7 @@
 "\n"
 "Talvez seja necessário ter o mplayer para abrir este arquivo.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4203,32 +4155,29 @@
 "Por favor confira as configurações de 'Comando de abertura de vídeo' em\n"
 "'Ferramentas | Preferências | Decodificação'\n"
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Fading áudio..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Legendas foram salvas em %s\n"
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Salvar Frame como %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Salvar Frame como %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Renomear Clipe"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4240,35 +4189,31 @@
 "\n"
 "Tem certeza que quer continuar?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "seleção"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Ligando seleção"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (sem som)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Salvando frames %d até %d%s como \"%s\" : codificador = %s : formato = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Salvando frames 1 até %d%s como \"%s\" : codificador %s : formato = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Salvando [pode levar muito tempo]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4278,34 +4223,33 @@
 "\n"
 "Erro de codificador -  arquivo de saída não foi criado!\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "Limpando a área de trasferência"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Tamanho do arquivo foi %.2fMB\n"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Gravando performance..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "FPS médio era %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4319,16 +4263,16 @@
 "Vá em 'Ferramentas | Redimensionar Todos'\n"
 "e redimensione todos frames para o tamanho atual.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Untitled%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4336,7 +4280,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4348,13 +4292,13 @@
 "FPS.\n"
 "O padrão pode ser ajustado em 'Ferramentas | Preferências | Misc'.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Velocidade de execução ajustada para %.3f fps para se encaixar no áudio.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4363,7 +4307,7 @@
 "Frames=%d tipo=%s tamanho=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4372,49 +4316,44 @@
 "Frames=%d tipo=%s tamanho=%dx%d bpp=%d fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s nenhum\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d canal(is) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comentário: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Salvando frame %d de %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Fazendo backup de %s até %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Fazendo backup"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "backup concluído dos dados da performance..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restaurando %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Restaurando"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4428,23 +4367,22 @@
 "LiVES não pode restaurá-lo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "grv %.2f MB"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!grv %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
-#, fuzzy
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
-msgstr "grv %.2f MB"
+msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4452,7 +4390,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4462,64 +4400,59 @@
 "Arquivos de uma execução anterior do LiVES foram encontrados.\n"
 "Quer tentar recuperá-los?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Recuperando arquivos"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Recuperando arquivos..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Mostra _layouts afetados"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Limpando espaço em disco"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s configurações avançadas"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Aviso !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "aviso"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr "LiVES: - Pergunta"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr "pergunta"
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "Mostrar Compositor"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Limpar _Erros"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "Sobre [_A]"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4530,7 +4463,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4542,11 +4475,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Tocadores de áudio não podem ser trocados durante a execução."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4559,20 +4492,18 @@
 "insuficiente.\n"
 "Por favor tente fechar outros aplicativos primeiro.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% feito. Tempo restante: %u seg\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4581,7 +4512,7 @@
 "\n"
 "%d/%d frames abertos. Tempo restante %u seg.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4590,7 +4521,7 @@
 "\n"
 "%d/%d frames abridos.\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4599,7 +4530,7 @@
 "\n"
 "%d frames abertos.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4608,7 +4539,7 @@
 "\n"
 "Tempo restante: %d seg"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4619,7 +4550,7 @@
 "Desculpe, LiVES só pode abrir %d arquivos por vez.\n"
 "Por favor feche um arquivo e tente novamente."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4636,7 +4567,7 @@
 "\n"
 "Por favor tenha certeza de ter permissão de escrita neste diretório."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4647,7 +4578,7 @@
 "ou troque por outro formato de codificador em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4661,7 +4592,7 @@
 "Por favor mude o codec de áudio em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4669,16 +4600,13 @@
 "Este layout inclui frames gerados.\n"
 "Ele nãopode ser salvo, renderize como clipe primeiro.\n"
 
-#: src/dialogs.c:1820
-#, fuzzy
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
-"Este layout inclui frames gerados.\n"
-"Ele nãopode ser salvo, renderize como clipe primeiro.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4689,7 +4617,7 @@
 "\n"
 "Devido a restrições no formato %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4697,43 +4625,43 @@
 "LiVES recomenda as configurações a seguir:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", assinado"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", não-assinalado"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:1867
-#, fuzzy, c-format
+#: src/dialogs.c:2004
+#, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
-msgstr "Usa uma taxa de áudio de %d Hz%s\n"
+msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Definir vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Definir vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4741,36 +4669,36 @@
 "\n"
 "Você pode querer:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "desabilite o áudio, uma vez que o codificador não pode codificar áudio\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES deve:\n"
 
-#: src/dialogs.c:1974
-#, fuzzy, c-format
+#: src/dialogs.c:2112
+#, c-format
 msgid "resample audio to %d Hz%s%s\n"
-msgstr "resamplear  áudio a %d Hz%s\n"
+msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "resamplear vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "resamplear vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4784,7 +4712,7 @@
 "Aperte 'OK' para continuar e 'Cancelar' para abortar.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4794,7 +4722,7 @@
 "Mudanças aplicadas a seleção não serão permanentes.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4807,7 +4735,7 @@
 "LiVES não pôde gravar a performance. Não há memória suficiente disponível.\n"
 "Tente gravar apenas uma parte do arquivo."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4826,7 +4754,7 @@
 "\n"
 "Aperte 'Cancelar' para abortar a inserção, ou 'OK' para continuar."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4840,11 +4768,11 @@
 "Você deve apenas clicar em OK se você sabe o que está fazendo, em outro caso "
 "clique Cancelar."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Mostrar atalhos"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4926,11 +4854,11 @@
 "g                             faz o loop tocar ao contrário quando chegar no "
 "final\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Atalhos do Multipista"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4973,19 +4901,18 @@
 "\n"
 "Para outras chaves, ver os menus.\n"
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Histórico de Mensagens"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Depois de fazer upgrade/instalação, deve-se ajustar o <prefix_dir> em seu "
-"arquivo ~/.lives"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4993,16 +4920,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES não conseguiu achar nenhum plugin de efeito renderizado.\n"
-"Por favor tenha certeza que os têm instalados em\n"
-"%s%s%s\n"
-"ou mude o valor de <lib_dir> no arquivo ~/.lives)\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5012,18 +4933,18 @@
 "\n"
 " (Nomes de arquivo devem terminar em .mp3, .ogg, .wav, .mod, .xm ou .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "falhou (tipo desconhecido)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -5037,7 +4958,7 @@
 "existente.\n"
 "Clique em Cancelar para escolher um novo nome.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5049,7 +4970,7 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5061,8 +4982,8 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2170
-#, fuzzy, c-format
+#: src/dialogs.c:2310
+#, c-format
 msgid ""
 "\n"
 "The original file\n"
@@ -5071,15 +4992,8 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
-"\n"
-"O arquivo original\n"
-"%s\n"
-"não pôde ser encontrado.\n"
-"Se este arquivo foi movido, por favor o copie para seu local original\n"
-"e clique em 'OK' para tentar novamente.\n"
-"Ou clique em 'Cancelar' para não carregar este arquivo.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5094,7 +5008,7 @@
 "%s\n"
 "O clipe não pode ser carregado.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5102,7 +5016,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5111,13 +5025,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5128,13 +5042,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5149,20 +5063,16 @@
 "Você pode aumentar este valor em  Preferências/Multipista.\n"
 "É recomendado aumentá-lo em ao menos %d MB"
 
-#: src/dialogs.c:2221
-#, fuzzy, c-format
+#: src/dialogs.c:2361
+#, c-format
 msgid ""
 "\n"
 "Some old layouts for the set %s already exist.\n"
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 msgstr ""
-"\n"
-"Já existem alguns layouts antigos do set %s.\n"
-"É recomendável deletá-los.\n"
-"Clique em OK para deletar, ou Cancelar para deixá-los no disco.\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5174,7 +5084,7 @@
 "Feche alguns aplicativos ou reduza o tamanho da memória de desfazer\n"
 "Em 'Preferências > Multipista 'Memória de Desfazer'\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5186,7 +5096,7 @@
 "Você precisa aumentar o buffer de desfazer\n"
 "em 'Preferências > Multipista > Tamanho do buffer de desfazer'\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5194,19 +5104,19 @@
 "\n"
 "LiVES não conseguiu reservar memória sufiiciente para o buffer de desfazer.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "ou insira um valor menos.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Tente novamente do editor de clipes, tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5215,21 +5125,21 @@
 "áudio.\n"
 "Ajuste as configurações de áudio no menu Ferramentas.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "O layout atual tem áudio, de modo que canais de áudio não podem ser "
 "definidos como zero.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5239,13 +5149,13 @@
 "outro sistema, ou de uma versão mais antiga do LiVES).\n"
 "Tentar reparar a cópia em disco do layout?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5255,7 +5165,7 @@
 "\n"
 "A taxa de áudio deve ser maior que 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5267,7 +5177,7 @@
 "e pode demorar muito tempo para ser apresentada.\n"
 "Tem certeza que deseja visualizar?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5277,7 +5187,7 @@
 "\n"
 "Você deve instalar o 'dvgrab' para usar esta função.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5292,25 +5202,25 @@
 "Você pode precisar selecionar um desses em Ferramentas/Preferências/"
 "Reprodução.\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "O plugin de execução de vídeo falhou em iniciar a palheta!\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "O plugin de decodificação de áudio falhou em inicializar a palheta!\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Impossível definir framerate do plugin de vídeo\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5323,34 +5233,34 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "cancelado.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "falhou.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "erro no arquivo. Falhou.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5358,13 +5268,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5372,13 +5278,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5386,26 +5288,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5413,26 +5307,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5440,17 +5326,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES não conseguiu escrever no arquivo:\n"
-"%s\n"
-"Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5459,7 +5341,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5472,7 +5354,7 @@
 "%s\n"
 "Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5481,19 +5363,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"O set será deletado do disco.\n"
-"Tem certeza?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5501,13 +5386,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5517,27 +5402,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5546,14 +5431,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5564,19 +5449,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5584,7 +5469,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5592,7 +5477,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5604,50 +5489,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Bem vindo ao LiVES versão %s.\n"
-"Traduzido por VJ pixel.\n"
-"Caso encontre erros, tenha sugestões para a tradução ou queira ajudar na "
-"documentação do LiVES, entre em contato: pixel(em)estudiolivre.org\n"
-"Para informações sobre multimídia em software livre acesse http://"
-"estudiolivre.org\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5656,203 +5534,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "gerador"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Geradores"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "gerador"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Geradores"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "transição"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Transições"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efeito"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efeitos"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "utilitário"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Utilitários"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Compositores"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Torneiras"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "divisor"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Divisores"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "conversor"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Conversores"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "áudio/vídeo"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Transições de Áudio e Vídeo"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "só vídeo"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Ver apenas Transições"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "áudio apenas"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Transições apenas de Áudio"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "áudio"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mixers de Áudio"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Efeitos de Áudio"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "controle do volume de áudio"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Controles do Volume de Áudio"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "só vídeo"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "só vídeo"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "áudio apenas"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Parâmetros de áudio"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s todos frames..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s área de transferência em frames %d até %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s na área de transferência..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s em novo clipe..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s frames %d até %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s área de transferência com seleção"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s na área de transferência"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s em um novo clipe"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s frames %d até %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5860,17 +5779,46 @@
 "\n"
 "Nenhum frame foi gerado.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Erro: plugin %s não tem a função weed_setup().\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5879,131 +5827,310 @@
 "Info: Impossível carregar plugin %s\n"
 "Erro: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Incluir subdiretórios"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Falha ao iniciar instância %s, erro %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Impossível iniciar gerador %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Falha ao iniciar gerador %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Falha ao iniciar gerador %s, erro %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Clique em 'Preview' para mudar estes valores"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Reiniciar Valores"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Frame"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Manter aspecto do frame original"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Manter _Aspecto"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Selecione um arquivo"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Manter aspecto do frame original"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "_Inicio da transição"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Início da transição"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "Crossfade áudio"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "Clique na caixa para permitir fazer transmissão de áudio com vídeo"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "Crossfade áudio"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Fim da transiçã_o"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Fim da transição"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "_Framerate alvo (um plugin pode sobreescrever)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : tamanho"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Novo tamanho (pixels)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "Largura [_W]"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "Altura [_H]"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Gerar na Área de Transferên_cia"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Gerar frames na área de transferência"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Gerar em _Novo Clipe"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Gerar frames em um novo clipe"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -6014,62 +6141,59 @@
 "Devem ser selecionados ao menos %d frames para usar este efeito.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Fechar janela [_W]"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Sem parâmetros"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Parametro inválido"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "Mostrar Compositor"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Clique para selecionar a cor"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Refazer"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Valor do vermelho (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Verde"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Valor do verde (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Azul"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Valor do azul (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -6078,12 +6202,12 @@
 "\n"
 "Erro de plugin: %s falhou com o código %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : mensagem era %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6098,17 +6222,17 @@
 "%s\n"
 "Código de erro %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Atualizando padrões de plugins de execução de vídeo em %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Carregando padrões de plugin de execução de vídeo de %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6123,32 +6247,32 @@
 " Ferramentas|Preferências|Execução|Plugins de Execução Avançados\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Framerate fixa para plugin.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Entrada de colorspace para o plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Framerate fixa para plugin.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Entrada de colorspace para o plugin.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6161,16 +6285,7 @@
 "Falhou em abrir o plugin de execução %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"O plugin de execução de vídeo falhou ao iniciar.\n"
-"O error: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6185,7 +6300,16 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"O plugin de execução de vídeo falhou ao iniciar.\n"
+"O error: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6195,7 +6319,7 @@
 "Aviso! O plugin de execução de vídeo não envia teclas pressionadas. O "
 "teclado deve estar desativado durante o uso!\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6204,30 +6328,26 @@
 "*** Usando o plugin %s pra execução em tela cheia, com a palheta tipo %d "
 "(%s). ***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVES não conseguiu achar seus plugins de codificação. Por favor confirme se "
-"tem os plugins instalados em\n"
-"%s%s%s\n"
-"ou mude o valor de <lib_dir> em ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6240,11 +6360,11 @@
 "%s%s%s\n"
 "ou troque de plugin em 'Ferramentas | Preferências | Codificação'\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Não foi possível redimensionar, por favor instale imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6257,7 +6377,7 @@
 "Falhou em abrir o plugin de decodificação %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6272,190 +6392,173 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/desconhecido"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Opções de codificação"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Falhou em carregar %s, as transições podem não redimensionar.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s configurações avançadas"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Novo RFX de Teste"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Editar RFX de Teste"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efeito -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Transição -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Gerador -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Ferramenta -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Utilitário -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Nome:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "O nome do plugin. Não são permitidos espaços."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Versão:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Versão do script."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Autor do script."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (opcional):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL do mantenedor do plugin."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Texto do menu:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "O texto a ser mostrado no menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Descrição da ação:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Descreva o que o plugin faz. Ex.: \"detecção de bordas\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Mínimo de frames:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Número mínimo de frames ao qual este efeito/ferramenta pode ser aplicado. "
 "Normalmente 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Requisitos..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Entre com os binários requeridos pelo plugin."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Definir propriedades para o plugin. Opcional."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parâmetros..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Configurando parâmetros usados em código pró/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Notas da Janela de Parâmetros [_W]"
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Criar notas sobre layout da janela de parâmetros. Opcional"
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Código de linguagem:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Língua para pré/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "Código _pré-loop..."
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Código a ser executado antes do loop. Opcional."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "Código de _loop..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Código de loop a ser aplicado em cada frame."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "Código _pós-loop..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Código para ser executado após o loop. Opcional"
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "Código de acionamen_to..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6463,7 +6566,7 @@
 "Configure o código gatilho para quando a janela de parâmetros for mostrada, "
 "ou quando um parâmetro for modificado. Opcional (exceto para Utilitários)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6478,55 +6581,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Requisitos RFX"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Parâmetros RFX"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Gatilhos RFX"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nova Entrada"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Editar Entrada"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Remover Entrada"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Mover Acima [_U]"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Move Abaixo [_U]"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Propriedades RFX"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "Lento (nota para GUI) [_S]"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "Gerador de modo _batch"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6540,7 +6643,7 @@
 "Favor remover o gatilho primeiro.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6552,197 +6655,185 @@
 "Alguns gatilhos foram ajustados.\n"
 "Por favor confirme o código gatilho.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Novo Parâmetro RFX"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Editar Parâmetro RFX"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Nome:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Nome do parâmetro, deve ser único no plugin."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Rótulo:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 "Rótulo a ser mostrado pelo parâmetro. Um sublinhado representa um atalho."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "_Grupo de botões: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "Um valor diferente de zero pode ser usado para agrupar botões rádio."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Tipo:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Tipo de parâmetro (selecione de uma lista)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Casas decimais [_P]: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "Valor pa_drão:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "Padrão [_D]: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "_Grupo de botões: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "Um valor diferente de zero pode ser usado para agrupar botões rádio."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "Valor _mínimo: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Valor má_ximo: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     Tamanho do pa_sso:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "Quanto do parâmetro é ajustado quando as setas são pressionadas."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Envolver "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Se o valor empacota max->min e min->max."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Definir _valores"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Valor padrão:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Valor mínimo: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Valor máximo: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Padrão ve_rmelho:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Padrão verde [_G]:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Padrão azul [_B]: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "_Definir padrão"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Valor padrão:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Comprimento máximo (caracteres): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Edição de Parâmetros RFX"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Palavra-chave:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Tipo especial:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Subtipo especial:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
+
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Linha:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Parâmetros atrelados (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Parametros atrelados (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Parâmetros atrelados (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Novo Gatilho RFX"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Editar Gatilho RFX"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Quando:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Código Pré-loop"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Codigo de Loop"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Codigo Pós-Loop"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Texto padrão (tam. máx. %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Entre com valores, um por linha"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6752,7 +6843,7 @@
 "\n"
 "O nome não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6762,7 +6853,7 @@
 "\n"
 "Nome não pode conter espaços.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6772,7 +6863,7 @@
 "\n"
 "Texto do menu não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6782,7 +6873,7 @@
 "\n"
 "Descrição da ação não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6792,7 +6883,7 @@
 "\n"
 "O nome do autor não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6804,7 +6895,7 @@
 "Já existe um plugin com este nome.\n"
 "O nome deve ser único.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6814,7 +6905,7 @@
 "\n"
 "Codigo do loop não deve estar em branco.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6824,7 +6915,7 @@
 "\n"
 "O código do gatilho não deve ser deixado em branco para um utilitário.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6834,7 +6925,7 @@
 "\n"
 "O nome do parâmetro não deve ser deixado em branco.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6848,41 +6939,41 @@
 "plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Escrevendo arquivo de script %s..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "A seção <define> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Versão do script ruim.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "A seção <name> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "A seção <version> não foi enonctrada no script.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "A seção <author> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "A seção <description> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Descrição ruim. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6897,27 +6988,27 @@
 "encontrado no script.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Reconstruindo todos scripts RFX..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Reconstruindo scripts"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "customizado..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "teste..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "reconstruindo entradas dinâmicas de menu..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6930,7 +7021,7 @@
 "LiVES não conseguiu encontrar o programa %s.\n"
 "Por favor confirme se este programa está no PATH e é executável.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6945,12 +7036,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Deletando script RFX %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6965,7 +7056,7 @@
 "%s\n"
 "Código do erro %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6980,12 +7071,12 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script de teste.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promovendo plugin rfx %s de teste para customizado..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6993,29 +7084,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Falha ao mover o script de plugin de\n"
-"%s para\n"
-"%s\n"
-"Código %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importar Script de..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Exportar Script para..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -7030,55 +7115,43 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script a ser importado.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Builtin"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Customizado"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Teste"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copy RFX Script"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Do tipo:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Renomear Script RFX de Teste"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Do script: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nome do Script RFX"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Nome do script: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Novo nome: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Novo nome de script: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7090,28 +7163,45 @@
 "Já existe um script de teste com este nome.\n"
 "O nome do script deve ser único.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renomeando script RFX de teste %s para %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Falha ao mover o script de plugin de\n"
+"%s para\n"
+"%s\n"
+"Código %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Aplicar Efeitos em Tempo-Real para Seleção"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Carregando efeito renderizado %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Veja: VJ - mostrar atalhos'. Configure os efeitos em tempo-real, e depois "
 "aplique-os aqui."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7123,7 +7213,7 @@
 "Plugins de execução de vídeo só são ativados em\n"
 "tela cheia, modo de janela separada\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7131,54 +7221,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Criar o diretório\n"
-"%s\n"
-"?\n"
-"\n"
-"(Espaço Livre = %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
-"O diretório temp é o diretório de trabalho do LiVES, onde clipes abertos e "
-"sets são armazenados.\n"
-"Ele deve estar em uma partição com muito espaço.\n"
-"\n"
-"Dica: evite confiurá-lo em /tmp, pois este diretório é esvaziado no "
-"desligamento."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Impossível criar ou escrever no novo diretório temp.\n"
-"Você deve criá-lo como root primeiro:\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"O diretório não será mudado agora.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7198,7 +7278,7 @@
 "Ou aperte 'Cancelar' para restaurar o diretório temp para sua configuração "
 "original."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7209,7 +7289,7 @@
 "primeiro.\n"
 "Veja http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7217,7 +7297,7 @@
 "\n"
 "Trocar tocador de áudio requer reiniciar (jackd não deve estar rodando)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7225,370 +7305,385 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (qualidade melhor; arquivos maiores)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferências"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Abrir janela de seleção de arquivos maximizada"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Mostrar arquivos recentes no menu 'Arquivo'"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Parar screensaver quando tocando    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Abrir janela principal maximizada"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Mostrar barra de ferramentas quando o fundo estiver limpo"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Modo inicial"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "Editor de _clipes"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "Modo _multipista"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Suporte multi-head"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " número do monitor para a interface do LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " número do monitor para execução"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Forçar único monitor"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Forçar modo de único monitor"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Quando entrando no modo multipista"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Pergunte-me por configurações de largura, altura, FPS e de áudio"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "Sempre use os seguintes v_alores:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Use os mesmos _valores para renderizar um novo clip"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "Largura [_W]           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          Altura [_H]      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Habilitar faixa do áudio de fundo"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Trilha de áudio por trilha de vídeo"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Tamanho do b_uffer de desfazer (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "Sair do modo multipista depois d_e renderizar"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Cada"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Depois de cada mudança"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nunca"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Multipista/Renderizar"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Use abertura imediata quando possível"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Ativar abertura imediata de alguns tipos de arquivo usando plugins de "
 "decodificação"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Comando de abrir vídeo             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Compressão de abertura/renderização                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
+
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     ( mais baixo = arquivos maiores e mais lentos; para jpeg, melhor "
 "qualidade )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Formato de imagem padrão          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Ativar desinterlaçamento automático quando possível"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Desinterlaça automaticamente frames quando um plugin o sugerir"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Quando abrir múltiplos arquivos, concatene as imagens em um clip"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Decodificação"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-"A qualidade da pré-visualização da execução de vídeo - afeta o "
-"redimensionamento"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "_Qualidade de Visualização"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Baixo - pode melhorar a performance em computadores mais lentos"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normal - recomendado para a maioria dos usuários"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Alto - pode melhorar a qualidade em computadores muito rápidos"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "_Qualidade de Visualização"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+"A qualidade da pré-visualização da execução de vídeo - afeta o "
+"redimensionamento"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Mostrar estatísticas de FPS"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "Tocador [_P]"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "_Comando para tocar áudio"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- interno -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "Áudio segue a velocidade/di_reção de vídeo"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "Áudio segue as mudanças de _clipe"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "ÁUDIO"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Execução"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      O que gravar quando 'r' for pressionado   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "Mudanças de _frame"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "Mudanças de F_PS"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "Efeitos em tempo _real"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "Trocas de _clip"
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Gravando"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Codificador                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Formato de saída"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Codec de áudio"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Usar _antialiasing quando redimensionando"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Número de efeitos em tempo _real"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7596,81 +7691,96 @@
 "O número de teclas de efeito em tempo real \"virtuais\". Podem ser "
 "controladas através da janela de efeitos em tempo real, ou via rede (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Diretório de vídeo a ser carregado (padrão)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Diretório de salvar vídeo (padrão) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Diretório de áudio a ser carregado (padrão) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Diretório de imagens (padrão) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Diretório de Backup/Restauração (padrão) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Diretório temp (não remova) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "O diretório padrão de onde carregar vídeos"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "O diretório padrão onde salvar vídeos codificados"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "O diretório padrão para carregar e salvar áudio"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "O diretório padrão para salvar amostras de frames"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "O diretório padrão para fazer backup e restauração de clipes individuais"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "diretório de trabalho do LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Diretórios"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7678,204 +7788,191 @@
 "Avisar ao Inserir/Mesclar se o _framerate da área de transferência não for "
 "igual ao da seleção"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avisar ao abrir arquivos de tamanho _superior a "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Mostrar um aviso antes de salvar um se_t"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Mostrar um aviso se nenhum efeito _renderizado for encontrado na "
 "inicialização."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Avisar se o  _mplayer não for encontrado quando o LiVES abrir."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Avisar se um nome de set _duplicado for digitado."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Quando um set é carregado, avise se clipes estiverem faltando dos _layouts."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Avise se um clipe usado em um layout está para ser fechado."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Avise se frames usados em um layout estão perto de serem deletados."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Avise se frames usados em um layout estão perto de serem movidos."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Avise se fames usados em um layout estão perto de serem alterados."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Avise se áudio usado em um layout está perto de ser deletado."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Avise se áudio usado em um layout está perto de ser movido."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Avise se áudio usado em um layout está perto de ser alterado."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "Avise se um layout não estiver salvo ao sair do modo multipista."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Avisar se multipista não tem canais de áudio e o layout com áudio está "
 "carregado."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 "Mostrar mensagem de informação depois de importar de dispositivo firewire."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Mostrar um aviso antes de abrir um stream yuv4mpeg (avançado)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Mostrar um aviso quando houver pouco espaço em disco no modo multipista."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
-#, fuzzy
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
-msgstr "Avisar se o  _mplayer não for encontrado quando o LiVES abrir."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Avisos"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Sincronia MIDI (requer os arquivos midistart e midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Quando inserindo/mesclando frames:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Aumentar/Diminuir Velocidade da In_serção"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Resamplear Inserção"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pausar xmms durante a execução de áudio"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "Dispositivo de CD           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Escolha o dispositivo de CD"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES pode carregar faixas de áudio deste CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "FPS padrão        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Frames por segundo para usar se nenhum for especificado"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Misc"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Novo tema:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Velocidade de download (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "LiVES deve ser compilado sem \"configure --disable-OSC\" para usar OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Controle remoto OMC ativado"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "Porta UDP       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Iniciar OMC ao abrir"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Streaming/Networking"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Transporte"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7883,48 +7980,44 @@
 "LiVES deve ser compilado com jack/transport.h e jack/jack.h presentes para "
 "usar transporte jack"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Arquivo de configuração do _transporte jack"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "O nome do servidor jack que pode controlar o transporte do LiVES"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Iniciar _servidor junto com o LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Áudio"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "LiVES deve ser compilado com jack/jack.h presente para usar áudio do jack"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -7932,84 +8025,71 @@
 "Você DEVE escolher o tocador de áudio \"jack\" na aba Execução para usar "
 "áudio do jack"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "_Arquivo de configuração do servidor de áudio jack"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Nome do servidor jack para áudio"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Integração com jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Eventos a responder para:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "Eventos do _Joystick"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "Dispositivos _Joystick"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "O dispositivo de Joystick, ex. /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Escolha um dispositivo de joystick"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "Eventos _MIDI"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr ""
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Use _ALSA MIDI (recomendado)"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr ""
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "Usar _raw MIDI"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Ler diretamente de um dispositivo MIDI"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "Dispositivo _MIDI"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "/dev/input/midi0O dispositivo MIDI, ex."
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Escolha um dispositivo MIDI"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "Checar _Taxa do MIDI"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8017,26 +8097,25 @@
 "Número de checagens por mensagem do teclado. Aumentar vai melhorar a "
 "resposta da MIDI, mas pode diminuir o tempo de resposta."
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "Repetição do MIDI"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Número de não-leituras permitidas entre sucessivas leituras."
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Aviso: definir este valor alto demais poder diminuir a velocidade de "
 "reprodução.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "Aprendizado do MIDI/Joystick"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8048,70 +8127,70 @@
 "diretório tenha efeito.\n"
 "Clique OK para continuar.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Mudanças de tema só surtirão efeito na próxima vez que o LiVES foi iniciado."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "As opções do jack só surtirão efeito da próxima vez que o LiVES for iniciado."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Sincronizando ao framerate externo de %.8f FPS.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Impossível inicializar receptor OSC\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "AVISO: Não foi possível iniciar o servidor OSC na porta UDP %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Servidor OSC iniciado na porta UDP %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Não foi possivel iniciar servidor OSC/UDP na porta %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionando frames 1 até %d"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Redimensionando frames 1 até %d"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Resamplear/Redimensionar"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Comprimento do vídeo é agora de %d frames.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8121,154 +8200,146 @@
 "\n"
 "A nova taxa deve ser maior que 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Resampleando áudio"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES não conseguiu resamplear o áudio como requisitado.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Resamplear Áudio"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Áudio resampleado a %d Hz, %d canais, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resampleando vídeo a %.8f frames por segundo..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Resampleando vídeo a %.3f frames por segundo..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Erro de reordenação!\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Resamplear"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Resamplear Áudio"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Inserir Silêncio"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Novo Clip de Áudio"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Configurações Externas de Clipe"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Taxa (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Canais "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Tamanho da Amostra "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
+
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Assinalado"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Não-assinalado"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Atual"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "Habilitar áudio [_e]"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "Taxa (Hz) (_r) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Canais "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Canais "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    Tamanho da Amo_stra "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Tamanho da amostra "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Novo"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Frames por segundo (FPS) "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Gravar para máximo:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " horass  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minutos  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " segundos  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Clique OK para começar a gravar ou Cancelar para sair."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "Tocar"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Resamplear Vídeo"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8285,7 +8356,7 @@
 "Por favor digite o framerate desejado\n"
 "em _frames por segundo"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8302,15 +8373,15 @@
 "Por favor digite o framerate desejado para _resamplear\n"
 "em frames por segundo"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OU entre a duração do arquivo em _segundos"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Mudar _a velocidade do áudio também"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8321,7 +8392,7 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8332,55 +8403,47 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Mudar a velocidade vai mover alguns layouts multipista.\n"
-"Tem certeza que quer continuar?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Mudar a velocidade vai mover o áudio em alguns layouts multipista.\n"
-"Tem certeza que quer continuar?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Mudança de Velocidade"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Velocidade de execução modificada para %.3f fps e áudio para %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Velocidade de execução modificada para %.3f fps.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Resampleando vídeo"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Resampleando vídeo da area de transferência"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Reordenando frames"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8390,20 +8453,20 @@
 "\n"
 "LiVES foi incapaz de reordenar os frames."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Desordenando frames"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "erro de sampling..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8419,7 +8482,7 @@
 "Tem certeza?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8431,12 +8494,12 @@
 "Aperte 'OK' para salvar este mapa de teclado como padrão\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Salvando mapa de teclado em %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8445,8 +8508,8 @@
 "\n"
 "Atualizando arquivo de mapa de teclado %s..."
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -8454,18 +8517,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"Impossível gravar mapa de teclado\n"
-"%s\n"
-"Erro %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Salvando padrão de efeitos em tempo-real para %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8480,22 +8538,22 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Carregando padrão de efeitos tempo-real de %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Carregando tamanhos padrão no gerador de %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8510,27 +8568,27 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Linha inválida %d em %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Chave inválida %d em %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Efeito inválido %s em %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8539,16 +8597,21 @@
 "Esta versão de LiVES não pode misturar geradores/não-geradores na mesma "
 "tecla (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Muitos efeitos ligados à tecla %d.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "atualização requerida.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8560,40 +8623,45 @@
 "Alguns efeitos não puderam ser localizados.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Sem descrição"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informação para %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nome do efeito: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nome do plugin: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Versão: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Descrição: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8607,65 +8675,69 @@
 "tecla.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES não pode localizar o efeito %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Mapeamento de Efeitos em Tempo-Real"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Pegar tecla"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Tecla ativa"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Pegar tecla"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "Trave o teclado para essa tecla de efeito"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "Limpar todos efeitos [_C]"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Modo ativo"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Atribuir parâmetros"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Nome do efeito:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Salvar como mapa de teclado padrão"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "Carregar mapa de teclado padrão [_L]"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8717,11 +8789,6 @@
 msgid "none\n"
 msgstr "nenhum\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d canal(is) %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8741,64 +8808,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Áudio de fundo"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Faixa selecionada: %s (camada %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Faixa atual: Áudio de fundo\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Faixa selecionada: camada %d\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f seg.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Fonte: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Clique com o botão direito para menu.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8807,7 +8874,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8815,7 +8882,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8825,7 +8892,7 @@
 "\n"
 "Sem clipes.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8835,7 +8902,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8844,12 +8911,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f seg. até %.2f seg.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8857,182 +8924,184 @@
 "Clique simples na linha de tempo\n"
 "para selecionar um frame.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "para selecionar uma região.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mixer de Áudio (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "Modo _Ins:Normal"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Mouse: Mover"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Mouse: Selecionar"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "_Gravidade:Normal"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "_Gravidade:Esquerda"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "_Gravidade:Direito"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Fechar primeiro vão(s) nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Fechar vãos"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Mover bloco"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Mover bloco de áudio"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Deletar bloco"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Deletar bloco de áudio"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Dividir faixas"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Dividir bloco"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Aplicar %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Deletar %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Inserir bloco"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Inserir vão"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Inserir bloco de áudio"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Mudança da ordem de efeitos"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "não-assinalado "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "assinalado "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "big endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "little endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9041,15 +9110,15 @@
 "Valores multipista definidos em %.3f fps, tamanho de frame %d x %d, canais "
 "de áudio %d, taxa de áudio %d, tamanho da amostra de áudio %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "lista de eventos inválida. Falha.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "a lista de eventos tem um FPS inválida. Falha.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -9064,7 +9133,7 @@
 "fechar o set atual,\n"
 "e então carregue no novo set a partir do menu 'Arquivo'.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -9075,433 +9144,439 @@
 "Há um número inválido de canais de áudio (%d) no LiVES.\n"
 "Não pode ser carregado.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Clipes"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Parâmetros"
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "Abrir Trecho de Arquivo [_P]"
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importar trecho de _DVD/VCD"
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importar Trecho de _DVD"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importar Trecho de _VCD"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Importar de Dispositivo"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Salvar layout como..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "Carregar _layout..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Descartar/Deletar layout..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorar largura, altura e valores de áudio dos layouts carregados"
 
-#: src/multitrack.c:5531
-#, fuzzy
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
-msgstr "Carregar legendas automaticamente"
+msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "EDITOR DE _CLIPES"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Inserir clipe selecionado"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_Inserir áudio do clipe selecionado"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Deletar bloco Selecionado"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "Pular para limite de bloco anterior [_J]"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "Pular para o próximo limite de bloco [_J]"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Limpar _marcas da linha de tempo"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Ignorar limites de seleção quando inserindo"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "Tocar a partir da _posição na linha de tempo"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Mover efeitos com blocos"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Ver/_Editar efeito selecionado"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Deletar efeito selecionado"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Aplicar efeito ao _bloco..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Aplicar efeito à _região..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Faixas"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Fazer áudio de fundo a faixa atual (_b)"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Adicionar faixa de vídeo at_rás"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Adicionar Faixa de Vídeo à _Frente"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "Dividir a trilha atual no cursor [_s]"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "Dividir faixas _selecionadas de vídeo"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Inserir vão nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Inserir vão na trilha atual e tempo selecionado"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Fechar todos vãos nas trilhas/tempo selecionados (_g)"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Se_leção"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Selecionar faixa atual"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Selecionar tod_as faixas de vídeo"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "_Não selecionar faixas de vídeo"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Selecionar todo _tempo"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Selecionar do tempo _zero"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Selecionar fim do t_empo"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Timecode para o início da região"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Timecode para o fim da região"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "Início da _região para timecode"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "Fim da _região para timecode"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "Mudar valores de largura, alltura e áudio..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Renderizar tudo para um novo clipe"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Renderizar _vídeo"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Renderizar _áudio"
 
-#: src/multitrack.c:6386
-#, fuzzy
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
-msgstr "_Pre-renderizar áudio"
+msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "_Pre-renderizar áudio"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Ver"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Bloquear pontos de entrada/sa_ida"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Efeitos no atual"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Parâmetros de áudio"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Mostrar faix_a do áudio de fundo"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Visão compacta"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Máximo de trilhas a inserir..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Rolar para seguir a execução"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Centralizar no cursor"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Zoom in"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Zoom out"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_Detalhes multipista"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "Janela de _Eventos"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "Mostrar evento_s de frame"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "Mostrar tecla_s multipista"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Modo do mouse: _Mover"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Modo do mouse: _Selecionar"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "Modo Ins:_Normal"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Inserir com _áudio"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Inserir com _áudio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "Selec. _sobreposn."
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "Selec. _sobreposn."
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Visão Expandida (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Visão Compacta (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "Gravidade:_Normal"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "Gravidade:_Esquerda"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "Gravidade:_Direito"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Clipes"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Parâmetros"
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Applicar"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Tempo"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Deletar nodo"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "Próximo _nodo"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "Nodo anterior [_P]"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "Execução _reversa  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Velocidade  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Ancorar o ponto de início à linha de tempo"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "Ancorar início [_S]"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Ancorar o ponto de início à linha de tempo"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Quadro inicial"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Ancorar o ponto final à linha de tempo"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "Ancorar final [_E]"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Ancorar o ponto final à linha de tempo"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Quadro final"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Rolar"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9511,91 +9586,91 @@
 "==============================\n"
 "Alternado para modo de edição de clipes\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Linha de tempo (segs.)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Áudio de fundo"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Áudio camada %d"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Áudio camada %d"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (cam. %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Selecionar faixa"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Vídeo %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (cam. %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Efeito selecionado"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_Ver/Editar este efeito"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Ver este efeito"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Deletar este efeito"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d até %d selecionados  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f seg."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d frames"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9605,65 +9680,65 @@
 "==============================\n"
 "Alternado para modo multipista\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s saída"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "camada %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "faixa de áudio"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s até %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "Mapa de filtro _ant"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Ins an_tes"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Ins apó_s"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "_Próx mapa de filtro"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9671,85 +9746,81 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Bloco/frame selecionado"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Selecionar este blog"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "Dividir bloco aqui [_S]"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Listar _efeitos aqui"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Ajustar %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Deletar bloco selecionado"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Inserir aqui"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Inserir áudio aqui"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 "Gap inserido nas trilhas selecionadas a partir do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Inserido vão na trilha %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Desfeito %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Refeito %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Detalhes multipista"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9757,56 +9828,62 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "pista %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "faixas %s e %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "faixas selecionadas"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Adiconados %s %s até %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Adicionado efeito %s na faixa %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderizados %d frames para um novo clipe.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Limpando..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Aperte 'm' durante a execução"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "fazer uma marca na linha de tempo"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9815,21 +9892,21 @@
 "Inserido áudio %.4f até %.4f do clip %s no áudio de fundo, do tempo %.4f até "
 "%.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Inseridos frames %d até %d no clipe %s na faixa %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9837,111 +9914,101 @@
 "selecione uma ou mais faixas\n"
 "para criar a região.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d trilhas de vídeo selecionadas.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "ou o botão INSERIR DEPOIS para movê-lo."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "para selecionar uma região.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "depois deste.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "antes deste.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Removidos parâmetros de efeitos para o efeito %s no tempo %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Definir os valores de parâmetro para %s %s em %s no tempo %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Autorecarregar cada vez"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Mapa de teclado salvo em %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "clipes e frames"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "clipes"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "frames"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9949,7 +10016,7 @@
 "\n"
 "Auto recarregar layout.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9960,11 +10027,11 @@
 "Alguns %s estão faltando no layout%s\n"
 "Por isso não pode ser carregado corretamente.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9973,43 +10040,43 @@
 "\n"
 "Impossível carregar arquivo de layout %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Pegou %d eventos...processando..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Checando e reconstruindo lista de eventos"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d erros detectados.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "FPS multipista definido em %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer de áudio multipista"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Reiniciar valores"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "Fechar mixer [_C]"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10017,43 +10084,42 @@
 "_Invertendo volumes do\n"
 "áudio de fundo e da camada"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Ajustando valores de áudio de fundo e da camada para que possam somar 1.0"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "camada de audio _Gang"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Ajustar todos valores de áudio das camadas para o mesmo valor"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "servidor JACK iniciado\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Impossível conectar ao servidor JACK\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Iniciado subsistema de áudio jack.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Iniciado leitor de áudio jack.\n"
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "Conectando ao servidor jack de transporte..."
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10061,7 +10127,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10069,132 +10135,129 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Impossível conectar ao servidor JACK\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: escolha um reprodutor de áudio"
+msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "Conectando ao servidor jack de transporte..."
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "não-fixado"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "fixado"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Respondendo a eventos de joystick de %s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Respondendo a eventos MIDI de %s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "dados"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "velocidade"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "variável"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "Vars."
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "Canal MIDI %d nota ligada"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "Canal MIDI %d nota desligada"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "Canal MIDI %d controlador %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "Canal MIDI %d pitch bend"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "botão %d do joystick"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "eixo %d do joystick"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "extensão"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* escala"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10202,203 +10265,211 @@
 "\n"
 "Clique em OK para deletar todas as entradas\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "Limpar _não-coincidentes"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Excluir tudo"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Iniciar exibição de video"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Parar exibição de video"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "Selecionar trecho <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Mudar clipe em primeiro plano para o n-ésimo clipe válido"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Exibir para frente"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Tocar vídeo no sentido normal"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Tocar para trás"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Tocar vídeo na direção reversa"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Reverter direção de execução"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Reverter direção da execução do vídeo"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Exibir o video rapidamente"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Exibir o video a uma taxa um pouco mais rápida"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Exibir video vagarosamente"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Exibir o video a uma taxa um pouco mais lenta"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "Mudar congelamento de execução"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Congelar video, ou se já congelado, descongelá-lo."
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "Definir taxa de exibição para <fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 "Definir taxa de exibição para o clip em primeiro plano para <float fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Iniciar gravação"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Parar gravação"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "Mudar estado de gravação"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "Alterar videos em primeiro e segundo planos"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Restaurar botões de efeitos"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "Desligar todos os effeitos."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "Ativar botão de efeito <key>"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "Desativar botão de efeito <key>"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "Mudar tecla de efeito <key>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Definir valor do parâmetro <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Mudar <value> do n-ésimo parâmetro para a tecla de efeito <key>."
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "Mudar vídeo em primeiro plano para o próximo clipe"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "Mudar vídeo em primeiro plano para o clipe anterior"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Definir a taxa de frames <fps_ratio>"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Definir a taxa de frames do clipe em primeiro plano para <float fps_ratio>"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "Reiniciar clipe <clipenum>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Mudar clipe em primeiro plano para o n-ésimo clipe válido, e reiniciar o "
 "número do frame"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "n. do clip"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "chave"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Salvando mapa de dispositivos para o arquivo %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10411,7 +10482,7 @@
 "Erro ao ler arquivo\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10424,12 +10495,12 @@
 "Versão inválida do arquivo\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Carregando mapa de dispositivos do arquivo %s..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10646,10 +10717,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Fade out do áudio"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Fade out do áudio"
-
 #~ msgid "Fade"
 #~ msgstr "Fade"
 
@@ -11135,9 +11202,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Superior esquerdo é a área de _transferência"
 
-#~ msgid "_Top"
-#~ msgstr "_Topo"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "Segmentos _verticais"
 
@@ -11402,127 +11466,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Você deve definir o dispositivo de CD primeiro em Preferências."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVES não consegue encontrar um número suficiente de trilhas atendendo "
-#~ "sua requisição."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Tente novamente com valores diferentes."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name falhou:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Impossível conectar ao servidor JACK\n"
-
-#~ msgid "Red"
-#~ msgstr "Vermelho"
-
-#~ msgid "error.\n"
-#~ msgstr "erro.\n"
-
-#~ msgid "Plugin timed out on message %s\n"
-#~ msgstr "Plugin não respondeu com a mensagem %s\n"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Impossível ler o arquivo\n"
-#~ "%s\n"
-#~ "Código de erro %d\n"
-
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Impossível ler arquivo com padrões\n"
-#~ "%s\n"
-#~ "Erro %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to read sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impossível ler arquivo de tamanhos\n"
-#~ "%s\n"
-#~ "Erro %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES não conseguiu escrever no arquivo:\n"
-#~ "%s\n"
-#~ "Por favor veja as permissões e tente novamente."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write script file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impossível escrever o arquivo do script\n"
-#~ "%s\n"
-#~ "Código de erro %d\n"
+#~ msgid "Default value:    "
+#~ msgstr "Valor padrão:    "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write filter defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impissível gravar arquivo de padrões\n"
-#~ "%s\n"
-#~ "Erro %d\n"
+#~ msgid "Minimum value: "
+#~ msgstr "Valor mínimo: "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Impossível escrever arquivo de tamanhos padrão\n"
-#~ "%s\n"
-#~ "Erro %d\n"
-
-#~ msgid "No clips were recovered for set (%s).\n"
-#~ msgstr "Não foram encontrados clipes para o set (%s).\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "No effect selected.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nenhum efeito seleçionado.\n"
+#~ msgid "Maximum value: "
+#~ msgstr "Valor máximo: "

LiVES-1.6.1.tar.bz2/po/ro.po -> LiVES-2.0.3.tar.bz2/po/ro.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 11:57+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -43,7 +59,7 @@
 "Mulţumesc. De recuperare ar trebui să fie posibilă în cazul în care "
 "reporniţi LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -55,7 +71,7 @@
 "Atunci când se blochează de raportare, vă rugăm să includă detalii cu "
 "privire la sistemul de operare, de distribuţie, precum şi LiVES versiunea ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -63,7 +79,7 @@
 "şi orice alte informaţii prezentate mai jos:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -73,163 +89,184 @@
 "multe informații.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Păstrarea set.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Redimensionare"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Redimensionarea tuturor cadrelor"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Orice"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Nimic"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "dezactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "** Structura actuală **"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr ""
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NU A FOST DETECTAT..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NU A FOST DETECTAT..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NU A FOST DETECTAT\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NU A FOST DETECTAT..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NU A FOST DETECTAT..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NU A FOST DETECTAT..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NU A FOST DETECTAT..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NU A FOST DETECTAT..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NU A FOST DETECTAT..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -240,22 +277,48 @@
 "\n"
 "Rapoarte de manager de ferestre ca \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numărul de monitoare detectate: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Directorul temporar este de %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -265,15 +328,15 @@
 "suport pentru jack sau pulse audio.\n"
 "Multe din funcțiile audio vor fi indisponibile.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilate cu suport jack, de bine !\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilate cu suport de pulse audio, minunat\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -282,7 +345,7 @@
 "Bine ati venit la LiVES versiunea %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -291,132 +354,132 @@
 "\n"
 "Sintaxa de start este: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "În cazul în care: de nume de fişier este numele de mass-media un fişier sau "
 "un fişier copie de rezervă.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : timpul de start al fișierului in secunde\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : numărul maxim de cadre pentru a deschide\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts pot fi:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : arată acest text de ajutor şi de ieşire\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : Nu încărcaţi orice set la pornire\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : vigoare nu-de încărcare de crash de recuperare\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : forţa de încărcare de accident de recuperare\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : Nu afişa GUI\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : pornește in modul editare clip\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : porni în modul multicale\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : pornește ascultătorul OSCpe portul UDP <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : nu începeţi ascultător OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 "-aplayer <ap>    : pornește cu playerul audio selectat. <ap> poate fi mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox sau jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " sau sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : încerca să se blochează de depanare (necesită 'gdb' instalat)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Incepand GUI ..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -424,27 +487,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Tema cerută nu a putut fi localizată. Asigurați-vă că aveți temele instalate "
-"în\n"
-"%s/%s.\n"
-"(Poate este nevoie să modificați valoarea lui <prefix_dir> fișierul "
-"dumneavoastră ~/.lives)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES nu a fost capabil sa scrie un fișier mic la /tmp\n"
-"Asigurați-vă ca aveți permisiunea de scriere în /tmp și încercați din nou.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -453,37 +507,37 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -491,10 +545,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -505,42 +557,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -548,62 +607,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Fără titlu%d> %dx%d : %d cadre %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? cadre ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cadre %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nici un fişier>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Rulează"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -611,35 +670,35 @@
 "LiVES nu a putut pentru a capta această imagine\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Închis de fişiere% s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "An_ulează ultima acțiune"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Refă ultima acțiune"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -648,26 +707,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: recupera layout ?"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -677,7 +721,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -687,7 +731,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -698,7 +742,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -707,54 +751,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -762,155 +806,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "Î_nainte"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -918,94 +970,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Previzionează"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1019,8 +1071,8 @@
 "\n"
 "Amintiţi-vă pentru a opri efectele (Ctrl-0) dupa aceea !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1028,182 +1080,188 @@
 "\n"
 "Vă rugăm să aşteptaţi"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Arată detalii"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Destul"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Previzualizează"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Renunță"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Dimensiune cadru"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Dimensiune fișier"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Octet dimensiuni"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Timp total"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Cadre"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Evenimente"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Sunet"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Tarif/dimensiune"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------- (Bifaţi caseta pentru a redimensiona a sugerat ca)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
-msgstr "<------------- (Bifaţi caseta de a utiliza recomandarea mărimea)"
+msgstr ""
+
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Păstraţi setările _mele"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr ""
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "În_chide fereastră"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Salvaţi în fişier"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insera"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Numărul de ori pentru a insera"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Introduceţi _cu sunet"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Introduceţi _fără sunet"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Deschidere de selecţie"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Numărul de cadre pentru a deschide"
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Redenumiţi Clip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1213,7 +1271,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1222,47 +1280,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Nu trimiteţi informaţiile latime de banda"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Încercaţi această setare dacă aveţi probleme cu obţinerea unui flux de"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Redenumiţi Clip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Alegeţi un director de lucru"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1270,13 +1343,13 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1287,407 +1360,357 @@
 "iniţială a instala astfel încât să puteţi obţine cele mai multe de la "
 "această cerere.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-"\n"
-"Mai întâi de toate, trebuie să alegeţi un director de lucru pentru LiVES.\n"
-"Acest lucru ar trebui să fie un director, cu o multime de spaţiu disponibil "
-"pe disc.\n"
-"Notă, pe multe sisteme, /tmp este ştearsă la închidere, astfel încât aceasta "
-"poate fi inoportună pentru a crea-o în /tmp.\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Redenumiţi Clip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Alegeţi un director de lucru"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nume nou "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Capitol  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "intai"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "ultimul"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "secunde."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "de selecţie."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Director:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Includere subdirectoare"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - File Comentarii (opţional)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Titlu/Nume : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Artist : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Comentarii : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Salvaţi în fişier"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: alegeţi un director"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: alegeţi un fişier"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Revocare/Aruncaţi/Salvare"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Aspect Stergeti"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignoră schimbările"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "Aspect _Sterge"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Salvaţi aspectul"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: recupera layout ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: recupera layout ?"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Selectează Fişier"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"LiVES nu a fost capabil sa scrie un fișier mic la /tmp\n"
-"Asigurați-vă ca aveți permisiunea de scriere în /tmp și încercați din nou.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Acest fişier"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1695,7 +1718,7 @@
 ",\n"
 " - inclusiv aspectul actual - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1705,7 +1728,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1715,20 +1738,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1741,33 +1764,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1775,97 +1798,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Desfac"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Audio restaurarea..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Reface"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Taie"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1874,31 +1897,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1906,7 +1929,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1915,86 +1938,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Inserez"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Inserează"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2002,11 +2025,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2015,7 +2038,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2024,7 +2047,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2033,22 +2056,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2056,93 +2079,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2159,11 +2182,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Dan Telecan https://launchpad.net/~telecan-dan\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2177,21 +2211,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2199,195 +2233,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr ""
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Închide _fereastra"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Curăţă _erori"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "Şterge _afişajele afectate"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Reia"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "întrerut..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pauză"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "reluat..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Păstrează"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2395,28 +2441,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Renunță"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2425,7 +2471,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2433,7 +2479,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2441,7 +2487,7 @@
 "\n"
 "Timpul de înregistrare trebuie să fie mai mare decât 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2456,17 +2502,17 @@
 "Apăsaţi 'Anulare' pentru a anula acţiunea\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2476,19 +2522,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2497,1049 +2543,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
+#: src/gui.c:1109
+msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1084
-msgid "Custom _Tools"
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3547,81 +3569,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3629,7 +3651,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3637,32 +3659,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3670,68 +3692,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3741,53 +3763,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3799,11 +3832,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3811,14 +3844,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3826,30 +3859,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Redenumiţi Clip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3857,66 +3889,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Dimensiune fișier"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3925,16 +3953,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3942,7 +3970,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3950,68 +3978,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4021,22 +4044,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4044,68 +4067,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr ""
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Insera"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Curăţă _erori"
+msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4116,7 +4137,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4128,11 +4149,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4140,46 +4161,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4187,7 +4208,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4199,14 +4220,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4214,19 +4235,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4234,83 +4255,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4319,14 +4340,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4335,7 +4356,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4346,7 +4367,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4355,11 +4376,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4401,11 +4422,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4427,17 +4448,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4445,28 +4467,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4475,7 +4497,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4483,7 +4505,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4491,7 +4513,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4502,7 +4524,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4512,7 +4534,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4520,7 +4542,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4529,13 +4551,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4546,13 +4568,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4562,7 +4584,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4571,7 +4593,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4579,7 +4601,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4587,63 +4609,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4651,14 +4673,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4667,25 +4689,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4694,34 +4716,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4729,11 +4751,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4741,11 +4761,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4753,10 +4771,8 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4765,8 +4781,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4774,10 +4790,8 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4786,8 +4800,8 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4795,15 +4809,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4812,7 +4824,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4821,7 +4833,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4830,14 +4842,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4845,13 +4865,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4861,27 +4881,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4890,14 +4910,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4908,19 +4928,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4928,7 +4948,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4936,7 +4956,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4948,45 +4968,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Bine ati venit la LiVES versiunea %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4995,344 +5013,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr ""
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Includere subdirectoare"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5340,72 +5613,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Refă ultima acțiune"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5415,17 +5687,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5435,32 +5707,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5469,14 +5741,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5486,40 +5751,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5528,11 +5800,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5541,7 +5813,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5551,193 +5823,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: recupera layout ?"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5747,55 +6002,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5804,7 +6059,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5812,231 +6067,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6044,28 +6287,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6074,41 +6317,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6118,27 +6361,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6147,7 +6390,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6157,12 +6400,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6172,7 +6415,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6182,12 +6425,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6195,23 +6438,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6221,55 +6464,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr ""
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr ""
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr ""
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6277,26 +6508,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6304,7 +6546,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6312,7 +6554,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6321,28 +6563,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6354,20 +6603,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6375,790 +6624,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7166,222 +7415,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7392,7 +7633,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7403,89 +7644,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7495,7 +7736,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7503,20 +7744,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7524,15 +7765,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"LiVES nu a putut pentru a capta această imagine\n"
-"\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7542,22 +7781,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7567,43 +7806,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7611,40 +7855,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr ""
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7653,65 +7902,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7761,11 +8014,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7783,64 +8031,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7849,7 +8097,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7857,14 +8105,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7874,7 +8122,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7883,208 +8131,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8094,7 +8344,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8102,587 +8352,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8690,275 +8948,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8966,94 +9216,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9061,7 +9311,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9069,328 +9319,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Pornirea serverului audio pulse..."
+msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9399,7 +9656,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9408,12 +9665,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9434,10 +9691,6 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "Blank _Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Blank frames"
 #~ msgstr "Cadre"
 
@@ -9450,10 +9703,6 @@
 #~ msgstr "Dimensiune cadru"
 
 #, fuzzy
-#~ msgid "Border _Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Brightness _end"
 #~ msgstr "_Ignoră schimbările"
 
@@ -9474,14 +9723,6 @@
 #~ msgstr "_Ignoră schimbările"
 
 #, fuzzy
-#~ msgid "Checkerboard"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Checkerboarding"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Colorize"
 #~ msgstr "Redimensionare"
 
@@ -9510,10 +9751,6 @@
 #~ msgstr "Redimensionare"
 
 #, fuzzy
-#~ msgid "Cycle _Step"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Enhance"
 #~ msgstr "Renunță"
 
@@ -9522,42 +9759,14 @@
 #~ msgstr "Renunță"
 
 #, fuzzy
-#~ msgid "Fade _colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Fade _end"
 #~ msgstr "_Ignoră schimbările"
 
 #, fuzzy
-#~ msgid "Fade _in"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Fade _out"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Fade"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Fina_l frame"
 #~ msgstr "Cadre"
 
 #, fuzzy
-#~ msgid "Flash _colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Frame Calculator"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Frame _Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Frame _height"
 #~ msgstr "Dimensiune cadru"
 
@@ -9614,26 +9823,10 @@
 #~ msgstr "Cadre"
 
 #, fuzzy
-#~ msgid "Hue _end"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Hue _start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Hue change"
 #~ msgstr "_Ignoră schimbările"
 
 #, fuzzy
-#~ msgid "Hue end"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Hue start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Normalize"
 #~ msgstr "Redimensionare"
 
@@ -9643,7 +9836,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Numărul de cadre pentru a deschide"
+#~ msgstr "_Numărul de ori pentru a insera"
 
 #, fuzzy
 #~ msgid "Posterize"
@@ -9658,10 +9851,6 @@
 #~ msgstr "_Redimensionarea tuturor cadrelor"
 
 #, fuzzy
-#~ msgid "S_tart %"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "Saturation _end"
 #~ msgstr "_Ignoră schimbările"
 
@@ -9690,74 +9879,10 @@
 #~ msgstr "Redimensionare"
 
 #, fuzzy
-#~ msgid "Step _Value"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Step per _Frame"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Swirl _start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Swirl s_tep"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Swirl"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Background Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Background colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Cycle Start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_End Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_End amount"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Fade level"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Fade start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Fill colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "_First frame"
 #~ msgstr "Cadre"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "_Frames per second"
 #~ msgstr "secunde."
 
@@ -9766,78 +9891,18 @@
 #~ msgstr "Cadre"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Numărul de cadre pentru a deschide"
+#~ msgstr "_Numărul de ori pentru a insera"
 
 #, fuzzy
 #~ msgid "_Point size"
 #~ msgstr "Dimensiune fișier"
 
 #, fuzzy
-#~ msgid "_Radius end"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Radius start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Radius"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Random colour each frame"
-#~ msgstr "Cadre"
-
-#, fuzzy
-#~ msgid "_Sigma end"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Sigma start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Source Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Start Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Start Value"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Start amount"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Stroke colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Target Colour"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "_Time (seconds)"
 #~ msgstr "secunde."
 
 #, fuzzy
-#~ msgid "_X Start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "_Y Start"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "blank_frames"
 #~ msgstr "Cadre"
 
@@ -9854,22 +9919,10 @@
 #~ msgstr "Redimensionare"
 
 #, fuzzy
-#~ msgid "colour_replace"
-#~ msgstr "Redimensionare"
-
-#, fuzzy
 #~ msgid "enhance"
 #~ msgstr "Renunță"
 
 #, fuzzy
-#~ msgid "fade_in_out"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "gamma_change"
 #~ msgstr "_Ignoră schimbările"
 
@@ -9878,10 +9931,6 @@
 #~ msgstr "Cadre"
 
 #, fuzzy
-#~ msgid "gen_clip_from_image"
-#~ msgstr "Cadre"
-
-#, fuzzy
 #~ msgid "gen_coloured_frames"
 #~ msgstr "Cadre"
 
@@ -9910,26 +9959,6 @@
 #~ msgstr "Redimensionare"
 
 #, fuzzy
-#~ msgid "swirl"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "transition_bwthresh"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "transition_checkerboard"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "transition_fade2"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
-#~ msgid "transition_splice"
-#~ msgstr "_Ignoră schimbările"
-
-#, fuzzy
 #~ msgid "trim_frames"
 #~ msgstr "Cadre"
 
@@ -9941,7 +9970,9 @@
 
 #, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES: alegeţi un fişier"
+#~ msgstr ""
+#~ "LiVES nu a putut pentru a capta această imagine\n"
+#~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was unable to open it."
@@ -9954,17 +9985,3 @@
 #~ msgstr ""
 #~ "LiVES nu a putut pentru a capta această imagine\n"
 #~ "\n"
-
-#, fuzzy
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES: - Insera"
-
-#, fuzzy
-#~ msgid "$error"
-#~ msgstr "Curăţă _erori"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Pornirea serverului audio pulse..."

LiVES-1.6.1.tar.bz2/po/ru.po -> LiVES-2.0.3.tar.bz2/po/ru.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 11:56+0000\n"
-"Last-Translator: Alexey Ivanov <alexey.ivanes@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:41+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +34,22 @@
 "Все переводчики должны прочитать заметки по переводу LiVES на\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr "%s Внимание: %s\n"
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr "%s Критическая ошибка: %s\n"
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr "%s Неисправимая ошибка: %s\n"
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +63,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Спасибо. Для восстановления перезапустите LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -59,7 +75,7 @@
 "В отчете об ошибке, пожалуйста, сообщите о вашей операционной системе, "
 "дистрибутиве, а также версию LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +83,7 @@
 "и другую информацию, как указано ниже:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,163 +93,193 @@
 "чтобы собрать больше информации.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Сохранение сборки.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Масштабирование"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Масштабировать все кадры"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Любой"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "рекомендуемые"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "отключено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "Текущее размещение"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Встроенный"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Настраиваемый"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Тест"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
+"\n"
+"\n"
+"Необходим запуск jackd пользователем. Пожалуйста, убедитесь, что jackd "
+"выполняется  \n"
+"или измените значение <jack_opts> с %s на 16\n"
+"и перезапустите LiVES.\n"
+"\n"
+"Также, вы можете попробовать запустить программу таким образом \"lives -"
+"jackopts 16\" или "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...обнаружен..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...обнаружен..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...обнаружен...\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...НЕ ОБНАРУЖЕН...\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...обнаружен..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...обнаружен..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...обнаружен..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...обнаружен..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...обнаружен..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...обнаружен..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -244,22 +290,48 @@
 "\n"
 "Менеджер интерфейса определен как \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "обнаружено мониторов: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Временный каталог: %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -269,15 +341,15 @@
 "без поддержки jack или pulse audio.\n"
 "Многие аудиофункции будут недоступны.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Скомпилировано с поддержкой jack, отлично!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Скомпоновано с поддержкой pulse audio, замечательно !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -286,7 +358,7 @@
 "Добро пожаловать в LiVES версии %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -295,85 +367,88 @@
 "\n"
 "Синтаксис запуска: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Где: filename - это имя медиафайла или резервной копии файла.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time - время начала filename (в сек.)\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : максимальное количество кадров, которые будут открыты\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts могут быть следующие:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : показать этот текст помощи и выйти\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
+"-tmpdir <tempdir>: использовать другой рабочий каталог (например /var/"
+"ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : автоматическая загрузка сборки <setname>\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : не загружать какую-либо сборку при запуске\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : загрузка без режима восстановления после сбоя\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : загрузка в режиме восстановления после сбоя\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
+"-nothreaddialog  : ничего не делать, сохранено для обратной совместимости\n"
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui: не показывать графический интерфейс\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
-msgstr ""
+msgstr "-nosplash        : не показывать заставку программы\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
-msgstr ""
+msgstr "-noplaywin       : не показывать окно воспроизведения\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : запуск в режиме редактора\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : запуск в режиме multitrack\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : запуск демона OSC на UDP порту <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : не запускать OSC демон\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -381,15 +456,15 @@
 "указать mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox или jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -400,31 +475,31 @@
 "транспорт сервер, 8 = остановить звук когда остановлено видео, 16 = "
 "запустить звуковой jack сервер] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " или sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-devicemap <mapname>          : автоматическая загрузка карты устройств\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : использовать для отладки ошибок (требуется установленный 'gdb')\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Запуск графической оболочки..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -432,25 +507,28 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 "\n"
 "\n"
-"Запрошенная Вами тема не обнаружена. Пожалуйста, проверьте наличие тем в\n"
+"Запрошенная вами тема не найдена. Пожалуйста, убедитесь, что вы темы "
+"установлены в\n"
 "%s/%s.\n"
-"(Возможно, требуется поменять значение <prefix_dir> в файле ~/.lives)\n"
+"(Возможно вам необходимо изменить значение <prefix_dir> в файле %s)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 "\n"
-"LiVES не смогла записать небольшой файл в /tmp\n"
-"Пожалуйста, проверьте ваши права доступа в /tmp и попробуйте ещё раз.\n"
+"LiVES не может выполнить запись небольшого файла в %s\n"
+"Пожалуйста, убедитесь, что у вас есть разрешение на запись в %s и повторите "
+"снова.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -464,55 +542,51 @@
 "Пожалуйста, изучите файл README, входящий в этот пакет\n"
 "перед запуском LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 "\n"
-"LiVES не смогла прочитать файл конфигурации\n"
-"%s/.lives\n"
+"LiVES не может выполнить чтение собственного файл настроек\n"
+"%s\n"
 "\n"
-"Пожалуйста, проверьте ваши права доступа к файлу и попробуйте ещё раз.\n"
+"Пожалуйста, проверьте разрешения файла и повторите снова.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 "\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
+"LiVES не может выполнить запись в собственный файл настроек\n"
+"%s\n"
 "\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
+"Пожалуйста, проверьте разрешения файла и каталога,\n"
+"затем повторите снова.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES не смогла использовать временный каталог\n"
+"Пожалуйста, проверьте параметр <tempdir> в \n"
 "%s\n"
-"\n"
-"Проверьте значение <tempdir> в \n"
-"%s/.lives\n"
-"и попробуйте ещё раз.\n"
+"и повторите снова.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -520,10 +594,13 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES не может загрузить это изображение\n"
 "\n"
+"LiVES не может использовать временный каталог\n"
+"%s\n"
+"\n"
+"%s"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -541,7 +618,7 @@
 "\n"
 "Спасибо.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -551,7 +628,17 @@
 "Для работы LiVES требуется 'mplayer' или 'sox'. Установите любой из этих "
 "пакетов и повторите ещё раз.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+"\n"
+"Для обеспечение работоспособности, LiVES необходимы 'mplayer' и 'sox'. "
+"Пожалуйста, установите их и повторите снова.\n"
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -561,7 +648,7 @@
 "LiVES не обнаружила 'mplayer'. Для полноценного использования LiVES "
 "желательно установить mplayer.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -571,7 +658,7 @@
 "LiVES не обнаружила 'convert'. Для наложения эффектов необходимо установить "
 "convert и image-magick.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -581,7 +668,7 @@
 "LiVES не обнаружила 'composite'. Если вы планируете использовать "
 "композиционные функции, необходимо установить composite и image-magick.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -591,7 +678,7 @@
 "LiVES не обнаружила 'sox'. Некоторые звуковые функции не будут доступны. "
 "Необходимо установить 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -599,68 +686,68 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 "\n"
-"LiVES не обнаружила кодирующих плагинов.\n"
-"Проверьте их наличие в\n"
+"LiVES не может найти надстройки кодеров.\n"
+"Пожалуйста, убедитесь, что они установлены правильно в\n"
 "%s%s%s/\n"
-"Без них Вы не сможете 'Сохранить' видео.\n"
-"Возможно, требуется изменить значение <lib_dir> в ~/.lives\n"
+"При их отсутствии, вы не сможете выполнять 'Сохранение'.\n"
+"Возможно вам понадобится изменить значение <lib_dir> в %s\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Загрузка сборки %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
-msgstr ""
+msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Непригодный аудиоплеер %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Неизвестный%d> %dx%d : %d кадров %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? кадров ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d кадров %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Нет файла>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -668,35 +755,35 @@
 "LiVES не может загрузить это изображение\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Закрыть файл %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Вернуть"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Видео"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Левый звуковой канал"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Правый звуковой канал"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -710,27 +797,12 @@
 "выбран mplayer.\n"
 "Измените параметры просмотра в меню Настройки и повторите ещё раз.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Окно проигрывателя"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Окно проигрывателя"
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -738,14 +810,14 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"Директория с именем\n"
+"Каталог с названием\n"
 "%s\n"
-"уже существует. Вы хотите использовать эту директорию ?\n"
+"уже существует. Вы действительно хотите использовать этот каталог ?\n"
 "\n"
-"(Свободное место = %.2f GB)\n"
+"(Свободно = %s)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -753,14 +825,15 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"Директория с именем\n"
+"Каталог с названием\n"
 "%s\n"
-"уже существует. Вы хотите использовать эту директорию ?\n"
-"\n"
-"(Свободное место = %.2f GB)\n"
+"уже существует.\n"
+"LiVES не имеет разрешения записи в этот каталог или получить сведения о "
+"свободном месте.\n"
+"Пожалуйста, выберите другое расположение.\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -769,13 +842,14 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Создать директорию\n"
+"\n"
+"Создать каталог\n"
 "%s\n"
 "?\n"
 "\n"
-"(Свободное место = %.2f GB)"
+"(Свободно = %s)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -783,12 +857,16 @@
 "%s\n"
 "Please try again and choose a different location.\n"
 msgstr ""
+"\n"
+"LiVES не имеет разрешения записи в этот каталог\n"
+"%s\n"
+"Пожалуйста, повторите снова и выберите другое расположение.\n"
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Имя директории слишком длинное !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -796,7 +874,7 @@
 "LiVES не удалось запустить выбранный вами аудиоплеер!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -806,7 +884,7 @@
 "\n"
 "PULSE AUDIO рекомендуется большинству пользователей"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -814,7 +892,7 @@
 ", но данная версия LiVES была скомпонована без поддержки pulse audio.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -824,11 +902,11 @@
 " Перед тем, как начать пользоваться LiVES, следует установить pulse audio.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio рекомендуется продвинутым пользователям"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -836,7 +914,7 @@
 ", но данная версия LiVES была скомпонована без поддержки jack audio.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -846,7 +924,7 @@
 "LiVES, следует установить jackd.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -859,12 +937,12 @@
 "другим аудиоплеером.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX обычно используется, если ни один из вышеуказанных плееров не работает, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -872,7 +950,7 @@
 "но некоторые аудиофункции не будут работать.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -882,7 +960,7 @@
 "Вам следует установить его, прежде чем запустить LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -890,91 +968,91 @@
 "Плеер MPLAYER рекомендуется использовать исключительно для тестирования.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Выберите аудиоплеер"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Использовать аудиоплеер _pulse"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Использовать аудиоплеер _jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Использовать аудиоплеер _sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Использовать аудиоплеер _mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Далее"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Пропущено"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Пройдено"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Ошибка"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Тестирование настроек"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Проблемы"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES теперь выполнят некоторые тесты базовой конфигурации\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Проверка представлений \"sox\""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Вы должны установить sox для использования всех звуковых эффектов в LiVES"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Проверка возможностей sox для конвертации звука"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
-msgstr ""
+msgstr "Невозможно выделить 176400 байт памяти."
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
-msgstr ""
+msgstr "Невозможно ваыполнить запись: %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
-msgstr ""
+msgstr "Ошибка выполнения команды: %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "Вы должны установить sox_fmt_all или аналогичное"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Проверка представлений для \"mplayer\""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -982,43 +1060,55 @@
 "Вы должны установить mplayer для возможности использовать все видеоэффекты в "
 "LiVES"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Проверка возможностей mplayer для конвертации звука"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Вы должны утановить mplayer с поддержкой pcm/wav"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Проверка возможностей mplayer декодирования в png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Вы можете обновить mplayer на новую версию"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Проверка возможностей mplayer декодирования в jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Вы должны установить mplayer с поддержкой png/alpha или jpeg"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Вы можете добавить поддержку вывода jpeg в mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Проверка для представлений \"convert\""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Установите imageMagick для возможности использовать все рендер-эффекты"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+"\n"
+"\n"
+"    Тип преобразования изображения был изменён на jpeg. Вы можете внести "
+"изменение в Параметры/Декодирование.    \n"
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1030,7 +1120,7 @@
 "    Нажмиет Отмена для выхода и устанвоки всех недостающих компонентов, или "
 "Далее чтобы продолжить    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1040,7 +1130,7 @@
 "\n"
 "Завершение, вы можете выбрать стартовый стандартный интерфейс для LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1051,7 +1141,7 @@
 "LiVES имеет два основных интерфейса и вы можете выбрать любой из них для "
 "запуска.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1061,75 +1151,78 @@
 "\n"
 "Умолчания можно изменить позднее в меню Предпочтения.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
-msgstr ""
+msgstr "Запустить в режиме фрагментного редактирования"
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
+"Наилучший вариант для задач простого редактирования, а также для VJ`ев\n"
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
-msgstr ""
+msgstr "Запустить в режиме с _несколькими дорожками"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
+"Наилучший вариант для редактирования сложных задач с несколькими "
+"фрагментами.\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
-msgstr ""
+msgstr "_Завершить"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Разрешить LiVES добавлять расширение _файла"
 
-#: src/interface.c:42
-#, fuzzy, c-format
+#: src/interface.c:35
+#, c-format
 msgid "Let LiVES set the _file extension (.%s)"
-msgstr "Разрешить LiVES добавлять расширение _файла"
+msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Устранить чересстрочную развёртку"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "Если включить, чересстрочная развёртка будет устранена при импорте."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Кликните сюда для _Предпросмотра выбранного видео, графического или "
 "звукового файла"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Кликните сюда для _Предпросмотра выбранного звукового файла"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Кликните сюда для _Предпросмотра видео"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Обработка..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1143,8 +1236,8 @@
 "\n"
 "Не забудьте отключить эффекты (ctrl-0) позже!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1152,111 +1245,114 @@
 "\n"
 "Подождите"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Показать подробности"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Достаточно"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Предпросмотр"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
-msgstr ""
+msgstr "Прио_становить"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr "LiVES: - %s"
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Формат"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Размер кадра"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Размер файла"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Размер в байтах"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Общая продолжительность"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Кадры"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "События"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Звук"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Поток/размер"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Правый звуковой канал"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Настройки кодирования"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
-"<------------- (Установить галочку, чтобы изменить размер так, как "
-"предложено)"
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
-"<------------- (Установить галочку, чтобы воспользоваться рекомендуемыми "
-"размерами)"
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Сохранить _мои настройки"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Использовать _рекомендованные настройки"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1264,76 +1360,75 @@
 "Больше _не показывать это предупреждение\n"
 "(можно вернуть обратно в меню Настройки/Предупреждения)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Показать _подробности"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Сохранить в файл"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Вставить"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Количество раз для вставки"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Вставить по совпадению звука"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Вставить _до выделенного"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Вставить содержимое буфера обмена до выделенного кадра"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Вставить _за выделеннием"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Вставить содержимое буфера обмена после выделенных кадров"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Вставить _со звуком"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Вставить бе_з звука"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Открыть выбранное"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Время начала проигрывания выбранных кадров (в сек.)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Число кадров, которые будут открыты"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
+
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Открыть путь"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Переименовать клип"
+msgstr "LiVES: - Oткрыть фрагмент из Youtube"
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1350,7 +1445,7 @@
 "Потоки\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1358,48 +1453,73 @@
 "Please make sure you have the latest version of that tool installed.\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"Чтобы открыть фрагмент из Youtube, первоначально LiVES загрузит его "
+"используя youtube-dl.\n"
+"Пожалуйста, убедитесь, что у вас установлена последняя версия этой "
+"программы.\n"
+"\n"
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
+"Введите веб-адрес фрагмента ниже.\n"
+"Например: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
+"\n"
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL: "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL: "
+msgstr "Веб-ссылка Youtube : "
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Не посылать сведения о пропускной способности"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Попробуйте эту настройку, если возникли проблемы с получением потока"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
-msgstr ""
+msgstr "Сохранить в _каталог : "
+
+#: src/interface.c:1331
+msgid "Download _File Name : "
+msgstr "Имя загружаемого _файла : "
 
-#: src/interface.c:1841
-msgid "Download Directory..."
+#: src/interface.c:1336
+msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1864
-msgid "Download _File Name : "
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Переименовать клип"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Введите имя набора"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1878
-msgid ".webm"
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Выберите рабочий каталог"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1412,7 +1532,7 @@
 "LiVES напомнит вам о необходимости сохранить набор отрезков, когда вы "
 "попытаетесь выйти.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1421,247 +1541,213 @@
 "отрезков.\n"
 "Оно так же будет использовано для имени проекта.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
+"Добро пожаловать в LiVES !\n"
+"Мастер ознакомит вас с начальными настройками,\n"
+"таким образом вы сможете полноценно пользоваться программой.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Переименовать клип"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Введите имя набора"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Введите имя набора"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
 msgstr ""
+"\n"
+"Первоначально, вам необходимо выбрать рабочий каталог для LiVES.\n"
+"Это должен быть каталог с достаточным свободным местом.\n"
 
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Новое имя "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Имя набора "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
-msgstr ""
+msgstr "По умолчанию"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Дополнительно"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
-msgstr ""
+msgstr "LiVES:- Выберите устройство ввода"
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
-msgstr ""
+msgstr "Выберите устройство ввода"
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Загрузить трек с CD"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Выбрать на DVD название или главу"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Выбрать на VCD название"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Изменить максимальное количество видимых треков"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
-msgstr ""
+msgstr "LiVES:- Сведения об устройстве"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Трек для загрузки (из %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Название DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Название VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Максимальное количество показываемых треков"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
-msgstr ""
+msgstr "Устройство:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Глава  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
-msgstr ""
+msgstr "Канал  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "ID аудио  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
-msgstr ""
+msgstr "Использовать ширину, высоту и кадров/с. по умолчанию"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
-msgstr ""
+msgstr "Ширина"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
-msgstr ""
+msgstr "Высота"
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Выходной формат"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr "Формат _вывода"
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Усилить звук"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Приглушить звук"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Усилить звук на протяжении  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "первых"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Приглушить на протяжении  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "последних"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "секунд."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "выделенных кадров."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Воспроизвести музыку вразброс"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Количество запрошенных дорожек:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Каталог:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Включая подкаталоги"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Минимальный размер файла (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Максимальный размер файла (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "выделения"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Комментарии к файлу (не обязательно)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Название/Имя : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Автор/Создатель : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Комментарии : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
-msgstr ""
+msgstr "_Параметры"
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "_Сохранить в файл"
+msgstr "Сохранить _субтитры в файл"
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
-msgstr ""
+msgstr "Файл субтитров"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
+msgstr "Обзор…"
+
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: выберите каталог"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: выберите файл"
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Отменить/Сбросить изменения/Сохранить"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1671,7 +1757,7 @@
 "Текущая схема размещения не была сохранена.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1681,7 +1767,7 @@
 "Текущая схема размещения была изменена при предыдущем сохранении.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1691,7 +1777,7 @@
 "Текущий набор отрезков может быть сохранён.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1699,7 +1785,7 @@
 "Текущий набор отрезков не был сохранён.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1707,62 +1793,62 @@
 "Макет не был сохранён.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "Название набора клипов"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Автоматически загрузить в следующий раз"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Очистить макет"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Игнорировать изменения"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Удалить набор клипов"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Удалить макет"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Сохранить макет"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Сохранить набор клипов"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: восстановить размещение ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1772,60 +1858,57 @@
 "LiVES обнаружил многодорожечное размещение в прошлом сеансе работы.\n"
 "Хотите восстановить и использовать его ?\n"
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - Настройки кодирования"
+msgstr "LiVES: - Параметры восстановления диска"
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Сбросить значения"
+msgstr "По _умолчанию"
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
-msgstr ""
+msgstr "_Принять"
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Сохранить сборку как %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Выберите файл"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
-msgstr ""
+msgstr "Пожалуйста, введите правильную ссылку для загрузки.\n"
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Загрузка сборки %s..."
+msgstr "Загрузка %s в %s..."
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr ""
+msgstr "Загрузка фрагмента"
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1833,20 +1916,21 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 "\n"
-"LiVES не смогла записать небольшой файл в /tmp\n"
-"Пожалуйста, проверьте ваши права доступа в /tmp и попробуйте ещё раз.\n"
+"LiVES не может загрузить фрагмент.\n"
+"Пожалуйста, проверьте правильность ссылки, а также, \n"
+" установлена ли последняя версия youtube-dl.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Этот файл"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1856,7 +1940,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1866,14 +1950,18 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
+"Изменения внесённые в фрагмент не были сохранены или не была создана "
+"резервная копия.\n"
+"\n"
+"Вы действительно хотите закрыть его ?"
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1881,7 +1969,7 @@
 "\n"
 "Неправильный файл проекта.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1903,33 +1991,33 @@
 "название или отказаться от этого.\n"
 "После чего вы можете импортировать новый проект.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Импортировать проект %s как сборку %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Импорт проекта"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Экспорт проекта %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Экспорт проекта"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Восстановить файл .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Сохранить резервную копию в файл .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Восстановить файл .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1941,90 +2029,90 @@
 "Сборка будет удалена с диска.\n"
 "Вы уверены ?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Удаление сборки..."
+msgstr "Удаление группы %s..."
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Удаление сборки..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Удалить сборку"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Сборка %s была полностью удалена с диска.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Вставить тишину"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Отмена операции"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Восстановление аудио..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Очищение изображений кадра"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Сейчас длина видео составляет %d кадров при %.3f кадрах в секунду.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Буфер обмена был повторно выбран к кадрам %d.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Возврат операции"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Копирование кадров в буфер обмена: с %d по %d%s..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Извлечение кадров из клипа"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
-msgstr ""
+msgstr "Вставка %d кадров в новый фрагмент %s..."
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Вставить"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
-msgstr ""
+msgstr "...добавлен звук..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2034,7 +2122,7 @@
 "Пожалуйста установите 'convert' из пакета Image-magick, и затем "
 "перезапустите LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2048,7 +2136,7 @@
 "Выберите все кадры и обратитесь к функции \n"
 "'Trim Audio' в меню Аудио."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2057,7 +2145,7 @@
 "соответствуют.\n"
 "Пожалуйста установите 'sox', и попробуйте снова."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2067,7 +2155,7 @@
 "Вставка кадров приведет к сдвигу в размещении мультитрековых дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2077,11 +2165,11 @@
 "Вставка звука приведет к сдвигу в размещении мультитрековых дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Повторный выбор буфера обмена звука"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2093,7 +2181,7 @@
 "LiVES не может повторно выбрать буфер обмена звука. \n"
 "Буфер обмена звука был очищен.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2102,30 +2190,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Будут вставлены %d%s кадров из буфера обмена..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Вставка"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Вставка %d отрезка из буфера обмена%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Вставка %d кадров из буфера обмена%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2135,7 +2223,7 @@
 "Удаление всех файлов приведет к закрытию файла.\n"
 "Вы уверены ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2146,8 +2234,8 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2158,7 +2246,7 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2169,7 +2257,7 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2180,20 +2268,20 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Удаление кадров с %d по %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Удаление"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2203,7 +2291,7 @@
 "\n"
 "Выбранное заблокировано.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2211,11 +2299,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Запись отменена.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2228,7 +2316,7 @@
 "Отчеты плагина '%s':\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2241,7 +2329,7 @@
 "Невозможно найти метод 'init' в плагине %s.\n"
 "Плагин, возможно, поврежден или неправильно установлен."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2254,22 +2342,22 @@
 "\n"
 "Пожалуйста нажмите \"Отмена\", если вам это не нужно.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Сохранение сборки %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Загрузка клипов из сборки %s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d клипы были восстановлены из сборки (%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2281,41 +2369,37 @@
 "этой машине.\n"
 "Нажмите OK для запуска.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Очистка места на диске..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Очистка места на диске"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d МБ диска было восстановлено.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
-msgstr ""
+msgstr "Восстановление частоты кадров и значений кадров..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Внешний: %s\n"
-"Внутренний: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2323,7 +2407,7 @@
 "\n"
 "  Открывание..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2332,7 +2416,7 @@
 "\n"
 "(%d виртуальный)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2341,7 +2425,7 @@
 "\n"
 "(%d декодированный)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2350,7 +2434,7 @@
 "\n"
 "  %.2f сек."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2358,23 +2442,23 @@
 "\n"
 "  Неизвестно"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "неподписан"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "подписан"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2383,8 +2467,7 @@
 "  %d Гц %d бит\n"
 "%s %s"
 
-#: src/callbacks.c:5632
-#, fuzzy
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2400,28 +2483,29 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
-"Данная программа является свободной; вы можете \n"
-"ее переиздавать и/или изменять в соответствии с \n"
-"лицензией GNU General Public License опубликованной\n"
-"Free Software Foundation; под версией 3 Лицензии, или\n"
-"(на ваш выбор) под более поздней.\n"
-"\n"
-"Эта программа распространяется для использования,\n"
-"но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; \n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; также без гарантий ПРИБЫЛЬНОСТИ\n"
-"или СОХРАННОСТИ ЗДРОВОЬЕ В ОПРЕДЕЛЕННОЙ ОБЛАСТИ. Более\n"
-"подробно смотрите в GNU General Public License.\n"
-"\n"
-"Вы должны получить копию GNU General Public License\n"
-"вместе с данной программой; если это не так, напишите в Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Видеоредактор и VJ-студия."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Aleksej Penkov https://launchpad.net/~aleksej-penkov\n"
+"  Alexander.Zagradsky https://launchpad.net/~alzet\n"
+"  Alexey Ivanov https://launchpad.net/~alexey-ivanov\n"
+"  Eugene Marshal https://launchpad.net/~lowrider\n"
+"  Georgiy https://launchpad.net/~g-trofimof\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Pavel798 https://launchpad.net/~moltograndioso\n"
+"  Sergey Sedov https://launchpad.net/~serg-sedov"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2435,7 +2519,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2445,14 +2529,18 @@
 "\n"
 "Вам нужно установить mplayer для предварительного просмотра этого файла.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
+"\n"
+"\n"
+"Чтобы выполнить предварительный просмотр этого файла, установите mplayer или "
+"imageMagick.\n"
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2465,197 +2553,212 @@
 "Вы уверены, что хотите продолжить ?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Открывание звука %s, тип %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Открывание звука"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Отмена"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Новый звук: %d Гц %d канал(ов) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Наложение звука"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Новый звук"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d кадров достаточно !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Вывод отладки кодировщика"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Полноэкранное воспроизведение"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Выключить полноэкранное воспроизведение"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Двойной размер (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Стандартный размер (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Скрыть окно проигрывателя (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Показать окно проигрывателя (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Проигрывать в отдельном окне (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Режим непрывного выполнения цикла выключен (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Режим непрывного выполнения цикла включен (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Громкость звука (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Включить звук (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Выключить звук (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Изменение буфера обмена..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Изменение буфера обмена"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
-msgstr ""
+msgstr "LiVES: Загрузить субтитры из..."
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
-msgstr ""
+msgstr "Загружен файл субтитров: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
-msgstr ""
+msgstr "Субтитры были стёрты.\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Выбрать звуковой файл"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Пожалуйста, выберите ваше устройство для проигрывания CD в Инструменты | "
 "Предпочтения | Прочее\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Открыть CD трэк %d из %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CD трэк %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Открытие CD трэка..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Ошибка загрузки CD трэка\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Выбор трэков"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "ошибка размещения"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Закрыть окно (_W)"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Убрать ошибки (_E)"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "Удалить затронутые слои размещения (_D)"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Продолжить"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
+"\n"
+"Приостановлено\n"
+"(Щёлкните Возобновить, чтобы продолжить процесс)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "приостановлено..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Приостановить"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "возобновление..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Оставить"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2667,30 +2770,28 @@
 "(кликните Оставить для сохранения того, что вам нужно и остановки)\n"
 "(кликните Продолжить для возобновления процесса)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Стоп"
+msgstr "Остановить"
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Выбранный кадр"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Сохранить кадр как %s..."
+msgstr "_Сохранить кадр как..."
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
-msgstr ""
+msgstr "Звук опережает видео на %.4f c. с кадра %d с частотой кадров/с. %.4f\n"
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2699,7 +2800,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2711,7 +2812,7 @@
 "Вы должны установить \"xwininfo\" перед использованием этой опции\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2719,7 +2820,7 @@
 "\n"
 "Время записи должно быть не нулевым.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2733,11 +2834,11 @@
 "Кликните 'Отмена' чтобы отказаться\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Было выпущено внешнее окно.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2745,7 +2846,7 @@
 "Кликните на окне для его захвата\n"
 "Нажмите 'q' для остановки записи"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2760,19 +2861,19 @@
 "Остановить или 'q' для выхода.\n"
 "(По-умолчанию используется %.3f кадров в секунду.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES не может захватить это окно. Извините.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Экспортировать выбранный звук как..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Экспортировать звук как..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2786,81 +2887,86 @@
 "Кликните 'OK' для экспорта с новой скоростью, или 'Отмена' для экспорта "
 "оригинала.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Экспорт звука кадров с %d по %d как %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Экспорт звука как %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Экспортирование звука"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Добавить звуковой файл..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Добавление звукового файла %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Добавление звука"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Добавить звук"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Удаление звука с %.2f по %.2f секунды..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Удаление/Добавление звука"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Изменение входящего звука"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Изменить входящий звук"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Изменение исходящего звука"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Изменить исходящий звук"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Изменение звука..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2870,975 +2976,941 @@
 "Удаление всего звука приведет к закрытию файла.\n"
 "Вы уверены ?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Удаление всего звука..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Удаление звука с %.2f по %.2f секунды..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Удаление звука"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Удалить звук"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Записать новый звук"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Вставка тишины с %.2f по %.2f секунды..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Вставка тишины"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Удалить %d схему(ы) размещения...вы уверены ?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Файл графики не найден: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Замещение"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Заменить буфер обмена [ %d кадров ] выделенным [ %d кадров ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Выровнить начало (_S)"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Выровнить конец (_E)"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "Вставить кадры (_I)"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "Удалить кадры (_D)"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Переходный метод:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Слияние сделано.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Пользовательские"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "Открыть файл/директорию (_O)"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "_Последние файлы..."
+msgstr "O_ткрыть часть файла..."
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Открыть размещение/поток (_L)..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
-msgstr ""
+msgstr "Oткрыть фрагмент из _Youtube..."
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "Импортировать выборочно с dvd/vcd (_d)..."
+msgstr "Импортировать из _DVD/VCD..."
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "Импортировать выборочно с dvd (_d)"
+msgstr "Импортировать из _DVD"
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "Импортривать с устройства (_I)"
+msgstr "Импортировать из _VCD"
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "Импортривать с устройства (_I)"
+msgstr "_Импортировать через интерфейс Firewire"
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
-msgstr ""
+msgstr "Импортировать с устройства _Firewire (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
-msgstr ""
+msgstr "Импортировать с устройства _Firewire (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
-msgstr ""
+msgstr "_Добавить веб-камеру или тв-карту..."
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Последние файлы..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
-msgstr ""
+msgstr "Закрыть/Сохрани_ть все фрагменты"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
-msgstr ""
+msgstr "_Кодировать фрагмент как..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Кодировать выбранное как (_S)..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "Закрыть текущий клип (_C)"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "Сохранить клип как *.lv1 (_B) ..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "Восстановить клип из *.lv1 (_R) ..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Кодировать/Загружать/Сохранять со звуком (_w)"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
-msgstr ""
+msgstr "Автоматическая загрузка субтитров"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Очистить место на диске (_u)"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Правка"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK режим"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
-msgstr ""
+msgstr "_Копировать выделенное"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Вырез_ать выбора"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
-msgstr ""
+msgstr "_Вставить из буфера обмена..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Вставить как _новое"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
-msgstr ""
+msgstr "_ Объединить содержимое буфера обмена с выделенным..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "Удалить _выделение"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
-msgstr ""
+msgstr "Отделить _видео от звука"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Выбрать..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
-msgstr ""
+msgstr "Выделить _все кадры"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Обратить выделение"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Играть"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Воспроизвести все"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
-msgstr ""
+msgstr "Во_спроизвести выделенное"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
-msgstr ""
+msgstr "Воспроизвести содержимое _буфера обмена"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Стоп"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Полный экран"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Удвоенный размер"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
-msgstr ""
+msgstr "Воспроизвести в _отдельном окне"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Приглушить"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
-msgstr ""
+msgstr "Показать субтитры"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Воздейст_вие"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
-msgstr ""
+msgstr "Эффекты применены к текущему выделению."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Инструменты"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
-msgstr ""
+msgstr "_Изменить скорость воспроизведения/сохранения"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Утилиты"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Создать"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Создать"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
-msgstr ""
+msgstr "Загрузка надстроек готовых эффектов"
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
-msgstr ""
+msgstr "Загрузить _субтитры из файла..."
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
-msgstr ""
+msgstr "Стереть субтитры"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Параметры..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Аудио"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
-msgstr ""
+msgstr "Загрузить _новый звуковой фрагмент..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
-msgstr ""
+msgstr "Загрузить дорожку _компакт-диска"
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
-msgstr ""
+msgstr "И_звлечь компакт-диск"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
-msgstr ""
+msgstr "в новый _фрагмент..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
-msgstr ""
+msgstr "_Экспортировать звук..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
-msgstr ""
+msgstr "Экспортировать _выделенный звук..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
-msgstr ""
+msgstr "Экспортировать _все звуковые данные..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
-msgstr ""
+msgstr "_Добавить звук..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
-msgstr ""
+msgstr "_Удалить звук..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
-msgstr ""
+msgstr "Удалить _выделенные звуковые данные..."
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
-msgstr ""
+msgstr "Удалить _все звуковые данные"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
-msgstr ""
+msgstr "Вставить в выделенное фрагмент _без звука"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Информация"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
-msgstr ""
+msgstr "Показать сведения _о файле"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
-msgstr ""
+msgstr "Показать/_изменить описание файла"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
-msgstr ""
+msgstr "Показать сведения _буфера обмена"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
-msgstr ""
+msgstr "Показать _сообщения"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
-msgstr ""
+msgstr "_Фрагменты"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
-msgstr ""
+msgstr "_Переименовать текущий фрагмент в меню..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Дополнительные"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Отправить LiVES поток..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "Импортировать проект *.lv2 (_I) ..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "Экспортировать проект *.lv2 (_x)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Сбросить все скорости воспроизведения и позиции"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/джойстик Интерфейс"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/джойстик учащегося..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Развлечение"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Никакого"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Руководства (открывается в браузере)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_жертвовать к проекту !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Электронная почта автора"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "_Сообщить об ошибке"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
-msgstr ""
+msgstr "Предложить новую _возможность"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
-msgstr ""
+msgstr "Предложить перевод программы"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
-msgstr ""
+msgstr "Устранение _неполадок"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_О Программе"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Воспроизвести все (P)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Остановка воспроизведения (Q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
-msgstr ""
+msgstr "Воспроизвести выделенное (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Объём"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Громкость звука (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
-msgstr ""
+msgstr "Воспроизвести с замедлением (ctrl-стрелка вниз)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
-msgstr ""
+msgstr "Воспроизвести с ускорением (ctrl-стрелка вверх)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
-msgstr ""
+msgstr "Показать сведения о фрагменте (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
-msgstr ""
+msgstr "Скрыть эту панель инструментов"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
-msgstr ""
+msgstr "     Скорость воспроизведения видео (кадры в секунду)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Первый кадр"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Последний кадр"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
+"    Нажмите 'q', чтобы остановить запись. НЕ ПЕРЕКРЫВАЙТЕ ОКНО "
+"ВОСПРОИЗВЕДЕНИЯ !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Свободная"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Начать"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Конец"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Указатель"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Перемотать назад"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Слушать все"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
-msgstr ""
+msgstr "Воспроизвести выделенное"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
-msgstr ""
+msgstr "Включить или выключить цикл"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
-msgstr ""
+msgstr "Начать _запись"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
-msgstr ""
+msgstr "Остановить _запись"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
-msgstr ""
+msgstr "Скрыть окно воспроизведения"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
-msgstr ""
+msgstr "Показать окно воспроизведения"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
-msgstr ""
+msgstr "%.2f ЭБ"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
-msgstr ""
+msgstr "%.2f ПБ"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
-msgstr ""
+msgstr "%.2f ТБ"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
-msgstr ""
+msgstr "%.2f ГБ"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
-msgstr ""
+msgstr "%.2f МБ"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
-msgstr ""
+msgstr "%.2f КБ"
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
-msgstr ""
+msgstr "%d байт"
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Очистка буфера обмена"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3846,81 +3918,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3928,7 +4000,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3936,32 +4008,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3969,68 +4041,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
-msgstr ""
+msgstr "Видео [открытие...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
-msgstr ""
+msgstr "Видео [%.2f с.]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Не определена)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Без видео)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Нет звука)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
-msgstr ""
+msgstr "моно [открытие...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
-msgstr ""
+msgstr "моно [%.2f с.]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4039,54 +4111,70 @@
 "\n"
 "Overwrite ?\n"
 msgstr ""
+"\n"
+"%s\n"
+"уже существует.\n"
+"\n"
+"Заменить ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Отменить %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "По_вторить %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Выбор------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Открытие %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
-msgstr ""
+msgstr " без звука"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
-msgstr ""
+msgstr "Открытие звука для %s"
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4097,20 +4185,33 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
+"\n"
+"В настоящее время LiVES не оптимизирован для работы с файлами больших "
+"размеров.\n"
+"На данный момент рекомендуется начать с небольшого файла или использовать "
+"параметр 'Открыть выбор файла'.\n"
+"(Размер файла=%s)\n"
+"\n"
+"Вы действительно хотите продолжить ?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - Пожалуйста, будьте терпеливы."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to extract either video or audio.\n"
 "Please check the terminal window for more details.\n"
 msgstr ""
+"\n"
+"\n"
+"LiVES не может извлечь видео или звук.\n"
+"Для получения дополнительных сведений, пожалуйста, обратитесь к окну "
+"терминала.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4120,7 +4221,7 @@
 "\n"
 "Вам может потребоваться установка MPlayer, чтобы открыть этот файл.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4128,32 +4229,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Изменение звука..."
+msgstr "Добавление изображения..."
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
-msgstr ""
+msgstr "Субтитры сохранены как %s\n"
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Сохранить кадр как %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Сохранить кадр как %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Переименовать клип"
+msgstr "LiVES: Сохранить фрагмент как..."
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4161,67 +4259,65 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "выделения"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (без звука)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
-msgstr ""
+msgstr "Сохранение [может занять некоторое время]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
+"\n"
+"\n"
+"Ошибка кодера - готовый файл не был создан !\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "Очистка буфера обмена"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Размер файла"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
-msgstr ""
+msgstr "запись прервана предварительным просмотром.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
-msgstr ""
+msgstr "запись прервана из-за воспроизведения данных буфера обмена.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4230,16 +4326,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Безымянный_%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4247,7 +4343,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4255,68 +4351,65 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
+"Скорость воспроизведения была выставлена со значением %.3f кадров/с. для "
+"соответствия звуку.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
-msgstr ""
+msgstr " - Описание: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
-msgstr ""
+msgstr "Резервное копирование %s в %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Резервное сохранение"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
-msgstr ""
+msgstr "Восстановление %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Восстановление файлов"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4324,95 +4417,99 @@
 "The file %s is corrupt.\n"
 "LiVES was unable to restore it.\n"
 msgstr ""
+"\n"
+"\n"
+"Файл %s повреждён.\n"
+"LiVES не может восстановить его.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
 "RECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %ld GB !\n"
 "Record stop level can be set in Preferences.\n"
 msgstr ""
+"\n"
+"ЗАПИСЬ БЫЛА ПРИОСТАНОВЛЕНА, ТАК КАК СВОБОДНОЕ МЕСТО НА НА %s МЕНЕЕ %ld ГБ !\n"
+"Ограничение записи с последующей остановкой может быть назначено в "
+"Параметрах.\n"
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Очистка места на диске"
+msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr ""
+msgstr " _Дополнительные настройки >>"
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
-msgstr ""
+msgstr "LiVES: - Внимание !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "предупреждение"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
-msgstr ""
+msgstr "LiVES: - Вопрос"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
-msgstr ""
+msgstr "вопрос"
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Выберите цвет"
+msgstr "LiVES: - Ошибка файла"
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Убрать ошибки (_E)"
+msgstr "Ошибка файла"
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_О Программе"
+msgstr "Пре_рвать"
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
-msgstr ""
+msgstr "_Повторить"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4423,7 +4520,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4435,66 +4532,75 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to perform this operation due to unsufficient memory.\n"
 "Please try closing some other applications first.\n"
 msgstr ""
+"\n"
+"\n"
+"LiVES не может выполнить эту операцию, так как недостаточно памяти.\n"
+"Пожалуйста, попробуйте закрыть другие открытые приложения.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
-msgstr ""
+msgstr "Выполнение было приостановлено."
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
+"\n"
+"%s%d%% готово. Оставшееся время: %u с.%s\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
 "Sorry, LiVES can only open %d files at once.\n"
 "Please close a file and then try again."
 msgstr ""
+"\n"
+"Извините, но LiVES позволяет открывать только %d файлов за раз.\n"
+"Пожалуйста, закройте файл и затем попробуйте снова."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4505,15 +4611,22 @@
 "\n"
 "Please make sure you can write to this directory."
 msgstr ""
+"LiVES не может выполнить запись во временный каталог.\n"
+"\n"
+"Текущий временный каталог:\n"
+"\n"
+"%s\n"
+"\n"
+"Пожалуйста, проверьте разрешения на запись в этот каталог."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4521,103 +4634,110 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
 "\n"
 "Due to restrictions in the %s format\n"
 msgstr ""
+"\n"
+"\n"
+"В связи с ограничениями в формате %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
+"LiVES рекомендует следующие настройки:\n"
+"\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
-msgstr ""
+msgstr "Использовать частоту звука %d Гц%s%s\n"
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
+"\n"
+"Возможно вы захотите:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
-msgstr ""
+msgstr "изменить размер видео на %d x %d пикселей\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4626,14 +4746,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4642,7 +4762,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4653,7 +4773,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4662,11 +4782,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4708,11 +4828,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4734,17 +4854,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
-msgstr ""
+msgstr "Журнал сообщений"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4752,28 +4873,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4782,7 +4903,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4790,7 +4911,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4798,7 +4919,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4808,8 +4929,15 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
+"\n"
+"Исходный файл\n"
+"%s\n"
+"не найден.\n"
+"Если этот файл был перемещён, нажмите 'OK', чтобы просмотреть новое "
+"расположение.\n"
+"В противном случае, нажмите Отмена, чтобы пропустить загрузку этого файла.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4818,8 +4946,13 @@
 "%s\n"
 "The clip could not be loaded.\n"
 msgstr ""
+"\n"
+"\n"
+"LiVES не может найти необходимую надстройку декодера для фрагмента\n"
+"%s\n"
+"Фрагмент не может быть загружен.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4827,7 +4960,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4836,13 +4969,16 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
+"\n"
+"Невозможно подключиться к серверу jack. Пожалуйста, запустите jack перед "
+"запуском LiVES\n"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4852,14 +4988,23 @@
 "\n"
 "%s\n"
 msgstr ""
+"\n"
+"Также вы можете попробовать запустить lives таким образом:\n"
+"\n"
+"\"lives -jackopts 16\", или\n"
+"\n"
+"%s\n"
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
+"\n"
+"Также вы можете перезапустить LiVES и выбрать другой музыкальный "
+"проигрыватель.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4869,7 +5014,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4878,94 +5023,119 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
 "Either close some other applications, or reduce the undo memory\n"
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
+"\n"
+"LiVES не может зарезервировать необходимое количество памяти для функции "
+"отмены в режиме нескольких дорожек.\n"
+"Или закройте некоторые приложения, или уменьшите количество памяти для "
+"функции отмены,\n"
+"используя Параметры/Несколько дорожек/Память функции отмены\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
 "You may need to increase the undo memory\n"
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
+"\n"
+"Недостаточно памяти для функции отмены.\n"
+"Вам необходимо увеличить количество памяти для функции отмены,\n"
+"используя Параметры/Несколько дорожек/Память функции отмены\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
+"\n"
+"LiVES не может зарезервировать достаточное количество памяти для буфера "
+"функции отмены в режиме нескольких дорожек.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
-msgstr ""
+msgstr "или введите меньшее значение.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
+"Попробуйте в редакторе фрагментов, а также попробуйте закрыть некоторые "
+"открытые приложения\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
-msgstr ""
+msgstr "Попробуйте закрыть некоторые открытые приложения\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
+"\n"
+"\n"
+"Частота звука должна превышать 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
 "and may take a long time to display.\n"
 "Are you sure you wish to view it ?\n"
 msgstr ""
+"\n"
+"Список событий будет очень объёмный\n"
+"и может занять длительное время для отображения.\n"
+"Вы действительно хотите просмотреть его ?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
+"\n"
+"\n"
+"Чтобы использовать эту возможность, необходимо установить 'dvgrab'.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4973,26 +5143,31 @@
 "the \"jack\" or the \"pulse audio\" audio player.\n"
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
+"\n"
+"\n"
+"Запись звука возможно только при использовании\n"
+"звукового проигрывателя \"jack\" или \"pulse audio\".\n"
+"Вам необходимо назначить это в Сервис/Параметры/Воспроизведение.\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5001,34 +5176,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "отменена.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "сбой.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "Ошибка в файле. Ошибка.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
-msgstr ""
+msgstr "Дополнительные сведения: %s\n"
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5037,14 +5212,13 @@
 "%s%s%s"
 msgstr ""
 "\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
+"Произошла неполадка в LiVES во время:\n"
+"%s\n"
+"Пожалуйста, проверьте систему на ошибки.\n"
+"%s%s%s"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5052,15 +5226,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5068,29 +5236,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES не смогла прочитать файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Пожалуйста, проверьте ваши права доступа к файлу и попробуйте ещё раз.\n"
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5098,29 +5255,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES не смогла прочитать файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Пожалуйста, проверьте ваши права доступа к файлу и попробуйте ещё раз.\n"
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5128,19 +5274,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5149,7 +5289,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5158,7 +5298,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5167,19 +5307,25 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 "\n"
-"\n"
-"Сборка будет удалена с диска.\n"
-"Вы уверены ?\n"
+"Прервать и выйти немедленно из LiVES\n"
+"Вы действительно хотите выйти ?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5187,13 +5333,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5202,28 +5348,41 @@
 "- Check if this device is in use by another program.\n"
 "- Check if the device actually exists.\n"
 msgstr ""
+"\n"
+"Устройство %s используется или недоступно.\n"
+"- Проверьте разрешения устройства\n"
+"- Проверьте, не используется ли устройство другой программой.\n"
+"- Проверьте, имеется ли само устройство.\n"
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
+"\n"
+"Этот файл уже имеет загруженные субтитры.\n"
+"Вы действительно хотите заменить существующие субтитры ?\n"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
+"\n"
+"В настоящее время LiVES поддерживает только субтитры формата .srt и .sub.\n"
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
+"\n"
+"Стереть все субтитры из этого фргамента.\n"
+"Вы действительно хотите стереть ?\n"
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5231,15 +5390,23 @@
 "Click Cancel to set another file name\n"
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
+"\n"
+"LiVES не распознал тип файла субтитров \"%s\".\n"
+"Щёлкните Отмена, чтобы назначить другое имя файла\n"
+"или OK, чтобы продолжить и сохранить как тип \"%s\"\n"
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
+"\n"
+"Вы действительно хотите переместить текущие группы фрагментов в новый "
+"каталог ?\n"
+"(Если не уверены, щёлкните Да)\n"
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5249,20 +5416,30 @@
 "continue\n"
 "."
 msgstr ""
+"\n"
+"Внимание - группа %s\n"
+"используется другой копией LiVES.\n"
+"Настоятельно рекомендуется закрыть другую копию, перед нажатием на кнопку "
+"продолжения - OK\n"
+"."
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
+"\n"
+"Устройства ввода видео не найдены.\n"
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
+"\n"
+"Все устройства ввода видео уже используются.\n"
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5270,7 +5447,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5278,7 +5455,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5288,47 +5465,62 @@
 "\n"
 "File -> Clean up Diskspace\n"
 msgstr ""
+"\n"
+"Добро пожаловать в LiVES версии %s\n"
+"\n"
+"После обновления, *настоятельно* рекомендуется выполнить:\n"
+"\n"
+"Файл -> Очистить диск\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Добро пожаловать в LiVES версии %s.\n"
+"\n"
+"\n"
+"Добро пожаловать в LiVES версии %s !\n"
 "\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
+"\n"
+"LiVES прервал соединение с jack и не смог выполнить повторное подключение.\n"
+"Рекомендуется выполнить перезапуск LiVES.\n"
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
+"\n"
+"LiVES прервал соединение с PulseAudio и не смог выполнить повторное "
+"подключение.\n"
+"Рекомендуется выполнить перезапуск LiVES.\n"
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5337,347 +5529,601 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr "Источники данных"
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Переходы состояний"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "эффект"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Эффекты"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Утилиты"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
-msgstr ""
+msgstr "только видео"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
-msgstr ""
+msgstr "только звук"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "аудио"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Аудио микшеры"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
-msgstr ""
+msgstr "Звуковые эффекты"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr "видео"
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr "Видео эффекты"
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "Воспроизведение видео быстро"
+msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "Параметры звука"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Параметры звука"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "неизвестный"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
-msgstr ""
+msgstr "%s в буфер обмена..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
-msgstr ""
+msgstr "%s в новый фрагмент..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
-msgstr ""
+msgstr "%s в буфер обмена"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
-msgstr ""
+msgstr "%s в новый фрагмент"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
+"сведения: Невозможно загрузить надстройку %s\n"
+"Ошибка: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Включая подкаталоги"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr " - надстройки %s -"
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr ""
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Сбросить значения"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Рама"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/framedraw.c:267
+msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Выбор файла"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr ""
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Ширина"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Высота"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5685,74 +6131,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "_Закрыть окно"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Нет параметры"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Неверный параметр"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Выберите цвет"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Нажмите, чтобы установить цвета"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Вернуть"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Красный значения (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Зелёная"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Зеленый значения (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Синяя"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5762,17 +6205,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5782,32 +6225,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5816,14 +6259,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5833,40 +6269,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5875,11 +6318,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5888,7 +6331,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5898,193 +6341,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LiVES: - Настройки кодирования"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Имя:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Версии:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Версия сценария."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Автор:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Автор сценария."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (необязательно):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL для плагина Сопровождающий."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Текст меню:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Текст для показа в меню."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Действие Описание:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Опишите, что плагин делает. Например, \"Граница обнаружения\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Минимальная кадры:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Требования..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Введите любое исполняемых файлов требуется плагин."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Параметры..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Установка свойств для плагина. Необязательно."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Параметры..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Код языка:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6094,55 +6520,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Новая запись"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Удалить вступлению"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "В_верх"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "В_низ"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6151,7 +6577,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6159,203 +6585,191 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Имя:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Название параметра, должен быть уникальным в плагине."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Лейбл:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Тип:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Параметр типа (выберите из списка)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Ключевое слово:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Специальный тип:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Специальный Подвид:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Ряд:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Когда:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6365,21 +6779,21 @@
 "\n"
 "Название не должно содержать пробелов.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6389,7 +6803,7 @@
 "\n"
 "Автор не должен быть пустым.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6397,21 +6811,21 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6421,7 +6835,7 @@
 "\n"
 "Параметр не должен быть пустым.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6430,41 +6844,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6474,27 +6888,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6503,7 +6917,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6513,12 +6927,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6528,7 +6942,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6538,12 +6952,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6551,23 +6965,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6577,55 +6991,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Встроенный"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Настраиваемый"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Тест"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Сценарист:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Имя сценария: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Новое имя: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6633,26 +7035,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6660,7 +7073,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6668,42 +7081,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Создать директорию\n"
-"%s\n"
-"?\n"
-"\n"
-"(Свободное место = %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6715,20 +7130,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6736,792 +7151,792 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Ширина           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Высота      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Каждый"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "секунды"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Никогда"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Видео открытой командой             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "По умолчанию формат изображений          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Декодирование"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Предварительный _качество"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Минимум - может повысить производительность на медленных машинах"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Нормальная - рекомендуется для большинства пользователей"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Максимум - можно улучшить качество на очень быстрых машинах"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Предварительный _качество"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Модуль"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "ВИДЕО"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Игроки"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "АУДИО"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Записывается"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      дешифратор                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Выходной формат"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Аудио кодек"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Кодирование"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Каталоги"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " МБ"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Показать предупреждение при многодорожечной заканчивается резервного "
 "пространства."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Предупреждения"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "xmms паузы во время воспроизведения аудио"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "Устройство чтения           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Новые темы:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Темы"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "_Джойстик события"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Джойстик устройство"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Джойстиком устройства, например /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Выберите устройство джойстик"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7529,222 +7944,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Удаление кадров с %d по %d%s..."
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Размер"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Сейчас длина видео составляет %d кадров.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Размер"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Беззнаковый"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Текущий"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr ""
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Создать"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Неограниченно"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7755,7 +8162,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7766,97 +8173,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
-#, fuzzy
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Вставка кадров приведет к сдвигу в размещении мультитрековых дорожек.\n"
-"Вы уверены, что хотите продолжить ?\n"
 
-#: src/resample.c:2303
-#, fuzzy
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
-"\n"
-"Вставка звука приведет к сдвигу в размещении мультитрековых дорожек.\n"
-"Вы уверены, что хотите продолжить ?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Изменение скорости"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7866,7 +8265,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7874,20 +8273,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7895,19 +8294,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"LiVES не смогла изменить файл конфигурации\n"
-"%s/.lives\n"
-"\n"
-"Проверьте ваши права доступа к файлу и каталогу\n"
-"и попробуйте ещё раз.\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7917,22 +8310,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7942,43 +8335,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7986,40 +8384,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Нет описания"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Описание: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8028,65 +8431,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Сведения"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Параметры моделирования"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8136,11 +8543,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8158,64 +8560,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Источник: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8224,7 +8626,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8232,14 +8634,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8249,7 +8651,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8258,208 +8660,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Закрыть интервалы"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Удалить блок"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Удалить %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Вставить блок"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8469,7 +8873,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8477,431 +8881,439 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "Открыть файл выборочно (_p)..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Импортировать выборочно с dvd/vcd (_d)..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Импортировать выборочно с dvd (_d)"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Импортировать выборочно с vcd (_v)"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "Импортривать с устройства (_I)"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Сохранить раскладку, как ..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Нагрузка макет ..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Композиции"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "В_ыбор"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Выберите Текущий трек"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Применить"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Вид"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "_Воздействие на текущий"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Параметры звука"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Компактный список"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Центр по курсором"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Увеличить"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Уменьшить"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "_События окна"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Применить"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Время"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Скорость  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Стартовый кадр"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Конечный кадр"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -8911,156 +9323,156 @@
 "==============================\n"
 "Перешли на Clip режиме редактирования\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Сроки (в секундах)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Выберите трек"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Выбранный эффекта"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Открыть этот эффект"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Удалить этот эффект"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d кадров"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "слой %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "звуковая дорожка"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s по %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9072,159 +9484,161 @@
 "Не влияет на текущий трек,\n"
 "текущее время.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Выбранный блок / кадр"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Выберите этот блок"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Удалить этот блок"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Вставьте здесь"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Вставьте аудио здесь"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "путь %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "выбранных композиций"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Очистка..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Пауза (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9232,117 +9646,107 @@
 "Выберите одну или несколько композиций\n"
 "создать регионе.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d видеодорожек выбран.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "после него.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "pered nim.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "клипы и кадры"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "Клипы"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "кадров"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9350,95 +9754,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Сброс значений"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Закрыть смеситель"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "Подключение к передающему jack-серверу..."
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9446,7 +9849,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9454,330 +9857,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Запуск сервера pulse audio..."
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - Выберите аудиоплеер"
+msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "Подключение к передающему jack-серверу..."
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "данные"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "скорость"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "заметка"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "значение"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "состояние"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "переменная"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "диапазон"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Удалить все"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Остановка воспроизведения видео"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Слушать Вперед"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Воспроизводит видео в направлении вперед"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Слушать назад"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Воспроизводит видео в обратном направлении"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Обратное направление воспроизведения"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Обратное направление воспроизведения видео"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Воспроизведение видео быстро"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Воспроизведение видео на несколько более быстрыми темпами"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Воспроизведение видео медленный"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Воспроизведение видео на несколько более медленными темпами"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Начать запись"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Остановить запись"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Ключи Сбросить эффекта"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "кадров/с"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "клавиша"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9786,7 +10194,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9795,12 +10203,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9878,11 +10286,11 @@
 
 #, fuzzy
 #~ msgid "Clipboard _over selection"
-#~ msgstr "Вставить _за выделеннием"
+#~ msgstr "_ Объединить содержимое буфера обмена с выделенным..."
 
 #, fuzzy
 #~ msgid "Clipboard _under selection"
-#~ msgstr "Вставить _за выделеннием"
+#~ msgstr "_ Объединить содержимое буфера обмена с выделенным..."
 
 #, fuzzy
 #~ msgid "Colorize"
@@ -9917,14 +10325,6 @@
 #~ msgstr "_Начать"
 
 #, fuzzy
-#~ msgid "Deinterlace"
-#~ msgstr "Устранить чересстрочную развёртку"
-
-#, fuzzy
-#~ msgid "Deinterlacing"
-#~ msgstr "Устранить чересстрочную развёртку"
-
-#, fuzzy
 #~ msgid "Enhance"
 #~ msgstr "Отмена"
 
@@ -9949,10 +10349,6 @@
 #~ msgstr "Изменить исходящий звук"
 
 #, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Изменить исходящий звук"
-
-#, fuzzy
 #~ msgid "Fade"
 #~ msgstr "Изменить входящий звук"
 
@@ -10090,7 +10486,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Число кадров, которые будут открыты"
+#~ msgstr "_Количество раз для вставки"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -10174,7 +10570,7 @@
 
 #, fuzzy
 #~ msgid "Step per _Frame"
-#~ msgstr "    _Рама"
+#~ msgstr "Стартовый кадр"
 
 #, fuzzy
 #~ msgid "Swirl _start"
@@ -10189,10 +10585,6 @@
 #~ msgstr "_Начать"
 
 #, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "Tunnel"
 #~ msgstr "Отмена"
 
@@ -10270,7 +10662,7 @@
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Число кадров, которые будут открыты"
+#~ msgstr "_Количество раз для вставки"
 
 #, fuzzy
 #~ msgid "_Point size"
@@ -10377,10 +10769,6 @@
 #~ msgstr "Вставка тишины"
 
 #, fuzzy
-#~ msgid "deinterlace"
-#~ msgstr "Устранить чересстрочную развёртку"
-
-#, fuzzy
 #~ msgid "enhance"
 #~ msgstr "Отмена"
 
@@ -10460,10 +10848,6 @@
 #~ msgstr "Остановить запись"
 
 #, fuzzy
-#~ msgid "swirl"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "transition_bwthresh"
 #~ msgstr "Переходы состояний"
 
@@ -10496,6 +10880,16 @@
 #~ msgid "Unable to locate the program $rfx_builder_multi"
 #~ msgstr "Невозможно обнаружить программу  $rfx_builder_multi"
 
+#, fuzzy
+#~ msgid ""
+#~ "You can work around this by switching to jpeg output in Preferences/"
+#~ "Decoding."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Тип преобразования изображения был изменён на jpeg. Вы можете внести "
+#~ "изменение в Параметры/Декодирование.    \n"
+
 #~ msgid "This does not appear to be a valid video or image file"
 #~ msgstr "Это не похоже на правильный файл, содержащий видео или изображение."
 
@@ -10524,50 +10918,9 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Вы должны вначале указать устройство CD в Параметрах."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LiVES не может найти дорожек, соответствующих вашему запросу."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Попробуйте снова с другими значениями."
+#~ msgid "$plugin_name failed:"
+#~ msgstr "сбой $plugin_name:"
 
 #, fuzzy
 #~ msgid "$error"
-#~ msgstr "ошибки.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Запуск сервера pulse audio..."
-
-#~ msgid "Red"
-#~ msgstr "Красная"
-
-#~ msgid "error.\n"
-#~ msgstr "ошибки.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES не смогла изменить файл конфигурации\n"
-#~ "%s/.lives\n"
-#~ "\n"
-#~ "Проверьте ваши права доступа к файлу и каталогу\n"
-#~ "и попробуйте ещё раз.\n"
-
-#~ msgid "No clips were recovered for set (%s).\n"
-#~ msgstr "Не восстановлены клипы для сборки (%s).\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "No effect selected.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Нет эффекта выбран.\n"
+#~ msgstr "Ошибка файла"

LiVES-1.6.1.tar.bz2/po/sk.po -> LiVES-2.0.3.tar.bz2/po/sk.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-11-01 11:47+0000\n"
-"Last-Translator: milboy <Unknown>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-26 11:33+0000\n"
-"X-Generator: Launchpad (build 14381)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +34,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -47,7 +63,7 @@
 "group_id=64341&atid=507139\n"
 "Ďakujeme. Obnovenie by malo byť možné po reštartovaní LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -59,7 +75,7 @@
 "Pri nahlasovaní neočakávaných skončení, prosím uveďte podrobnosti o "
 "operačnom systéme, distribúcii a verzii LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -67,7 +83,7 @@
 "a všetky informácie uvedené nižšie:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -77,163 +93,184 @@
 "zhromaždenie viac informácií.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Nastavenie zachovania.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Zmena veľkosti"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Zmeniť veľkosť všetkých snímkov"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Ktorýkoľvek"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Žiaden"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "doporučené"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "zakázané !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Súčasné rozloženie**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Vstavané"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Vlastné"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Otestovať"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...nájdený..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NENÁJDENÝ..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...nájdený..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NENÁJDENÝ..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...nájdený\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NENÁJDENÝ\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...nájdený..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NENÁJDENÝ..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...nájdený..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NENÁJDENÝ..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...nájdené..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NENÁJDENÉ..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...nájdený..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...NENÁJDENÝ..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...nájdený..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NENÁJDENÝ..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...nájdený..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NENÁJDENÝ..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -244,22 +281,48 @@
 "\n"
 "Správa manažéra okien ako \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "počet nájdených monitorov: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "malý endian"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "veľký endian"
+
+#: src/main.c:1732
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Dočasný adresár je %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -269,15 +332,15 @@
 "podpory jack alebo pulse audio.\n"
 "Mnohé audio funkcie nebudú k dispozícii.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Kompilované s podporou jack, dobrá práca!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Kompilované s podporou pulse audio, nádhera !\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -286,7 +349,7 @@
 "Vítajte vo verzii LiVES %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -295,130 +358,130 @@
 "\n"
 "Štartovací syntax je: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Kde: názov súboru je názvom mediálneho súboru alebo záložného súboru.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "čas_spustenia : čas do spustenia súboru v sekundách\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "snímky : maximálny počet snímkov, ktoré je možné otvoriť\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts môže byť:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : zobraziť túto nápovedu a ukončiť\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : automaticky nastaviť zostavu klipu\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : pri spustení nenahrať zostavu\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-nerocover : nenahrávať havarijnú zálohu\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : nahrať havarijnú zálohu\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : nezobrazovať gui\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : spustiť v režime editora klipu\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : spustiť v režime viacstopého editora\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : spustiť počúvanie na UDP porte <port>\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : nespúšťať OSC počúvanie\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 "-aplayer <ap> : spustenie s vybraným audio prehrávačom. <ap> môže byť mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox alebo jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " alebo sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname> : automatické spustenie mapovania jednotky\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : skúsiť ladenie zlyhania (vyžaduje nainštalovaný 'gdb' )\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Spúšťam GUI..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -426,25 +489,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Požadovaná téma nebola nájdená. Uistite sa, že je táto téma nainštalovaná\n"
-"%s/%s.\n"
-"(Možno budete musieť zmeniť hodnotu <prefix_dir> vo vašom ~/.lives file)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES nemohol zapísať malý súbor do /tmp\n"
-"Uistite sa či máte právo na zápis do /tmp a skúste to opäť.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -458,55 +514,37 @@
 "Prosim, prečítajte si ešte raz súbor README dodaný s týmto balíčkom\n"
 "pred spustením LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES nemôže čítať z konfiguračného súboru\n"
-"%s/.lives\n"
-"\n"
-"Skontrolujte oprávnenia k súboru a skúste znova.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do konfiguračného súboru\n"
-"%s/.lives\n"
-"\n"
-"Skontrolujte oprávnenia k tomuto súboru a adresáru\n"
-"a skúste znova.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do dočasného súboru\n"
-"%s\n"
-"\n"
-"Prosím skontrolujte nastavenia v <tempdir> \n"
-"%s/.lives\n"
-"a skúste to znova.\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -514,10 +552,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES nebol schopný zachytiť tento obrázok\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -535,7 +571,7 @@
 "\n"
 "Ďakujem.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -545,7 +581,14 @@
 "LiVES momentálne vyžaduje k spusteniu 'mplayer' alebo 'sox'. Prosím "
 "nainštalujte jeden z uvedených a skúste opäť.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -555,7 +598,7 @@
 "LiVES nemôže nájsť 'mplayer'. Inštaláciou mplayer-a bude LiVES plne "
 "funkčný.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -565,7 +608,7 @@
 "LiVES nemôže nájsť 'convert'. Mali by ste nainštalovať convert a image magic "
 "ak chcete využiť efekty vykresľovania.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -575,7 +618,7 @@
 "LiVES nemôže nájsť 'composite'. Mali by ste nainštalovať composite a image "
 "magic ak chcete využiť funkciu  spájania.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -585,7 +628,7 @@
 "LiVES nemôže nájsť 'sox'. Niektoré zvukové funkcie nebudú fungovať. Mali by "
 "ste nainštalovať 'sox'.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -593,68 +636,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES nenašiel rozšírenia pre kódovanie.\n"
-"Prosím, overte, či boli správne nainštalované do\n"
-"%s%s%s/\n"
-"Bez nich nebudete môcť ukladať.\n"
-"Bude potrebné zmeniť hodnotu <lib_dir> v ~/.lives\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Automaticky načítavam %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Neplatný prehrávač zvuku %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? snímky ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d snímky %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No File>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Prehrať"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -662,35 +699,35 @@
 "LiVES nebol schopný zachytiť tento obrázok\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Zatvorený súbor %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Ľavý audio kanál"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Pravý audio kanál"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -704,27 +741,12 @@
 "prehrávač je nastavený mplayer.\n"
 "Prosím upravte nastavenia prehrávania v Nastaveniach a skúste opäť.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Okno prehrávania"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Okno prehrávania"
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -732,14 +754,9 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"Adresár pomenovaný\n"
-"%s\n"
-"už existuje. Chcete použiť tento adresár ?\n"
-"\n"
-"(Voľné miesto = %.2f GB)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -747,14 +764,9 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"Adresár pomenovaný\n"
-"%s\n"
-"už existuje. Chcete použiť tento adresár ?\n"
-"\n"
-"(Voľné miesto = %.2f GB)\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -763,13 +775,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Vytvoriť adresár\n"
-"%s\n"
-"?\n"
-"\n"
-"(Voľné miesto = %.2f GB)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -778,11 +785,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Názov adresára je príliš dlhý !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -790,7 +797,7 @@
 "LiVES NESPUSTIL VAMI VYBRANÝ PREHRÁVAČ ZVUKU !\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -800,7 +807,7 @@
 "\n"
 "PULSE AUDIO je doporučené pre väčšinu používateľov"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -808,7 +815,7 @@
 ", ale táto verzia LiVES nebola kompilovaná pre podporu pulse audio.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -818,11 +825,11 @@
 " Odporúčame nainštalovať pulse audio skôr, ako spustíte LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio je doporučené pre skúsených používateľov"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -830,7 +837,7 @@
 ", ale táto verzia LiVES nebola kompilovaná pre podporu jack audio.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -840,7 +847,7 @@
 "pred spustením LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -852,13 +859,13 @@
 "zvuku.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX, môže byť použitý, ak nefunguje ani jeden z predchádzajúcich "
 "prehrávačov, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -866,7 +873,7 @@
 "ale niektoré zvukové funkcie, budú zakázané.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -876,7 +883,7 @@
 "Odporúčame nainštalovať ho pred spustením LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -884,92 +891,92 @@
 "Prehrávač MPLAYER je doporučený len pre účely testovania.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Vybrať audio prehrávač"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Použi _pulse audio prehrávač"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Použi _jack audio prehrávač"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Použi _sox audio prehrávač"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "Použi _mplayer audio prehrávač"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Nasledujúci"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Preskočené"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Zlyhalo"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testovacia konfigurácia"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Riešenie problémov"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES teraz spustí jednoduché testy konfigurácie\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Kontrola prítomnosti \"Sox\""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Mali by ste nainštalovať sox, aby ste v LIVES mohli využívať všetky audio "
 "funkcie"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Kontrola, či sox dokáže konvertovať audio"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "Nedá sa spustiť generátor %s\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "Mali by ste nainštalovať sox_fmt_all alebo podobné"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Kontrola prítomnosti \"mplayer\""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -977,43 +984,51 @@
 "Mali by ste nainštalovať mplayer, aby ste v LiVES mohli využívať všetky "
 "audio funkcie"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Kontrola, či mplayer dokáže konvertovať audio"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Mali by ste nainštalovať mplayer a podporou pcm/wav"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Kontrola, či mplayer dokáže dekódovať na png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Mali by ste aktualizovať mplayer na novšiu verziu"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Kontrola, či mplayer dokáže dekódovať na jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Mali by ste nainštalovať mplayer s podporou buď png/alfa alebo jpeg"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Možno budete chcieť pridať podporu jpeg pre mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Kontrola prítomnosti \"convert\""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Nainštalujte ImageMagick aby ste mohli využiť všetky poskytnuté efekty"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1025,7 +1040,7 @@
 "    Kliknite na tlačidlo zrušiť pre ukončenie a nainštalovať chýbajúce "
 "súčasti, alebo ďalej pre pokračovanie    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1035,7 +1050,7 @@
 "\n"
 "Nakoniec si môžete vybrať predvolené rozhranie pre spustenie LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1045,7 +1060,7 @@
 "\n"
 "LiVES má dve hlavné rozhrania a môžete začať s niektorým z nich.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1055,77 +1070,76 @@
 "\n"
 "Predvolené možno kedykoľvek zmeniť v Nastaveniach.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Vyberte rozhranie pri spustení"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "Spustiť v móde Úprava _klipu"
 
-#: src/startup.c:1042
-#, fuzzy
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
-msgstr "To je najlepšou voľbou pre jednoduchú editáciu úloh alebo pre VJs\n"
+msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "Spustiť vo _Viacstopom móde"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Nechať LiVES nastaviť _príponu súboru"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Použiť odstrániť prekladania"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Ak je zapnuté, zo snímkov bude odstránené prekladanie tak, ako sú "
 "importované."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Kliknutím získate _náhľad vybraného videa, obrázku alebo zvukového súboru"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Kliknutím zobrazíte _ukážku vybraných zvukových súborov"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Kliknutím zobrazíte _ukážku vybraných video súborov"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: -Spracovávanie..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1139,8 +1153,8 @@
 "\n"
 "Nezabudnite potom vypnúť efekty (ctrl-0) !"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1148,105 +1162,114 @@
 "\n"
 "Prosím čakajte"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Zobraziť podrobnosti"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Dostatočne"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Náhľad"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Formátovanie"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Veľkosť snímku"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Veľkosť súboru"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Veľkosť v bitoch"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Celkový čas"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Snímky"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Udalosti"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Pomer/veľkosť"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Zvuk vpravo"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - nastavenie kódovania"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Ponechať _moje nastavenia"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Použiť _doporučené nastavenia"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1254,76 +1277,75 @@
 "_Nezobrazovať už toto upozornenie\n"
 "(zmenu nastavenia urobíte v Predvoľby/Upozornenia)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Zobraziť_podrobnosti"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Zatvoriť okno"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Uložiť do súboru"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Vložiť"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Koľkokrát vložiť"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "_Vložiť do dľžky zvuku"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Vložiť _pred výberom"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Vložiť obsah stránky pred vybrané snímky"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Vložiť _za výber"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Vložiť obsah stránky za vybrané snímky"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Vložiť _so zvukom"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Vložiť _bez zvuku"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Otvoriť výber"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Počiatočný čas výberu (sek)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Počet snímkov k otvoreniu"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
+
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Otvoriť umiestnenie"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - Premenovať klip"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1339,7 +1361,7 @@
 "Tiež sa presvedčte, či máte nastavenú šírku pásma v Nastavenia|Streaming\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1348,47 +1370,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL: "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL: "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Neposielať informácie o šírke pásma"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Ak máte problém s príjmom, skúste tieto nastavenia"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Premenovať klip"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Zadajte názov zostavy"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Vybrať Pracovný adresár"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1400,7 +1437,7 @@
 "Prosím napíšte názov zostavy, ktorý chcete použiť.\n"
 "LiVES Vám pripomenie uloženie zostavy pri ukončovaní.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1409,7 +1446,7 @@
 "projekt.\n"
 "Ten bude použitý jako názov projektu.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1419,244 +1456,200 @@
 "Sprievodca spustením vás prevedie\n"
 "začiatkom inštalácie, aby ste získali čo najviac z tejto aplikácie.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"Najprv musíte zvoliť pracovný adresár pre LiVES.\n"
-"K  dispozícii by mal byť adresár s dostatkom voľného miesta na disku.\n"
-"Poznámka, na mnohých systémoch sa /tmp vyčistí pri vypnutí, tak to môže byť "
-"nevhodné riešiť vytvorením v /tmp.\n"
 
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Premenovať klip"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Zadajte názov zostavy"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Zadajte názov zostavy"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Vybrať Pracovný adresár"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Nový názov "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Zadať názov "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Pokročilé"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Nahrajte CD stopu"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Zvoliť DVD titul/kapitolu"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Zvoliť VCD titul"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Zmeniť maximum viditeľných stôp"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Podrobnosti zariadenia"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Nahrať stopu (z %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD titul"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD titul"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Maximálny počet zobrazených stôp"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Jednotka: /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Jednotka: fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Kapitola  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Kanál  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Výstupný formát"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Postupne zosilniť zvuk"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Postupne zoslabiť zvuk"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Zosilniť cez  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "prvý"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Zoslabiť cez  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "posledný"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "sekundy."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "výber."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Hrať náhodnú hudbu"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Počet požadovaných stôp    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Adresár"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Vrátane podpriečinkov"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimálna veľkosť súboru (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maximálna veľkosť súboru (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "výber"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Komentár k súboru (nepovinné)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Titul/Názov : "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Autor/Umelec : "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Komentáre : "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: vybrať adresár"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: vybrať súbor"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Zrušiť/odstrániť/uložiť"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1666,7 +1659,7 @@
 "Súčasné zmeny neboli uložené.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1676,7 +1669,7 @@
 "Súčasné zmeny boli zmenené od posledného uloženia.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1686,7 +1679,7 @@
 "Súčasná zostava klipov nebola uložená.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1694,7 +1687,7 @@
 "Súčasná zostava klipov nebola uložená.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1702,7 +1695,7 @@
 "Súčasné rozloženie nebolo uložené.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1710,7 +1703,7 @@
 "Aktuálna usporiadanie sa nezmenilo, pretože bolo naposledy uložené.\n"
 "Čo chcete robiť?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1718,7 +1711,7 @@
 "Súčasné rozloženie obsahuje vytvorené snímky a nemôže byť zachované.\n"
 "Možno tak budete chcieť urobiť pred ukončením viacstopového režimu.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1728,43 +1721,43 @@
 "Súčasné rozloženie obsahuje vytvorené snímky a nemôže byť zachované.\n"
 "Čo chcete urobiť ?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "Zadať názov _klipu"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Automatické otvorenie pri ďaľšom  spusteni"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_Vymazať rozloženie"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ignorovať zmeny"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_Odstrániť zostavu klipov"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_Odstrániť rozloženie"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Uložiť rozloženie"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Uložiť zostavu klipov"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: vrátiť zmeny ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1774,78 +1767,69 @@
 "LiVES zistil viacstopé rozloženie z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o jej obnovenie ?\n"
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - nastavenie kódovania"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "Vymazať _značky z časovej osi"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Vymazanie hodnôt"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Uložiť ako zostavu %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Zvolte súbor"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "Automaticky načítavam %s..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "Vyčistenie klipu"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES nemôže nájsť program %s.\n"
-"Prosím skontrolujte cestu k programu a či je spustiteľný.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Tento súbor"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1853,7 +1837,7 @@
 ",\n"
 " - vrátane aktuálneho rozloženia - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1868,7 +1852,7 @@
 "\n"
 "Skutočne ukončiť ?"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1883,14 +1867,14 @@
 "\n"
 "Skutočne chcete ukončiť ?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1898,7 +1882,7 @@
 "\n"
 "Neplatný súbor projektu.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1920,33 +1904,33 @@
 "vymažte.\n"
 "Ak to urobíte, potom môžete importovať nový projekt.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importujem projekt %s ako zostavu %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Importujem projekt"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportujem projekt %s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Exportujem projekt"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Obnoviť .lv1 súbor"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Zálohovať ako .lv1 súbor"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Obnoviť .lv1 súbor"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1958,90 +1942,90 @@
 "Zostava bude odstránená z disku.\n"
 "Ste si istý ?\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Odstraňujem zostavu..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Odstraňujem zostavu..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Odstraňujem zostavu"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Zostava %s bola navždy odstránená z disku.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Vložiť ticho"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Vraciam späť"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Obnovenie zvuku..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Čistenie rámu obrázkov"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Mazanie nadbytočných snímkov"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Dĺžka videa je teraz %d obrázkov pri %.3f snímkov za sekundu.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Schránka bola prevzorkovaná na %d snímkov.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Prestavba"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Kopírovanie snímkov %dLiVES do %d%s do schránky..."
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Ťahanie snímkov z klipu"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Kopírovanie do schránky"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Vložiť"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2050,7 +2034,7 @@
 "Táto operácia si vyžaduje zmenu veľkosti alebo konverziu snímok.\n"
 "Prosím, nainštalujte 'convert' z balíčka Image-magick a reštartujte LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2064,7 +2048,7 @@
 "Skúste označiť všetky snímky a potom použite \n"
 "Funkciu 'Trim Audio' z ponuky zvuku."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2072,7 +2056,7 @@
 "LiVES nemohol vložiť pretože nesúhlasí pomer zvuku.\n"
 "Prosím nainštalujte 'sox' a skúste znova."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2082,7 +2066,7 @@
 "Vložením dôjde k posunu snímkov v niektorých viacstopových rozmiestneniach.\n"
 "Skutočne chcete pokračovať ?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2092,11 +2076,11 @@
 "Vložením dôjde k posunu zvuku v niektorých viacstopových rozmiestneniach.\n"
 "Skutočne chcete pokračovať ?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Prevzorkovať zvuk v schránke"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2108,7 +2092,7 @@
 "LiVES nemohol prevzokovať zvuk v schránke. \n"
 "Zvuk bol zo schránky vymazaný.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2122,30 +2106,30 @@
 "Chcete pokračovať s vložením \n"
 "nezmeneného zvuku ?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Vkladám %d%s snímkov zo schránky..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Vkladám"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Vložiť %d krát zo schránky%s..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Vloženie %d snímkov zo schránky%s..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2155,7 +2139,7 @@
 "Odstránenie všetkých snímkov zatvorí súbor.\n"
 "Ste si istý ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2166,8 +2150,8 @@
 "rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2178,7 +2162,7 @@
 "rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2188,7 +2172,7 @@
 "Odstránenie spôsobí posun snímkov v niektorých viacstopových rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2198,20 +2182,20 @@
 "Odstránenie spôsobí posun zvuku v niektorých viacstopových rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Odstraňujem snímky %d do %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Odstraňuje sa"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2221,7 +2205,7 @@
 "\n"
 "Výber je zamknutý.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2233,11 +2217,11 @@
 "(Pre zrušenie, stlačte 'r' alebo kliknite na Prehrať|Nahrávať opäť pred "
 "prehraním.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Nahrávanie zrušené.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2250,7 +2234,7 @@
 "Správy '%s' o rozšírení:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2263,7 +2247,7 @@
 "Nedá sa nájsť 'init' metóda v %s rozšírení.\n"
 "Rozšírenie môže byť poškodené alebo nie je správne nainštalované."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2276,22 +2260,22 @@
 "\n"
 "Prosím stlačte 'Zrušit' ak nesúhlasíte.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Uloženie zostavy %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Načítavam klipy zo zostavy %s"
 
-#: src/callbacks.c:5017
-#, fuzzy, c-format
+#: src/callbacks.c:5086
+#, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
-msgstr "%d klipov bolo obnovených zo zostavy (%s).\n"
+msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2302,41 +2286,37 @@
 "Pokračujte IBA ak nemáte spustenú dalšiu kópiu LiVES.\n"
 "Pokračujete kliknutím na OK.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Čistenie disku..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Čistenie disku"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d NB miesta na disku bolo obnovených.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Resetovanie hodnotenia snímkov a hodnoty snímkov..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Externé: %s\n"
-"Interné: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2344,7 +2324,7 @@
 "\n"
 "  Otváram..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2353,7 +2333,7 @@
 "\n"
 "(%d virtuálnej)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2362,7 +2342,7 @@
 "\n"
 "(%d dekódované)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2371,7 +2351,7 @@
 "\n"
 "  %.2f sek."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2379,23 +2359,23 @@
 "\n"
 "  Neznáme"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "nepodpísané"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "podpísané"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "veľký-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "malý-endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2404,7 +2384,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2421,11 +2401,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Úprava videa a VJ program"
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Milan Slovák https://launchpad.net/~milboys\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2439,7 +2430,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2449,14 +2440,14 @@
 "\n"
 "Je nutné nainštalovať mplayer, aby bol možný náhľad tohoto súboru.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2468,197 +2459,209 @@
 "viacstopých rozloženiach. \n"
 "Naozaj chcete pokračovať?"
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Otváram zvuk %s, typ %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Otváram zvuk"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Rušenie"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Nový zvuk: %d Hz %d kanál(y) %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Vytvoriť zvuk"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Nový zvuk"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d snímkov je postačujúcich !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Kódovač výstupu ladenia"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Prehranie na celej obrazovke (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Prehranie na celej obrazovke vypnuté (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Dvojitá veľkosť (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Vlastná veľkosť (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Skryť okno s prehrávaním (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Zobraziť okno s prehrávaním (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Prehrať v oddelenom okne (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Vypnúť nekonečnú sľučku (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Zapnúť nekonečnú sľučku (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Hlasitosť zvuku (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Zapnúť zvuk (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Vypnúť zvuk (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Vratná schránka..."
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Vratná schránka"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Vybrať zvukový súbor"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Prosím nastavte si CD prehrávaciu jednotku v menu Nástroje | Nastavenie | "
 "Misc\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Otváranie stopy na CD %d od %s..."
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Stopa na CD %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Otváram stopu na CD..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Chyba pri načítaní CD stopy\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Výber skladieb"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "rozloženie chýb"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Zatvoriť _okno"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Vymazanie _chýb"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_Odstrániť postihnuté rozloženia"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Obnoviť"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "pozastavené..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "pokračovanie..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Ponechať"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2668,30 +2671,28 @@
 "\n"
 "Pauza"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Zastaviť"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Vybraný snímok"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "Uložiť snímky ako %s..."
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2700,7 +2701,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2713,7 +2714,7 @@
 "funkciu\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2721,7 +2722,7 @@
 "\n"
 "Nahrávací čas musí byť väčší ako 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2735,11 +2736,11 @@
 "Kliknite na 'Zrušiť' pre zrušenie\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Vonkajšie okno bola uvoľnené.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2747,7 +2748,7 @@
 "Kliknite na Okno pre nahrávanie\n"
 "Stlačte tlačidlo 'q' pre ukončenie nahrávania"
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2762,19 +2763,19 @@
 "Stop nebo 'q' pre ukončenie.\n"
 "(Bude použité predvolené nastavenie %.3f snímkov za sekundu.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES nemôže zaznamenať toto okno. Prepáčte.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Exportovanie vybraného zvuku ako..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Exportovať zvuk ako..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2788,81 +2789,86 @@
 "Kliknite na 'OK' pre export s novou rýchlosťou alebo 'Zrušiť' a exportovat "
 "originálnym pomerom.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportovanie zvukových snímkov %d do %d ako %s..."
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Export zvuku ako %s..."
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Exportujem zvuk"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Pridať zvukový súbor..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Pridávam zvukový súbor %s..."
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Pridávam zvuk"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Pridať zvuk"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Orezanie zvuku z %.2f to %.2f sekundy..."
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Orezanie/vyplnenie zvuku"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Orezať/Doplniť zvuk"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Zoslabovanie zvuku v"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Zoslabujúci zvuk v"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Stíšenie zvuku"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Stíšiť zvuk"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s nad %.1f sekundy..."
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s od času %.2f sekúnd do %.2f sekúnd..."
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Stišovanie zvuku"
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2871,667 +2877,636 @@
 "\n"
 "Odstránenie všetkých zvukov zatvorí tento súbor."
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Odstránenie všetkých zvukov..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Odstránenie zvuku od %.2f do %.2f sekundy..."
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Odstraňujem zvuk"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Odstrániť zvuk"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Nahrať nový zvuk"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Vložiť ticho od %.2f do %.2f sekundy..."
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Vložiť ticho"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Zmazať %d rozmiestnenie(a)...ste si istý ?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nepodarilo sa nájsť súbor s obrázkom: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Spojiť"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Zlúčiť schránku [ %d snímkov ] s výberom [ %d snímkov ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "Zlúčiť schránku [ %d snímkov (prevzorkované) ] s výberom [ %d snímkov ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Zosúladiť _Štart"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Zosúladiť _Koniec"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Čo robiť s extra snímkami v schránke -"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Vložiť snímky"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_Vyhodiť snímky"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Počet opakovaní schránky"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Metóda prechodu:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Zlúčiť schránku s výberom..."
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "vloženie %d extra snímku(ov) pred zlúčením\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "vkladám %d extra snímok(y)\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Zlúčenie skončené.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Vlastné efekty"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "Vlastné _pomôcky"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Otvoriť súbor/Adresár"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Otvoriť _umiestnenie/stream..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importovať z _Firewire  jednotky (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importovať z _Firewire  jednotky (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr "Pridať live _Firewire zariadenie"
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Nedávne súbory..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "Znovu otvoriť sadu klipov..."
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Zavrieť/Ul_ožiť všetky klipy"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "_Dekódovať klip ako..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Kódovať _výber ako..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Zavrieť tento klip"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "_Zálohovať klip ako .lv1..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "_Obnoviť klip z .lv1..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Kódovať/Otvoriť/Zálohovať _zo zvukom"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "_Vyčistiť disk"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "_VIACSTOPOVÝ režim"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Kopírovať vybrané"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Vy_strihnúť vybrané"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "_Vloťiť zo schránky"
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Vložiť ako _nový"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Zlúčiť schránku s výberom..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Zmazať výber"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Oddeliť _Video od zvuku"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Vybrať..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Vybrať všetky snímky"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "_Iba počiatočný snímok"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "_Iba posledný snímok"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Vybrať od _prvého snímku"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Vybrať do _posledného snímku"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Vybrať posledný vložený/_Zlúčiť"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Vybrať posledný efekt"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Obrátiť výber"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "_Zamknúť šírku výberu"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Prehrať"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Prehrať všetko"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Pre_hrať výber"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Prehrať _schránku"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Zastaviť"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "Pre_vinúť"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "Na _celú obrazovku"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Dvojitá veľkosť"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Prehrať v _oddelenom okne"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Prázdne pozadie"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Automaticky)_opakovať video (vyplniť podľa zvuku)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Ne_pretržitá sľučka"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong sľučky"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Ztlmiť zvuk"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Oddelené okno 'L_epivý' mód"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "U_káž počítadlo snímkov"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Efekt_y"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Efekty sú pužité na súčasný výber."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Spustiť test Vykresľovanie efektov/Nástroje/Generátor..."
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Nástroje sú použité na dokončenie klipov."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Otočiť schránku"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Zmeniť prehrávanie/Uložiť rýchlosť"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Prevzorkovať _video na nový pomer..."
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Nástroje"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "Vy_generovať"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Vlastné _nástroje"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "Vy_generovať"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Spúšťam rozšírenie vykresľovanie efektov"
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Zachytiť _externé okno "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Predvoľby..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Zvuk"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Nahrať _nový zvuk pre klip ..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Nahrať _CD stopu..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "V_ysunúť CD"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Nahrávanie e_xterného zvuku..."
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "do nového _klipu..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "do _výberu"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "_Zosilniť zvuk..."
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "_Zoslabiť zvuk..."
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Exportovať zvuk..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "_Exportovať _vybraný zvuk..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "_Exportovať _všetky zvuky..."
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "_Pripojiť zvuk..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "_Odstrániť zvuk..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Odstrániť _vybraný zvuk..."
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Odstrániť _všetky zvuky..."
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Vložiť _ticho vo vybranom"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "_Prevzorkovať zvuk..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Prehrať _hudbu pomocou xmms..."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Náhodnú hudbu  _pomocou xmms..."
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Zastaviť xmms _prehrávanie"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Zobraziť informáciu o _klipe"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Zobraziť/ _Upraviť komentáre k súboru"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Zobraziť informáciu o _schránke"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Zobraziť _správy"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Zobraziť chyby _rozloženia"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Klipy"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Premenovať aktuálny klip v menu..."
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Efekty/Nástroje/Pomôcky"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Nový test RFX skriptu..."
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "_Koirovať RFX skript do testu..."
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Upraviť test RFX skriptu..."
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "Premeno_vať test RFT skriptu..."
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Odstrániť test RFX skriptu..."
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Importovať vlastný RFX skript..."
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportovať vlastný RFX skript..."
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "Od_strániť vlastný RFX skript..."
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Re_konštruovať všetky RFX rozšírenia"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "Získať _LiVES stream od..."
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Poslať LiVES stream do..."
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Otvoriť _yuv4mpeg stream na %sstream.yuv"
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Importovať projekt (.lv2)..."
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportovať projekt (.lv2)..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Mapovanie real time _efektu"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Priradiť real time efekty k ctrl-numerickým klávesam."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Nastaviť _predvolený real time efekt"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Nastaviť _predvolenú hodnotu pre real time efekty."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Uložiť _predvolený real time efekt"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3539,146 +3514,146 @@
 "Uložiť predvolené hodnoty real time efektov, budú použité pri každom "
 "spustení LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "_Resetovať všetky rýchlosti prehrávania a pozícií"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Resetovanie všetkých prehraných pozícií na snímok 1 a resetovanie všetkých "
 "prehraných snímkov."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "Rozhranie _MIDI/Joystick"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "_Uložiť mapu zariadenia..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_Načítať mapu zariadenia..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Zobraziť VJ _\tKlávesy"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Hračky"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "Žia_dny"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_Bláznivé snḿky"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (širokopásmová)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Manuál (otvoriť v prehliadači)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "_Prispieť na projekt !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Mailová adresa autora"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Nahlásiť _chybu"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Navrhnite _funkciu"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Pomôcť s _prekladom"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "Riešenie _problémov"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_O programe"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Previnúť na štart (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Prehrať všetko (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Zastaviť prehrávanie (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Prehrať vybrané (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Hlasitosť"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Hlasitosť zvuku (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Vyplnené pozadie (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Prehrať pomalšie (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Prehrať rýchlejšie (ctrl-hore)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Preskočiť späť (ctrl-vľavo)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Preskočiť vpred (ctrl-vpravo)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Zobraziť info o klipe (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Skryť túto lištu s nástrojmi"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3687,161 +3662,161 @@
 "zastavte s \"q\"."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Rýchlosť prehrávania videa (snímky za sekundu)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Odlíšiť rýchlosť videa"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Prvý snímok"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Posledný snímok"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "Prvý vybraný snímok v tomto klipe"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "Posledný vybraný snímok v tomto klipe"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Začínam...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr "    Stlač 'q' k zastaveniu nahrávania. NEPREKRÝVAJTE HRACIE OKNO !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Čísla snímkov k náhľadu"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Voľná"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Voľný výber čísla snímku"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Štart"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "Číslo snímku ukazuje na prvý snímok"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Koniec"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "Číslo snímku ukazuje na posledný snímok"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_Kurzor"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "Číslo snímku ukazuje na ukazovateľ prehrávania"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Previnúť"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Prehrať všetko"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Prehrať vybrané"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Slučka Zap/Vyp"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Spustiť _nahrávanie"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Zastaviť _nahrávanie"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Skryť okno s prehrávaním"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Zobraziť okno s prehrávaním"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "rec %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "rec %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "rec %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "rec %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "rec %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
-#, fuzzy, c-format
+#: src/utils.c:500
+#, c-format
 msgid "%.2f KiB"
-msgstr "rec %.2f MB"
+msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Vyprázdnenie schránky"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3852,7 +3827,7 @@
 "==============================\n"
 "Prepnuté na klip %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3862,11 +3837,11 @@
 "==============================\n"
 "Prepnuté na prázdny klip\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(čisté)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3875,7 +3850,7 @@
 "Názov zostavy bol zmenený z %s na %s. Súvisiace rozmiestnenie bude primerane "
 "aktualizované\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3884,7 +3859,7 @@
 "Klip %s nebol nájdený v tejto zostave.\n"
 "Je vyžadované nasledujúce rozloženie:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3893,7 +3868,7 @@
 "Klip %s bol zatvorený.\n"
 "Je požadované nasledujúce rozloženie:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3902,7 +3877,7 @@
 "Snímky v klipe %s boli posunuté.\n"
 "Nasledujúce rozloženie bude ovplyvnené:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3911,7 +3886,7 @@
 "Snímky z klipu %s boli zmazané.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3920,7 +3895,7 @@
 "Z klipu %s bol odstránený zvuk.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3929,7 +3904,7 @@
 "V klipe %s bol posunutý zvuk.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3938,7 +3913,7 @@
 "V klipe %s bol zmenený zvuk.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3947,7 +3922,7 @@
 "V klipe %s boli zmenené snímky.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3958,7 +3933,7 @@
 "sa nedá otvoriť, pretože je používaná\n"
 "inou kópiou LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3969,7 +3944,7 @@
 "Zostava %s je používaná inou kópiou LiVES.\n"
 "Prosím vyberte iný názov zostavy.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3977,16 +3952,13 @@
 "\n"
 "Názov zostavy nemôže byť prázdny.\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"Názov nesmie obsahovať medzery alebo znaky%s.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -3995,13 +3967,13 @@
 "\n"
 "Názov nesmie obsahovať medzery alebo znaky%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4012,68 +3984,68 @@
 "Zostava %s už existuje.\n"
 "Prosím zvolte iný názov zostavy.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Odstraňujem rozloženia %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [otváram...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sek]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Nedefinované)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Žiadne video)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Žiadny zvuk)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono [otváram...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Ľavý zvukový kanál [otváram...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sek]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Ľavý zvukový kanál [%.2f sek]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Pravý zvukový kanál [otváram...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Pravý zvukový kanál [%.2f sek]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES nemôže při načítání klipov prepnúť na mplayer."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Vyčistenie klipu"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4088,54 +4060,65 @@
 "\n"
 "Prepísať ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Vrátiť %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Znovu %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Výber------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sek ] ----------výber---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " snímky ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Kontrolujem hlavičku súboru"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Otváram %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Otváranie %s začiatok %.2f sek. snímkov %d"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " bez zvuku"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Otváram zvuk pre %s"
 
-#: src/saveplay.c:541
-#, fuzzy, c-format
+#: src/saveplay.c:595
+#, c-format
 msgid ""
 "\n"
 "LiVES is not currently optimised for larger file sizes.\n"
@@ -4145,19 +4128,12 @@
 "\n"
 "Are you sure you wish to continue ?"
 msgstr ""
-"\n"
-"LiVES nie je aktuálne optimalizovaný na veľké súbory.\n"
-"Ste poučený (teraz) začnite s menším súborom, alebo použite voľbu 'otvoríť "
-"súbor výber'.\n"
-"(veľkosť súboru=%.2fMB)\n"
-"\n"
-"Ste si istý že chcete pokračovať ?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - prosím o trpezlivosť."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4169,7 +4145,7 @@
 "LiVES nebol schopný dať ukážku buď videa, alebo zvuku.\n"
 "Prosím, pre viac informácií skontrolujte okno terminálu.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4179,7 +4155,7 @@
 "\n"
 "Musíte nainštalovať mplayer k otvoreniu tohto súboru.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4191,32 +4167,29 @@
 "Skontrolujte nastavenie príkazu pre otvorenie videa v\n"
 "Nástroje|Predvoľby|Dekódovanie\n"
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "Stišovanie zvuku"
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "Uložiť snímky ako %s..."
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "Uložiť snímky ako %s..."
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - Premenovať klip"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4228,33 +4201,29 @@
 "\t\n"
 "Prajete si napriek tomu pokračovať ?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "výber"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Prepojenie výberu"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (bez zvuku)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "Uložiť snímky %d do %d%s ako \"%s\" : enkodér = %s : formát = %s..."
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "Uložiť snímky 1 do %d%s ako \"%s\" : enkodér %s : formát = %s..."
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Ukladanie [môže to chvíľu trvať]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4264,33 +4233,33 @@
 "\n"
 "Chyby kódovača - výstupný súbor nebol vytvorený !\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Veľkosť súboru"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "nahrávanie prerušené náhľadom.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "nahrávanie prerušené prehrávaním zo schránky.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Priemerná hodnota FPS bola %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4304,16 +4273,16 @@
 "Kliknite na Nástroje--->Zmeniť veľkosť všetkých\n"
 "a zmeňte veľkosť všetkých snímkov na \taktuálnu veľkosť.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Bez názvu %d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4321,7 +4290,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4333,14 +4302,14 @@
 "fps . \n"
 "Predvolené hodnoty možno nastaviť v Nástroje | Predvoľby | Rôzne.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Rýchlosť prehrávania bola nastavená na %.3f snímky za sekundu, aby "
 "zodpovedal zvuku.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4350,7 +4319,7 @@
 "%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4359,49 +4328,44 @@
 "Snímky=%d typ=%s veľkosť=%dx%d bpp=%d snímkov za sekundu =%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s žiadny\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d kanál(ov) %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Komentár: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Ukladám snímky %d ako %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Zálohovanie %s do %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Zálohujem"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "dáta boli zálohované..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Obnovovanie %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Obnovovanie"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4415,23 +4379,22 @@
 "LiVES ho nemohol obnoviť.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "rec %.2f MB"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!rec %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
-#, fuzzy
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
-msgstr "rec %.2f MB"
+msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4439,7 +4402,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4449,64 +4412,59 @@
 "Byly nájdené súbory z predchádzajúceho spustenia LiVES.\n"
 "Chcete sa pokúsit se o ich obnovenie ?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Obnovujem súbory"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Obnovenie súborov ..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Zobraziť postihnuté _rozloženia"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Čistenie disku"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s pokročilé nastavenia"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Upozornenie !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "upozornenie"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Vybrať farbu"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Vymazanie _chýb"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_O programe"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4517,7 +4475,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4529,11 +4487,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Prehrávače zvuku nemôžu byť prepnuté počas prehrávania."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4545,20 +4503,18 @@
 "LiVES nemohol vykonať túto operáciu kvôli nedostatku pamäte.\n"
 "Prosím skúste najskôr zatvoriť daľšie aplikácie.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
-"\n"
-"%d%% hotovo. Zostávajúci čas je približne %u sek\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4567,14 +4523,14 @@
 "\n"
 "%d/%d otvorených snímkov. Zostávajúci čas %u sek.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4583,7 +4539,7 @@
 "\n"
 "%d otvorených snímkov.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4592,7 +4548,7 @@
 "\n"
 "Zostávajúci čas: %d sek"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4603,7 +4559,7 @@
 "Prepáčte, LiVES môže súčasne otvoriť %d súborov.\n"
 "Prosím zatvorte súbor a skúste to znova."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4622,7 +4578,7 @@
 "\n"
 "Uistite sa prosím, že do tohoto adresára môžete zapisovať."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4632,7 +4588,7 @@
 "Prosím nainštalujte 'sox'\n"
 "Alebo vyberte iný formát kódovania v Nástroje | Nastavenia | Encoding\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4644,7 +4600,7 @@
 "Tento formát sa nedá použiť s vybraným zvukovým kodekom.\n"
 "Nastavte zvukový kodek v Nástroje|Nastavenia|Encoding\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4652,16 +4608,13 @@
 "Toto rozloženie obsahuje vygenerované snímky.\n"
 "Nedá sa uložiť, musíte ich najskôr vykresliť do klipu.\n"
 
-#: src/dialogs.c:1820
-#, fuzzy
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
-"Toto rozloženie obsahuje vygenerované snímky.\n"
-"Nedá sa uložiť, musíte ich najskôr vykresliť do klipu.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4672,7 +4625,7 @@
 "\n"
 "Vzhľadom na obmedzenia vo %s formáte\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4680,43 +4633,43 @@
 "LiVES doporučuje nasledujúce nastavenia:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", podpísané"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ". nepodpísané"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", malý-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", veľký-endian"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Nastaviť video na %.3f snímkov za sekundu\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Nastaviť video na %d:%d snímkov za sekundu\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Nastaviť veľkosť videa na %d x %d pixelov\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4724,35 +4677,35 @@
 "\n"
 "Možno si budete priať:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "zmeniť veľkosť videa na %d x %d pixelov\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "vypnúť zvuk, pretože cieľový enkodér nemohol zakódovať zvuk\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES musí:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "prevzorkovať video na %.3f snímkov za sekundu\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "prevzorkovať video na %d:%d snímkov za sekundu\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4766,7 +4719,7 @@
 "Kliknite na `OK` pre pokračovanie, `Zrušiť` pre stornovanie.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4776,7 +4729,7 @@
 "Zmeny použité do výberu nebudú trvalé.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4790,7 +4743,7 @@
 "pamäte.\n"
 "Skúste nahrať len vybranú časť súboru."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4809,7 +4762,7 @@
 "\n"
 "Vyberte Zrušiť pre ukončenie vkladania alebo OK pre pokračovanie."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4818,11 +4771,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Zobraziť klávesy"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4864,11 +4817,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Klávesy pre výber stopy"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4890,19 +4843,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "História správy"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
-"Po upgrade/inštalácii, budete musieť poopraviť <prefix_dir> nastavenia ~/."
-"lives souboru."
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4910,16 +4862,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"\n"
-"LiVES nenašiel žiadne rozšírenia vykresľovania efektov.\n"
-"Prosím presvedčte sa, že ich máte nainštalované v\n"
-"%s%s%s\n"
-"alebo zmeňte hodnotu <lib_dir> v ~/.lives\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4929,18 +4875,18 @@
 "\n"
 " (Názov súboru musí mať koncovku .mp3, .ogg, .wav, .mod, .xm alebo .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "zlyhalo (neznámy typ)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4953,7 +4899,7 @@
 "Kliknitím na OK pridáte aktuálne klipy a rozloženia da existujúcej zostavy.\n"
 "Kliknutím na Zrušiť vyberiete nový názov.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4964,7 +4910,7 @@
 "Snímky z tohoto klipu sú použité v niektorých viacstopých rozloženiach.\n"
 "Ste si istý že chcete pokračovať ?"
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4975,8 +4921,8 @@
 "Zvuky z tohoto klipu sú použité v niektorých viacstopých rozloženiach.\n"
 "Ste si istý že chcete pokračovať ?"
 
-#: src/dialogs.c:2170
-#, fuzzy, c-format
+#: src/dialogs.c:2310
+#, c-format
 msgid ""
 "\n"
 "The original file\n"
@@ -4985,15 +4931,8 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
-"\n"
-"Pôvodný súbor\n"
-"%s\n"
-"sa nepodarilo nájsť.\n"
-"Ak bol tento súbor presunutý, skopírujte ho späť do pôvodného umiestnenia\n"
-"a kliknutím na OK skúste znova.\n"
-"Inak kliknite na Zrušiť pre zrušenie načítavania súboru.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5008,7 +4947,7 @@
 "%s\n"
 "Klip sa nedá načítať.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5016,7 +4955,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5025,13 +4964,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5042,7 +4981,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5050,7 +4989,7 @@
 "\n"
 "Môžete tiež reštartovať LiVES a vybrať iný audio prehrávač.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5065,20 +5004,16 @@
 "Môžete zvýšiť hodnoty v Preferences/Multitrack.\n"
 "Odporúča sa zvýšiť aspoň o %d MB"
 
-#: src/dialogs.c:2221
-#, fuzzy, c-format
+#: src/dialogs.c:2361
+#, c-format
 msgid ""
 "\n"
 "Some old layouts for the set %s already exist.\n"
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 msgstr ""
-"\n"
-"Niektoré staré rozloženie pre súbor %s už existuje.\n"
-"Je doporučené ho odstrániť.\n"
-"Kliknite na OK pre odstránenie, Zrušiť pre ponechanie na disku.\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5086,7 +5021,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5098,7 +5033,7 @@
 "Zvýšte veľkosť pamäte pre krok späť\n"
 "v Nastavenia/Multitrack/Pamäť späť\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5107,20 +5042,20 @@
 "LiVES nemohol rezervovať dostatok pamäte pre zásobník viacstopého kroku "
 "späť.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "alebo vložte nižšiu hodnotu.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Skúste opäť z editora klipov, skúste zavrieť niektoré ďaľšie aplikácie\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Skúste zavrieť niektoré ďaľšie aplikácie\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5129,14 +5064,14 @@
 "zvuk.\n"
 "Upravte nastavenie zvuku v menu Nástroje.\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "Súčasné nastavenie obsahuje zvuk, ale zvukové kanály nemôžu byť nastavené na "
 "nulu.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5146,7 +5081,7 @@
 "\"jack\" alebo \"pulse audio\" prehrávačom.\n"
 "Môžete to nastaviť v Nástroje|Predvoľby|Prehrávanie."
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5156,7 +5091,7 @@
 "systému, alebo zo staršej verzie LiVES).\n"
 "Mám skúsiť opravu disku kópiou rozloženia?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5164,7 +5099,7 @@
 "LiVES nebol schopný načítať rozloženie.\n"
 "Ospravedlňujeme sa.\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5174,7 +5109,7 @@
 "\n"
 "Zvukový pomer musí byť väčší ako 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5186,7 +5121,7 @@
 "a jeho zobrazenie môže trvať veľmi dlho.\n"
 "Ste si istí, že chcete zobraziť?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5196,7 +5131,7 @@
 "\n"
 "Musíte nainštalovať 'dvgrab' aby ste mohli používať túto funkciu.\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5205,19 +5140,19 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "Zlyhalo rozšírenie video prehrávania k inicializovaniu palety !\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Zlyhalo rozšírenie dekodéra k inicializovaniu palety !\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Nedá sa nastaviť pomer snímkov video rozšírenia\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5225,7 +5160,7 @@
 "Po havárii, je vhodné použiť vyčistenie disku s\n"
 "Súbor|Čistenie disku\n"
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5234,34 +5169,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "zrušené.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "zlyhalo.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "dokončené.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "chyba v súbore. Zlyhanie.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5269,13 +5204,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5283,13 +5214,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5297,26 +5224,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5324,26 +5243,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5351,17 +5262,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES nemôže zapisovať do súboru:\n"
-"%s\n"
-"Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5370,7 +5277,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5383,7 +5290,7 @@
 "%s\n"
 "Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5396,19 +5303,22 @@
 "%s\n"
 "Skontrolujte, či máte oprávnenia pre adresár a skúste znova."
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"Zostava bude odstránená z disku.\n"
-"Ste si istý ?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5419,7 +5329,7 @@
 "%s nemôže dekódovať klipy s obrázkami typu %s.\n"
 "Prosím vyberte iný dekodér zo zoznamu.\n"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5427,7 +5337,7 @@
 "\n"
 "Táto karta je už používaná a nedá sa otvoriť viackrát.\n"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5442,27 +5352,27 @@
 "- Skontrolujte, či zariadenie nie je používané iným programom.\n"
 "- Skontrolujte, či zariadenie skutočne existuje.\n"
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5471,14 +5381,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5489,19 +5399,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5509,7 +5419,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5517,7 +5427,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5529,45 +5439,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"Vítajte vo verzii LiVES %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5576,203 +5484,244 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "generátor"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Generátory"
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "generátor"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Generátory"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "prechod"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Prechody"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efekt"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efekty"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "pomôcka"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Pomôcky"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "sádzač"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Sádzače"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "rozdeľovač"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Rozbočovače"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "konvertor"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Konvertory"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "zvuk/video"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Zvuk/Video prevody"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "iba video"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Iba prevody videa"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "iba zvuk"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Iba prevody zvuku"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "zvuk"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Mixovanie zvukov"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Zvukové efekty"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "Ovládač hlasitosti zvuku"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Ovládače hlasitosti zvuku"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "iba video"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "iba video"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "iba zvuk"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Parametre zvuku"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "neznáme"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s všetky snímky..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s schránka na snímky %d do %d..."
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s do schránky..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s do nových klipov..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s snímkov %d do %d..."
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s schránka s výberom"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s do schránky"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s do nového klipu"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s snímkov %d do %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5780,17 +5729,46 @@
 "\n"
 "Neboli generované snímky.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Chyba: rozšírenie %s nemá weed_setup () funkciu.\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5799,131 +5777,310 @@
 "Info: Nemožno nahrať rozšírenie %s\n"
 "Chyba bola: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Vrátane podpriečinkov"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Úspešne načítané %d Weed filtre\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Nepodarilo sa spustiť inštanciu %s, kód chyby %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Nedá sa spustiť generátor %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Nepodarilo sa spustiť generátor %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Nepodarilo sa spustiť generátor %s, chyba %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr "Môžete kliknutím na náhľad zmeniť tieto hodnoty"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Vymazanie hodnôt"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Snímka"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Zachovať pomer strán pôvodnej snímky"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "Zachovať _pomer strán"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Vybrať súbor"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Zachovať pomer strán pôvodnej snímky"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "Prechod _v"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Prechod v"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "Začiarknite políčko, pre urobenie prechodu zvuku  s videom"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Prechod _z"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Prechod z"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "Cieľová _FPS (nemá vplyv na rozšírenie)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : veľkosť"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Nová veľkosť (pixely)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Šírka"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Výška"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Generovať do _schránky"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Generovať snímky do schránky"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Generovať do _nového klipu"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Generovať snímky do nového klipu"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5934,62 +6091,59 @@
 "Musíte vybrať najmenej %d snímkov k použitiu tohto efektu.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Nastaviť ako štandardné"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Zavrieť okno"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Žiadne parametre"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Neplatný parameter"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Vybrať farbu"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Kliknite pre nastavenie farby"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Znova"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Červená hodnota (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Zelená"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Zelená hodnota (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Modrá"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Modrá hodnota (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -5998,12 +6152,12 @@
 "\n"
 "Chyba rozšírenia: %s chyba s kódom %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : správa %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6018,17 +6172,17 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Aktualizácia prehrania rozšírenia videa predvolene v %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Načítavam video rozšírenie predvolene z %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6043,32 +6197,32 @@
 " Nástroje|Preferences|Prehrávanie|Pokročilé rozšírenie prehrávania\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Fixný počet snímkov pre rozšírenie.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr ""
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Fixný počet snímkov pre rozšírenie.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "_Farebný priestor"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6081,16 +6235,7 @@
 "Zlyhalo otvorenie rozšírenia prehrávanie %s\n"
 "Chyba bola: %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"Nepodarilo sa inicializovať rozšírenie videa.\n"
-"Chyba bola: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6105,14 +6250,23 @@
 "chýbajú povinné funkcie.\n"
 "Nedá sa použiť.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"Nepodarilo sa inicializovať rozšírenie videa.\n"
+"Chyba bola: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6121,30 +6275,26 @@
 "*** Použitím %s rozšírenia pre fs prehrávanie, súhlasíte s použitím palety "
 "typu %d ( %s ).***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
-"LiVES nemôže nájsť rozšírenie kódovania. Prosím presvedčte sa či je "
-"rozšírenie nainštalované v\n"
-"%s%s%s\n"
-"alebo zmeňte hodnotu <lib_dir> in ~/.lives\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6153,11 +6303,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Nedá sa zmeniť veľkosť, prosím nainštalujte imageMagic\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6170,7 +6320,7 @@
 "Nepodarilo sa otvoriť rozšírenie dekodéra  %s\n"
 "Chyba bola %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6185,188 +6335,172 @@
 "chýbajú povinné funkcie.\n"
 "Nedá sa použiť.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/neznámy"
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Zlyhalo spustenie %s, nie je možné zmenit veľkosť prechodu.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s pokročilé nastavenia"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nový test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Upraviť test RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efekt -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Prechod -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Generátor -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Nástroj -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Pomôcky -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Názov          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Názov rozšírenia. Bez medzier."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Verzia       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Verzia skriptu."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Autor       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Autor skriptu."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (nepovinné):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "URL pre správcu rozšírenia."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Text menu:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Text zobrazený v menu."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Popis akcie:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Opíšte, čo plugin robí. Napr. \"Odhaľovanie rohov\""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Minimálny počet snímkov:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Minimálny počet snímkov, ktorým nemôže byť tento efekt/nástroj aplikovaný. "
 "Normálne 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Požiadavky..."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Vypíšte binárky požadované rozšírením."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Nastaviť vlastnosti pre rozšírenie. Nepovinné."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parametre..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Nastaviť parametre použité v pre/sľučka/po/spúšťač kódu. Nepovinné."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Parameter _okna nápovedy..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Nastaviť nápovedy ako rozložiť okno s parametrami. Nepovinné."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Kód jazyka:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Jazyk pre pre/sľučka/post/triggers. Nepovinné."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Kód spustený pred sľučkou. Nepovinné."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "_Kód sľučky..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Kód sľučky použitý na každý snímok."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "Kód _po sľučke..."
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Kód spustený po sľučke. Nepovinné."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "_Spúšťací kód..."
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6374,7 +6508,7 @@
 "Nastaviť spúšťací kód pre situáciu, kedy parameter okna je zobrazený, alebo "
 "parameter je pozmenený. Nepovinné (okrem Pomôcok)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6389,55 +6523,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX požiadavky"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parametre"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX Parametre okna nápovedy"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX Spúšťače"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Nový záznam"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Upraviť záznam"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Odstrániť záznam"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Presunúť _hore"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Posunúť _dolu"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX Vlastnosti"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "_Pomaly (nápověda GUI)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "_Generátor dávkového režimu"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6451,7 +6585,7 @@
 "Prosím najskôr odstránte spúšťač.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6463,27 +6597,27 @@
 "Niektoré spúšťače boli nastavené.\n"
 "Prosím skontrolujte kód spúšťača.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nový RFX Parameter"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Upraviť RFX Parameter"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Názov:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Názov parametru musí byť v rozšírení jedinečný."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Štítok    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6491,170 +6625,158 @@
 "Štítok zobrazený parametrom. Podtrhnutie predstavuje mnemotechnický "
 "akcelerátor."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "Tlačítko _Skupina: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "Nie-nulová hodnota môže byť použitá pre skupinu prepínačov."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Typ         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Typ prametra (vybrať zo zoznamu)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Desatinné _miesta: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "_Predvolená hodnota:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "Predvolené: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "Tlačítko _Skupina: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "Nie-nulová hodnota môže byť použitá pre skupinu prepínačov."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "_Minimálna hodnota: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Ma_ximálna hodnota: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     _Veľkosť kroku:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "O koľko je upravený parametr po stlačení otáčacích šípiek."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Zalomenie: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Nastaviť _hodnoty"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Predvolená hodnota:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Minimálna hodnota: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Miximálna hodnota: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Predvolená _Červená:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Predvolená _Zelená:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Predvolená _Modrá: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "Nastaviť predvolené"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Predvolená hodnota:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Maximálna dĺžka (znakov): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nový RFX Parameter okna nápovedy"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Upraviť RFX Parameter okna nápovedy"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Kľúčové slovo:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Špeciálny typ:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Špeciálny podtyp:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr ""
+
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Rada:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Súvisiace parametre (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Súvisiace parametre (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Súvisiace parametre (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nový RFX spúšťač"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Upraviť RFX spúšťač"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Kedy:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Pred sľučkový kód"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Sľučkový kód"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Po sľučkový kód"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Predvolený text (max dĺžka %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Vložte hodnoty, jedna na riadok"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -6664,7 +6786,7 @@
 "\n"
 "Názov nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -6674,7 +6796,7 @@
 "\n"
 "Názov nesmie obsahovať medzery.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -6684,7 +6806,7 @@
 "\n"
 "Menu textu nesmie byť prázdne.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -6694,7 +6816,7 @@
 "\n"
 "Popis akcie nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -6704,7 +6826,7 @@
 "\n"
 "Autor nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6716,7 +6838,7 @@
 "Rozšírenie s týmto názvom už existuje.\n"
 "Názov musí byť jedinečný.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -6726,7 +6848,7 @@
 "\n"
 "Kód sľučky by nemal byt prázdny.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -6736,7 +6858,7 @@
 "\n"
 "Spúšťací kód pre pomôcku by nemal byť prázdny.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -6746,7 +6868,7 @@
 "\n"
 "Parameter názvu nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6760,41 +6882,41 @@
 "jedinečný.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Zápis skriptu súboru %s..."
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "Žiadna <define> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Chybná verzia skriptu.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "Žiadna <name> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "Žiadna <version> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "Žiadna <author> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "Žiadna <description> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Zlý popis.(%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6809,27 +6931,27 @@
 "Nájdený v skripte.\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Prerobenie všetkých RFX skriptov...vstavané..."
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Prerobenie skriptov"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "vlastný..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "prerobenie vstupov dynamického menu..."
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6842,7 +6964,7 @@
 "LiVES nemôže nájsť program %s.\n"
 "Prosím skontrolujte cestu k programu a či je spustiteľný.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6857,12 +6979,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Odstránenie rfx skriptu %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6877,7 +6999,7 @@
 "%s\n"
 "Kód chyby bol %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6892,12 +7014,12 @@
 "už existuje.\n"
 "Prosím, najskôr ho vymažte, alebo premenujtee testovací skript.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Podpora rfx test rozšírenia %s do vlastného..."
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6905,29 +7027,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
-"\n"
-"\n"
-"Nepodarilo sa presunúť rozšírenie skriptu z\n"
-"%s do\n"
-"%s\n"
-"Návratový kód je %d\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Importovať skripty z..."
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Exportovať skripty do..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírovanie %s do %s..."
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6942,55 +7058,43 @@
 "už existuje.\n"
 "Prosím, najskôr ho vymažte, alebo premenujte importovaný skript.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Vstavané"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Vlastné"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Otestovať"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Kopírovať RFX skript"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "Z typu:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Skript:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Premenovať testovací RFX skript"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Zo skriptu: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Názov RFX skriptu"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Názov skriptu: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Nový názov: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Nový názov skriptu: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7002,28 +7106,45 @@
 "Testovací skript s týmto názvom už existuje.\n"
 "Názov skriptu musí byť jedinečný.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Premenovanie RFX testovacieho skriptu %s na %s..."
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Nepodarilo sa presunúť rozšírenie skriptu z\n"
+"%s do\n"
+"%s\n"
+"Návratový kód je %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Použiť Real Time efekty do výberu"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Spúšťam vykresľovanie efektu %s..."
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Pozri: VJ - zobraziť VJ klávesy. Nastaviť real time efekty a potom ich "
 "použiť."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7035,7 +7156,7 @@
 "Video rozšírenia sú aktivované iba v\n"
 "režim celej obrazovky, mód (fs) oddeleného okna\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7043,48 +7164,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Vytvoriť adresár\n"
-"%s\n"
-"?\n"
-"\n"
-"(Voľné miesto = %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
-"Nedá sa vytvoriť nebo zapisovať do nového dočasného adresára\n"
-"Skúste ho vytvoriť ako root, napr.\n"
-"\n"
-"mkdir %s; chmod 777 %s\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
-"Adresár nebude zmenený.\n"
+"The directory will not be changed now.\n"
+msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7102,7 +7219,7 @@
 "\n"
 "Stlačením 'Zrušit' obnovíte predvolená nastavenie dočasného adresára."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7112,7 +7229,7 @@
 "Nedá sa prepnúť prehrávač zvuku na jack - najprv musíte nainštalovať jack.\n"
 "Pozri http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7120,7 +7237,7 @@
 "\n"
 "Prepnutie prehrávača zvuku vyžaduje reštart (jackd nesnie byť spustený)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7132,370 +7249,383 @@
 "najskôr musíte nainštalovať pulse audio.\n"
 "Pozrite http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (vysoká kvalita; veľké súbory)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Predvoľby"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Otvoriť výber súboru maximalizovaný"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Ukáž posledné súbory v ponuke Súbor"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Zastaviť šetrič obrazovky pri prehrávaní    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Otvoriť hlavné okno maximalizované"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Zobraziť panel s nástrojmi ak je pozadie čisté"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Umožniť prepínanie klipov kolieskom myši"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr "Zmenšenie náhľadov, aby sa vošli do rozhrania"
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Mód pri spustení:"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "Editor _klipov"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "_Viacstopý mód"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Podpora Multi-head"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " sledovať počet rozhraní pre LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " sledovať počet pre prehrávanie"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Vynútiť jeden monitor"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Mód vynútenia jedného monitora"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "Grafické"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Pri spustení viacstopého módu:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Vyzvi ma k nastaveniu šírky, výšky, fps a zvuku"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_Vždy použiť nasledujúce hodnoty:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Použi rovnaké _hodnoty pre vykresľovanie nového klipu"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Šírka           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Výška      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Zapnúť podporu audio stopy"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Zvuková stopa na video stopu"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Vrátiť veľkosť vyrovnávacej pamäte (MB)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Ukončiť viacstopý mód po vykreslení"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Automatické zálohovanie rozložení"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Každý"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Po kažej _zmene"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Nikdy"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Viacstopé/Vykresliť"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "Použite okamžité otvorenie pokiaľ je to možné"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Povoliť okamžité otvorenie niektorých typov súborov použitím rozšírení "
 "dekodéru"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Príkaz otvorenie videa             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Otvoriť/vykresliť kompresiu                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr ""
+
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr " % ( nižšie = pomalšie, väčšie súbory; pre jpeg, vysoká kvalita )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Predvolený formát obrázku          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "(Skontrolujte Pomocníka/Riešenie problémov pre zistenie, ktoré formáty "
 "obrázkov sú podporované)"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Povoliť automatické deinterlacing pokiaľ je to možné"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Pri otvorení viac súborov, spájať obrazy do jedného klipu"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Dekódovanie"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr "Úroveň náhľadu pre prehrávanie videa - po zmene veľkosti"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "Kvalita _náhľadu"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Nízka - môže zvýšiť výkon na pomalších strojoch"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Normálne - doporučené pre väčšinu používateľov"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Vysoká - môže zlepšiť kvalitu na veľmi rýchlych strojoch"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "Kvalita _náhľadu"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr "Úroveň náhľadu pre prehrávanie videa - po zmene veľkosti"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "_Zobraziť FPS štatistiku"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Rozšírenie"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "_Prehrávač"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "Príkaz na _prehranie zvuku"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- vnútorné -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "Zvuk kopíruje video _tempo/adresa"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "Zvuk nasleduje prepínanie _klipov"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "ZVUK"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Prehrať"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Čo sa nahráva keď je stlačené 'r'   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "Zmena _snímku"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "F_PS zmeny"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "_Real time efekty"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "_Klip Prepínače"
 
-#: src/preferences.c:3507
-#, fuzzy
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_Zvuk (vyžaduje jack alebo prehrávač zvuku pulse)"
-
-#: src/preferences.c:3529
-#, fuzzy
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_Zvuk (vyžaduje jack alebo prehrávač zvuku pulse)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Nahrávanie"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Enkodér                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Výstupný formát"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Zvukový kodek"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Použite _antialiasing pri zmene veľkosti"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7503,80 +7633,95 @@
 "Počet \"virtuálnych\" kláves realtime efektov. Je možné ich ovládať v okne "
 "realtime efektov, alebo cez sieť (OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Načítanie adresára video (predvolené)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Adresár pre ukladanie videa (predvolene) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Načítanie adresára  zvuku (predvolené) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Adresár s obrázkami (predvolene) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Záloha/obnovenie adresára (predvolene) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Dočasný adresár (neodstraňovať) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "Predvolený adresár pre spustenie video klipov z"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "Predvolený adresár pre uloženie kódovaných klipov do"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "Predvolený adresár pre nahrávanie a ukladanie zvuku"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "Predvolený adresár pre uloženie snímkov do"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr "Predvolený adresár pre zálohovanie/obnovu jednotlivých klipov"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "LiVES pracovný adresár."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Adresáre"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7584,87 +7729,87 @@
 "Upozorniť pri Vložení / Zlúčiť ak tempo snímkov v schránke nesúhlasí s "
 "tempom výberu"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Upozorniť pri otvorení ak _veľkosť súboru presiahne "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Zobraziť varovanie pred uložením zo_stavy"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "Zobraziť varovanie ak nebol nájdený efekt vykresľovania pri spustení."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Zobraziť varovanie ak nebolo nájdené rozšírenie kódovania pri spustení."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Zobraziť varovanie ak bol vložený už existujúci názov zostavy."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Ak je zostava nahraná, zobraziť varovanie ak chýbajú klipy v _rozložení"
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Upozorniť ak klip použitý v rozložení má byť ukončený."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Upozorniť ak snímky použité v rozložení majú byť odstránené."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Upozorniť ak snímky použité v rozložení majú byť presunuté."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Upozorniť ak snímky použité v rozložení majú byť zmenené."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Upozorniť ak zvuk použitý v rozložení má byť odstránený."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Upozorniť, ak použitý zvuk v rozložení má byť posunutý."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Upozorniť, ak použitý zvuk v rozložení má byť zmenený."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Upozorniť pri opustení viacstopového módu, ak rozloženie nie je uložené."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Zobraziť varovanie ak v multitracku nie sú zvukové stopy a rozloženie zo "
 "zvukom je nahrané."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7672,117 +7817,105 @@
 "Zobraziť varovanie ak v multitracku nie sú zvukové stopy a vašim prehrávačom "
 "zvuku nie je \"jack\" alebo \"pulse audio\"."
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Zobraziť info správu po importovaní z firewire jednotky."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Zobraziť upozornenie pred otvorením yuv4mpeg streamu (pokročilé)."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Zobraziť upozornenie ak nie je dostatok miesta pre zálohovanie multitracku."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Varovania"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi synchronizácia (vyžaduje súbory midistart a midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Pri vkladaní/zlučovaní snímkov:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Zrýchliť/Spomaliť vkladanie"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Prevzorkovanie vkladania"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pauza xmms počas prehrávania zvuku"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD jednotka           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Vybrať CD mechaniku"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES nemôže spustiť zvukovú stopu z tohto CD"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "Predvolené FPS        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr "Použiť snímkov za sekundu, ak nie je uvedené inak"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Nová téma:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Témy vzhľadu"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Rýchlosť sťahovania (Kb/s)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES musí byť skompilovaný bez \"configure --disable-OCS\" pre použitie OMC"
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "OMC diaľkové ovládanie povolené"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Spustiť OMC pri štarte"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Streaming/Siete"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Prenos jack"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7790,47 +7923,43 @@
 "LiVES musí byť skompilovaný s jack/transport.h a jack/jack.h pre použitie "
 "prenosu cez jack"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Jack _transport konfiguračný súbor"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "Názov  jack serveru kontrolujúceho prenos LiVES"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Spustiť LiVES _server pri spustení"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Jack zvuk"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "LiVES musí byť skompilovaný s jack/jack.h pre použitie zvuku jack"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -7838,109 +7967,95 @@
 "MUSÍTE nastaviť prehrávač zvuku na \"jack\" v záložke Prehrávanie k použitiu "
 "zvuku jack"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Jack _audio server konfiguračný súbor"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Názov jack servera pre zvuk"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr "Prehrávať zvuk aj keď je transport _pozastavený"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Integrácia jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Udalosti v reakcii na:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "_Joystick jednotka"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Joystick jednotka, napr. /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Vyberte joystick jednotku"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "_MIDI udalosti"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr ""
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Použiť _ALSA MIDI (doporučené)"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr ""
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Čítať priamo z MIDI jednotky"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_MIDI jednotka"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDI jednotka, napr. /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Vybraž MIDI jednotku"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "MIDI opakovať"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Upozornenie: nastavenie  tejto hodnoty je príliš vysoké, môže spomaliť "
 "prehrávanie.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7951,68 +8066,68 @@
 "LiVES bude ukončený. Je potrebné reštartovať, aby bola uplatnená zmena "
 "adresára.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "Zmena témy nebude mať vplyv až do ďalšieho spustenia LiVES."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Zmeny nastavenia jack se prejavia po reštarte LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Synchronizácia s externou frekvenciou %.8f snímkov za sekundu.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Nemožno inicializovať OSC prijímač\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "UPOZORNENIE: Nedá sa spustiť OSC server na UDP porte %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Spustený OSC server na UDP porte %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Nedá sa spustiť OSC/UDP server na porte %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Zmeniť veľkosť obrázkov 1 do %d"
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Zmeniť veľkosť obrázkov 1 do %d"
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Zmeniť veľkosť"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Prevzorkovanie/Zmena veľkosti"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Dĺžka videa je teraz %d obrázkov.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8022,154 +8137,146 @@
 "\n"
 "Nový pomer musí byť väčší ako 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Prevzorkovanie zvuku"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES nebol schopný prevzorkovať zvuk tak, ako bolo požadované.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Prevzorkovať zvuk"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Zvuk bol prevzorkovaný do %d Hz, %d chanels, %d bit"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Prevzorkovať video na %.8f snímkov za sekundu..."
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Prevzorkovať video na %.3f snímkov za sekundu..."
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Chyba preradenia !\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Prevzorkovať"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Prevzorkovať zvuk"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Vložiť ticho"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nový zvukový klip"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Nastavenia externého klipu"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Frekvencia (Hz) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Kanály "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Veľkosť vzorky "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Podpísané"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Nepodpísané"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Malý endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Veľký endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Aktuálne"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Povovliť zvuk"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Frekvencia (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Kanály "
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Kanály "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    _Veľkosť vzorky "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Veľkosť vzorky "
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Nový"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Snímok za sekundu "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Nahrať maximálne:  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " hodiny  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " minúty  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " sekundy  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Bez obmedzenia"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Kliknite na OK pre začatie nahrávania, alebo Zrušiť pre ukončenie."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Zmeniť rýchlosť prehrávania"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Prevzorkovať video"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8186,7 +8293,7 @@
 "Prosím, zadajte požadovanú rýchlosť prehrávania\n"
 "v _snímkoch za sekundu"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8203,15 +8310,15 @@
 "Prosím vložte _prevzorkovanú hodnotu\n"
 "v snímkoch za sekundu"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "ALEBO zadajte požadovanú dĺžku klipu v _sekundách"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Zmeniť rovnako rýchlosť _zvuku"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8222,7 +8329,7 @@
 "rozloženiach.\n"
 "Skutočne chcete zmeniť rýchlosť ?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8233,48 +8340,48 @@
 "rozloženiach.\n"
 "Skutočne chcete zmeniť rýchlosť ?\n"
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Zmena rýchlosti"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Zmeniť rýchlosť prehrávania na %.3f snḿkov za sekundu a zvuku na %d Hz.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Zmena rýchlosti prehrávania na %.3f snímky za sekundu.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Prevzorkovanie videa"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Prevzorkovanie videa zo schránky"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Preradenie snímkov"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8284,20 +8391,20 @@
 "\n"
 "LiVES nemôže preradiť snímky."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "chyba prevzorkovania..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8313,7 +8420,7 @@
 "Ste si istý ?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8325,12 +8432,12 @@
 "Kliknitím na OK uložíte rozloženie kláves ako predvolené\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Uložiť rozloženie kláves do %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8339,8 +8446,8 @@
 "\n"
 "Aktualizovať súbor s rozložením kláves %s..."
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -8348,18 +8455,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"\n"
-"\n"
-"Nedá sa zapísať súbor s rozložením kláves\n"
-"%s\n"
-"Kód chyby %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Uložiť real time efekt predvolene do %s..."
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8374,22 +8476,22 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Načítať predvolené hodnoty real time efektu z %s..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Nahrávánie predvolených rozmerov generátora z %s..."
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Nahrávánie predvoleného rozloženia kláves z %s..."
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8404,27 +8506,27 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Neplatná linka %d v %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Neplatný kľúč %d v %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Neplatný efekt %s v %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8433,16 +8535,21 @@
 "Táto verzia LiVES neumožňuje kombináciu generátorov/ne-generátorov na "
 "rovnakej klávese (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Pre klávesu %d je priradených priveľa efektov.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "vyžaduje aktualizáciu.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8454,40 +8561,45 @@
 "Niektoré efekty sa nedajú nájsť.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Bez popisu"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informácie pre %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Názov efektu: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Názov rozšírenia: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Verzia: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8501,65 +8613,69 @@
 "rovnakej klávese.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES nemohol nájsť efekt %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Zobrazenie efektu v reálnom čase"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Zachytenie kláves"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Aktívne klávesy"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Zachytenie kláves"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "_Vyčistiť všetky efekty"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Aktívny mód"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Informácia"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Nastaviť parametre"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Zmazať"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Názov efektu:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "_Uložiť ako predvolenú mapu kláves"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "_Nahrať predvolenú mapu kláves"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8611,11 +8727,6 @@
 msgid "none\n"
 msgstr "žiadny\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Hz %d kanál(y) %d bps\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8635,58 +8746,58 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "Automatické zálohovanie"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Podpora zvuku"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Aktuálna stopa: %s (vrstva %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Aktuálna stopa: Podpora zvuku\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Aktuálna stopa: Vrstva %d zvuku\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f sek.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Kliknite pravým tlačidlom na kontextové menu.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -8694,7 +8805,7 @@
 "dvojitým kliknutím na blok\n"
 "ho vyberiete."
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8703,7 +8814,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8711,7 +8822,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8721,7 +8832,7 @@
 "\n"
 "Nie je načítaný žiaden klip.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8731,7 +8842,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8745,12 +8856,12 @@
 "a časovú zónu\n"
 "pre uplatnenie kompozítorov.\n"
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f sek.do %.2f sek.\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8758,182 +8869,184 @@
 "Jedným kliknutím na časovú stopu\n"
 "vyberte snímok.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "vybrať časové pásmo.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Vybraný klip"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "_Nastavenie počiatočných a koncových bodov"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "_Zobraziť informácie o klipe"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "_Zatvoriť tento klip"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Zvukový mixér (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "Jednoduché kliknutie na časovej ose"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "pre vybranie snímku."
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "pre vybranie bloku."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "Klipy možno preťahovať"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "na časovej osi."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "Mód myši je: Pohyb"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "s klipmi môžete pohybovať."
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "Mód myši je: Vybrať."
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "Ťahaním myšou na časovej osi"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "vybrať skladby a čas."
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "Mód _myši: Pohyb"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "Mód _myši: Výber"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Zatvoriť _prvú medzeru(y) v aktuálnej skladbe/čase"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Zatvoriť medzery"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Posunúť blok"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Posunúť zvukový blok"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Odstrániť blok"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Odstrániť zvukový blok"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Rozdeliť stopy"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Rozdeliť bloky"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Použiť %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Odstrániť %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Vložiť blok"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Vložiť medzeru"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Vložiť blok zvuku"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Zmeniť poradie efektov"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "neoznačený "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "označený "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "veľký endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "malý endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -8942,15 +9055,15 @@
 "Multitrack hodnoty nastavené na %.3f fps, veľkosť snímku %d x %d, zvukové "
 "kanály %d, pomer zvuku %d, veľkosť  vzorky zvuku %d, %s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "Neplatný zoznam udalostí. Zlyhanie.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "zoznam udalostí má neplatné fps. Zlyhanie.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8965,7 +9078,7 @@
 "zatvorte aktuálnu zostavu,\n"
 "potom spustite novú zostavu z menu súbora.\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8976,431 +9089,439 @@
 "LiVES našiel neplatný počet zvukových kanálov (%d).\n"
 "Nemohlo byť spustené.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Klipy"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr "FX zásobník"
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "O_tvoriť súbor výberu..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importovať výber z _dvd/vcd..."
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Importovať výber z _dvd"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Importovať výber z _vcd"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Importovať výber z jednotky"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "_Uložiť rozloženie ako..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Nahrať rozloženie..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "_Vyčistiť/Zmazať rozloženie..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorovať šírku, výšku a hodnoty zvuku z nahraného rozloženia"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_KLIP EDITOR"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Vložiť vybraný klip"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "_Vložiť vybraný zvuk klipu"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "_Odstrániť vybraný blok"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "_Skočiť na predchádzajúcu hranicu bloku"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "_Skočiť na hranicu ďaľšieho bloku"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Vymazať _značky z časovej osi"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Ignorovať obmedzenia výberu pri vkladaní"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "_Prehrať z určitého miesta na časovej osi"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "_Presunúť efekty s blokmi"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Zobraziť/_Upraviť vybraný efekt"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "_Odstrániť vybraný efekt"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Použiť efekt na _blok..."
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Použiť efekt na _región..."
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Stopy"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Presun aktuálnej zvukovej stopy na _pozadie"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Pridať video stopu na _koniec"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Pridať video stopu na _začiatok"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "_Rozdeliť súčasnú stopu na kurzor"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_Rozdeliť vybrané video stopy"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Vložiť medzeru vo zvolenej skladbe/čase"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Vložiť medzeru v aktuálnej skladbe/vybranom čase"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Zatvoriť všetky _medzery v aktuálnej skladbe/čase"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Vý_ber"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "_Vybrať aktuálnu stopu"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Vybrať _všetky video stopy"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "Nevybrať _žiadne video stopy"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Vybrať všetko"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Vybrať od začiatku"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Vybrať do konca"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Časový kód pre začiatok oblasti"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Časový kód pre koniec oblasti"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "_Spustiť v čase"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "_Ukončiť v čase"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Zmeniť šírku, výšku a hodnoty zvuku..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Vykresliť"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Vykresliť všetko do nového klipu"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Vykresliť _video"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Vykresliť _zvuk"
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Zobrazenie"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "Blokovať body _vstupu/výstupu"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "Aktuálne _efekty"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Parametre zvuku"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Zobraziť _zvukovú stopu na pozadí"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Kompaktný pohľad"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Maximum stôp k zobrazeniu..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Prejdite na nasledujúce prehrávanie"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Vystrediť na kurzor"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "_Priblížiť"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "_Oddialiť"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "_Detaily o multitracku"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "_Okno udalosti"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "_Okno udalosti (iba vybraný čas)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_Zobraziť udalosti SNÍMKY"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Zobraziť multitrack klávesy"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Mód myši: _Pohyb"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Mód myši: _Výber"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Vložiť so _zvukom"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Vložiť so _zvukom"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "Vybrať _prekrytie"
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "Vybrať _prekrytie"
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Rozšírený pohľad (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Kompaktný pohľad (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Klipy"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr "FX zásobník"
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Použiť"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Čas"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "_Odstrániť uzol"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "_Ďaľší uzol"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "_Predchádzajúci uzol"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "_Opačné prehrávanie  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Rýchlosť  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Ukotviť bod štartu na časovej osi"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "Ukotviť _štart"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Ukotviť bod štartu na časovej osi"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Prvý snímok"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Ukotviť bod konca na časovej osi"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "Ukotviť _koniec"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Ukotviť bod konca na časovej osi"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Posledný snímok"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Prejdite"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9410,91 +9531,91 @@
 "==============================\n"
 "Prepnuté do režimu úpravy klipu\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Časová os (sekundy)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Zvuk v pozadí"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Vrstva %d zvuku"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "Zobraziť/skryť detaily zvuku"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Vrstva %d zvuku"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (vrstva %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Vybrať stopu"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Zobraziť/skryť zvuk"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (vrstva %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Vybraný efekt"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "_Zobraziť/upraviť tento efekt"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "_Zobraziť tento efekt"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "_Odstrániť tento efekt"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "Nedá sa vložiť po tomto efekte"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Tento efekt nemôže byť premiestnený"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d do %d vybraného  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sek."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d snímkov"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9504,19 +9625,19 @@
 "==============================\n"
 "Prepnúť do Multitrack módu\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "chcete nastaviť parametre efektu"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Nastavte parametre a potom kliknite na tlačidlo \"Použiť\"\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9526,46 +9647,46 @@
 "boli nastavené.\n"
 "Nodes môžu byť odstránené."
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "Efekt nemá žiadne parametre.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s výstup"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "vrstva %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "zvuková stopa"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s na %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "Mapa _predchádzajúceho filtra"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Vložiť _pred"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Vložiť _po"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "Mapa _nasledujúceho filtra"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9577,84 +9698,80 @@
 "Žiaden efekt na aktuálnej stope,\n"
 "aktuálny čas.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Vybraný blok/snímok"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "_Vybrať tento blok"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "Tu _rozdeliť bloky"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Zoznam _efektov"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Nastaviť %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "_Odstrániť tento blok"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Vložiť sem"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Vložiť zvuk sem"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Vložená medzera vo vybranej stope od %.4f do %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Vložená medzera v stope %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Zrušený %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Prerobiť %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Podrobnosti multitrack"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -9662,56 +9779,62 @@
 "\n"
 " (variabilný)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "stopa %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "stopy %s a %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "vybrané stopy"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Pridané %s %s do %s z %.4f do %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Pridaný efekt %s do stopy %s z %.4f do %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "vykreslené %d snímky do nového klipu.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Prebieha čistenie..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Pozastaviť"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Pozastavené (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Stlač 'm' počas prehrávania"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "urobiť značku na časovej osi"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9719,13 +9842,13 @@
 msgstr ""
 "Vložený zvuk %.4f do %.4f z klipu %s do zvuku v pozadí od %.4f do %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr "Vložené snímky %d do %d z klipu %s do do stopy %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9734,7 +9857,7 @@
 "Časová zóna%.3f do %.3f\n"
 "vybraná.\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9742,12 +9865,12 @@
 "vyberte jednu alebo viac stôp\n"
 "k vytvoreniu regionu.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d video stopa vybraná.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9755,7 +9878,7 @@
 "dvojité kliknutie na časovú zónu\n"
 "pre odznačenie časovej oblasti."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9763,7 +9886,7 @@
 "Jednoduché kliknutie na efekt\n"
 "pre jeho vybratie."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9771,7 +9894,7 @@
 "Dvojité kliknutie na efekt\n"
 "pre jeho úpravu"
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9779,37 +9902,27 @@
 "Kliknite pravým tlačidlom myši na efekt\n"
 "pre kontextové menu.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "alebo VLOŽIŤ PO tlačítkom pre pohyb."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "vybrať časové pásmo.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "Kliknite na daľší efekt,"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -9817,46 +9930,46 @@
 "a jeho vybraním\n"
 "bude vložený"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "po.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "pred.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Odstránené hodnoty pre efekt %s v čase %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Nastaviť hodnoty pre %s %s na %s v čase %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Automatické znovu načítanie"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Rozloženie uložené do %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "klipy a snímky"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "klipy"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "snímky"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9864,7 +9977,7 @@
 "\n"
 "Automatické načítanie rozloženia.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9875,11 +9988,11 @@
 "Niektoré %s sa nenachádzajú v rozložení%s\n"
 "Preto nemohli byť správne otvorené.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "automatické zálohovanie"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9888,231 +10001,221 @@
 "\n"
 "Nedá sa načítať súbor s rozložením %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Načítavam rozloženie z %s..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d udalostí...spracovávam..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Kontrolujem a opäť vytváram zoznam udalostí"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d nájdených chýb.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps nastavené na %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack mixovanie zvuku"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Vynulovať hodnoty"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Zatvoriť mixér"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "_Usporiadanie vrstvy zvuku"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Nastavte všetky hladiny hodnôt zvuku na rovnakú hodnotu"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACK server spustený\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Nepodarilo sa pripojiť na JACK server\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Spustený podsystém jack audio.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Spustená čítačka jack audio.\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
-#, fuzzy
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 "Falling back to sox audio player.\n"
 "You can change this in Preferences/Playback.\n"
 msgstr ""
-"Ukážka viacstopého zvuku je k dispozícii s\n"
-"\"jack\" alebo \"pulse audio\" prehrávačom.\n"
-"Môžete to nastaviť v Nástroje|Predvoľby|Prehrávanie."
 
-#: src/pulse.c:89
-#, fuzzy
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 "Falling back to mplayer audio player.\n"
 "You can change this in Preferences/Playback.\n"
 msgstr ""
-"Ukážka viacstopého zvuku je k dispozícii s\n"
-"\"jack\" alebo \"pulse audio\" prehrávačom.\n"
-"Môžete to nastaviť v Nástroje|Predvoľby|Prehrávanie."
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Nepodarilo sa pripojiť na JACK server\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES: - Vybrať audio prehrávač"
+msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "nevnorený"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "vnorený"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Reakcia na udalosti joysticku z %s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Reakcia na MIDI udalosti z %s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "údaje"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "frekvencia"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "poznámka"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "hodnota"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "stav"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "premenná"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "MIDI ch %d poznámka zapnutá"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "MIDI ch %d poznámka vypnutá"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "MIDI ch %d radič %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "MIDI ch %d rozstup ohybu"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "Zmena MIDI ch %d pgm"
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "Tlačítko joysticku %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Joystick osa %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "rozsah"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ odchylka1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* stupnica"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ odchylka2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10120,199 +10223,207 @@
 "\n"
 "Kliknite na OK pre odstránenie všetkých vstupov\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "_Odstrániť všetko"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Spustiť prehrávanie videa"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Zastaviť prehrávanie videa"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "Výber klipu <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Prehrať dopredu"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Prehrávanie videa v smere dopredu"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Prehrať opačne"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Prehrávanie videa v opačnom smere"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Reverzné prehrávanie"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Reverzné prehrávanie videa"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Prehrať video rýchlejšie"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Prehrať video nepatrne rýchlejšie"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Prehrať video pomalšie"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Prehrať video nepatrne pomalšie"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "Prepnúť zmrznutie videa"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Zamrznutie videa, alebo ak už zamrzlo, uvoľniť ho"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "Nastaviť pomer videa na <fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Nastaviť pomer výstupu klipu k <float fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Štart nahrávania"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Zastaviť nahrávanie"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "Prepnúť zaznamenávanie stavu"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "Prehodiť popredie a pozadie klipu"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Vynulovať klávesy efektov"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "Vypnúť všetky efekty."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "Povoliť klávesu efektu <key>"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "Zakázať klávesu efektu <key>"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "Prepnúť klávesu efektu <key>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Nastaviť parameter hodnoty <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Nastaviť <value> z pth (číselný) parameter pre klávesu efektu <key>."
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "Prepnúť popredie na ďaľší klip"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "Prepnúť popredie na predchádzajúci klip"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "klávesa"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_pomer"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Ukladanie zariadenia pre mapovanie do súboru %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10325,7 +10436,7 @@
 "Chyba pri analýze súboru \n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10338,12 +10449,12 @@
 "Chybná verzia v súbore\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Načítavam zariadenie pre mapovanie zo súboru %s..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10560,10 +10671,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "Stíšiť zvuk"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "Stíšiť zvuk"
-
 #~ msgid "Fade"
 #~ msgstr "Slabnúť"
 
@@ -11049,9 +11156,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Kopírovanie do schránky"
 
-#~ msgid "_Top"
-#~ msgstr "_Hore"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "_Vertikálne prvky"
 
@@ -11061,10 +11165,6 @@
 #~ msgid "_White is transparent"
 #~ msgstr "_Biela je priehľadná"
 
-#, fuzzy
-#~ msgid "_Wrap Around"
-#~ msgstr "_Zalomenie: "
-
 #~ msgid "_X Center"
 #~ msgstr "_X stred"
 
@@ -11315,110 +11415,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Musíte najskôr nastaviť CD jednotku v Nastaveniach."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LiVES nemohol nájsť dostatok požadovaných stôp."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Skúste znova s inými hodnotami."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name zlyhal:"
 
 #~ msgid "$error"
 #~ msgstr "$chyba"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Nepodarilo sa pripojiť na JACK server\n"
-
-#~ msgid "Red"
-#~ msgstr "Červená"
-
-#~ msgid "error.\n"
-#~ msgstr "Chyba.\n"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "nedá sa čítať súbor\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
-
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "Nedá sa čítať predvolený súbor\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to read sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nedá sa prečítať veľkosť súboru\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES nemôže zapisovať do súboru:\n"
-#~ "%s\n"
-#~ "Prosím skontrolujte práva k súboru a skúste znova."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write script file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nedá sa napísať skript súboru\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
+#~ msgid "Default value:    "
+#~ msgstr "Predvolená hodnota:    "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write filter defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nedá sa zapisovať do predvoleného súboru\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
+#~ msgid "Minimum value: "
+#~ msgstr "Minimálna hodnota: "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Nedá sa prepísať predvolená veľkosť súboru\n"
-#~ "%s\n"
-#~ "Kód chyby %d\n"
+#~ msgid "Maximum value: "
+#~ msgstr "Miximálna hodnota: "

LiVES-1.6.1.tar.bz2/po/te.po -> LiVES-2.0.3.tar.bz2/po/te.po Changed

LiVES-1.6.1.tar.bz2/po/tr.po -> LiVES-2.0.3.tar.bz2/po/tr.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-08-18 12:12+0000\n"
-"Last-Translator: salsaman <salsaman@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-21 20:42+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -43,7 +59,7 @@
 "Teşekkür ederiz. Eğer LiVES yeniden başlatırsanız çalışmanızı kurtarmanız "
 "mümkündür.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -55,7 +71,7 @@
 "Lütfen hata raporuna İşletim sistemi, dağıtım ve LiVES sürüm bilgilerini "
 "ekleyiniz ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -63,7 +79,7 @@
 "ve daha fazla bilgi aşağıda gösterilmiştir:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -73,163 +89,184 @@
 "birlikte çalıştırın.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Koruma ayarları.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Yeniden boyutlandırma"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "Tüm çerçeveleri yeniden boyutlandır"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Herhangi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Boş"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "tavsiye"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "Engelli!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Mevcut yerleşim düzeni**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Yapısal"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Özel"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Sınama"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...bulundu..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...BULUNAMADI..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite ... bulundu ..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite ... BULUNAMADI ..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...bulundu\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...BULUNAMADI\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...bulundu..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...BULUNAMADI..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...bulundu..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...BULUNAMADI..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "Pulse audio... algılandı..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse audio...ALGILANMADI..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...bulundu..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...BULUNAMADI..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...bulundu..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...BULUNAMADI..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...bulundu..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...BULUNAMADI..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -240,22 +277,48 @@
 "\n"
 "Pencere yöneticisi raporları olarak \"%s\"; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "bulunan monitor sayısı : %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Geçici dizin:% s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -265,15 +328,15 @@
 "ses desteği olmadan derlenmiştir.\n"
 "Bir çok ses özelliği kullanılamaz.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Jack desteği ile derlendi, iyi!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Pulse audio desteğiyle derlendi, mükemmel!\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -282,7 +345,7 @@
 "LiVES'a Hoşgeldiniz version %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -291,131 +354,131 @@
 "\n"
 "Başlangıç yazım şekli: % s [opts] [dosyaadı [başlangıç zamanı] [kare]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "başlama_zamanı : Saniye cinsinden dosya ismi başlama zamanı\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "Çerçeveler: en çok sayıda çerçeve açmak için\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "opts olabilir:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help: Bu yardım metnini ve çıkışı gösterir\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : Başlangıçta herhangi bir ayar yükleme\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : çökmesi durumunda zorla yükleme\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : çökmesi durumunda zorla yükle\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui :arayüzü gösterme\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : Klip düzenleyici kipinde başlat\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : çok parçalı kipte başlatmak\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : OSC dinleyicisini başlatma\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 "-aplayer <ap> : Seçili audio oynatıcı ile başlat. <ap> mplayer olabilir."
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr "sox veya jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " veya sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : Çöküş nedeni bulmak için ('gdb' kurulu olması "
 "gereklidir)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Grafiksel kullanıcı arayüzü başlıyor..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -423,25 +486,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"Tema konumunda bulunamadı. Lütfen temanın yüklü olduğundan emin olun\n"
-"%s/%s.\n"
-"(Belki değerini değiştirmeniz gerekir <prefix_dir> dosyanız ~/.lives )\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES küçük dosyası  /tmp e yazamadı.\n"
-"Lütfen yeniden deneyin ve / tmp yazma erişimi olduğundan emin olun.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -455,55 +511,37 @@
 "Lütfen LiVES ı çalıştımadan önce paket ile birlikte\n"
 "gelen README dosyasını inceleyin.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol edip tekrar deneyin.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol\n"
-"edip tekrar deneyin.\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES geçici dizini kullanmak başaramadı\n"
-"%s\n"
-"\n"
-"Lütfen <tempdir> ayarını kontrol edin\n"
-"%s/.lives\n"
-"ve tekrar deneyin\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -511,10 +549,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES görüntü yakalanamadı\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -532,7 +568,7 @@
 "\n"
 "Teşekkür ederim.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -542,7 +578,14 @@
 "LiVES  çalışması için 'mplayer' veya 'sox'  gereklidir. Lütfen birini yada "
 "her ikisini yükleyin ve yeniden deneyin.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -552,7 +595,7 @@
 "LiVES 'mplayer' ı bulamadı. Tüm işlevleri kullanabilmek için mplayer "
 "yükleyebilirsiniz.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -562,7 +605,7 @@
 "LiVES convert'  bulunamadı. Render efektlerini kullanabilmeniz için convert "
 "ve image-magick yüklemeniz gereklidir.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -572,7 +615,7 @@
 "LiVES 'composite' bulunamadı. Birleştirme işlevlerini kullanabilmeniz için "
 "composite ve image-magick  yüklemeniz gereklidir.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -582,7 +625,7 @@
 "LiVES 'sox' 'bulamadı. Bazı ses özellikleri çalışmayabilir. 'sox' yüklemeniz "
 "gereklidir.\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -590,68 +633,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES kodlayıcı eklenti bulamadı.\n"
-"Lütfen bunlaın doğru yüklü olduğundan emin olun.\n"
-"%s%s%s/\n"
-"Onlarsız kaydetmek mümkün değl.\n"
-" ~/.lives içinde <lib_dir> değerini değiştiriniz.\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "%s ayarı otomatik yükleniyor..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Geçersiz ses çalar % s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d çerçeveler %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Dosya Yok>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "kayıt %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!kayıt %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Oynat"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -659,35 +696,35 @@
 "LiVES görüntü yakalanamadı\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Dosya kapandı %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Geri Al"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Yinele"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Sol Ses"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Sağ ses"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -701,26 +738,11 @@
 "arasında geçiş yapamazsınız.\n"
 "Lütfen Tercihlerden çalma seçeneklerini ayarlayın ve tekrar deneyin.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - Oynatma Penceresi"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Oynatma Penceresi"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -730,7 +752,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -740,8 +762,8 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -750,13 +772,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Dizini oluştur\n"
-"%s\n"
-"?\n"
-"\n"
-"(Boş alan = %.2f GB)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -765,11 +782,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Dizin adı çok uzun !"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -777,7 +794,7 @@
 "LiVES İÇİN SEÇTİĞİNİZ AUDIO PLAYER BAŞLATILAMADI!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -787,7 +804,7 @@
 "\n"
 "PULSE AUDIO çoğu kullanıcı için önerilir"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -795,7 +812,7 @@
 ", ama LiVES ın bu sürümü pulse audio desteği ile derlenmedi.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -805,11 +822,11 @@
 "LiVES çalıştırmadan önce pulse audio yüklemeniz tavsiye edilir.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK ses profesyonel kullanıcılar için önerilir"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -817,7 +834,7 @@
 ", ama LiVES bu sürümü jack ses desteği ile derlenmemiş.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -827,7 +844,7 @@
 "isteyebilirsiniz.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -838,11 +855,11 @@
 "LiVES jack ile başlamaz ise yeniden başka bir ses çalar ile deneyin.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -850,7 +867,7 @@
 "ancak bazı ses özellikleri devre dışı bırakılır.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -860,7 +877,7 @@
 "LiVES çalıştırmadan önce yüklemeniz tavsiye edilir.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -868,133 +885,141 @@
 "MPlayer ses çalar için sadece test amaçlı önerilmektedir.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES - ses çalar seçin"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "_pulse ses çalıcısı kullan"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Ses çalar jack kullanıyor"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "_sox ses çalıcısı kullan"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "_mplayer ses çalıcısı kullan"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Sonraki"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Atlandı"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Geçti"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Başarısız"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Yapılandırma Kontrol Ediliyor"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Sorun giderme"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES temel yapılandırma testi başlatılıyor\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr "LiVES tüm ses özellikleri kullanabilmek için sox yüklemek gerekir"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "sox ile ses dönüştürme kontrol ediliyor"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "%s üretci başlayamıyor\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "sox_fmt_all or similar ve benzeri yüklemelisiniz"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "\"Mplayer\" varlığının kontrol edilmesi"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 "LiVES'ın tüm çözme özelliklerini kullanabilmek için mplayer yüklemelisiniz"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "mplayer ile ses dönüştürme kontrol ediliyor"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "pcm/wav desteği için mplayer yüklemelisiniz"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Yeni bir sürüme yükseltmek istiyormusunuz"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "png/alpha veya jpeg desteği için mplayer yüklemelisiniz."
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "jpeg çıkış desteği eklemek için mplayer yükleyebilirsiniz"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "\"convert\"  varlığının kontrol edilmesi"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Tüm render efektlerini kullanmak için  imageMagick yükleyebilirsiniz"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1006,7 +1031,7 @@
 "    İptal tuşuna basıp çıkabilirsiniz ve eksik bileşenleri yükleyebilirsiniz "
 "veya devamı için ileri tuşuna    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1016,7 +1041,7 @@
 "\n"
 "Son olarak, LiVES için başlatma arayüzü öntanımlı seçebilirsiniz.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1027,7 +1052,7 @@
 "LiVES iki ana arayüzü bulunmaktadır ve başlangıçta onlar ile "
 "başlayabilirsiniz.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1037,73 +1062,73 @@
 "\n"
 "Tercihlerden ön tanımlılar her zaman değiştirilebilr.\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Başlangıç arayüz seçimi"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "_Klip düzenleme kipinde başla"
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Son"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Deinterlace uygula"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Önizleme"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "video _önizleme için buraya tıklayın"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - İşleniyor..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1115,8 +1140,8 @@
 "\n"
 "Lütfen Bekleyin"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1124,108 +1149,114 @@
 "\n"
 "Lütfen Bekleyin"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Ayrıntıları göster"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Yeterli"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Önizleme"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Durakla_t"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "Duraklat/_Yeterli"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Biçim"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Çerçeve boyutu"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Dosya boyutu"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Bayt boyutu"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Toplam süre"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Çerçeveler"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Eylemler"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Ses"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Oran / boyut"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Sağ ses"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LIVES - Kodlama seçenekleri"
 
-#: src/interface.c:884
-#, fuzzy
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
-msgstr "<------------- (Önerdiği boyutlandırma için kutuyu işaretleyin)"
+msgstr ""
 
-#: src/interface.c:885
-#, fuzzy
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
-"<------------- (Tavsiye edilen boyutu kullanmak için kutuyu işaretleyin)"
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Ayarlarımı tut"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Tavsiye edilen ayarları kullan"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1233,76 +1264,75 @@
 "bu ve diğer uyarıları gösterme.\n"
 "(Tercihler / Uyarılar dan tekrar geri dönülebilir)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "_Detayları Göster"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "_Pencereyi Kapat"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "Dosyaya _kaydet"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LIVES - Ekle"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "Ses uyacak şekilde ekle"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Seçim _öncesi ekle"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Seçim _sonrası ekle"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Seçildikten sonra çerçeveyi panoya ekle"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Ses ile ekle"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Ses olmadan ekle"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES - Seçimi aç"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Seçim başlama zamanı (sn)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Açılacak kare sayısı"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LIVES - Açma Konumu"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - klip in ismini değiştir"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1319,7 +1349,7 @@
 "olun\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1328,47 +1358,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "bant genişliği bilgisi gönderme"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Eğer akışta problem yaşıyorsanız bu ayarı deneyin"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - klip in ismini değiştir"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Ayarlama Adını Girin"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Çalışma Dizini Seçin"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1380,7 +1425,7 @@
 "Lütfen kullanmak istediğiniz adını girin.\n"
 "LiVES çıkmak istediğinizde klibi kaydetmek için hatırlatacaktır\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1388,7 +1433,7 @@
 "Bu projeyi dışarı çıkarmak için bu klip için isim girmelisiniz.\n"
 "Bu aynı zamanda projenin adı kullanılır.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1398,245 +1443,200 @@
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"Öncelikle LiVES için bir çalışma dizini seçme ihtiyacı var.\n"
-"Disk alanında yeterli boş alan olmalıdır.\n"
-"Not, bir çok sistemde /tmp kapatma zamanında temizlenir bu nedenle /tmp "
-"oluşturmak yanlış olabilir\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - klip in ismini değiştir"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Ayarlama Adını Girin"
 
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - Ayarlama Adını Girin"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Çalışma Dizini Seçin"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Yeni isim "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Ayar ismi "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "Varsayılanı kullan"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "_Gelişmiş"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- CD parçası yükle"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LIVES: - DVD Başlık / Bölüm seçimi"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LIVES: - VCD Başlığı Seçiniz"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LIVES - Maksimum Görünür Parça Sayısını Değiştir"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Aygıt detayları"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Parça yükleme ( %s den)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD Başlığı"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD Başlığı"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "parça azami sayısını görüntülemek için"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Aygıt: /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Aygıt:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Bölüm  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Kanal  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Ses nosu  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "Giriş numarası"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "Ön tanımlı genişlik, yükseklik ve FPS kullanımı"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Genişlik"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Yükseklik"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Sürücü"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Çıktı biçimi"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Ses girişini zayıflatmak"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Ses çıkışını zayıflatmak"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "birinci"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "sonuncu"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "saniye."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "seçim"
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LIVES - Rastgele Müzik çal"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Parça Talep Sayısı:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Dizin:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Alt dizinler dahil"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Minimum Dosya Boyutu (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Maksimum Dosya Boyutu (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "seleksiyon"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES - Dosya Yorumları (isteğe bağlı)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Başlık / İsim: "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Yazar / Sanatçı: "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Açıklama: "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: src/interface.c:3301
-#, fuzzy
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
-msgstr "Dosyaya _kaydet"
+msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "Gözat..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: bir dizin seçin"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: bir dosya seçin"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES - İptal / Sil / Kaydet"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1646,7 +1646,7 @@
 "Geçerli yerleşim düzeni kaydedilemedi\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1656,14 +1656,14 @@
 "Geçerli yerleşim düzeni son kayıttan bu yana değiştirilmiştir.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1671,7 +1671,7 @@
 "Geçerli klip set kaydedilmedi.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1679,7 +1679,7 @@
 "Mevcut düzen kaydedilmedi.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1687,137 +1687,131 @@
 "Mevcut yerleşim düzeninde o son kaydedilen bu yana değişlik olmamıştır.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "Klip ayar ismi"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "Değişiklikleri Yoksay"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "Klip ayarlarını sil"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "Düzeni sil"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "Yerleşim Düzenini _Kaydet"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "Klip ayarlarını kaydet"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: Yerleşim düzenini kurtar ?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LIVES - Kodlama seçenekleri"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "_Değerleri Sıfırla"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Ayarlar kaydediliyor %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Dosya Seçin"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "%s ayarı otomatik yükleniyor..."
+msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"LiVES küçük dosyası  /tmp e yazamadı.\n"
-"Lütfen yeniden deneyin ve / tmp yazma erişimi olduğundan emin olun.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Bu dosya"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1827,7 +1821,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1837,14 +1831,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1852,7 +1846,7 @@
 "\n"
 "Geçersiz proje dosyası.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1865,33 +1859,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Proje içeriye alınıyor"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "%s... Proje dışarıya aktarılıyor"
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Proje dışarıya çıkartılıyor"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr ".lv1 dosyası geri yükleniyor"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr ".lv1 dosyası olarak yedekle"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr ".lv1 dosyası geri yükleniyor"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1899,97 +1893,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "Ayar siliniyor..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Ayar siliniyor..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Ayarları sil"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Sessiz ekle"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Geri alınıyor"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Çerçeve resimleri siliniyor"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Fazla çerçeveler siliniyor"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Yineleniyor"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Klipten çerçeveler alınıyor"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Panoya kopyalanıyor"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Kes"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Yapıştırılıyor"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2003,31 +1997,31 @@
 "Try selecting all frames, and then using \n"
 "the 'Trim Audio' function from the Audio menu."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2035,7 +2029,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2044,30 +2038,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Ekleniyor"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Zamanlar%d panodan%s ekleniyor..."
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Çerçeveler%d panodan%s ekleniyor..."
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Ekle"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2077,49 +2071,49 @@
 "Bu dosyayı kapatınca tüm çerçeveler silinecek.\n"
 "Emin misiniz ?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Çerçeveler siliniyor %d to %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Siliniyor"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Sil"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2129,7 +2123,7 @@
 "\n"
 "Seçim kilitlendi.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2137,11 +2131,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Kayıt iptal edildi.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2154,7 +2148,7 @@
 "'%s' eklenti raporu:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2163,7 +2157,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2172,22 +2166,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Ayarlar kaydediliyor %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Klip ayarlardan yükleniyor %s"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2195,41 +2189,37 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Disk alanı temizleniyor..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "Disk alanı temizleniyor"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d MB  disk alanı  kazanıldı.\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Çerçeve hızları ve çerçeve değerleri sıfırlanıyor..."
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"Harici: %s\n"
-"Dahili: %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "ara belleğe alınmış"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2237,7 +2227,7 @@
 "\n"
 "  Açılıyor..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2246,7 +2236,7 @@
 "\n"
 "(%d sanal)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2255,7 +2245,7 @@
 "\n"
 "(%d çözümlenmiş)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2264,7 +2254,7 @@
 "\n"
 "  %.2f sn."
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2272,23 +2262,23 @@
 "\n"
 "  Bilinmiyor"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "imzasız"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "imzalandı"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2297,7 +2287,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2314,11 +2304,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Bir video düzenleyicisi ve VJ programı."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Angel Spy https://launchpad.net/~dilara.ekinci\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Yusuf ÜLKÜ https://launchpad.net/~yusufulku\n"
+"  gamer https://launchpad.net/~pardus-gamer\n"
+"  linuxseven https://launchpad.net/~linuxseven\n"
+"  salsaman https://launchpad.net/~salsaman\n"
+"  zeugma https://launchpad.net/~sunder67"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2332,21 +2338,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2354,170 +2360,182 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Ses açılıyor"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "İptal ediliyor"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Yeni ses: %d Hz %d kanal %d bps\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Yeni ses"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d çerçeve yeterli !\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Tam ekran oynatma (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Tam ekran oynatma (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Çift boyut (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Tek boyut (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Oynatma penceresini gizle (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Oynatma penceresini göster (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Ses hacmi (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Sesi kesme (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Sesi kes (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Yüklenen altyazı dosyası: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "Altyazılar silindi.\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Ses dosyasını seçin"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Lütfen Araçlar | Tercihler | Çeşitli  menüsünden CD oynatma aygıtını "
 "ayarlayınız.\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "CD parçası %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "CD parçası açılıyor..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "CD parçası yüklenirken hata veriyor\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Parça seçilmesi"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "Düzen hataları"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Pencere Kapat"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Hataları sil"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "Etkilenen düzenleri sil"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Devam Et"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2527,27 +2545,27 @@
 "Duraklatıldı\n"
 "(İşleme devam etmek için tıklayınız )"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "duraklatıldı..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Durdur"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Koru"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "Yeter"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2555,30 +2573,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "_Durdur"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "%s... çerçeve olarak kaydet"
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2587,7 +2603,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2595,7 +2611,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2603,7 +2619,7 @@
 "\n"
 "Kayıt süresi 0'dan büyük olmalıdır.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2612,17 +2628,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2632,19 +2648,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2653,1057 +2669,1026 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Ses dışa aktarılıyor"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Ses Dosyası Ekleme..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "%s Ses dosyası  ekleniyor"
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "ses ekleniyor"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Ses ekle"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Ses Kırpılıyor/Dolgulanıyor"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Ses Kırp/Dolgu"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Tüm sesler siliniyor..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Ses siliniyor"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Sesi sil"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Yeni ses kaydet"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmap dosyasını bulamadı: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Birleştir"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Çerçeve _ekle"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "Çerçeve _Çıkar"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_Geçiş Yöntemi:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Birleştirme yapıldı.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Özel Efektler"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "Özel _Yardımcılar"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Dosya"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Dosya/Klasör Aç"
 
-#: src/gui.c:343
-#, fuzzy
+#: src/gui.c:360
 msgid "O_pen Part of File..."
-msgstr "_Son Dosyalar ..."
+msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "_Konum/Akış Aç..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
-#, fuzzy
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
-msgstr "_dvd/vcd den seçimi içeri al"
+msgstr ""
 
-#: src/gui.c:381
-#, fuzzy
+#: src/gui.c:398
 msgid "Import from _dvd"
-msgstr "_dvd den seçimi içeri al"
+msgstr ""
 
-#: src/gui.c:384
-#, fuzzy
+#: src/gui.c:401
 msgid "Import from _vcd"
-msgstr "_Aygıttan içeri al"
+msgstr ""
 
-#: src/gui.c:387
-#, fuzzy
+#: src/gui.c:404
 msgid "_Import from Firewire"
-msgstr "_Aygıttan içeri al"
+msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "_Firewire aygıtından (dv) içeri al"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "_Firewire aygıtından (hdv) içeri al"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
-#, fuzzy
+#: src/gui.c:459
 msgid "Add _Unicap Device"
-msgstr "_TV aygıtı canlı yayın ekle"
+msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr "_Firewire aygıtı canlı yayın ekle"
 
-#: src/gui.c:461
-#, fuzzy
+#: src/gui.c:478
 msgid "Add _TV Device"
-msgstr "_TV aygıtı canlı yayın ekle"
+msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Son Dosyalar ..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "Klip ayarını _tekrar yükle"
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "_Tüm klipleri kaydet/kapat"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "Klibi farklı adla _kodla..."
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Seçimii farklı adla _kodla..."
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "Bu klibi _kapat"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "Klip _Yedeği .lv1 i Farklı Kaydet..."
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ".lv1 den klibi _geri yükle..."
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Sesli Kodla/Yükle/Yedek"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "Altyazıları otomatik yükle"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Disk alanını temizle"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Çok parçalı kip"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "Seçimi _kopyala"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Seçimi ke_s"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "Panodan _ekle..."
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "_Yeni Olarak Yapıştır"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "Seçimi pano ile _birleştir..."
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "_Seçimi sil"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "_Seç..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "_Tüm çerçeveleri seç"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Son  _efektii seç"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Seçimi Tersine Çevir"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "Genişlik Seçimini _Kilitle"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Oynat"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "Tümünü _Oynat"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Seçim O_ynat"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "_Panoyu oynat"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Durdur"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "_Geriye sar"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Tam Ekran"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Çift boyut"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Boş arkaplan"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Otomatik) Video _döngüsü (ses e uyacak şekilde)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Sürekli dö_ngü"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "_Sessiz"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "Çerçeve saymayı _göster"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "Altyazıları Göster"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Efekt_ler"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Geçerli seçime efektleri uygula"
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Araçlar"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Yardımcılar"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "_Üret"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Özel _Araçlar"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "_Üret"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "redener efekt eklentisi yükleniyor"
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr "Altyazıları silme"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "_Dış Pencere Yakala... "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Tercihler"
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Ses"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Klip için _Yeni Ses Yükle..."
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "_CD Parçası Yükle..."
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "_CD'yi Çıkart"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "_Dış Kaynaklı Ses kaydı"
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "Yeni _Klip e..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "_Seçime"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "Ses _Çıkart..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "_Seçili Sesi Çıkart..."
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "_Tüm sesleri çıkart"
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "Sesi _sil"
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Seçilmiş Sesi sil"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Tüm sesi sil"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "xmms  Kullanarak Müzik Çalın...."
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "xmms  Kullanarak Rastgele  Müzik"
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "_Bilgi"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Klip Bilgisini _Göster"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Dosya Açıklamalarını Düzenle_/Göster"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "_Pano Bilgisini Göster"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "_Mesajları Göster"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "_Yerleşim düzeni hatalarını göster"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Klipler"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "_Gelişmiş"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "Proje (.lv2) _dışarı çıkartılıyor..."
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Gerçek Zamanlı _Efekt Haritası"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Gerçek zamanlı efektler için ctrl-sayı tuşları atama."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Gerçek zamanlı efekt ön tanımları ayarla"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/denetim kolu arayüz"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "VJ _Tuşlarını Göster"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "_Araçlar"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Hiçbiri"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (Geniş band)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Yardım"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "Kılavuz (tarayıcıda açılır)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "Projeye _Bağış !"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "Yazara _E-posta"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "_Hata Raporu"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Bir özellik _önerin"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Sorun Giderici"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Hakkında"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Tümünü oynat (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Oynatmayı durdur (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Seçimi oynat (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Ses Düzeyi"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Ses düzeyi (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Dolu arkaplan (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Yavaş oynat (ctrl-down)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Hızlı oynat (ctrl-up)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "İleri gitme (ctrl-right)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Klip bilgisini göster (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Araç çubuğunu gizle"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "İlk Kare"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Son Çerçeve"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Başlatılıyor ...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Kayıt durdurmak için 'q'  tuşuna bas. OYNATMA PENCERESİNİ KAPATMAYIN !   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Önizleme için çerçeve sayısı"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "_Serbest"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Çerçeve sayısı özgür seçim"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "_Başlat"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Son"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "_İşaretçi"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Geriye Sar"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Tümünü oynat"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Seçimi oynat"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Döngüyü Aç/Kapat"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "_Kaydı başlat"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "_Kaydı durdur"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "_Kayıt Performansı"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Oynatma Penceresini Gizle"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Oynatma Penceresini Göster"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
-#, fuzzy, c-format
+#: src/utils.c:500
+#, c-format
 msgid "%.2f KiB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Panoyu temizle"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3711,81 +3696,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3793,7 +3778,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3801,32 +3786,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3834,68 +3819,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "%s Yerleşim düzeni kaldırıldı\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Video [açılıyor ...]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sn]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Tanımsız)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Video yok)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Ses yok)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Mono  [açılıyor...]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Sol Ses [açılıyor...]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sn]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Sol Ses [%.2f sn]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Sağ Ses [açılıyor...]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Sağ Ses [%.2f sn]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3910,53 +3895,64 @@
 "\n"
 "Üzerine yazayım mı ?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "_Geri al %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "_Yinele %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "------------- Seçim ------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sn ] ----------Seçim---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " çerçeve ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Dosya başlığı incelenmesi"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılıyor"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " sessiz"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3968,11 +3964,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3980,7 +3976,7 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -3990,7 +3986,7 @@
 "\n"
 "Dosyayı açmak için mplayer yüklemeniz gerekebilir.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4002,31 +3998,29 @@
 "Lütfen Araçlar | Tercihler | Çözücü menüsündeki\n"
 "video ayarlarını kontrol edin.\n"
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "%s... çerçeve olarak kaydet"
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "%s... çerçeve olarak kaydet"
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - klip in ismini değiştir"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4034,33 +4028,29 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "seleksiyon"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "seçimi bağlama"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (sessiz)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Kaydetmek [Uzun bir zaman alabilir]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4070,34 +4060,33 @@
 "\n"
 "Kodlama hatası - çıktı dosyası oluşturulamadı!\n"
 
-#: src/saveplay.c:1800
-#, fuzzy
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
-msgstr "Panoyu temizle"
+msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "Dosya  boyutu %.2fMB  oldu\n"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Kayıt performansı ..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Ortalama  FPS %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4106,16 +4095,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Adsız Belge%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4123,7 +4112,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4135,12 +4124,12 @@
 "fps \n"
 "Ön tanımlılar Araçlar | Tercihler | Çeşitli menüsünden ayarlanabilir.\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4149,7 +4138,7 @@
 "Çerçeveler=%d tipi=%s boyut=%dx%d *bpp=Gri tonlama* fps=%.3f\n"
 "Ses:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4158,49 +4147,44 @@
 "Çerçeveler=%d tipi=%s boyut=%dx%d bpp=%d fps=%.3f\n"
 "Ses:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Hz %d kanal %d bps\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Yorum: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Yedekleniyor"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Yeniden Yükleniyor %s..."
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Yeniden Yükleniyor"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4210,34 +4194,30 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "kayıt %.2f MB"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!kayıt %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
-#, fuzzy
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
-msgstr "kayıt %.2f MB"
+msgstr ""
 
-#: src/saveplay.c:4819
-#, fuzzy, c-format
+#: src/saveplay.c:5058
+#, c-format
 msgid ""
 "\n"
 "RECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %ld GB !\n"
 "Record stop level can be set in Preferences.\n"
 msgstr ""
-"\n"
-"KAYIT DONDURULDU ÇÜNKÜ BOŞ DİSK ALANI DÜŞÜK %ld GB !\n"
-"Tercihler menüsünden kayıt durdurma seviyesi ayarlanabilir.\n"
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4247,64 +4227,59 @@
 "LiVES ın bir önceki çalışmasından dosyalar bulundu.\n"
 "Onları kurtarmak için istiyor musunuz?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Dosyalar kurtarılıyor"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Dosyalar kurtarılıyor..."
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Etkilenen _yerleşim düzenini göster"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "Disk alanı temizleniyor"
+msgstr ""
 
-#: src/dialogs.c:155
-#, fuzzy
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
-msgstr "%s gelişmiş ayarlar"
+msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Uyarı !"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "uyarı"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES: - Renk Seçimi"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "Hataları sil"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "_Hakkında"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4315,7 +4290,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4327,11 +4302,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4343,25 +4318,25 @@
 "LiVES Bu işlemi yetersiz hafıza nedeniyle gerçekleştiremedi.\n"
 "Lütfen önce diğer bazı uygulamaları kapatarak deneyin.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4370,7 +4345,7 @@
 "\n"
 "%d/%d çerçeve açıldı.\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4379,7 +4354,7 @@
 "\n"
 "%d çerçeve açıldı.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4388,7 +4363,7 @@
 "\n"
 "Kalan süre:% d saniye"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4399,7 +4374,7 @@
 "Üzgünüz, LiVES bir seferde sadece d% dosya açabilirsiniz \n"
 "Lütfen bir dosyayı kapatın ve yeniden deneyin."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4418,7 +4393,7 @@
 "\n"
 "Lütfen bu dizine yazabilir olduğuna emin olun."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4429,7 +4404,7 @@
 "veya Araçlar | Tercihler | Kodlayıcı  menüsünden başka kodlama biçimini "
 "ayarlayın.\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4437,19 +4412,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4457,83 +4432,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", Imzalandı"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", imzasız"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "%d x %d piksel için dosya boyutu ayarla\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "%d x %d piksel için dosya boyutu\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES gerekli:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4542,14 +4517,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4558,7 +4533,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4569,7 +4544,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4578,11 +4553,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Kısayol Tuşları Göster"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4624,11 +4599,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Çoklu parça kip tuşları"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4650,17 +4625,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Mesaj geçmişi"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4668,10 +4644,10 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4681,18 +4657,18 @@
 "\n"
 " (Dosya adları ile sona ermelidir .mp3,. .ogg, .wav,. .mod, .xm veya .it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "başarısız (Bilinmeyen tip)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4701,7 +4677,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4709,7 +4685,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4717,7 +4693,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4728,7 +4704,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4738,7 +4714,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4746,7 +4722,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4755,13 +4731,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4772,13 +4748,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4788,7 +4764,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4797,7 +4773,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4805,7 +4781,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4813,63 +4789,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4877,14 +4853,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4893,25 +4869,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4920,34 +4896,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "iptal edildi.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "başarısız.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "tamam.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "Başarısız . dosyada hata\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -4955,15 +4931,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol\n"
-"edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -4971,15 +4941,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol\n"
-"edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -4987,29 +4951,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol\n"
-"edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5017,29 +4970,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol\n"
-"edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5047,19 +4989,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES %s/.lives yapılandırma dosyasını\n"
-"okuyamadı\n"
-"\n"
-"Lütfen bu dosya için dosya izinlerini kontrol\n"
-"edip tekrar deneyin.\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5068,7 +5004,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5077,7 +5013,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5086,14 +5022,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5101,13 +5045,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5117,27 +5061,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5146,14 +5090,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5164,19 +5108,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5184,7 +5128,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5192,7 +5136,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5204,45 +5148,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"LiVES'a Hoşgeldiniz version %s.\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5251,219 +5193,289 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "üretici"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "üretici"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "Üreteç -"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "geçiş"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Geçişler"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "efekt"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Efektler"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Yardımcı Araçlar"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "ayrac"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "dönüştürücü"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "dönüştürücüler"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "ses / video"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Ses/Video geçişleri"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "sadece video"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Sadece Video Geçişleri"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "sadece ses"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Sadece  Ses Geçişleri"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "ses"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Ses Mikserleri"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Ses Efekti"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Ses Seviye Kontrolleri"
 
-#: src/effects.c:107
-#, fuzzy
+#: src/effects.c:128
 msgid "video analyser"
-msgstr "sadece video"
+msgstr ""
 
-#: src/effects.c:108
-#, fuzzy
+#: src/effects.c:129
 msgid "Video analysers"
-msgstr "sadece video"
+msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "sadece ses"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "Ses  parametreleri"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s tüm kareler..."
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "Panoya %s ..."
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "Yeni klip için %s ..."
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "Yeni klip için %s"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5472,131 +5484,310 @@
 "Bilgi: %s eklentisi yüklenemiyor\n"
 "Hata:% s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "Alt dizinler dahil"
+msgstr ""
+
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "%d Weed filtresi başarıyla yüklendi\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "%s üretci başlayamıyor\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "%s üretici başlatılamadı\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr ""
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr ""
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr ""
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr ""
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr ""
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr ""
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr ""
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr ""
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr ""
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "_Değerleri Sıfırla"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Çerçeve"
-
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/framedraw.c:267
+msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: Dosya Seç"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "Geçiş _İçeri"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Geçiş içeri"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr ""
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr "video ile ses geçiş yapmak için kutuyu işaretleyin"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr ""
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "Geçiş dışarı"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr ""
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s : boyut"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Yeni boyut (pixels)"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Genişlik"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Yükseklik"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5604,74 +5795,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Öntanımlı olarak ata"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "Pencereyi kapat"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Parametre yok"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Geçersiz parametre"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Renk Seçimi"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Renk atamak için tıklayın"
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "_Yinele"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Kırmızı değeri (0 - 255)"
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "Yeşil"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Yeşil değeri (0 - 255)"
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "Mavi"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Mavi değeri (0 - 255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " :  %s mesajı oldu\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5681,17 +5869,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "ön tanımlı %s adresten video oynatma eklentisi yükleniyor ..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5701,32 +5889,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "eklenti için çerçeve hızı düzeltildi.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr ""
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "eklenti için çerçeve hızı düzeltildi.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5735,14 +5923,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5752,40 +5933,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5794,11 +5982,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Yeniden boyutlandırılamadı, lütfen imageMagick yükleyin.\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5807,7 +5995,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5817,193 +6005,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/bilinmeyen"
 
-#: src/plugins.c:2446
-#, fuzzy
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
-msgstr "LIVES - Kodlama seçenekleri"
+msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s gelişmiş ayarlar"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - RFX Yeni Test"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Tip:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Efekt -"
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Geçiş -"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Üreteç -"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Araç -"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Donatı -"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Adı:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Sürüm:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Betik vsürümü."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Geliştirici:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Betik Geliştiricisi"
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    URL (isteğe bağlı):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "Eklenti bakımcısı için URL"
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menü metni:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Eylem açıklaması:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "En az çerçeve sayısı"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Gereksinimler...."
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Eklenti özelliklerini ayarlama. İsteğe bağlı."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Parametreler..."
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Parametre _Pencere İpuçları..."
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Dil kodu:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "_Döngü kodu..."
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6018,55 +6189,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX Gereklilikleri"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parametreleri"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "_Yeni Girdi"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Girdiyi düzenle"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "_Girdiyi kaldır"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "_Yukarı Taşı"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "_Aşağı Taşı"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX Özellikleri"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6075,7 +6246,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6083,231 +6254,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Yeni RFX Parametresi"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - RFX Parametresini düzenle"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_İsim:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Etiket:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "Buton _Grubu: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Tip:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Parametre tipi (listeden seçin)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "_Ön tanımlı değer:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_Ön tanımlı "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "Buton _Grubu: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "_En küçük değer: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "En _büyük değer: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     _Adım büyüklüğü:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Ön tanımlı değer:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "En düşük değer: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "En büyük değer: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Ön tanımlı _Kırmızı:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Ön tanımlı _Yeşil:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Ön tanımlı _Mavi: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "ön tanımlı değer:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "En büyük uzunluk (karakter): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Anahtar kelime:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Özel Tip:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Satır:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Bağlantılı parametreler (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Bağlantılı parametreler (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Bağlantılı parametreler (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Döngü Kodu"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Varsayılan metin (mak. uzunluk %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6315,28 +6474,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6345,41 +6504,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6389,27 +6548,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "özel..."
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6418,7 +6577,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6428,12 +6587,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6443,7 +6602,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6453,12 +6612,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6466,23 +6625,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6492,55 +6651,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Yapısal"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Özel"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Sınama"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Yeni isim: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6548,26 +6695,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6575,7 +6733,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6583,42 +6741,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"Dizini oluştur\n"
-"%s\n"
-"?\n"
-"\n"
-"(Boş alan = %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6630,20 +6790,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6651,790 +6811,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Tercihler"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Genişlik           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Yükseklik      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr "          _FPS"
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "saniye"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Hiçbir Zaman"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Varsayılan görüntü formatı          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Eklenti"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "VİDEO"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "SES"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Oynat"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "_Çerçeve değişiklikleri"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "_FPS değişiklikleri"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "GB"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Kaydediliyor"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Çıktı biçimi"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Ses çözücüsü"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Video yükleme dizini (varsayılan)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Video kaydetme dizini (varsayılan) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Ses yükleme dizini (varsayılan) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Resim dizini (varsayılan) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "LiVES çalışma dizini."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Dizinler"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Uyarılar"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "CD aygıtı           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: CD aygıtı seçin"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Yeni tema:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Temalar"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7442,222 +7602,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "Çerçeveler siliniyor %d to %d%s..."
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Yeniden Boyutlandır"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Örnek tekrar"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Kanallar "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "İşaretsiz"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Güncel"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Kanallar "
-
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Kanallar "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Yeni"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " saat  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " dakika  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " saniye  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Sınırsız"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7668,7 +7820,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7679,89 +7831,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Tür: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7771,7 +7923,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7779,20 +7931,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7800,16 +7952,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"dosya okunamadı\n"
-"%s\n"
-"Hata kodu %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7819,22 +7968,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7844,43 +7993,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7888,40 +8042,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Açıklama Yok"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Efekt ismi: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Eklenti adı: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Yayıncı: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Sürüm: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Açıklama: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7930,65 +8089,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Bilgiler"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Efekt adı:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8038,11 +8201,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8060,64 +8218,64 @@
 msgid "TV card %d"
 msgstr "%d TV kartı"
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f saniye.\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Kaynak: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8126,7 +8284,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8134,14 +8292,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8151,7 +8309,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8160,208 +8318,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "%s Uygula"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "%s Sil"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8371,7 +8531,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8379,588 +8539,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Klipler"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Aç..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "_Seçili dosyayı aç"
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "_dvd/vcd den seçimi içeri al"
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "_dvd den seçimi içeri al"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "_vcd den seçimi içeri al"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Aygıttan içeri al"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
-#, fuzzy
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
-msgstr "Altyazıları otomatik yükle"
+msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "Seçi_m"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Tarama"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Göster"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Ses  parametreleri"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Yoğun görünüm"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Klipler"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Uygula"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Süre"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Kaydırma"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s ( %d katman)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Ses göster/gizle"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "%d video"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s ( %d katman)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sn."
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "%d katman"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s'den %s'e"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8968,275 +9135,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Temizleniyor..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "_Duraklat"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Duraklat (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "klipler"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "çerçeve"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9244,95 +9403,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "_Değerleri sıfırla"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "Jack taşıma sunucusuna bağlanılıyor"
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9340,7 +9498,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9348,330 +9506,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "Pulse audio sunucusu başlıyor"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LiVES - ses çalar seçin"
+msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "Jack taşıma sunucusuna bağlanılıyor"
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "veri"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "hız"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "not"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "değer"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "şehir"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "değişken"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "aralık"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "He_psini sil"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Kaydı durdur"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "anahtar"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9680,7 +9843,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9689,12 +9852,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10033,6 +10196,9 @@
 #~ msgid "Negating"
 #~ msgstr "Negatifleştirilyor"
 
+#~ msgid "Noise type"
+#~ msgstr "Gürültü tipi"
+
 #~ msgid "Normalize"
 #~ msgstr "Normalleştir"
 
@@ -10041,7 +10207,7 @@
 
 #, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "    Açılacak kare sayısı"
+#~ msgstr "Çerçeve _Çıkar"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -10135,7 +10301,7 @@
 
 #, fuzzy
 #~ msgid "Step per _Frame"
-#~ msgstr "    _Çerçeve"
+#~ msgstr "_Tüm çerçeveleri seç"
 
 #, fuzzy
 #~ msgid "Swirl _start"
@@ -10268,7 +10434,7 @@
 
 #, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "    Açılacak kare sayısı"
+#~ msgstr "Çerçeve _Çıkar"
 
 #~ msgid "_Other Center"
 #~ msgstr "Diğer merkez"
@@ -10346,9 +10512,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Panoya kopyalanıyor"
 
-#~ msgid "_Top"
-#~ msgstr "_Üst"
-
 #, fuzzy
 #~ msgid "_Vertical segments"
 #~ msgstr "Dikey kaydırma"
@@ -10564,7 +10727,9 @@
 
 #, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES: bir dosya seçin"
+#~ msgstr ""
+#~ "LiVES görüntü yakalanamadı\n"
+#~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was unable to open it."
@@ -10596,52 +10761,11 @@
 #~ msgid "$error"
 #~ msgstr "$hata"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "Pulse audio sunucusu başlıyor"
-
-#~ msgid "Red"
-#~ msgstr "Kırmızı"
-
-#~ msgid "error.\n"
-#~ msgstr "hata.\n"
+#~ msgid "Default value:    "
+#~ msgstr "Ön tanımlı değer:    "
 
-#~ msgid "Plugin timed out on message %s\n"
-#~ msgstr "%s  mesajı  eklenti zaman aşımına uğradı\n"
-
-#~ msgid ""
-#~ "unable to read file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "dosya okunamadı\n"
-#~ "%s\n"
-#~ "Hata kodu %d\n"
+#~ msgid "Minimum value: "
+#~ msgstr "En düşük değer: "
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES %s/.lives yapılandırma dosyasını\n"
-#~ "okuyamadı\n"
-#~ "\n"
-#~ "Lütfen bu dosya için dosya izinlerini kontrol\n"
-#~ "edip tekrar deneyin.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "dosya okunamadı\n"
-#~ "%s\n"
-#~ "Hata kodu %d\n"
+#~ msgid "Maximum value: "
+#~ msgstr "En büyük değer: "

LiVES-1.6.1.tar.bz2/po/ug.po -> LiVES-2.0.3.tar.bz2/po/ug.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-11-07 04:09+0000\n"
-"Last-Translator: Gheyret T.Kenji <Unknown>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-08 11:04+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -37,7 +53,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -45,176 +61,197 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "خالىغان"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "يوق"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "تەۋسىيە قىلغان"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "چەكلەنگەن!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr ""
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "ئىچكى"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "ئىختىيارى"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "سىناق"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -222,172 +259,198 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
 #, c-format
-msgid "Number of CPUs detected: %d\n"
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -395,17 +458,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -414,36 +478,36 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -453,7 +517,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -464,42 +528,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -507,96 +578,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "قوي"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "يېنىۋال(_U)"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "قايتىلا(_R)"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "سىن"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "سول ئۈن"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "ئوڭ ئۈن"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -605,26 +676,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr ""
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -634,7 +690,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -644,7 +700,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -655,7 +711,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -664,54 +720,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -719,155 +775,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "كېيىنكى(_N)"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "ئاتلاپ ئۆتتى"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "ئۆتتى"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "مەغلۇپ بولدى"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -875,94 +939,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "تاماملا(_F)"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "ئالدىن كۆزەت"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -971,8 +1035,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -980,179 +1044,188 @@
 "\n"
 "سەل ساقلاڭ"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "تەپسىلاتىنى كۆرسەت"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "ئالدىن كۆزەت(_P)"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "پىچىمى"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "كاندۇك چوڭلۇقى"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "ھۆججەت چوڭلۇقى"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "بايت چوڭلۇقى"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "ئومۇمىي ۋاقىت"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "كاندۇكلار"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "ھادىسە"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "ئۈن"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "ئوڭ ئۈن"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr ""
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "كۆزنەك ياپ(_C)"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "ھۆججەتكە ساقلا(_S)"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1162,7 +1235,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1171,47 +1244,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1219,397 +1307,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr ""
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "يېڭى ئات "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "ئاتىنى بەلگىلەش "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "كۆڭۈلدىكىلەرنى ئىشلەت"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "ئالىي(_A)"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "باب  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "قانال  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "كەڭلىك"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "ئېگىزلىك"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "قوزغاتقۇ"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "بىرىنچى"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "ئاخىرقى"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr ""
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "مۇندەرىجە:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "تاللانما(_O)"
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "كۆز يۈگۈرت…"
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "كۆڭۈلدىكىلەرنى ئىشلەت"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "ھۆججەت تاللا"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1617,17 +1666,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1637,7 +1686,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1647,20 +1696,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1673,33 +1722,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1707,97 +1756,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "%s نى ئۆچۈر"
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "كەس"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1806,31 +1855,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1838,7 +1887,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1847,79 +1896,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "قىستۇر"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "ئۆچۈرۈۋاتىدۇ"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -1929,7 +1978,7 @@
 "\n"
 "تاللاش قۇلۇپلانغان\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1937,11 +1986,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1950,7 +1999,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1959,7 +2008,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -1968,22 +2017,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -1991,64 +2040,64 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2056,30 +2105,30 @@
 "\n"
 "  نامەلۇم"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2096,11 +2145,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Gheyret T.Kenji https://launchpad.net/~gheyretkenji\n"
+"  salsaman https://launchpad.net/~salsaman"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2114,21 +2174,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2136,195 +2196,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "ئەمەلدىن قالدۇرۇۋاتىدۇ"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "داۋاملاشتۇر"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "ۋاقىتلىق توختا"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "تەگمە"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2332,29 +2404,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "ئەمەلدىن قالدۇرۇش"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "توختا (&S)"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2363,7 +2434,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2371,13 +2442,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2386,17 +2457,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2406,19 +2477,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2427,1049 +2498,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "تاللا(_S)…"
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "ئەكسىچە تاللا(_I)"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "قوي(_P)"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "توختا (&S)"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "پۈتۈن ئېكران(_F)"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "ئۈنسىز(_M)"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "قوراللار(_T)"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "قوراللار(_U)"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "قۇر(_G)"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "قۇر(_G)"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "پارامېتىرلار(_P)..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "ئۈن(_A)"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "ئۇچۇر(_I)"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "يوق(_N)"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "مەسىلە ھەل قىل(_T)"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "ئاۋاز مىقدارى"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr ""
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "بىرىنچى كاندۇك"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "ئاخىرقى كاندۇك"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "باشلاۋاتىدۇ…\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "ئەركىن(_F)"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "باشلا(_S)"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "كەينىگە"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3477,81 +3524,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3559,7 +3606,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3567,32 +3614,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3600,68 +3647,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3671,53 +3718,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "%s نى ئېچىۋاتىدۇ"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3729,11 +3787,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3741,14 +3799,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3756,29 +3814,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3786,66 +3844,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "ھۆججەت چوڭلۇقى"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3854,16 +3908,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3871,7 +3925,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3879,68 +3933,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3950,22 +3999,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -3973,68 +4022,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "ئاگاھلاندۇرۇش"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr "سوئال"
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "$error"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "ھەققىدە(_A)"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4045,7 +4092,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4057,11 +4104,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4069,46 +4116,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4116,7 +4163,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4128,14 +4175,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4143,19 +4190,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4163,83 +4210,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4248,14 +4295,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4264,7 +4311,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4275,7 +4322,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4284,11 +4331,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4330,11 +4377,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4356,17 +4403,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4374,28 +4422,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4404,7 +4452,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4412,7 +4460,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4420,7 +4468,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4431,7 +4479,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4441,7 +4489,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4449,7 +4497,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4458,13 +4506,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4475,13 +4523,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4491,7 +4539,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4500,7 +4548,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4508,7 +4556,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4516,63 +4564,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4580,14 +4628,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4596,25 +4644,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4623,33 +4671,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -4659,7 +4707,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -4669,7 +4717,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -4679,7 +4727,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4688,7 +4736,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -4698,7 +4746,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4707,7 +4755,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -4717,12 +4765,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4731,7 +4779,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4740,7 +4788,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4749,14 +4797,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4764,13 +4820,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4780,27 +4836,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4809,14 +4865,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4827,19 +4883,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4847,7 +4903,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4855,7 +4911,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4867,7 +4923,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -4876,34 +4932,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4912,343 +4968,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "ئالماشتۇر"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "ئۈنۈم"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "ئۈنۈملەر"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "قوراللار"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "ئۈن"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "نامەلۇم"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5256,74 +5568,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "كۆڭۈلدىكى قىممەتكە تەڭشە"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "قايتىلا(_R)"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "يېشىل"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "كۆك"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5333,17 +5642,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5353,32 +5662,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5387,14 +5696,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5404,40 +5706,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5446,11 +5755,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5459,7 +5768,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5469,192 +5778,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "تىپى:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "ئاتى:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "نەشرى:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    ئاپتور:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5664,55 +5957,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "يۇقىرىغا(_U)"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "تۆۋەنگە(_D)"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5721,7 +6014,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5729,231 +6022,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "ئاتى(_N):    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "ئەن(_L):    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "تىپى(_T):         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "كۆڭۈلدىكى(_D) "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "ئەڭ كىچىك قىممىتى: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "ئەڭ چوڭ قىممىتى: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "ھالقىلىق سۆز:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -5961,28 +6242,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -5991,41 +6272,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6035,27 +6316,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6064,7 +6345,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6074,12 +6355,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6089,7 +6370,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6099,12 +6380,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6112,23 +6393,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr ""
-
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6138,55 +6419,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "ئىچكى"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "ئىختىيارى"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "سىناق"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "قوليازما نامى: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "يېڭى ئات: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6194,26 +6463,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6221,7 +6501,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6229,7 +6509,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6238,28 +6518,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6271,20 +6558,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6292,790 +6579,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "سېكۇنت"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "ھەرگىز(_N)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "قويۇش"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "گىگابايت"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "خاتىرىلەۋاتىدۇ"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "ئاۋاز كودېك"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "كودلاش"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "مۇندەرىجىلەر"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " مېگابايت"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "ئاگاھلاندۇرۇش"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "ئارىلاش"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "ئۆرنەكلەر"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "ئالىي"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7083,222 +7370,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "چوڭلۇقىنى ئۆزگەرت"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         قانال "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        ئەۋرىشكە چوڭلۇقى "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr ""
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "ئىمزاسىز"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "نۆۋەتتىكى"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    قانال "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    ئەۋرىشكە چوڭلۇقى "
-
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "يېڭى"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " سائەت  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " مىنۇت  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " سېكۇنت  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "چەكسىز"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7309,7 +7588,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7320,89 +7599,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "تىپى: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7412,7 +7691,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7420,19 +7699,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7442,12 +7721,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7457,22 +7736,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7482,43 +7761,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7526,40 +7810,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "چۈشەندۈرۈشى يوق"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "ئاپتور: ‎%s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "چۈشەندۈرۈش: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7568,65 +7857,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "ئۇچۇرى"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "تازىلا"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7676,11 +7969,6 @@
 msgid "none\n"
 msgstr "يوق\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7698,64 +7986,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "مەنبە: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7764,7 +8052,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7772,14 +8060,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7789,7 +8077,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7798,208 +8086,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "%s نى ئۆچۈر"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8009,7 +8299,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8017,587 +8307,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "ئاچ(_O)…"
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "تاللا(_L)"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "كۆچۈر(_C)…"
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "قوللان(_A)"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "ۋاقىت"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "سىيرىش"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8605,275 +8903,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "تازىلاۋاتىدۇ…"
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "ۋاقىتلىق توختا(_P)"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "كاندۇك"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8881,94 +9171,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8976,7 +9266,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8984,327 +9274,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "تېزلىك"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "ئىزاھ"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "قىممىتى"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "ئۆزگەرگۈچى"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "ئاچقۇچ"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9313,7 +9611,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9322,12 +9620,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -9388,26 +9686,6 @@
 #~ msgid "Border _Colour"
 #~ msgstr "باشلا(_S)"
 
-#, fuzzy
-#~ msgid "Brightness _end"
-#~ msgstr "ئالماشتۇر"
-
-#, fuzzy
-#~ msgid "Brightness _start"
-#~ msgstr "ئالماشتۇر"
-
-#, fuzzy
-#~ msgid "Brightness change"
-#~ msgstr "ئالماشتۇر"
-
-#, fuzzy
-#~ msgid "Brightness end"
-#~ msgstr "ئالماشتۇر"
-
-#, fuzzy
-#~ msgid "Brightness start"
-#~ msgstr "ئالماشتۇر"
-
 #~ msgid "Charcoal"
 #~ msgstr "كاربون قەلەم"
 
@@ -9819,10 +10097,6 @@
 #~ msgid "_Frames"
 #~ msgstr "كاندۇكلار"
 
-#, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "سۇسلاشتۇر"
-
 #~ msgid "_Image File"
 #~ msgstr "سۈرەت ھۆججىتى(_I)"
 
@@ -9916,9 +10190,6 @@
 #~ msgid "_Time (seconds)"
 #~ msgstr " سېكۇنت  "
 
-#~ msgid "_Top"
-#~ msgstr "بېشى(_T)"
-
 #, fuzzy
 #~ msgid "_Wavemax"
 #~ msgstr "دولقۇنسىمان سىزىق"
@@ -9947,10 +10218,6 @@
 #~ msgstr "كاندۇك"
 
 #, fuzzy
-#~ msgid "brightness_change"
-#~ msgstr "ئالماشتۇر"
-
-#, fuzzy
 #~ msgid "charcoal"
 #~ msgstr "كاربون قەلەم"
 
@@ -10117,5 +10384,8 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
-#~ msgid "Red"
-#~ msgstr "قىزىل"
+#~ msgid "Minimum value: "
+#~ msgstr "ئەڭ كىچىك قىممىتى: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "ئەڭ چوڭ قىممىتى: "

LiVES-1.6.1.tar.bz2/po/uk.po -> LiVES-2.0.3.tar.bz2/po/uk.po Changed

@@ -9,18 +9,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-02-01 11:46+0000\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-22 06:20+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-03 17:36+0000\n"
-"X-Generator: Launchpad (build 14738)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -34,7 +35,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr "%s, попередження: %s\n"
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr "%s, критична помилка: %s\n"
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr "%s, аварія: %s\n"
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -48,7 +64,7 @@
 "group_id=64341&atid=507139\n"
 "Дякуємо. Відновити дані можна буде після перезапуску LiVES.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -60,7 +76,7 @@
 "Будь ласка, у повідомленнях про помилки у програмі вказуйте назву вашої "
 "операційної системи, дистрибутива та номер версії LiVES ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -68,7 +84,7 @@
 "а також дані, наведені нижче:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -78,65 +94,81 @@
 "зібрати більше даних.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Збереження набору.\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Зміна розміру"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "_Змінити розміри всіх кадрів"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Будь-який"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Жодного"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "найліпший"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "вимкнено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Поточне компонування**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "Вбудований"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Нетиповий"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Перевірити"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
@@ -144,104 +176,109 @@
 "\n"
 "\n"
 "Потрібно запустити jackd вручну. Переконайтеся, що jackd запущено, \n"
-"або змініть значення <jack_opts> у ~/.lives на 16\n"
+"або змініть значення <jack_opts> у %s на 16\n"
 "і перезапустіть LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert…виявлено…"
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite…виявлено…"
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox…виявлено\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox…НЕ ВИЯВЛЕНО\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...виявлено..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ВИЯВЛЕНО..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd…виявлено…"
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio…виявлено…"
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python…виявлено…"
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab…виявлено…"
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo…виявлено…"
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr "Версія Windows %04X"
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr "НЕВІДОМИЙ — будь ласка, накладіть латку!"
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -252,22 +289,48 @@
 "\n"
 "Інструмент керування вікнами — «%s»; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "виявлена кількість моніторів: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "Кількість виявлених процесорів: %d\n"
+msgid "Number of CPUs detected: %d "
+msgstr "Кількість виявлених процесорів: %d "
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "little endian"
 
-#: src/main.c:1561
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "big endian"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr "(%d-бітова, %s)\n"
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr "Тип графічного інтерфейсу: "
+
+#: src/main.c:1740
+#, c-format
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr "Версія GTK+ %d.%d.%d (зібрано з %d.%d.%d)"
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ", з підтримкою cairo"
+
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Каталог тимчасових файлів — %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -277,15 +340,15 @@
 "jack або PulseAudio.\n"
 "Ви не зможете скористатися багатьма можливостями з обробки звуку.\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "Зібрано з підтримкою jack, добре!\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Зібрано з підтримкою PulseAudio, чудово!\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -294,7 +357,7 @@
 "Вітаємо у LiVES версії %s.\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -304,83 +367,83 @@
 "Синтаксис команди запуску: %s [параметри] [назва файла [початок_за_часом] "
 "[кількість кадрів]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "де «назва файла» — назва файла мультимедійних даних або резервної копії.\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 "початок_за_часом: початок за часом у файлі з вказаною назвою у секундах\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "кількість кадрів: максимальна кількість кадрів, які слід відкрити\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "параметри можуть бути такими:\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help               : показати текст цієї довідки і завершити роботу\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <тимч. каталог>: використовувати інший робочий каталог (наприклад /"
 "var/ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 "-set <назва_набору> : автоматично завантажити набір кліпів з вказаною "
 "назвою\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset              : не завантажувати жодного набору після запуску\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 "-norecover          : не завантажувати відновлені дані під час перезапуску "
 "після аварії\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 "-recover            : завантажити відновлені дані під час перезапуску після "
 "аварії\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 "-nothreaddialog  : нічого не робити — залишено з міркувань зворотної "
 "сумісності\n"
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui              : не показувати графічного інтерфейсу\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : не показувати вікна вітання\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : не показувати вікна відтворення\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : запустити у режимі редактора кліпів\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : запустити у режимі роботи з декількома доріжками\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -388,17 +451,17 @@
 "-fxmodesmax <n>  : надати змогу використовувати <n> режимів на клавішу "
 "ефекту (мінімальне значення — 1, типове — 8)\n"
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 "-oscstart <порт>    : запустити програму очікування на дані OSC на вказаному "
 "порті UDP\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart         : не запускати програми очікування на дані OSC\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
@@ -406,15 +469,15 @@
 "Програвачем <ap> може бути, наприклад, mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ", sox або jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -425,16 +488,16 @@
 "запуск сервера передавання даних jack, 8 = призупинка відтворення звуку, "
 "якщо призупинено відтворення відео, 16 = запуск звукового сервера jack] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " або sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-devicemap <назва карти>         : автоматично завантажити карту пристроїв\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -443,17 +506,17 @@
 "відтворення відео з  <файл>-а (Зауваження: встановлюються лише параметри, а "
 "не тип додатка)\n"
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug               : спробувати виконати діагностику аварії (доведеться "
 "встановити «gdb»)\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Запуск графічного інтерфейсу..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -461,7 +524,7 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 "\n"
 "\n"
@@ -469,20 +532,21 @@
 "було встановлено теми у\n"
 "%s/%s.\n"
 "(Можливо, вам доведеться змінити значення параметра <prefix_dir> у вашому "
-"файлі ~/.lives)\n"
+"файлі %s)\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 "\n"
-"LiVES не вдалося записати малий файл до /tmp\n"
-"Будь ласка, переконайтеся, що маєте права доступу на запис до /tmp і "
-"повторіть спробу.\n"
+"LiVES не вдалося записати малий файл до %s\n"
+"Будь ласка, переконайтеся, що маєте права доступу на запис до %s і повторіть "
+"спробу.\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -497,50 +561,50 @@
 "Будь ласка, ознайомтеся з файлом README, який постачається\n"
 "разом з цим пакунком, перед запуском LiVES.\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 "\n"
-"LiVES не вдалося прочитати файл налаштування програми\n"
-"%s/.lives\n"
+"LiVES не вдалося виконати читання файла налаштувань програми\n"
+"%s\n"
 "\n"
-"Будь ласка, перевірте права доступу до файла і повторіть спробу.\n"
+"Будь ласка, змініть права доступу до цього файла і повторіть спробу.\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 "\n"
 "LiVES не вдалося записати файл налаштування програми\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Будь ласка, перевірте права доступу на цей файл і каталог,\n"
 "а потім повторіть спробу.\n"
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 "Будь ласка, перевірте, чи правильно вказано параметр <tempdir> у \n"
-"%s/.lives\n"
+"%s\n"
 "і повторіть спробу.\n"
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -555,7 +619,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -573,7 +637,7 @@
 "\n"
 "Дякуємо.\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -584,7 +648,17 @@
 "програма «sox». Будь ласка, встановіть одну з цих програм і повторіть "
 "спробу.\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+"\n"
+"Для роботи поточної версії LiVES потрібні програми «mplayer» та «sox». Будь "
+"ласка, встановіть ці програми і повторіть спробу.\n"
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -594,7 +668,7 @@
 "LiVES не вдалося виявити програму «mplayer». Вам варто встановити mplayer, "
 "щоб скористатися усіма можливостями LiVES.\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -604,7 +678,7 @@
 "LiVES не вдалося виявити програми «convert». Якщо ви маєте намір "
 "користуватися ефектами показу, вам слід встановити convert і image-magick.\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -615,7 +689,7 @@
 "користуватися функціональними можливостями об’єднання, вам слід встановити "
 "composite і image-magick.\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -626,7 +700,7 @@
 "програму, програма не зможе виконувати деякі з функцій обробки звуку. Вам "
 "слід встановити «sox».\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -634,68 +708,68 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 "\n"
 "LiVES не вдалося виявити жодного з додатків кодування.\n"
 "Будь ласка, перевірте, чи встановлено їх належним чином до\n"
 "%s%s%s/\n"
 "Без цих додатків ви не зможете скористатися пунктом «Зберегти».\n"
-"Можливо, вам слід змінити значення параметра <lib_dir> у ~/.lives\n"
+"Можливо, вам слід змінити значення параметра <lib_dir> у %s\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Автоматичне завантаження набору %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Помилковий аудіопрогравач %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d кадрів %d бітів/пк %.3f кд/с"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? кадрів ??? бітів/пк %.3f кд/с"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d кадрів %d бітів/пк %.3f кд/с"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <файла не вказано>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr "зап %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!зап %9d/%d"
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Пуск"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -703,35 +777,35 @@
 "LiVES не вдалося захопити це зображення.\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Закритий файл %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "В_ернути"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "Повт_орити"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Відео"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "Лівий канал звуку"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "Правий канал звуку"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -745,26 +819,11 @@
 "визначено mplayer.\n"
 "Будь ласка, змініть налаштування у «Параметрах» і повторіть спробу.\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr " (масштаб: %d %%)"
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: вікно відтворення%s"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Вікно відтворення"
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -779,7 +838,7 @@
 "\n"
 "(Вільного місця = %s)\n"
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -795,7 +854,7 @@
 "вільного місця у ньому.\n"
 "Будь ласка, виберіть інший каталог.\n"
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -812,7 +871,7 @@
 "\n"
 "(Вільного місця = %s)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -825,11 +884,11 @@
 "%s\n"
 "Будь ласка, повторіть спробу з іншим каталогом.\n"
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "Назва каталогу занадто довга!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -837,7 +896,7 @@
 "LiVES НЕ ВДАЛОСЯ ЗАПУСТИТИ ВКАЗАНИЙ ВАМИ АУДІОПРОГРАВАЧ!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -847,7 +906,7 @@
 "\n"
 "Звичайним користувачам ми рекомендуємо скористатися PulseAudio"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -855,7 +914,7 @@
 ", але цю версію LiVES було зібрано без підтримки PulseAudio.\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -865,11 +924,11 @@
 " Радимо вам встановити PulseAudio, перед запуском LiVES.\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "Сервер JACK варто використовувати користувачам-професіоналам"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -877,7 +936,7 @@
 ", але цю версію LiVES було зібрано без підтримки Jack.\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -887,7 +946,7 @@
 "ніж ви запустите LiVES.\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -899,13 +958,13 @@
 "спробувати якийсь інший аудіопрогравач.\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX можна скористатися, якщо не працюватиме жоден з запропонованих вище "
 "програвачів, "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -913,7 +972,7 @@
 "але деякі з можливостей роботи зі звуком буде вимкнено.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -923,7 +982,7 @@
 "Радимо вам встановити його до того, як ви почнете користуватися LiVES.\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -931,92 +990,92 @@
 "Звуковий програвач Mplayer варто використовувати лише з метою тестування.\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Вибір звукового програвача"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "Вик_ористовувати програвач PulseAudio"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "Ви_користовувати звуковий програвач Jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "Вико_ристовувати звуковий програвач Sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "В_икористовувати звуковий програвач mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "_Далі"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "Пропущено"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "Пройдено"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "Невдача"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - перевірка налаштувань"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - усування вад"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "Зараз LiVES виконає декілька перевірок основних налаштувань\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "Перевірка наявності «sox»"
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Щоб мати змогу скористатися всіма можливостями з обробки звуку у LiVES, вам "
 "слід встановити sox"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "Перевірка можливості перетворення звукових даних sox"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Не вдалося отримати 176400 байтів пам’яті."
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Не вдалося виконати запис до %s"
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr "Помилка команди: %s"
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "Вам слід встановити sox_fmt_all або подібну програму"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "Перевірка наявності «mplayer»"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
@@ -1024,45 +1083,58 @@
 "Щоб мати змогу скористатися всіма можливостями з декодування звуку у LiVES, "
 "вам слід встановити mplayer"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "Перевірка можливості перетворення звуку за допомогою mplayer"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "Щоб скористатися підтримкою pcm/wav, вам слід встановити mplayer"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Перевірка можливості декодування png/alpha за допомогою mplayer"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Вам варто оновити пакунок mplayer"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Перевірка можливості декодування jpeg за допомогою mplayer"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 "Щоб скористатися підтримкою png/alpha або jpeg, вам слід встановити mplayer"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Вам варто додати підтримку виведення у форматі jpeg до пакунка mplayer"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "Перевірка наявності «convert»"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 "Щоб мати змогу скористатися усіма ефектами обробки, встановіть imageMagick"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+"\n"
+"\n"
+"    Тип декодування зображення було змінено на jpeg. Повернутися до "
+"попереднього типу можна за допомогою пункту «Налаштування-"
+">Декодування».    \n"
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1075,7 +1147,7 @@
 "додаткові компоненти, а бо натисніть кнопку «Далі», щоб продовжити "
 "роботу    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1085,7 +1157,7 @@
 "\n"
 "Нарешті, ви можете вибрати типовий інтерфейс запуску LiVES.\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1096,7 +1168,7 @@
 "У LiVES передбачено два основних інтерфейси, ви можете запускати програму з "
 "будь-яким з цих інтерфейсів.\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1107,81 +1179,81 @@
 "Типовий інтерфейс згодом можна змінити за допомогою діалогового вікна "
 "«Параметри».\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - вибір інтерфейсу запуску"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "Запускати у режимі редагування _кліпів"
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 "Цей режим є найкращим вибором для простих завдань з редагування і для ві-"
 "джеїв\n"
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "Запускати у _багатодоріжковому режимі"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Цей режим буде кращим вибором для складних завдань з одночасного редагування "
 "декількох кліпів.\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "_Завершити"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "Дозволити LiVES встановлювати су_фікс назв файлів"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr "Дозволити LiVES встановлювати су_фікс назв файлів (.%s)"
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "Усунути черезрядковість"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr "_Усунути черезрядковість"
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Якщо позначити цей пункт, програма усуватиме черезрядковість з кадрів під "
 "час імпортування."
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Перегляд"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Натисніть, щоб _переглянути будь-який позначений файл відео, зображення або "
 "звукових даних"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "Натисніть, щоб _переглянути будь-який позначений файл звукових даних"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "Натисніть, щоб _переглянути відео"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Обробка…"
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1195,8 +1267,8 @@
 "\n"
 "Не забудьте потім вимкнути ефекти (ctrl-0)!"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1204,88 +1276,101 @@
 "\n"
 "Будь ласка, зачекайте"
 
-#: src/interface.c:403
-msgid "Show details"
+#: src/interface.c:241
+msgid "Show Details"
 msgstr "Показати подробиці"
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "_Досить"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "П_ереглянути"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "Приз_упинити"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr "Призупинити/_Досить"
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr "LiVES: — %s"
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr "LiVES: — Подробиці щодо набору доріжок"
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Формат"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "Розміри кадру"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "Розмір файла"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "Розмір у байтах"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "Загальний час"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "кадрів/с"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Кадри"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Події"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Звук"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "Швидкість/Розмір"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "Правий канал звуку"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Параметри кодування"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 "<------------- (Позначте, щоб змінити _розміри відповідно до пропозиції)"
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr "<------------- (Позначте, щоб було використано _рекомендований розмір)"
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr "_Чорні смуги для збереження співвідношення розмірів (необов’язкове)"
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
@@ -1293,19 +1378,15 @@
 "Додавати чорні смуги над і під зображенням, або з боків зображення, щоб "
 "запобігти розтягуванню."
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr "_Чорні смуги для збереження співвідношення розмірів (необов’язкове)"
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "Зберегти _мої параметри"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "Використати _рекомендовані параметри"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1313,75 +1394,75 @@
 "Н_е показувати більше цього попередження\n"
 "(увімкнути показ можна у вікні «Параметри/Попередження»)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "Показати по_дробиці"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "За_крити вікно"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "_Зберегти до файла"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Вставка"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "_Кількість повторних вставок"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "В_ставити відповідно до звукових даних"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "Вставити п_еред позначеним"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "Вставити вміст буфера обміну даними перед позначеними кадрами"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "Вставити п_ісля позначеного"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "Вставити вміст буфера обміну даними після позначених кадрів"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "Вставити _зі звуком"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "Вставити _без звуку"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Відкриття позначеного"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    Час початку позначеної ділянки (у сек.)"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    Кількість кадрів, які буде відкрито"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr "Початок позначення (сек.)"
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr "Кількість кадрів, які слід відкрити"
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Відкриття адреси"
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: — відкриття кліпу з Youtube"
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1398,7 +1479,7 @@
 "Потокові дані\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1413,7 +1494,7 @@
 "Будь ласка, переконайтеся, що встановлено найсвіжішу версію цієї програми.\n"
 "\n"
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1423,41 +1504,57 @@
 "Приклад: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL: "
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr "Адреса на Youtube: "
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "Не надсилати даних щодо потужності каналу"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Спробуйте скористатися цим пунктом, якщо у вас виникають проблеми з "
 "отриманням потоку даних"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr "Звантаження до _каталогу: "
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr "Каталог звантаження…"
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr "Назва звантаженого _файла: "
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - Перейменування кліпу"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - Введіть назву набору"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr "LiVES: — вкажіть назву набору для перезавантаження"
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - Виберіть робочий каталог"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr "LiVES: - Перейменування поточної доріжки"
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1470,7 +1567,7 @@
 "LiVES нагадає вам про те, що слід зберегти набір кліпів пізніше, якщо ви "
 "спробуєте вийти.\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1478,7 +1575,7 @@
 "Щоб експортувати цей проект, вам слід ввести назву цього набору кліпів.\n"
 "Цю назву також буде використано для проекту.\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1489,243 +1586,203 @@
 "ви зможете зробити так, щоб програма змогла працювати на максимумі "
 "потужностей.\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
 "\n"
-"Спочатку вам слід вибрати робочий каталог для LiVES.\n"
+"Спочатку вам слід вибрати робочий каталог для LiVES\n"
 "Цей каталог має зберігатися на диску, де дуже багато вільного місця.\n"
-"Зауважте, що у багатьох системах під час завершення роботи відбувається\n"
-"спорожнення /tmp, отже не радимо створювати робочий каталог у /tmp.\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - Перейменування кліпу"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Введіть назву набору"
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: — вкажіть назву набору для перезавантаження"
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - Виберіть робочий каталог"
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "Нова назва "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "Встановити назву "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "Використовувати т_ипові"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "Д_одатково"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr "LiVES: Вибір пристрою вхідних даних"
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr "Виберіть пристрій вхідних даних:"
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Завантаження композиції з КД"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Вибір частини або глави DVD"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Вибір заголовка VCD"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Зміна максимальної кількості видимих доріжок"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Параметри пристроїв"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Доріжка, яку слід завантажити (з %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "Частина DVD"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "Частина VCD"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "Максимальна кількість доріжок для показу"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "Пристрій:        /dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "Пристрій:        fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "Частина  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "Канал  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "Ідент. звуку  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "Кількість входів"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "Використовувати типову ширину, висоту і частоту кадрів"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "Ширина"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "Висота"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "Драйвер"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr "Д_райвер"
+
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr "Формат _виведення"
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "Формат виводу"
-
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Поступове наростання гучності"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Поступове зменшення гучності"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "Наростання завершується після  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "перших"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "Зменшення завершується після  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "останній"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "секунд."
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "позначеного."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - Відтворення випадкових композицій"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "Бажана кількість доріжок:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Каталог:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "Включити підкаталоги"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "Мінімальний розмір файлів (у МБ)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "Максимальний розмір файлів (у МБ)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "позначене"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Коментарі до файла (необов’язкові)"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "Заголовок/Назва: "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "Автор/Виконавець: "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "Коментарі: "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "П_араметри"
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr "Зберегти с_убтитри до файла"
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "Файл субтитрів"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "Вибрати..."
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: вибір каталогу"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: вибір файла"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr "LiVES: - виберіть пристрій"
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr "LiVES: - виберіть каталог"
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr "LiVES: - виберіть файл"
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Скасування/Відкидання/Збереження"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1735,7 +1792,7 @@
 "Поточне компонування не було збережено.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1745,7 +1802,7 @@
 "Поточне компонування було змінено з часу останнього збереження.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1755,7 +1812,7 @@
 "Можна зберегти поточний набір кліпів.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1763,7 +1820,7 @@
 "Поточний набір кліпів не було збережено.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1771,7 +1828,7 @@
 "Поточне компонування не було збережено.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1779,7 +1836,7 @@
 "Поточне компонування не було збережено з часу попереднього зберігання.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1788,7 +1845,7 @@
 "Ймовірно, вам варто виконати обробку перед виходом з режиму роботи з "
 "декількома доріжками.\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1798,43 +1855,43 @@
 "Поточне компонування містить створені кадри, отже його неможливо зберегти.\n"
 "Що слід робити програмі?"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr "_Назва набору кліпів"
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_Автоматично перезавантажити наступного разу"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "Ви_терти компонування"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_Ігнорувати зміни"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "Ви_лучити набір кліпів"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "Ви_лучити компонування"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_Зберегти компонування"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_Зберегти набір кліпів"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: відновити компонування?"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1844,57 +1901,58 @@
 "LiVES було виявлено багатодоріжкове компонування з попереднього сеансу.\n"
 "Бажаєте, щоб програма спробувала його відновити?\n"
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: — Параметри спорожнення диска"
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr "Вилучити _невикористані кліпи"
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+"Вилучити всі кліпи, які зараз не завантажено або які не є частиною набору"
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "Вилучити файли _резервних копій закритих кліпів"
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr "Вилучити набори, які мають записи _компонування, але не мають кліпів"
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr "_Типові значення"
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr "При_йняти"
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Зберігання набору %s…"
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Вибрати файл"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "Будь ласка, вкажіть назву файла, до якого слід зберегти кліп.\n"
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr "Будь ласка, вкажіть коректну адресу для отримання даних.\n"
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "Звантаження %s до %s…"
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr "Звантаження кліпу"
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1906,11 +1964,11 @@
 "Будь ласка, перевірте, чи правильно вказано адресу кліпу\n"
 "і чи встановлено найсвіжішу версію youtube-dl.\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "Поточний файл"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1918,7 +1976,7 @@
 ",\n"
 " - разом з поточним компонуванням - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1933,7 +1991,7 @@
 "\n"
 "Ви справді бажаєте його закрити?"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1948,7 +2006,7 @@
 "\n"
 "Ви справді бажаєте його закрити?"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1959,7 +2017,7 @@
 "\n"
 "Закрити кліп попри це?"
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1967,7 +2025,7 @@
 "\n"
 "Некоректний файл проекту.\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1990,33 +2048,33 @@
 "нову назву або відкинути набір.\n"
 "Після завершення цих дій ви зможете імпортувати новий проект.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Імпортування проекту %s як набору %s…"
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "Імпортування проекту"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Експортування проекту %s…"
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "Експортування проекту"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "Відновити файл .lv1"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "Створити резервну копію у файлі .lv1"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "Відновити файл .lv1"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -2028,91 +2086,91 @@
 "Набір буде вилучено з диска.\n"
 "Ви справді цього бажаєте?\n"
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr "Вилучення набору %s…"
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "Вилучення набору…"
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "Вилучення набору"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Набір %s було остаточно вилучено з диска.\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "Вставити тишу"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "Скасування"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "Відновлення звуку…"
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "Спорожнення зображень кадрів"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "Вилучення зайвих кадрів"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "Поточна тривалість відео — %d кадрів на швидкості %.3f кадрів на секунду.\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Вміст буфера обміну даних було розбито на %d кадрів.\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "Повторення"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "Копіювання кадрів з %d до %d%s до буфера даних…"
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "Отримання кадрів з кліпу"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "Копіювання до буфера"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "Вставлення %d кадрів до нового кліпу %s…"
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "Вставка"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "…додано звукові дані…"
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2122,7 +2180,7 @@
 "Будь ласка, встановіть програму «convert» з пакунка Imagemagick, а потім "
 "перезапустіть LiVES.\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2136,7 +2194,7 @@
 "Спробуйте позначити всі кадри, а потім скористайтеся пунктом \n"
 "«Обрізати/Доповнити звукову доріжку» з меню «Звук»."
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2145,7 +2203,7 @@
 "дискретизації.\n"
 "Будь ласка, встановіть «sox», а потім повторіть спробу."
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2156,7 +2214,7 @@
 "компонувань.\n"
 "Ви саме цього і хотіли?\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2167,11 +2225,11 @@
 "компонувань.\n"
 "Ви саме цього і хотіли?\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "Повторна дискретизація звукових даних буфера"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2183,7 +2241,7 @@
 "LiVES не вдалося змінити частоту дискретизації звукових даних у буфері. \n"
 "Звукові дані у буфері вилучено.\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2197,30 +2255,30 @@
 "Бажаєте продовжувати процедуру вставлення \n"
 "на основі незмінених звукових даних?\n"
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Вставка %d%s кадрів з буфера обміну даними…"
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "Вставлення"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Вставка %d копій даних з буфера%s…"
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Вставка %d кадрів з буфера обміну даними%s…"
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2230,7 +2288,7 @@
 "Вилучення всіх кадрів призведе до закриття цього файла.\n"
 "Чи впевнені ви у своїх діях?"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2241,8 +2299,8 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2253,7 +2311,7 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2263,7 +2321,7 @@
 "Вилучення призведе до зсуву кадрів у деяких з багатодоріжкових компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2274,20 +2332,20 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Вилучення кадрів від %d до %d%s…"
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Вилучення"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Вилучити"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2297,7 +2355,7 @@
 "\n"
 "Позначення заблоковано.\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2309,11 +2367,11 @@
 "(Щоб скасувати запис, натисніть клавішу «r» або скористайтеся пунктом меню "
 "«Відтворення->Виконати запис» ще раз перед початком запису.)\n"
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "Запис скасовано.\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2326,7 +2384,7 @@
 "Повідомлення додатка «%s»:\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2339,7 +2397,7 @@
 "У додатку %s не вдалося виявити методу «init».\n"
 "Ймовірно, файли додатка пошкоджено або встановлено неналежним чином."
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2352,22 +2410,22 @@
 "\n"
 "Будь ласка, натисніть «Скасувати», якщо це суперечить вашим планам.\n"
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr "Зберігання набору %s"
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Завантаження кліпів з набору %s"
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr "%d кліпів і %d компонувань було відновлено з набору (%s).\n"
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2379,40 +2437,40 @@
 "запущено жодної іншої копії LiVES.\n"
 "Натисніть кнопку «Гаразд», щоб продовжити виконання дії.\n"
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "Спорожнення простору на диску…"
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr "Звільнення місця на диску"
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "Звільнено %s місця на диску.\n"
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr "Відновлення частоти кадрів та параметрів кадрів…"
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 "\n"
 "Зовнішня: %s\n"
-"Внутрішня: %s (%d bpp)\n"
+"Внутрішня: %s (%d біт/тчк) / %s\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "буферизовано"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2420,7 +2478,7 @@
 "\n"
 "  Відкриття…"
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2429,7 +2487,7 @@
 "\n"
 "(%d віртуальних)"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2438,7 +2496,7 @@
 "\n"
 "(%d декодовано)"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2447,7 +2505,7 @@
 "\n"
 "  %.2f с"
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2455,23 +2513,23 @@
 "\n"
 "  Невідомо"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "unsigned"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "signed"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2480,7 +2538,7 @@
 "  %d Гц %d бітів\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2511,11 +2569,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
 "USA\n"
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "Відеоредактор та програма для ві-джеїв."
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr "Про LiVES"
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Yuri Chornoivan https://launchpad.net/~yurchor-gmail\n"
+"  yurchor https://launchpad.net/~yurchor-deactivatedaccount"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2539,7 +2608,7 @@
 "salsaman@gmail.com\n"
 "Домашня сторінка: http://lives.sourceforge.net"
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2549,19 +2618,18 @@
 "\n"
 "Вам слід встановити mplayer, щоб мати змогу переглянути цей файл.\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
-msgstr ""
-"Попереднім переглядом не можна скористатися у середовищах, відмінних від "
-"X11. \n"
-"Для показу вікна попереднього перегляду потрібен його ідентифікатор.\n"
-"Будь ласка, надсилайте латки, якщо вам відомо, як отримати такий \n"
-"ідентифікатор у інших середовищах.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
+msgstr ""
+"\n"
+"\n"
+"Вам слід встановити mplayer або ImageMagick, щоб мати змогу переглянути цей "
+"файл.\n"
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2574,170 +2642,184 @@
 "Бажаєте продовжити завантаження?\n"
 "."
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "Відкриття звукових даних %s, тип %s…"
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "Відкриття звукових даних"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "Скасування"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr "Нові звукові дані: %d Гц %d каналів %d б/с\n"
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "Додавання звукових даних"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "Новий звук"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+"Текст збережено як\n"
+"%s\n"
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "Достатньо %d кадрів!\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Дані зневаджування інструменту кодування"
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "Повноекранне відтворення (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "Вимкнути повноекранне відтворення (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr " (масштаб: %d %%)"
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr "LiVES: вікно відтворення%s"
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "Подвійний розмір (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "Одинарний розмір (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "Сховати вікно відтворення (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "Показати вікно відтворення (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "Відтворити у окремому вікні (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr "LiVES — Обробка потокових даних"
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "Вимикання неперервного циклічного відтворення (o)"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "Вмикання неперервного циклічного відтворення (o)"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Гучність (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "Увімкнути звук (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "Вимкнути звук (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr "Обернення за часом даних з буфера…"
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr "Обернення за часом даних з буфера"
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr "LiVES: Завантажити субтитри з…"
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Завантажений файл субтитрів: %s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "Субтитри було вилучено.\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "Вибір звукового файла"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr "LiVES: - виберіть файл звукових даних"
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Будь ласка, вкажіть ваш пристрій відтворення КД у меню «Інструменти | "
 "Параметри | Інше»\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Відкриття доріжки КД №%d з %s…"
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "Доріжка КД %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "Відкриття доріжки КД…"
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "Помилка під час завантаження доріжки КД\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "Вибір доріжок"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "помилки компонування"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "Закрити в_ікно"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "Вилучити записи про п_омилки"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "Ви_лучити відповідні компонування"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Поновити"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2747,27 +2829,27 @@
 "Призупинено\n"
 "(натисніть «Поновити», щоб продовжити обробку)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "призупинено…"
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Призупинити"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "поновлено…"
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Залишити"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr "Досить"
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2779,29 +2861,29 @@
 "(натисніть «Залишити», щоб зупинитися на поточному стані)\n"
 "(натисніть «Поновити», щоб продовжити обробку)"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES: позначений кадр"
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr "_Зберегти кадр як…"
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 "Звук випереджає відео на %.4f секунд у кадрі %d, частота кадрів — %.4f\n"
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2815,7 +2897,7 @@
 "Щоб змусити її працювати на інших платформах, надсилайте латки до коду.\n"
 "\n"
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2828,7 +2910,7 @@
 "програму «xwininfo».\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2836,7 +2918,7 @@
 "\n"
 "Час запису має бути більшим за 0.\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2851,11 +2933,11 @@
 "Натисніть «Скасувати», щоб скасувати дію.\n"
 "\n"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "Зовнішнє вікно було закрито.\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2863,7 +2945,7 @@
 "Клацніть кнопкою миші у вікні, щоб почати захоплення зображення.\n"
 "Натисніть клавішу «q», щоб припинити запис."
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2879,19 +2961,19 @@
 "Натисніть «Зупинити» або клавішу «q», щоб завершити захоплення.\n"
 "(Типово, буде використано швидкість захоплення у %.3f кадрів на секунду.)\n"
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES не вдалося захопити дані з цього вікна. Вибачте.\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "Експортувати позначені звукові дані як…"
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "Експортувати звукові дані як…"
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2905,81 +2987,86 @@
 "Натисніть кнопку «Гаразд», щоб експорт було виконано на новій швидкості, або "
 "кнопку «Скасувати», щоб експортувати його з початковою швидкістю.\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Експортування звуку кадрів від %d до %d як %s…"
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Експортування звуку як %s…"
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "Експортування звукових даних"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "Долучити звуковий файл…"
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr "LiVES: - долучення файла звукових даних"
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Долучення звукового файла %s…"
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "Долучення звукових даних"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "Долучення звуку"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr "Доповнення звукових даних до %.2f секунд…"
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Обрізання звукових даних від позиції %.2f с до позиції %.2f с…"
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr "Обрізання/Доповнення звукових даних"
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr "Обрізати/Доповнити звукові дані"
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "Наростання звуку"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "Наростання звуку"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "Поступове зменшення гучності"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "Поступове зменшення гучності"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s після %.1f секунд…"
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s від часу %.2f секунд до часу %.2f секунд…"
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "Зміна гучності…"
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2989,60 +3076,51 @@
 "Вилучення всіх звукових даних призведе до закриття цього файла.\n"
 "Ви бажаєте саме цього?"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "Вилучення всіх звукових даних…"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Вилучення звукових даних від позиції %.2f с до позиції %.2f с…"
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "Вилучення звуку"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "Вилучити звук"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "Запис нових звукових даних"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Вставка тиші від позиції %.2f с до позиції %.2f с…"
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr "Вставка тиші"
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-"\n"
-"Вилучення %d компонувань… Ви впевнені?\n"
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не вдається знайти файл зображення: %s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Об’єднання"
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Об’єднання буфера [ %d кадрів ]       з позначеним [ %d кадрів ]"
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -3050,607 +3128,585 @@
 "Об’єднання буфера [ %d кадрів (змінена дискретизація) ]       з позначеним "
 "[ %d кадрів ]"
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr "Вирівняти по_чатки"
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr "Вирівняти _кінці"
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr "Спосіб обробки додаткових кадрів з буфера даних —"
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_Вставити кадри"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "Ви_кинути кадри"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr "Кількість повторень даних з буфера даних"
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Циклічно додати для заповнення позначеної ділянки"
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "Спосіб п_ереходу:"
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr "Об’єднання даних з буфера з позначеною ділянкою…"
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr "вставляємо %d додаткових кадрів перед об’єднанням\n"
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr "тепер вставляємо %d додаткових кадрів\n"
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "Об’єднання завершено.\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr "_Нетипові породжувачі"
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "_Нетипові ефекти"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "Нетипові _допоміжні програми"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr "_Відкрити файл або каталог"
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr "В_ідкрити частину файла…"
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "Відкрити _адресу/потік…"
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr "Відкрити к_ліп Youtube…"
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr "Ім_портувати з DVD/VCD…"
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr "Імпорт_увати з DVD"
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr "Імпорту_вати з VCD"
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr "І_мпортувати з Firewire"
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr "Імпортувати з п_ристрою Firewire (dv)"
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Імпортувати з п_ристрою Firewire (hdv)"
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr "_Додати вебкамеру/ТБ-картку…"
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr "Додати прис_трій unicap"
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr "Додати потік даних з п_ристрою firewire"
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr "Додати п_ристрій ТБ"
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_Нещодавні файли…"
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr "П_ерезавантажити набір кліпів…"
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr "Закрити/З_берегти всі кліпи"
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr "За_кодувати кліп як…"
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr "Закодувати _позначене як…"
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_Закрити цей кліп"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr "Створити _резервну копію кліпу як .lv1…"
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr "Ві_дновити кліп з .lv1…"
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Кодування/Завантаження/Резервне копіювання з_і звуком"
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr "Автоматично завантажувати субтитри"
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr "Споро_жнити місце на диску"
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "З_міни"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr "Режим _декількох доріжок"
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_Копіювати позначене"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "Ви_різати позначене"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr "В_ставити з буфера обміну…"
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "Вставити як _новий"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Об’єднати вміст буфера з позначеним…"
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "Ви_лучити позначене"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr "Розділити _відео і звук"
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "По_значити…"
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "Позна_чити всі кадри"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr "_Лише перший кадр"
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr "Лише _останній кадр"
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr "Позначити від п_ершого кадру"
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr "Позначити від _останнього кадру"
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr "Позначити останню вставку/о_б’єднання"
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "Позначити ділянку останнього _ефекту"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "І_нвертувати позначення"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "За_блокувати тривалість позначеного"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "_Відтворення"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "_Відтворити все"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "Ві_дтворити позначене"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr "Відтворити да_ні з буфера обміну"
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "З_упинити"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr "На по_чаток"
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Повноекранний режим"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Подв_ійний розмір"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr "Відтворити у _окремому вікні"
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Спо_рожнити тло"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Авто)з_ациклити відео (відповідно до звукової доріжки)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "Неперервний _цикл"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Ци_кл з відбиттям"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "В_имкнути звук"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Ре_жим «прилипання» окремих вікон"
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "По_казати лічильник кадрів"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "Показати субтитри"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr "Режим додавання чорних смуг"
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "Е_фекти"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "Ефекти застосовують до поточного позначеного фрагмента."
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Запустити тестовий ефект обробки/інструмент/породжувач…"
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "_Інструменти"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "Інструменти застосовують до цілих кліпів."
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Обернути порядок у буфері обміну даних"
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "З_мінити швидкість відтворення або збереження…"
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "_Змінити частоту кадрів відео…"
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Допоміжні програми"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "С_творити"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Нетипові _інструменти"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "С_творити"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Завантаження додатків ефектів показу…"
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr "Завантажити с_убтитри з файла…"
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr "Вилучити субтитри"
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr "Захоплення відео з зовні_шнього вікна… "
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "_Параметри…"
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr "_Звук"
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr "Завантажити _новий звук для кліпу…"
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr "Завантажити _композицію з КД…"
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "Ви_штовхнути лоток КД"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr "Записати з_овнішній звук…"
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "до нового _кліпу…"
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "до _позначеного"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr "Поступове на_ростання гучності…"
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr "Поступове змен_шення гучності…"
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "_Експортувати звук…"
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr "Експортувати поз_начений звук…"
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr "Експорт_увати весь звук…"
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "Д_олучити звук…"
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr "_Обрізати/Доповнити звукову доріжку…"
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Обрізати/Доповнити звукову доріжку до _позначеного"
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Обрізати/Доповнити звукову доріжку від початку до позиції _відтворення"
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "В_илучити звук…"
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr "Вилучити _позначений звук"
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr "Вилучити в_есь звук"
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr "Вставити _тишу у позначене"
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "Змінити _частоту звуку…"
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr "Відтворити _музику за допомогою xmms…"
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr "Випадковий звуковий суп_ровід з xmms…"
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr "Зупинити ві_дтворення у xmms"
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "І_нформація"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr "Показати _відомості щодо кліпу"
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr "Переглянути або _змінити коментарі у файлі"
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr "Показати відомості щодо _буфера даних"
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "Показати _повідомлення"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "Показати помилки _компонування"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "_Кліпи"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr "П_ерейменувати поточний кліп у меню…"
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "Д_одаткові"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_Ефекти/Інструменти/Допоміжні програми RFX"
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr "_Створити тестовий скрипт RFX…"
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr "К_опіювати скрипт RFX до тестових…"
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr "_Змінити тестовий скрипт RFX…"
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr "Пере_йментувати тестовий скрипт RFX…"
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr "_Вилучити тестовий скрипт RFX…"
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "Підн_яти тестовий ефект обробки/інструмент/породжувач у списку…"
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr "_Імпортувати нетиповий скрипт RFX…"
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr "Е_кспортувати нетиповий скрипт RFX…"
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr "Ви_лучити нетиповий скрипт RFX…"
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr "Перез_ібрати всі додатки RFX"
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr "_Отримати потік даних LiVES з…"
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr "_Надіслати потік даних LiVES до…"
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Відкрити по_тік yuv4mpeg на %sstream.yuv..."
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr "_Імпортувати проект (.lv2)…"
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr "Е_кспортувати проект (.lv2)…"
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "Ві-д_жей"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr "Відображення _ефектів реального часу"
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Пов’язати ефекти реального часу з комбінаціями клавіш ctrl-цифра."
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr "Встановити _типові параметри ефектів реального часу"
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr "Встановити типові значення параметрів ефектів реального часу."
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr "Зберегти _типові параметри ефектів реального часу"
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3658,146 +3714,146 @@
 "Зберегти типові параметри ефектів реального часу, щоб програма завантажувала "
 "їх кожного разу, коли ви користуєтеся LiVES."
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr "С_кинути всі швидкості та позиції відтворення"
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Перевести всі позиції відтворення на перший кадр та відновити початкові "
 "значення частоти кадрів відтворення."
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_Інтерфейс MIDI/джойстика"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "_Навчання MIDI/джойстика…"
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "З_берегти карту відображення пристроїв…"
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "_Завантажити карту відображення пристроїв…"
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "Показати _клавіші ві-джея"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "За_бавки"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Жодних"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr "_Автоматика"
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_Шалені кадри"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_ТБ LiVES (широкосмугове)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Довідка"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "_Підручник (буде відкрито у переглядачі)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "Підтримати проект _фінансово!"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "_Надіслати електронного листа авторові"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "Повідомити про _ваду"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "Запропонувати _можливість"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "Допомогти з п_ерекладом"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "_Усування вад"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Про програму"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "Повернутися на початок (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "Відтворити все (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "Зупинити відтворення (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "Відтворити позначене (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Гучність"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr "Гучність звуку (1.00)"
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr "Показати тло (b)"
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr "Уповільнити відтворення (ctrl-вниз)"
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr "Пришвидшити відтворення (ctrl-вгору)"
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr "Повернутися назад (ctrl-ліворуч)"
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr "Перейти вперед (ctrl-праворуч)"
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "Показати відомості щодо кліпу (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "Приховати цю панель інструментів"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3806,162 +3862,162 @@
 "швидкодії, натискання «q» призведе до закриття вікна."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Швидкість відтворення відео (у кадрах на секунду)        "
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "Змінювати швидкість відео"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "Перший кадр"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "Останній кадр"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "Перший позначений кадр цього кліпу"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "Останній позначений кадр цього кліпу"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "Запуск...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Натисніть «q», щоб зупинити запис. НЕ ЗАКРИВАЙТЕ ВІКНО ВІДТВОРЕННЯ!   "
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr "Кількість кадрів для перегляду"
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "Виві_льнити"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "Довільний вибір номера кадру"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "П_очаток"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr "Кількість кадрів пов’язано з початковим кадром"
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_Кінець"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr "Кількість кадрів пов’язано з кінцевим кадром"
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "В_казівник"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr "Кількість кадрів пов’язано з позначкою позиції відтворення"
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Повний назад"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "Відтворити все"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "Відтворити позначене"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "Вмикання/Вимикання циклу"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr "Почати _запис"
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr "Зупинити _запис"
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "_Виконати запис"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "Приховати вікно відтворення"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "Показати вікно відтворення"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f ЕБ"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f ПБ"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f ТБ"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f ГБ"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f МБ"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f КіБ"
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr "%d байтів"
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr "Спорожнення буфера обміну даними"
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3972,7 +4028,7 @@
 "==============================\n"
 "Перемкнуто на кліп %s\n"
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3982,11 +4038,11 @@
 "==============================\n"
 "Перемкнуто на порожній кліп\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr "(порожній)"
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3995,7 +4051,7 @@
 "Назву набору було змінено з %s на %s. Виконано відповідне оновлення "
 "пов’язаних з ним компонувань.\n"
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -4004,7 +4060,7 @@
 "У цьому наборі немає кліпу %s.\n"
 "Цей кліп потрібен для таких компонувань:\n"
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -4013,7 +4069,7 @@
 "Кліп %s було закрито.\n"
 "Цей кліп потрібен для таких компонувань:\n"
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -4022,7 +4078,7 @@
 "У кліпі %s було зсунуто кадри.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -4031,7 +4087,7 @@
 "З кліпу %s було вилучено кадри.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -4040,7 +4096,7 @@
 "З кліпу %s було вилучено звукові дані.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -4049,7 +4105,7 @@
 "У кліпі %s було зсунуто звукові дані.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -4058,7 +4114,7 @@
 "У кліпі %s було замінено звукові дані.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -4067,7 +4123,7 @@
 "У кліпі %s було замінено кадри.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4078,7 +4134,7 @@
 "оскільки його вже використано\n"
 "іншою копією програми LiVES.\n"
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -4089,7 +4145,7 @@
 "З набором %s зараз працює інша копія програми LiVES.\n"
 "Будь ласка, оберіть іншу назву набору.\n"
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -4097,7 +4153,7 @@
 "\n"
 "Назви наборів не можуть бути порожніми.\n"
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
@@ -4105,7 +4161,7 @@
 "\n"
 "Довжина назви набору не повинна перевищувати 128 символів.\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
@@ -4114,7 +4170,7 @@
 "\n"
 "У назвах наборів не повинно містити пробілів або символів%s.\n"
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
@@ -4123,7 +4179,7 @@
 "Назви наборів не повинні починатися з символу «.» і містити послідовності "
 "«..»\n"
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -4134,68 +4190,68 @@
 "Набір з назвою %s вже існує.\n"
 "Будь ласка, оберіть іншу назву набору.\n"
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr "Вилучення компонування %s\n"
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr "Відео [відкриття…]"
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Відео [%.2f с]"
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr "(Не визначено)"
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "(Немає відео)"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "(Немає звуку)"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr "Моно [відкриття…]"
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr "Лівий канал звуку [відкриття…]"
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Моно [%.2f с]"
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Лівий канал звуку [%.2f с]"
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr "Правий канал звуку [відкриття…]"
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Правий канал звуку [%.2f с]"
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES не може перемикатися на mplayer під час завантаження кліпів."
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "Спорожнення кліпу"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4210,53 +4266,71 @@
 "\n"
 "Перезаписати?\n"
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "В_ернути %s"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "П_овторити %s"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------Позначене------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr " с ] ----------Позначене---------- [ "
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " кадрів ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+"У вашій версії mplayer/ffmpeg можуть бути помилки!\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"Тимчасово уникнути помилок можна перемиканням на виведення у форматі jpeg "
+"(«Налаштування->Декодування»).\n"
+"\n"
+"Щоб дізнатися більше, скористайтеся пунктом «Довідка->Усування вад»."
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "Вивчення заголовка файла"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "Відкриття %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Відкриття %s час початку — %.2f с, %d кадрів"
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " без звуку"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Відкриття звуку для %s"
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4276,11 +4350,11 @@
 "\n"
 "Ви справді бажаєте відкрити цей файл?"
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - будь ласка, зачекайте."
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4292,7 +4366,7 @@
 "LiVES не вдалося видобути дані або зображення або звуку.\n"
 "Подробиці можна знайти на панелі термінала.\n"
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4302,7 +4376,7 @@
 "\n"
 "Ймовірно, для відкриття цього файла вам доведеться встановити mplayer.\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4315,29 +4389,29 @@
 "меню\n"
 "«Інструменти|Параметри|Декодування»\n"
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr "Додавання зображення…"
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Субтитри було збережено до %s\n"
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr "LiVES: Зберегти кадр %d як…"
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr "LiVES: Зберегти кадр як…"
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: Зберегти кліп з новою назвою…"
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4349,36 +4423,32 @@
 "\n"
 "Бажаєте зберегти дані до поточного файла?"
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "позначене"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "Пов’язування позначеного"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr " (без звуку)\n"
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Збереження кадрів від %d до %d%s як «%s»: програма кодування = %s: формат = "
 "%s…"
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Збереження кадрів від 1 до %d%s як «%s»: програма кодування %s: формат = %s…"
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "Збереження [може тривати досить довго]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
@@ -4388,33 +4458,33 @@
 "\n"
 "Помилка кодування. Файл даних не було створено!\n"
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr "Зняття додавання чорних смуг"
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr "Розмір файла: %s\n"
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "запис перервано переглядом.\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "запис перервано відтворенням даних з буфера.\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "Виконання запису…"
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Середня частота кадрів — %.4f\n"
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4429,16 +4499,16 @@
 "кадрів»\n"
 "і змінити розміри всіх кадрів до поточного значення.\n"
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "Без_назви%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4449,7 +4519,7 @@
 "Помилка під час спроби отримання даних щодо кліпу %s.\n"
 "Можливо, дані цього кліпу пошкоджено.\n"
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4462,14 +4532,14 @@
 "Типову частоту кадрів можна встановити за допомогою пункту меню «Інструменти "
 "| Параметри | Інше».\n"
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Швидкість відтворення було скориговано до значення %.3f кадрів на секунду, "
 "щоб зберегти відповідність з звуковими даними.\n"
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4479,7 +4549,7 @@
 "%.3f\n"
 "Звукові дані:"
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4488,49 +4558,44 @@
 "Кадрів=%d тип=%s розмір=%dx%d глибина кольорів=%d частота кадрів=%.3f\n"
 "Звукові дані:"
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr "%s немає\n"
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr "%s %d Гц %d каналів %d б/с\n"
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Коментар: %s\n"
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Збереження кадру %d як %s..."
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Створення резервної копії %s на %s"
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "Створення резервної копії"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "було створено резервну копію записаних даних…"
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr "Відновлення %s…"
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "Відновлення"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4544,22 +4609,22 @@
 "LiVES не вдалося відновити їх.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr "зап %.2f МБ"
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!зап %.2f МБ"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr "зап. ?? МБ"
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4572,7 +4637,7 @@
 "Параметри призупинки запису можна встановити за допомогою діалогового вікна "
 "«Параметри».\n"
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4582,59 +4647,59 @@
 "Було знайдено файли від попереднього запуску LiVES.\n"
 "Бажаєте, щоб програма спробувала їх відновити?\n"
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "Відновлення файлів"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr "Відновлення файлів…"
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Показати _компонування, які буде змінено"
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr "_Відновити місце на диску"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr " _Додаткові параметри >>"
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Попередження!"
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "попередження"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr "LiVES — Запитання"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr "запитання"
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr "LiVES: — Помилка під час роботи з файлом"
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr "Помилка під час роботи з файлом"
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr "_Перервати"
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr "П_овторити"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4651,7 +4716,7 @@
 "\n"
 "Критичний рівень можна змінити у налаштуваннях програми."
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4670,11 +4735,11 @@
 "Наступне попередження буде показано, якщо залишиться менше за %s.\n"
 "Критичний рівень можна змінити у налаштуваннях програми."
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "Перемикання програвачів під час відтворення неможливе."
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4686,20 +4751,20 @@
 "LiVES не вдалося виконати цю дію через недостатній об’єм пам’яті.\n"
 "Будь ласка, спробуйте завершити роботу сторонніх програм.\n"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr "Обробку було призупинено."
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 "\n"
-"Завершено на %d%%. Залишилося %u секунд\n"
+"%sВиконано %d%%. Залишилося часу: %u с%s\n"
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
@@ -4708,7 +4773,7 @@
 "\n"
 "Відкрито %d з %d кадрів. Зачекайте ще %u с.\n"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
@@ -4717,7 +4782,7 @@
 "\n"
 "Відкрито %d з %d кадрів.\n"
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
@@ -4726,7 +4791,7 @@
 "\n"
 "відкрито %d кадрів.\n"
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
@@ -4735,7 +4800,7 @@
 "\n"
 "Залишилося часу: %d с"
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4746,7 +4811,7 @@
 "Вибачте, LiVES не може одночасно відкривати більше %d файлів.\n"
 "Будь ласка, закрийте один з файлів і повторіть вашу спробу."
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4765,7 +4830,7 @@
 "\n"
 "Будь ласка, переконайтеся, що ви можете здійснювати запис до цього каталогу."
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4776,7 +4841,7 @@
 "або перемкніть формат кодування за допомогою пункту «Інструменти | Параметри "
 "| Кодування»\n"
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4790,7 +4855,7 @@
 "Будь ласка, змініть кодек для звукових даних за допомогою меню «Інструменти|"
 "Параметри|Кодування»\n"
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4799,7 +4864,7 @@
 "Зберегти таке компонування неможливо, спочатку вам слід виконати обробку "
 "кліпу.\n"
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4808,7 +4873,7 @@
 "Зберегти таке компонування неможливо, спочатку вам слід виконати обробку "
 "кліпу.\n"
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4819,7 +4884,7 @@
 "\n"
 "Через обмеження формату %s\n"
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4827,43 +4892,43 @@
 "LiVES рекомендує вам такі параметри:\n"
 "\n"
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ", signed"
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ", unsigned"
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "Використовувати частоту дискретизації звуку %d Гц%s%s\n"
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Встановлення частоти кадрів відео у значення %.3f кадрів на секунду\n"
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Встановлення частоти кадрів відео у значення %d:%d кадрів на секунду\n"
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Встановлення розмірів відео %d x %d пікселів\n"
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4871,37 +4936,37 @@
 "\n"
 "Ймовірні варіанти дій:\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "зміна розмірів відео до %d x %d пікселів\n"
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "вимкнення звуку через те, що інструмент кодування не може закодувати звукові "
 "дані\n"
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr "LiVES має:\n"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr "зміна дискретизації звуку до %d Гц%s%s\n"
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "зміна дискретизації відео до %.3f кадрів на секунду\n"
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "зміна дискретизації відео до %d:%d кадрів на секунду\n"
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4916,7 +4981,7 @@
 "дії.\n"
 "\n"
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4926,7 +4991,7 @@
 "Зміни внесені до позначеної ділянки не будуть остаточними.\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4940,7 +5005,7 @@
 "пам’яті.\n"
 "Спробуйте зберегти запис лише частини файла."
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4960,7 +5025,7 @@
 "Натисніть кнопку «Скасувати», щоб скасувати вставлення або кнопку «Гаразд», "
 "щоб виконати коригування."
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4974,11 +5039,11 @@
 "Натисніть кнопку «Гаразд», якщо повністю усвідомлюєте наслідки ваших дій. "
 "Якщо це не так, натисніть кнопку «Скасувати»."
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "Клавіатурні скорочення показу"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -5061,11 +5126,11 @@
 "d                             подвоїти розміри\n"
 "g                             циклічне відтворення з відбиттям\n"
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "Клавіатурні скорочення режиму декількох доріжок"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5111,19 +5176,20 @@
 "\n"
 "Інші комбінації клавіш наведено в меню.\n"
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "Журнал повідомлень"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 "Після оновлення або встановлення, ймовірно, вам слід виправити значення "
-"параметра <prefix_dir> у вашому файлі ~/.lives"
+"параметра <prefix_dir> у вашому файлі %s"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -5131,16 +5197,16 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 "\n"
 "\n"
 "LiVES не вдалося знайти жодного додатка ефектів обробки.\n"
 "Будь ласка, переконайтеся, що їх встановлено у\n"
 "%s%s%s\n"
-"або змініть значення змінної <lib_dir> у файлі ~/.lives\n"
+"або змініть значення змінної <lib_dir> у файлі %s\n"
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5151,11 +5217,11 @@
 " (Програма може працювати з даними у файлах .mp3, .ogg, .wav, .mod, .xm або ."
 "it)"
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr "невдало (невідомий тип)\n"
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
@@ -5165,7 +5231,7 @@
 "Бажаєте вилучити файли компонування, пов’язані з цим набором кліпів?\n"
 "(Цими файлами не можна буде скористатися без самого набору).\n"
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -5179,7 +5245,7 @@
 "існуючого набору.\n"
 "Натисніть кнопку «Скасувати», щоб ввести нову назву.\n"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5191,7 +5257,7 @@
 "Ви справді бажаєте продовжити виконання дії?\n"
 "."
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5204,7 +5270,7 @@
 "Ви справді бажаєте продовжити виконання дії?\n"
 "."
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -5222,7 +5288,7 @@
 "Якщо файл втрачено, натисніть кнопку «Скасувати», щоб пропустити його "
 "завантаження.\n"
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -5237,7 +5303,7 @@
 "%s\n"
 "Отже, кліп не вдалося завантажити.\n"
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5251,7 +5317,7 @@
 "Крім того, у вікні «Налаштування» ви можете вибрати інший звуковий\n"
 "програвач.\n"
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5265,7 +5331,7 @@
 "сторонньою програмою.\n"
 "Автоматичний запуск jack буде вимкнено.\n"
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5274,7 +5340,7 @@
 "Не вдалося встановити з’єднання з сервером jack. jack слід запустити до "
 "запуску LiVES\n"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -5291,7 +5357,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5300,7 +5366,7 @@
 "Крім того, ви можете перезапустити LiVES і вказати інший програвач звукових "
 "даних.\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -5315,7 +5381,7 @@
 "Збільшити відповідне значення можна у вікні Параметри->Доріжки/Обробка.\n"
 "Рекомендуємо збільшити значення принаймні до %d МБ"
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -5328,7 +5394,7 @@
 "Рекомендуємо вам вилучити ці компонування.\n"
 "Вилучити старі компонування?\n"
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5342,7 +5408,7 @@
 "буфера скасування дій\n"
 "за допомогою пункту Параметри/Доріжки/Обробка/Розмір буфера скасування\n"
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5354,7 +5420,7 @@
 "Ймовірно, вам слід збільшити об’єм буфера дій\n"
 "за допомогою пункту Параметри/Доріжки/Обробка/Розмір буфера скасування\n"
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5363,21 +5429,21 @@
 "LiVES не вдалося зарезервувати достатньо пам’яті для буфера скасування "
 "багатодоріжкового режиму.\n"
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr "або введіть менше значення.\n"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Спробуйте повторити дію з редактора кліпів, спробуйте завершити роботу "
 "сторонніх програм,\n"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr "Спробуйте завершити роботу сторонніх програм\n"
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5387,14 +5453,14 @@
 "Вам слід скоригувати параметри звукових даних за допомогою меню "
 "«Інструменти».\n"
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "У поточному компонуванні є звукові дані, отже не можна встановлювати нульову "
 "кількість каналів звуку.\n"
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5405,7 +5471,7 @@
 "Змінити програвач можна за допомогою вкладки Інструменти|Параметри|"
 "Відтворення."
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5415,7 +5481,7 @@
 "іншої системи або зі старішої версії LiVES).\n"
 "Спробувати виправити копію компонування на диску?\n"
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5423,7 +5489,7 @@
 "LiVES не вдалося завантажити компонування.\n"
 "Вибачте.\n"
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
@@ -5433,7 +5499,7 @@
 "\n"
 "Значення частоти звукових даних має бути більшим за 0.\n"
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5445,7 +5511,7 @@
 "його показ може тривати досить довго.\n"
 "Ви справді бажаєте його переглянути?\n"
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
@@ -5455,7 +5521,7 @@
 "\n"
 "Щоб скористатися цією можливістю, вам слід встановити програму «dvgrab».\n"
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -5470,19 +5536,19 @@
 "Вам варто вибрати один з цих серверів на вкладці «Інструменти/Параметри/"
 "Відтворення».\n"
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "Додатку відтворення відео не вдалося ініціалізувати палітру!\n"
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Додатку декодування не вдалося ініціалізувати палітру!\n"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Не вдалося встановити частоту кадрів додатка роботи з відео\n"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5491,7 +5557,7 @@
 "допомогою пункту меню\n"
 "«Файл|Спорожнити місце на диску»\n"
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5504,33 +5570,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr "скасовано.\n"
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "невдало.\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr "помилка у файлі. Виконання перервано.\n"
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "Додаткова інформація: %s\n"
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr "Значення помилки: %d%s\n"
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -5545,7 +5611,7 @@
 "Будь ласка, перевірте, чи не пошкоджено основні файли вашої системи.\n"
 "%s%s%s"
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -5560,7 +5626,7 @@
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 "%s"
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -5575,7 +5641,7 @@
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 "%s"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -5588,7 +5654,7 @@
 "%s\n"
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -5603,7 +5669,7 @@
 "Повідомлення про помилку:\n"
 "%s\n"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -5616,7 +5682,7 @@
 "%s\n"
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -5631,12 +5697,12 @@
 "Повідомлення про помилку:\n"
 "%s\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr "Не вдалося прочитати значення «%s»."
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5649,7 +5715,7 @@
 "%s\n"
 "Будь ласка, перевірте, чи не є причиною пошкодження у вашій системі.\n"
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5662,7 +5728,7 @@
 "%s\n"
 "Будь ласка, змініть права доступу до теки і повторіть спробу."
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5675,7 +5741,18 @@
 "%s\n"
 "Будь ласка, змініть права доступу до каталогу і повторіть спробу."
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+"\n"
+"LiVES не може прочитати дані з каталогу:\n"
+"%s\n"
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5685,7 +5762,7 @@
 "Перервати виконання всіх завдань і негайно завершити роботу LiVES.\n"
 "Ви справді цього хочете?\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5696,7 +5773,7 @@
 "%s не придатний для кодування кліпів з зображеннями типу %s.\n"
 "Будь ласка, вкажіть інший інструмент кодування зі списку.\n"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5705,7 +5782,7 @@
 "Дані цієї картки вже використовуються, потік даних не можна відкривати "
 "декілька разів.\n"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5720,7 +5797,7 @@
 "- Перевірте, чи не користується цим пристроєм стороння програма.\n"
 "- Перевірте, чи створено системою файл пристрою.\n"
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5730,7 +5807,7 @@
 "Для цього файла вже завантажено субтитри.\n"
 "Бажаєте перезаписати поточні субтитри?\n"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5739,7 +5816,7 @@
 "У поточній версії LiVES передбачено підтримку субтитрів лише у форматах .srt "
 "і .sub.\n"
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5749,7 +5826,7 @@
 "Вилучення всіх субтитрів з цього кліпу.\n"
 "Ви впевнені у своїх діях?\n"
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5762,7 +5839,7 @@
 "Натисніть кнопку «Скасуват», щоб вказати файл з іншою назвою,\n"
 "або кнопку «Гаразд», щоб наказати програмі зберегти файл типу «%s»\n"
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5772,7 +5849,7 @@
 "Бажаєте пересунути поточні набори кліпів до нового каталогу?\n"
 "(Якщо непевні, натисніть кнопку «Так».)\n"
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5788,7 +5865,7 @@
 "Наполегливо рекомендуємо вам завершити роботу цього екземпляра до натискання "
 "кнопки «Гаразд»."
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5796,7 +5873,7 @@
 "\n"
 "Не вдалося виявити жодного пристрою вхідних даних.\n"
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5804,7 +5881,7 @@
 "\n"
 "Всі пристрої вхідних відеоданих вже використовуються.\n"
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5816,7 +5893,7 @@
 "ВИЛУЧЕННЯ І КОПІЮВАННЯ ФАЙЛІВ. МОЖЕ ТРИВАТИ ДОСИТЬ ДОВГО.\n"
 "НЕ ЗАВЕРШУЙТЕ РОБОТУ І НЕ ЗАКРИВАЙТЕ ВІКНО LIVES !\n"
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5827,7 +5904,7 @@
 "спробу.\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5845,7 +5922,7 @@
 "Файл -> Спорожнити місце на диску\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -5858,7 +5935,7 @@
 "Вітаємо у LiVES версії %s!\n"
 "\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
@@ -5870,7 +5947,7 @@
 "Докладні настанови щодо встановлення цієї змінної можна знайти у "
 "документації до вашого дистрибутива.\n"
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
@@ -5878,7 +5955,7 @@
 "\n"
 "Для використання цієї забавки вам слід завантажити принаймні один кліп.\n"
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -5889,7 +5966,7 @@
 "завершилися невдало.\n"
 "Рекомендуємо вам перезапустити LiVES.\n"
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -5900,7 +5977,7 @@
 "з’єднання завершилися невдало.\n"
 "Рекомендуємо вам перезапустити LiVES.\n"
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5913,197 +5990,244 @@
 "щоб інші програми могли обмінюватися даними з LiVES.\n"
 "Бажаєте дозволити таке з’єднання (лише протягом цього сеансу)?\n"
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "породжувач"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr "Породжувачі"
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr "породжувач звуку"
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr "Породжувачі звуку"
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr "породжувач звуку або відео"
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr "Породжувачі звуку або відео"
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr "породжувач даних"
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr "Породжувачі даних"
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr "візуалізатор даних"
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr "Візуалізатори даних"
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr "обробник даних"
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr "Обробники даних"
+
+#: src/effects.c:77
+msgid "data source"
+msgstr "джерело даних"
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr "Джерела даних"
+
+#: src/effects.c:80
 msgid "transition"
 msgstr "перехід"
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Переходи"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "ефект"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Ефекти"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "утиліта"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Утиліти"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr "складання"
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr "Складання"
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr "удар"
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr "Удари"
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr "роздільник"
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "Роздільники"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr "перетворювач"
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr "Перетворювачі"
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr "аналізатор"
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr "Аналізатори"
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr "звук/відео"
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr "Переходи звуку/зображення"
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr "лише відео"
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr "Переходи лише зображення"
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr "лише звук"
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr "Лише звук з переходами"
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "звук"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr "Аудіомікшери"
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr "Звукові ефекти"
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr "відео"
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr "Відеоефекти"
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr "регулятор гучності"
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr "Регулятори гучності"
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr "відеоаналізатор"
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr "Відеоаналізатори"
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr "аналізатор звуку"
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr "Засоби аналізу звукових даних"
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "невідомий"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr "%s всі кадри…"
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s вміст буфера обміну у кадри з %d до %d…"
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s до буфера…"
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s до нового кліпу…"
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s кадри з %d до %d…"
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s вміст буфера обміну даними з позначеною ділянкою"
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s до буфера"
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr "%s до нового кліпу"
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s кадри від %d до %d"
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -6111,17 +6235,46 @@
 "\n"
 "Не було створено жодного кадру.\n"
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr "ціле число"
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr "int64"
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr "булеве"
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr "double"
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr "рядок"
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr "вказівник"
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Помилка: у додатку %s не визначено функції weed_setup().\n"
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr "У додатку %s не знайдено придатних до використання фільтрів\n"
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr "Виявлено дублювання додатка %s"
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -6130,134 +6283,345 @@
 "Інформація: не вдалося завантажити додаток %s\n"
 "Повідомлення про помилку: %s\n"
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr "Каталоги додатків"
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr " - додатки %s -"
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Успішно завантажено %d фільтрів Weed\n"
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr "Некоректний комплексний ефект %s — суперечливі значення target_fps\n"
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr "Некоректний комплексний ефект %s — декілька параметрів переходу\n"
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+"Некоректний комплексний ефект %s — вказано декілька параметрів гучності "
+"основного каналу\n"
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr "Некоректний комплексний ефект %s — має бути більше одного підфільтра\n"
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr "Виявлено некоректний ефект %s у комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректне типове значення у комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний фільтр %d для типових значень у комплексному ефекті %s, "
+"рядок %d\n"
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний параметр %d для типових значень у комплексному ефекті "
+"%s, рядок %d\n"
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректну кількість типових значень у комплексному ефекті %s, "
+"рядок %d\n"
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено небулеве значення для типового параметра у комплексному ефекті %s, "
+"рядок %d\n"
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний параметр посилання у комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний фільтр виведення даних %d для параметрів посилань у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний параметр виведення даних %d для параметрів посилань у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+"Виявлено небулеве значення для автоматичного масштабування у комплексному "
+"ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний фільтр вхідних даних %d для параметрів посилань у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний параметр вхідних даних %d для параметрів посилань у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректне посилання на канал у комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+"Виявлено некоректний фільтр виведення даних %d для каналів прив’язки у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний канал виведення даних %d для параметрів посилань у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний фільтр вхідних даних %d для каналів прив’язки у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+"Виявлено некоректний канал вхідних даних %d для параметрів посилань у "
+"комплексному ефекті %s, рядок %d\n"
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr "Комплексний: %s"
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr "Успішно завантажено %d комплексних фільтрів\n"
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr "Не можна використовувати ефект %s з цим програвачем звукових даних.\n"
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Не вдалося запустити екземпляр %s, код помилки: %d\n"
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Не вдалося запустити породжувач %s\n"
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Не вдалося запустити породжувач %s\n"
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Не вдалося запустити породжувач %s, помилка: %d\n"
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr "%s [нестабільний] (%s)"
 
-#: src/framedraw.c:131
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
+msgstr "Слот ключа %d"
+
+#: src/effects-data.c:2814
+msgid "Connected to -->"
+msgstr "З’єднано з →"
+
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
+msgstr "З’єднання каналу прозорості"
+
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
+msgstr "З’єднання даних параметрів"
+
+#: src/effects-data.c:2904
+msgid "Autoscale All"
+msgstr "Автомасштаб для всього"
+
+#: src/effects-data.c:2971
+msgid "Autoscale"
+msgstr "Автомасштаб"
+
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
+msgstr "LiVES: З’єднання параметрів та каналів прозорості"
+
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
+msgstr "Автоз’єднання каналів"
+
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
+msgstr "Автоз’єднання параметрів"
+
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr "Від’єднати все"
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr "Канал вхідних даних вже з’єднано"
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr "Параметр вхідних даних вже з’єднано"
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr "Вхідні і вихідні параметри є несумісними"
+
+#: src/framedraw.c:156
 msgid "You can click in Preview to change these values"
 msgstr ""
 "Ви можете клацнути лівою кнопкою миші у області перегляду, щоб змінити ці "
 "значення"
 
-#: src/framedraw.c:148
+#: src/framedraw.c:170
 msgid "_Reset Values"
 msgstr "Від_новити значення"
 
-#: src/framedraw.c:249
-msgid "    _Frame"
-msgstr "    _Кадр"
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr "_Кадр"
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
-msgstr "Зберігати співвідношення розмірів початкового кадру"
-
-#: src/paramspecial.c:277
+#: src/paramspecial.c:264
 msgid "Maintain _Aspect Ratio"
 msgstr "З_берігати співвідношення розмірів"
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
-msgstr "LiVES: вибір файла"
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr "Зберігати співвідношення розмірів початкового кадру"
 
-#: src/paramspecial.c:356
+#: src/paramspecial.c:339
 msgid "Display Password"
 msgstr "Показувати пароль"
 
-#: src/paramwindow.c:360
+#: src/paramwindow.c:436
 msgid "Transition _In"
 msgstr "В_хідна позиція переходу"
 
-#: src/paramwindow.c:365
-msgid "Transition in"
-msgstr "Вхідна позиція переходу"
+#: src/paramwindow.c:456
+msgid "Crossfade audio"
+msgstr "Поступовий перехід звуку"
 
-#: src/paramwindow.c:393
+#: src/paramwindow.c:457
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 "Позначте цей пункт, щоб наказати програмі виконати перехід звуку разом з "
 "переходом зображення"
 
-#: src/paramwindow.c:396
-msgid "Crossfade audio"
-msgstr "Поступовий перехід звуку"
-
-#: src/paramwindow.c:430
+#: src/paramwindow.c:475
 msgid "Transition _Out"
 msgstr "В_ихідна позиція переходу"
 
-#: src/paramwindow.c:435
-msgid "Transition out"
-msgstr "Вихідна позиція переходу"
-
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr "Остаточна _частота кадрів (додаток може перевизначити її)"
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr "%s: розмір"
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr "Новий розмір (у пікселях):"
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "_Ширина"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "_Висота"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr "Створити до _буфера"
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr "Створити кадри у буфері обміну даними"
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr "Створити до _нового кліпу"
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr "Створити кадри у новому кліпі"
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -6268,59 +6632,59 @@
 "Для застосування цього ефекту вам слід позначити принаймні %d кадрів.\n"
 "\n"
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "Зробити типовим"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr "Скинути"
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "За_крити вікно"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr "Без параметрів"
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "Некоректний параметр"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Вибір кольору"
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr "Натисніть, щоб вказати колір"
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr "_Червоний"
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr "Значення червоного (0-255)"
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr "_Зелений"
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr "Значення зеленого (0-255)"
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr "С_иній"
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr "Значення синього (0-255)"
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
@@ -6329,12 +6693,12 @@
 "\n"
 "Помилка додатка: виконання %s завершилося помилкою з кодом %d"
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr " : повідомлення: %s\n"
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -6349,18 +6713,18 @@
 "%s\n"
 "Код помилки %d\n"
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Оновлення типових значень параметра відтворення відео у %s\n"
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 "Завантаження типових значень параметрів додатка відтворення відео з %s..."
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -6375,32 +6739,32 @@
 " Інструменти|Параметри|Відтворення|Додаткові параметри відтворення\n"
 "\n"
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr "Збереження типових параметрів додатка відтворення до %s…"
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr "Фіксована частота кадрів для додатка.\n"
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_Частота кадрів"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
-msgstr "Вхідний простір кольорів для додатка.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
+msgstr "Фіксована частота кадрів для додатка.\n"
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr "_Простір кольорів"
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr "Вхідний простір кольорів для додатка.\n"
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr "Зберегти параметри до іншого файла.\n"
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -6413,16 +6777,7 @@
 "Не вдалося відкрити додаток відтворення %s\n"
 "Помилка: %s\n"
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-"Не вдалося ініціалізувати додаток відтворення.\n"
-"Помилка: %s\n"
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -6437,7 +6792,16 @@
 "не передбачено обов’язкової функції.\n"
 "Його використання неможливе.\n"
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+"Не вдалося ініціалізувати додаток відтворення.\n"
+"Помилка: %s\n"
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6448,7 +6812,7 @@
 "натискання клавіш. Під час користування додатком клавіатурні скорочення може "
 "бути вимкнено!\n"
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6457,30 +6821,30 @@
 "*** Використання додатка %s для повноекранного відтворення призведе до "
 "використання типу палітри %d ( %s ). ***\n"
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr "Поток звукових даних не може використовувати бажаний формат «%s»\n"
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr "Використовуємо формат «%s».\n"
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 "LiVES не вдалося знайти додатки кодування програми. Будь ласка, "
 "переконайтеся, що ці додатки було встановлено до\n"
 "%s%s%s\n"
-"або змініть значення параметра <lib_dir> у ~/.lives\n"
+"або змініть значення параметра <lib_dir> у %s\n"
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6494,11 +6858,11 @@
 "або перемкніть програму на використання іншого додатка за допомогою вкладки "
 "«Інструменти|Параметри|Кодування»\n"
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Зміна розмірів неможлива, будь ласка, встановіть imageMagick\n"
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -6511,7 +6875,7 @@
 "Не вдалося відкрити додаток декодування %s\n"
 "Помилка: %s\n"
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -6526,192 +6890,176 @@
 "немає обов’язкової функції.\n"
 "Його використання неможливе.\n"
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr "/невідомо"
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr "LiVES: - Додаток декодування"
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr "Увімкнені декодери відео (зніміть позначку, щоб вимкнути)"
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Не вдалося завантажити %s, при переходах зміна розмірів неможлива.\n"
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr "Додаткові параметри %s"
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Створення тестового RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Зміна тестового RFX"
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr "Ефект —"
+#: src/rfx-builder.c:188
+msgid "tool"
+msgstr "інструмент"
 
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr "Перехід —"
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr "Породжувач —"
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr "Інструмент —"
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr "Утиліта —"
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr "Назва:          "
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Назва додатка. Не можна використовувати пробіли."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr "Версія:       "
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr "Версія скрипту."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr "    Автор:       "
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr "Автор скрипту."
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr "    Адреса URL (необов’язкова):       "
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr "Адреса сторінки супровідника додатка."
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Текст меню:    "
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Текст, який буде показано у меню."
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr "Опис дії:        "
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Опишіть дії, які виконує додаток. Наприклад, «Визначення меж»"
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr "Мінімальна к-ть кадрів:"
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Мінімальна кількість кадрів, до якої можна застосовувати цей ефект або "
 "інструмент. Зазвичай, 1."
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr "_Залежності…"
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr "Введіть список бінарних файлів, потрібних для роботи додатка."
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "_Властивості…"
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr "Вкажіть властивості додатка. Не є обов’язковим."
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr "_Параметри…"
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Визначіть параметри, які буде використано у коді перед, після, у циклі або у "
 "коді перемикача. Не є обов’язковими."
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr "Підказки _вікна параметрів…"
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "Вкажіть підказки щодо заповнення вікна параметрів. Підказки не є "
 "обов’язковими."
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "Код мови:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr "Код _мови:"
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Мова коду перед, після, у циклі або перемикачів. Не є обов’язковою."
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr "Код _до циклу…"
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr "Код, який буде виконано до циклу. Необов’язковий."
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr "Код _циклу…"
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr "Код циклу, який буде застосовано до кожного кадру."
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr "Код _після циклу…"
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr "Код, який буде виконано після циклу. Необов’язковий."
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr "Код пере_микача…"
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6719,7 +7067,7 @@
 "Встановіть код перемикання для показу вікна параметра або зміни параметра. "
 "Не є обов’язковим (окрім допоміжних інструментів)."
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6734,55 +7082,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Залежності RFX"
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Параметри RFX"
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Підказки вікна параметрів RFX"
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX Triggers"
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "С_творити запис"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr "_Змінити запис"
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "Ви_лучити запис"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "Пересунути в_гору"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "Пересунути в_низ"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Властивості RFX"
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr "Пов_ільно (підказка до інтерфейсу)"
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr "_Породжувач пакетного режиму"
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6796,7 +7144,7 @@
 "Будь ласка, спочатку вилучіть перемикач.\n"
 "\n"
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6808,27 +7156,27 @@
 "Було скориговано деякі з перемикачів.\n"
 "Будь ласка, перевірте код перемикачів.\n"
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Новий параметр RFX"
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Зміна параметра RFX"
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr "_Назва:    "
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Назва параметра, не повинна повторюватися в межах додатка."
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr "_Мітка:    "
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6836,174 +7184,162 @@
 "Мітка, яку буде показано поряд з параметром. Символ підкреслювання "
 "відповідатиме клавіатурному акселератору."
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr "_Група кнопок: "
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr "Для групування пунктів варіантів можна ввести ненульове число."
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr "_Тип:         "
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr "Тип параметра (виберіть зі списку)."
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr "Десяткових п_озицій: "
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr "_Типове значення:    "
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr "_Типовий: "
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr "_Група кнопок: "
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr "Для групування пунктів варіантів можна ввести ненульове число."
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr "_Мінімальне значення: "
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr "Ма_ксимальне значення: "
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr "     Розмір _кроку:   "
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "Крок зміни параметра у відповідь на натискання кнопок зі стрілками поряд з "
 "полем лічильника."
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
-msgstr "_Циклічність: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
+msgstr "_Циклічна зміна"
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 "Визначає, чи буде значення зациклено переходами максимальне->мінімальне та "
 "мінімальне->максимальне."
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr "Вказати _значення"
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr "Типове значення:    "
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr "Мінімальне значення: "
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr "Максимальне значення: "
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr "Типовий _червоний:  "
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr "Типовий _зелений:"
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr "Типовий _синій: "
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr "Зробити _типовим"
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr "Типове значення:  "
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr "Максимальна довжина (у літерах): "
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Створення підказки вікна параметрів RFX"
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Зміна підказки вікна параметрів перемикача RFX"
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
-msgstr "Ключове слово:         "
-
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
-msgstr "Особливий тип:         "
-
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
-msgstr "Особливий підтип:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
+msgstr "_Ключове слово:         "
+
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
+msgstr "Особливий _тип:         "
+
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
+msgstr "Особливий _підтип:         "
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr "Рядок:    "
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Пов’язані параметри (%d):    "
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr "Пов’язані параметри (4):    "
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr "Пов’язані параметри (2):    "
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Створення перемикача RFX"
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Зміна перемикача RFX"
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr "Якщо:         "
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Код перед циклом"
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Код циклу"
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Код після циклу"
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Типовий текст (максимальна довжина — %d)"
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Введіть значення, по одному на рядок"
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
@@ -7013,7 +7349,7 @@
 "\n"
 "Назва не повинна бути порожньою.\n"
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
@@ -7023,7 +7359,7 @@
 "\n"
 "У назві не повинно міститися пробілів.\n"
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
@@ -7033,7 +7369,7 @@
 "\n"
 "Текст меню не повинен бути порожнім.\n"
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
@@ -7043,7 +7379,7 @@
 "\n"
 "Опис дії не повинен бути порожнім.\n"
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
@@ -7053,7 +7389,7 @@
 "\n"
 "Поле автора не повинно бути порожнім.\n"
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -7065,7 +7401,7 @@
 "Додаток з вказаною назвою вже існує.\n"
 "Назва не повинна повторюватися.\n"
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
@@ -7075,7 +7411,7 @@
 "\n"
 "Область коду циклу не повинна бути порожньою.\n"
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
@@ -7085,7 +7421,7 @@
 "\n"
 "Код перемикача допоміжного інструменту не повинен бути порожнім.\n"
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
@@ -7095,7 +7431,7 @@
 "\n"
 "Поле назви параметра не повинно бути порожнім.\n"
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -7109,41 +7445,41 @@
 "повторюватися у межах додатка.\n"
 "\n"
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Запис файла скрипту %s…"
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <define>.\n"
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr "Помилкова версія скрипту.\n"
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <name>.\n"
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <version>.\n"
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <author>.\n"
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <description>.\n"
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Помилковий опис. (%s)\n"
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -7158,27 +7494,27 @@
 "некоректний перемикач (%s).\n"
 "\n"
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Перезбирання всіх скриптів RFX… вбудовані…"
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr "Перезбирання скриптів"
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr "нетиповий…"
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr "перевірка…"
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr "перезбирання динамічних пунктів меню…"
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -7192,7 +7528,7 @@
 "Будь ласка, перевірте, чи зберігається ця програма за шляхом зі змінної PATH "
 "та чи є її файл виконуваним.\n"
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -7207,12 +7543,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Вилучення скрипту rfx %s..."
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -7227,7 +7563,7 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -7242,12 +7578,12 @@
 "вже існує.\n"
 "Будь ласка, спочатку вилучіть цей файл або перейменуйте тестовий скрипт.\n"
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Переведення тестового додатка rfx %s до списку нетипових…"
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -7255,29 +7591,29 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
+"Return code was %d (%s)\n"
 msgstr ""
 "\n"
 "\n"
 "Не вдалося пересунути скрипт додатка з\n"
 "%s до\n"
 "%s\n"
-"Повернуто код помилки %d\n"
+"Повернуто код помилки %d (%s)\n"
 
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
-msgstr "Імпортувати скрипт з…"
-
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
-msgstr "Експортувати скрипт до…"
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
+msgstr "LiVES: Експортувати скрипт до…"
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Копіювання %s до %s…"
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr "LiVES: Імпортувати скрипт з…"
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -7293,55 +7629,43 @@
 "Будь ласка, спочатку вилучіть цей файл або перейменуйте скрипт, який "
 "імпортується.\n"
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "Вбудований"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Нетиповий"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Перевірити"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Копіювання скрипту RFX"
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
-msgstr "З типу:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
+msgstr "_З типу:    "
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr "   Скрипт:    "
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Перейменування тестового скрипту RFX"
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr "Зі скрипту: "
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Назва текстового скрипту RFX"
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr "Назва скрипту: "
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr "Нова назва: "
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr "Нова назва скрипту: "
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -7353,28 +7677,45 @@
 "Тестовий скрипт з вказаною назвою вже існує.\n"
 "Назва скрипту не повинна повторюватися.\n"
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Перейменування тестового скрипту RFX %s на %s…"
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+"\n"
+"\n"
+"Не вдалося пересунути скрипт додатка з\n"
+"%s до\n"
+"%s\n"
+"Повернуто код помилки %d\n"
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Застосувати ефекти реального часу до позначеного"
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Завантаження ефекту обробки %s…"
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Див.: Ві-джей - Показати клавіші ві-джея. Встановіть ефекти реального часу, "
 "а потім застосуйте їх тут."
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -7386,7 +7727,7 @@
 "Додатки відтворення відео буде задіяно лише у\n"
 "повноекранному режимі або режимі окремого вікна\n"
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -7398,7 +7739,7 @@
 "\n"
 "(Вільного місця = НЕВІДОМО)"
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -7411,29 +7752,23 @@
 "\n"
 "(Вільно %s)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 "Каталог тимчасових файлів є робочим каталогом LiVES, де зберігаються "
 "відкриті кліпи та набори.\n"
 "Його має бути розташовано на розділі, де досить багато вільного місця.\n"
-"\n"
-"Підказка: не використовуйте каталоги у /tmp, оскільки під час завершення "
-"роботи системи часто вміст /tmp вилучається."
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
@@ -7441,11 +7776,27 @@
 "Ймовірно, вам спочатку слід створити його від імені користувача root, "
 "наприклад:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"su -c \"mkdir -p %s\"; su -c \"chmod 777 %s\"\n"
+"\n"
+"Зараз каталог змінено не буде.\n"
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+"Не вдалося створити або виконати запис до нового тимчасового каталогу.\n"
+"%s\n"
+"Будь ласка, скористайтеся іншим каталогом або зв’яжіться з адміністратором "
+"вашої системи.\n"
 "\n"
 "Зараз каталог змінено не буде.\n"
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7465,7 +7816,7 @@
 "Ви також можете натиснути кнопку «Скасувати», щоб відновити початкову адресу "
 "каталогу тимчасових файлів."
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7476,7 +7827,7 @@
 "jackd.\n"
 "Див. http://jackaudio.org\n"
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7485,7 +7836,7 @@
 "Перемикання інструментів відтворення звуку вимагає перезапуску програми "
 "(доведеться запустити jackd)\n"
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7497,67 +7848,67 @@
 "Слід спочатку встановити PulseAudio\n"
 "Див. http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (найвища якість, найбільші файли)"
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Параметри"
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr "Відкривати частини файлів максимізованими"
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr "Показувати нещодавні файли у меню «Файл»"
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr "Зупиняти зберігач екрана на час відтворення    "
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr "Відкривати вікно максимізованим"
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr "Показувати панель, якщо тло спорожнено"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr "Дозволити перемикання між кліпами коліщатком миші"
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr "Стискати перегляд відповідно до розмірів інтерфейсу"
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr "Початковий режим:"
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr "_Редактор кліпів"
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr "Режим _декількох доріжок"
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr "Підтримка роботи з декількома моніторами"
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr " кількість моніторів для інтерфейсу LiVES"
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr " кількість моніторів для відтворення"
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7565,238 +7916,254 @@
 "У разі встановлення значення 0 буде використано всі доступні монітори "
 "(працює не з усіма додатками відтворення)."
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr "Примусово на одному моніторі"
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
-msgstr "Режим примусової роботи на одному моніторі"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
+msgstr "Ігнорувати всі монітори, окрім першого"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "Інтерфейс"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr "Після входу до режиму декількох доріжок:"
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Запитати про ширину, висоту, частоту кадрів та параметри звуку"
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr "_Завжди використовувати такі значення:"
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr "Використовувати ці з_начення для обробки нових кліпів"
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr "_Ширина           "
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr "          _Висота      "
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr "          _Частота кадрів"
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr "Увімкнути резервне копіювання звукової доріжки"
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr "Кількість звукових доріжок на відеодоріжку"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Розмір _буфера скасування (у МБ)    "
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr "Ви_йти з багато доріжкового режиму після обробки"
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr "Автоматичне створення копій компонування"
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr "_Кожні"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "секунд"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr "Після к_ожної зміни"
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Ніколи"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr "Доріжки/Обробка"
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr "За можливості, користуватися негайним відкриттям"
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Увімкнути негайне відкриття файлів деяких типів за допомогою додатків "
 "декодування"
 
-#: src/preferences.c:2840
-msgid "Video open command             "
-msgstr "Команда відкриття відео             "
-
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
-msgstr "Стискання відкриття/обробки                  "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
+msgstr "Команда відкриття відео (резервна)"
+
+#: src/preferences.c:2494
+msgid "Open/render compression"
+msgstr "Стискання відкритня/обробки"
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     ( менше значення = повільніше, більші файли; для jpeg — вища якість )"
 
-#: src/preferences.c:2885
-msgid "Default image format          "
-msgstr "Типовий формат зображень          "
+#: src/preferences.c:2509
+msgid "Default image format"
+msgstr "Типовий формат зображень"
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "(Скористайтеся пунктом меню «Довідка/Усування вад», щоб переглянути список "
 "підтримуваних форматів зображень)"
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr "За можливості, увімкнути автоматичне усування черезрядковості"
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Автоматично усувати черезрядковість, якщо це пропонує додаток"
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr "Якщо можна, ігнорувати порожні поля"
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr "Якщо можна, вирізати всі порожні поля з кадрів"
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Якщо буде відкрито декілька зображень, об’єднати їх у один кліп"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "Декодування"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-"Якість попереднього перегляду відтворення відео (впливає на зміну розмірів)"
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr "_Якість перегляду"
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr "Низька — може покращити швидкодію на повільних комп’ютерах"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr "Звичайна — рекомендована для більшості користувачів"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr "Висока — може покращити якість на дуже швидких комп’ютерах"
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr "_Якість перегляду"
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+"Якість попереднього перегляду відтворення відео (впливає на зміну розмірів)"
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr "П_оказувати дані щодо частоти кадрів"
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "_Додаток"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr "Потоковий звук"
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr "Додаток відтворення потокового звуку"
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr "Записувати дані, що відтворюються"
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr "Записувати дані щодо відтворюються, а не виводити дані для відтворення"
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "ВІДЕО"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr "П_рогравач"
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 "(Додаткові параметри запуску Jack можна знайти на вкладці «Інтеграція з "
 "Jack»)"
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr "_Команда відтворення звуку"
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr "- вбудована -"
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr "Параметри звуку змінюються за _частотою/напрямком відтворення відео"
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr "Параметри звуку змінюються за перемиканням _кліпів"
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr "Джерело:"
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr "В_нутрішні"
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr "З_овнішні (потрібен звуковий програвач з підтримкою jack або pulse)"
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr "ЗВУК"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Відтворення"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7804,69 +8171,68 @@
 "Записувати звук під час захоплення відео з з_овнішнього вікна\n"
 " (потрібен сервер Jack або PulseAudio)"
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Джерело даних для запису після натискання клавіші «r»   "
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr "З_мінюється номер кадру"
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr "Змі_нюється частота кадрів"
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr "Ефекти _реального часу"
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr "П_еремикання кліпів"
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr "_Внутрішній звук (потрібен програвач jack або PulseAudio)"
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr "_Зовнішній звук (потрібен програвач jack або PulseAudio)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
+msgstr "_Звук (потрібен звуковий програвач з підтримкою jack або pulse)"
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr "Призупинити запис, якщо на диску залишилося менше"
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr "ГБ"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "Запис"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
-msgstr "      Кодувальник                  "
+#: src/preferences.c:2985
+msgid "Encoder"
+msgstr "Кодувальник"
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "Формат виводу"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "Аудіокодек"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr "Використовувати під час зміни розмірів з_гладжування"
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr "Кількість клавіш ефектів _реального часу"
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7875,81 +8241,98 @@
 "можна або за допомогою вікна ефектів реального часу, або за допомогою мережі "
 "(OSC)."
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr "_Розподілене виконання під час застосування ефектів"
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr "Кількість _потоків"
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+"У разі внесення змін до будь-якого з вказаних нижче шляхів програму "
+"доведеться перезапустити:"
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr "Шлях до додатків Weed"
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr "Шлях до додатків Frei0r"
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr "Шлях до додатків LADSPA"
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr "      Каталог завантаження відео (типовий)      "
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr "      Каталог збереження відео (типовий) "
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr "      Каталог завантаження звукових даних (типовий) "
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr "      Каталог зображень (типовий) "
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr "      Каталог резервних копій/Відновлення (типовий) "
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr "      Каталог тимчасових файлів (не вилучати) "
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr "Типовий каталог, з якого завантажуватимуться відеокліпи"
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr "Типовий каталог, до якого зберігатимуться закодовані кліпи"
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr "Типовий каталог для збереження та завантаження звукових даних"
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr "Типовий каталог, до якого зберігатимуться зображення кадрів"
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "Типовий каталог для створення резервних копій або відновлення окремих кліпів"
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr "Робочий каталог LiVES."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Каталоги"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr "Попереджати, якщо місця менше за: "
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr " МБ [0 — вимкнути попередження]"
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr "Критичний рівень місця на диску: "
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7957,19 +8340,19 @@
 "Попереджати під час вставки/об’єднання, якщо _частота кадрів у буфері даних "
 "не збігається з частотою кадрів позначеного"
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr "Попереджати під час відкриття, якщо _розмір перевищує "
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " МБ"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr "Показувати попередження перед збереженням _набору"
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
@@ -7977,76 +8360,76 @@
 "Показувати попередження, як_що під час запуску LiVES не буде знайдено "
 "mplayer, sox, composite або convert."
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Показувати попередження, якщо при запуску у системі не буде знайдено ефектів "
 "_обробки."
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Показувати попередження, якщо при запуску у системі не буде знайдено "
 "_додатків кодування."
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Показувати попередження, якщо буде введено _дублікат назви набору."
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Під час завантаження набору попереджати про те, що не вдалося знайти кліпів "
 "_компонувань."
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Попередження про намір закрити кліп, використаний у компонуванні."
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Попередження про вилучення кадрів, використаних у компонуванні."
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Попередження про пересування кадрів, використаних у компонуванні."
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Попередження про заміну кадрів, використаних у компонуванні."
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 "Попередження про вилучення звукових даних, використаних у компонуванні."
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 "Попередження про пересування звукових даних, використаних у компонуванні."
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Попередження про заміну звукових даних, використаних у компонуванні."
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr "Контекстні підказки про помилки компонування після змін у кліпі."
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Попереджати про те, що компонування не було збережено під час завершення "
 "роботи у багатодоріжковому режимі."
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Попереджати про завантаження компонування зі звуковими доріжками у "
 "багатодоріжковому режимі без звуку."
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -8054,124 +8437,112 @@
 "Попереджати, якщо у багатодоріжковому режимі є звукові канали, а програвачем "
 "звуку не є «jack» або «PulseAudio»."
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr "Показувати сповіщення після імпортування даних пристрою firewire."
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Показувати попередження перед відкриттям потоку yuv4mpeg."
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Показувати попередження про вичерпання простору для резервування у "
 "багатодоріжковому режимі."
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 "Показувати після аварійного завершення діалогове вікно з пропозицією "
 "звільнити місце на диску."
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 "Показувати попередження, якщо не вдасться зв’язатися з відтворювачем "
 "pulseaudio."
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Попередження"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "MIDI-синхронізація (потрібні файли midistart і midistop)"
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr "Вставка/Об’єднання кадрів:  "
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "При_швидшити/Сповільнити вставлене"
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr "_Змінити частоту кадрів у вставленому"
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr "Pause xmms during audio playback"
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr "Пристрій КД           "
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr "LiVES: Вибір пристрою КД"
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES може завантажувати звукові композиції з цього КД"
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "Типово кд/с        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 "Кількість кадрів на секунду, яку слід використовувати, якщо кількість не "
 "визначено"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Інше"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "Нова тема:           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Теми"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Ширина каналу звантаження (кб/с)       "
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "Для використання OMC LiVES має бути зібрано без \"configure --disable-OSC\""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr "Увімкнено віддалене керування OMC"
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "Порт UDP       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "Вмикати OMC під час запуску програми"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "Потокові дані/Мережа"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr "Передавання даних Jack"
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8179,51 +8550,47 @@
 "Щоб мати змогу використовувати передавання даних Jack, LiVES має бути "
 "зібрано з файлами заголовків jack/transport.h та jack/jack.h"
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr "Файл налаштування _передавання даних Jack"
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr "Назва сервера Jack, який може керувати передавання даних LiVES"
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "Запускати с_ервер при запуску LiVES"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr "С_ервер передавання даних Jack (запуск і зупинка)"
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr "_Клієнт передавання даних Jack (запуск і зупинка)"
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr "Початкову позицію встановлює передавання Jack"
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr "Допоміжний засіб відліку часу передавання Jack"
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 "(Див. також «Відтворення -> Параметри звуку змінюються з частотою/напрямком "
 "відтворення відео»)"
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Звук Jack"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "Щоб мати змогу скористатися звуковим сервером Jack, вам слід зібрати LiVES з "
 "jack/jack.h"
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8231,85 +8598,72 @@
 "Щоб скористатися звуковими можливостями Jack, вам СЛІД вказати звуковий "
 "програвач «jack» на вкладці «Відтворення»"
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Фа_йл налаштування звукового сервера Jack"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Назва звукового сервера Jack"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr "Відтворювати звук, навіть якщо передавання пр_изупинено"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr "Інтеграція з Jack"
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr "Події, на які слід реагувати:"
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr "Події д_жойстика"
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr "Пристрій _джойстика"
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Пристрій джойстика, наприклад, /dev/input/js0"
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr "LiVES: Вибір пристрою джойстика"
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "П_одії MIDI"
 
-#: src/preferences.c:5498
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
+msgstr "Вико_ристати MIDI ALSA (рекомендовано)"
+
+#: src/preferences.c:3987
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "Створити порт MIDI ALSA, з яким можна буде з’єднувати інші MIDI-пристрої"
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
-msgstr "Вико_ристати MIDI ALSA (рекомендовано)"
-
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "Використовувати MIDI б_ез обробки"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "Читання безпосередньо з пристрою MIDI"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "Пр_истрій MIDI"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "Пристрій MIDI, наприклад, /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES: Вибір пристрою MIDI"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Додатково"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr "_Частота перевірки MIDI"
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8318,26 +8672,25 @@
 "значення може покращити інтерактивність MIDI, але може сповільнити "
 "відтворення."
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "Повторення MIDI"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Кількість тактів відсутності сигналу між двома послідовними сигналами."
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Попередження: визначення занадто великих значень може уповільнити "
 "відтворення.)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr "Навчання MIDI/джойстика"
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8349,7 +8702,7 @@
 "щоб зміна каталогів набула чинності.\n"
 "Натисніть «Гаразд», щоб програма завершила роботу.\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
@@ -8357,63 +8710,63 @@
 "Щоб зміни у розташуванні каталогів набули чинності, LiVES буде перезапущено "
 "після закриття діалогового вікна налаштування."
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "Зміна теми набуде чинності лише під час наступного запуску LiVES."
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "Параметри Jack набудуть чинності лише під час наступного запуску LiVES."
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Синхронізація зовнішньої частоти кадрів у %.8f кадрів на секунду.\n"
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Не вдалося ініціалізувати отримувач даних OSC\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "ПОПЕРЕДЖЕННЯ: Не вдалося запустити сервер OSC на порту UDP %d\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Запущено сервер OSC на порту UDP %d\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Не вдалося запустити сервер OSC/UDP на порту %d \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Зміна розмірів кадрів від 1 до %d"
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr "Зміна розмірів кадрів з 1 до %d"
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Змінити розмір"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr "Зміна дискретизації/розмірів"
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Тепер відео складається з %d кадрів.\n"
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
@@ -8423,155 +8776,147 @@
 "\n"
 "Нове значення частоти має бути більшим за 0\n"
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "Зміна дискретизації звукових даних"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES не вдалося змінити дискретизацію звукових даних бажаним чином.\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "Зміна дискретизації звуку"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Частоту звукових даних було змінено на %d Гц, %d каналів, %d бітів"
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Зміна дискретизації відео при %.8f кадрах на секунду…"
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Зміна дискретизації відео при %.3f кадрах на секунду…"
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr "Помилка перевпорядкування!\n"
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "Змінити частоту"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Зміна дискретизації звуку"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Вставка тиші"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Новий звук кліпу"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Параметри зовнішнього кліпу"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr "Частота (Гц) "
 
-#: src/resample.c:1269
-msgid "         Channels "
-msgstr "         Канали "
-
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        Розмір вибірки "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
+msgstr "Канали"
+
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr "Розмір фрагмента "
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "Signed"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Поточний"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "_Увімкнути звук"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr "_Частота (у Гц) "
+#: src/resample.c:1372
+msgid "_Channels"
+msgstr "_Канали"
+
+#: src/resample.c:1394
+msgid "_Sample Size"
+msgstr "_Розмір фрагмента"
+
+#: src/resample.c:1394
+msgid "Sample Size"
+msgstr "Розмір фрагмента"
 
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr "    _Канали "
-
-#: src/resample.c:1546
-msgid "    Channels "
-msgstr "    Канали "
-
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    _Розмір семпла "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    Розмір семпла "
-
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Створити"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "_Кадрів на секунду "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "Запис триватиме максимум  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " годин  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " хвилин  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " секунд  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Не обмежено"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 "Натисніть «Гаразд», щоб почати запис, або «Скасувати», щоб скасувати запис."
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Зміна швидкості відтворення"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Зміна дискретизації відео"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -8588,7 +8933,7 @@
 "Будь ласка, введіть бажану швидкість відтворення\n"
 "у _кадрах на секунду"
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -8605,15 +8950,15 @@
 "Будь ласка, введіть з_мінену частоту дискретизації\n"
 "у кадрах на секунду"
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr "АБО введіть бажану _тривалість кліпу у секундах"
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "Змінити також швидкість _звукових даних"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8624,7 +8969,7 @@
 "компонувань.\n"
 "Ви справді бажаєте змінити швидкість?\n"
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8635,7 +8980,7 @@
 "багатодоріжкових компонувань.\n"
 "Ви справді бажаєте змінити швидкість?\n"
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
@@ -8646,7 +8991,7 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
@@ -8657,35 +9002,35 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "Зміна швидкості"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Швидкість відтворення змінено на %3f кадрів на секунду, а частоту звукових "
 "даних на %d Гц.\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Швидкість відтворення змінено на %.3f кадрів на секунду.\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "Зміна дискретизації відео"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "Зміна дискретизації відео у буфері даних"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr "Перевпорядкування кадрів"
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
@@ -8695,20 +9040,20 @@
 "\n"
 "LiVES не вдалося перевпорядкувати кадри."
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr "Скасування впорядкування кадрів"
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "помилка зміни дискретизації…"
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -8724,7 +9069,7 @@
 "Ви хочете саме цього?\n"
 "\n"
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -8737,12 +9082,12 @@
 "файл\n"
 "\n"
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Збереження прив’язки клавіш до %s\n"
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
@@ -8751,7 +9096,7 @@
 "\n"
 "Оновлення файла прив’язки клавіш %s…"
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -8766,12 +9111,12 @@
 "%s\n"
 "Повідомлення про помилку: %s\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Збереження типових параметрів ефектів реального часу до %s…"
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -8786,22 +9131,22 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Завантаження типових параметрів ефектів реального часу з %s…"
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Завантаження типових розмірів інструментів створення з %s…"
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Завантаження клавіатурних скорочень з %s…"
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -8816,27 +9161,27 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Некоректний рядок %d у %s\n"
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Некоректна клавіша %d у %s\n"
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Некоректний ефект %s у %s\n"
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr "Невідомий ефект %s у %s\n"
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8845,16 +9190,21 @@
 "У цій версії LiVES неможливо призначати породжувачі і непороджувачі на одну "
 "клавішу (%d) !\n"
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "З клавішею %d пов’язано занадто багато ефектів.\n"
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "потрібне оновлення.\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr "Завантажуємо карту прив’язування даних з %s…"
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -8866,40 +9216,45 @@
 "Не вдалося знайти деяких з ефектів.\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "Без опису"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: відомості про %s"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "Назва ефекту: %s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Назва додатка: %s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr "і: %s"
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "Версія: %d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "Опис: "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -8913,65 +9268,69 @@
 "клавіші.\n"
 "\n"
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES не вдалося знайти ефект %s.\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: прив’язка ефектів реального часу"
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr "Захоплення клавіші"
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr "Активізація клавіші"
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr "Захоплення клавіші"
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr "Захопити клавіатуру для цієї клавіші ефекту"
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "Ви_лучити всі ефекти"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr "Активізація режиму"
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Інформація"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "Вказати параметри"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr "Встановити з’єднання"
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Спорожнити"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "Назва ефекту:"
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr "З_берегти як типовий набір прив’язок"
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr "З_авантажити типові клавіатурні скорочення"
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -9025,11 +9384,6 @@
 msgid "none\n"
 msgstr "немає\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr "%d Гц каналів: %d %d б/с\n"
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -9049,58 +9403,58 @@
 msgid "TV card %d"
 msgstr "ТБ-картка %d"
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "Відкрито ТБ-картку %d (%s)"
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewire-картка %d"
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "Відкрито firewire-картку %d"
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "Авторезервування"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr "Звуковий супровід"
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Поточна доріжка: %s (шар %d)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr "Current track: Backing audio\n"
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Поточна доріжка: шар %d звуку\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f с\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "Джерело: %s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "Клацніть правою кнопкою миші, щоб відкрити контекстне меню.\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -9108,7 +9462,7 @@
 "Двічі клацніть лівою кнопкою\n"
 "миші на блоці, щоб позначити його."
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -9123,7 +9477,7 @@
 "подвійним клацанням лівою або\n"
 "правою кнопкою миші.\n"
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -9135,7 +9489,7 @@
 "Не вказано жодного ефекту.\n"
 "Спочатку позначте ефект у стосі, щоб переглянути його властивості.\n"
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -9145,7 +9499,7 @@
 "\n"
 "Не завантажено жодного кліпу.\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9161,7 +9515,7 @@
 "Крім того, ви можете увімкнути автоматичні переходи у\n"
 "меню «Ефекти» перед додаванням кліпів на монтажний стіл."
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -9175,12 +9529,12 @@
 "позначити принаймні одну відеодоріжку\n"
 "і ділянку за часом.\n"
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "від %.2f с до %.2f с\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9188,182 +9542,186 @@
 "Клацніть лівою кнопкою миші\n"
 "на монтажному столі, щоб позначити кадр.\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr "%s [нестабільний]"
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+"Ви можете натиснути кнопку миші\n"
+"і перетягнути вказівник монтажним столом"
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "щоб позначити діапазон часу.\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES: позначений кліп"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "_Коригування початкової і кінцевої позицій"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr "З_мінити/Закодувати у редакторі кліпів"
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "П_оказати відомості щодо кліпу"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "З_акрити цей кліп"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "Звуковий мікшер (ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "Клацніть лівою кнопкою миші на монтажному столі,"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "щоб позначити кадр."
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr "Двічі клацніть лівою або правою кнопкою миші на монтажному столі,"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "щоб позначити блок."
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "Кліпи можна перетягувати"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "на монтажний стіл."
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "Режим миші: пересування"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "кліпи можна пересувати."
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "Режим миші: позначення."
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "Натисніть кнопку миші і перетягніть вказівник монтажного стола,"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "щоб позначити доріжки і часові ділянки."
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "_Вставлення: звичайне"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "_Миша: пересування"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "_Миша: позначення"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "_Тяжіння: звичайне"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "_Тяжіння: ліворуч"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "_Тяжіння: праворуч"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr "Закрити за_лишкові прогалини у позначених доріжках/проміжку часу"
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Закрити пер_шу прогалину в позначених доріжках/часовому фрагменті"
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "Закрити проміжки"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr "Пересунути блок"
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr "Пересунути блок звуку"
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "Вилучити блок"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr "Вилучити блок звуку"
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr "Розділити доріжки"
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr "Розділити блок"
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "Застосувати %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "Вилучити %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr "Вставити блок"
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr "Вставити проміжок"
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr "Вставити звуковий блок"
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "Зміна порядку ефектів"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "unsigned "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "signed "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "big endian"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "little endian"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9373,15 +9731,15 @@
 "x %d, кількість каналів звуку %d, частота звуку %d, розмір семпла звуку %d, "
 "%s.\n"
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "некоректний список подій. Помилка.\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "у списку подій вказано некоректну частоту кадрів. Помилка.\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -9396,7 +9754,7 @@
 "закрити поточний набір,\n"
 "а потім завантажити новий набір за допомогою меню «Файл».\n"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -9407,331 +9765,361 @@
 "Вказано некоректну для LiVES кількість каналів звукових даних (%d).\n"
 "Не вдалося завантажити.\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr "Компонування було вилучено.\n"
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: багатодоріжковий %dx%d: глибина кольору %d %.3f кд/с"
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "Кліпи"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr "Вхід/Вихід"
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr "Стос ефектів"
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "Параметри"
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "_Відкрити…"
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "В_ідкрити частину файла…"
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Імпортувати позна_чене з DVD/VCD…"
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr "Імпортувати познач_ене з DVD"
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr "Імпортувати позна_чене з VCD"
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_Імпортувати з пристрою"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "За_крити вікно позначеного кліпу"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "З_берегти компонування як…"
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "_Завантажити компонування…"
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "Ви_лучити компонування…"
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 "_Ігнорувати дані про ширину, висоту та параметри звуку з завантажених "
 "компонувань"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr "Авто_матично завантажувати субтитри з кліпами"
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "_РЕДАКТОР КЛІПІВ"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "С_коригувати початкову або кінцеву позицію позначеного кліпу"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "_Вставити позначений кліп"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "В_ставити позначений звуковий кліп"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr "Ви_лучити позначений блок"
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr "П_ерейти до межі попереднього блоку"
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr "П_ерейти до межі наступного блоку"
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "Вилучити позна_чки з монтажного стола"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "Ігнорувати обмеження позначеного під час вставлення"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "Від_творити від позиції на монтажному столі"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr "Від_творити лише позначений фрагмент"
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr "П_ересунути ефекти з блоками"
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr "Вибрати ефект _автопереходу…"
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "Переглянути/З_мінити позначений ефект"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "Ви_лучити позначений ефект"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr "Застосувати ефект до _блоку…"
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr "Застосувати ефект до _ділянки…"
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "_Доріжки"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr "Перейменувати поточну доріжку"
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr "Зробити зв_уковий супровід поточною доріжкою"
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr "Додати відеодоріжку на _задній план"
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr "Додати відеодоріжку на п_ередній план"
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "_Розділити поточну доріжку на позиції курсора"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "_Розділити позначені відеодоріжки"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr "Вставити прогалину у позначені доріжки/позицію часу"
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr "Вставити прогалину у поточну доріжку/позначений час"
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Закрити всі про_галини у позначених доріжках/часових фрагментах"
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "По_значене"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "П_означити поточну доріжку"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "Позначити в_сі відеодоріжки"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "Зн_яти позначення з усіх відеодоріжок"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "Позначити весь _час"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "Позначити від _нульового часу"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "Позначити до _кінцевого часу"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "_Копіювати…"
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr "_Часовий відлік до початку області"
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr "_Часовий відлік до кінця області"
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr "Від початку _ділянки до часового відліку"
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr "Від кінця _ділянки до часового відліку"
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+"Позначити або зняти позначення з блоку на поточній доріжці або у поточній "
+"позиції часу"
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "_Змінити ширину, висоту та гучність звуку…"
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "_Обробка"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "_Обробити дані до нового кліпу"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "Обробити _відео"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "Обробити _звук"
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr "_Нормалізувати оброблений звук"
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "Попередн_ьо обробити звук"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "П_ерегляд"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr "По_часткова/кінцева точки блоку"
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "Е_фекти у поточній позиції"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "Параметри звуку"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr "Показати доріжку _звукового супроводу"
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "Компактний перегляд"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "Максимальна к-ть доріжок…"
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr "Гортати за відтворенням"
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "_Центрувати за курсором"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "З_більшити"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "З_меншити"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "П_араметри багатодоріжкової частини"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "Вікно п_одій"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "Вікно по_дій (лише для позначеного часу)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "_Показувати події FRAME"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "_Показувати клавіші доріжок"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "Режим миші: _пересування"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "Режим миші: _вибір"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "Режим вставлення: _звичайний"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "Вставляти зі _звуком"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr "Визначає, вставлятиме програма відеокліпи зі звуковими даними чи ні"
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "Вставляти зі _звуком"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "Позначене пере_кривається"
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
@@ -9739,103 +10127,83 @@
 "Визначає, будуть фрагменти записів монтажного стола прилипати до перекриття "
 "один до одного між позначеними доріжками чи ні"
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "Позначене пере_кривається"
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "Розгорнутий перегляд (d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "Компактний перегляд (d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "Тяжіння: _звичайне"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "Тяжіння: _ліворуч"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "Тяжіння: _праворуч"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "Кліпи"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr "Вхід/Вихід"
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr "Стос ефектів"
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "Параметри"
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Застосувати"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "Час"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr "Ви_л. вузол"
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr "_Наст. вузол"
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr "П_опер. вузол"
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr "Зв_оротне відтворення  "
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "_Швидкість  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
-msgstr "Прив’язати початкову точку до монтажного стола"
-
-#: src/multitrack.c:7478
+#: src/multitrack.c:8091
 msgid "Anchor _start"
 msgstr "Зафіксувати по_чаток"
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
+msgstr "Прив’язати початкову точку до монтажного стола"
+
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "Початковий кадр"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
-msgstr "Прив’язати кінцеву точку до монтажного столу"
-
-#: src/multitrack.c:7552
+#: src/multitrack.c:8154
 msgid "Anchor _end"
 msgstr "Зафіксувати _кінець"
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
+msgstr "Прив’язати кінцеву точку до монтажного столу"
+
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "Кінцевий кадр"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "Гортання"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -9845,91 +10213,91 @@
 "==============================\n"
 "Перемкнено у режим редагування кліпів\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "Монтажний стіл (секунди)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr " Звуковий супровід"
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " Шар %d звуку"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "Показати/Приховати параметри звуку"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "Шар %d звуку"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (шар %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "Вибрати доріжку"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "Показати/Приховати звукові доріжки"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "Відео %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (шар %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES: позначений ефект"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "П_ереглянути/Змінити цей ефект"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "П_ереглянути цей ефект"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "Ви_лучити цей ефект"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "Не вдалося вставити після цього ефекту"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "Цей ефект не вдалося пересунути"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  позначено від %d до %d  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f с"
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d кадрів"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -9939,19 +10307,19 @@
 "==============================\n"
 "Перемкнено у режим роботи з багатьма доріжками\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr "Перетягніть повзунок часу у позицію, де ви"
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "бажаєте встановити параметри ефектів"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Вкажіть параметри, а потім натисніть кнопку «Застосувати»\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9961,46 +10329,46 @@
 "встановлено параметри.\n"
 "Вузли можна вилучати."
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "Для ефекту не передбачено парамтрів.\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "вивід %s"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "шар %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "звукова доріжка"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "від %s до %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr "_Попередня карта фільтрування"
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "Вставити п_еред"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "Вставити п_ісля"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr "_Наступна карта фільтрування"
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -10012,7 +10380,7 @@
 "До поточної доріж�и у поточний момент часу,\n"
 "не призначено ефектів.\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -10022,7 +10390,7 @@
 "позицію монтажного столу,\n"
 "щоб застосувати його до позначеної області."
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -10032,7 +10400,7 @@
 "позицію монтажного столу,\n"
 "щоб застосувати його до позначеної області."
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -10040,67 +10408,63 @@
 "Ефекти можна просто перетягувати\n"
 "на блоки монтажного столу."
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: позначений блок або кадр"
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr "П_означити цей блок"
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr "_Розділити блок тут"
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "Показати список _ефектів тут"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Коригувати %s"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr "Ви_лучити цей блок"
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "_Вставити тут"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "_Вставити звук тут"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 "Вставлено прогалину у позначені доріжки від позиції часу %.4f до позиції "
 "часу %.4f\n"
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 "Вставлено прогалину у доріжку %s від позиції часу %.4f до позиції часу %.4f\n"
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr "Скасування %s\n"
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr "Повторення %s\n"
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "Параметри багатодоріжкової частини"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
@@ -10108,56 +10472,62 @@
 "\n"
 " (змінна)"
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "доріжка %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "доріжки %s і %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "позначені доріжки"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Додано %s %s до %s від %.4f до %.4f\n"
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Додано ефект %s до доріжки %s від %.4f до %.4f\n"
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr "Вилучено %s %s з %s, від %.4f до %.4f\n"
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "оброблено %d кадрів зі спрямуванням до нового кліпу.\n"
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "Спорожнення…"
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "П_ризупинити"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "Призупинити (p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "Натисніть «m» під час відтворення"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "для створення позначки на монтажному столі"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10166,7 +10536,7 @@
 "Вставлено звукові дані від %.4f до %.4f з кліпу %s до звукового супроводу з "
 "часової позначки %.4f до %.4f\n"
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -10174,14 +10544,14 @@
 "Вставлено кадри від %d до %d з кліпу %s до доріжки %s з часової позначки "
 "%.4f до %.4f\n"
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr "Позначено ділянку часу від %.3f до %.3f.\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10189,12 +10559,12 @@
 "позначте одну або декілька доріжок,\n"
 "щоб створити область.\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "Позначено %d відеодоріжок.\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10202,7 +10572,7 @@
 "Двічі клацніть лівою кнопкою миші на монтажному столі,\n"
 "щоб зняти позначення з області."
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10210,7 +10580,7 @@
 "Один раз клацніть на позначці ефекту,\n"
 "щоб позначити ефект."
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10218,7 +10588,7 @@
 "Двічі клацніть на позначці ефекту,\n"
 "щоб змінити його параметри."
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10226,7 +10596,7 @@
 "Клацанням правою кнопкою миші на позначці\n"
 "ефекту можна викликати контекстне меню.\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10234,7 +10604,7 @@
 "Порядок застосування ефектів можна\n"
 "змінити у КАРТАХ ЕФЕКТІВ"
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -10242,27 +10612,15 @@
 "Ви можете позначити ефект,\n"
 "а потім скористатися кнопкою ВСТАВИТИ ПЕРЕД"
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "або ВСТАВИТИ ПІСЛЯ, щоб пересунути його."
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-"Ви можете натиснути кнопку миші\n"
-"і перетягнути вказівник монтажним столом"
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "щоб позначити діапазон часу.\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "Натисніть на пункті іншого ефекту"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10270,46 +10628,46 @@
 "і позначений ефект\n"
 "буде вставлено"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "після.\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "перед.\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Вилучено значення параметрів ефекту %s у позиції часу %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Встановлено значення параметрів %s %s у %s для позиції часу %.4f\n"
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "_Автоматично перезавантажувати кожного разу"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Збережено компонування для %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "кліпи і кадри"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "кліпи"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "кадрів"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10317,7 +10675,7 @@
 "\n"
 "Автоматичне перезавантаження компонування.\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -10328,11 +10686,11 @@
 "Не вистачає деяких %s з компонування %s\n"
 "Отже належне завантаження неможливе.\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "автоматичне створення резервних копій"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -10341,43 +10699,43 @@
 "\n"
 "Не вдалося завантажити файл компонування %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Завантаження компонування з %s…"
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Отримано %d повідомлень про події… обробка…"
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "Перевірка і перебудова списку подій"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "Виявлено %d помилок.\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Частоту кадрів багатодоріжкової області встановлено у значення %.3f\n"
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: мікшер багатодоріжкового звуку"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "Від_новити значення"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "_Закрити вікно мікшера"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10385,37 +10743,37 @@
 "_Інвертувати гучності\n"
 "звукового супроводу і шарів"
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Скоригувати гучності звукового супроводу і шарів звуку так, щоб їх сума "
 "складала 1,0"
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr "Звук з’_єднаного шару"
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "Вирівняти гучності всіх шарів звукових даних"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "Запущено сервер JACK\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "Не вдалося з’єднатися з сервером JACK\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "Запущено звукову підсистему Jack.\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "Запущено інструмент читання звуку Jack.\n"
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
@@ -10423,7 +10781,7 @@
 "\n"
 "З’єднання зі звуковим каналом jack було розірвано.\n"
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10436,7 +10794,7 @@
 "Змінити параметри звукових серверів можна на сторінці «Налаштування -> "
 "Відтворення»\n"
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10449,7 +10807,7 @@
 "Змінити параметри звукових серверів можна на сторінці «Налаштування -> "
 "Відтворення»\n"
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10457,11 +10815,11 @@
 "\n"
 "Не вдалося встановити з’єднання з сервером PulseAudio.\n"
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES завершить роботу, ви зможете вибрати інший звуковий програвач.\n"
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -10469,113 +10827,113 @@
 "\n"
 "З’єднання зі звуковим сервером PulseAudio було розірвано.\n"
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "незатиснуте"
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "затиснуте"
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Відповідь на події з джойстика від %s\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr "Створення порту seq ALSA…"
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Відповідь на події з MIDI від %s\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "дані"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "швидкість"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "нотатка"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "значення"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "стан"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "змінна"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "Змінні"
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "Увімкнено ноту каналу MIDI %d"
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "Вимкнено ноту каналу MIDI %d"
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "Канал MIDI %d контролер %d"
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "Канал MIDI %d смуга тону"
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "Канал MIDI %d зміна pgm"
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr "Кнопка джойстика %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Вісь джойстика %d"
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "діапазон"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr "+ зсув1"
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr "* масштаб"
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr "+ зсув2"
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10583,203 +10941,211 @@
 "\n"
 "Натисніть кнопку «Гаразд», щоб вилучити всі записи\n"
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr "LiVES: навчання OMC"
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr "Вилучити _невідповідне"
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "Ви_лучити все"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "Почати відтворення відео"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "Зупинити відтворення відео"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr "Позначення кліпу <clipnum>"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Перемкнути кліп переднього плану з n-им коректним кліпом"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr "Відтворити у прямому порядку"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr "Відтворити відео у прямому порядку"
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr "Відтворити у оберненому порядку"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr "Відтворити відео у оберненому порядку"
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr "Змінити напрям відтворення"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr "Змінити напрям відтворення відео"
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr "Пришвидшити відтворення відео"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr "Відтворювати відео з трохи збільшеною швидкістю"
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr "Уповільнити відтворення відео"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr "Відтворювати відео з трохи зменшеною швидкістю"
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr "Увімкнути/Вимкнути заморожування зображення"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Заморозити відео, якщо вже заморожено, розморозити"
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr "Встановити значення частоти кадрів відео <fps>"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Встановити частоту кадрів для кліпу переднього плану <float fps>"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "Почати запис"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "Зупинити запис"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr "Увімкнути/Вимкнути стан запису"
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr "Поміняти місцями кліпи переднього і заднього планів"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr "Відновити початкові параметри всіх ефектів"
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "Вимкнути всі ефекти."
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr "Увімкнути клавішу ефекту <key>"
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr "Вимкнути клавішу ефекту <key>"
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr "Увімкнути або вимкнути клавішу ефекту <key>"
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Встановити значення параметра <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Встановити <value> p-го (числового) параметра клавіші ефекту <key>."
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr "Перемкнути передній план на наступний кліп"
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr "Перемкнути передній план на попередній кліп"
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Встановити частоту кадрів відео у співвідношення <fps_ratio>"
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Встановити коефіцієнт частоти кадрів для кліпу переднього плану у <float "
 "fps_ratio>"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr "Перемкнути кліп <clipnum>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Перемкнути кліп переднього плану з n-им коректним кліпом і скинути значення "
 "номера кадру"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr "Cycle to next mode for effect key <key>"
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "Циклічний перехід до попереднього режиму клавіші ефекту <key>"
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr "Встановити значення параметра додатка відтворення <pnum> = <value>"
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr "Встановити <value> p-го параметра додатка відтворення."
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "кд/с"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "клавіша"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Збереження карти відображення пристроїв до файла %s…"
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -10792,7 +11158,7 @@
 "Помилка під час обробки файла\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -10805,12 +11171,12 @@
 "Некоректна версія у файлі\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Завантаження карти відображення пристрої з файла %s…"
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10835,6 +11201,9 @@
 msgid "Opened device %s\n"
 msgstr "Відкрито пристрій %s\n"
 
+#~ msgid " _Top  "
+#~ msgstr " _Верх  "
+
 #~ msgid "180 _degrees             "
 #~ msgstr "180 _градусів             "
 
@@ -11024,6 +11393,9 @@
 #~ msgid "Enhancing"
 #~ msgstr "Покращення"
 
+#~ msgid "Envelope length"
+#~ msgstr "Тривалість обгортки"
+
 #~ msgid "Fade _colour"
 #~ msgstr "_Кольорова зміна освітленості"
 
@@ -11036,8 +11408,8 @@
 #~ msgid "Fade _out"
 #~ msgstr "З_гасання"
 
-#~ msgid "Fade video in or out"
-#~ msgstr "Поступове підвищення або зниження освітленості відео"
+#~ msgid "Fade video to or from color"
+#~ msgstr "Перехід зображення з або до кольору"
 
 #~ msgid "Fade"
 #~ msgstr "Згасання"
@@ -11540,9 +11912,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "В_горі ліворуч дані з буфера"
 
-#~ msgid "_Top"
-#~ msgstr "_Верхньої частини"
-
 #~ msgid "_Vertical segments"
 #~ msgstr "_Вертикальні сегменти"
 
@@ -11768,6 +12137,22 @@
 #~ msgid "Unable to locate the program $rfx_builder_multi"
 #~ msgstr "Не вдалося встановити адресу програми $rfx_builder_multi"
 
+#~ msgid "Your version of mplayer/ffmpeg may be broken"
+#~ msgstr "Ваша версія mplayer/ffmpeg може містити помилки"
+
+#~ msgid "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071"
+#~ msgstr "Див. http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid ""
+#~ "You can work around this by switching to jpeg output in Preferences/"
+#~ "Decoding."
+#~ msgstr ""
+#~ "Уникнути наслідків цих помилок можна перемиканням на виведення даних у "
+#~ "форматі jpeg на сторінці Налаштування/Декодування."
+
 #~ msgid "This does not appear to be a valid video or image file"
 #~ msgstr "Здається, цей файл не є коректним файлом відео або зображення"
 
@@ -11801,15 +12186,17 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "Спочатку вам слід вказати пристрій КД у «Параметрах»."
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr ""
-#~ "LiVES не вдалося знайти достатньо доріжок, що відповідають вашому запиту."
-
-#~ msgid "Try again with different values."
-#~ msgstr "Повторіть спробу з іншими значеннями."
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "Помилка $plugin_name:"
 
 #~ msgid "$error"
 #~ msgstr "$error"
+
+#~ msgid "Default value:    "
+#~ msgstr "Типове значення:    "
+
+#~ msgid "Minimum value: "
+#~ msgstr "Мінімальне значення: "
+
+#~ msgid "Maximum value: "
+#~ msgstr "Максимальне значення: "

LiVES-1.6.1.tar.bz2/po/uz.po -> LiVES-2.0.3.tar.bz2/po/uz.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2012-01-07 19:27+0000\n"
-"Last-Translator: Akmal Xushvaqov <akmalxster@gmail.com>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "Language: uz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-01-14 13:16+0000\n"
-"X-Generator: Launchpad (build 14664)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,7 +34,22 @@
 "Барча таржимонлар LiVES таржима эслатмасаларини \n"
 "http://lives.sourceforge.net/TRANS-README.txt файлидан ўқишлари керак."
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -48,7 +64,7 @@
 "Раҳмат. Тиклаш жараёни LiVES. дастурини қайтадан ишга туширсангиз мавжуд "
 "бўлиши керак.\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -60,7 +76,7 @@
 "Носозлик ҳақида хабар берганингизда, илтимос, операцион тизимингиз, "
 "дистрибутивингиз ва LiVES дастури версияси маълумотларини ҳам қўшинг ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -68,7 +84,7 @@
 "ва бошқа маълумот қуйида кўрсатилади:\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -78,172 +94,184 @@
 "debug мосламаси билан ишга туширинг.\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "Йиғилганларни сақлаш\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "Ҳажми ўзгартирилмоқда"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "Барча кадрларнинг _ҳажмини ўзгартириш"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "Исталган"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "Йўқ"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "тавсия қилинди"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "ўчирилди !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**Жорий қатлам**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr ""
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "Бошқа"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "Синаш"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "Реал вақт эффект плагинлари юкланмоқда..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "Jack аудио сервер ишга туширилмоқда..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "Jack транспорт сервери ишга туширилмоқда..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "Jack транспорт серверига уланмоқда..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
-"\n"
-"\n"
-"jackd'ни қўлбола ишга тушириш сўралмоқда. Илтимос, jackd ишлаётганига ишонч "
-"ҳосил қилинг \n"
-"ёки  <jack_opts> қийматини ~/.lives'дан 16га ўзгартиринг\n"
-"ва LiVES дастурини қайтадан ишга туширинг.\n"
-"\n"
-"Муқобил равишда, lives дастурини \"lives -jackopts 16\", билан ишга "
-"туширишга ҳаракат қилинг ёки "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "Аудио сервер пульси ишга туширилмоқда..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "конвертлаш...аниқланди..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "конвертлаш...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...аниқланди..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...аниқланди\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...АНИҚЛАНМАДИ\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...аниқланди..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...аниқланди..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...аниқланди..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...аниқланди..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...аниқланди..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...аниқланди..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -254,172 +282,198 @@
 "\n"
 "Ойна бошқарувчиси \"%s\"сифатида маълумот берди; "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "мониторлар миқдори аниқланди: %d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr ""
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr ""
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "CPUлар миқдори аниқланди: %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Temp директорияси: %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -427,17 +481,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -446,36 +501,36 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2048
+#: src/main.c:2342
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2055
+#: src/main.c:2349
 #, c-format
 msgid ""
 "\n"
@@ -485,7 +540,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -496,42 +551,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -539,96 +601,96 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "Ўйнаш"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "_Бекор қилиш"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "_Қайтариш"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "Видео"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -637,26 +699,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, c-format
-msgid "LiVES: - Play Window%s"
-msgstr ""
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:24
+#: src/startup.c:25
 #, c-format
 msgid ""
 "A directory named\n"
@@ -666,7 +713,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:30
+#: src/startup.c:32
 #, c-format
 msgid ""
 "A directory named\n"
@@ -676,7 +723,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:46
+#: src/startup.c:49
 #, c-format
 msgid ""
 "\n"
@@ -687,7 +734,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -696,54 +743,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -751,155 +798,163 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
+#: src/startup.c:620
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr ""
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -907,94 +962,94 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:1042
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr ""
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr ""
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "Олдиндан кўриш"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1003,186 +1058,195 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "Тафсилотларни кўрсатиш"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "_Олдиндан кўриш"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "_Бекор қилиш"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "Форматлаш"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr ""
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr ""
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "Freymlar"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "Ҳодисалар"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
 msgstr ""
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr ""
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "Ойнани _ёпиш"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1622
-msgid "    Number of frames to open"
+#: src/interface.c:1172
+msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1734
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1192,7 +1256,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1201,46 +1265,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1769
+#: src/interface.c:1286
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr ""
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr ""
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr ""
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1248,396 +1328,358 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
-msgstr ""
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr ""
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr ""
-
-#: src/interface.c:2045
-msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr ""
-
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:2696
-msgid "Driver"
+#: src/interface.c:1976
+msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
+#: src/interface.c:1979
+msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr ""
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr ""
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr ""
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "Директория:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr ""
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr ""
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
 msgstr ""
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
+
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr ""
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:3745
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "Файлни танлаш"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
+#: src/callbacks.c:848
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:802
+#: src/callbacks.c:876
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:824
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1645,17 +1687,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1665,7 +1707,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1675,20 +1717,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1701,33 +1743,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
+#: src/callbacks.c:1490
+msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1343
-msgid "Backup as .lv1 file"
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1735,97 +1777,97 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1584
+#: src/callbacks.c:1708
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "Кесиш"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -1834,31 +1876,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -1866,7 +1908,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -1875,86 +1917,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "тиқ"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "Ўчирилмоқда"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "Olib tashlash"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1962,11 +2004,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -1975,7 +2017,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -1984,7 +2026,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -1993,22 +2035,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2016,93 +2058,93 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5334
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5378
+#: src/callbacks.c:5487
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2119,11 +2161,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5668
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Akmal Xushvaqov https://launchpad.net/~uzadmin\n"
+"  Guybrush88 https://launchpad.net/~guybrush"
+
+#: src/callbacks.c:5786
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2137,21 +2190,21 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2159,195 +2212,207 @@
 "."
 msgstr ""
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr ""
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr ""
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr ""
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr ""
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr ""
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr ""
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr ""
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "Давом этиш"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "Вақтинча тўхтатиш"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "Шундай қолдириш"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2355,28 +2420,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: src/callbacks.c:9378
+#: src/callbacks.c:9574
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:9870
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2385,7 +2450,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2393,13 +2458,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2408,17 +2473,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2428,19 +2493,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2449,1049 +2514,1025 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "_Таҳрирлаш"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "_Тескарисига танлаш"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "_Тўхтатиш"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "_Бутун экранга"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
+#: src/gui.c:1109
+msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1084
-msgid "Custom _Tools"
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1087
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "_Йўқ"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "_Ёрдам"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "_Ҳақида"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "Товуш"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "Орқага"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
+#: src/utils.c:480
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
+#: src/utils.c:484
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
+#: src/utils.c:488
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
+#: src/utils.c:492
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
+#: src/utils.c:496
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3499,81 +3540,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3581,7 +3622,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3589,32 +3630,32 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
 msgstr ""
 
-#: src/utils.c:1259
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3622,68 +3663,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -3693,53 +3734,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr ""
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "%s очилмоқда"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -3751,11 +3803,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -3763,14 +3815,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -3778,29 +3830,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
+#: src/saveplay.c:932
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
+#: src/saveplay.c:1106
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1021
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1125
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3808,66 +3860,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr ""
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
+#: src/saveplay.c:2060
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -3876,16 +3924,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -3893,7 +3941,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -3901,68 +3949,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -3972,22 +4015,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -3995,66 +4038,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:140
+#: src/dialogs.c:124
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr ""
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:212
+#: src/dialogs.c:203
 msgid "File Error"
 msgstr ""
 
-#: src/dialogs.c:214
+#: src/dialogs.c:206
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4065,7 +4108,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4077,11 +4120,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4089,46 +4132,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4136,7 +4179,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4148,14 +4191,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4163,19 +4206,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4183,83 +4226,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4268,14 +4311,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4284,7 +4327,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4295,7 +4338,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4304,11 +4347,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4350,11 +4393,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4376,17 +4419,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4394,28 +4438,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4424,7 +4468,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4432,7 +4476,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4440,7 +4484,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4451,7 +4495,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4461,7 +4505,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4469,7 +4513,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4478,13 +4522,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4495,13 +4539,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4511,7 +4555,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4520,7 +4564,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4528,7 +4572,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4536,63 +4580,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4600,14 +4644,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4616,25 +4660,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4643,33 +4687,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
+#: src/dialogs.c:2704
 #, c-format
 msgid ""
 "\n"
@@ -4679,7 +4723,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2646
+#: src/dialogs.c:2750
 #, c-format
 msgid ""
 "\n"
@@ -4689,7 +4733,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2670
+#: src/dialogs.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -4699,7 +4743,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2818
 #, c-format
 msgid ""
 "\n"
@@ -4708,7 +4752,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:2822
 #, c-format
 msgid ""
 "\n"
@@ -4718,7 +4762,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2853
 #, c-format
 msgid ""
 "\n"
@@ -4727,7 +4771,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2753
+#: src/dialogs.c:2857
 #, c-format
 msgid ""
 "\n"
@@ -4737,12 +4781,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -4751,7 +4795,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -4760,7 +4804,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -4769,14 +4813,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -4784,13 +4836,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -4800,27 +4852,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -4829,14 +4881,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -4847,19 +4899,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -4867,7 +4919,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -4875,7 +4927,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -4887,7 +4939,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
+#: src/dialogs.c:3076
 #, c-format
 msgid ""
 "\n"
@@ -4896,34 +4948,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -4932,343 +4984,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:69
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "Oʻtishlar"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "Эффектлар"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "Воситалар"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
+#: src/effects.c:131
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:132
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "номаълум"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
 msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
+msgstr ""
+
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5276,71 +5584,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
+#: src/paramwindow.c:1572
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
+#: src/paramwindow.c:1576
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
+#: src/paramwindow.c:1580
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5350,17 +5658,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5370,32 +5678,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5404,14 +5712,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5421,40 +5722,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5463,11 +5771,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5476,7 +5784,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5486,192 +5794,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "Тури:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:235
-msgid "Generator -"
-msgstr ""
-
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
+#: src/rfx-builder.c:294
+msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -5681,55 +5973,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "_Юқорига кўтариш"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -5738,7 +6030,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -5746,231 +6038,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -5978,28 +6258,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6008,41 +6288,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6052,27 +6332,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6081,7 +6361,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6091,12 +6371,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6106,7 +6386,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6116,12 +6396,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6129,23 +6409,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6155,55 +6435,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr ""
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "Бошқа"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "Синаш"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6211,26 +6479,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6238,7 +6517,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6246,7 +6525,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
+#: src/preferences.c:410
 #, c-format
 msgid ""
 "\n"
@@ -6255,28 +6534,35 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6288,20 +6574,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6309,790 +6595,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "сония"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "_Ҳеч қачон"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr ""
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "Ўйнаш"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr ""
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "Кодлаш усули"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "Директориялар"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " Мб"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "Огоҳномалар"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "Хар ҳил"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "Мавзулар"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr ""
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+#: src/preferences.c:3985
+msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:5499
-msgid "Use _ALSA MIDI (recommended)"
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:5518
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr ""
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "Қўшимча"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7100,222 +7386,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
+#: src/resample.c:140 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "Ўлчамини ўзгартириш"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
+#: src/resample.c:1252
+msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "Жорий"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
-msgstr ""
-
-#: src/resample.c:1545
-msgid "    _Channels "
-msgstr ""
-
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1580
-msgid "    Sample Size "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "Янги"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "Чексиз"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7326,7 +7604,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7337,89 +7615,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7429,7 +7707,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7437,19 +7715,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
+#: src/rte_window.c:420
 #, c-format
 msgid ""
 "\n"
@@ -7459,12 +7737,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7474,22 +7752,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7499,43 +7777,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7543,40 +7826,45 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr ""
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7585,65 +7873,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "Маълумот"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "Тозалаш"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -7693,11 +7985,6 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -7715,64 +8002,64 @@
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -7781,7 +8068,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -7789,14 +8076,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -7806,7 +8093,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -7815,208 +8102,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr ""
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr ""
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr ""
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8026,7 +8315,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8034,587 +8323,595 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr ""
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr ""
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr ""
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:6386
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "_Кўриниш"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr ""
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr ""
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr ""
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr ""
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr ""
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "_Қўллаш"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr ""
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr ""
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr ""
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr ""
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -8622,275 +8919,267 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr ""
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr ""
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "кадрлар"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -8898,94 +9187,94 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1476
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -8993,7 +9282,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9001,327 +9290,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:98
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1009
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "maʼlumot"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "изоҳ"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "qiymat"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "oraliq"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9330,7 +9627,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9339,12 +9636,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"

LiVES-1.6.1.tar.bz2/po/zh_CN.po -> LiVES-2.0.3.tar.bz2/po/zh_CN.po Changed

@@ -8,18 +8,19 @@
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: http://www.sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"POT-Creation-Date: 2012-02-04 10:59-0300\n"
-"PO-Revision-Date: 2011-11-07 16:24+0000\n"
-"Last-Translator: lhquark <Unknown>\n"
+"POT-Creation-Date: 2013-04-10 00:06-0300\n"
+"PO-Revision-Date: 2013-03-14 12:31+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-26 11:32+0000\n"
-"X-Generator: Launchpad (build 14381)\n"
+"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
+"X-Generator: Launchpad (build 16546)\n"
 
-#: src/main.c:118
+#. TRANSLATORS: do not translate this message
+#: src/main.c:116
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,7 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
+#: src/main.c:129
+#, c-format
+msgid "%s Warning: %s\n"
+msgstr ""
+
+#: src/main.c:133
+#, c-format
+msgid "%s Critical error: %s\n"
+msgstr ""
+
 #: src/main.c:134
+#, c-format
+msgid "%s Fatal error: %s\n"
+msgstr ""
+
+#: src/main.c:171
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -42,7 +58,7 @@
 "谢。\n"
 "重启 LiVES 之后应该可以恢复。\n"
 
-#: src/main.c:135
+#: src/main.c:172
 msgid ""
 "\n"
 "\n"
@@ -53,7 +69,7 @@
 "\n"
 "报告崩溃时请包括操作系统、发行版及 LiVES 版本信息 ("
 
-#: src/main.c:138
+#: src/main.c:175
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -61,7 +77,7 @@
 "以及下面的信息：\n"
 "\n"
 
-#: src/main.c:142
+#: src/main.c:179
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -70,170 +86,184 @@
 "请安装 gdb 然后添加 -debug 选项运行 LiVES 以便收集更多信息。\n"
 "\n"
 
-#: src/main.c:150
+#: src/main.c:187
 msgid "Preserving set.\n"
 msgstr "正在保存场景。\n"
 
-#: src/main.c:510
+#: src/main.c:614
 msgid "Resizing"
 msgstr "正在调整尺寸"
 
-#: src/main.c:517
+#: src/main.c:621
 msgid "_Resize All Frames"
 msgstr "调整所有帧的尺寸(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:782
+#: src/main.c:873
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:784
+#: src/main.c:875
 msgid "None"
 msgstr "无"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:786
+#: src/main.c:877
 msgid "recommended"
 msgstr "推荐"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:788
+#: src/main.c:879
 msgid "disabled !"
 msgstr "已禁用 ！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:790
+#: src/main.c:881
 msgid "**The current layout**"
 msgstr "**当前的布局**"
 
-#: src/main.c:1344
+#. TRANSLATORS: adjective for "Built in" type effects
+#: src/main.c:883
+msgid "Builtin"
+msgstr "内置"
+
+#. TRANSLATORS: adjective for "Custom" type effects
+#: src/main.c:885
+msgid "Custom"
+msgstr "自定义"
+
+#. TRANSLATORS: adjective for "Test" type effects
+#: src/main.c:887
+msgid "Test"
+msgstr "测试"
+
+#: src/main.c:1501
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1408
+#: src/main.c:1565
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1410
+#: src/main.c:1567
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1411
+#: src/main.c:1568
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1439
+#: src/main.c:1598
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Manual start of jackd required. Please make sure jackd is running, \n"
-"or else change the value of <jack_opts> in ~/.lives to 16\n"
+"or else change the value of <jack_opts> in %s to 16\n"
 "and restart LiVES.\n"
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
-"\n"
-"\n"
-"需要手动启动 jackd。请确信 jackd 正在运行，或者\n"
-"将 ~/.lives 中的 <jack_opts> 值更改为 16 并\n"
-"重新启动 LiVES。\n"
-"\n"
-"或者，尝试通过“lives -jackopts 16”或以下方式启动 lives "
 
-#: src/main.c:1463
+#: src/main.c:1626
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1524
+#: src/main.c:1689
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1525
+#: src/main.c:1690
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1526
+#: src/main.c:1691
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1527
+#: src/main.c:1692
 msgid "convert...detected..."
 msgstr "convert...发现..."
 
-#: src/main.c:1528
+#: src/main.c:1693
 msgid "convert...NOT DETECTED..."
 msgstr "convert...未发现..."
 
-#: src/main.c:1529
+#: src/main.c:1694
 msgid "composite...detected..."
 msgstr "composite...发现..."
 
-#: src/main.c:1530
+#: src/main.c:1695
 msgid "composite...NOT DETECTED..."
 msgstr "composite...未发现..."
 
-#: src/main.c:1531
+#: src/main.c:1696
 msgid "sox...detected\n"
 msgstr "sox...发现\n"
 
-#: src/main.c:1532
+#: src/main.c:1697
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...未发现\n"
 
-#: src/main.c:1533
+#: src/main.c:1698
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...发现..."
 
-#: src/main.c:1534
+#: src/main.c:1699
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...未发现..."
 
-#: src/main.c:1535
+#: src/main.c:1700
 msgid "jackd...detected..."
 msgstr "jackd...发现..."
 
-#: src/main.c:1536
+#: src/main.c:1701
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...未发现..."
 
-#: src/main.c:1537
+#: src/main.c:1702
 msgid "pulse audio...detected..."
 msgstr "pulse audio...发现..."
 
-#: src/main.c:1538
+#: src/main.c:1703
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse 音频...未发现..."
 
-#: src/main.c:1539
+#: src/main.c:1704
 msgid "python...detected..."
 msgstr "python...发现..."
 
-#: src/main.c:1540
+#: src/main.c:1705
 msgid "python...NOT DETECTED..."
 msgstr "python...未发现..."
 
-#: src/main.c:1541
+#: src/main.c:1706
 msgid "dvgrab...detected..."
 msgstr "dvgrab...发现..."
 
-#: src/main.c:1542
+#: src/main.c:1707
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...未发现..."
 
-#: src/main.c:1543
+#: src/main.c:1708
 msgid "xwininfo...detected..."
 msgstr "xwininfo...发现..."
 
-#: src/main.c:1544
+#: src/main.c:1709
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...未发现..."
 
-#: src/main.c:1549
+#: src/main.c:1715
+#, c-format
+msgid "Windows version %04X"
+msgstr ""
+
+#: src/main.c:1717
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1552
+#: src/main.c:1721
 #, c-format
 msgid ""
 "\n"
@@ -244,22 +274,48 @@
 "\n"
 "窗口管理器报告为\"%s\"； "
 
-#: src/main.c:1555
+#: src/main.c:1724
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "检测到的显视器数量：%d\n"
 
-#: src/main.c:1558
+#: src/main.c:1727
+#, c-format
+msgid "Number of CPUs detected: %d "
+msgstr ""
+
+#: src/main.c:1730 src/multitrack.c:4635
+msgid "little endian"
+msgstr "小端"
+
+#: src/main.c:1731 src/multitrack.c:4634
+msgid "big endian"
+msgstr "大端"
+
+#: src/main.c:1732
+#, c-format
+msgid "(%d bits, %s)\n"
+msgstr ""
+
+#: src/main.c:1736
+msgid "GUI type is: "
+msgstr ""
+
+#: src/main.c:1740
 #, c-format
-msgid "Number of CPUs detected: %d\n"
-msgstr "检测到的 CPU 数目： %d\n"
+msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
+msgstr ""
+
+#: src/main.c:1762
+msgid ", with cairo support"
+msgstr ""
 
-#: src/main.c:1561
+#: src/main.c:1769
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "临时文件夹为 %s\n"
 
-#: src/main.c:1565
+#: src/main.c:1773
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -269,15 +325,15 @@
 "jack 或 pulse 音频支持。\n"
 "许多音频功能将不可用。\n"
 
-#: src/main.c:1568
+#: src/main.c:1776
 msgid "Compiled with jack support, good !\n"
 msgstr "编译上 jack 支持了，好！\n"
 
-#: src/main.c:1571
+#: src/main.c:1779
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "编译上 pulse 音频支持了，很好！\n"
 
-#: src/main.c:1575
+#: src/main.c:1783
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -286,7 +342,7 @@
 "欢迎来到 LiVES 版本 %s。\n"
 "\n"
 
-#: src/main.c:1934
+#: src/main.c:2217
 #, c-format
 msgid ""
 "\n"
@@ -295,99 +351,99 @@
 "\n"
 "启动语法为： %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:1935
+#: src/main.c:2218
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "其中：filename 为媒体文件或备份文件名。\n"
 
-#: src/main.c:1936
+#: src/main.c:2219
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : 文件名以秒计的开始时间\n"
 
-#: src/main.c:1937
+#: src/main.c:2220
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : 要打开的最大帧数\n"
 
-#: src/main.c:1939
+#: src/main.c:2222
 msgid "opts can be:\n"
 msgstr "选项可以是：\n"
 
-#: src/main.c:1940
+#: src/main.c:2223
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : 显示此帮助文字并退出\n"
 
-#: src/main.c:1941
+#: src/main.c:2224
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr "-tmpdir <tempdir> ：使用其它的工作目录(例如 /var/ramdisk)\n"
 
-#: src/main.c:1942
+#: src/main.c:2225
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : 自动加载场景 setname\n"
 
-#: src/main.c:1943
+#: src/main.c:2226
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : 启动时不加载任何场景\n"
 
-#: src/main.c:1944
+#: src/main.c:2227
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : 强制不从崩溃中恢复\n"
 
-#: src/main.c:1945
+#: src/main.c:2228
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : 强制载入崩溃恢复\n"
 
-#: src/main.c:1946
+#: src/main.c:2229
 msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:1947
+#: src/main.c:2230
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : 不显示图形用户界面\n"
 
-#: src/main.c:1948
+#: src/main.c:2231
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash：不显示启动画面\n"
 
-#: src/main.c:1949
+#: src/main.c:2232
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin：不显示播放窗口\n"
 
-#: src/main.c:1950
+#: src/main.c:2233
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : 以剪辑编辑模式启动\n"
 
-#: src/main.c:1951
+#: src/main.c:2234
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : 以多轨模式启动\n"
 
-#: src/main.c:1952
+#: src/main.c:2235
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:1954
+#: src/main.c:2237
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : 在 UDP 端口 <port> 启动 OSC 监听\n"
 
-#: src/main.c:1955
+#: src/main.c:2238
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : 不启动 OSC 监听\n"
 
-#: src/main.c:1957
+#: src/main.c:2240
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer"
 msgstr "-aplayer <ap>    : 和选择的音频播放器一起启动。<ap> 可以是 mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:1960
+#: src/main.c:2243
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:1963
+#: src/main.c:2246
 msgid ", sox or jack\n"
 msgstr "、 sox 或 jack\n"
 
-#: src/main.c:1964
+#: src/main.c:2247
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -397,29 +453,29 @@
 "client, 2 = jack transport master, 4 = start jack transport server, 8 = "
 "pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:1966
+#: src/main.c:2249
 msgid " or sox\n"
 msgstr " 或 sox\n"
 
-#: src/main.c:1968
+#: src/main.c:2251
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : 自动加载 devicemap\n"
 
-#: src/main.c:1969
+#: src/main.c:2252
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:1970
+#: src/main.c:2253
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : 尝试调试崩溃（需要安装 gdb）\n"
 
-#: src/main.c:1996 src/gui.c:1089
+#: src/main.c:2281 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "正在启动图形用户界面..."
 
-#: src/main.c:2008
+#: src/main.c:2300
 #, c-format
 msgid ""
 "\n"
@@ -427,25 +483,18 @@
 "The theme you requested could not be located. Please make sure you have the "
 "themes installed in\n"
 "%s/%s.\n"
-"(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"
+"(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
-"\n"
-"\n"
-"无法找到您指定的主题。请确认您将主题安装与\n"
-"%s/%s。\n"
-"（或许您需要修改 ~/.lives 文件中 <prefix_dir> 的值）\n"
 
-#: src/main.c:2021
+#: src/main.c:2314
+#, c-format
 msgid ""
 "\n"
-"LiVES was unable to write a small file to /tmp\n"
-"Please make sure you have write access to /tmp and try again.\n"
+"LiVES was unable to write a small file to %s\n"
+"Please make sure you have write access to %s and try again.\n"
 msgstr ""
-"\n"
-"LiVES 无法向 /tmp 写入小文件\n"
-"请确保您有向 /tmp 的写入权限并重试。\n"
 
-#: src/main.c:2025
+#: src/main.c:2319
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -459,55 +508,37 @@
 "请在运行 LiVES 前\n"
 "参阅 README 文件。\n"
 
-#: src/main.c:2031
+#: src/main.c:2325
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
-"\n"
-"LiVES 无法读取配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件权限并重试。\n"
 
-#: src/main.c:2038
+#: src/main.c:2332
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to its configuration file\n"
-"%s/.lives\n"
+"%s\n"
 "\n"
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES 无法写入配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件及包含该文件的目录权限\n"
-"并重试。\n"
 
-#: src/main.c:2048
-#, fuzzy, c-format
+#: src/main.c:2342
+#, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
-"%s/.lives\n"
+"%s\n"
 "and try again.\n"
 msgstr ""
-"\n"
-"LiVES 无法使用临时目录\n"
-"%s\n"
-"\n"
-"请检查文件\n"
-"%s/.lives\n"
-"中 <tempdir> 的设置并重试。\n"
 
-#: src/main.c:2055
-#, fuzzy, c-format
+#: src/main.c:2349
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to use the temporary directory\n"
@@ -515,10 +546,8 @@
 "\n"
 "%s"
 msgstr ""
-"LiVES 无法捕获此图片\n"
-"\n"
 
-#: src/main.c:2063
+#: src/main.c:2357
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -536,7 +565,7 @@
 "\n"
 "谢谢。\n"
 
-#: src/main.c:2067 src/dialogs.c:1799
+#: src/main.c:2362 src/dialogs.c:1936
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
@@ -545,7 +574,14 @@
 "\n"
 "LiVES 目前需要 'mplayer' 或 'sox' 以正常工作。请至少安装其中之一并重试。\n"
 
-#: src/main.c:2076
+#: src/main.c:2366
+msgid ""
+"\n"
+"LiVES currently requires both 'mplayer' and 'sox' to function. Please "
+"install these, and try again.\n"
+msgstr ""
+
+#: src/main.c:2376
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
@@ -554,7 +590,7 @@
 "\n"
 "LiVES 无法定位 'mplayer'。您可以安装 mplayer 来获得更完整的 LiVES 功能。\n"
 
-#: src/main.c:2079
+#: src/main.c:2379
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -564,7 +600,7 @@
 "LiVES 无法定位 'convert'。您可以安装 convert 和 image-magick 来使用渲染效"
 "果。\n"
 
-#: src/main.c:2082
+#: src/main.c:2382
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -574,7 +610,7 @@
 "LiVES 无法定位 'composite'。您需要安装 composite 和 image-magick 来使用融合功"
 "能。\n"
 
-#: src/main.c:2085
+#: src/main.c:2385
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -583,7 +619,7 @@
 "\n"
 "LiVES 无法定位 'sox'。有些音频特性可能无法工作。您应该安装 'sox'。\n"
 
-#: src/main.c:2088
+#: src/main.c:2388
 #, c-format
 msgid ""
 "\n"
@@ -591,68 +627,62 @@
 "Please check that you have them installed correctly in\n"
 "%s%s%s/\n"
 "You will not be able to 'Save' without them.\n"
-"You may need to change the value of <lib_dir> in ~/.lives\n"
+"You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
-"\n"
-"LiVES 无法找到任何编码插件。\n"
-"请检查您是否已将插件正确安装至\n"
-"%s%s%s/\n"
-"没有插件您无法进行 '保存'。\n"
-"您或许需要修改 ~/.lives 中 <lib_dir> 的设置。\n"
 
-#: src/main.c:2197
+#: src/main.c:2513
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "自动装载场景 %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2289
+#: src/main.c:2688 src/interface.c:737
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2451
+#: src/main.c:2851
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "无效的音频播放器 %s\n"
 
-#: src/main.c:2569
+#: src/main.c:2980
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d 帧 %d bpp %.3f fps"
 
-#: src/main.c:2573
+#: src/main.c:2985
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? 帧 ??? bpp %.3f fps"
 
-#: src/main.c:2576
+#: src/main.c:2989
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d 帧 %d bpp %.3f fps"
 
-#: src/main.c:2582
+#: src/main.c:2997
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <没有文件>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:4158
+#: src/main.c:4733
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:4162
+#: src/main.c:4737
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:4395 src/main.c:4396 src/gui.c:2052 src/gui.c:3094
-#: src/saveplay.c:2031
+#: src/main.c:4978 src/main.c:4979 src/gui.c:2116 src/gui.c:3210
+#: src/saveplay.c:2208
 msgid "Play"
 msgstr "播放"
 
-#: src/main.c:5042
+#: src/main.c:5664
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -660,35 +690,35 @@
 "LiVES 无法捕获此图片\n"
 "\n"
 
-#: src/main.c:5164
+#: src/main.c:5786
 #, c-format
 msgid "Closed file %s\n"
 msgstr "已关闭文件 %s\n"
 
-#: src/main.c:5334 src/gui.c:622 src/utils.c:3270 src/utils.c:3302
-#: src/saveplay.c:3172 src/multitrack.c:3994 src/multitrack.c:5558
+#: src/main.c:5988 src/gui.c:639 src/utils.c:3923 src/utils.c:3955
+#: src/saveplay.c:3382 src/multitrack.c:4246 src/multitrack.c:5991
 msgid "_Undo"
 msgstr "撤消(_U)"
 
-#: src/main.c:5335 src/gui.c:635 src/utils.c:3271 src/utils.c:3303
-#: src/saveplay.c:3173 src/multitrack.c:4015 src/multitrack.c:5581
+#: src/main.c:5989 src/gui.c:652 src/utils.c:3924 src/utils.c:3956
+#: src/saveplay.c:3383 src/multitrack.c:4267 src/multitrack.c:6014
 msgid "_Redo"
 msgstr "重做(_R)"
 
-#: src/main.c:5362 src/interface.c:663 src/gui.c:2217 src/preferences.c:2503
-#: src/resample.c:1833
+#: src/main.c:6032 src/interface.c:465 src/gui.c:2326 src/preferences.c:2308
+#: src/resample.c:1516
 msgid "Video"
 msgstr "视频"
 
-#: src/main.c:5363 src/interface.c:682 src/gui.c:2236
+#: src/main.c:6033 src/interface.c:480 src/gui.c:2351
 msgid "Left Audio"
 msgstr "左声道"
 
-#: src/main.c:5364 src/gui.c:2254
+#: src/main.c:6034 src/gui.c:2375
 msgid "Right Audio"
 msgstr "右声道"
 
-#: src/main.c:5411
+#: src/main.c:6080
 msgid ""
 "\n"
 "\n"
@@ -701,27 +731,12 @@
 "如果指定音频播放器为 mplayer，LiVES 无法在同时打开的片段见切换。\n"
 "请调整首选项中的回放设置并重试。\n"
 
-#: src/main.c:5494 src/callbacks.c:6990 src/callbacks.c:7138
-#: src/callbacks.c:7464 src/callbacks.c:7481 src/gui.c:3682
-#: src/saveplay.c:2152 src/saveplay.c:2186 src/saveplay.c:2756
-#: src/saveplay.c:2866 src/saveplay.c:2888 src/multitrack.c:8325
-#: src/multitrack.c:9912
-#, c-format
-msgid " (%d %% scale)"
-msgstr ""
-
-#: src/main.c:5496 src/callbacks.c:6992 src/callbacks.c:7140
-#: src/callbacks.c:7466 src/gui.c:3686 src/saveplay.c:2154 src/saveplay.c:2188
-#, fuzzy, c-format
-msgid "LiVES: - Play Window%s"
-msgstr "LiVES: - 播放窗口"
-
-#: src/main.c:5893 src/plugins.c:1415
+#: src/main.c:6589 src/plugins.c:1498
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - 播放窗口"
 
-#: src/startup.c:24
-#, fuzzy, c-format
+#: src/startup.c:25
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -729,14 +744,9 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
-"名为\n"
-"%s\n"
-"的目录已经存在.您希望使用它吗?\n"
-"\n"
-"(剩余空间 = %.2f GB)\n"
 
-#: src/startup.c:30
-#, fuzzy, c-format
+#: src/startup.c:32
+#, c-format
 msgid ""
 "A directory named\n"
 "%s\n"
@@ -744,14 +754,9 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
-"名为\n"
-"%s\n"
-"的目录已经存在.您希望使用它吗?\n"
-"\n"
-"(剩余空间 = %.2f GB)\n"
 
-#: src/startup.c:46
-#, fuzzy, c-format
+#: src/startup.c:49
+#, c-format
 msgid ""
 "\n"
 "Create the directory\n"
@@ -760,13 +765,8 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
-"创建目录\n"
-"%s\n"
-"?\n"
-"\n"
-"(剩余空间 = %.2f GB)"
 
-#: src/startup.c:51
+#: src/startup.c:54
 #, c-format
 msgid ""
 "\n"
@@ -775,11 +775,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:88
+#: src/startup.c:95
 msgid "Directory name is too long !"
 msgstr "目录名太长!"
 
-#: src/startup.c:204
+#: src/startup.c:219
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -787,7 +787,7 @@
 "LIVES 无法启动您选定的音频播放器!\n"
 "\n"
 
-#: src/startup.c:211
+#: src/startup.c:226
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -797,7 +797,7 @@
 "\n"
 "推荐大多数用户使用 PULSEAUDIO"
 
-#: src/startup.c:214
+#: src/startup.c:229
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -805,7 +805,7 @@
 "，但是本版本 LIVES 编译时未加入对 pulse 音频的支持\n"
 "\n"
 
-#: src/startup.c:217
+#: src/startup.c:232
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -815,11 +815,11 @@
 " 建议您在运行 LIVES 前安装 pulse 音频。\n"
 "\n"
 
-#: src/startup.c:222
+#: src/startup.c:237
 msgid "JACK audio is recommended for pro users"
 msgstr "推荐专业用户使用 JACK 音频系统"
 
-#: src/startup.c:225
+#: src/startup.c:240
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -827,7 +827,7 @@
 "，但是本版本 LIVES 编译时未加入对 jack 音频的支持。\n"
 "\n"
 
-#: src/startup.c:228
+#: src/startup.c:243
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -837,7 +837,7 @@
 "频。\n"
 "\n"
 
-#: src/startup.c:231
+#: src/startup.c:246
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -848,11 +848,11 @@
 "如果 LIVES 不能与 jack 一同启动，您可以重启并选择其它的音频播放器。\n"
 "\n"
 
-#: src/startup.c:235
+#: src/startup.c:250
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "如果前述播放器均不能工作，可以尝试 SOX， "
 
-#: src/startup.c:238
+#: src/startup.c:253
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -860,7 +860,7 @@
 "但一些音频功能将被禁用。\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:256
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -870,7 +870,7 @@
 "建议您在运行 LIVES 前安装 SOX。\n"
 "\n"
 
-#: src/startup.c:245
+#: src/startup.c:260
 msgid ""
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
@@ -878,132 +878,140 @@
 "MPlayer 的音频播放器只推荐用于测试目的。\n"
 "\n"
 
-#: src/startup.c:263
+#: src/startup.c:277
 msgid "LiVES: - Choose an audio player"
 msgstr "LIVES： -选择一款音频播放器"
 
-#: src/startup.c:292
+#: src/startup.c:294
 msgid "Use _pulse audio player"
 msgstr "音频播放器使用_pulse"
 
-#: src/startup.c:326
+#: src/startup.c:316
 msgid "Use _jack audio player"
 msgstr "音频播放器使用_jack"
 
-#: src/startup.c:363
+#: src/startup.c:336
 msgid "Use _sox audio player"
 msgstr "音频播放器使用_sox"
 
-#: src/startup.c:398
+#: src/startup.c:357
 msgid "Use _mplayer audio player"
 msgstr "音频播放器使用_mplayer"
 
-#: src/startup.c:451 src/startup.c:639 src/interface.c:2150
+#: src/startup.c:382 src/startup.c:547 src/interface.c:1582
 msgid "_Next"
 msgstr "下一步(_N)"
 
-#: src/startup.c:495
+#: src/startup.c:422
 msgid "Skipped"
 msgstr "已跳过"
 
-#: src/startup.c:512
+#: src/startup.c:437
 msgid "Passed"
 msgstr "已通过"
 
-#: src/startup.c:544
+#: src/startup.c:461
 msgid "Failed"
 msgstr "已失败"
 
-#: src/startup.c:606
+#: src/startup.c:519
 msgid "LiVES: - Testing Configuration"
 msgstr "LIVES： - 测试配置"
 
-#: src/startup.c:609
+#: src/startup.c:522
 msgid "LiVES: - Troubleshoot"
 msgstr "LIVES： - 疑难解答"
 
-#: src/startup.c:623
+#: src/startup.c:535
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LIVES 现在将进行一些基本的配置测试\n"
 
-#: src/startup.c:662
+#: src/startup.c:570
 msgid "Checking for \"sox\" presence"
 msgstr "检查\"sox\"的存在"
 
-#: src/startup.c:666
+#: src/startup.c:574
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr "要使用 LIVES 的所有音频功能您应该安装 sox"
 
-#: src/startup.c:674
+#: src/startup.c:582
 msgid "Checking if sox can convert audio"
 msgstr "检查 sox 是否可以转换音频"
 
-#: src/startup.c:697
+#: src/startup.c:605
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:709
-#, fuzzy, c-format
+#: src/startup.c:620
+#, c-format
 msgid "Unable to write to: %s"
-msgstr "无法打开设备 %s\n"
+msgstr ""
 
-#: src/startup.c:723 src/startup.c:849
+#: src/startup.c:634 src/startup.c:766
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:744
+#: src/startup.c:656
 msgid "You should install sox_fmt_all or similar"
 msgstr "您应该安装 sox_fmt_all 或类似软件包"
 
-#: src/startup.c:771
+#: src/startup.c:684
 msgid "Checking for \"mplayer\" presence"
 msgstr "检查\"mplayer\"是否存在"
 
-#: src/startup.c:775
+#: src/startup.c:688
 msgid ""
 "You should install mplayer to be able to use all the decoding features in "
 "LiVES"
 msgstr "要使用 LIVES 全部的解码功能，需要安装 mplayer"
 
-#: src/startup.c:801
+#: src/startup.c:714
 msgid "Checking if mplayer can convert audio"
 msgstr "检查 mplayer 是否可以转换音频"
 
-#: src/startup.c:811
+#: src/startup.c:727
 msgid "You should install mplayer with pcm/wav support"
 msgstr "您应该安装带 pcm/wav 支持的 mplayer"
 
-#: src/startup.c:828
+#: src/startup.c:744
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "检查 mplayer 是否可以解码为 png/alpha"
 
-#: src/startup.c:869
+#: src/startup.c:787
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "您可能要升级到 mplayer 的新版本"
 
-#: src/startup.c:895
+#: src/startup.c:813
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "检查 mplayer 是否可以解码为 jpeg"
 
-#: src/startup.c:909
+#: src/startup.c:832
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "您应该安装带 png/alpha 或 jpeg 支持的 mplayer"
 
-#: src/startup.c:910
+#: src/startup.c:833
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "您可能需要向 mplayer 添加 jpeg 输出支持"
 
-#: src/startup.c:919
+#: src/startup.c:842
 msgid "Checking for \"convert\" presence"
 msgstr "检查\"convert\"是否存在"
 
-#: src/startup.c:923
+#: src/startup.c:846
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "安装 imageMagic 以使用所有的渲染效果"
 
-#: src/startup.c:937
+#: src/startup.c:859
+msgid ""
+"\n"
+"\n"
+"    Image decoding type has been switched to jpeg. You can revert this in "
+"Preferences/Decoding.    \n"
+msgstr ""
+
+#: src/startup.c:865
 msgid ""
 "\n"
 "\n"
@@ -1014,7 +1022,7 @@
 "\n"
 "    点击\"取消\"退出然后安装缺失的任何组件或者\"下一步\"继续    \n"
 
-#: src/startup.c:976
+#: src/startup.c:899
 msgid ""
 "\n"
 "\n"
@@ -1024,7 +1032,7 @@
 "\n"
 "最后您可以为 LIVES 选择一个默认的启动界面。\n"
 
-#: src/startup.c:977
+#: src/startup.c:900
 msgid ""
 "\n"
 "\n"
@@ -1034,7 +1042,7 @@
 "\n"
 "LIVES有两个主要的用户界面，您可以选择任意一个作为启动界面\n"
 
-#: src/startup.c:978
+#: src/startup.c:901
 msgid ""
 "\n"
 "\n"
@@ -1044,74 +1052,73 @@
 "\n"
 "默认的画面以后在首选项中可以随时修改。\n"
 
-#: src/startup.c:989
+#: src/startup.c:911
 msgid "LiVES: - Choose the startup interface"
 msgstr "LIVES： - 选择启动界面"
 
-#: src/startup.c:1018
+#: src/startup.c:922
 msgid "Start in _Clip Edit mode"
 msgstr "以剪辑编辑模式启动(_C)"
 
-#: src/startup.c:1042
-#, fuzzy
+#: src/startup.c:925
 msgid "This is the best choice for simple editing tasks and for VJs\n"
-msgstr "这是简单的编辑任务或 VJ 们的最佳选择\n"
+msgstr ""
 
-#: src/startup.c:1054
+#: src/startup.c:931
 msgid "Start in _Multitrack mode"
 msgstr "多轨道模式启动(_M)"
 
-#: src/startup.c:1074
+#: src/startup.c:933
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr "这更适合包含多剪辑片段的复杂编辑任务。\n"
 
-#: src/startup.c:1091
+#: src/startup.c:942
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: src/interface.c:40
+#: src/interface.c:34
 msgid "Let LiVES set the _file extension"
 msgstr "让 LiVES 自动选择文件（_f）扩展名"
 
-#: src/interface.c:42
+#: src/interface.c:35
 #, c-format
 msgid "Let LiVES set the _file extension (.%s)"
 msgstr ""
 
-#: src/interface.c:154
-msgid "Apply Deinterlace"
-msgstr "应用反交错"
+#: src/interface.c:49
+msgid "Apply _Deinterlace"
+msgstr ""
 
-#: src/interface.c:177
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "如果设置此项，视频在导入时将被反交错化。"
 
-#: src/interface.c:206 src/callbacks.c:9439 src/callbacks.c:9469
-#: src/callbacks.c:9470 src/gui.c:3097 src/gui.c:3660 src/saveplay.c:2034
-#: src/saveplay.c:2779 src/dialogs.c:1314 src/dialogs.c:1315
-#: src/dialogs.c:1539 src/dialogs.c:1540 src/framedraw.c:206
-#: src/multitrack.c:7145
+#: src/interface.c:112 src/callbacks.c:9635 src/callbacks.c:9658
+#: src/callbacks.c:9659 src/gui.c:3213 src/gui.c:3795 src/saveplay.c:2211
+#: src/saveplay.c:2993 src/dialogs.c:1441 src/dialogs.c:1442
+#: src/dialogs.c:1674 src/dialogs.c:1675 src/framedraw.c:238
+#: src/multitrack.c:7695
 msgid "Preview"
 msgstr "预览"
 
-#: src/interface.c:229
+#: src/interface.c:131
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "点击此处预览（_P）选定的视频、图像或音频文件"
 
-#: src/interface.c:232
+#: src/interface.c:134
 msgid "Click here to _Preview any selected audio file"
 msgstr "点击此处预览（_P）任何选定的音频文件"
 
-#: src/interface.c:235
+#: src/interface.c:137
 msgid "Click here to _Preview the video"
 msgstr "点击此处预览（_P）视频"
 
-#: src/interface.c:316 src/dialogs.c:2343
+#: src/interface.c:180 src/dialogs.c:2474
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - 正在处理..."
 
-#: src/interface.c:355
+#: src/interface.c:216
 msgid ""
 "\n"
 "\n"
@@ -1125,8 +1132,8 @@
 "\n"
 "请不要忘记之后关闭效果（ctrl-0）！"
 
-#: src/interface.c:360 src/callbacks.c:9209 src/callbacks.c:9242
-#: src/dialogs.c:2377
+#: src/interface.c:221 src/callbacks.c:9405 src/callbacks.c:9440
+#: src/dialogs.c:2502
 msgid ""
 "\n"
 "Please Wait"
@@ -1134,105 +1141,114 @@
 "\n"
 "请稍候"
 
-#: src/interface.c:403
-msgid "Show details"
-msgstr "显示细节"
+#: src/interface.c:241
+msgid "Show Details"
+msgstr ""
 
-#: src/interface.c:426 src/dialogs.c:2395
+#: src/interface.c:253 src/dialogs.c:2516
 msgid "_Enough"
 msgstr "可以了（_E）"
 
-#: src/interface.c:427 src/framedraw.c:265
+#: src/interface.c:254 src/framedraw.c:278
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: src/interface.c:429
+#: src/interface.c:256
 msgid "Paus_e"
 msgstr "暂停(_E)"
 
-#: src/interface.c:430 src/callbacks.c:9239
+#: src/interface.c:257 src/callbacks.c:9437
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:457
+#: src/interface.c:284
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/interface.c:607
+#: src/interface.c:356
+#, c-format
+msgid "LiVES: - %s"
+msgstr ""
+
+#: src/interface.c:358
+msgid "LiVES: - Multitrack details"
+msgstr ""
+
+#: src/interface.c:433
 msgid "Format"
 msgstr "格式"
 
-#: src/interface.c:616
+#: src/interface.c:438
 msgid "Frame size"
 msgstr "帧尺寸"
 
-#: src/interface.c:625
+#: src/interface.c:443
 msgid "File size"
 msgstr "文件大小"
 
-#: src/interface.c:626
+#: src/interface.c:444
 msgid "Byte size"
 msgstr "字节大小"
 
-#: src/interface.c:635 src/interface.c:708 src/interface.c:758
+#: src/interface.c:449 src/interface.c:501 src/interface.c:542
 msgid "Total time"
 msgstr "总时间"
 
-#: src/interface.c:644 src/interface.c:2674
+#: src/interface.c:454 src/interface.c:1968
 msgid "FPS"
 msgstr "帧每秒"
 
-#: src/interface.c:653
+#: src/interface.c:459
 msgid "Frames"
 msgstr "帧"
 
-#: src/interface.c:654
+#: src/interface.c:460
 msgid "Events"
 msgstr "事件"
 
-#: src/interface.c:685 src/resample.c:1788
+#: src/interface.c:483 src/resample.c:1488
 msgid "Audio"
 msgstr "音频"
 
-#: src/interface.c:726 src/interface.c:776
+#: src/interface.c:515 src/interface.c:556
 msgid "Rate/size"
 msgstr "速率/尺寸"
 
-#: src/interface.c:785
+#: src/interface.c:561
 msgid "Right audio"
 msgstr "右声道"
 
-#: src/interface.c:857
+#: src/interface.c:623
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - 编码选项"
 
-#: src/interface.c:884
+#: src/interface.c:637
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:885
+#: src/interface.c:638
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:916
+#: src/interface.c:663
+msgid "Use _letterboxing to maintain aspect ratio (optional)"
+msgstr ""
+
+#: src/interface.c:664
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:919
-msgid "Use _letterboxing to maintain aspect ratio (optional)"
-msgstr ""
-
-#: src/interface.c:976
+#: src/interface.c:695
 msgid "Keep _my settings"
 msgstr "记住我的设置(_M)"
 
-#: src/interface.c:977
+#: src/interface.c:696
 msgid "Use _recommended settings"
 msgstr "使用推荐设置(_R)"
 
-#: src/interface.c:1051 src/dialogs.c:107
+#: src/interface.c:774 src/dialogs.c:110
 msgid ""
 "Do _not show this warning any more\n"
 "(can be turned back on from Preferences/Warnings)"
@@ -1240,76 +1256,75 @@
 "不再显示此警告(_N)\n"
 "(可以从 偏好设置/警告 中重新开启)"
 
-#: src/interface.c:1078
+#: src/interface.c:786
 msgid "Show _Details"
 msgstr "显示详情（_D）"
 
-#: src/interface.c:1172
+#: src/interface.c:885
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: src/interface.c:1176
+#: src/interface.c:887
 msgid "_Save to file"
 msgstr "保存到文件（_S）"
 
-#: src/interface.c:1284
+#: src/interface.c:983
 msgid "LiVES: - Insert"
 msgstr "LiVES: - 插入"
 
-#: src/interface.c:1306
+#: src/interface.c:1000
 msgid "_Number of times to insert"
 msgstr "插入次数（_N）"
 
-#: src/interface.c:1327
+#: src/interface.c:1009
 msgid "_Insert to fit audio"
 msgstr "插入以适应音频（_I）"
 
-#: src/interface.c:1371
+#: src/interface.c:1023
 msgid "Insert _before selection"
 msgstr "插入到选区前（_B）"
 
-#: src/interface.c:1376
+#: src/interface.c:1025
 msgid "Insert clipboard before selected frames"
 msgstr "插入剪切板内容到选定帧之前"
 
-#: src/interface.c:1408
+#: src/interface.c:1041
 msgid "Insert _after selection"
 msgstr "插入到选区后（_A）"
 
-#: src/interface.c:1413
+#: src/interface.c:1043
 msgid "Insert clipboard after selected frames"
 msgstr "插入剪切板内容到选定帧之后"
 
-#: src/interface.c:1444
+#: src/interface.c:1054
 msgid "Insert _with sound"
 msgstr "带声音插入（_W）"
 
-#: src/interface.c:1480
+#: src/interface.c:1067
 msgid "Insert with_out sound"
 msgstr "不带声音插入（_O）"
 
-#: src/interface.c:1583
+#: src/interface.c:1148
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - 打开选区"
 
-#: src/interface.c:1612
-msgid "    Selection start time (sec)"
-msgstr "    选区起始时间（秒）"
-
-#: src/interface.c:1622
-msgid "    Number of frames to open"
-msgstr "    打开帧数"
+#: src/interface.c:1166
+msgid "Selection start time (sec)"
+msgstr ""
 
-#: src/interface.c:1732
+#: src/interface.c:1172
+msgid "Number of frames to open"
+msgstr ""
+
+#: src/interface.c:1248
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - 打开位置"
 
-#: src/interface.c:1734
-#, fuzzy
+#: src/interface.c:1250
 msgid "LiVES: - Open Youtube Clip"
-msgstr "LiVES: - 重命名剪辑"
+msgstr ""
 
-#: src/interface.c:1740
+#: src/interface.c:1268
 msgid ""
 "\n"
 "\n"
@@ -1324,7 +1339,7 @@
 "并保证在 首选向|流媒体 中设置了带宽\n"
 "\n"
 
-#: src/interface.c:1743
+#: src/interface.c:1271
 msgid ""
 "\n"
 "\n"
@@ -1333,47 +1348,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1752
+#: src/interface.c:1275
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1767
+#: src/interface.c:1286
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1769
-#, fuzzy
+#: src/interface.c:1286
 msgid "Youtube URL : "
-msgstr "URL : "
+msgstr ""
 
-#: src/interface.c:1789
+#: src/interface.c:1290
 msgid "Do not send bandwidth information"
 msgstr "不发送带宽信息"
 
-#: src/interface.c:1790
+#: src/interface.c:1292
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "如果获取流媒体有问题是请尝试此选项"
 
-#: src/interface.c:1827
+#: src/interface.c:1313
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1841
-msgid "Download Directory..."
-msgstr ""
-
-#: src/interface.c:1864
+#: src/interface.c:1331
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1878
+#: src/interface.c:1336
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1991
+#: src/interface.c:1414
+msgid "LiVES: - Rename Clip"
+msgstr "LiVES: - 重命名剪辑"
+
+#: src/interface.c:1417
+msgid "LiVES: - Enter Set Name"
+msgstr "LiVES: - 输入场景名"
+
+#: src/interface.c:1420
+msgid "LiVES: - Enter a Set Name to Reload"
+msgstr ""
+
+#: src/interface.c:1423
+msgid "LiVES: - Choose a Working Directory"
+msgstr "LiVES: - 选择工作目录"
+
+#: src/interface.c:1426
+msgid "LiVES: - Rename Current Track"
+msgstr ""
+
+#: src/interface.c:1446
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1385,7 +1415,7 @@
 "请输入您希望使用的场景名字。\n"
 "LiVES 将会在稍后退出时提示您保存剪辑场景。\n"
 
-#: src/interface.c:2001
+#: src/interface.c:1452
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1393,7 +1423,7 @@
 "为了导出此项目，您必须为剪辑场景起个名字。\n"
 "这个名字同时也是项目名字。\n"
 
-#: src/interface.c:2012
+#: src/interface.c:1459
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1403,244 +1433,200 @@
 "启动向导将指引您进行初始安装，\n"
 "以尽可能开启本程序功能。\n"
 
-#: src/interface.c:2019
+#: src/interface.c:1463
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
-"Note, on many systems, /tmp is cleared on shutdown, so it may be inadvisable "
-"to create it in /tmp.\n"
 msgstr ""
-"\n"
-"首先，您需要为 LiVES 选择一个工作目录。\n"
-"这个目录应该有足够的剩余空间。\n"
-"注意，很多系统上，/tmp 在关机时会被清除，因此不建议您将工作目录放在 /tmp "
-"下。\n"
-
-#: src/interface.c:2039
-msgid "LiVES: - Rename Clip"
-msgstr "LiVES: - 重命名剪辑"
-
-#: src/interface.c:2042
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - 输入场景名"
-
-#: src/interface.c:2045
-#, fuzzy
-msgid "LiVES: - Enter a Set Name to Reload"
-msgstr "LiVES: - 输入场景名"
-
-#: src/interface.c:2048
-msgid "LiVES: - Choose a Working Directory"
-msgstr "LiVES: - 选择工作目录"
 
-#: src/interface.c:2052
+#: src/interface.c:1482
 msgid "New name "
 msgstr "新名称 "
 
-#: src/interface.c:2055
+#: src/interface.c:1485
 msgid "Set name "
 msgstr "场景名 "
 
-#: src/interface.c:2204
+#: src/interface.c:1627
 msgid "Use def_aults"
 msgstr "用默认值(_A)"
 
-#: src/interface.c:2207 src/interface.c:2563 src/preferences.c:2820
-#: src/preferences.c:3147
+#: src/interface.c:1630 src/interface.c:1917 src/preferences.c:2466
+#: src/preferences.c:2635
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: src/interface.c:2263
+#: src/interface.c:1681
 msgid "LiVES:- Select input device"
 msgstr "LiVES：- 选择输入设备"
 
-#: src/interface.c:2290
+#: src/interface.c:1699
 msgid "Select input device:"
 msgstr "选择输入设备:"
 
-#: src/interface.c:2388
+#: src/interface.c:1763
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- 载入 CD 音轨"
 
-#: src/interface.c:2391
+#: src/interface.c:1766
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- 选择 DVD 标题/章节"
 
-#: src/interface.c:2394
+#: src/interface.c:1769
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- 选择 VCD 标题"
 
-#: src/interface.c:2397
+#: src/interface.c:1772
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- 更改最大可见Change Maximum Visible Tracks"
 
-#: src/interface.c:2400
+#: src/interface.c:1775
 msgid "LiVES:- Device details"
 msgstr "LiVES:-设备明细"
 
-#: src/interface.c:2431
+#: src/interface.c:1798
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "载入音轨 (从 %s)"
 
-#: src/interface.c:2434
+#: src/interface.c:1801
 msgid "DVD Title"
 msgstr "DVD 标题"
 
-#: src/interface.c:2437
+#: src/interface.c:1804
 msgid "VCD Title"
 msgstr "VCD 标题"
 
-#: src/interface.c:2440
+#: src/interface.c:1807
 msgid "Maximum number of tracks to display"
 msgstr "显示的最大音轨数"
 
-#: src/interface.c:2443
+#: src/interface.c:1810
 msgid "Device:        /dev/video"
 msgstr "设备：/dev/video"
 
-#: src/interface.c:2446
+#: src/interface.c:1813
 msgid "Device:        fw:"
 msgstr "设备： fw:"
 
-#: src/interface.c:2486
+#: src/interface.c:1848
 msgid "Chapter  "
 msgstr "章  "
 
-#: src/interface.c:2487
+#: src/interface.c:1853
 msgid "Channel  "
 msgstr "通道  "
 
-#: src/interface.c:2511
+#: src/interface.c:1868
 msgid "Audio ID  "
 msgstr "音频 ID  "
 
-#: src/interface.c:2579
+#: src/interface.c:1934
 msgid "Input number"
 msgstr "输入数字"
 
-#: src/interface.c:2604
+#: src/interface.c:1942
 msgid "Use default width, height and FPS"
 msgstr "使用默认的宽度、高度和帧率"
 
-#: src/interface.c:2644
+#: src/interface.c:1956
 msgid "Width"
 msgstr "宽度"
 
-#: src/interface.c:2659
+#: src/interface.c:1962
 msgid "Height"
 msgstr "高度"
 
-#: src/interface.c:2696
-msgid "Driver"
-msgstr "驱动"
+#: src/interface.c:1976
+msgid "_Driver"
+msgstr ""
 
-#: src/interface.c:2715 src/preferences.c:3652
-msgid "Output format"
-msgstr "输出格式"
+#: src/interface.c:1979
+msgid "_Output format"
+msgstr ""
 
-#: src/interface.c:2852
+#: src/interface.c:2075
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- 音频渐强"
 
-#: src/interface.c:2855
+#: src/interface.c:2078
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- 音频渐弱"
 
-#: src/interface.c:2881
+#: src/interface.c:2094
 msgid "Fade in over  "
 msgstr "结束时淡出  "
 
-#: src/interface.c:2882
+#: src/interface.c:2095
 msgid "first"
 msgstr "第一个"
 
-#: src/interface.c:2885
+#: src/interface.c:2098
 msgid "Fade out over  "
 msgstr "渐弱结束  "
 
-#: src/interface.c:2886
+#: src/interface.c:2099
 msgid "last"
 msgstr "最后一个"
 
-#: src/interface.c:2923
+#: src/interface.c:2121
 msgid "seconds."
 msgstr "秒。"
 
-#: src/interface.c:2948
-msgid "selection."
-msgstr "选区."
-
-#: src/interface.c:3014
-msgid "LiVES: - Play Random Music"
-msgstr "LiVES: - 随机播放音乐"
-
-#: src/interface.c:3042
-msgid "Number of Tracks Requested:    "
-msgstr "要求的音轨数:    "
-
-#: src/interface.c:3065
-msgid "Directory:"
-msgstr "目录:"
-
-#: src/interface.c:3091
-msgid "Include subdirectories"
-msgstr "包含子目录"
-
-#: src/interface.c:3119
-msgid "Minimum File Size (MB)         "
-msgstr "最小文件尺寸 (MB)         "
-
-#: src/interface.c:3139
-msgid "Maximum File Size (MB)        "
-msgstr "最大文件尺寸 (MB)        "
+#: src/interface.c:2129 src/saveplay.c:1403
+msgid "selection"
+msgstr "选区"
 
-#: src/interface.c:3202
+#: src/interface.c:2169
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - 文件注释（可选）"
 
-#: src/interface.c:3222
+#: src/interface.c:2184
 msgid "Title/Name : "
 msgstr "标题/名称： "
 
-#: src/interface.c:3233
+#: src/interface.c:2191
 msgid "Author/Artist : "
 msgstr "作者/艺术家： "
 
-#: src/interface.c:3244
+#: src/interface.c:2198
 msgid "Comments : "
 msgstr "评论： "
 
-#: src/interface.c:3280
+#: src/interface.c:2228
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: src/interface.c:3301
+#: src/interface.c:2235
 msgid "Save _subtitles to file"
 msgstr "将字幕保存到文件(_S)"
 
-#: src/interface.c:3331
+#: src/interface.c:2247
 msgid "Subtitle file"
 msgstr "字幕文件"
 
-#: src/interface.c:3337
+#: src/interface.c:2249
 msgid "Browse..."
 msgstr "浏览…"
 
-#: src/interface.c:3416
-msgid "LiVES: choose a directory"
-msgstr "LiVES: 选择一个目录"
-
-#: src/interface.c:3419
-msgid "LiVES: choose a file"
-msgstr "LiVES: 选择一个文件"
+#: src/interface.c:2332
+msgid "LiVES: - choose a device"
+msgstr ""
+
+#: src/interface.c:2336
+msgid "LiVES: - choose a directory"
+msgstr ""
+
+#: src/interface.c:2339
+msgid "LiVES: - choose a file"
+msgstr ""
 
-#: src/interface.c:3516
+#: src/interface.c:2522
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - 取消/放弃/保存"
 
-#: src/interface.c:3536
+#: src/interface.c:2537
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1650,7 +1636,7 @@
 "当前布局（layout）还没有保存。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:3539
+#: src/interface.c:2540
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1660,7 +1646,7 @@
 "当前布局（layout）至上一次保存已经有改动。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:3543
+#: src/interface.c:2544
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1670,7 +1656,7 @@
 "当前剪辑设置可以保存。\n"
 "您打算保存吗？\n"
 
-#: src/interface.c:3544
+#: src/interface.c:2545
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1678,7 +1664,7 @@
 "目前的剪辑尚未保存。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:3548
+#: src/interface.c:2549
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1686,7 +1672,7 @@
 "当前的布局尚未保存。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:3551
+#: src/interface.c:2552
 msgid ""
 "The current layout has not been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1694,7 +1680,7 @@
 "当前布局（layout）至上一次保存并未改动。\n"
 "你打算做什么？\n"
 
-#: src/interface.c:3556
+#: src/interface.c:2557
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1702,7 +1688,7 @@
 "当前的布局包含生成的帧，并且不能保留。\n"
 "你在离开多轨（multitrack）模式前最好渲染一下这些帧。\n"
 
-#: src/interface.c:3559
+#: src/interface.c:2560
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1712,43 +1698,43 @@
 "当前的布局包含生成的帧，并且不能保留。\n"
 "你打算做什么？"
 
-#: src/interface.c:3582
+#: src/interface.c:2573
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:3594
+#: src/interface.c:2579
 msgid "_Auto reload next time"
 msgstr "_下一次自动加载"
 
-#: src/interface.c:3650 src/interface.c:3661
+#: src/interface.c:2615 src/interface.c:2625
 msgid "_Wipe layout"
 msgstr "_擦除布局"
 
-#: src/interface.c:3651
+#: src/interface.c:2616
 msgid "_Ignore changes"
 msgstr "_忽略的变化"
 
-#: src/interface.c:3652
+#: src/interface.c:2617
 msgid "_Delete clip set"
 msgstr "_夹上删除"
 
-#: src/interface.c:3653
+#: src/interface.c:2618
 msgid "_Delete layout"
 msgstr "_删除布局"
 
-#: src/interface.c:3659
+#: src/interface.c:2623
 msgid "_Save layout"
 msgstr "_保存布局"
 
-#: src/interface.c:3660
+#: src/interface.c:2624
 msgid "_Save clip set"
 msgstr "_夹上保存"
 
-#: src/interface.c:3680
+#: src/interface.c:2646
 msgid "LiVES: recover layout ?"
 msgstr "LiVES: 恢复布局？"
 
-#: src/interface.c:3695
+#: src/interface.c:2658
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1758,77 +1744,69 @@
 "LiVES检测到先前的多轨布局\n"
 "你要恢复到这个布局吗？\n"
 
-#: src/interface.c:3745
-#, fuzzy
+#: src/interface.c:2706
 msgid "LiVES: - Disk Recovery Options"
-msgstr "LiVES: - 编码选项"
+msgstr ""
 
-#: src/interface.c:3790
+#: src/interface.c:2725
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:3817
-#, fuzzy
+#: src/interface.c:2726
+msgid "Delete any clips which are not currently loaded or part of a set"
+msgstr ""
+
+#: src/interface.c:2739
 msgid "Clear _Backup Files from Closed Clips"
-msgstr "清除时间线上的标记(_M)"
+msgstr ""
 
-#: src/interface.c:3847
+#: src/interface.c:2750
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:3870
-#, fuzzy
+#: src/interface.c:2761
 msgid "_Reset to Defaults"
-msgstr "重设值(_R)"
+msgstr ""
 
-#: src/interface.c:3877
+#: src/interface.c:2768
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:166
+#: src/callbacks.c:194
 #, c-format
 msgid "Saving as set %s..."
 msgstr "将场景保存为 %s..."
 
-#: src/callbacks.c:518 src/callbacks.c:548
-msgid "Select File"
-msgstr "选择文件"
-
-#: src/callbacks.c:742
+#: src/callbacks.c:814
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:750
+#: src/callbacks.c:822
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:774
-#, fuzzy, c-format
+#: src/callbacks.c:848
+#, c-format
 msgid "Downloading %s to %s..."
-msgstr "自动装载场景 %s..."
+msgstr ""
 
-#: src/callbacks.c:802
-#, fuzzy
+#: src/callbacks.c:876
 msgid "Downloading clip"
-msgstr "清理剪辑"
+msgstr ""
 
-#: src/callbacks.c:824
-#, fuzzy
+#: src/callbacks.c:914
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 msgstr ""
-"\n"
-"LiVES 无法向 /tmp 写入小文件\n"
-"请确保您有向 /tmp 的写入权限并重试。\n"
 
-#: src/callbacks.c:971 src/callbacks.c:1006
+#: src/callbacks.c:1100 src/callbacks.c:1135
 msgid "This file"
 msgstr "文件"
 
-#: src/callbacks.c:972
+#: src/callbacks.c:1101
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1836,7 +1814,7 @@
 "，\n"
 " - 包括当前的布局 - "
 
-#: src/callbacks.c:974
+#: src/callbacks.c:1103
 #, c-format
 msgid ""
 "\n"
@@ -1851,7 +1829,7 @@
 "\n"
 "确实要关闭吗？"
 
-#: src/callbacks.c:976
+#: src/callbacks.c:1105
 #, c-format
 msgid ""
 "\n"
@@ -1866,7 +1844,7 @@
 "\n"
 "确实要关闭吗？"
 
-#: src/callbacks.c:1007
+#: src/callbacks.c:1136
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1875,7 +1853,7 @@
 "对此剪辑所做的更改还未保存或备份。\n"
 "真的要关闭吗？"
 
-#: src/callbacks.c:1164
+#: src/callbacks.c:1328
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1883,7 +1861,7 @@
 "\n"
 "无效的项目文件。\n"
 
-#: src/callbacks.c:1177
+#: src/callbacks.c:1341
 #, c-format
 msgid ""
 "\n"
@@ -1903,33 +1881,33 @@
 "然后通过 文件|关闭/保存所有剪辑 并且提供新的场景名称或者忽略。\n"
 "一旦你完成这些，你就可以导入新工程了。.\n"
 
-#: src/callbacks.c:1187
+#: src/callbacks.c:1351
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "导入工程 %s 为场景 %s..."
 
-#: src/callbacks.c:1207
+#: src/callbacks.c:1371
 msgid "Importing project"
 msgstr "导入项目"
 
-#: src/callbacks.c:1292
+#: src/callbacks.c:1456
 #, c-format
 msgid "Exporting project %s..."
 msgstr "导出工程为%s..."
 
-#: src/callbacks.c:1310
+#: src/callbacks.c:1474
 msgid "Exporting project"
 msgstr "导出工程"
 
-#: src/callbacks.c:1326
-msgid "Restore .lv1 file"
-msgstr "恢复 .lv1文件"
-
-#: src/callbacks.c:1343
+#: src/callbacks.c:1490
 msgid "Backup as .lv1 file"
 msgstr "备份为 .lv1文件"
 
-#: src/callbacks.c:1529
+#: src/callbacks.c:1506
+msgid "Restore .lv1 file"
+msgstr "恢复 .lv1文件"
+
+#: src/callbacks.c:1649
 msgid ""
 "\n"
 "\n"
@@ -1941,90 +1919,90 @@
 "设置将被删除从磁盘。\n"
 "你确定吗？\n"
 
-#: src/callbacks.c:1584
-#, fuzzy, c-format
+#: src/callbacks.c:1708
+#, c-format
 msgid "Deleting set %s..."
-msgstr "删除设置..."
+msgstr ""
 
-#: src/callbacks.c:1586
+#: src/callbacks.c:1710
 msgid "Deleting set..."
 msgstr "删除设置..."
 
-#: src/callbacks.c:1590
+#: src/callbacks.c:1714
 msgid "Deleting set"
 msgstr "删除设置"
 
-#: src/callbacks.c:1598
+#: src/callbacks.c:1722
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "%s的设置永久删除磁盘。\n"
 
-#: src/callbacks.c:1649 src/callbacks.c:11606
+#: src/callbacks.c:1772 src/callbacks.c:11820
 msgid "Insert Silence"
 msgstr "插入沉默"
 
-#: src/callbacks.c:1702 src/callbacks.c:1781 src/callbacks.c:1943
+#: src/callbacks.c:1828 src/callbacks.c:1908 src/callbacks.c:2071
 msgid "Undoing"
 msgstr "撤消"
 
-#: src/callbacks.c:1794 src/callbacks.c:2004
+#: src/callbacks.c:1921 src/callbacks.c:2132
 msgid "Restoring audio..."
 msgstr "还原音频..."
 
-#: src/callbacks.c:1810
+#: src/callbacks.c:1937
 msgid "Clearing frame images"
 msgstr "结算帧图像"
 
-#: src/callbacks.c:1842
+#: src/callbacks.c:1970
 msgid "Deleting excess frames"
 msgstr "删除多余的帧"
 
-#: src/callbacks.c:2086
+#: src/callbacks.c:2214
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "视频长度现在为 %d帧，播放速度为 %.3f帧/秒。\n"
 
-#: src/callbacks.c:2090 src/resample.c:680 src/resample.c:2574
+#: src/callbacks.c:2218 src/resample.c:683 src/resample.c:2163
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "剪贴板已经被重新取样为 %d 帧\n"
 
-#: src/callbacks.c:2253 src/callbacks.c:2282
+#: src/callbacks.c:2381 src/callbacks.c:2410
 msgid "Redoing"
 msgstr "重做"
 
-#: src/callbacks.c:2327
+#: src/callbacks.c:2455
 #, c-format
 msgid "Copying frames %d to %d%s to the clipboard..."
 msgstr "正在将%d 到 %d%s 帧拷贝到剪贴板……"
 
-#: src/callbacks.c:2349 src/saveplay.c:1259 src/saveplay.c:1410
-#: src/saveplay.c:1496 src/saveplay.c:3587
+#: src/callbacks.c:2477 src/saveplay.c:1413 src/saveplay.c:1567
+#: src/saveplay.c:1629 src/saveplay.c:3835
 msgid "Pulling frames from clip"
 msgstr "从剪辑中抽取帧"
 
-#: src/callbacks.c:2387
+#: src/callbacks.c:2515
 msgid "Copying to the clipboard"
 msgstr "正在拷贝到剪贴板……"
 
-#: src/callbacks.c:2447
+#: src/callbacks.c:2593
 msgid "Cut"
 msgstr "剪切"
 
-#: src/callbacks.c:2484
+#: src/callbacks.c:2630
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "正在粘贴 %d 帧至新剪辑 %s ..."
 
-#: src/callbacks.c:2507
+#: src/callbacks.c:2654
 msgid "Pasting"
 msgstr "粘贴"
 
-#: src/callbacks.c:2523
+#: src/callbacks.c:2670
 msgid "...added audio..."
 msgstr "...已添加音频..."
 
-#: src/callbacks.c:2603
+#: src/callbacks.c:2747
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2033,7 +2011,7 @@
 "此操作需要调整帧尺寸或转换帧。\n"
 "请安装 Image-magick 软件包中的“convert”程序并重新启动 LiVES。\n"
 
-#: src/callbacks.c:2620
+#: src/callbacks.c:2764
 msgid ""
 "\n"
 "\n"
@@ -2047,7 +2025,7 @@
 "请尝试选择所有帧,然后使用 \n"
 "音频菜单中的“剪切音频”功能。"
 
-#: src/callbacks.c:2644
+#: src/callbacks.c:2788
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2055,7 +2033,7 @@
 "无法插入因为音频码率不符。\n"
 "请安装“sox”后重试。"
 
-#: src/callbacks.c:2663
+#: src/callbacks.c:2807
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2065,7 +2043,7 @@
 "插入帧将导致一些转向多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:2713 src/callbacks.c:11539
+#: src/callbacks.c:2857 src/callbacks.c:11748
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2075,11 +2053,11 @@
 "插入音频会导致一些转移多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:2820 src/callbacks.c:2848
+#: src/callbacks.c:2965 src/callbacks.c:2994
 msgid "Resampling clipboard audio"
 msgstr "音频重采样剪贴板"
 
-#: src/callbacks.c:2864
+#: src/callbacks.c:3010
 msgid ""
 "\n"
 "\n"
@@ -2091,7 +2069,7 @@
 "无法重采样剪切板中的音频。 \n"
 "剪切板中的音频已经被清除。\n"
 
-#: src/callbacks.c:2878
+#: src/callbacks.c:3024
 msgid ""
 "\n"
 "\n"
@@ -2100,30 +2078,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:2930 src/callbacks.c:3097
+#: src/callbacks.c:3076 src/callbacks.c:3246
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "正在从剪切板中插入 %d%s 帧..."
 
-#: src/callbacks.c:2954 src/callbacks.c:3023 src/callbacks.c:3120
+#: src/callbacks.c:3101 src/callbacks.c:3171 src/callbacks.c:3270
 msgid "Inserting"
 msgstr "正在插入"
 
-#: src/callbacks.c:2985
+#: src/callbacks.c:3132
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:2992
+#: src/callbacks.c:3139
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3199
+#: src/callbacks.c:3349
 msgid "Insert"
 msgstr "插入"
 
-#: src/callbacks.c:3268
+#: src/callbacks.c:3418
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2133,7 +2111,7 @@
 "删除所有的帧将关闭该文件。\n"
 "你确定吗？"
 
-#: src/callbacks.c:3277
+#: src/callbacks.c:3427
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2143,8 +2121,8 @@
 "删除将导致丢失一些多轨布局框架。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3297 src/callbacks.c:10782 src/callbacks.c:11014
-#: src/callbacks.c:11080
+#: src/callbacks.c:3447 src/callbacks.c:10973 src/callbacks.c:11218
+#: src/callbacks.c:11284
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2154,7 +2132,7 @@
 "删除会导致一些失踪的多轨音频布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3316
+#: src/callbacks.c:3466
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2164,7 +2142,7 @@
 "帧删除会导致一些转移多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3335 src/callbacks.c:11062
+#: src/callbacks.c:3485 src/callbacks.c:11266
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2174,20 +2152,20 @@
 "删除会导致音频转向一些多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3393
+#: src/callbacks.c:3543
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "正在删除帧 %d 到 %d%s..."
 
-#: src/callbacks.c:3417
+#: src/callbacks.c:3568
 msgid "Deleting"
 msgstr "删除中"
 
-#: src/callbacks.c:3498
+#: src/callbacks.c:3649
 msgid "Delete"
 msgstr "删除"
 
-#: src/callbacks.c:3519
+#: src/callbacks.c:3670
 msgid ""
 "\n"
 "\n"
@@ -2197,7 +2175,7 @@
 "\n"
 "选择被锁定。\n"
 
-#: src/callbacks.c:3960
+#: src/callbacks.c:4025
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2205,11 +2183,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:3966
+#: src/callbacks.c:4031
 msgid "Record cancelled.\n"
 msgstr "记录取消。\n"
 
-#: src/callbacks.c:4110
+#: src/callbacks.c:4175
 #, c-format
 msgid ""
 "\n"
@@ -2222,7 +2200,7 @@
 "插件 '%s' 报告：\n"
 "%s\n"
 
-#: src/callbacks.c:4114
+#: src/callbacks.c:4179
 #, c-format
 msgid ""
 "\n"
@@ -2231,7 +2209,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4501
+#: src/callbacks.c:4559
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2240,22 +2218,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4580
+#: src/callbacks.c:4642
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:4934
+#: src/callbacks.c:4998
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5017
+#: src/callbacks.c:5086
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5268
+#: src/callbacks.c:5362
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2263,41 +2241,37 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5273
+#: src/callbacks.c:5367
 msgid "Cleaning up disk space..."
 msgstr "清理磁盘空间..."
 
-#: src/callbacks.c:5334
-#, fuzzy
+#: src/callbacks.c:5435
 msgid "Recovering disk space"
-msgstr "结算磁盘空间"
+msgstr ""
 
-#: src/callbacks.c:5378
-#, fuzzy, c-format
+#: src/callbacks.c:5487
+#, c-format
 msgid "%s of disk space was recovered.\n"
-msgstr "%d个MB的磁盘空间被收回。\n"
+msgstr ""
 
-#: src/callbacks.c:5434
+#: src/callbacks.c:5543
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5483
+#: src/callbacks.c:5586
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
-"Internal: %s (%d bpp)\n"
+"Internal: %s (%d bpp) / %s\n"
 msgstr ""
-"\n"
-"外部： %s\n"
-"内部： %s (%d bpp)\n"
 
-#: src/callbacks.c:5485
+#: src/callbacks.c:5588
 msgid "buffered"
 msgstr "已缓冲"
 
-#: src/callbacks.c:5498 src/callbacks.c:5517 src/callbacks.c:5535
-#: src/callbacks.c:5569
+#: src/callbacks.c:5601 src/callbacks.c:5620 src/callbacks.c:5638
+#: src/callbacks.c:5672
 msgid ""
 "\n"
 "  Opening..."
@@ -2305,7 +2279,7 @@
 "\n"
 "  开幕..."
 
-#: src/callbacks.c:5505
+#: src/callbacks.c:5608
 #, c-format
 msgid ""
 "\n"
@@ -2314,7 +2288,7 @@
 "\n"
 "（%d个虚拟）"
 
-#: src/callbacks.c:5508
+#: src/callbacks.c:5611
 #, c-format
 msgid ""
 "\n"
@@ -2323,7 +2297,7 @@
 "\n"
 "（%d个解码）"
 
-#: src/callbacks.c:5520 src/callbacks.c:5538 src/callbacks.c:5572
+#: src/callbacks.c:5623 src/callbacks.c:5641 src/callbacks.c:5675
 #, c-format
 msgid ""
 "\n"
@@ -2332,7 +2306,7 @@
 "\n"
 "  %.2f 秒"
 
-#: src/callbacks.c:5529
+#: src/callbacks.c:5632
 msgid ""
 "\n"
 "  Unknown"
@@ -2340,23 +2314,23 @@
 "\n"
 "  未知"
 
-#: src/callbacks.c:5542 src/callbacks.c:5556
+#: src/callbacks.c:5645 src/callbacks.c:5659
 msgid "unsigned"
 msgstr "无符号"
 
-#: src/callbacks.c:5543 src/callbacks.c:5557
+#: src/callbacks.c:5646 src/callbacks.c:5660
 msgid "signed"
 msgstr "有符号"
 
-#: src/callbacks.c:5545 src/callbacks.c:5559
+#: src/callbacks.c:5648 src/callbacks.c:5662
 msgid "big-endian"
 msgstr "大端"
 
-#: src/callbacks.c:5546 src/callbacks.c:5560
+#: src/callbacks.c:5649 src/callbacks.c:5663
 msgid "little-endian"
 msgstr "小端"
 
-#: src/callbacks.c:5548 src/callbacks.c:5562
+#: src/callbacks.c:5651 src/callbacks.c:5665
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2365,7 +2339,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5632
+#: src/callbacks.c:5736
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2382,12 +2356,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5646
+#: src/callbacks.c:5750
 msgid "A video editor and VJ program."
 msgstr "阿视频编辑和南军的计划。"
 
-#: src/callbacks.c:5668
-#, fuzzy, c-format
+#: src/callbacks.c:5751
+msgid "About LiVES"
+msgstr ""
+
+#: src/callbacks.c:5753
+msgid "translator_credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Liu Hui https://launchpad.net/~dannul\n"
+"  Timothy Gu https://launchpad.net/~timothy-gu\n"
+"  Wylmer Wang https://launchpad.net/~wantinghard\n"
+"  salsaman https://launchpad.net/~salsaman\n"
+"  zhanshime https://launchpad.net/~zhanshime"
+
+#: src/callbacks.c:5786
+#, c-format
 msgid ""
 "LiVES Version %s\n"
 "(c) G. Finch (salsaman) %s\n"
@@ -2399,17 +2388,8 @@
 "salsaman@gmail.com\n"
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
-"LiVES 版本 %s\n"
-"(c) G. Finch (salsaman) %s\n"
-"\n"
-"请遵守 GPL 3 或更新版本的许可协议 (http://www.gnu.org/licenses/gpl.txt)\n"
-"LiVES 的发布不作任何担保\n"
-"\n"
-"作者的联系方式：\n"
-"salsaman@xs4all.nl\n"
-"主页：http://lives.sourceforge.net"
 
-#: src/callbacks.c:5906
+#: src/callbacks.c:6065
 msgid ""
 "\n"
 "\n"
@@ -2419,14 +2399,14 @@
 "\n"
 "您需要安装mplayer的能够预览该文件。\n"
 
-#: src/callbacks.c:5923
+#: src/callbacks.c:6068
 msgid ""
-"Preview will not work without X11. We need the window id of the preview "
-"window.\n"
-"Please send a patch if you know how to do this.\n"
+"\n"
+"\n"
+"You need to install mplayer or imageMagick to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6301 src/callbacks.c:8093
+#: src/callbacks.c:6449 src/callbacks.c:8314
 msgid ""
 "\n"
 "Loading new audio may cause missing audio in some multitrack layouts.\n"
@@ -2437,168 +2417,180 @@
 "载入新的音频可能会导致丢失一些多轨音频布局。\n"
 "您确定要继续吗？"
 
-#: src/callbacks.c:6399
+#: src/callbacks.c:6546
 #, c-format
 msgid "Opening audio %s, type %s..."
 msgstr "正在打开音频 %s，类型为 %s..."
 
-#: src/callbacks.c:6432 src/saveplay.c:438
+#: src/callbacks.c:6579 src/saveplay.c:461
 msgid "Opening audio"
 msgstr "开幕式音频"
 
-#: src/callbacks.c:6441 src/callbacks.c:6481 src/callbacks.c:8191
-#: src/callbacks.c:8233 src/callbacks.c:8276 src/callbacks.c:10708
+#: src/callbacks.c:6588 src/callbacks.c:6628 src/callbacks.c:8412
+#: src/callbacks.c:8454 src/callbacks.c:8497 src/callbacks.c:10899
 msgid "Cancelling"
 msgstr "正在取消"
 
-#: src/callbacks.c:6500 src/callbacks.c:8342
-#, c-format
-msgid "New audio: %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/callbacks.c:6528 src/callbacks.c:8318 src/callbacks.c:10738
-#: src/callbacks.c:11415
+#: src/callbacks.c:6676 src/callbacks.c:8539 src/callbacks.c:10929
+#: src/callbacks.c:11620
 msgid "Committing audio"
 msgstr "提交音频"
 
-#: src/callbacks.c:6540 src/callbacks.c:8349
+#: src/callbacks.c:6688 src/callbacks.c:8571
 msgid "New Audio"
 msgstr "新的音频"
 
-#: src/callbacks.c:6773
+#: src/callbacks.c:6796
+#, c-format
+msgid ""
+"Text was saved as\n"
+"%s\n"
+msgstr ""
+
+#: src/callbacks.c:6968 src/saveplay.c:3450
 #, c-format
 msgid "%d frames are enough !\n"
 msgstr "%d个帧够了！\n"
 
-#: src/callbacks.c:6852
+#: src/callbacks.c:7074
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:6889 src/gui.c:1894
+#: src/callbacks.c:7111 src/gui.c:1936
 msgid "Fullscreen playback (f)"
 msgstr "全屏播放 (f)"
 
-#: src/callbacks.c:6891
+#: src/callbacks.c:7113
 msgid "Fullscreen playback off (f)"
 msgstr "全屏播放关 (f)"
 
-#: src/callbacks.c:7104 src/gui.c:1879
+#: src/callbacks.c:7212 src/callbacks.c:7360 src/callbacks.c:7693
+#: src/callbacks.c:7710 src/gui.c:3680 src/saveplay.c:2339 src/saveplay.c:2373
+#: src/saveplay.c:2970 src/saveplay.c:3072 src/saveplay.c:3091
+#: src/multitrack.c:8929 src/multitrack.c:10635
+#, c-format
+msgid " (%d %% scale)"
+msgstr ""
+
+#: src/callbacks.c:7214 src/callbacks.c:7362 src/callbacks.c:7695
+#: src/gui.c:3684 src/saveplay.c:2341 src/saveplay.c:2375
+#, c-format
+msgid "LiVES: - Play Window%s"
+msgstr ""
+
+#: src/callbacks.c:7326 src/gui.c:1921
 msgid "Double size (d)"
 msgstr "双倍尺寸 (d)"
 
-#: src/callbacks.c:7111
+#: src/callbacks.c:7333
 msgid "Single size (d)"
 msgstr "单倍尺寸 (d)"
 
-#: src/callbacks.c:7242 src/callbacks.c:7243
+#: src/callbacks.c:7465 src/callbacks.c:7466
 msgid "Hide the play window (s)"
 msgstr "隐藏播放窗口 (s)"
 
-#: src/callbacks.c:7252 src/gui.c:1718
+#: src/callbacks.c:7475 src/gui.c:1758
 msgid "Show the play window (s)"
 msgstr "显示播放窗口 (s)"
 
-#: src/callbacks.c:7253 src/gui.c:1868
+#: src/callbacks.c:7476 src/gui.c:1910
 msgid "Play in separate window (s)"
 msgstr "在单独的窗口中播放 (s)"
 
-#: src/callbacks.c:7329 src/gui.c:3927 src/saveplay.c:2183
+#: src/callbacks.c:7558 src/gui.c:4029 src/saveplay.c:2370
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7581
+#: src/callbacks.c:7810
 msgid "Switch continuous looping off (o)"
 msgstr "连续循环开关关闭（海外）"
 
-#: src/callbacks.c:7588 src/gui.c:1769
+#: src/callbacks.c:7817 src/gui.c:1809
 msgid "Switch continuous looping on (o)"
 msgstr "开关连续循环的（海外）"
 
-#: src/callbacks.c:7656
+#: src/callbacks.c:7872
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "音量 (%.2f)"
 
-#: src/callbacks.c:7701 src/callbacks.c:7702 src/gui.c:3560
+#: src/callbacks.c:7917 src/callbacks.c:7918 src/gui.c:3608
 msgid "Unmute the audio (z)"
 msgstr "取消静音 (z)"
 
-#: src/callbacks.c:7713 src/callbacks.c:7714 src/gui.c:1782 src/gui.c:3559
+#: src/callbacks.c:7929 src/callbacks.c:7930 src/gui.c:1822 src/gui.c:3607
 msgid "Mute the audio (z)"
 msgstr "静音 (z)"
 
-#: src/callbacks.c:7851
+#: src/callbacks.c:8067
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:7865
+#: src/callbacks.c:8081
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:7893
+#: src/callbacks.c:8109
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:7956 src/saveplay.c:805
+#: src/callbacks.c:8176 src/saveplay.c:890
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "已加载字幕文件：%s\n"
 
-#: src/callbacks.c:8025
+#: src/callbacks.c:8245
 msgid "Subtitles were erased.\n"
 msgstr "字幕已擦除。\n"
 
-#: src/callbacks.c:8037 src/callbacks.c:8385
-msgid "Select Audio File"
-msgstr "选择音频文件"
+#: src/callbacks.c:8264
+msgid "LiVES: - Select Audio File"
+msgstr ""
 
-#: src/callbacks.c:8053
+#: src/callbacks.c:8275
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "请在 工具 | 首选项 | 杂项 中设置您的光盘播放设备\n"
 
-#: src/callbacks.c:8125
+#: src/callbacks.c:8346
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8130
+#: src/callbacks.c:8351
 #, c-format
 msgid "CD track %d"
 msgstr "光盘音轨 %d"
 
-#: src/callbacks.c:8177
+#: src/callbacks.c:8398
 msgid "Opening CD track..."
 msgstr "正在打开光盘音轨..."
 
-#: src/callbacks.c:8219 src/callbacks.c:8265
+#: src/callbacks.c:8440 src/callbacks.c:8486
 msgid "Error loading CD track\n"
 msgstr "加载光盘音轨出错\n"
 
-#: src/callbacks.c:8447
-msgid "Selecting tracks"
-msgstr "选择跟踪"
-
-#: src/callbacks.c:8502
+#: src/callbacks.c:8608
 msgid "layout errors"
 msgstr "布局错误"
 
-#: src/callbacks.c:8512
+#: src/callbacks.c:8618
 msgid "Close _Window"
 msgstr "关闭_窗口"
 
-#: src/callbacks.c:8523
+#: src/callbacks.c:8629
 msgid "Clear _Errors"
 msgstr "清除_错误"
 
-#: src/callbacks.c:8534
+#: src/callbacks.c:8640
 msgid "_Delete affected layouts"
 msgstr "_删除受影响的布局"
 
-#: src/callbacks.c:9197 src/callbacks.c:9223
+#: src/callbacks.c:9375 src/callbacks.c:9420
 msgid "Resume"
 msgstr "恢复"
 
-#: src/callbacks.c:9198
+#: src/callbacks.c:9376
 msgid ""
 "\n"
 "Paused\n"
@@ -2608,27 +2600,27 @@
 "已暂停\n"
 "(点击恢复继续处理)"
 
-#: src/callbacks.c:9199 src/callbacks.c:9229
+#: src/callbacks.c:9377 src/callbacks.c:9427
 msgid "paused..."
 msgstr "暂停..."
 
-#: src/callbacks.c:9208 src/callbacks.c:9240
+#: src/callbacks.c:9404 src/callbacks.c:9438
 msgid "Pause"
 msgstr "暂停"
 
-#: src/callbacks.c:9210 src/callbacks.c:9243
+#: src/callbacks.c:9406 src/callbacks.c:9441
 msgid "resumed..."
 msgstr "恢复..."
 
-#: src/callbacks.c:9225
+#: src/callbacks.c:9422
 msgid "Keep"
 msgstr "不压缩"
 
-#: src/callbacks.c:9226
+#: src/callbacks.c:9423
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9227
+#: src/callbacks.c:9425
 msgid ""
 "\n"
 "Paused\n"
@@ -2640,30 +2632,28 @@
 "（点击保持来保留现有工作并停止）\n"
 "（点击恢复继续处理）"
 
-#: src/callbacks.c:9241
+#: src/callbacks.c:9439
 msgid "Cancel"
 msgstr "取消"
 
-#: src/callbacks.c:9378
-#, fuzzy
+#: src/callbacks.c:9574
 msgid "Stop"
-msgstr "停止(_S)"
+msgstr ""
 
-#: src/callbacks.c:9863 src/multitrack.c:12030
+#: src/callbacks.c:10071 src/multitrack.c:12806
 msgid "LiVES: Selected frame"
 msgstr "LiVES：已选择的帧"
 
-#: src/callbacks.c:9870
-#, fuzzy
+#: src/callbacks.c:10078
 msgid "_Save frame as..."
-msgstr "为保存框架%s。。。"
+msgstr ""
 
-#: src/callbacks.c:10114
+#: src/callbacks.c:10322
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10192
+#: src/callbacks.c:10399
 msgid ""
 "\n"
 "\n"
@@ -2672,7 +2662,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10198
+#: src/callbacks.c:10405
 msgid ""
 "\n"
 "\n"
@@ -2684,7 +2674,7 @@
 "您必须安装“xwininfo”，然后才能使用此功能\n"
 "\n"
 
-#: src/callbacks.c:10274 src/callbacks.c:11333
+#: src/callbacks.c:10481 src/callbacks.c:11538
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2692,7 +2682,7 @@
 "\n"
 "记录时间必须大于零。\n"
 
-#: src/callbacks.c:10285
+#: src/callbacks.c:10492
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2701,17 +2691,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10497
 msgid "External window was released.\n"
 msgstr "对外窗口被释放。\n"
 
-#: src/callbacks.c:10324
+#: src/callbacks.c:10531
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10354
+#: src/callbacks.c:10565
 #, c-format
 msgid ""
 "\n"
@@ -2721,19 +2711,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10380
+#: src/callbacks.c:10591
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES 无法捕获此窗口。对不起。\n"
 
-#: src/callbacks.c:10528
+#: src/callbacks.c:10748
 msgid "Export Selected Audio as..."
 msgstr "音频输出选择的..."
 
-#: src/callbacks.c:10531
+#: src/callbacks.c:10752
 msgid "Export Audio as..."
 msgstr "音频输出为..."
 
-#: src/callbacks.c:10573
+#: src/callbacks.c:10767
 msgid ""
 "\n"
 "\n"
@@ -2746,81 +2736,86 @@
 "此剪辑的音频播放速度已被更改。\n"
 "点击'确定'以新速度输出，或'取消'以原速度输出。\n"
 
-#: src/callbacks.c:10579
+#: src/callbacks.c:10773
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10584
+#: src/callbacks.c:10778
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10609
+#: src/callbacks.c:10804
 msgid "Exporting audio"
 msgstr "音频输出"
 
-#: src/callbacks.c:10642
-msgid "Append Audio File..."
-msgstr "附加音频文件..."
+#: src/callbacks.c:10835
+msgid "LiVES: - Append Audio File"
+msgstr ""
 
-#: src/callbacks.c:10687
+#: src/callbacks.c:10878
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10698
+#: src/callbacks.c:10889
 msgid "Appending audio"
 msgstr "正在附加音频"
 
-#: src/callbacks.c:10754
+#: src/callbacks.c:10945
 msgid "Append Audio"
 msgstr "附加音频"
 
-#: src/callbacks.c:10813
+#: src/callbacks.c:11005
+#, c-format
+msgid "Padding audio to %.2f seconds..."
+msgstr ""
+
+#: src/callbacks.c:11007
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10830
+#: src/callbacks.c:11026
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10838
+#: src/callbacks.c:11034
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:10912
+#: src/callbacks.c:11108
 msgid "Fading audio in"
 msgstr "正在淡入音频"
 
-#: src/callbacks.c:10913
+#: src/callbacks.c:11109
 msgid "Fade audio in"
 msgstr "淡入音频"
 
-#: src/callbacks.c:10918
+#: src/callbacks.c:11114
 msgid "Fading audio out"
 msgstr "正在淡出音频"
 
-#: src/callbacks.c:10919
+#: src/callbacks.c:11115
 msgid "Fade audio out"
 msgstr "淡出音频"
 
-#: src/callbacks.c:10942
+#: src/callbacks.c:11138
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10944
+#: src/callbacks.c:11140
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10951
+#: src/callbacks.c:11147
 msgid "Fading audio..."
 msgstr "淡入淡出音频..."
 
-#: src/callbacks.c:11046
+#: src/callbacks.c:11250
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2830,968 +2825,939 @@
 "删除所有音频将关闭该文件。\n"
 "你确定吗？"
 
-#: src/callbacks.c:11049
+#: src/callbacks.c:11253
 msgid "Deleting all audio..."
 msgstr "删除所有音频..."
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:11259
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11141
+#: src/callbacks.c:11346
 msgid "Deleting Audio"
 msgstr "正在删除音频"
 
-#: src/callbacks.c:11148
+#: src/callbacks.c:11353
 msgid "Delete Audio"
 msgstr "删除音频"
 
-#: src/callbacks.c:11486
+#: src/callbacks.c:11693
 msgid "Record new audio"
 msgstr "新的音频记录"
 
-#: src/callbacks.c:11570
+#: src/callbacks.c:11781
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11597
+#: src/callbacks.c:11810
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/callbacks.c:11700
-#, c-format
-msgid ""
-"\n"
-"Delete %d layout(s)...are you sure ?\n"
-msgstr ""
-
-#: src/support.c:85 src/support.c:109
+#: src/support.c:87 src/support.c:111
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "无法找到像素图文件：%s"
 
-#: src/merge.c:86
+#: src/merge.c:85
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:111
+#: src/merge.c:102
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:116
+#: src/merge.c:107
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:141
+#: src/merge.c:118
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:165
+#: src/merge.c:123
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:192
+#: src/merge.c:134
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:201
+#: src/merge.c:137
 msgid "_Insert Frames"
 msgstr "_插入帧"
 
-#: src/merge.c:215
+#: src/merge.c:143
 msgid "_Drop Frames"
 msgstr "_丢弃帧"
 
-#: src/merge.c:228
+#: src/merge.c:149
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:241
+#: src/merge.c:160
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:261
+#: src/merge.c:173
 msgid "_Transition Method:"
 msgstr "_过渡方法："
 
-#: src/merge.c:471
+#: src/merge.c:394
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:493
-#, c-format
-msgid "inserting %d extra frame(s) before merge\n"
-msgstr ""
-
-#: src/merge.c:600
-#, c-format
-msgid "now inserting %d extra frame(s)\n"
-msgstr ""
-
-#: src/merge.c:616
+#: src/merge.c:551
 msgid "Merge done.\n"
 msgstr "合并完成。\n"
 
-#: src/gui.c:123
+#: src/gui.c:133
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:134
 msgid "_Custom Effects"
 msgstr "自定义效果(_C)"
 
-#: src/gui.c:125
+#: src/gui.c:135
 msgid "Custom _Utilities"
 msgstr "自定义工具(_U)"
 
-#: src/gui.c:326 src/multitrack.c:5261
+#: src/gui.c:343 src/multitrack.c:5694
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gui.c:337 src/multitrack.c:5284
+#: src/gui.c:354 src/multitrack.c:5717
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:343
+#: src/gui.c:360
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:349 src/gui.c:353 src/multitrack.c:5301 src/multitrack.c:5317
-#: src/multitrack.c:5322
+#: src/gui.c:366 src/gui.c:370 src/multitrack.c:5734 src/multitrack.c:5750
+#: src/multitrack.c:5755
 msgid "Open _Location/Stream..."
 msgstr "打开_位置/流..."
 
-#: src/gui.c:362 src/multitrack.c:5310
+#: src/gui.c:379 src/multitrack.c:5743
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:390
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:381
+#: src/gui.c:398
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:384
+#: src/gui.c:401
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:387
+#: src/gui.c:404
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:395 src/multitrack.c:5378
+#: src/gui.c:412 src/multitrack.c:5811
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:396 src/multitrack.c:5386
+#: src/gui.c:413 src/multitrack.c:5819
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:424
+#: src/gui.c:441
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:442
+#: src/gui.c:459
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:452
+#: src/gui.c:469
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:461
+#: src/gui.c:478
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:476 src/multitrack.c:5409
+#: src/gui.c:493 src/multitrack.c:5842
 msgid "_Recent Files..."
 msgstr "_最近的文件..."
 
-#: src/gui.c:527 src/multitrack.c:5468
+#: src/gui.c:544 src/multitrack.c:5901
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:531 src/multitrack.c:5476
+#: src/gui.c:548 src/multitrack.c:5909
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:544
+#: src/gui.c:561
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:546
+#: src/gui.c:563
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:553
+#: src/gui.c:570
 msgid "_Close This Clip"
 msgstr "_关闭此影片"
 
-#: src/gui.c:566
+#: src/gui.c:583
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:592
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:588
+#: src/gui.c:605
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:593
+#: src/gui.c:610
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:603 src/multitrack.c:5515
+#: src/gui.c:620 src/multitrack.c:5948
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:611 src/multitrack.c:5548
+#: src/gui.c:628 src/multitrack.c:5981
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gui.c:653
+#: src/gui.c:670
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:666
+#: src/gui.c:683
 msgid "_Copy Selection"
 msgstr "_复制选择"
 
-#: src/gui.c:675
+#: src/gui.c:692
 msgid "Cu_t Selection"
 msgstr "_切的选择"
 
-#: src/gui.c:684
+#: src/gui.c:701
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:697
+#: src/gui.c:714
 msgid "Paste as _New"
 msgstr "粘贴为新图像(_N)"
 
-#: src/gui.c:706
+#: src/gui.c:723
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:713
+#: src/gui.c:730
 msgid "_Delete Selection"
 msgstr "删除选中区域(_D)"
 
-#: src/gui.c:731
+#: src/gui.c:748
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:741
+#: src/gui.c:758
 msgid "_Select..."
 msgstr "选择(_S)..."
 
-#: src/gui.c:754
+#: src/gui.c:771
 msgid "Select _All Frames"
 msgstr "选择_所有帧"
 
-#: src/gui.c:762
+#: src/gui.c:779
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:770
+#: src/gui.c:787
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:783
+#: src/gui.c:800
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:787
+#: src/gui.c:804
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:791
+#: src/gui.c:808
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:795
+#: src/gui.c:812
 msgid "Select Last _Effect"
 msgstr "选择最后的_影响"
 
-#: src/gui.c:799
+#: src/gui.c:816
 msgid "_Invert Selection"
 msgstr "反转选择(_I)"
 
-#: src/gui.c:807
+#: src/gui.c:824
 msgid "_Lock Selection Width"
 msgstr "锁定选区宽度(_L)"
 
-#: src/gui.c:812 src/multitrack.c:5695
+#: src/gui.c:829 src/multitrack.c:6128
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gui.c:823
+#: src/gui.c:840
 msgid "_Play All"
 msgstr "全部播放(_P)"
 
-#: src/gui.c:835
+#: src/gui.c:852
 msgid "Pla_y Selection"
 msgstr "播放选择(_Y)"
 
-#: src/gui.c:843
+#: src/gui.c:860
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:860 src/multitrack.c:5724
+#: src/gui.c:885 src/multitrack.c:6157
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gui.c:873 src/multitrack.c:5734
+#: src/gui.c:903 src/multitrack.c:6167
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:904 src/multitrack.c:5749
+#: src/gui.c:945 src/multitrack.c:6182
 msgid "_Full Screen"
 msgstr "全屏(_F)"
 
-#: src/gui.c:913
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_双倍大小"
 
-#: src/gui.c:921 src/multitrack.c:5757
+#: src/gui.c:962 src/multitrack.c:6190
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:930
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "空白背景(_B)"
 
-#: src/gui.c:937
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(自动)循环视频(以适应音轨)(_L)"
 
-#: src/gui.c:946 src/multitrack.c:5765
+#: src/gui.c:987 src/multitrack.c:6198
 msgid "L_oop Continuously"
 msgstr "持续循环(_O)"
 
-#: src/gui.c:955
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "乒乓循环(_G)"
 
-#: src/gui.c:963 src/multitrack.c:5773
+#: src/gui.c:1004 src/multitrack.c:6206
 msgid "_Mute"
 msgstr "静音(_M)"
 
-#: src/gui.c:977 src/multitrack.c:5786
+#: src/gui.c:1018 src/multitrack.c:6219
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:985
+#: src/gui.c:1026
 msgid "S_how Frame Counter"
 msgstr "显示帧计数器(_H)"
 
-#: src/gui.c:995
+#: src/gui.c:1036
 msgid "Show Subtitles"
 msgstr "显示字幕"
 
-#: src/gui.c:1005
+#: src/gui.c:1046
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1011 src/multitrack.c:5801
+#: src/gui.c:1052 src/multitrack.c:6234
 msgid "Effect_s"
 msgstr "效果(_S)"
 
-#: src/gui.c:1014
+#: src/gui.c:1055
 msgid "Effects are applied to the current selection."
 msgstr "效果应用到当前的选区。"
 
-#: src/gui.c:1026
+#: src/gui.c:1067
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1031 src/multitrack.c:6278
+#: src/gui.c:1072 src/multitrack.c:6831
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/gui.c:1034
+#: src/gui.c:1075
 msgid "Tools are applied to complete clips."
 msgstr "工具应用到剪辑完成。"
 
-#: src/gui.c:1043
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1052
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1057
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1063
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "工具(_U)"
 
-#: src/gui.c:1074 src/multitrack.c:6303
-msgid "_Generate"
-msgstr "生成(_G)"
-
-#: src/gui.c:1084
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "自定义工具(_T)"
 
-#: src/gui.c:1087
+#: src/gui.c:1115 src/multitrack.c:6856
+msgid "_Generate"
+msgstr "生成(_G)"
+
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1102
+#: src/gui.c:1140
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1107
+#: src/gui.c:1145
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1117 src/multitrack.c:6312
+#: src/gui.c:1155 src/multitrack.c:6865
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1126 src/multitrack.c:6327
+#: src/gui.c:1164 src/multitrack.c:6880
 msgid "_Preferences..."
 msgstr "偏好设置(_P)..."
 
-#: src/gui.c:1137
+#: src/gui.c:1175
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1148
+#: src/gui.c:1186
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1154
+#: src/gui.c:1192
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1155
+#: src/gui.c:1193
 msgid "E_ject CD"
 msgstr "弹出 CD(_J)"
 
-#: src/gui.c:1169
+#: src/gui.c:1207
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1180
+#: src/gui.c:1219
 msgid "to New _Clip..."
 msgstr "到新剪辑(_C)..."
 
-#: src/gui.c:1184
+#: src/gui.c:1223
 msgid "to _Selection"
 msgstr "到选区(_S)"
 
-#: src/gui.c:1194
+#: src/gui.c:1233
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1198
+#: src/gui.c:1237
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1210
+#: src/gui.c:1249
 msgid "_Export Audio..."
 msgstr "输出音频(_E)..."
 
-#: src/gui.c:1222
+#: src/gui.c:1261
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1226
+#: src/gui.c:1265
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1269
 msgid "_Append Audio..."
 msgstr "附加音频(_A)..."
 
-#: src/gui.c:1235
+#: src/gui.c:1274
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1247
+#: src/gui.c:1286
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1252
+#: src/gui.c:1291
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1296
 msgid "_Delete Audio..."
 msgstr "删除音频(_D)..."
 
-#: src/gui.c:1269
+#: src/gui.c:1308
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1273
+#: src/gui.c:1312
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1277
+#: src/gui.c:1316
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1282
+#: src/gui.c:1321
 msgid "_Resample Audio..."
 msgstr "重采样音频(_R)..."
 
-#: src/gui.c:1292
-msgid "Play _Music Using xmms..."
-msgstr ""
-
-#: src/gui.c:1296
-msgid "Random Music _Using xmms..."
-msgstr ""
-
-#: src/gui.c:1300
-msgid "Stop xmms _Playing"
-msgstr ""
-
-#: src/gui.c:1315
+#: src/gui.c:1331
 msgid "_Info"
 msgstr "信息(_I)"
 
-#: src/gui.c:1326
+#: src/gui.c:1342
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1334
+#: src/gui.c:1350
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1339
+#: src/gui.c:1355
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1348 src/multitrack.c:6436
+#: src/gui.c:1364 src/multitrack.c:6989
 msgid "Show _Messages"
 msgstr "显示消息(_M)"
 
-#: src/gui.c:1352 src/multitrack.c:6514
+#: src/gui.c:1368 src/multitrack.c:7067
 msgid "Show _Layout Errors"
 msgstr "显示布局错误(_L)"
 
-#: src/gui.c:1357 src/multitrack.c:6413
+#: src/gui.c:1373 src/multitrack.c:6966
 msgid "_Clips"
 msgstr "剪辑(_C)"
 
-#: src/gui.c:1368
+#: src/gui.c:1384
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1383
+#: src/gui.c:1399
 msgid "A_dvanced"
 msgstr "高级(_D)"
 
-#: src/gui.c:1395
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1406
+#: src/gui.c:1422
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1410
+#: src/gui.c:1426
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1414
+#: src/gui.c:1430
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1418
+#: src/gui.c:1434
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1422
+#: src/gui.c:1438
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1434
+#: src/gui.c:1450
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1443
+#: src/gui.c:1459
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1447
+#: src/gui.c:1463
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1451
+#: src/gui.c:1467
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1460
+#: src/gui.c:1476
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1505
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1473
+#: src/gui.c:1513
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1480
+#: src/gui.c:1520
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1504
+#: src/gui.c:1544
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1508
+#: src/gui.c:1548
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1513
+#: src/gui.c:1553
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1524
+#: src/gui.c:1564
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1530
+#: src/gui.c:1570
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1532
+#: src/gui.c:1572
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1534
+#: src/gui.c:1574
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1546
+#: src/gui.c:1586
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1549
+#: src/gui.c:1589
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1556
+#: src/gui.c:1596
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1559
+#: src/gui.c:1599
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1561
+#: src/gui.c:1601
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/游戏杆接口"
 
-#: src/gui.c:1575
+#: src/gui.c:1615
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/游戏杆学习者..."
 
-#: src/gui.c:1580
+#: src/gui.c:1620
 msgid "_Save device mapping..."
 msgstr "保存设备映射(_S)..."
 
-#: src/gui.c:1586
+#: src/gui.c:1626
 msgid "_Load device mapping..."
 msgstr "加载设备映射(_L)..."
 
-#: src/gui.c:1597
+#: src/gui.c:1637
 msgid "Show VJ _Keys"
 msgstr "显示 VJ 键(_K)"
 
-#: src/gui.c:1601
+#: src/gui.c:1641
 msgid "To_ys"
 msgstr "玩具(_Y)"
 
-#: src/gui.c:1612
+#: src/gui.c:1652
 msgid "_None"
 msgstr "无(_N)"
 
-#: src/gui.c:1622
+#: src/gui.c:1662
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1627
+#: src/gui.c:1667
 msgid "_Mad Frames"
 msgstr "_疯狂框架"
 
-#: src/gui.c:1632
+#: src/gui.c:1672
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES 电视(宽带)"
 
-#: src/gui.c:1642 src/multitrack.c:6536
+#: src/gui.c:1682 src/multitrack.c:7089
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: src/gui.c:1653 src/multitrack.c:6555
+#: src/gui.c:1693 src/multitrack.c:7108
 msgid "_Manual (opens in browser)"
 msgstr "手动(打开浏览器)(_M)"
 
-#: src/gui.c:1662 src/multitrack.c:6564
+#: src/gui.c:1702 src/multitrack.c:7117
 msgid "_Donate to the project !"
 msgstr "向项目捐款(_D)！"
 
-#: src/gui.c:1666 src/multitrack.c:6568
+#: src/gui.c:1706 src/multitrack.c:7121
 msgid "_Email the author"
 msgstr "给作者发邮件(_E)"
 
-#: src/gui.c:1670 src/multitrack.c:6572
+#: src/gui.c:1710 src/multitrack.c:7125
 msgid "Report a _bug"
 msgstr "报告错误(_B)"
 
-#: src/gui.c:1674 src/multitrack.c:6576
+#: src/gui.c:1714 src/multitrack.c:7129
 msgid "Suggest a _feature"
 msgstr "功能建议(_F)"
 
-#: src/gui.c:1678 src/multitrack.c:6580
+#: src/gui.c:1718 src/multitrack.c:7133
 msgid "Assist with _translating"
 msgstr "帮助翻译(_T)"
 
-#: src/gui.c:1687 src/multitrack.c:6589
+#: src/gui.c:1727 src/multitrack.c:7142
 msgid "_Troubleshoot"
 msgstr "故障诊断(_T)"
 
-#: src/gui.c:1691 src/multitrack.c:6593
+#: src/gui.c:1731 src/multitrack.c:7146
 msgid "_About"
 msgstr "关于(_A)"
 
-#: src/gui.c:1724
+#: src/gui.c:1764
 msgid "Rewind to start (w)"
 msgstr "倒带启动 (w)"
 
-#: src/gui.c:1732 src/multitrack.c:15282
+#: src/gui.c:1772 src/multitrack.c:16249
 msgid "Play all (p)"
 msgstr "播放所有 (p)"
 
-#: src/gui.c:1742 src/gui.c:1849
+#: src/gui.c:1782 src/gui.c:1891
 msgid "Stop playback (q)"
 msgstr "停止播放 (q)"
 
-#: src/gui.c:1753
+#: src/gui.c:1793
 msgid "Play selection (y)"
 msgstr "播放选区 (y)"
 
-#: src/gui.c:1798
+#: src/gui.c:1846
 msgid "Volume"
 msgstr "音量"
 
-#: src/gui.c:1826
+#: src/gui.c:1868
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1855
+#: src/gui.c:1897
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1901
+#: src/gui.c:1943
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1907
+#: src/gui.c:1949
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1914
+#: src/gui.c:1956
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1920
+#: src/gui.c:1962
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1926
+#: src/gui.c:1968
 msgid "Show clip info (i)"
 msgstr "显示剪辑信息 (i)"
 
-#: src/gui.c:1932
+#: src/gui.c:1974
 msgid "Hide this toolbar"
 msgstr "隐藏此工具栏"
 
-#: src/gui.c:1934
+#: src/gui.c:1976
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1962
+#: src/gui.c:2009
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:1981
+#: src/gui.c:2023
 msgid "Vary the video speed"
 msgstr "不同的视频播放速度"
 
-#: src/gui.c:2005
+#: src/gui.c:2047
 msgid "                                                            "
 msgstr "                                                            "
 
-#: src/gui.c:2036 src/gui.c:3092
+#: src/gui.c:2098 src/gui.c:3208
 msgid "First Frame"
 msgstr "首帧"
 
-#: src/gui.c:2111 src/gui.c:3101
+#: src/gui.c:2196 src/gui.c:3216
 msgid "Last Frame"
 msgstr "末帧"
 
-#: src/gui.c:2130
+#: src/gui.c:2213
 msgid "The first selected frame in this clip"
 msgstr "此剪辑中所选择的第一帧"
 
-#: src/gui.c:2159
+#: src/gui.c:2251
 msgid "The last selected frame in this clip"
 msgstr "此剪辑中所选择的最后一帧"
 
-#: src/gui.c:2397
+#: src/gui.c:2524
 msgid "Starting...\n"
 msgstr "正在启动...\n"
 
-#: src/gui.c:2951
+#: src/gui.c:3066
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3357
+#: src/gui.c:3489
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3373
+#: src/gui.c:3506
 msgid "_Free"
 msgstr "空闲(_F)"
 
-#: src/gui.c:3378
+#: src/gui.c:3507
 msgid "Free choice of frame number"
 msgstr "自由选择的帧号"
 
-#: src/gui.c:3402
+#: src/gui.c:3511
 msgid "_Start"
 msgstr "起始(_S)"
 
-#: src/gui.c:3407
+#: src/gui.c:3512
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3433
+#: src/gui.c:3519
 msgid "_End"
 msgstr "_结尾"
 
-#: src/gui.c:3438
+#: src/gui.c:3520
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3463
+#: src/gui.c:3527
 msgid "_Pointer"
 msgstr "指针(_P)"
 
-#: src/gui.c:3468
+#: src/gui.c:3528
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3501
+#: src/gui.c:3549
 msgid "Rewind"
 msgstr "倒回"
 
-#: src/gui.c:3512 src/dialogs.c:773 src/dialogs.c:775 src/dialogs.c:1606
-#: src/dialogs.c:1608
+#: src/gui.c:3560 src/dialogs.c:829 src/dialogs.c:831 src/dialogs.c:1746
+#: src/dialogs.c:1748
 msgid "Play all"
 msgstr "播放所有"
 
-#: src/gui.c:3525
+#: src/gui.c:3573
 msgid "Play Selection"
 msgstr "播放选择"
 
-#: src/gui.c:3539
+#: src/gui.c:3587
 msgid "Loop On/Off"
 msgstr "循环开/关"
 
-#: src/gui.c:3600
+#: src/gui.c:3661
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3606
+#: src/gui.c:3666
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3612
+#: src/gui.c:3671
 msgid "_Record Performance"
 msgstr "记录性能(_R)"
 
-#: src/gui.c:3706
+#: src/gui.c:3825
 msgid "Hide Play Window"
 msgstr "隐藏播放窗口"
 
-#: src/gui.c:4075
+#: src/gui.c:4180
 msgid "Show Play Window"
 msgstr "显示播放窗口"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:246
-#, fuzzy, c-format
+#: src/utils.c:480
+#, c-format
 msgid "%.2f EB"
-msgstr "%.2f 秒"
+msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:250
-#, fuzzy, c-format
+#: src/utils.c:484
+#, c-format
 msgid "%.2f PB"
-msgstr "%.2f 秒"
+msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:254
-#, fuzzy, c-format
+#: src/utils.c:488
+#, c-format
 msgid "%.2f TB"
-msgstr "%.2f 秒"
+msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:258
-#, fuzzy, c-format
+#: src/utils.c:492
+#, c-format
 msgid "%.2f GB"
-msgstr "%.2f 秒"
+msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:262
-#, fuzzy, c-format
+#: src/utils.c:496
+#, c-format
 msgid "%.2f MB"
-msgstr "%.2f 秒"
+msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:266
+#: src/utils.c:500
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
 
-#: src/utils.c:269
+#: src/utils.c:503
 #, c-format
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:915
+#: src/utils.c:1515
 msgid "Clearing the clipboard"
 msgstr ""
 
-#: src/utils.c:951
+#: src/utils.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -3799,7 +3765,7 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:957
+#: src/utils.c:1557
 msgid ""
 "\n"
 "==============================\n"
@@ -3809,74 +3775,74 @@
 "==============================\n"
 "切换到空剪辑\n"
 
-#: src/utils.c:995
+#: src/utils.c:1595
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:998
+#: src/utils.c:1598
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1006
+#: src/utils.c:1606
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1010
+#: src/utils.c:1610
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1015
+#: src/utils.c:1615
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1020
+#: src/utils.c:1620
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1025
+#: src/utils.c:1625
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1030
+#: src/utils.c:1630
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1035
+#: src/utils.c:1635
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1040
+#: src/utils.c:1640
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1207
+#: src/utils.c:1807
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3884,7 +3850,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:1214
+#: src/utils.c:1814
 #, c-format
 msgid ""
 "\n"
@@ -3892,7 +3858,7 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1254
+#: src/utils.c:1854
 msgid ""
 "\n"
 "Set names may not be blank.\n"
@@ -3900,29 +3866,26 @@
 "\n"
 "设置名称可能不能为空。\n"
 
-#: src/utils.c:1259
-#, fuzzy
+#: src/utils.c:1859
 msgid ""
 "\n"
 "Set names may not be longer than 128 characters.\n"
 msgstr ""
-"\n"
-"设置名称可能不能为空。\n"
 
-#: src/utils.c:1264
+#: src/utils.c:1864
 #, c-format
 msgid ""
 "\n"
 "Set names may not contain spaces or the characters%s.\n"
 msgstr ""
 
-#: src/utils.c:1272
+#: src/utils.c:1872
 msgid ""
 "\n"
 "Set names may not start with a '.' or contain '..'\n"
 msgstr ""
 
-#: src/utils.c:1287
+#: src/utils.c:1887
 #, c-format
 msgid ""
 "\n"
@@ -3930,68 +3893,68 @@
 "Please choose another set name.\n"
 msgstr ""
 
-#: src/utils.c:1591
+#: src/utils.c:2233
 #, c-format
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:1988
+#: src/utils.c:2667
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:1992
+#: src/utils.c:2671
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:1996
+#: src/utils.c:2675
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:1999
+#: src/utils.c:2678
 msgid "(No video)"
 msgstr "（无视频）"
 
-#: src/utils.c:2006
+#: src/utils.c:2685
 msgid "(No audio)"
 msgstr "（无音频）"
 
-#: src/utils.c:2011
+#: src/utils.c:2690
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:2014
+#: src/utils.c:2693
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2019
+#: src/utils.c:2698
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2022
+#: src/utils.c:2701
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2030
+#: src/utils.c:2709
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:2033
+#: src/utils.c:2712
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:2514
+#: src/utils.c:3145
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:2725
+#: src/utils.c:3396
 msgid "Cleaning up clip"
 msgstr "清理剪辑"
 
-#: src/utils.c:2855
+#: src/utils.c:3524
 #, c-format
 msgid ""
 "\n"
@@ -4001,53 +3964,64 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:3263 src/utils.c:3295 src/multitrack.c:3987
+#: src/utils.c:3916 src/utils.c:3948 src/multitrack.c:4239
 #, c-format
 msgid "_Undo %s"
 msgstr "撤消 %s(_U)"
 
-#: src/utils.c:3264 src/utils.c:3296 src/multitrack.c:4009
+#: src/utils.c:3917 src/utils.c:3949 src/multitrack.c:4261
 #, c-format
 msgid "_Redo %s"
 msgstr "重做 %s(_R)"
 
-#: src/utils.c:3321
+#: src/utils.c:3974
 msgid "-------------Selection------------"
 msgstr "-------------选择------------"
 
 #. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:3329
+#: src/utils.c:3982
 msgid " frames ] ----------"
 msgstr " 帧 ] ----------"
 
-#: src/saveplay.c:158
+#: src/utils.c:4964
+msgid ""
+"Your version of mplayer/ffmpeg may be broken !\n"
+"See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
+"\n"
+"You can work around this temporarily by switching to jpeg output in "
+"Preferences/Decoding.\n"
+"\n"
+"Try running Help/Troubleshoot for more information."
+msgstr ""
+
+#: src/saveplay.c:171
 msgid "Examining file header"
 msgstr "检查文件头"
 
-#: src/saveplay.c:292 src/saveplay.c:659
+#: src/saveplay.c:308 src/saveplay.c:713
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
-#: src/saveplay.c:295
+#: src/saveplay.c:311
 #, c-format
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:303 src/saveplay.c:3574
+#: src/saveplay.c:319 src/saveplay.c:3822
 msgid " without sound"
 msgstr " 无声"
 
-#: src/saveplay.c:361
+#: src/saveplay.c:385
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:541
+#: src/saveplay.c:595
 #, c-format
 msgid ""
 "\n"
@@ -4059,11 +4033,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:555
+#: src/saveplay.c:609
 msgid " - please be patient."
 msgstr " - 请耐心等待。"
 
-#: src/saveplay.c:782
+#: src/saveplay.c:862
 msgid ""
 "\n"
 "\n"
@@ -4071,7 +4045,7 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:785
+#: src/saveplay.c:865
 msgid ""
 "\n"
 "\n"
@@ -4081,7 +4055,7 @@
 "\n"
 "您可能需要安装 mplayer 才能打开这个文件。\n"
 
-#: src/saveplay.c:788
+#: src/saveplay.c:868
 msgid ""
 "\n"
 "\n"
@@ -4089,32 +4063,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:847
-#, fuzzy
+#: src/saveplay.c:932
 msgid "Adding image..."
-msgstr "淡入淡出音频..."
+msgstr ""
 
-#: src/saveplay.c:934
+#: src/saveplay.c:1022
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1018
-#, fuzzy, c-format
+#: src/saveplay.c:1106
+#, c-format
 msgid "LiVES: Save Frame %d as..."
-msgstr "为保存框架%s。。。"
+msgstr ""
 
-#: src/saveplay.c:1021
-#, fuzzy
+#: src/saveplay.c:1109
 msgid "LiVES: Save Frame as..."
-msgstr "为保存框架%s。。。"
+msgstr ""
 
-#: src/saveplay.c:1125
-#, fuzzy
+#: src/saveplay.c:1218
 msgid "LiVES: Save Clip as..."
-msgstr "LiVES: - 重命名剪辑"
+msgstr ""
 
-#: src/saveplay.c:1197
+#: src/saveplay.c:1286
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4122,66 +4093,62 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1242
-msgid "selection"
-msgstr "选区"
-
-#: src/saveplay.c:1330 src/saveplay.c:1464
+#: src/saveplay.c:1484 src/saveplay.c:1605
 msgid "Linking selection"
 msgstr "连接选区"
 
-#: src/saveplay.c:1514
+#: src/saveplay.c:1646
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1522
+#: src/saveplay.c:1653
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1526
+#: src/saveplay.c:1657
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1673
+#: src/saveplay.c:1776
 msgid "Saving [can take a long time]"
 msgstr "保存[可能需要较长时间]"
 
-#: src/saveplay.c:1769
+#: src/saveplay.c:1924
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:1800
+#: src/saveplay.c:1955
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:1883
-#, fuzzy, c-format
+#: src/saveplay.c:2060
+#, c-format
 msgid "File size was %s\n"
-msgstr "文件大小"
+msgstr ""
 
-#: src/saveplay.c:1977
+#: src/saveplay.c:2156
 msgid "recording aborted by preview.\n"
 msgstr "记录被预览中止。\n"
 
-#: src/saveplay.c:1981
+#: src/saveplay.c:2160
 msgid "recording aborted by clipboard playback.\n"
 msgstr "记录被剪贴板回放中止。\n"
 
-#: src/saveplay.c:1984
+#: src/saveplay.c:2163
 msgid "Recording performance..."
 msgstr "记录性能..."
 
-#: src/saveplay.c:2939
+#: src/saveplay.c:3144
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:2945
+#: src/saveplay.c:3150
 msgid ""
 "\n"
 "\n"
@@ -4190,16 +4157,16 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3102
+#: src/saveplay.c:3312
 msgid "Unknown"
 msgstr "未知"
 
-#: src/saveplay.c:3203 src/saveplay.c:4152
+#: src/saveplay.c:3421 src/saveplay.c:4402
 #, c-format
 msgid "Untitled%d"
 msgstr "未命名%d"
 
-#: src/saveplay.c:3237
+#: src/saveplay.c:3465
 #, c-format
 msgid ""
 "\n"
@@ -4207,7 +4174,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3325
+#: src/saveplay.c:3555
 #, c-format
 msgid ""
 "\n"
@@ -4215,68 +4182,63 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3337
+#: src/saveplay.c:3567
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3353
+#: src/saveplay.c:3586
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3357 src/saveplay.c:4324
+#: src/saveplay.c:3590 src/saveplay.c:4579
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3361 src/saveplay.c:4328
+#: src/saveplay.c:3594 src/saveplay.c:4583
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3364 src/saveplay.c:4331
-#, c-format
-msgid "%s %d Hz %d channel(s) %d bps\n"
-msgstr ""
-
-#: src/saveplay.c:3372
+#: src/saveplay.c:3606
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3477
+#: src/saveplay.c:3718
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3569
+#: src/saveplay.c:3817
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:3621
+#: src/saveplay.c:3870
 msgid "Backing up"
 msgstr "备份"
 
-#: src/saveplay.c:3654
+#: src/saveplay.c:3904
 msgid "performance data was backed up..."
 msgstr "性能数据备份..."
 
-#: src/saveplay.c:4227
+#: src/saveplay.c:4478
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4254
+#: src/saveplay.c:4509
 msgid "Restoring"
 msgstr "还原中"
 
-#: src/saveplay.c:4276
+#: src/saveplay.c:4531
 #, c-format
 msgid ""
 "\n"
@@ -4286,22 +4248,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:4785
+#: src/saveplay.c:5024
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:4791
+#: src/saveplay.c:5030
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:4794
+#: src/saveplay.c:5033
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:4819
+#: src/saveplay.c:5058
 #, c-format
 msgid ""
 "\n"
@@ -4309,70 +4271,66 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:4963
+#: src/saveplay.c:5218
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:4983
+#: src/saveplay.c:5238
 msgid "Recovering files"
 msgstr "恢复文件"
 
-#: src/saveplay.c:4985
+#: src/saveplay.c:5240
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:70
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "显示受影响的布局(_L)"
 
-#: src/dialogs.c:140
-#, fuzzy
+#: src/dialogs.c:124
 msgid "_Recover disk space"
-msgstr "结算磁盘空间"
+msgstr ""
 
-#: src/dialogs.c:155
+#: src/dialogs.c:139
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:193
+#: src/dialogs.c:179
 msgid "LiVES: - Warning !"
 msgstr ""
 
-#: src/dialogs.c:194
+#: src/dialogs.c:181
 msgid "warning"
 msgstr "警告"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:190
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:203
+#: src/dialogs.c:192
 msgid "question"
 msgstr ""
 
-#: src/dialogs.c:211
-#, fuzzy
+#: src/dialogs.c:201
 msgid "LiVES: - File Error"
-msgstr "LiVES 音频错误。"
+msgstr ""
 
-#: src/dialogs.c:212
-#, fuzzy
+#: src/dialogs.c:203
 msgid "File Error"
-msgstr "清除_错误"
+msgstr ""
 
-#: src/dialogs.c:214
-#, fuzzy
+#: src/dialogs.c:206
 msgid "_Abort"
-msgstr "关于(_A)"
+msgstr ""
 
-#: src/dialogs.c:220
+#: src/dialogs.c:211
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:473
+#: src/dialogs.c:527
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4383,7 +4341,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:491
+#: src/dialogs.c:545
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4395,11 +4353,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:503
+#: src/dialogs.c:557
 msgid "Audio players cannot be switched during playback."
 msgstr "音频播放器不能播放过程中进行切换。"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:562
 msgid ""
 "\n"
 "\n"
@@ -4407,46 +4365,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:631
+#: src/dialogs.c:687
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:814
+#: src/dialogs.c:872
 #, c-format
 msgid ""
 "\n"
-"%d%% done. Time remaining: %u sec\n"
+"%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1148
+#: src/dialogs.c:1268
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1270
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1154
+#: src/dialogs.c:1274
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1724
+#: src/dialogs.c:1863
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1781
+#: src/dialogs.c:1919
 #, c-format
 msgid ""
 "\n"
@@ -4454,7 +4412,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:1925
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4466,14 +4424,14 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:1805
+#: src/dialogs.c:1941
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1810
+#: src/dialogs.c:1946
 msgid ""
 "\n"
 "\n"
@@ -4481,19 +4439,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:1815
+#: src/dialogs.c:1951
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1956
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:1827 src/dialogs.c:1925
+#: src/dialogs.c:1966 src/dialogs.c:2064
 #, c-format
 msgid ""
 "\n"
@@ -4501,49 +4459,49 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:1849
+#: src/dialogs.c:1986
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:1855 src/dialogs.c:1963 src/resample.c:845
+#: src/dialogs.c:1992 src/dialogs.c:2101 src/resample.c:850
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:1856 src/dialogs.c:1964 src/resample.c:848
+#: src/dialogs.c:1993 src/dialogs.c:2102 src/resample.c:853
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:1860 src/dialogs.c:1968 src/resample.c:853
+#: src/dialogs.c:1997 src/dialogs.c:2106 src/resample.c:858
 msgid ", little-endian"
 msgstr "，小端"
 
-#: src/dialogs.c:1861 src/dialogs.c:1969 src/resample.c:856
+#: src/dialogs.c:1998 src/dialogs.c:2107 src/resample.c:861
 msgid ", big-endian"
 msgstr "，大端"
 
-#: src/dialogs.c:1867
+#: src/dialogs.c:2004
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1875
+#: src/dialogs.c:2012
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1879
+#: src/dialogs.c:2016
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1884 src/dialogs.c:1998
+#: src/dialogs.c:2021 src/dialogs.c:2136
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1892 src/dialogs.c:1997
+#: src/dialogs.c:2029 src/dialogs.c:2135
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4551,35 +4509,35 @@
 "\n"
 "您可能希望：\n"
 
-#: src/dialogs.c:1895 src/dialogs.c:1989
+#: src/dialogs.c:2032 src/dialogs.c:2127
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:1900
+#: src/dialogs.c:2037
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:1959
+#: src/dialogs.c:2097
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:2112
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:1981
+#: src/dialogs.c:2119
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:1985
+#: src/dialogs.c:2123
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2004
+#: src/dialogs.c:2142
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4588,7 +4546,7 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2007
+#: src/dialogs.c:2145
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4598,7 +4556,7 @@
 "更改应用到的选区不会是永久的。\n"
 "\n"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:2164
 msgid ""
 "\n"
 "\n"
@@ -4607,7 +4565,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2035
+#: src/dialogs.c:2171
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4618,7 +4576,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2043
+#: src/dialogs.c:2178
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file and then "
 "write yuv4mpeg frames to it.\n"
@@ -4627,11 +4585,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2093
+#: src/dialogs.c:2228
 msgid "Show Keys"
 msgstr "显示键"
 
-#: src/dialogs.c:2094
+#: src/dialogs.c:2229
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4673,11 +4631,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2102
+#: src/dialogs.c:2237
 msgid "Multitrack Keys"
 msgstr "多轨钥匙"
 
-#: src/dialogs.c:2103
+#: src/dialogs.c:2238
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4699,17 +4657,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2119
+#: src/dialogs.c:2254
 msgid "Message History"
 msgstr "消息历史"
 
-#: src/dialogs.c:2133
+#: src/dialogs.c:2267
+#, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
-"in your ~/.lives file"
+"in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2276
 #, c-format
 msgid ""
 "\n"
@@ -4717,28 +4676,28 @@
 "LiVES could not find any rendered effect plugins.\n"
 "Please make sure you have them installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2144
+#: src/dialogs.c:2284
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2145
+#: src/dialogs.c:2285
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2155
+#: src/dialogs.c:2295
 #, c-format
 msgid ""
 "\n"
@@ -4747,7 +4706,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2302
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4755,7 +4714,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2306
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4763,7 +4722,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2310
 #, c-format
 msgid ""
 "\n"
@@ -4774,7 +4733,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2177
+#: src/dialogs.c:2317
 #, c-format
 msgid ""
 "\n"
@@ -4784,7 +4743,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2184
+#: src/dialogs.c:2324
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4792,7 +4751,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2188
+#: src/dialogs.c:2328
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4801,13 +4760,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2194
+#: src/dialogs.c:2334
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2343
 #, c-format
 msgid ""
 "\n"
@@ -4818,13 +4777,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2210
+#: src/dialogs.c:2350
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2355
 #, c-format
 msgid ""
 "\n"
@@ -4834,7 +4793,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2221
+#: src/dialogs.c:2361
 #, c-format
 msgid ""
 "\n"
@@ -4843,7 +4802,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2228
+#: src/dialogs.c:2368
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4851,7 +4810,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2232
+#: src/dialogs.c:2372
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4859,63 +4818,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2236
+#: src/dialogs.c:2376
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2238
+#: src/dialogs.c:2378
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2380
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2381
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2252
+#: src/dialogs.c:2392
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2256
+#: src/dialogs.c:2396
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2260
+#: src/dialogs.c:2400
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2264
+#: src/dialogs.c:2404
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2268
+#: src/dialogs.c:2408
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2274
+#: src/dialogs.c:2414
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2278
+#: src/dialogs.c:2418
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4923,14 +4882,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2283
+#: src/dialogs.c:2423
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2288
+#: src/dialogs.c:2428
 msgid ""
 "\n"
 "\n"
@@ -4939,25 +4898,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2292
+#: src/dialogs.c:2432
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2296
+#: src/dialogs.c:2436
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2441
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2446
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2318
+#: src/dialogs.c:2458
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4966,34 +4925,34 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2542
+#: src/dialogs.c:2646
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2549
+#: src/dialogs.c:2653
 msgid "failed.\n"
 msgstr "失败。\n"
 
-#: src/dialogs.c:2556
+#: src/dialogs.c:2660
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/dialogs.c:2560
+#: src/dialogs.c:2664
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2594 src/dialogs.c:2643 src/dialogs.c:2667
+#: src/dialogs.c:2698 src/dialogs.c:2747 src/dialogs.c:2771
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2597
+#: src/dialogs.c:2701
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2600
-#, fuzzy, c-format
+#: src/dialogs.c:2704
+#, c-format
 msgid ""
 "\n"
 "LiVES failed doing the following:\n"
@@ -5001,15 +4960,9 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 msgstr ""
-"\n"
-"LiVES 无法写入配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件及包含该文件的目录权限\n"
-"并重试。\n"
 
-#: src/dialogs.c:2646
-#, fuzzy, c-format
+#: src/dialogs.c:2750
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5017,15 +4970,9 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES 无法写入配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件及包含该文件的目录权限\n"
-"并重试。\n"
 
-#: src/dialogs.c:2670
-#, fuzzy, c-format
+#: src/dialogs.c:2774
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5033,29 +4980,18 @@
 "Please check for possible error causes.\n"
 "%s"
 msgstr ""
-"\n"
-"LiVES 无法读取配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件权限并重试。\n"
 
-#: src/dialogs.c:2714
-#, fuzzy, c-format
+#: src/dialogs.c:2818
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES 无法写入配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件及包含该文件的目录权限\n"
-"并重试。\n"
 
-#: src/dialogs.c:2718
-#, fuzzy, c-format
+#: src/dialogs.c:2822
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to write to the file\n"
@@ -5063,29 +4999,18 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES 无法写入配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件及包含该文件的目录权限\n"
-"并重试。\n"
 
-#: src/dialogs.c:2749
-#, fuzzy, c-format
+#: src/dialogs.c:2853
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
 "%s\n"
 "Please check for possible error causes.\n"
 msgstr ""
-"\n"
-"LiVES 无法读取配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件权限并重试。\n"
 
-#: src/dialogs.c:2753
-#, fuzzy, c-format
+#: src/dialogs.c:2857
+#, c-format
 msgid ""
 "\n"
 "LiVES was unable to read from the file\n"
@@ -5093,19 +5018,13 @@
 "The error was\n"
 "%s.\n"
 msgstr ""
-"\n"
-"LiVES 无法写入配置文件\n"
-"%s/.lives\n"
-"\n"
-"请检查文件及包含该文件的目录权限\n"
-"并重试。\n"
 
-#: src/dialogs.c:2821
+#: src/dialogs.c:2925
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:2839
+#: src/dialogs.c:2943
 #, c-format
 msgid ""
 "\n"
@@ -5114,7 +5033,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:2848
+#: src/dialogs.c:2952
 #, c-format
 msgid ""
 "\n"
@@ -5123,7 +5042,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2959
 #, c-format
 msgid ""
 "\n"
@@ -5132,19 +5051,22 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:2862
-#, fuzzy
+#: src/dialogs.c:2966
+#, c-format
+msgid ""
+"\n"
+"LiVES was unable to read from the directory:\n"
+"%s\n"
+msgstr ""
+
+#: src/dialogs.c:2973
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
-"\n"
-"\n"
-"设置将被删除从磁盘。\n"
-"你确定吗？\n"
 
-#: src/dialogs.c:2868
+#: src/dialogs.c:2979
 #, c-format
 msgid ""
 "\n"
@@ -5152,13 +5074,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2988
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2993
 #, c-format
 msgid ""
 "\n"
@@ -5168,27 +5090,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:2889
+#: src/dialogs.c:3000
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:3004
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:2897
+#: src/dialogs.c:3008
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:2903
+#: src/dialogs.c:3014
 #, c-format
 msgid ""
 "\n"
@@ -5197,14 +5119,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:2910
+#: src/dialogs.c:3021
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:2914
+#: src/dialogs.c:3025
 #, c-format
 msgid ""
 "\n"
@@ -5215,19 +5137,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2920
+#: src/dialogs.c:3031
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:2924
+#: src/dialogs.c:3035
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:2928
+#: src/dialogs.c:3039
 msgid ""
 "\n"
 "\n"
@@ -5235,7 +5157,7 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:2947
+#: src/dialogs.c:3059
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5243,7 +5165,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2956
+#: src/dialogs.c:3068
 #, c-format
 msgid ""
 "\n"
@@ -5255,45 +5177,43 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:2964
-#, fuzzy, c-format
+#: src/dialogs.c:3076
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Welcome to LiVES version %s !\n"
 "\n"
 msgstr ""
-"欢迎来到 LiVES 版本 %s。\n"
-"\n"
 
-#: src/dialogs.c:2970
+#: src/dialogs.c:3082
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:2974
+#: src/dialogs.c:3086
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:2978
+#: src/dialogs.c:3090
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2982
+#: src/dialogs.c:3094
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:2995
+#: src/dialogs.c:3107
 #, c-format
 msgid ""
 "\n"
@@ -5302,348 +5222,599 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:56
+#: src/effects.c:59
 msgid "generator"
 msgstr "生成器"
 
-#: src/effects.c:57
+#: src/effects.c:60
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:59
-#, fuzzy
+#: src/effects.c:62
+msgid "audio generator"
+msgstr ""
+
+#: src/effects.c:63
+msgid "Audio Generators"
+msgstr ""
+
+#: src/effects.c:65
+msgid "audio/video generator"
+msgstr ""
+
+#: src/effects.c:66
+msgid "Audio/Video Generators"
+msgstr ""
+
+#: src/effects.c:68
 msgid "data generator"
-msgstr "生成器"
+msgstr ""
 
-#: src/effects.c:60
-#, fuzzy
+#: src/effects.c:69
 msgid "Data Generators"
-msgstr "生成器"
+msgstr ""
 
-#: src/effects.c:62
+#: src/effects.c:71
+msgid "data visualiser"
+msgstr ""
+
+#: src/effects.c:72
+msgid "Data Visualisers"
+msgstr ""
+
+#: src/effects.c:74
+msgid "data processor"
+msgstr ""
+
+#: src/effects.c:75
+msgid "Data Processors"
+msgstr ""
+
+#: src/effects.c:77
+msgid "data source"
+msgstr ""
+
+#: src/effects.c:78
+msgid "Data Sources"
+msgstr ""
+
+#: src/effects.c:80
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:81
 msgid "Transitions"
 msgstr "过渡"
 
-#: src/effects.c:65
+#: src/effects.c:83
 msgid "effect"
 msgstr "特效"
 
-#. TRANSLATORS: please keep this string short
-#: src/effects.c:66 src/preferences.c:3826
+#: src/effects.c:84 src/preferences.c:3125
 msgid "Effects"
 msgstr "特效"
 
-#: src/effects.c:68
+#: src/effects.c:86 src/rfx-builder.c:191
 msgid "utility"
 msgstr "工具"
 
-#: src/effects.c:69
+#: src/effects.c:87
 msgid "Utilities"
 msgstr "工具"
 
-#: src/effects.c:71
+#: src/effects.c:89
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:90
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:74
+#: src/effects.c:92
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:93
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:77
+#: src/effects.c:95
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:96
 msgid "Splitters"
 msgstr "分隔器"
 
-#: src/effects.c:80
+#: src/effects.c:98
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:99
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:83
+#: src/effects.c:101
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:102
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:89
+#: src/effects.c:107
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:108
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:92
+#: src/effects.c:110
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:111
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:95 src/multitrack.c:9636
+#: src/effects.c:113 src/multitrack.c:10317
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:114
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:98 src/effects.c:101 src/multitrack.c:17270
+#: src/effects.c:116 src/effects.c:119 src/multitrack.c:18277
 msgid "audio"
 msgstr "音频"
 
-#: src/effects.c:99
+#: src/effects.c:117
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:120
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:104
+#: src/effects.c:122
+msgid "video"
+msgstr ""
+
+#: src/effects.c:123
+msgid "Video Effects"
+msgstr ""
+
+#: src/effects.c:125
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:105
+#: src/effects.c:126
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:107
+#: src/effects.c:128
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:129
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:110
-#, fuzzy
+#: src/effects.c:131
 msgid "audio analyser"
-msgstr "音频参数"
+msgstr ""
 
-#: src/effects.c:111
-#, fuzzy
+#: src/effects.c:132
 msgid "Audio Analysers"
-msgstr "音频参数"
+msgstr ""
 
-#: src/effects.c:115 src/plugins.c:2328
+#: src/effects.c:136 src/plugins.c:2451 src/plugins.c:2465
 msgid "unknown"
 msgstr "未知"
 
-#: src/effects.c:216
+#: src/effects.c:237
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:221
+#: src/effects.c:242
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:228
+#: src/effects.c:249
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:232
+#: src/effects.c:253
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:237
+#: src/effects.c:258
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:268
+#: src/effects.c:289
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:273
+#: src/effects.c:294
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:277
+#: src/effects.c:298
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:282
+#: src/effects.c:303
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:408 src/effects.c:475
+#: src/effects.c:455 src/effects.c:522
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:3434
+#: src/effects-weed.c:418
+msgid "integer"
+msgstr ""
+
+#: src/effects-weed.c:419
+msgid "int64"
+msgstr ""
+
+#: src/effects-weed.c:420
+msgid "boolean"
+msgstr ""
+
+#: src/effects-weed.c:421
+msgid "double"
+msgstr ""
+
+#: src/effects-weed.c:422
+msgid "string"
+msgstr ""
+
+#: src/effects-weed.c:423
+msgid "pointer"
+msgstr ""
+
+#: src/effects-weed.c:4374
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:3449
+#: src/effects-weed.c:4389
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3529
+#: src/effects-weed.c:4463
+#, c-format
+msgid "Found duplicate plugin %s"
+msgstr ""
+
+#: src/effects-weed.c:4517
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:3532 src/effects-weed.c:3853
-#, fuzzy
+#: src/effects-weed.c:4520 src/effects-weed.c:5652
 msgid "Some plugin directories"
-msgstr "包含子目录"
+msgstr ""
 
-#: src/effects-weed.c:3689
+#. TRANSLATORS: example " - LADSPA plugins -"
+#: src/effects-weed.c:4589 src/rte_window.c:1991
+#, c-format
+msgid " - %s plugins -"
+msgstr ""
+
+#: src/effects-weed.c:4788
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:4415
+#: src/effects-weed.c:4953
+#, c-format
+msgid "Invalid compound effect %s - has conflicting target_fps\n"
+msgstr ""
+
+#: src/effects-weed.c:4973
+#, c-format
+msgid "Invalid compound effect %s - has multiple transition parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:4987
+#, c-format
+msgid "Invalid compound effect %s - has multiple master volume parameters\n"
+msgstr ""
+
+#: src/effects-weed.c:5122
+#, c-format
+msgid "Invalid compound effect %s - must have >1 sub filters\n"
+msgstr ""
+
+#: src/effects-weed.c:5142
+#, c-format
+msgid "Invalid effect %s found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5157
+#, c-format
+msgid "Invalid default found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5168
+#, c-format
+msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5182
+#, c-format
+msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5209
+#, c-format
+msgid ""
+"Invalid number of values for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5243
+#, c-format
+msgid ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5276
+#, c-format
+msgid "Invalid param link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5287
+#, c-format
+msgid ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5305
+#, c-format
+msgid ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5317
+#, c-format
+msgid ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5328
+#, c-format
+msgid ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5342
+#, c-format
+msgid ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5370
+#, c-format
+msgid "Invalid channel link found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5381
+#, c-format
+msgid ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
+msgstr ""
+
+#: src/effects-weed.c:5399
+#, c-format
+msgid ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5409
+#, c-format
+msgid ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5427
+#, c-format
+msgid ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
+msgstr ""
+
+#: src/effects-weed.c:5465
+#, c-format
+msgid "Compound:%s"
+msgstr ""
+
+#: src/effects-weed.c:5552
+#, c-format
+msgid "Successfully loaded %d compound filters\n"
+msgstr ""
+
+#: src/effects-weed.c:6354
+#, c-format
+msgid "Effect %s cannot be used with this audio player.\n"
+msgstr ""
+
+#: src/effects-weed.c:6494
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:4453
+#: src/effects-weed.c:6562
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5006
+#: src/effects-weed.c:7280
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:5067
+#: src/effects-weed.c:7377
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6147
+#: src/effects-weed.c:8603
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/framedraw.c:131
-msgid "You can click in Preview to change these values"
+#: src/effects-data.c:2740
+#, c-format
+msgid "Key slot %d"
 msgstr ""
 
-#: src/framedraw.c:148
-msgid "_Reset Values"
+#: src/effects-data.c:2814
+msgid "Connected to -->"
 msgstr ""
 
-#: src/framedraw.c:249
-msgid "    _Frame"
+#: src/effects-data.c:2829
+msgid "Alpha Channel Connections"
 msgstr ""
 
-#: src/paramspecial.c:274
-msgid "Maintain aspect ratio of original frame"
+#: src/effects-data.c:2897
+msgid "Parameter Data Connections"
 msgstr ""
 
-#: src/paramspecial.c:277
-msgid "Maintain _Aspect Ratio"
+#: src/effects-data.c:2904
+msgid "Autoscale All"
 msgstr ""
 
-#: src/paramspecial.c:325
-msgid "LiVES: Select file"
+#: src/effects-data.c:2971
+msgid "Autoscale"
 msgstr ""
 
-#: src/paramspecial.c:356
-msgid "Display Password"
+#: src/effects-data.c:3342
+msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/paramwindow.c:360
-msgid "Transition _In"
+#: src/effects-data.c:3351
+msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/paramwindow.c:365
-msgid "Transition in"
+#: src/effects-data.c:3363
+msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/paramwindow.c:393
-msgid "Check the box to make audio transition with the video"
+#: src/effects-data.c:3373
+msgid "Disconnect All"
+msgstr ""
+
+#: src/effects-data.c:3426
+msgid "Input channel is already connected"
+msgstr ""
+
+#: src/effects-data.c:3433
+msgid "Input parameter is already connected"
+msgstr ""
+
+#: src/effects-data.c:3440
+msgid "Input and output parameters are not compatible"
+msgstr ""
+
+#: src/framedraw.c:156
+msgid "You can click in Preview to change these values"
+msgstr ""
+
+#: src/framedraw.c:170
+msgid "_Reset Values"
+msgstr ""
+
+#: src/framedraw.c:267
+msgid "_Frame"
+msgstr ""
+
+#: src/paramspecial.c:264
+msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramwindow.c:396
+#: src/paramspecial.c:265
+msgid "Maintain aspect ratio of original frame"
+msgstr ""
+
+#: src/paramspecial.c:339
+msgid "Display Password"
+msgstr ""
+
+#: src/paramwindow.c:436
+msgid "Transition _In"
+msgstr ""
+
+#: src/paramwindow.c:456
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:430
-msgid "Transition _Out"
+#: src/paramwindow.c:457
+msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:435
-msgid "Transition out"
+#: src/paramwindow.c:475
+msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:541
 msgid "Target _FPS (plugin may override this)"
 msgstr ""
 
-#: src/paramwindow.c:532
+#: src/paramwindow.c:564
 #, c-format
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:536
+#: src/paramwindow.c:568
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:548 src/plugins.c:953
+#: src/paramwindow.c:587 src/plugins.c:993
 msgid "_Width"
 msgstr "宽度(_W)"
 
-#: src/paramwindow.c:576 src/plugins.c:968
+#: src/paramwindow.c:606 src/plugins.c:999
 msgid "_Height"
 msgstr "高度(_H)"
 
-#: src/paramwindow.c:649
+#: src/paramwindow.c:654
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:654
+#: src/paramwindow.c:656
 msgid "Generate frames to the clipboard"
 msgstr ""
 
-#: src/paramwindow.c:670
+#: src/paramwindow.c:663
 msgid "Generate to _New Clip"
 msgstr ""
 
-#: src/paramwindow.c:675
+#: src/paramwindow.c:665
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:798
+#: src/paramwindow.c:786
 #, c-format
 msgid ""
 "\n"
@@ -5651,74 +5822,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:891 src/paramwindow.c:901
+#: src/paramwindow.c:881 src/paramwindow.c:891
 msgid "Set as default"
 msgstr "设置为默认"
 
-#: src/paramwindow.c:893 src/paramwindow.c:905
+#: src/paramwindow.c:883 src/paramwindow.c:898
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:903 src/rte_window.c:1496 src/omc-learn.c:1365
+#: src/paramwindow.c:893 src/rte_window.c:2281 src/omc-learn.c:1352
 msgid "Close _window"
 msgstr "关闭窗口(_W)"
 
-#: src/paramwindow.c:1254
+#: src/paramwindow.c:1296
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1335
+#: src/paramwindow.c:1373
 msgid "Invalid parameter"
 msgstr "无效参数"
 
-#: src/paramwindow.c:1519
+#: src/paramwindow.c:1555
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1523
+#: src/paramwindow.c:1560
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1538
-#, fuzzy
+#: src/paramwindow.c:1572
 msgid "_Red"
-msgstr "重做(_R)"
+msgstr ""
 
-#: src/paramwindow.c:1539
+#: src/paramwindow.c:1573
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1540
-#, fuzzy
+#: src/paramwindow.c:1576
 msgid "_Green"
-msgstr "绿"
+msgstr ""
 
-#: src/paramwindow.c:1541
+#: src/paramwindow.c:1577
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1542
-#, fuzzy
+#: src/paramwindow.c:1580
 msgid "_Blue"
-msgstr "蓝"
+msgstr ""
 
-#: src/paramwindow.c:1543
+#: src/paramwindow.c:1581
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:80
+#: src/plugins.c:85
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:82
+#: src/plugins.c:87
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:328
+#: src/plugins.c:388
 #, c-format
 msgid ""
 "\n"
@@ -5728,17 +5896,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:334
+#: src/plugins.c:398
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:389
+#: src/plugins.c:453
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:445
+#: src/plugins.c:514
 #, c-format
 msgid ""
 "\n"
@@ -5748,32 +5916,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:782
+#: src/plugins.c:852
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:900
-msgid "Fixed framerate for plugin.\n"
-msgstr ""
-
-#: src/plugins.c:902
+#: src/plugins.c:958
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:994
-msgid "Colourspace input to the plugin.\n"
+#: src/plugins.c:959
+msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:996
+#: src/plugins.c:1028
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1081
+#: src/plugins.c:1029
+msgid "Colourspace input to the plugin.\n"
+msgstr ""
+
+#: src/plugins.c:1085
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1162
+#: src/plugins.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -5782,14 +5950,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1198
-#, c-format
-msgid ""
-"Video playback plugin failed to initialise.\n"
-"Error was: %s\n"
-msgstr ""
-
-#: src/plugins.c:1211
+#: src/plugins.c:1248
 #, c-format
 msgid ""
 "\n"
@@ -5799,40 +5960,47 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1374
+#: src/plugins.c:1261
+#, c-format
+msgid ""
+"Video playback plugin failed to initialise.\n"
+"Error was: %s\n"
+msgstr ""
+
+#: src/plugins.c:1457
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1378
+#: src/plugins.c:1461
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1484
+#: src/plugins.c:1567
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1492
+#: src/plugins.c:1575
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1530
+#: src/plugins.c:1612
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
 "plugins installed in\n"
 "%s%s%s\n"
-"or change the value of <lib_dir> in ~/.lives\n"
+"or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1537
+#: src/plugins.c:1620
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5841,11 +6009,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:1945
+#: src/plugins.c:2028
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2269
+#: src/plugins.c:2392
 #, c-format
 msgid ""
 "\n"
@@ -5854,7 +6022,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2292
+#: src/plugins.c:2415
 #, c-format
 msgid ""
 "\n"
@@ -5864,192 +6032,176 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2333
+#: src/plugins.c:2456
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2446
+#: src/plugins.c:2543
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2466
+#: src/plugins.c:2561
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2544
+#: src/plugins.c:2618
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3635
+#: src/plugins.c:3740
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
 
-#: src/rfx-builder.c:133
+#: src/rfx-builder.c:137
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:140
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:192
+#: src/rfx-builder.c:170
 msgid "Type:"
 msgstr "类型:"
 
-#: src/rfx-builder.c:206
-msgid "Effect -"
-msgstr ""
-
-#: src/rfx-builder.c:221
-msgid "Transition -"
-msgstr ""
-
-#: src/rfx-builder.c:235
-msgid "Generator -"
+#: src/rfx-builder.c:188
+msgid "tool"
 msgstr ""
 
-#: src/rfx-builder.c:248
-msgid "Tool -"
-msgstr ""
-
-#: src/rfx-builder.c:262
-msgid "Utility -"
-msgstr ""
-
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:196
 msgid "Name:          "
 msgstr ""
 
-#: src/rfx-builder.c:292
+#: src/rfx-builder.c:197
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:205
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:313
+#: src/rfx-builder.c:207
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:214
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:328
+#: src/rfx-builder.c:215
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:337
+#: src/rfx-builder.c:221
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:348
+#: src/rfx-builder.c:222
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:357
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:368
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:382
+#: src/rfx-builder.c:243
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:394
+#: src/rfx-builder.c:245
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:400
+#: src/rfx-builder.c:250
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:413
+#: src/rfx-builder.c:253
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:422
+#: src/rfx-builder.c:264
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:426
+#: src/rfx-builder.c:267
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:432
+#: src/rfx-builder.c:271
 msgid "_Properties..."
 msgstr "文档选项(_P)..."
 
-#: src/rfx-builder.c:436
+#: src/rfx-builder.c:274
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:442
+#: src/rfx-builder.c:278
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:446
+#: src/rfx-builder.c:281
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:452
+#: src/rfx-builder.c:285
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:456
+#: src/rfx-builder.c:288
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:466
-msgid "Language code:"
-msgstr "语言代码："
+#: src/rfx-builder.c:294
+msgid "_Language code:"
+msgstr ""
 
-#: src/rfx-builder.c:485
+#: src/rfx-builder.c:295
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:491
+#: src/rfx-builder.c:304
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:495
+#: src/rfx-builder.c:307
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:501
+#: src/rfx-builder.c:311
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:505
+#: src/rfx-builder.c:314
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:511
+#: src/rfx-builder.c:318
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:515
+#: src/rfx-builder.c:321
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:521
+#: src/rfx-builder.c:325
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:525
+#: src/rfx-builder.c:328
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:627
+#: src/rfx-builder.c:425
 #, c-format
 msgid ""
 "\n"
@@ -6059,55 +6211,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:750
+#: src/rfx-builder.c:549
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:754
+#: src/rfx-builder.c:553
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:758
+#: src/rfx-builder.c:557
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:762
+#: src/rfx-builder.c:561
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:842
+#: src/rfx-builder.c:627
 msgid "_New Entry"
 msgstr "新条目(_N)"
 
-#: src/rfx-builder.c:846
+#: src/rfx-builder.c:630
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:850
+#: src/rfx-builder.c:633
 msgid "_Remove Entry"
 msgstr "删除条目(_R)"
 
-#: src/rfx-builder.c:855
+#: src/rfx-builder.c:637
 msgid "Move _Up"
 msgstr "向上移动(_U)"
 
-#: src/rfx-builder.c:859
+#: src/rfx-builder.c:640
 msgid "Move _Down"
 msgstr "向下移动(_D)"
 
-#: src/rfx-builder.c:1198
+#: src/rfx-builder.c:968
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1225
+#: src/rfx-builder.c:977
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1244
+#: src/rfx-builder.c:988
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1824
+#: src/rfx-builder.c:1727
 msgid ""
 "\n"
 "\n"
@@ -6116,7 +6268,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1852
+#: src/rfx-builder.c:1755
 msgid ""
 "\n"
 "\n"
@@ -6124,231 +6276,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1926
+#: src/rfx-builder.c:1838
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1929
+#: src/rfx-builder.c:1841
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1954
+#: src/rfx-builder.c:1857
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:1970
+#: src/rfx-builder.c:1860
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:1979
+#: src/rfx-builder.c:1866
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:1995
+#: src/rfx-builder.c:1869
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2003
-msgid "Button _Group: "
-msgstr ""
-
-#: src/rfx-builder.c:2016
-msgid "A non-zero value can be used to group radio buttons."
-msgstr ""
-
-#: src/rfx-builder.c:2024
+#: src/rfx-builder.c:1880
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2046
+#: src/rfx-builder.c:1881
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2079
+#: src/rfx-builder.c:1914
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2107
+#: src/rfx-builder.c:1923 src/rfx-builder.c:2318 src/rfx-builder.c:2336
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2130
+#: src/rfx-builder.c:1939
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2174
+#: src/rfx-builder.c:1973
+msgid "Button _Group: "
+msgstr ""
+
+#: src/rfx-builder.c:1975
+msgid "A non-zero value can be used to group radio buttons."
+msgstr ""
+
+#: src/rfx-builder.c:1983 src/rfx-builder.c:2319
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2195
+#: src/rfx-builder.c:1989 src/rfx-builder.c:2320
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2217
+#: src/rfx-builder.c:1998
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2232
+#: src/rfx-builder.c:2001
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2242
-msgid "_Wrap: "
+#: src/rfx-builder.c:2012
+msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2259
+#: src/rfx-builder.c:2013
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2525
+#: src/rfx-builder.c:2311
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2532 src/rfx-builder.c:2605
-msgid "Default value:    "
-msgstr ""
-
-#: src/rfx-builder.c:2533
-msgid "Minimum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2534
-msgid "Maximum value: "
-msgstr ""
-
-#: src/rfx-builder.c:2623
+#: src/rfx-builder.c:2353
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2624
+#: src/rfx-builder.c:2354
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2625
+#: src/rfx-builder.c:2355
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2643
+#: src/rfx-builder.c:2379
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2645
+#: src/rfx-builder.c:2381
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2646
+#: src/rfx-builder.c:2382
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2686
+#: src/rfx-builder.c:2417
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2689
+#: src/rfx-builder.c:2420
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2739
-msgid "Keyword:         "
+#: src/rfx-builder.c:2463
+msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2768
-msgid "Special Type:         "
+#: src/rfx-builder.c:2480
+msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2797
-msgid "Special Subtype:         "
+#: src/rfx-builder.c:2497
+msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2825 src/rfx-builder.c:2893
+#: src/rfx-builder.c:2508 src/rfx-builder.c:2547
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2920
+#: src/rfx-builder.c:2573
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2935
+#: src/rfx-builder.c:2590
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2938
+#: src/rfx-builder.c:2593
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2963
+#: src/rfx-builder.c:2618
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2966
+#: src/rfx-builder.c:2621
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2990
+#: src/rfx-builder.c:2649
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:3129
+#: src/rfx-builder.c:2731
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3136
+#: src/rfx-builder.c:2738
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3143
+#: src/rfx-builder.c:2745
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:3156
+#: src/rfx-builder.c:2758
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:3169
+#: src/rfx-builder.c:2771
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3289
+#: src/rfx-builder.c:2882
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3294
+#: src/rfx-builder.c:2887
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3299
+#: src/rfx-builder.c:2892
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3305
+#: src/rfx-builder.c:2898
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3310
+#: src/rfx-builder.c:2903
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3319 src/rfx-builder.c:4558
+#: src/rfx-builder.c:2912 src/rfx-builder.c:4165
 msgid ""
 "\n"
 "\n"
@@ -6356,28 +6496,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3326
+#: src/rfx-builder.c:2919
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3332
+#: src/rfx-builder.c:2925
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3345
+#: src/rfx-builder.c:2938
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3351
+#: src/rfx-builder.c:2944
 msgid ""
 "\n"
 "\n"
@@ -6386,41 +6526,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3396
+#: src/rfx-builder.c:2997
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3697
+#: src/rfx-builder.c:3303
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3704 src/rfx-builder.c:3713
+#: src/rfx-builder.c:3310 src/rfx-builder.c:3319
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3725
+#: src/rfx-builder.c:3331
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3733
+#: src/rfx-builder.c:3339
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3742
+#: src/rfx-builder.c:3348
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3756
+#: src/rfx-builder.c:3362
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3760
+#: src/rfx-builder.c:3366
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3923
+#: src/rfx-builder.c:3528
 #, c-format
 msgid ""
 "\n"
@@ -6430,27 +6570,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4072
+#: src/rfx-builder.c:3685
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:4073
+#: src/rfx-builder.c:3686
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:4080
+#: src/rfx-builder.c:3694
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4082
+#: src/rfx-builder.c:3698
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:4086
+#: src/rfx-builder.c:3704
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:4109 src/rfx-builder.c:4116
+#: src/rfx-builder.c:3731 src/rfx-builder.c:3738
 #, c-format
 msgid ""
 "\n"
@@ -6459,7 +6599,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4154
+#: src/rfx-builder.c:3777
 #, c-format
 msgid ""
 "\n"
@@ -6469,12 +6609,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:4161
+#: src/rfx-builder.c:3786
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4170
+#: src/rfx-builder.c:3806
 #, c-format
 msgid ""
 "\n"
@@ -6484,7 +6624,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4197
+#: src/rfx-builder.c:3842
 #, c-format
 msgid ""
 "\n"
@@ -6494,12 +6634,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4206
+#: src/rfx-builder.c:3853
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4219 src/rfx-builder.c:4605
+#: src/rfx-builder.c:3870
 #, c-format
 msgid ""
 "\n"
@@ -6507,23 +6647,23 @@
 "Failed to move the plugin script from\n"
 "%s to\n"
 "%s\n"
-"Return code was %d\n"
-msgstr ""
-
-#: src/rfx-builder.c:4234
-msgid "Import Script from..."
+"Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4250
-msgid "Export Script to..."
+#: src/rfx-builder.c:3896
+msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4272 src/rfx-builder.c:4346
+#: src/rfx-builder.c:3903 src/rfx-builder.c:3982
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4338
+#: src/rfx-builder.c:3931
+msgid "LiVES: Import Script from..."
+msgstr ""
+
+#: src/rfx-builder.c:3974
 #, c-format
 msgid ""
 "\n"
@@ -6533,55 +6673,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4407 src/rfx-builder.c:4565 src/rfx-builder.c:4633
-msgid "Builtin"
-msgstr "内置"
-
-#: src/rfx-builder.c:4408 src/rfx-builder.c:4567 src/rfx-builder.c:4637
-msgid "Custom"
-msgstr "自定义"
-
-#: src/rfx-builder.c:4409 src/rfx-builder.c:4641
-msgid "Test"
-msgstr "测试"
-
-#: src/rfx-builder.c:4434
+#: src/rfx-builder.c:4075
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4436
-msgid "From type:    "
+#: src/rfx-builder.c:4077
+msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4455
+#: src/rfx-builder.c:4084
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4464
+#: src/rfx-builder.c:4093
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4465
+#: src/rfx-builder.c:4094
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4470
+#: src/rfx-builder.c:4099
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4471
+#: src/rfx-builder.c:4100
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4504
+#: src/rfx-builder.c:4120
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4507
+#: src/rfx-builder.c:4123
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4589
+#: src/rfx-builder.c:4198
 msgid ""
 "\n"
 "\n"
@@ -6589,26 +6717,37 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4599
+#: src/rfx-builder.c:4210
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4789
+#: src/rfx-builder.c:4216
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Failed to move the plugin script from\n"
+"%s to\n"
+"%s\n"
+"Return code was %d\n"
+msgstr ""
+
+#: src/rfx-builder.c:4431
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4839
+#: src/rfx-builder.c:4481
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4944
+#: src/rfx-builder.c:4586
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:348
+#: src/preferences.c:357
 msgid ""
 "\n"
 "\n"
@@ -6616,7 +6755,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:397
+#: src/preferences.c:406
 msgid ""
 "\n"
 "\n"
@@ -6624,42 +6763,44 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:401
-#, fuzzy, c-format
+#: src/preferences.c:410
+#, c-format
 msgid ""
 "\n"
 "\n"
 "\n"
 "(Free space = %s)"
 msgstr ""
-"创建目录\n"
-"%s\n"
-"?\n"
-"\n"
-"(剩余空间 = %.2f GB)"
 
-#: src/preferences.c:405
+#: src/preferences.c:414
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
-"\n"
-"Tip: avoid setting it inside /tmp, since frequently /tmp is cleared on "
-"system shutdown."
 msgstr ""
 
-#: src/preferences.c:682
+#: src/preferences.c:760
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
 "You may need to create it as the root user first, e.g:\n"
 "\n"
-"mkdir %s; chmod 777 %s\n"
+"sudo mkdir -p %s; sudo chmod 777 %s\n"
+"\n"
+"The directory will not be changed now.\n"
+msgstr ""
+
+#: src/preferences.c:762
+#, c-format
+msgid ""
+"Unable to create or write to the new temporary directory.\n"
+"%s\n"
+"Please try another directory or contact your system administrator.\n"
 "\n"
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:692
+#: src/preferences.c:774
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6671,20 +6812,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1085
+#: src/preferences.c:1133
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1091
+#: src/preferences.c:1139
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1118
+#: src/preferences.c:1166
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6692,790 +6833,790 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1411
+#: src/preferences.c:1461
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2035
+#: src/preferences.c:2006
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2126
+#: src/preferences.c:2085
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2136
+#: src/preferences.c:2092
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2150
+#: src/preferences.c:2101
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2159
+#: src/preferences.c:2108
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2172
+#: src/preferences.c:2116
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2124
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2194
+#: src/preferences.c:2135
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2204
+#: src/preferences.c:2145
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2215
+#: src/preferences.c:2149
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2235
+#: src/preferences.c:2153
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2300
+#: src/preferences.c:2204
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2313
+#: src/preferences.c:2212
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2328
+#: src/preferences.c:2218
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2341
+#: src/preferences.c:2224
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2354
+#: src/preferences.c:2234
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2369
-msgid "Force single monitor mode"
+#: src/preferences.c:2235
+msgid "Ignore all except the first monitor."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2391
+#: src/preferences.c:2257
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2419
+#: src/preferences.c:2272
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2438
+#: src/preferences.c:2281
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2457
+#: src/preferences.c:2287
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2477
+#: src/preferences.c:2296
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2516
+#: src/preferences.c:2321
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2532
+#: src/preferences.c:2326
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2549
+#: src/preferences.c:2330
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2575
+#: src/preferences.c:2338
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2597
+#: src/preferences.c:2345
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2374
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2645
+#: src/preferences.c:2383
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2667
+#: src/preferences.c:2391
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2677
+#: src/preferences.c:2396
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2404
 msgid "seconds"
 msgstr "秒"
 
-#: src/preferences.c:2713
+#: src/preferences.c:2412
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2732
+#: src/preferences.c:2418
 msgid "_Never"
 msgstr "从不(_N)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:2767
+#: src/preferences.c:2441
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2801
+#: src/preferences.c:2459
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2814
+#: src/preferences.c:2460
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2840
-msgid "Video open command             "
+#: src/preferences.c:2482
+msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2860
-msgid "Open/render compression                  "
+#: src/preferences.c:2494
+msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2872
+#: src/preferences.c:2497
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2885
-msgid "Default image format          "
+#: src/preferences.c:2509
+msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2894
+#: src/preferences.c:2513
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2909
+#: src/preferences.c:2516
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2929
+#: src/preferences.c:2523
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2945
+#: src/preferences.c:2531
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2957
+#: src/preferences.c:2533
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2971
+#: src/preferences.c:2544
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2983
+#: src/preferences.c:2546
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2997
+#: src/preferences.c:2557
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3019
+#: src/preferences.c:2567
 msgid "Decoding"
 msgstr "解码中"
 
-#: src/preferences.c:3058
-msgid "The preview quality for video playback - affects resizing"
-msgstr ""
-
-#: src/preferences.c:3060
-msgid "Preview _quality"
-msgstr ""
-
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3072
+#: src/preferences.c:2590
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3074
+#: src/preferences.c:2592
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:3076
+#: src/preferences.c:2594
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:3099
+#: src/preferences.c:2597
+msgid "Preview _quality"
+msgstr ""
+
+#: src/preferences.c:2598
+msgid "The preview quality for video playback - affects resizing"
+msgstr ""
+
+#: src/preferences.c:2613
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:3129
+#: src/preferences.c:2632
 msgid "_Plugin"
 msgstr "插件(_P)"
 
-#: src/preferences.c:3173
+#: src/preferences.c:2656
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:2659
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:3192
+#: src/preferences.c:2672
+msgid "Record player output"
+msgstr ""
+
+#: src/preferences.c:2675
+msgid "Record output from player instead of input to player"
+msgstr ""
+
+#: src/preferences.c:2682
 msgid "VIDEO"
 msgstr "视频"
 
-#: src/preferences.c:3215
+#: src/preferences.c:2721
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:3253
+#: src/preferences.c:2726
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:3287
+#: src/preferences.c:2753
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:3299
+#: src/preferences.c:2763
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:3317
+#: src/preferences.c:2770
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:3329
+#: src/preferences.c:2779
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:3350
+#: src/preferences.c:2787
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:3368
+#: src/preferences.c:2794
+msgid "Source:"
+msgstr ""
+
+#: src/preferences.c:2798
+msgid "_Internal"
+msgstr ""
+
+#: src/preferences.c:2803
+msgid "_External (requires jack or pulse audio player)"
+msgstr ""
+
+#: src/preferences.c:2822
 msgid "AUDIO"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3383
+#: src/preferences.c:2832
 msgid "Playback"
 msgstr "回放"
 
-#: src/preferences.c:3408
+#: src/preferences.c:2855
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:3428
+#: src/preferences.c:2870
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:3443
+#: src/preferences.c:2879
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:3459
+#: src/preferences.c:2894
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:3481
+#: src/preferences.c:2912
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:3493
+#: src/preferences.c:2923
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3507
-msgid "_Internal Audio (requires jack or pulse audio player)"
+#: src/preferences.c:2934
+msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3529
-msgid "_External Audio (requires jack or pulse audio player)"
-msgstr ""
-
-#: src/preferences.c:3562
+#: src/preferences.c:2954
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
-#: src/preferences.c:3576
+#. TRANSLATORS: gigabytes
+#: src/preferences.c:2960
 msgid "GB"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3588
+#: src/preferences.c:2967
 msgid "Recording"
 msgstr "正在录音"
 
-#: src/preferences.c:3616
-msgid "      Encoder                  "
+#: src/preferences.c:2985
+msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3699
+#: src/preferences.c:3020
+msgid "Output format"
+msgstr "输出格式"
+
+#: src/preferences.c:3036
 msgid "Audio codec"
 msgstr "音频编解码器"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:3715
+#: src/preferences.c:3049
 msgid "Encoding"
 msgstr "编码中"
 
-#: src/preferences.c:3741
+#: src/preferences.c:3064
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3762
+#: src/preferences.c:3073
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3775
+#: src/preferences.c:3075
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3781
+#: src/preferences.c:3082
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3803
+#: src/preferences.c:3089
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3851
+#: src/preferences.c:3102
+msgid "Restart is required if any of the following paths are changed:"
+msgstr ""
+
+#: src/preferences.c:3112
+msgid "Weed plugin path"
+msgstr ""
+
+#: src/preferences.c:3114
+msgid "Frei0r plugin path"
+msgstr ""
+
+#: src/preferences.c:3116
+msgid "LADSPA plugin path"
+msgstr ""
+
+#: src/preferences.c:3139
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3862
+#: src/preferences.c:3145
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3873
+#: src/preferences.c:3151
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3884
+#: src/preferences.c:3157
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3895
+#: src/preferences.c:3163
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3906
+#: src/preferences.c:3169
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3925
+#: src/preferences.c:3182
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3968
+#: src/preferences.c:3207
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3981
+#: src/preferences.c:3215
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3994
+#: src/preferences.c:3223
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:4007
+#: src/preferences.c:3231
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:4019
+#: src/preferences.c:3239
 msgid "LiVES working directory."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4097
+#: src/preferences.c:3289
 msgid "Directories"
 msgstr "目录列表"
 
-#: src/preferences.c:4128
+#: src/preferences.c:3304
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:4143 src/preferences.c:4175
+#: src/preferences.c:3310 src/preferences.c:3324
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:4160
+#: src/preferences.c:3319
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:4199
+#: src/preferences.c:3337
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:4222
+#: src/preferences.c:3347
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:4245
+#: src/preferences.c:3355
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:4255
+#: src/preferences.c:3362
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:4274
+#: src/preferences.c:3372
 msgid ""
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 msgstr ""
 
-#: src/preferences.c:4293
+#: src/preferences.c:3382
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:4312
+#: src/preferences.c:3394
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:4331
+#: src/preferences.c:3404
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:4350
+#: src/preferences.c:3415
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:4370
+#: src/preferences.c:3425
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:4389
+#: src/preferences.c:3435
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4408
+#: src/preferences.c:3445
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4427
+#: src/preferences.c:3455
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:4446
+#: src/preferences.c:3465
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:4465
+#: src/preferences.c:3476
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:4484
+#: src/preferences.c:3486
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:4503
+#: src/preferences.c:3496
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:4522
+#: src/preferences.c:3507
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:4541
+#: src/preferences.c:3518
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:4560
+#: src/preferences.c:3528
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:4579
+#: src/preferences.c:3540
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:4600
+#: src/preferences.c:3556
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:4621
+#: src/preferences.c:3569
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:4640
+#: src/preferences.c:3580
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:4660
+#: src/preferences.c:3591
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4685
+#: src/preferences.c:3603
 msgid "Warnings"
 msgstr "警告"
 
-#: src/preferences.c:4710
+#: src/preferences.c:3621
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:4734
+#: src/preferences.c:3633
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:4744
+#: src/preferences.c:3637
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:4760
+#: src/preferences.c:3641
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:4777
-msgid "Pause xmms during audio playback"
-msgstr ""
-
-#: src/preferences.c:4800
+#: src/preferences.c:3648
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:4817
-msgid "LiVES: Choose CD device"
-msgstr ""
-
-#: src/preferences.c:4840
+#: src/preferences.c:3651
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:4846
+#: src/preferences.c:3664
 msgid "Default FPS        "
 msgstr "默认帧率        "
 
-#: src/preferences.c:4859
+#: src/preferences.c:3667
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4866
+#: src/preferences.c:3674
 msgid "Misc"
 msgstr "杂项"
 
-#: src/preferences.c:4893
+#: src/preferences.c:3699
 msgid "New theme:           "
 msgstr "新主题：           "
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:4928
+#: src/preferences.c:3717
 msgid "Themes"
 msgstr "主题"
 
-#: src/preferences.c:4955
+#: src/preferences.c:3732
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:4977
+#: src/preferences.c:3740
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:4991
+#: src/preferences.c:3750
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:5011
+#: src/preferences.c:3758
 msgid "UDP port       "
 msgstr "UDP 端口       "
 
-#: src/preferences.c:5027
+#: src/preferences.c:3767
 msgid "Start OMC on startup"
 msgstr "启动时运行 OMC"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5061
+#: src/preferences.c:3787
 msgid "Streaming/Networking"
 msgstr "流媒体/网络"
 
-#: src/preferences.c:5086
+#: src/preferences.c:3799
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:5101
+#: src/preferences.c:3803
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:5112
+#: src/preferences.c:3809
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:5127
-msgid "The name of the jack server which can control LiVES transport"
-msgstr ""
-
-#: src/preferences.c:5130 src/preferences.c:5325
+#: src/preferences.c:3816 src/preferences.c:3906
 msgid "Start _server on LiVES startup"
 msgstr "在 LiVES 启动时运行服务器(_S)"
 
-#: src/preferences.c:5154
+#: src/preferences.c:3828
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5174
+#: src/preferences.c:3838
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:5198
+#: src/preferences.c:3852
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:5227
+#: src/preferences.c:3869
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:5252
+#: src/preferences.c:3880
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:5275
+#: src/preferences.c:3888
 msgid "Jack audio"
 msgstr "Jack 音频"
 
-#: src/preferences.c:5283
+#: src/preferences.c:3892
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:5290
+#: src/preferences.c:3895
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:5301
+#: src/preferences.c:3901
 msgid "Jack _audio server config file"
 msgstr "Jack 音频服务器配置文件(_A)"
 
-#: src/preferences.c:5317
-msgid "The name of the jack server for audio"
-msgstr "Jack 音频服务器的名称"
-
-#: src/preferences.c:5346
+#: src/preferences.c:3913
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5374
+#: src/preferences.c:3926
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:5400
+#: src/preferences.c:3940
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:5411
+#: src/preferences.c:3949
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:5432
+#: src/preferences.c:3956
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:5447
+#: src/preferences.c:3958
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:5454
-msgid "LiVES: Choose joystick device"
-msgstr ""
-
-#: src/preferences.c:5470
+#: src/preferences.c:3976
 msgid "_MIDI events"
 msgstr "_MIDI 事件"
 
-#: src/preferences.c:5498
-msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
-msgstr ""
-
-#: src/preferences.c:5499
+#: src/preferences.c:3985
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "使用 _ALSA MIDI(推荐)"
 
-#: src/preferences.c:5518
+#: src/preferences.c:3987
+msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
+msgstr ""
+
+#: src/preferences.c:3995
 msgid "Use _raw MIDI"
 msgstr "使用原始 MIDI(_R)"
 
-#: src/preferences.c:5531
+#: src/preferences.c:3997
 msgid "Read directly from the MIDI device"
 msgstr "从 MIDI 设备直接读取"
 
-#: src/preferences.c:5543
+#: src/preferences.c:4009
 msgid "_MIDI device"
 msgstr "_MIDI 设备"
 
-#: src/preferences.c:5558
+#: src/preferences.c:4011
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDI 设备，如 /dev/input/midi0"
 
-#: src/preferences.c:5565
-msgid "LiVES: Choose MIDI device"
-msgstr "LiVES：选择 MIDI 设备"
-
-#: src/preferences.c:5582
+#: src/preferences.c:4023
 msgid "Advanced"
 msgstr "高级"
 
-#: src/preferences.c:5593
+#: src/preferences.c:4029
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:5606
+#: src/preferences.c:4032
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:5608
+#: src/preferences.c:4039
 msgid "MIDI repeat"
 msgstr "MIDI 重复"
 
-#: src/preferences.c:5621
+#: src/preferences.c:4042
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:5627
+#: src/preferences.c:4045
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(警告：将此值设得过大会拖慢播放。)"
 
-#. TRANSLATORS: please keep this string short
-#: src/preferences.c:5650
+#: src/preferences.c:4064
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:5971
+#: src/preferences.c:4399
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7486,222 +7627,214 @@
 "LiVES 即将关闭。您需要重新启动它以使目录更改生效。\n"
 "点击确定继续。\n"
 
-#: src/preferences.c:6017
+#: src/preferences.c:4423
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr "为使目录更改生效，LiVES 将在关闭首选项对话框后重新启动。"
 
-#: src/preferences.c:6021
+#: src/preferences.c:4427
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "主题的更改只有在您下次启动 LiVES 时才会生效。"
 
-#: src/preferences.c:6025
+#: src/preferences.c:4431
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Jack 选项在您下次启动 LiVES 时才会生效。"
 
-#: src/osc.c:2365
+#: src/osc.c:2515
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:4714
+#: src/osc.c:6530
 msgid "Cannot initialize OSC receiver\n"
 msgstr "无法初始化 OSC 接收器\n"
 
-#: src/osc.c:4738
+#: src/osc.c:6554
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "警告：无法在 UDP 端口 %d 上启动 OSC 服务器\n"
 
-#: src/osc.c:4743
+#: src/osc.c:6559
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "已在 UDP 端口 %d 上启动 OSC 服务器\n"
 
-#: src/osc.c:4856
+#: src/osc.c:6676
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "无法在端口 %d 上启动 OSC/UDP 服务器 \n"
 
-#: src/resample.c:124 src/resample.c:302
+#: src/resample.c:125 src/resample.c:304
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:139 src/resample.c:315
-#, fuzzy, c-format
+#: src/resample.c:140 src/resample.c:318
+#, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
-msgstr "正在删除帧 %d 到 %d%s..."
+msgstr ""
 
-#: src/resample.c:358 src/resample.c:382
+#: src/resample.c:361 src/resample.c:385
 msgid "Resize"
 msgstr "更改大小"
 
-#: src/resample.c:392
+#: src/resample.c:395
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:677
+#: src/resample.c:680
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:742
+#: src/resample.c:745
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:793 src/resample.c:808
+#: src/resample.c:797 src/resample.c:813
 msgid "Resampling audio"
 msgstr "正在重采样音频"
 
-#: src/resample.c:826
+#: src/resample.c:831
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES 无法按要求对音频进行重采样。\n"
 
-#: src/resample.c:828 src/resample.c:832
+#: src/resample.c:833 src/resample.c:837
 msgid "Resample Audio"
 msgstr "重采样音频"
 
-#: src/resample.c:840
+#: src/resample.c:845
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1029
+#: src/resample.c:1034
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1032
+#: src/resample.c:1037
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1063
+#: src/resample.c:1068
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1074
+#: src/resample.c:1079
 msgid "Resample"
 msgstr "重采样"
 
-#: src/resample.c:1201
+#: src/resample.c:1192
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES：- 重采样音频"
 
-#: src/resample.c:1204
+#: src/resample.c:1195
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES：- 插入静音"
 
-#: src/resample.c:1207
+#: src/resample.c:1198
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES：- 新剪辑音频"
 
-#: src/resample.c:1210
+#: src/resample.c:1201
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES：- 外部剪辑设置"
 
-#: src/resample.c:1248 src/resample.c:1518
+#: src/resample.c:1238 src/resample.c:1358
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1269
-msgid "         Channels "
+#: src/resample.c:1245 src/resample.c:1372
+msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1289
-msgid "        Sample Size "
-msgstr "        采样尺寸 "
+#: src/resample.c:1252
+msgid "Sample Size "
+msgstr ""
 
-#: src/resample.c:1328 src/resample.c:1632
+#: src/resample.c:1268 src/resample.c:1425
 msgid "Signed"
 msgstr "有符号"
 
-#: src/resample.c:1355 src/resample.c:1666
+#: src/resample.c:1274 src/resample.c:1435
 msgid "Unsigned"
 msgstr "无符号"
 
-#: src/resample.c:1402 src/resample.c:1719
+#: src/resample.c:1297 src/resample.c:1460
 msgid "Little Endian"
 msgstr "小端"
 
-#: src/resample.c:1429 src/resample.c:1751
+#: src/resample.c:1303 src/resample.c:1468
 msgid "Big Endian"
 msgstr "大端"
 
-#: src/resample.c:1454
+#: src/resample.c:1315
 msgid "Current"
 msgstr "当前"
 
-#: src/resample.c:1486
+#: src/resample.c:1340
 msgid "_Enable audio"
 msgstr "启用音频(_E)"
 
-#: src/resample.c:1517
-msgid "_Rate (Hz) "
+#: src/resample.c:1372
+msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1545
-msgid "    _Channels "
+#: src/resample.c:1394
+msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1546
-msgid "    Channels "
+#: src/resample.c:1394
+msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1579
-msgid "    _Sample Size "
-msgstr "    采样尺寸(_S) "
-
-#: src/resample.c:1580
-msgid "    Sample Size "
-msgstr "    采样尺寸 "
-
-#: src/resample.c:1789
+#: src/resample.c:1489
 msgid "New"
 msgstr "新建"
 
-#: src/resample.c:1818
+#: src/resample.c:1512
 msgid "_Frames Per Second "
 msgstr "帧每秒(_F) "
 
-#: src/resample.c:1860
+#: src/resample.c:1530
 msgid "Record for maximum:  "
 msgstr "最多录制：  "
 
-#: src/resample.c:1883
+#: src/resample.c:1533
 msgid " hours  "
 msgstr " 时  "
 
-#: src/resample.c:1896
+#: src/resample.c:1536
 msgid " minutes  "
 msgstr " 分  "
 
-#: src/resample.c:1909
+#: src/resample.c:1538
 msgid " seconds  "
 msgstr " 秒  "
 
-#: src/resample.c:1930
+#: src/resample.c:1545
 msgid "Unlimited"
 msgstr "无限制"
 
-#: src/resample.c:1958
+#: src/resample.c:1561
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "点击确定进行录制，或点击取消退出。"
 
-#: src/resample.c:2067
+#: src/resample.c:1670
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES：- 更改播放速度"
 
-#: src/resample.c:2070
+#: src/resample.c:1673
 msgid "LiVES: - Resample Video"
 msgstr "LiVES：- 重采样视频"
 
-#: src/resample.c:2091
+#: src/resample.c:1696
 #, c-format
 msgid ""
 "\n"
@@ -7712,7 +7845,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:2094
+#: src/resample.c:1701
 #, c-format
 msgid ""
 "\n"
@@ -7723,89 +7856,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:2120
+#: src/resample.c:1723
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:2143
+#: src/resample.c:1745
 msgid "Change the _audio speed as well"
 msgstr "同时更改音频速度(_A)"
 
-#: src/resample.c:2257
+#: src/resample.c:1846
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2274
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:2289
+#: src/resample.c:1878
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2303
+#: src/resample.c:1892
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:2349
+#: src/resample.c:1938
 msgid "Speed Change"
 msgstr "更改速度"
 
-#: src/resample.c:2358
+#: src/resample.c:1947
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "已将播放速度更改为 %.3f 帧每秒， 音频更改为 %d Hz。\n"
 
-#: src/resample.c:2361
+#: src/resample.c:1950
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "已将播放速度更改为 %.3f 帧每秒。\n"
 
-#: src/resample.c:2446
+#: src/resample.c:2035
 msgid "Resampling video"
 msgstr "正在重采样视频"
 
-#: src/resample.c:2453 src/resample.c:2568 src/resample.c:2590
+#: src/resample.c:2042 src/resample.c:2157 src/resample.c:2179
 msgid "Resampling clipboard video"
 msgstr "正在重采样剪贴板视频"
 
-#: src/resample.c:2458
+#: src/resample.c:2047
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2467
+#: src/resample.c:2056
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2515
+#: src/resample.c:2104
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2607
+#: src/resample.c:2196
 msgid "resampling error..."
 msgstr "重采样错误..."
 
-#: src/rte_window.c:67 src/rte_window.c:902
+#: src/rte_window.c:67 src/rte_window.c:1618
 #, c-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: src/rte_window.c:98
+#: src/rte_window.c:94
 msgid ""
 "\n"
 "\n"
@@ -7815,7 +7948,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:200
+#: src/rte_window.c:400
 msgid ""
 "\n"
 "\n"
@@ -7823,20 +7956,20 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:205
+#: src/rte_window.c:406
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:212
+#: src/rte_window.c:413
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:219
-#, fuzzy, c-format
+#: src/rte_window.c:420
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -7844,16 +7977,13 @@
 "%s\n"
 "Error was %s\n"
 msgstr ""
-"无法读取默认设置文件。\n"
-"%s\n"
-"错误代码为 %d\n"
 
-#: src/rte_window.c:286
+#: src/rte_window.c:500
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:295
+#: src/rte_window.c:509
 #, c-format
 msgid ""
 "\n"
@@ -7863,22 +7993,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:383
+#: src/rte_window.c:606
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "正在从 %s 中加载实时特效默认设置..."
 
-#: src/rte_window.c:429
+#: src/rte_window.c:655
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:552
+#: src/rte_window.c:1238
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:569
+#: src/rte_window.c:1261
 #, c-format
 msgid ""
 "\n"
@@ -7888,43 +8018,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:636
+#: src/rte_window.c:1335
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:712
+#: src/rte_window.c:1415
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:727
+#: src/rte_window.c:1430
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:745
+#: src/rte_window.c:1449
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:762
+#: src/rte_window.c:1467
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:773
+#: src/rte_window.c:1479
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:802
+#: src/rte_window.c:1507
 msgid "update required.\n"
 msgstr "需要更新。\n"
 
-#: src/rte_window.c:818
+#: src/rte_window.c:1523
+#, c-format
+msgid "Loading data connection map from %s..."
+msgstr ""
+
+#: src/rte_window.c:1532
 msgid ""
 "\n"
 "\n"
@@ -7936,40 +8071,45 @@
 "一些特效无法找到。\n"
 "\n"
 
-#: src/rte_window.c:875
+#: src/rte_window.c:1598
 msgid "No Description"
 msgstr "无说明"
 
-#: src/rte_window.c:880
+#: src/rte_window.c:1603
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES：%s 信息"
 
-#: src/rte_window.c:894
+#: src/rte_window.c:1614
 #, c-format
 msgid "Effect name: %s"
 msgstr "特效名称：%s"
 
-#: src/rte_window.c:910
+#: src/rte_window.c:1622
 #, c-format
 msgid "Plugin name: %s"
 msgstr "插件名称：%s"
 
-#: src/rte_window.c:918
+#: src/rte_window.c:1626
 #, c-format
 msgid "Author: %s"
 msgstr "作者：%s"
 
-#: src/rte_window.c:926
+#: src/rte_window.c:1631
+#, c-format
+msgid "and: %s"
+msgstr ""
+
+#: src/rte_window.c:1636
 #, c-format
 msgid "Version: %d"
 msgstr "版本：%d"
 
-#: src/rte_window.c:938
+#: src/rte_window.c:1643
 msgid "Description: "
 msgstr "描述： "
 
-#: src/rte_window.c:1108
+#: src/rte_window.c:1843
 msgid ""
 "\n"
 "\n"
@@ -7978,65 +8118,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1153
+#: src/rte_window.c:1910
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES 无法找到特效 %s。\n"
 
-#: src/rte_window.c:1239
+#: src/rte_window.c:2101
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:1248 src/rte_window.c:1306
-msgid "Key grab"
-msgstr ""
-
-#: src/rte_window.c:1263
+#: src/rte_window.c:2125
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:1272
+#: src/rte_window.c:2132
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:1311
+#: src/rte_window.c:2146
+msgid "Key grab"
+msgstr ""
+
+#: src/rte_window.c:2147
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:1330
+#: src/rte_window.c:2157
 msgid "_Clear all effects"
 msgstr "清除所有特效(_C)"
 
-#: src/rte_window.c:1349
+#: src/rte_window.c:2171
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:1375 src/multitrack.c:7606
+#: src/rte_window.c:2181 src/multitrack.c:8189
 msgid "Info"
 msgstr "信息"
 
-#: src/rte_window.c:1376
+#: src/rte_window.c:2182
 msgid "Set Parameters"
 msgstr "设置参数"
 
-#: src/rte_window.c:1377
+#: src/rte_window.c:2183
+msgid "Set Connections"
+msgstr ""
+
+#: src/rte_window.c:2184
 msgid "Clear"
 msgstr "清除"
 
-#: src/rte_window.c:1386
+#: src/rte_window.c:2193
 msgid "Effect name:"
 msgstr "特效名称："
 
-#: src/rte_window.c:1486
+#: src/rte_window.c:2271
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:1491
+#: src/rte_window.c:2276
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:1847
+#: src/rte_window.c:2701
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8086,11 +8230,6 @@
 msgid "none\n"
 msgstr "无\n"
 
-#: src/lives-yuv4mpeg.c:403
-#, c-format
-msgid "%d Hz %d channel(s) %d bps\n"
-msgstr ""
-
 #: src/lives-yuv4mpeg.c:465
 #, c-format
 msgid ""
@@ -8110,64 +8249,64 @@
 msgid "TV card %d"
 msgstr "电视卡 %d"
 
-#: src/lives-yuv4mpeg.c:688
+#: src/lives-yuv4mpeg.c:689
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "已打开电视卡 %d(%s)"
 
-#: src/lives-yuv4mpeg.c:738
+#: src/lives-yuv4mpeg.c:739
 #, c-format
 msgid "Firewire card %d"
 msgstr "火线卡 %d"
 
-#: src/lives-yuv4mpeg.c:774
+#: src/lives-yuv4mpeg.c:775
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "已打开火线卡 %d"
 
-#: src/multitrack.c:503
+#: src/multitrack.c:553
 msgid "Auto backup"
 msgstr "自动备份"
 
-#: src/multitrack.c:690
+#: src/multitrack.c:759
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1450 src/multitrack.c:3056
+#: src/multitrack.c:1626 src/multitrack.c:3227
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "当前轨道：%s(第 %d 层)\n"
 
-#: src/multitrack.c:1454 src/multitrack.c:3057
+#: src/multitrack.c:1630 src/multitrack.c:3228
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1455
+#: src/multitrack.c:1631
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "当前轨道：第 %d 层音频\n"
 
-#: src/multitrack.c:1458
+#: src/multitrack.c:1634
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f 秒\n"
 
-#: src/multitrack.c:1463 src/multitrack.c:3062
+#: src/multitrack.c:1639 src/multitrack.c:3234
 #, c-format
 msgid "Source: %s"
 msgstr "源：%s"
 
-#: src/multitrack.c:1466 src/multitrack.c:3064
+#: src/multitrack.c:1642 src/multitrack.c:3236
 msgid "Right click for context menu.\n"
 msgstr "右击打开环境菜单。\n"
 
-#: src/multitrack.c:1468
+#: src/multitrack.c:1644
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:2884
+#: src/multitrack.c:3056
 msgid ""
 "\n"
 "\n"
@@ -8176,7 +8315,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:2887
+#: src/multitrack.c:3059
 msgid ""
 "\n"
 "\n"
@@ -8184,7 +8323,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:2890
+#: src/multitrack.c:3062
 msgid ""
 "\n"
 "\n"
@@ -8194,7 +8333,7 @@
 "\n"
 "未载入剪辑。\n"
 
-#: src/multitrack.c:2893
+#: src/multitrack.c:3065
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8204,7 +8343,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:2896
+#: src/multitrack.c:3068
 msgid ""
 "\n"
 "\n"
@@ -8213,12 +8352,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3060
+#: src/multitrack.c:3231
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f 秒到 %.2f 秒\n"
 
-#: src/multitrack.c:3065
+#: src/multitrack.c:3237
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8226,197 +8365,201 @@
 "单击时间线\n"
 "来选择某一帧。\n"
 
-#: src/multitrack.c:3248 src/multitrack.c:5983
+#: src/multitrack.c:3456 src/multitrack.c:6501
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3505
+#: src/multitrack.c:3566
+msgid ""
+"You can click and drag\n"
+"below the timeline"
+msgstr ""
+"您可以点击拖动\n"
+"时间线下方"
+
+#: src/multitrack.c:3567
+msgid "to select a time region.\n"
+msgstr "以选择一个时间区段。\n"
+
+#: src/multitrack.c:3729
 msgid "LiVES: Selected clip"
 msgstr "LiVES：已选剪辑"
 
-#: src/multitrack.c:3512
+#: src/multitrack.c:3736
 msgid "_Adjust start and end points"
 msgstr "调整起点和终点(_A)"
 
-#: src/multitrack.c:3521
+#: src/multitrack.c:3745
 msgid "_Edit/encode in clip editor"
 msgstr "在剪辑编辑器中进行编辑/编码(_E)"
 
-#: src/multitrack.c:3528
+#: src/multitrack.c:3752
 msgid "_Show clip information"
 msgstr "显示剪辑信息(_S)"
 
-#: src/multitrack.c:3535
+#: src/multitrack.c:3759
 msgid "_Close this clip"
 msgstr "关闭此剪辑(_C)"
 
-#: src/multitrack.c:3744
+#: src/multitrack.c:3980
 msgid "Audio mixer (ctrl-m)"
 msgstr "混音器(ctrl-m)"
 
-#: src/multitrack.c:3820
+#: src/multitrack.c:4072
 msgid "Single click on timeline"
 msgstr "点击时间线"
 
-#: src/multitrack.c:3821
+#: src/multitrack.c:4073
 msgid "to select a frame."
 msgstr "来选择一帧。"
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:4074
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:4075
 msgid "to select a block."
 msgstr "来选择块。"
 
-#: src/multitrack.c:3824
+#: src/multitrack.c:4076
 msgid "Clips can be dragged"
 msgstr "剪辑可以被拖放"
 
-#: src/multitrack.c:3825
+#: src/multitrack.c:4077
 msgid "onto the timeline."
 msgstr "到时间线上。"
 
-#: src/multitrack.c:3827
+#: src/multitrack.c:4079
 msgid "Mouse mode is: Move"
 msgstr "鼠标模式为：移动"
 
-#: src/multitrack.c:3828
+#: src/multitrack.c:4080
 msgid "clips can be moved around."
 msgstr "剪辑可以四处移动。"
 
-#: src/multitrack.c:3833
+#: src/multitrack.c:4085
 msgid "Mouse mode is: Select."
 msgstr "鼠标模式为：选择。"
 
-#: src/multitrack.c:3834
+#: src/multitrack.c:4086
 msgid "Drag with mouse on timeline"
 msgstr "用鼠标拖动时间线"
 
-#: src/multitrack.c:3835
+#: src/multitrack.c:4087
 msgid "to select tracks and time."
 msgstr "来选择轨道和时间。"
 
-#: src/multitrack.c:3846
+#: src/multitrack.c:4098
 msgid "_Insert mode: Normal"
 msgstr "插入模式：正常(_I)"
 
-#: src/multitrack.c:3862
+#: src/multitrack.c:4114
 msgid "_Mouse mode: Move"
 msgstr "鼠标模式：移动(_M)"
 
-#: src/multitrack.c:3866
+#: src/multitrack.c:4118
 msgid "_Mouse mode: Select"
 msgstr "鼠标模式：选择(_M)"
 
-#: src/multitrack.c:3889 src/multitrack.c:7054
+#: src/multitrack.c:4141 src/multitrack.c:7605
 msgid "_Gravity: Normal"
 msgstr "重力：正常(_G)"
 
-#: src/multitrack.c:3893
+#: src/multitrack.c:4145
 msgid "_Gravity: Left"
 msgstr "重力：左(_G)"
 
-#: src/multitrack.c:3898
+#: src/multitrack.c:4150
 msgid "_Gravity: Right"
 msgstr "重力：右(_G)"
 
-#: src/multitrack.c:3900
+#: src/multitrack.c:4152
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3903
+#: src/multitrack.c:4155
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:3942
+#: src/multitrack.c:4194
 msgid "Close gaps"
 msgstr "关闭缺口"
 
-#: src/multitrack.c:3944
+#: src/multitrack.c:4196
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:3946
+#: src/multitrack.c:4198
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:3948
+#: src/multitrack.c:4200
 msgid "Delete block"
 msgstr "删除区块"
 
-#: src/multitrack.c:3950
+#: src/multitrack.c:4202
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:3952
+#: src/multitrack.c:4204
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:3954
+#: src/multitrack.c:4206
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:3957
+#: src/multitrack.c:4209
 #, c-format
 msgid "Apply %s"
 msgstr "应用 %s"
 
-#: src/multitrack.c:3962
+#: src/multitrack.c:4214
 #, c-format
 msgid "Delete %s"
 msgstr "删除 %s"
 
-#: src/multitrack.c:3966
+#: src/multitrack.c:4218
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:3968
+#: src/multitrack.c:4220
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:3970
+#: src/multitrack.c:4222
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:3972
+#: src/multitrack.c:4224
 msgid "Effect order change"
 msgstr "更改特效顺序"
 
-#: src/multitrack.c:4368
+#: src/multitrack.c:4631
 msgid "unsigned "
 msgstr "无符号 "
 
-#: src/multitrack.c:4369
+#: src/multitrack.c:4632
 msgid "signed "
 msgstr "有符号 "
 
-#: src/multitrack.c:4371
-msgid "big endian"
-msgstr "大端"
-
-#: src/multitrack.c:4372
-msgid "little endian"
-msgstr "小端"
-
-#: src/multitrack.c:4374
+#: src/multitrack.c:4637
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4406
+#: src/multitrack.c:4671
 msgid "invalid event list. Failed.\n"
 msgstr "无效的事件列表。失败。\n"
 
-#: src/multitrack.c:4412
+#: src/multitrack.c:4677
 msgid "event list has invalid fps. Failed.\n"
 msgstr "事件列表中有无效的帧率。失败。\n"
 
-#: src/multitrack.c:4421
+#: src/multitrack.c:4686
 #, c-format
 msgid ""
 "\n"
@@ -8426,7 +8569,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4726
 #, c-format
 msgid ""
 "\n"
@@ -8437,432 +8580,439 @@
 "此布局中的声道数 (%d) 对 LiVES 无效。\n"
 "无法加载。\n"
 
-#: src/multitrack.c:4795 src/multitrack.c:4804 src/multitrack.c:19533
+#: src/multitrack.c:5069 src/multitrack.c:5078 src/multitrack.c:20642
 msgid "Layout was wiped.\n"
 msgstr "布局已擦除。\n"
 
-#: src/multitrack.c:4844
+#: src/multitrack.c:5118
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5274
+#: src/multitrack.c:5358
+msgid "Clips"
+msgstr "剪辑"
+
+#: src/multitrack.c:5360
+msgid "In/out"
+msgstr "输入/输出"
+
+#: src/multitrack.c:5362
+msgid "FX stack"
+msgstr ""
+
+#: src/multitrack.c:5370 src/omc-learn.c:673
+msgid "Params."
+msgstr "参数"
+
+#: src/multitrack.c:5707
 msgid "_Open..."
 msgstr "打开(_O)..."
 
-#: src/multitrack.c:5291
+#: src/multitrack.c:5724
 msgid "O_pen File Selection..."
 msgstr "_打开文件选择..."
 
-#: src/multitrack.c:5334
+#: src/multitrack.c:5767
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:5343
+#: src/multitrack.c:5776
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:5353
+#: src/multitrack.c:5786
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:5369
+#: src/multitrack.c:5802
 msgid "_Import from Device"
 msgstr "_从设备进口"
 
-#: src/multitrack.c:5395
+#: src/multitrack.c:5828
 msgid "_Close the selected clip"
 msgstr "关闭选择的剪辑(_C)"
 
-#: src/multitrack.c:5489
+#: src/multitrack.c:5922
 msgid "_Save layout as..."
 msgstr "布局保存为(_S)..."
 
-#: src/multitrack.c:5497
+#: src/multitrack.c:5930
 msgid "_Load layout..."
 msgstr "加载布局(_L)..."
 
-#: src/multitrack.c:5501
+#: src/multitrack.c:5934
 msgid "_Wipe/Delete layout..."
 msgstr "擦除/删除布局(_W)..."
 
-#: src/multitrack.c:5527
+#: src/multitrack.c:5960
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "忽略已加载布局中的宽度、高度和音频值(_I)"
 
-#: src/multitrack.c:5531
+#: src/multitrack.c:5964
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:5608
+#: src/multitrack.c:6041
 msgid "_CLIP EDITOR"
 msgstr "剪辑编辑器(_C)"
 
-#: src/multitrack.c:5620
+#: src/multitrack.c:6053
 msgid "_Adjust selected clip start/end points"
 msgstr "调整所选剪辑的始点/终点(_A)"
 
-#: src/multitrack.c:5629
+#: src/multitrack.c:6062
 msgid "_Insert selected clip"
 msgstr "插入选择的剪辑(_I)"
 
-#: src/multitrack.c:5641
+#: src/multitrack.c:6074
 msgid "_Insert selected clip audio"
 msgstr "插入选择的剪辑音频(_I)"
 
-#: src/multitrack.c:5650
+#: src/multitrack.c:6083
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:5659
+#: src/multitrack.c:6092
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:5668
+#: src/multitrack.c:6101
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:5681
+#: src/multitrack.c:6114
 msgid "Clear _marks from timeline"
 msgstr "清除时间线上的标记(_M)"
 
-#: src/multitrack.c:5689
+#: src/multitrack.c:6122
 msgid "Ignore selection limits when inserting"
 msgstr "在插入时忽略选区限制"
 
-#: src/multitrack.c:5705 src/multitrack.c:15281
+#: src/multitrack.c:6138 src/multitrack.c:16248
 msgid "_Play from Timeline Position"
 msgstr "从时间线位置开始播放(_P)"
 
-#: src/multitrack.c:5717
+#: src/multitrack.c:6150
 msgid "Pla_y selected time only"
 msgstr "只播放选择的时间段(_Y)"
 
-#: src/multitrack.c:5811
+#: src/multitrack.c:6244
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:5824
+#: src/multitrack.c:6257
 msgid "Select _autotransition effect..."
 msgstr "选择自动过渡特效(_A)..."
 
-#: src/multitrack.c:5838
+#: src/multitrack.c:6271
 msgid "View/_Edit selected effect"
 msgstr "查看/编辑选择的特效(_E)"
 
-#: src/multitrack.c:5842
+#: src/multitrack.c:6275
 msgid "_Delete selected effect"
 msgstr "删除选择的效果(_D)"
 
-#: src/multitrack.c:5850
+#: src/multitrack.c:6283
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:5861
+#: src/multitrack.c:6339
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6065
+#: src/multitrack.c:6596
 msgid "_Tracks"
 msgstr "轨道(_T)"
 
-#: src/multitrack.c:6075
+#: src/multitrack.c:6606
+msgid "Rename current track"
+msgstr ""
+
+#: src/multitrack.c:6614
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6086
+#: src/multitrack.c:6625
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6094
+#: src/multitrack.c:6633
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6107
+#: src/multitrack.c:6646
 msgid "_Split current track at cursor"
 msgstr "从光标处分割当前轨道(_S)"
 
-#: src/multitrack.c:6119
+#: src/multitrack.c:6658
 msgid "_Split selected video tracks"
 msgstr "分割所选的视频轨道(_S)"
 
-#: src/multitrack.c:6132
+#: src/multitrack.c:6671
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6140
+#: src/multitrack.c:6679
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6152
+#: src/multitrack.c:6691
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6178
+#: src/multitrack.c:6717
 msgid "Se_lection"
 msgstr "选区(_L)"
 
-#: src/multitrack.c:6188
+#: src/multitrack.c:6727
 msgid "_Select Current Track"
 msgstr "选择当前轨道(_S)"
 
-#: src/multitrack.c:6195
+#: src/multitrack.c:6734
 msgid "Select _all video tracks"
 msgstr "选择所有视频轨道(_A)"
 
-#: src/multitrack.c:6202
+#: src/multitrack.c:6741
 msgid "Select _no video tracks"
 msgstr "取消选择所有视频轨道(_N)"
 
-#: src/multitrack.c:6209
+#: src/multitrack.c:6748
 msgid "Select all _time"
 msgstr "选择所有时间(_T)"
 
-#: src/multitrack.c:6220
+#: src/multitrack.c:6759
 msgid "Select from _zero time"
 msgstr "从时间开头开始选择(_Z)"
 
-#: src/multitrack.c:6227
+#: src/multitrack.c:6766
 msgid "Select to _end time"
 msgstr "选择到时间末尾(_E)"
 
-#: src/multitrack.c:6234
+#: src/multitrack.c:6773
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: src/multitrack.c:6244
+#: src/multitrack.c:6783
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:6251
+#: src/multitrack.c:6790
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:6258
+#: src/multitrack.c:6797
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:6265
+#: src/multitrack.c:6804
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:6289
+#: src/multitrack.c:6818
+msgid "Select/deselect block at current track/time"
+msgstr ""
+
+#: src/multitrack.c:6842
 msgid "_Change width, height and audio values..."
 msgstr "更改宽度、高度和音频值(_C)..."
 
-#: src/multitrack.c:6346
+#: src/multitrack.c:6899
 msgid "_Render"
 msgstr "渲染(_R)"
 
-#: src/multitrack.c:6356
+#: src/multitrack.c:6909
 msgid "_Render all to new clip"
 msgstr "渲染所有到新剪辑(_R)"
 
-#: src/multitrack.c:6371
+#: src/multitrack.c:6924
 msgid "Render _video"
 msgstr "渲染视频(_V)"
 
-#: src/multitrack.c:6376
+#: src/multitrack.c:6929
 msgid "Render _audio"
 msgstr "渲染音频(_A)"
 
-#: src/multitrack.c:6386
-#, fuzzy
+#: src/multitrack.c:6939
 msgid "_Normalise rendered audio"
-msgstr "预渲染音频(_P)"
+msgstr ""
 
-#: src/multitrack.c:6393
+#: src/multitrack.c:6946
 msgid "_Pre-render audio"
 msgstr "预渲染音频(_P)"
 
-#: src/multitrack.c:6402
+#: src/multitrack.c:6955
 msgid "_View"
 msgstr "视图(_V)"
 
-#: src/multitrack.c:6420
+#: src/multitrack.c:6973
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:6429
+#: src/multitrack.c:6982
 msgid "_Effects at current"
 msgstr "当前特效(_E)"
 
-#: src/multitrack.c:6447
+#: src/multitrack.c:7000
 msgid "Audio parameters"
 msgstr "音频参数"
 
-#: src/multitrack.c:6457
+#: src/multitrack.c:7010
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:6461
+#: src/multitrack.c:7014
 msgid "Compact view"
 msgstr "紧凑视图"
 
-#: src/multitrack.c:6469
+#: src/multitrack.c:7022
 msgid "Maximum tracks to display..."
 msgstr "显示的最大轨道数目..."
 
-#: src/multitrack.c:6476
+#: src/multitrack.c:7029
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:6480
+#: src/multitrack.c:7033
 msgid "_Center on cursor"
 msgstr "沿光标居中(_C)"
 
-#: src/multitrack.c:6487
+#: src/multitrack.c:7040
 msgid "_Zoom in"
 msgstr "拉近(_Z)"
 
-#: src/multitrack.c:6498
+#: src/multitrack.c:7051
 msgid "_Zoom out"
 msgstr "推远(_Z)"
 
-#: src/multitrack.c:6510
+#: src/multitrack.c:7063
 msgid "Multitrack _details"
 msgstr "多轨道细节(_D)"
 
-#: src/multitrack.c:6523
+#: src/multitrack.c:7076
 msgid "_Event Window"
 msgstr "事件窗口(_E)"
 
-#: src/multitrack.c:6527
+#: src/multitrack.c:7080
 msgid "_Event Window (selected time only)"
 msgstr "事件窗口(只针对选择的时间)(_E)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:7084
 msgid "_Show FRAME events"
 msgstr "显示帧事件(_S)"
 
-#: src/multitrack.c:6547
+#: src/multitrack.c:7100
 msgid "_Show multitrack keys"
 msgstr "显示多轨道键(_S)"
 
-#: src/multitrack.c:6614
+#: src/multitrack.c:7167
 msgid "Mouse mode: _Move"
 msgstr "鼠标模式：移动(_M)"
 
-#: src/multitrack.c:6622
+#: src/multitrack.c:7175
 msgid "Mouse mode: _Select"
 msgstr "鼠标模式：(_S)"
 
-#: src/multitrack.c:6650
+#: src/multitrack.c:7203
 msgid "Insert mode: _Normal"
 msgstr "插入模式：正常(_N)"
 
-#: src/multitrack.c:6932
+#: src/multitrack.c:7430
+msgid "Insert with _audio"
+msgstr "和音频一同插入(_A)"
+
+#: src/multitrack.c:7431
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr "选择是否将视频剪辑和所带的音频一起插入或移动"
 
-#: src/multitrack.c:6936
-msgid "Insert with _audio"
-msgstr "和音频一同插入(_A)"
+#: src/multitrack.c:7522
+msgid "Select _overlap"
+msgstr "选择重叠(_O)"
 
-#: src/multitrack.c:6967
+#: src/multitrack.c:7523
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr "选择时间线选区是否捕获到所选轨道的重叠处"
 
-#: src/multitrack.c:6972
-msgid "Select _overlap"
-msgstr "选择重叠(_O)"
-
-#: src/multitrack.c:7030 src/multitrack.c:12883
+#: src/multitrack.c:7581 src/multitrack.c:13734
 msgid "Expanded View (d)"
 msgstr "扩展视图(d)"
 
-#: src/multitrack.c:7032 src/multitrack.c:12890
+#: src/multitrack.c:7583 src/multitrack.c:13741
 msgid "Compact View (d)"
 msgstr "紧凑视图(d)"
 
-#: src/multitrack.c:7065
+#: src/multitrack.c:7616
 msgid "Gravity: _Normal"
 msgstr "重力：正常(_N)"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7626
 msgid "Gravity: _Left"
 msgstr "重力：左(_L)"
 
-#: src/multitrack.c:7086
+#: src/multitrack.c:7637
 msgid "Gravity: _Right"
 msgstr "重力：右(_R)"
 
-#: src/multitrack.c:7196
-msgid "Clips"
-msgstr "剪辑"
-
-#: src/multitrack.c:7233
-msgid "In/out"
-msgstr "输入/输出"
-
-#: src/multitrack.c:7242
-msgid "FX stack"
-msgstr ""
-
-#: src/multitrack.c:7281 src/omc-learn.c:662
-msgid "Params."
-msgstr "参数"
-
-#: src/multitrack.c:7306
+#: src/multitrack.c:7936
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: src/multitrack.c:7328
+#: src/multitrack.c:7958
 msgid "Time"
 msgstr "时间"
 
-#: src/multitrack.c:7344
+#: src/multitrack.c:7972
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:7352
+#: src/multitrack.c:7980
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:7360
+#: src/multitrack.c:7988
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:7390
+#: src/multitrack.c:8012
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:7418
+#: src/multitrack.c:8028
 msgid "_Velocity  "
 msgstr "速率(_V)  "
 
-#: src/multitrack.c:7475
-msgid "Anchor the start point to the timeline"
+#: src/multitrack.c:8091
+msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:7478
-msgid "Anchor _start"
+#: src/multitrack.c:8092
+msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7512
+#: src/multitrack.c:8108
 msgid "Start frame"
 msgstr "起始帧"
 
-#: src/multitrack.c:7549
-msgid "Anchor the end point to the timeline"
+#: src/multitrack.c:8154
+msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:7552
-msgid "Anchor _end"
+#: src/multitrack.c:8155
+msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:7585
+#: src/multitrack.c:8167
 msgid "End frame"
 msgstr "结尾帧"
 
-#: src/multitrack.c:7739
+#: src/multitrack.c:8336
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/multitrack.c:8314
+#: src/multitrack.c:8918
 msgid ""
 "\n"
 "==============================\n"
@@ -8872,91 +9022,91 @@
 "==============================\n"
 "已切换到剪辑编辑方式\n"
 
-#: src/multitrack.c:8490
+#: src/multitrack.c:9091
 msgid "Timeline (seconds)"
 msgstr "时间线(秒)"
 
-#: src/multitrack.c:8930
+#: src/multitrack.c:9570
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:8933
+#: src/multitrack.c:9573
 #, c-format
 msgid " Layer %d audio"
 msgstr " 层 %d 音频"
 
-#: src/multitrack.c:8940
+#: src/multitrack.c:9580
 msgid "Show/hide audio details"
 msgstr "显示/隐藏音频细节"
 
-#: src/multitrack.c:8957 src/multitrack.c:9165
+#: src/multitrack.c:9597 src/multitrack.c:9819
 #, c-format
 msgid "Layer %d audio"
 msgstr "层 %d 的音频"
 
-#: src/multitrack.c:9120
+#: src/multitrack.c:9731 src/multitrack.c:9847
+#, c-format
+msgid "%s (layer %d)"
+msgstr "%s (层 %d)"
+
+#: src/multitrack.c:9771
 msgid "Select track"
 msgstr "选择轨道"
 
-#: src/multitrack.c:9123
+#: src/multitrack.c:9775
 msgid "Show/hide audio"
 msgstr "显示/隐藏音频"
 
-#: src/multitrack.c:9129
+#: src/multitrack.c:9781
 #, c-format
 msgid "Video %d"
 msgstr "视频 %d"
 
-#: src/multitrack.c:9157 src/multitrack.c:9193
-#, c-format
-msgid "%s (layer %d)"
-msgstr "%s (层 %d)"
-
-#: src/multitrack.c:9166
+#: src/multitrack.c:9820
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:9259
+#: src/multitrack.c:9932
 msgid "LiVES: Selected effect"
 msgstr "LiVES：已选特效"
 
-#: src/multitrack.c:9266
+#: src/multitrack.c:9943
 msgid "_View/Edit this effect"
 msgstr "查看/编辑此特效(_V)"
 
-#: src/multitrack.c:9269
+#: src/multitrack.c:9946
 msgid "_View this effect"
 msgstr "查看此特效(_V)"
 
-#: src/multitrack.c:9277
+#: src/multitrack.c:9954
 msgid "_Delete this effect"
 msgstr "删除此特效(_D)"
 
-#: src/multitrack.c:9328
+#: src/multitrack.c:10007
 msgid "Cannot insert after this effect"
 msgstr "无法在此特效后插入"
 
-#: src/multitrack.c:9357
+#: src/multitrack.c:10036
 msgid "This effect cannot be moved"
 msgstr "此特效无法移除"
 
-#: src/multitrack.c:9403
+#: src/multitrack.c:10082
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  已选择 %d 到 %d  "
 
-#: src/multitrack.c:9406 src/multitrack.c:9642
+#: src/multitrack.c:10085 src/multitrack.c:10323
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f 秒"
 
-#: src/multitrack.c:9613
+#: src/multitrack.c:10294
 #, c-format
 msgid "%d frames"
 msgstr "%d 帧"
 
-#: src/multitrack.c:9921
+#: src/multitrack.c:10645
 msgid ""
 "\n"
 "==============================\n"
@@ -8966,65 +9116,65 @@
 "==============================\n"
 "已切换到多轨道模式\n"
 
-#: src/multitrack.c:11518
+#: src/multitrack.c:12266
 msgid "Drag the time slider to where you"
 msgstr "将时间滑块拖到您"
 
-#: src/multitrack.c:11519
+#: src/multitrack.c:12267
 msgid "want to set effect parameters"
 msgstr "想要设置特效参数的地方"
 
-#: src/multitrack.c:11520
+#: src/multitrack.c:12268
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "设置参数，然后点击“应用”\n"
 
-#: src/multitrack.c:11521
+#: src/multitrack.c:12269
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:11524
+#: src/multitrack.c:12272
 msgid "Effect has no parameters.\n"
 msgstr "特效没有参数。\n"
 
-#: src/multitrack.c:11608
+#: src/multitrack.c:12363
 #, c-format
 msgid "%s output"
 msgstr "%s 输出"
 
-#: src/multitrack.c:11614
+#: src/multitrack.c:12369
 #, c-format
 msgid "layer %d"
 msgstr "层 %d"
 
-#: src/multitrack.c:11616
+#: src/multitrack.c:12371
 msgid "audio track"
 msgstr "音轨"
 
-#: src/multitrack.c:11617
+#: src/multitrack.c:12372
 #, c-format
 msgid "%s to %s"
 msgstr "%s 到 %s"
 
-#: src/multitrack.c:11668
+#: src/multitrack.c:12423
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:11679
+#: src/multitrack.c:12434
 msgid "Insert _before"
 msgstr "插入前面(_B)"
 
-#: src/multitrack.c:11689
+#: src/multitrack.c:12444
 msgid "Insert _after"
 msgstr "插入后面(_A)"
 
-#: src/multitrack.c:11704
+#: src/multitrack.c:12459
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:11719
+#: src/multitrack.c:12474
 msgid ""
 "\n"
 "\n"
@@ -9036,152 +9186,154 @@
 "当前轨道、当前时刻\n"
 "无特效。\n"
 
-#: src/multitrack.c:11731
+#: src/multitrack.c:12487
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11738
+#: src/multitrack.c:12494
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:11746
+#: src/multitrack.c:12502
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:11948
+#: src/multitrack.c:12724
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:11954
+#: src/multitrack.c:12730
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:11964
+#: src/multitrack.c:12740
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:11972
+#: src/multitrack.c:12748
 msgid "List _effects here"
 msgstr "在此列出效果(_E)"
 
-#: src/multitrack.c:11981 src/multitrack.c:12059
+#: src/multitrack.c:12757 src/multitrack.c:12835
 #, c-format
 msgid "_Adjust %s"
 msgstr "调整 %s(_A)"
 
-#: src/multitrack.c:11996
+#: src/multitrack.c:12772
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:12040
+#: src/multitrack.c:12816
 msgid "_Insert here"
 msgstr "在此插入(_I)"
 
-#: src/multitrack.c:12046
+#: src/multitrack.c:12822
 msgid "_Insert audio here"
 msgstr "在此插入音频(_I)"
 
-#: src/multitrack.c:13486
+#: src/multitrack.c:14339
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13520
+#: src/multitrack.c:14373
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:13718
+#: src/multitrack.c:14574
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13914
+#: src/multitrack.c:14773
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:13940
-msgid "Multitrack details"
-msgstr "多轨道细节"
-
-#: src/multitrack.c:13952
+#: src/multitrack.c:14806
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:14174 src/multitrack.c:17249 src/multitrack.c:17261
+#: src/multitrack.c:15033 src/multitrack.c:15145 src/multitrack.c:18256
+#: src/multitrack.c:18268
 #, c-format
 msgid "track %s"
 msgstr "轨道 %s"
 
-#: src/multitrack.c:14179 src/multitrack.c:17254
+#: src/multitrack.c:15038 src/multitrack.c:15150 src/multitrack.c:18261
 #, c-format
 msgid "tracks %s and %s"
 msgstr "轨道 %s 和 %s"
 
-#: src/multitrack.c:14185 src/multitrack.c:17264
+#: src/multitrack.c:15044 src/multitrack.c:15156 src/multitrack.c:18271
 msgid "selected tracks"
 msgstr "已选择的轨道"
 
-#: src/multitrack.c:14189
+#: src/multitrack.c:15047
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14218
+#: src/multitrack.c:15081
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14513
+#: src/multitrack.c:15162
+#, c-format
+msgid "Deleted %s %s from %s from %.4f to %.4f\n"
+msgstr ""
+
+#: src/multitrack.c:15466
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:14603
+#: src/multitrack.c:15556
 msgid "Cleaning up..."
 msgstr "正在清理..."
 
-#: src/multitrack.c:15274
+#: src/multitrack.c:16241
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: src/multitrack.c:15275
+#: src/multitrack.c:16242
 msgid "Pause (p)"
 msgstr "暂停(p)"
 
-#: src/multitrack.c:15417
+#: src/multitrack.c:16382
 msgid "Press 'm' during playback"
 msgstr "在播放过程中按“m”键"
 
-#: src/multitrack.c:15418
+#: src/multitrack.c:16383
 msgid "to make a mark on the timeline"
 msgstr "要在时间线上做标记"
 
-#: src/multitrack.c:15708
+#: src/multitrack.c:16680
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15955
+#: src/multitrack.c:16940
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:16531
+#: src/multitrack.c:17518
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9190,7 +9342,7 @@
 "时间区段 %.3f 到 %.3f\n"
 "已选择。\n"
 
-#: src/multitrack.c:16535
+#: src/multitrack.c:17522
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9198,12 +9350,12 @@
 "选择一条或多条轨道\n"
 "来创建一个区段。\n"
 
-#: src/multitrack.c:16537
+#: src/multitrack.c:17524
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "已选择了 %d 条视频轨道。\n"
 
-#: src/multitrack.c:16539
+#: src/multitrack.c:17526
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9211,7 +9363,7 @@
 "双击时间线来\n"
 "取消时间区段选择。"
 
-#: src/multitrack.c:16546
+#: src/multitrack.c:17533
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9219,7 +9371,7 @@
 "单击某个效果来\n"
 "选中它。"
 
-#: src/multitrack.c:16547
+#: src/multitrack.c:17534
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9227,7 +9379,7 @@
 "双击某个效果\n"
 "进行编辑。"
 
-#: src/multitrack.c:16548
+#: src/multitrack.c:17535
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9235,13 +9387,13 @@
 "右击某个效果来\n"
 "打开环境菜单。\n"
 
-#: src/multitrack.c:16550
+#: src/multitrack.c:17537
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:16557
+#: src/multitrack.c:17544
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -9249,27 +9401,15 @@
 "您可以选择一个特效，\n"
 "然后使用 插入前面"
 
-#: src/multitrack.c:16558
+#: src/multitrack.c:17545
 msgid "or INSERT AFTER buttons to move it."
 msgstr "或 插入后面 按钮来移动它。"
 
-#: src/multitrack.c:16594
-msgid ""
-"You can click and drag\n"
-"below the timeline"
-msgstr ""
-"您可以点击拖动\n"
-"时间线下方"
-
-#: src/multitrack.c:16595
-msgid "to select a time region.\n"
-msgstr "以选择一个时间区段。\n"
-
-#: src/multitrack.c:16829 src/multitrack.c:16842
+#: src/multitrack.c:17827 src/multitrack.c:17840
 msgid "Click on another effect,"
 msgstr "点击另一个效果，"
 
-#: src/multitrack.c:16830 src/multitrack.c:16843
+#: src/multitrack.c:17828 src/multitrack.c:17841
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -9277,46 +9417,46 @@
 "和所选的这个\n"
 "将被插入"
 
-#: src/multitrack.c:16831
+#: src/multitrack.c:17829
 msgid "after it.\n"
 msgstr "在它之后。\n"
 
-#: src/multitrack.c:16844
+#: src/multitrack.c:17842
 msgid "before it.\n"
 msgstr "在它之前。\n"
 
-#: src/multitrack.c:17076
+#: src/multitrack.c:18071
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "已移除效果 %s 的参数值，于时间 %.4f\n"
 
-#: src/multitrack.c:17272
+#: src/multitrack.c:18279
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17763 src/multitrack.c:19272
+#: src/multitrack.c:18766 src/multitrack.c:20382
 msgid "_Autoreload each time"
 msgstr "每次都自动重载(_A)"
 
-#: src/multitrack.c:17860
+#: src/multitrack.c:18856
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "将布局保存到 %s\n"
 
-#: src/multitrack.c:19171
+#: src/multitrack.c:20292
 msgid "clips and frames"
 msgstr "剪辑和帧"
 
-#: src/multitrack.c:19175
+#: src/multitrack.c:20296
 msgid "clips"
 msgstr "剪辑"
 
-#: src/multitrack.c:19178
+#: src/multitrack.c:20299
 msgid "frames"
 msgstr "画面"
 
-#: src/multitrack.c:19188
+#: src/multitrack.c:20309
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9324,7 +9464,7 @@
 "\n"
 "自动重载布局。\n"
 
-#: src/multitrack.c:19191
+#: src/multitrack.c:20312
 #, c-format
 msgid ""
 "%s\n"
@@ -9335,11 +9475,11 @@
 "有些 %s 在布局 %s 中找不到\n"
 "因此不能正确加载。\n"
 
-#: src/multitrack.c:19329
+#: src/multitrack.c:20429
 msgid "auto backup"
 msgstr "自动备份"
 
-#: src/multitrack.c:19332
+#: src/multitrack.c:20432
 #, c-format
 msgid ""
 "\n"
@@ -9348,84 +9488,83 @@
 "\n"
 "无法加载布局文件 %s\n"
 
-#: src/multitrack.c:19347
+#: src/multitrack.c:20453
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "正在从 %s 加载布局..."
 
-#: src/multitrack.c:19380
+#: src/multitrack.c:20487
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "收到 %d 个事件...处理中..."
 
-#: src/multitrack.c:19395
+#: src/multitrack.c:20500
 msgid "Checking and rebuilding event list"
 msgstr "正在检测和重新构建事件列表"
 
-#: src/multitrack.c:19421
+#: src/multitrack.c:20526
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "检测到 %d 项错误。\n"
 
-#: src/multitrack.c:19469
+#: src/multitrack.c:20577
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:20458
+#: src/multitrack.c:21532
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES：多轨音频混音器"
 
-#: src/multitrack.c:20495
+#: src/multitrack.c:21562
 msgid "_Reset values"
 msgstr "重设值(_R)"
 
-#: src/multitrack.c:20499
+#: src/multitrack.c:21566
 msgid "_Close mixer"
 msgstr "关闭混音器(_C)"
 
-#: src/multitrack.c:20541
+#: src/multitrack.c:21620
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:20547
+#: src/multitrack.c:21622
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:20586
+#: src/multitrack.c:21665
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:20592
+#: src/multitrack.c:21667
 msgid "Adjust all layer audio values to the same value"
 msgstr "将所有层的音频值调整为相同值"
 
-#: src/jack.c:99
+#: src/jack.c:103
 msgid "JACK server started\n"
 msgstr "JACK 服务器已启动\n"
 
-#: src/jack.c:929 src/jack.c:1000
+#: src/jack.c:1111 src/jack.c:1180
 msgid "Unable to connect to JACK server\n"
 msgstr "无法连接 JACK 服务器\n"
 
-#: src/jack.c:1159
+#: src/jack.c:1339
 msgid "Started jack audio subsystem.\n"
 msgstr "已启动 jack 音频子系统。\n"
 
-#: src/jack.c:1267
+#: src/jack.c:1447
 msgid "Started jack audio reader.\n"
 msgstr "已启动 jack 音频读取器。\n"
 
-#: src/jack.c:1476
-#, fuzzy
+#: src/jack.c:1664
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
-msgstr "正在连接 jack 传输服务器..."
+msgstr ""
 
-#: src/pulse.c:85
+#: src/pulse.c:86
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9433,7 +9572,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:89
+#: src/pulse.c:90
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9441,330 +9580,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:93
-#, fuzzy
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
-msgstr "无法连接 JACK 服务器\n"
+msgstr ""
 
-#: src/pulse.c:98
-#, fuzzy
+#: src/pulse.c:100
 msgid "LiVES will exit and you can choose another audio player.\n"
-msgstr "LIVES： -选择一款音频播放器"
+msgstr ""
 
-#: src/pulse.c:1009
-#, fuzzy
+#: src/pulse.c:1317
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
-msgstr "正在连接 jack 传输服务器..."
+msgstr ""
 
-#: src/colourspace.c:1064
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1065
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:192
+#: src/omc-learn.c:195
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "正在响应来自 %s 的游戏杆事件\n"
 
-#: src/omc-learn.c:280
+#: src/omc-learn.c:289
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:315
+#: src/omc-learn.c:325
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "正在响应来自 %s 的 MIDI 事件\n"
 
-#: src/omc-learn.c:557
+#: src/omc-learn.c:568
 msgid "data"
 msgstr "数据"
 
-#: src/omc-learn.c:560
+#: src/omc-learn.c:571
 msgid "velocity"
 msgstr "速度"
 
-#: src/omc-learn.c:561
+#: src/omc-learn.c:572
 msgid "note"
 msgstr "笔记"
 
-#: src/omc-learn.c:563 src/omc-learn.c:722 src/omc-learn.c:1094
-#: src/omc-learn.c:1584
+#: src/omc-learn.c:574 src/omc-learn.c:733 src/omc-learn.c:1102
+#: src/omc-learn.c:1589 src/omc-learn.c:1638
 msgid "value"
 msgstr "值"
 
-#: src/omc-learn.c:565
+#: src/omc-learn.c:576
 msgid "state"
 msgstr "状态"
 
-#: src/omc-learn.c:677
+#: src/omc-learn.c:688
 msgid "variable"
 msgstr "变量"
 
-#: src/omc-learn.c:988
+#: src/omc-learn.c:999
 msgid "Vars."
 msgstr "变量"
 
-#: src/omc-learn.c:1040
+#: src/omc-learn.c:1052
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1044
+#: src/omc-learn.c:1056
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1048
+#: src/omc-learn.c:1060
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1052
+#: src/omc-learn.c:1064
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1056
+#: src/omc-learn.c:1068
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1059
+#: src/omc-learn.c:1071
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1074
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1102
+#: src/omc-learn.c:1110
 msgid "x"
 msgstr "水平"
 
-#: src/omc-learn.c:1111
+#: src/omc-learn.c:1119
 msgid "range"
 msgstr "范围"
 
-#: src/omc-learn.c:1130
+#: src/omc-learn.c:1138
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1148
+#: src/omc-learn.c:1156
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1166
+#: src/omc-learn.c:1174
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1267
+#: src/omc-learn.c:1275
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1311
+#: src/omc-learn.c:1313
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1342
+#: src/omc-learn.c:1329
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1353
+#: src/omc-learn.c:1340
 msgid "_Delete all"
 msgstr "全部删除(_D)"
 
-#: src/omc-learn.c:1406
+#: src/omc-learn.c:1409
 msgid "Start video playback"
 msgstr "开始播放视频"
 
-#: src/omc-learn.c:1409
+#: src/omc-learn.c:1412
 msgid "Stop video playback"
 msgstr "停止播放视频"
 
-#: src/omc-learn.c:1413
+#: src/omc-learn.c:1416
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1417
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1421
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1422
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1422
+#: src/omc-learn.c:1425
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1426
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1426
+#: src/omc-learn.c:1429
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1430
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1430
+#: src/omc-learn.c:1433
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1434
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1434
+#: src/omc-learn.c:1437
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1438
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1438
+#: src/omc-learn.c:1441
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1442
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1442
+#: src/omc-learn.c:1445
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1446
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1450
 msgid "Start recording"
 msgstr "开始录制"
 
-#: src/omc-learn.c:1450
+#: src/omc-learn.c:1453
 msgid "Stop recording"
 msgstr "停止录制"
 
-#: src/omc-learn.c:1453
+#: src/omc-learn.c:1456
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1456
+#: src/omc-learn.c:1459
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1461
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1459
+#: src/omc-learn.c:1462
 msgid "Switch all effects off."
 msgstr "关闭所有效果。"
 
-#: src/omc-learn.c:1462
+#: src/omc-learn.c:1465
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1466
+#: src/omc-learn.c:1469
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1470
+#: src/omc-learn.c:1473
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1474
+#: src/omc-learn.c:1477
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1478
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1482
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1482
+#: src/omc-learn.c:1485
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1485
+#: src/omc-learn.c:1488
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1486
+#: src/omc-learn.c:1489
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1493
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1494
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1498
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1499
+#: src/omc-learn.c:1502
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
+#: src/omc-learn.c:1506
+msgid "Set playback plugin parameter value <pnum> = <value>"
+msgstr ""
+
+#: src/omc-learn.c:1507
+msgid "Set <value> of pth parameter for the playback plugin."
+msgstr ""
+
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1529 src/omc-learn.c:1600
+#: src/omc-learn.c:1534 src/omc-learn.c:1605
 msgid "clipnum"
 msgstr "剪辑号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1538
+#: src/omc-learn.c:1543
 msgid "fps"
 msgstr "帧/秒"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1546 src/omc-learn.c:1553 src/omc-learn.c:1560
-#: src/omc-learn.c:1568 src/omc-learn.c:1608 src/omc-learn.c:1616
+#: src/omc-learn.c:1551 src/omc-learn.c:1558 src/omc-learn.c:1565
+#: src/omc-learn.c:1573 src/omc-learn.c:1613 src/omc-learn.c:1621
 msgid "key"
 msgstr "密钥"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1576
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "pnum"
 msgstr "帧号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1592
+#: src/omc-learn.c:1597
 msgid "fps_ratio"
 msgstr "帧率(_R)"
 
-#: src/omc-learn.c:2372
+#: src/omc-learn.c:2431
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "正在将设备映射保存为文件 %s..."
 
-#: src/omc-learn.c:2456
+#: src/omc-learn.c:2515
 #, c-format
 msgid ""
 "\n"
@@ -9777,7 +9921,7 @@
 "解析文件出错\n"
 "%s\n"
 
-#: src/omc-learn.c:2463
+#: src/omc-learn.c:2522
 #, c-format
 msgid ""
 "\n"
@@ -9790,12 +9934,12 @@
 "文件中的版本无效\n"
 "%s\n"
 
-#: src/omc-learn.c:2494
+#: src/omc-learn.c:2553
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "正从文件 %s 加载设备映射..."
 
-#: src/omc-learn.c:2499
+#: src/omc-learn.c:2558
 #, c-format
 msgid ""
 "\n"
@@ -10010,10 +10154,6 @@
 #~ msgid "Fade _out"
 #~ msgstr "淡出音频"
 
-#, fuzzy
-#~ msgid "Fade video in or out"
-#~ msgstr "淡出音频"
-
 #~ msgid "Fade"
 #~ msgstr "淡入淡出"
 
@@ -10524,9 +10664,6 @@
 #~ msgid "_Top left is clipboard"
 #~ msgstr "正在拷贝到剪贴板……"
 
-#~ msgid "_Top"
-#~ msgstr "顶部(_T)"
-
 #, fuzzy
 #~ msgid "_Vertical segments"
 #~ msgstr "竖直移动"
@@ -10786,61 +10923,8 @@
 #~ msgid "You must set the CD device first in Preferences."
 #~ msgstr "您必须先在偏好设置中设置光盘设备。"
 
-#~ msgid "LiVES could not find enough tracks fitting your request."
-#~ msgstr "LiVES 无法找到全部符合要求的音轨。"
-
-#~ msgid "Try again with different values."
-#~ msgstr "使用不同的值再次尝试。"
-
 #~ msgid "$plugin_name failed:"
 #~ msgstr "$plugin_name 失败："
 
 #~ msgid "$error"
 #~ msgstr "$error"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Unable to connect to pulse audio server\n"
-#~ msgstr "无法连接 JACK 服务器\n"
-
-#~ msgid "Red"
-#~ msgstr "红"
-
-#~ msgid "error.\n"
-#~ msgstr "错误。\n"
-
-#~ msgid ""
-#~ "Unable to read defaults file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "无法读取默认设置文件。\n"
-#~ "%s\n"
-#~ "错误代码为 %d\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "LiVES was unable to write %d bytes of %d to the file\n"
-#~ "%s\n"
-#~ "Please check for possible error causes.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "LiVES 无法写入配置文件\n"
-#~ "%s/.lives\n"
-#~ "\n"
-#~ "请检查文件及包含该文件的目录权限\n"
-#~ "并重试。\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Unable to write generator sizes file\n"
-#~ "%s\n"
-#~ "Error code %d\n"
-#~ msgstr ""
-#~ "无法读取默认设置文件。\n"
-#~ "%s\n"
-#~ "错误代码为 %d\n"

LiVES-1.6.1.tar.bz2/resources/Makefile.in -> LiVES-2.0.3.tar.bz2/resources/Makefile.in Changed

LiVES-1.6.1.tar.bz2/smogrify -> LiVES-2.0.3.tar.bz2/smogrify Changed

@@ -1,19 +1,15 @@
 #!/usr/bin/perl
 
-# smogrify - Copyright G. Finch (salsaman@gmail.com) 2003 - 2012
+# smogrify - Copyright G. Finch (salsaman@gmail.com) 2003 - 2013
 # Released under the GPL 3 or later - see file COPYING or www.gnu.org for details
 
 
 ##################################################################
 
 # these MUST match with the definition in the GUI
-$rc_filename=".lives";
 
 $rfx_builder_multi="build-lives-rfx-plugin-multi";
 
-# default temporary directory (can be overridden from the GUI)
-$default_tmpdir="/tmp/livestmp/";
-
 $umask=0177; # ->        -rw-------
 
 $GUI_NAME="LiVES";
@@ -21,28 +17,64 @@
 ###################################################################
 
 # default values
-$encoder="mencoder_encoder";
-
-$composite_command="composite -quiet -colorspace RGB -type truecolor";
-
-$convert_command="convert -quiet -colorspace RGB -type truecolor";
 
 ###################################################################
 # Do not change these except for testing !
 
 $background=1;
-$version="1.6.1";
+$version="2.0.3";
 #$dyneversion="LIVES-20091209";
 
-
 ###################################################################
 
 
+
 $uid=$>;
 $gid=$);
 $gid=~ s/\W.*//;
 
-$home=$ENV{"HOME"};
+if ($^O eq "MSWin32") {
+#TODO - get this from the registry when needed
+#only if we installed perl ourselves
+    $installdir="C:\\Program Files\\LiVES";
+
+    push @INC,"$installdir\\lib";
+
+    use File::Path qw(make_path);
+
+#TODO - get this from the registry when needed
+    $login = getlogin;
+    $home="C:\\users\\$login\\Application Data\\LiVES";
+
+    $rc_filename="LiVES.ini";
+    $lives_home_dir="$home\\Config";
+
+
+# default temporary directory (can be overridden from the GUI)
+    $default_tmpdir="$home\\livescache\\";
+    $is_mingw=1;
+    $nulfile="NUL";
+
+    $encoder="ffmpeg_encoder";
+    $smog_composite_command="composite.exe -quiet";
+    $smog_convert_command="mgkvert.exe -quiet";
+
+}
+else {
+    $home=$ENV{"HOME"};
+    $rc_filename=".lives";
+    $lives_home_dir="$home/.lives-dir";
+
+# default temporary directory (can be overridden from the GUI)
+    $default_tmpdir="$home/livestmp/";
+    $nulfile="/dev/null";
+
+    $encoder="mencoder_encoder";
+    $smog_composite_command="composite -quiet";
+    $smog_convert_command="convert -quiet";
+
+}
+
 
 #$DEBUG_SMOGRIFY=1;
 
@@ -53,18 +85,19 @@
     $command=$ARGV[0];
 
     unless ($command eq "version") {
-	my ($rcfile)=$home."/".$rc_filename;
+	my $rcfile="$home/$rc_filename";
 	if (-f $rcfile) {
 	    $tmpdir=&rc_get("session_tempdir");
+
 	    if ($tmpdir eq ""||$command eq "report") {
 		$tmpdir=&rc_get("tempdir");
 		$priority=1;
-		&rc_set("session_tempdir",$tmpdir);
+		&rc_set("session_tempdir","$tmpdir");
 		$priority=0;
 	    }
 
             if (! -d $tmpdir) {
-		unless ($command eq "report") {
+		unless ($command eq "report" || $command eq "set_pref") {
 		    &mktmpdir;
 		}
 
@@ -84,6 +117,29 @@
 
 
 ## blocking calls
+	if ($command eq "get_pid_for_handle") {
+	    $handle=$ARGV[1];
+	    $curtmpdir="$tmpdir/$handle";
+
+	    if ($^O eq "MSWin32") {
+		$pidfile="$curtmpdir/pid";
+	    }
+	    else {
+		$pidfile="$curtmpdir/.pid";
+	    }
+
+	    if (defined(open IN,"< $pidfile")) {
+		read IN,$target_pid,8;
+		close IN;
+		
+		if ($target_pid eq NULL) {
+		    print " ";
+		    exit 1;
+		}
+	    }
+	    print $target_pid;
+	    exit 0;
+	}
 
 
     if ($command eq "stopsubsub"||$command eq "stopsubsubs"||$command eq "stop_audio") {
@@ -91,13 +147,13 @@
 	$curtmpdir="$tmpdir/$handle";
 	my $sig="KILL";
 	if ($command eq "stop_audio") {
-		$pidfile="$curtmpdir/.pidpb";
+	    $pidfile="$curtmpdir/.pidpb";
 	}
 	else {
-		$pidfile="$curtmpdir/.pid";
-		if (defined($ARGV[2])) {
-		    $sig=$ARGV[2];
-		}
+	    $pidfile="$curtmpdir/.pid";
+	    if (defined($ARGV[2])) {
+		$sig=$ARGV[2];
+	    }
 	}
 	$statusfile="$curtmpdir/.status";
 
@@ -112,6 +168,7 @@
 	    if ($target_pid eq NULL) {
 		exit 1;
 	    }
+
 	    # make sure pidfile has same group and owner, otherwise exit
 	    @stat=stat($pidfile);
 	    if (!($uid==$stat[4]&&$gid==$stat[5])) {
@@ -135,6 +192,8 @@
 		unlink "$tmpdir/.pids.$target_pid";
 	    }
 	    
+	    
+	    
 	    else {
 		print "Attempting to stop process ".$target_pid." with $command\n";
 		if ($sig eq "KILL") {
@@ -144,8 +203,8 @@
 		    smog_system("pkill -$sig -P $target_pid");# must not ! >/dev/null 2>&1");
 		}
 	    }
-	    
-	    if ($command ne "stop_audio" && $sig eq "SIGTERM") {
+
+	    if ($sig eq "KILL" && $command ne "stop_audio") {
 		&sig_killed;
 	    }
 	    exit 0;
@@ -154,21 +213,27 @@
     }
 
 
+
     if ($command eq "new") {
 	# $key can normally be set to getpid()
 
 	$key=$ARGV[1];
 
 	# write mini-info file
-	$infofile="$tmpdir/.info.$key";
-	
+
+	if ($^O eq "MSWin32") {
+	    $infofile="$tmpdir/info.$key";
+	}
+	else {
+	    $infofile="$tmpdir/.info.$key";
+	}
 	do {
 	    $handle=int(rand 1000000000)+65536;
 	    $curtmpdir="$tmpdir/$handle";
 	} while (-d $curtmpdir);
 	
 	umask 0;
-	unless (mkdir $curtmpdir,0700) {
+	unless (mkdir $curtmpdir,0777) {
 	    sig_system_error("Creating directory \"$curtmpdir\"",0);
 	    exit 1;
 	}
@@ -183,12 +248,19 @@
 	close OUT;
 	exit 0;
     }
-    
+	
 
     if ($command eq "get_tempdir") {
+	# TODO - take dirname as second param
 	if (defined($ARGV[1])) {
 	    $id=$ARGV[1];
-	    open OUT,"> /tmp/.smogrify.$id" or exit 1;
+
+	    if ($^O ne "MSWin32") {
+		open OUT,"> /tmp/.smogrify.$id" or exit 1;
+	    }
+	    else {
+		open OUT,"> C:\\smogrify.$id" or exit 1;
+	    }
 	    print OUT "$tmpdir";
 	    close OUT;
 	}
@@ -210,14 +282,25 @@
 	}
 
     if ($command eq "report") {
+
 	$gui_bootstrap_file="";
 	if (defined($ARGV[1])) {
 	    $gui_bootstrap_file=$ARGV[1];
 	}
 
+	if (! -d "$lives_home_dir") {
+	    # this can fail here, but succeed later
+	    if ($^O ne "MSWin32") {
+		smog_system("/bin/mkdir -p -mode=777 \"$lives_home_dir\"");
+	    }
+	    else {
+		make_path("$lives_home_dir");
+	    }
+	}
+
 	$startup_phase=0;
 
-	$video_open_command=&location("mplayer");
+	$video_open_command="\"".&location("mplayer")."\"";
 
 	$audio_player="sox";
 	$audio_play_command=&rc_get_default("sox_command");
@@ -244,24 +327,18 @@
 	    }
 	}
 
-	$lives_home_dir="$home/.lives-dir/";
 	$default_keymap="default.keymap";
 
-	if (! -d "$lives_home_dir") {
-	    # this can fail here, but succeed later
-	    mkdir ("$lives_home_dir",0700);
-	}
-
-	&rc_set_if_not_set("version",$version);
-	&rc_set_if_not_set("tempdir",$default_tmpdir);
+	&rc_set_if_not_set("version","$version");
+	&rc_set_if_not_set("tempdir","$default_tmpdir");
 
 	if (defined($dyneversion)) {
 	    &rc_set_if_not_set("lib_dir","/opt/$dyneversion/lib/");
 	    &rc_set_if_not_set("prefix_dir","/opt/$dyneversion/");
 	}
 
-	&rc_set_if_not_set("video_open_command",$video_open_command);
-	&rc_set_if_not_set("audio_play_command",$audio_play_command);
+	&rc_set_if_not_set("video_open_command","$video_open_command");
+	&rc_set_if_not_set("audio_play_command","$audio_play_command");
 	&rc_set_if_not_set("audio_player",$audio_player);
 	&rc_set_if_not_set("midisynch","false");
 	&rc_set_if_not_set("pb_quality",2);
@@ -269,7 +346,7 @@
 	&rc_set_if_not_set("open_compression_percent",15);
 	&rc_set_if_not_set("conserve_space","false");
 	&rc_set_if_not_set("antialias","true");
-	# resize action when opening images - can be one of: "bound", "default" or "none"
+	# resize action when opening images - can be either: "bound" or "none"
 	&rc_set_if_not_set("image_resize_action","none");
 	&rc_set_if_not_set("encoder",$encoder);
 	&rc_set_if_not_set("output_type","mjpeg");
@@ -325,6 +402,7 @@
 	&rc_set_if_not_set("rec_stop_gb",10);
 
 	&rc_set_if_not_set("def_autotrans","chroma blend");
+	&rc_set_if_not_set("audio_src",0); #internal
 
 	$tmpdir=&rc_get("tempdir");
 	&write_bootstrap_file;
@@ -336,8 +414,6 @@
 	}
 	&version_check_and_upgrade;
 
-
-
 	unless ($gui_bootstrap_file eq "") {
 	    open OUT,"> $gui_bootstrap_file" or exit 4;
 	    print OUT "$version|$tmpdir|$startup_phase|$msg|$msg2";
@@ -345,9 +421,9 @@
 	}
 
 	#make sure we can write to tempir
-	open OUT,"> $tmpdir/.test" or exit 5;
+	open OUT,"> $tmpdir/testfile" or exit 5;
 	close OUT;
-	unlink "$tmpdir/.test";
+	unlink "$tmpdir/testfile";
 
 	exit 0;
     }
@@ -360,24 +436,17 @@
 
 
     if ($command eq "set_pref") {
-	# WARNING - pref keys should not contain spaces, but values can
 	$key=$ARGV[1];
-	shift(@ARGV);
-	shift(@ARGV);
+	$value=$ARGV[2];
 
-	$value=join(" ",@ARGV);
-	&rc_set($key,$value);
+	&rc_set("$key","$value");
 	exit 0;
     }
 	
     if ($command eq "set_pref_if_not_set") {
-	# WARNING - pref keys should not contain spaces, but values can
 	$key=$ARGV[1];
-	shift(@ARGV);
-	shift(@ARGV);
-
-	$value=join(" ",@ARGV);
-	&rc_set_if_not_set($key,$value);
+	$value=$value=$ARGV[2];
+	&rc_set_if_not_set("$key","$value");
 	exit 0;
     }
 	
@@ -414,8 +483,12 @@
 	    print $value;
 	    exit 0;
 	}
-
-	open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+	if ($^O eq "MSWin32") {
+	    open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
+	}
+	else {
+	    open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+	}
 	print OUT $value;
 	close OUT;
 	exit 0;
@@ -436,7 +509,17 @@
 	    $second=$gid;
 	}
 	$value=&rc_get_default($key);
-	open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+
+	if ($value eq "") {
+	    $value="NULL";
+	}
+
+	if ($^O eq "MSWin32") {
+	    open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
+	}
+	else {
+	    open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+	}
 	print OUT $value;
 	close OUT;
 	exit 0;
@@ -462,36 +545,41 @@
 	    $second=$gid;
 	}
 	$value=&location($exe);
-	open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+
+	if ($^O eq "MSWin32") {
+	    open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
+	}
+	else {
+	    open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+	}
+
 	print OUT $value;
 	close OUT;
 	exit 0;
     }
 
 
-	if ($command eq "xmmsstop") {
-	$xmms_command=&location("xmms");
-	unless ($xmms_command eq "") {
-	    smog_system("$xmms_command -s");
+    if ($command eq "pause") {
+	if ($^O eq "MSWin32") {
+	    $smres=smog_system("touch.exe \"$tmpdir\\$ARGV[1]\\pause\"");
+	    if ($smres) {
+		sig_write_error("$tmpdir\\$ARGV[1]\\pause"); 
+		exit 1;
+	    }
 	}
-	exit 0;
-    }
-
-    if ($command eq "xmmsplay") {
-	$xmms_command=&location("xmms");
-	unless ($xmms_command eq "") {
-	    smog_system("$xmms_command -p \"$ARGV[1]\" &");
+	else {
+	    $smres=smog_system("touch \"$tmpdir/$ARGV[1]/pause\"");
+	    if ($smres) {
+		sig_write_error("$tmpdir/$ARGV[1]/pause"); 
+		exit 1;
+	    }
 	}
-	exit 0;
-    }
-
-    if ($command eq "pause") {
-	$smres=smog_system("/bin/touch \"$tmpdir/$ARGV[1]/pause\"");
-	if ($smres) {
-	    sig_write_error("$tmpdir/$ARGV[1]/pause"); 
-	    exit 1;
+	if ($^O eq "MSWin32") {
+	    #smog_system("chmod.exe 600 \"$tmpdir\\$ARGV[1]\\pause\"");
+	}
+	else {
+	    smog_system("/bin/chmod 600 \"$tmpdir/$ARGV[1]/pause\"");
 	}
-	smog_system("/bin/chmod 600 \"$tmpdir/$ARGV[1]/pause\"");
 	exit 0;
     }
 
@@ -516,7 +604,7 @@
 	    #clear old backups (e.g. when saving a set)
 	    $curtmpdir="$tmpdir/$handle";
 	    smog_chdir("$curtmpdir");
-	    smog_system("/bin/rm *.pre");
+	    unlink glob "*.pre";
 	    &sig_complete;
 	    exit 0;
 	}
@@ -525,7 +613,13 @@
     if ($command eq "undo_audio") {
 	$handle=$ARGV[1];
 	$curtmpdir="$tmpdir/$handle";
-	$statusfile="$curtmpdir/.status";
+	if ($^O eq "MSWin32") {
+	    $statusfile="$curtmpdir/status";
+	}
+	else {
+	    $statusfile="$curtmpdir/.status";
+	}
+
 	&undo_audio; # will abort on failure
 	&sig_complete;
 	exit 0;
@@ -534,7 +628,12 @@
     if ($command eq "backup_audio") {
 	$handle=$ARGV[1];
 	$curtmpdir="$tmpdir/$handle";
-	$statusfile="$curtmpdir/.status";
+	if ($^O eq "MSWin32") {
+	    $statusfile="$curtmpdir/status";
+	}
+	else {
+	    $statusfile="$curtmpdir/.status";
+	}
 	smog_chdir("$curtmpdir");
 	&backup_audio;
 	if ($panic) {
@@ -560,7 +659,13 @@
 	if (defined $ARGV[5]) {
 	    $vsize=$ARGV[5];
 	}
-	$statusfile="$curtmpdir/.status";
+
+	if ($^O eq "MSWin32") {
+	    $statusfile="$curtmpdir/status";
+	}
+	else {
+	    $statusfile="$curtmpdir/.status";
+	}
 
 	# check the file is writable
 	unless (&is_writeable($nfile)) {
@@ -568,18 +673,19 @@
 	}
 
 	$img_ext=&get_img_ext($curtmpdir,$frame);
+	$img_prefix=&get_img_prefix($img_ext);
 
 	umask 0111;
 
 	if ($hsize==-1||$vsize==-1) {
-	    $com="$convert_command \"$curtmpdir/$name$img_ext\" \"$nfile\" >/dev/null 2>&1";
+	    $com="$smog_convert_command $img_prefix\"$curtmpdir/$name$img_ext\" \"$nfile\" >$nulfile 2>&1";
 	}
 	else {
 	    if ($antialias eq "false") {
-		$com="$convert_command +antialias \"$curtmpdir/$name$img_ext\" -scale $hsize"."!x"."$vsize! \"$nfile\" > /dev/null 2>&1";
+		$com="$smog_convert_command +antialias $img_prefix\"$curtmpdir/$name$img_ext\" -scale $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1";
 	    }
 	    else {
-		$com="$convert_command -antialias \"$curtmpdir/$name$img_ext\" -resize $hsize"."!x"."$vsize! \"$nfile\" > /dev/null 2>&1";
+		$com="$smog_convert_command -antialias $img_prefix\"$curtmpdir/$name$img_ext\" -resize $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1";
 	    }
 	}
 
@@ -599,13 +705,19 @@
 	$leave_headers=$ARGV[3];
 
 	$curtmpdir="$tmpdir/$handle";
-	$statusfile="$curtmpdir/.status";
+
+	if ($^O eq "MSWin32") {
+	    $statusfile="$curtmpdir/status";
+	}
+	else {
+	    $statusfile="$curtmpdir/.status";
+	}
 
 	smog_chdir("$curtmpdir");
 	$fsize= -s "$nfile";
 	$afsize = -s "audio";
-	unlink <*.tar>;
-	unlink <event.*>;
+	unlink glob "*.tar";
+	unlink glob "event.*";
 	unlink "extended";
 
 	$img_type="jpg";
@@ -630,8 +742,9 @@
 	    # very old backups didn't have a header2
 	    if (! -f "header2") {
 		unless ($nfile eq "") {
-		    unlink <event.*>;
+		    unlink glob "event.*";
 		    $img_ext=&get_img_ext($curtmpdir);
+		    $img_prefix=&get_img_prefix($img_ext);
 		    $frames=&count_frames;
 		}
 	    }
@@ -659,6 +772,7 @@
     }
 
     if ($command eq "list_plugins") {
+
 	# prefix_dir pref should be set first
 	# plugins are returned in sort() order
 	my $allow_nonex=$ARGV[1];
@@ -708,15 +822,22 @@
 
 
 	if ($command eq "build_rfx_plugins") {
-	    if (&location($rfx_builder_multi) eq "") {
-		&sig_error("Unable to locate the program $rfx_builder_multi");
-		exit 1;
+	    if ($^O ne "MSWin32") {
+		if (&location($rfx_builder_multi) eq "") {
+		    &sig_error("Unable to locate the program $rfx_builder_multi");
+		    exit 1;
+		}
 	    }
 
 	    $type=$ARGV[1];
             $script_dir=$ARGV[2];
             $exec_dir=$ARGV[3];
-	    smog_system("$rfx_builder_multi \"$type\" \"$script_dir\" \"$exec_dir\"");
+	    if ($^O ne "MSWin32") {
+		smog_system("$rfx_builder_multi \"$type\" \"$script_dir\" \"$exec_dir\"");
+	    }
+	    else {
+		smog_system("perl \"$installdir\\$rfx_builder_multi\" \"$type\" \"$script_dir\" \"$exec_dir\"");
+	    }
 	    exit 0;
 	}
 
@@ -725,10 +846,16 @@
 	if ($command eq "make_thumb") {
 	    $handle=$ARGV[1];
 	    $curtmpdir="$tmpdir/$handle";
-	    $statusfile="$curtmpdir/.status";
+	    if ($^O eq "MSWin32") {
+		$statusfile="$curtmpdir/status";
+	    }
+	    else {
+		$statusfile="$curtmpdir/.status";
+	    }
 	    $dwidth=$ARGV[2];
 	    $dheight=$ARGV[3];
 	    $img_ext=".".$ARGV[4];
+	    $img_prefix=&get_img_prefix($img_ext);
 	    $file=$ARGV[5];
 
 	    if (! -d "$curtmpdir") {
@@ -752,10 +879,10 @@
 	    $name=&mkname(1);
 	    
 	    if ($antialias eq "false") {
-		smog_system("$convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! \"$curtmpdir/$name$img_ext\" > /dev/null 2>&1");
+		smog_system("$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1");
 	    }
 	    else {
-		smog_system("$convert_command -antialias \"$file\" -resize $hsize"."!x"."$vsize! \"$curtmpdir/$name$img_ext\" > /dev/null 2>&1");
+		smog_system("$smog_convert_command -antialias \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1");
 	    }
 	    &sig_complete($hsize,$vsize);
 	    exit 0;
@@ -775,7 +902,12 @@
 	    #
 	    $handle=$ARGV[1];
 	    $curtmpdir="$tmpdir/$handle";
-	    $statusfile=$curtmpdir."/.status";
+	    if ($^O eq "MSWin32") {
+		$statusfile="$curtmpdir/status";
+	    }
+	    else {
+		$statusfile="$curtmpdir/.status";
+	    }
 	    smog_chdir("$curtmpdir");
 	    $start=$ARGV[2];
 	    $end=$ARGV[3];
@@ -783,12 +915,15 @@
 	    $type=$ARGV[5];
 	    $rest=$ARGV[6];
 	    $plugin="";
+
+
 	    unless ($rest eq "") {
 		$plugin="$plugdir$type/$rest";
 	    }
 
 	    if ($type eq "encoders" || $type eq "effects/rendered/") {
 		$img_ext=&get_img_ext($curtmpdir,$start);
+		$img_prefix=&get_img_prefix($img_ext);
 		if ($type eq "encoders") {
 		    if (-f "audio.origbak") {
 			unlink "audio";
@@ -799,7 +934,10 @@
 			unlink <audiodump.wav audioclip>;
 		    }
 		    if ($areq&4) {
-			&clear_symlinks;
+			if ($^O ne "MSWin32") {
+			    # TODO **** !!!!!
+			    &clear_symlinks;
+			}
 		    }
 		}
 	    }
@@ -807,7 +945,21 @@
 	    #need this again - something resets us
 	    smog_chdir("$curtmpdir");
 
-	    $com="\"$plugin\" clear $start $end $img_ext";
+	    if ($^O eq "MSWin32") {
+		# filter by file ext
+		my $ext=&get_ext("$plugin");
+		if ($ext eq ".py") {
+		    $cmd="python";
+		}
+		else {
+		    $cmd="perl";
+		}
+		$com="$cmd \"$plugin\" clear $start $end $img_ext";
+	    }
+	    else {
+		$com="\"$plugin\" clear $start $end $img_ext";
+	    }
+
 	    $smerr=smog_system($com);
 	    if ($smerr) {
 		sig_system_error("Command failed: $com",$smerr); 
@@ -820,6 +972,8 @@
 
 
 	if ($command eq "check_for_lock") {
+#TODO - mingw
+
 	    # check if there is a lock file for a set, and if so is it in use
 	    my $setname=$ARGV[1];
 	    my $exename=$ARGV[2];
@@ -852,7 +1006,7 @@
 
 
 
-
+#TODO - mingw
 	if ($command eq "get_recovery_file") {
 	    #find first non-in-use recovery file for given uid, gid and filepart
 	    my $uid=$ARGV[1];
@@ -884,7 +1038,7 @@
 	    exit 0;
 	}
 
-
+#TODO - mingw
 	if ($command eq "clean_recovery_files") {
 	    #remove non-in-use recovery/layout files for given uid, gid
 	    my $uid=$ARGV[1];
@@ -937,7 +1091,12 @@
                 $found="none";
             }
 
-            $infofile="$tmpdir/.info.$pid";
+	    if ($^O eq "MSWin32") {
+		$infofile="$tmpdir/info.$pid";
+	    }
+	    else {
+		$infofile="$tmpdir/.info.$pid";
+	    }
             smog_system_sync();
 
             if (-d $tmpdir) {
@@ -953,8 +1112,10 @@
 	    smog_chdir("$tmpdir");
 	    print "Cleaning up temporary space for $GUI_NAME.\n";
 	    if ($command eq "cleanup") {
-		unlink "/tmp/.smogval*";
-		unlink <* .*>;  # will not remove directories
+		if ($^O ne "MSWin32") {
+		    unlink "/tmp/.smogval*";  # TODO *** !!!!!!!!!!
+		}
+		unlink glob "* .* *.*";  # will not remove directories
 	    }
 	    else {
 		$new_temp=$ARGV[1];
@@ -1019,7 +1180,12 @@
         if ($command eq "mv_pre") {
 	    $handle=$ARGV[1];
 	    $curtmpdir="$tmpdir/$handle";
-            $statusfile=$curtmpdir."/.status";
+	    if ($^O eq "MSWin32") {
+		$statusfile="$curtmpdir/status";
+	    }
+	    else {
+		$statusfile="$curtmpdir/.status";
+	    }
 	    unlink "$curtmpdir/pause";
 	    $start=$ARGV[2];
 	    $end=$ARGV[3];
@@ -1041,13 +1207,14 @@
 	}
 
 
-
     
 ####################################################################    
-    # run the rest in background
-    if ($background==1) {
-	if (fork()) {
-	    exit 0;
+    if ($^O ne "MSWin32") {
+	# run the rest in background
+	if ($background==1) {
+	    if (fork()) {
+		exit 0;
+	    }
 	}
     }
 ####################################################################
@@ -1061,13 +1228,29 @@
     $handle=$ARGV[1];
 
     $curtmpdir="$tmpdir/$handle";
-    $statusfile=$curtmpdir."/.status";
+
+    if ($^O eq "MSWin32") {
+	$statusfile=$curtmpdir."/status";
+    }
+    else {
+	$statusfile=$curtmpdir."/.status";
+    }
 
     if ($command eq "play"||$command eq "play_opening_preview") {
-	$pidfile=$curtmpdir."/.pidpb";
+	if ($^O eq "MSWin32") {
+	    $pidfile=$curtmpdir."/pidpb";
+	}
+	else {
+	    $pidfile=$curtmpdir."/.pidpb";
+	}
     }
     else {
-	$pidfile=$curtmpdir."/.pid";
+	if ($^O eq "MSWin32") {
+	    $pidfile=$curtmpdir."/pid";
+	}
+	else {
+	    $pidfile=$curtmpdir."/.pid";
+	}
     }
 
     if ($command eq "play_opening_preview") {
@@ -1234,11 +1417,11 @@
 	$showed_err=0;
 
 	do {
-	    if (! -d "$curtmpdir" || -f "$curtmpdir/.stoploop" || ! -f $audiofile) {
+	    if (! -d "$curtmpdir" || -f "$curtmpdir/.stoploop" || -f "$curtmpdir/stoploop" || ! -f $audiofile) {
 		$loop=0;
 	    }
 	    else {
-		$syscom3=$syscom2.">/dev/null 2>&1";
+		$syscom3=$syscom2.">$nulfile 2>&1";
 		$retval=smog_system("$syscom3");
 		if ($retval>255) {
 		    unless ($showed_err) {
@@ -1253,6 +1436,7 @@
 	&sig_complete_audio;
 
 	unlink "$curtmpdir/.stoploop";
+	unlink "$curtmpdir/stoploop";
 
 	exit 0;
     }
@@ -1265,6 +1449,7 @@
 
 
 	if ($command eq "open") {
+
 	unlink "$curtmpdir/pause";
 
 	$file=$ARGV[2];
@@ -1312,7 +1497,7 @@
 	# process video
 
 	# 3 other files we will use
-	$curtmpfile=".temp";
+	$curtmpfile="tempresult";
 	$audio_out="audio";
 	$audio_in="audiodump.pcm";
 
@@ -1333,6 +1518,7 @@
 	                 # quitting, thus we won't send full info
 	}
 	&get_file_info;
+
 	if ($panic) {
 	    unlink "$pidfile"; 
 	    exit 1;
@@ -1349,7 +1535,7 @@
 	    }
 	    $asamps=16;
 	}
-
+#TODO - mingw
 	$threads=smog_system_direct("/bin/grep processor /proc/cpuinfo | wc -l");
 	$threads=int($threads);
 	if ($threads==0) {
@@ -1372,35 +1558,35 @@
 	    if ($withsound eq "0") {
              #video only
 		if ($img_ext eq ".jpg") {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params </dev/null";
+		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params <$nulfile";
 		}
 		else {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params </dev/null";
+		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params <$nulfile";
 		}
 	    }
 	    elsif ($withsound eq "1") {
              #video and audio 
 		if ($img_ext eq ".jpg") {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params </dev/null";
+		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params <$nulfile";
 		}
 		else {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params </dev/null";
+		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params <$nulfile";
 		}
             }
             else {
              #audio only 
 		if ($ss eq "" && $frames eq "") {
-		    $syscom=$mplay_command . " -quiet $band -vo null -vc null -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params </dev/null";
+		    $syscom=$mplay_command . " -quiet $band -vo null -vc null -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params <$nulfile";
 		}
 		else {
-		    $syscom=$mplay_command . " -quiet $band -vo null $ss $frames -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params </dev/null";
+		    $syscom=$mplay_command . " -quiet $band -vo null $ss $frames -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params <$nulfile";
 		}
 	    }
 	    if (defined($DEBUG_OPEN)) {
 		print STDERR "open command for $handle is: $syscom\n";
 	    }
 	    
-	    $syscom2=$syscom." >\"$curtmpfile\" 2>/dev/null";
+	    $syscom2=$syscom." >\"$curtmpfile\" 2>$nulfile";
 
 	    unless ($opentest==1) {
 		&sig_progress(0);
@@ -1413,8 +1599,8 @@
 		exit 1;
             }
 
-	    @info=split /  /, smog_system_direct("grep VIDEO: \"$curtmpfile\" 2>/dev/null");
-	    @info2=split / /, smog_system_direct("grep AUDIO: \"$curtmpfile\" 2>/dev/null");
+	    @info=split /  /, smog_system_direct("grep VIDEO: \"$curtmpfile\" 2>$nulfile");
+	    @info2=split / /, smog_system_direct("grep AUDIO: \"$curtmpfile\" 2>$nulfile");
 	    
 	    unlink "$curtmpfile";
 	    #$type=$info[1];
@@ -1435,25 +1621,36 @@
 		exit 1;
 	    }
 	    
-	    # double check number of frames
-	    $count=&count_frames;
-
+	    if ($withsound eq "-1") {
+		$count=0;
+	    }
+	    else {
+		# double check number of frames
+		$count=&count_frames;
+	    }
 	}
 
 	# if the last frame has zero size, delete it
 	if ($count>0) {
+
 	    $name=&mkname($count);
-	    while (-f "$name$img_ext" && -z "$name$img_ext" && $count > 1) {
+	    while ($count > 0 && -f "$name$img_ext" && -z "$name$img_ext") {
 		unlink "$name$img_ext";
-		$count--;
+		$name=&mkname(--$count);
+	    }
+	    if ($count==0) {
+		if ($img_ext==".png") {
+		    &sig_error("Your version of mplayer/ffmpeg may be broken","See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071"," ","You can work around this by switching to jpeg output in Preferences/Decoding.");
+		}
 	    }
+
 	    # double check image size
 	    $name=&mkname(1);
 	    $imresact="none";
 	    &get_image_size("$name$img_ext");
 	    if ($panic||$hsize==-1) {
 		unlink $pidfile;
-		exit 1;
+		&sig_error;
 	    }
 	}
 
@@ -1466,6 +1663,16 @@
 	    $bpp=32;
 	}
 
+	unless (0||$withsound ne "-1" || $achans==0) {
+	    # try as best we can to sync sound and video for a selection
+	    $audio_out=&clip_audio(0.3,1000000.);
+	    if (!$panic) {
+		smog_rename( "$audio_out","audio");
+	    }
+	    $audio_out="audio";
+	}
+
+
 	if ($count==0||$type eq "jpeg"||$type eq "png"||$type eq "Audio") {
 	    # we could have audio or images
 	    if (-f $audio_out) {
@@ -1487,8 +1694,12 @@
 		    print STDERR "\nFailed to open file - I tried:\n\n $syscom\n";
 		    print STDERR "\nMaybe you are missing a library in mplayer (or it is not a valid media file) ?\n";
 		}
-		&sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it.","","Check the terminal window for more details.");
-		
+		if ($^O eq "MSWin32") {
+		    &sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it."," ");
+		}
+		else {
+		    &sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it.","","Check the terminal window for more details.");
+		}
 	    }
 	}
 
@@ -1519,15 +1730,6 @@
 	    }
 	}
 
-	unless (!defined($MPLAYER_SEL_AUDIO_SYNCH_BUG)||$ss eq ""||$achans==0) {
-	    # try as best we can to sync sound and video for a selection
-	    $audio_out=&clip_audio(0.5,1000000.);
-	    if (!$panic) {
-		smog_rename( "$audio_out","audio");
-	    }
-	    $audio_out="audio";
-	}
-
 	$af_size= -s $audio_out;
 	if (-d $curtmpdir) {
 	    &sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
@@ -1536,9 +1738,10 @@
     }
 
     if ($command eq "get_details") {
+
 	$handle=$ARGV[1];
 	$curtmpdir="$tmpdir/$handle";
-	$statusfile="$curtmpdir/.status";
+
 
 	#attempt to get file details
 	$file=$ARGV[2];
@@ -1563,7 +1766,10 @@
 	    $asamps=16;
 	}
 
+	smog_chdir("$curtmpdir");
+
 	&sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
+
 	exit 0;
     }
 
@@ -1603,7 +1809,7 @@
 		}
 	    }
 
-	    $com="mplayer -really-quiet tv://$chanstr -tv device=$devstr$inputstr$driverstr$sizestr$outfmt$fpsstr -vo yuv4mpeg:file=$fifofile >/dev/null 2>&1 </dev/null";
+	    $com="mplayer -really-quiet tv://$chanstr -tv device=$devstr$inputstr$driverstr$sizestr$outfmt$fpsstr -vo yuv4mpeg:file=$fifofile >$nulfile 2>&1 <$nulfile";
 	    $smerr=smog_system($com);
 	    if ($smerr) {
 		sig_system_error("$com",$smerr);
@@ -1619,7 +1825,7 @@
 	    $cardno=$ARGV[2];
 	    $cache=$ARGV[3];
 	    $fifofile=$ARGV[4];
-	    $com="dvgrab -s 0 -noavc -card $cardno -o - 2>/dev/null | mplayer - -really-quiet -demuxer lavf -vo yuv4mpeg:file=$fifofile >/dev/null 2>&1";
+	    $com="dvgrab -s 0 -noavc -card $cardno -o - 2>$nulfile | mplayer - -really-quiet -demuxer lavf -vo yuv4mpeg:file=$fifofile >$nulfile 2>&1";
 	    $smerr=smog_system("$com");
 	    if ($smerr) {
 		sig_system_error("$com",$smerr);
@@ -1638,11 +1844,12 @@
 	    if (defined(open IN,"< $pidfile")) {
 		close IN;
 		# cancel any processing
-		smog_system("smogrify stopsubsub \"$handle\"");
+		if ($^O ne "MSWin32") {
+		    smog_system("smogrify stopsubsub \"$handle\"");
+		}
 	    }
-	    
 	    if (chdir("$curtmpdir")) {
-		unlink <* .*>;
+		unlink glob "* .* *.*";
 		smog_chdir("$tmpdir");
 		rmdir $curtmpdir;
 	    }
@@ -1673,6 +1880,7 @@
 
 	
 	if ($command eq "save") {
+	    my $cmd="";
 
 	    $get_rfx=0;
 
@@ -1682,8 +1890,15 @@
 		$handle=$ARGV[1];
 
 		$curtmpdir="$tmpdir/$handle";
-		$statusfile=$curtmpdir."/.status";
-		$pidfile=$curtmpdir."/.pid";
+		if ($^O eq "MSWin32") {
+		    $statusfile="$curtmpdir/status";
+		    $pidfile=$curtmpdir."/pid";
+		}
+		else {
+		    $statusfile="$curtmpdir/.status";
+		    $pidfile=$curtmpdir."/.pid";
+		}
+
 	    }
 
 	    unlink "$curtmpdir/pause";
@@ -1753,7 +1968,9 @@
 	    # get image size ($hsize x $vsize)
 	    $imresact="none";
 	    my $firstframe=&mkname($start);
+
 	    &get_image_size("$firstframe$img_ext");
+
 	    if ($panic||$hsize==-1) {
 		unlink $pidfile;
 		exit 1;
@@ -1766,6 +1983,7 @@
 
 	    $audiofile="";
 
+
 	    if ($get_rfx==0) {
 
 		unlink "audiodump.wav";
@@ -1777,7 +1995,7 @@
 
 		    $origaudio=$audiofile=$audio_in="$curtmpdir/audio";
 		    if ($areq&1||$aud_start!=0.) {
-			
+
 			# encode sound up to the next nearest second
 			# seems to be the norm...
 			$aud_length=($aud_end-$aud_start);
@@ -1883,17 +2101,43 @@
 
 	    }
 
+
 	    unless ($plugin eq "") {
 		$atype=&rc_get("encoder_acodec");
 		$fields="$fps \"$nfile\" $start $end $img_ext $otype $atype $hsize $vsize";
 		$fields.=" $DEBUG_ENCODERS";
 		$fields.=" $arate $achans $asamps $ssigned";
-		if ($get_rfx==0) {
-		    $fields.=@ARGV[13..$#ARGV];
-		    $com="\"$plugin\" encode $fields";
+
+		if ($plugin =~ /multi_encoder$/) {
+		    $extra_opts="-v";
+		}
+
+		if ($^O eq "MSWin32") {
+		    # adjust depending on file ext
+		    my $ext=&get_ext("$plugin");
+		    if ($ext eq ".py") {
+			$cmd="python";
+		    }
+		    else {
+			$cmd="perl";
+		    }
+		    if ($get_rfx==0) {
+			$fields.=@ARGV[13..$#ARGV];
+			$com="$cmd \"$plugin\" $extra_opts encode $fields";
+
+		    }
+		    else {
+			$com="$cmd \"$plugin\" get_rfx $fields";
+		    }
 		}
 		else {
-		    $com="\"$plugin\" get_rfx $fields";
+		    if ($get_rfx==0) {
+			$fields.=@ARGV[13..$#ARGV];
+			$com="\"$plugin\" $extra_opts encode $fields";
+		    }
+		    else {
+			$com="\"$plugin\" get_rfx $fields";
+		    }
 		}
 
 		$smerr=smog_system("$com");
@@ -1909,6 +2153,7 @@
 		unlink ".comment";
 	    }
 	    @tmp=split(/\|\|\%/,$string);
+
 	    $title=$tmp[0];
 	    $author=$tmp[1];
 	    $comment=$tmp[2];
@@ -1952,18 +2197,34 @@
 		$linksdir="/tmp/lives-symlinks/$handle/";
 
 		if (-d $linksdir) {
-		    smog_system("/bin/rm -rf \"$linksdir\"");
+		    if ($^O eq "MSWin32") {
+			smog_system("DEL /q \"$linksdir\"");
+			smog_system("RMDIR \"$linksdir\"");
+		    }
+		    else {
+			smog_system("/bin/rm -rf \"$linksdir\"");
+		    }
 		}
 
-		$com="/bin/mkdir -p \"$linksdir\"";
+		if ($^O eq "MSWin32") {
+		    $com="mkdir.exe -p \"$linksdir\"";
+		}
+		else {
+		    $com="/bin/mkdir /p \"$linksdir\"";
+		}
 		$smerr=smog_system($com);
 		if ($smerr) {
 		    sig_system_error("Creating directory \"$linksdir\"",$smerr); 
 		    unlink "$pidfile"; 
 		    exit 1;
 		}
-
-		smog_system ("/bin/chmod -R 777 \"$linksdir\"");
+		
+		if ($^O eq "MSWin32") {
+		    smog_system ("chmod.exe -R 777 \"$linksdir\"");
+		}
+		else {
+		    smog_system ("/bin/chmod -R 777 \"$linksdir\"");
+		}
 	    }
 	    else {
 		$linksdir=$curtmpdir;
@@ -2002,18 +2263,29 @@
 
 	  }
 
-	$img_ext=&get_img_ext($curtmpdir,$start);
+	    $img_ext=&get_img_ext($curtmpdir,$start);
 
 	    for ($i=1;$i<=($end-$start+1);$i++) {
 		$name=&mkname($i);
 		$from=&mkname($i+$start-1);
 		if (-f "$curtmpdir/$from$img_ext") {
-		    $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
-		    if ($smerr) {
-			sig_system_error("Linking \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
-			unlink "$pidfile"; 
-			exit 1;
+		    if ($^O eq "MSWin32") {
+			$smerr=smog_system ("cp.exe \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
+			if ($smerr) {
+			    sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
+			    unlink "$pidfile"; 
+			    exit 1;
+			}
 		    }
+		    else {
+			$smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
+			if ($smerr) {
+			    sig_system_error("Linking \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
+			    unlink "$pidfile"; 
+			    exit 1;
+			}
+		    }
+	
 		}
 		&sig_progress($i);
 	    }
@@ -2036,6 +2308,7 @@
 	    my $iheight=$ARGV[4];
 
 	    $img_ext=".".$ARGV[5];
+	    $img_prefix=&get_img_prefix($img_ext);
 
 	    $resize_ext=".mgk";
 
@@ -2054,6 +2327,24 @@
 
 	    &clean_old;
 
+	    if ($letterbox) {
+		# make a background frame
+		if (!defined($bgcolour)) {
+		    $bgcolour="#000000";
+		}
+		
+		$com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1";
+		$smerr=smog_system($com);
+		if ($smerr) {
+		    sig_system_error("$com",$smerr);
+		    unlink "blank.jpg";
+		    unlink "$pidfile"; 
+		    exit 1;
+		}
+	    }
+
+
+
 	    for ($i=1;$i<=$end;$i++) {
 		$name=&mkname($i);
 		
@@ -2061,6 +2352,7 @@
 		if ($panic) {
 		    if ($letterbox) {
 			try_to_recover($start,$i-1);
+			unlink "blank.jpg";
 		    }
 		    if ($DEBUG_SMOGRIFY) {
 			print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
@@ -2079,6 +2371,7 @@
 		if ($panic) {
 		    if ($letterbox) {
 			try_to_recover($start,$i);
+			unlink "blank.jpg";
 		    }
 		    unlink "$pidfile"; 
 		    exit 1;
@@ -2091,6 +2384,7 @@
 		if ($panic) {
 		    if ($letterbox) {
 			try_to_recover($start,$i);
+			unlink "blank.jpg";
 		    }
 		    unlink "$pidfile"; 
 		    exit 1;
@@ -2109,6 +2403,9 @@
 		    exit 1;
 		}
 	    }
+	    else {
+		unlink "blank.jpg";
+	    }
 
 	    &sig_complete;
 	    exit 0;
@@ -2136,97 +2433,59 @@
 	    &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
 	}
 
-	unlink <*.tar>;
-	$com="tar -cf header.tar \"$audio\" header* extended* event.* subs.* file* 2>/dev/null";
+	unlink glob "*.tar";
+	$com="tar --ignore-failed-read -cf header.tar \"$audio\" header* extended* event.* subs.* file* 2>$nulfile";
 	smog_system ($com);
 	if ($smerr) {
 	    sig_system_error("$com",$smerr);
 	    unlink "$pidfile"; 
 	    exit 1;
 	}
-	$img_ext=&get_img_ext($curtmpdir,$start);
 
-	if ($start>0) {
-	    # we have to add frames 100 at a time, otherwise tar complains about 'too many parameters'
-	    # TODO - rewrite using xargs or pattern exclude (like projects)
-	    $oend=$end;
-	    $nexthundred=int($start/100)+1;
-	    if ($end>$nexthundred*100-1) {
-		$end=$nexthundred*100-1;
-	    }
-	    
-	    $tarcount=1;
-	    $tarname=&mkname($tarcount).".tar";
-	    
-	    for ($i=$start;$i<=$end;$i++) {
-		$name=&mkname($i);
-		$com="tar -rf \"$tarname\" \"$name$img_ext\"";
-		$smerr=smog_system ($com);
-		if ($smerr) {
-		    sig_system_error("$com",$smerr);
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-		&sig_progress(int($start+($i-$start)/4));
-	    }
-	    
-	    while (($nexthundred+1)*100<=$oend) {
-		$end=$nexthundred*100;
-		$len=length ($nexthundred);
-		$name=substr("000000",$len) . $nexthundred . "\"*\"";
-		$tarname=&mkname(++$tarcount).".tar";
-		$com="tar -cf \"$tarname\" \"$name$img_ext\"";
-		$smerr=smog_system ($com);
-		if ($smerr) {
-		    sig_system_error("$com",$smerr);
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-		$nexthundred++;
-		&sig_progress(int($start+($end-$start)/4));
-	    }
-	    
-	    $tarname=&mkname(++$tarcount).".tar";
-	    
-	    for ($i=$end;$i<=$oend;$i++) {
-		$name=&mkname($i);
-		$com="tar -rf $tarname $name$img_ext 2>.tar_err";
-		$smerr=smog_system ($com);
-		if ($smerr) {
-		    sig_system_error("$com",$smerr);
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-		if (-f ".tar_err") {
-		    open IN,"< .tar_err";
-		    read IN,$tarerr,255;
-		    close IN;
-		    unless ($tarerr eq "") {
-			&sig_err("Error creating new backup - temp dir may be full.",$tarerr);
-			unlink <*.tar .tar_err>;
-			unlink "$pidfile";
-			exit 1;
-		    }
-		}
-		&sig_progress($start+($i-$start));
-	    }
+	&sig_progress(0);
+	
+	$com="tar -cf temp.tar header.tar 2>.tar_err";
+	$smerr=smog_system ($com);
+	if ($smerr) {
+	    sig_system_error("$com",$smerr);
+	    unlink "$pidfile"; 
+	    exit 1;
 	}
-	$com="tar -czf \"$nfile\" *.tar 2>.tar_err";
+	
+	$com="tar --exclude=*.bak --exclude=*.tar --exclude=./.* --exclude=*.mgk --exclude=*.tmp --exclude=audioclip* -rf temp.tar * 2>>.tar_err";
 	$smerr=smog_system ($com);
 	if ($smerr) {
 	    sig_system_error("$com",$smerr);
 	    unlink "$pidfile"; 
 	    exit 1;
 	}
+	
+	if ($^O eq "MSWin32") {
+	    $com="gzip.exe -S .lv1 temp.tar";
+	}
+	else {
+	    $com="gzip -S .lv1 temp.tar";
+	}
+
+	$smerr=smog_system ($com);
+	if ($smerr) {
+	    sig_system_error("$com",$smerr);
+	    unlink "$pidfile"; 
+	    exit 1;
+	}
+	
+	unlink "temp.tar";
+	
+	smog_rename("temp.tar.lv1","$nfile");
+	
 	unlink <header.tar 0*.tar>;
 	if (-f ".tar_err") {
 	    open IN,"< .tar_err";
 	    read IN,$tarerr,255;
 	    close IN;
-	    # TODO - check this, it is not working
 	    unless ($tarerr eq "") {
 		&sig_error("Error creating new backup.",$tarerr);
-		unlink <*.tar .tar_err>;
+		unlink glob "*.tar .tar_err";
 		unlink "$pidfile";
 		exit 1;
 	    }
@@ -2239,19 +2498,55 @@
 
     if ($command eq "restore") {
 	$nfile=$ARGV[2];
+
 	smog_chdir("$curtmpdir");
+	
+	if ($^O ne "MSWin32") {
+	    $com="tar -zxf \"$nfile\" 2>$nulfile";
+	    smog_system ($com);
 
-	$com="tar -zxf \"$nfile\" 2>/dev/null";
-	smog_system ($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
+	    if ($smerr) {
+		sig_system_error("$com",$smerr);
+		unlink "$pidfile"; 
+		exit 1;
+	    }
+	}
+	else {
+	    smog_copy("$nfile","$curtmpdir\\temp.gz");
+	    if ($panic) {
+		unlink "$pidfile"; 
+		exit 1;
+	    }
+	    $com="gzip.exe -d temp.gz";
+	    smog_system ($com);
+	    if ($smerr) {
+		sig_system_error("$com",$smerr);
+		unlink "$pidfile"; 
+		exit 1;
+	    }
+	    $com="tar.exe -xf temp";
+	    smog_system ($com);
+	    if ($smerr) {
+		sig_system_error("$com",$smerr);
+		unlink "$pidfile"; 
+		exit 1;
+	    }
+	    unlink "temp";
 	}
+
 	unless (-f "header.tar"||-f "header"||-f "header.lives") {
 	    &sig_error("This does not appear to be a valid backup file","$GUI_NAME was unable to open it.");
 	}
-	smog_system("for i in *.tar; do tar -xf \$i 2>/dev/null; /bin/rm -f \$i; done");
+
+	opendir DIR,$curtmpdir;
+	while ($file=readdir(DIR)) {
+	    if ($file =~ /.tar$/) {
+		smog_system("tar -xf $file 2>$nulfile");
+		unlink "$file";
+	    }
+	}
+	close DIR;
+
 	&sig_complete;
 	exit 0;
     }
@@ -2262,6 +2557,7 @@
 	unlink "$curtmpdir/pause";
 
 	$img_ext=".".$ARGV[2];
+	$img_prefix=&get_img_prefix($img_ext);
 
 	if (!defined($ARGV[3])) {
 	    $endian=&get_endian;
@@ -2313,6 +2609,24 @@
 	    $pstart=&getint($val);
 	    $count=$pstart;
 	    
+
+	    if ($letterbox&&!$leave_bak) {
+		# make a background frame
+		if (!defined($bgcolour)) {
+		    $bgcolour="#000000";
+		}
+		
+		$com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1";
+		$smerr=smog_system($com);
+		if ($smerr) {
+		    sig_system_error("$com",$smerr);
+		    unlink "$pidfile"; 
+		    exit 1;
+		}
+	    }
+
+
+
 	    while ($newframe!=0) {
 		read IN,$val,4;
 		$newframe=&getint($val);
@@ -2326,6 +2640,7 @@
 			    if ($panic) {
 				if ($letterbox) {
 				    try_to_recover($start,$i-1);
+				    unlink "blank.jpg";
 				}
 				unlink "$pidfile"; 
 				exit 1;
@@ -2335,6 +2650,7 @@
 			    if (!$smerr) {
 				if ($letterbox) {
 				    try_to_recover($start,$i);
+				    unlink "blank.jpg";
 				}
 				sig_system_error("Renaming \"$curtmpdir/$from$resize_ext\" to \"$curtmpdir/$to.mgk\"",$!);
 				unlink "$pidfile"; 
@@ -2374,7 +2690,8 @@
 				smog_copy("$curtmpdir/$to$img_ext", "$curtmpdir/$to.bak");
 				if ($panic) {
 				    try_to_recover($start,$i-1);
-				    unlink "$pidfile"; 
+				    unlink "$pidfile";
+				    unlink "blank.jpg";
 				    exit 1;
 				}
 				# make $to.mgk $to.img_ext
@@ -2383,6 +2700,7 @@
 				if ($panic) {
 				    try_to_recover($start,$i-1);
 				    unlink "$pidfile"; 
+				    unlink "blank.jpg";
 				    exit 1;
 				}
 
@@ -2397,6 +2715,11 @@
 		&sig_progress($fcount++);
 	    }
 	    close IN;
+
+	    if ($letterbox&&!$leave_bak) {
+		unlink "blank.jpg";
+	    }
+
 	}
 	
 	else {
@@ -2575,7 +2898,7 @@
 		exit 1;
 	    }
 	    smog_chdir("$curtmpdir");
-	    unlink <*>;
+	    unlink glob "* *.* .*";
 	    if ($GUI_NAME eq "LiVES") {
 		# LiVES needs this to stop the progress dialog from flickering 
 		sleep(1);
@@ -2636,7 +2959,12 @@
 	$extra_params=$ARGV[8];
 	$mplayer_command=&location("mplayer");
 
-	smog_system("$mplayer_command -quiet -x $hsize -y $vsize -wid $win -vo x11 -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >/dev/null 2>&1 </dev/null");
+	if ($^O ne "MSWin32") {
+	    smog_system("\"$mplayer_command\" -quiet -x $hsize -y $vsize -wid $win -vo x11 -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >$nulfile 2>&1 <$nulfile");
+	}
+	else {
+	    smog_system("\"$mplayer_command\" -quiet -x $hsize -y $vsize -wid $win -vo direct3d -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >$nulfile 2>&1 <$nulfile");
+	}
 	&sig_complete;
 	exit 0;
     }
@@ -2681,7 +3009,7 @@
 	else {
 	    $asigned="-u";
 	}
-	
+
 	if ($audio_end>0.) {
 	    $audio_in=&clip_audio($audio_start,$audio_end);
 	    if ($panic) {
@@ -2692,8 +3020,10 @@
 	else {
 	    $audio_in="$curtmpdir/audio";
 	}
+
 	# convert raw audio to wav
 	$audio_out=$curtmpdir . "/audiodump.wav";
+
 	&convert_audio_to_wav;
 	if ($panic) {
 	    unlink "$pidfile"; 
@@ -2704,7 +3034,12 @@
 	}
   
 	smog_rename("$audio_out","$nfile");
-	smog_system("/bin/chmod 644 \"$nfile\" >/dev/null 2>&1");
+	if ($^O eq "MSWin32") {
+	    smog_system("chmod.exe 644 \"$nfile\" >$nulfile 2>&1");
+	}
+	else {
+	    smog_system("/bin/chmod 644 \"$nfile\" >$nulfile 2>&1");
+	}
 
 	&sig_complete;
 	exit 0;
@@ -2723,10 +3058,11 @@
 	$nsigned=$ARGV[6];
 	$nendian=$ARGV[7];
 	$file=$ARGV[8];
-	$audio_in="$curtmpdir/audiodump.wav";
+	$audio_in="audiodump.wav";
 
 	smog_chdir("$curtmpdir");
-	$audiofile="$curtmpdir/audio";
+
+	$audiofile="audio";
 
 	if ($type eq "mp3") {
 	    &mp3_open;
@@ -2752,7 +3088,7 @@
 	    &sig_error("$GUI_NAME was not able to open the file","$file");
 	}
 	
-	$audio_out="$curtmpdir/audio.new";
+	$audio_out="audio.new";
 	&convert_audio_to_raw;
 	if ($panic) {
 	    unlink "$pidfile"; 
@@ -2760,7 +3096,8 @@
 	}
 	unlink "$audio_in";
 
-	$audio_bak="$curtmpdir/audio.bak";
+	$audio_bak="audio.bak";
+
 
 	# resample $audio_out (if required)
 	unless ($arate==$nrate&&$achans==$nchans&&$asamps==$nsamps&&$nsigned==$signed&&$nendian==$endian) {
@@ -2771,21 +3108,30 @@
 		unlink "$pidfile"; 
 		exit 1;
 	    }
+
 	    unlink "$audio_in"; #audio.new
 	    smog_rename( "$audio_out","$audio_in");  #audio.bak -> audio.new
 	    $audio_out=$audio_in; #audio.new
 	}
 
 	unless (&rc_get("conserve_space") eq "true") {
+	    smog_rename("$audio_out","keep_$audio_out");
 	    &backup_audio;
 	    if ($panic) {
+		unlink "keep_$audio_out";
 		unlink "$pidfile"; 
 		exit 1;
 	    }
+	    smog_rename("keep_$audio_out","$audio_out");
 	}
 
 	# cat audio audio.new -> audiodump
-	$smerr=smog_system("/bin/cat \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
+	if ($^O eq "MSWin32") {
+	    $smerr=smog_system("cat.exe \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
+	}
+	else {
+	    $smerr=smog_system("/bin/cat \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
+	}
 
 	if ($smerr) {
 	    sig_system_error("Creating \"$curtmpdir\audiodump\"",$smerr);
@@ -2804,41 +3150,64 @@
     if ($command eq "trim_audio") {
 	$audio_start=$ARGV[2];
 	$audio_end=$ARGV[3];
+
 	$arate=$ARGV[4];
 	$achans=$ARGV[5];
 	$asamps=$ARGV[6];
 	$asigned=$ARGV[7];
 	$aendian=$ARGV[8];
 
+	smog_chdir("$curtmpdir");
+
 	unless (&rc_get("conserve_space") eq "true") {
-	    &backup_audio;
+	    &backup_audio; #audio -> audio.bak
 	    if ($panic) {
 		unlink "$pidfile"; 
 		exit 1;
 	    }
 	}
 
-	# $audio_from is the new clip
+	#trim audio to selection
+	
+	# $audio_from is the new clip ("audioclip")
 	$audio_from=&clip_audio($audio_start,$audio_end);
 	if ($panic) {
 	    unlink "$pidfile"; 
 	    exit 1;
 	}
-	unlink "$audio_in";
+	
+	$align=$achans*$asamps/8;
+	$acsize=-s $audio_from;
+	$acsize/=$align*$arate;
+
+	unlink "$audio_in"; # audio_in is "audio"
+	
 	$where=$audio_start;
 	$end=$audio_end-$audio_start;
 	$start=0;
-	# insert_audio will insert silence at start
+	
+	if ($end>$acsize) {
+	    #the part we cliṕped may have been *shorter* than the selection
+	    # need to check for this now, as we are more careful with reads and writes
+	    $end=$acsize;
+	}
+
+	# insert_audio will insert silence at start, and should recreate "audio" from "audioclip" ($audio_from)
+
 	&insert_audio($asamps,$achans,$asigned,$aendian,1);
 	if ($panic) {
 	    unlink "$pidfile"; 
 	    exit 1;
+	    $panic=0;
 	}
-	unlink "$audio_out";
+
+	#append silence to pad to end
+	
 	&append_silence(0,&align($audio_end*$arate*$align),$asamps,$achans,$asigned,$aendian);
 	if ($panic) {
 	    unlink "$pidfile"; 
 	    exit 1;
+	    $panic=0;
 	}
 
 	&sig_complete;
@@ -2969,6 +3338,7 @@
 	$width=$ARGV[3];
 	$height=$ARGV[4];
 	$img_ext=".".$ARGV[5];
+	$img_prefix=&get_img_prefix($img_ext);
 	$has_audio=0;
 	$fps=$ARGV[6];
 	$arate=$ARGV[7];
@@ -3009,7 +3379,12 @@
 		    unlink "$pidfile"; 
 		    exit 1;
 		}
-		smog_system("/bin/cat \"$audio_out\">>\"$audio_in\"");
+		if ($^O eq "MSWin32") {
+		    smog_system("cat.exe \"$audio_out\">>\"$audio_in\"");
+		}
+		else {
+		    smog_system("/bin/cat \"$audio_out\">>\"$audio_in\"");
+		}
 		unlink "$audio_out";
 	    }
 	}
@@ -3032,15 +3407,17 @@
 	my $f_size=-s $audio_in;
 	if ($f_size>0) {
 	    # wav format
-	    if (&rc_get("conserve_space") eq "true") {
-		unlink "$audio_out";
-	    }
-	    else {
+	    unless (&rc_get("conserve_space") eq "true") {
 		if (-f $audio_out) {
 		    $smres=smog_rename( "$audio_out","$audio_bak");
 		}
 		else {
-		    $smres=smog_system("/bin/touch \"$audio_bak\"");
+		    if ($^O eq "MSWin32") {
+			$smres=smog_system("touch.exe \"$audio_bak\"");
+		    }
+		    else {
+			$smres=smog_system("touch \"$audio_bak\"");
+		    }
 		    if ($smres) {
 			sig_write_error("$audio_bak"); 
 			unlink "$pidfile"; 
@@ -3070,15 +3447,17 @@
 	    }
 	    if ($gotit || -f $audio_in) {
 		# raw format
-		if (&rc_get("conserve_space") eq "true") {
-		    unlink "$audio_out";
-		}
-		else {
+		unless (&rc_get("conserve_space") eq "true") {
 		    if (-f $audio_out) {
 			$smres=smog_rename( "$audio_out","$audio_bak"); #aborts on failure
 		    }
 		    else {
-			$smres=smog_system("/bin/touch \"$audio_bak\"");
+			if ($^O eq "MSWin32") {
+			    $smres=smog_system("touch.exe \"$audio_bak\"");
+			}
+			else {
+			    $smres=smog_system("touch \"$audio_bak\"");
+			}
 			if ($smres) {
 			    sig_write_error("$audio_bak"); 
 			    unlink "$pidfile"; 
@@ -3095,7 +3474,7 @@
 		&sig_error("$GUI_NAME audio error.");
 	    }
 	}
-	unlink <audiodump.*>;
+	unlink glob "audiodump.*";
 
 	$f_size=-s $audio_out;
 	&sig_complete($arate,$achans,$asamps,$signed,$endian,$f_size);
@@ -3107,7 +3486,7 @@
 	# plus any audio.new files (e.g. from append audio)
 
 	smog_chdir("$curtmpdir");
-	unlink <audiodump* audio.new>;
+	unlink glob "audiodump* audio.new";
 
 	&sig_complete;
 	exit 0;
@@ -3118,7 +3497,7 @@
 	my $url=$ARGV[2];
 	my $dfile=$ARGV[3];
 
-	if ($url =~ /youtube/) {
+	if ($url =~ /youtube/ || $url =~ /youtu\.be/) {
 	    # youtube-dl
 
 	    if (-f $dfile) {
@@ -3135,6 +3514,7 @@
 	    &sig_progress(1);
 
 	    $res=smog_system("$com");
+
 	    if ($res || !(-f $dfile) || -z $dfile) {
 
 		if (-f $dfile) {
@@ -3172,7 +3552,7 @@
 	    unlink "$audiofile";
 	}
 
-	$com="$cdda2wav_command -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >/dev/null 2>&1";
+	$com="\"$cdda2wav_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
 	$smerr=smog_system($com);
 	if ($smerr) {
 	    sig_system_error("$com",$smerr);
@@ -3198,9 +3578,12 @@
 	# TODO - allow front end to specify rate/channels, etc.
 
 	$file=$ARGV[2];
-	$audio_in=$curtmpdir."/audiodump.wav";
 
-	$ext=&get_ext($file);
+	smog_chdir("$curtmpdir");
+
+	$audio_in="audiodump.wav";
+
+	$ext=&get_ext("$file");
 	if ($ext eq ".mp3") {
 	    &mp3_open;
 	}
@@ -3224,70 +3607,6 @@
 	exit 0;
     }
 
-    if ($command eq "xmmsrandom") {
-	# to be deprecated
-	$trackstoplay=$ARGV[2];
-	$descend=$ARGV[3];
-	$minmeg=$ARGV[4];
-	$maxmeg=$ARGV[5];
-	$origdir=$dir=$ARGV[6];
-	$meg=1024*1024;
-
-	$xmms_command=&location("xmms");
-	unless ($xmms_command eq "") {
-	    $first=1;
-	    $tracks=0;
-	    # give up if we tried 200 files and didn't get an audio file
-	    $giveup=200;
-
-	    do {
-		opendir DIR,$dir;
-		@length=readdir(DIR);
-		$count=scalar(@length);
-		closedir DIR;
-		
-		if ($count>0) {
-		    $filetoplay=int(rand $count);
-		    $file=$length[$filetoplay];
-
-		    if ((-d "$dir$file")&&$descend==1) {
-			unless ($file =~ /^\./) {
-			    $dir="$dir$file/";
-			}
-		    }
-		    elsif (-f "$dir$file") {
-			$size=-s "$dir$file";
-			if (($size>$minmeg*$meg)&&($size<$maxmeg*$meg)) {
-			    $ext=&get_ext($file);
-			    # TODO - add more extensions (and allow editing thru prefs...)
-			    if (($ext eq ".mp3")||($ext eq ".ogg")||($ext=".mod")) {
-				$tracks++;
-				$giveup=200;
-				if ($first==1) {
-				    smog_system("$xmms_command -p \"$dir$file\"");
-				    $first=0;
-				}
-				else {
-				    smog_system("$xmms_command -p -e \"$dir$file\"");
-				}
-			    }
-			}
-			$dir=$origdir;
-		    }
-		}
-		else {
-		    $giveup=0;
-		}
-	    } while ($tracks<$trackstoplay&&($giveup--)>0);
-	    if ($giveup<=0) {
-		&sig_error("$GUI_NAME could not find enough tracks fitting your request.","Try again with different values.");
-	    }
-	}
-	&sig_complete;
-	exit 0;
-    }
-
-
     if ($command eq "insert") {
 	# with_audio: 0, no audio, 1 video and audio, 2 ONLY audio
 	# for 0 and 1, start, end, where are in frames; for 2, start,end,where are in seconds
@@ -3296,17 +3615,21 @@
 
 	unlink "$curtmpdir/pause";
 	$img_ext=".".$ARGV[2];
+	$img_prefix=&get_img_prefix($img_ext);
 	$where=$ARGV[3];
 	$start=$ARGV[4];
 	$end=$ARGV[5];
 	$from_handle=$ARGV[6];
 	$with_audio=$ARGV[7];
 	$num_frames=$ARGV[8];
+
 	$width=$ARGV[9];
 	$height=$ARGV[10];
 	$times=1;
 	$undo_cut=0;
 
+        $new_frames=$num_frames;
+
 	smog_chdir("$curtmpdir");
 
 	if (defined ($ARGV[17])) {
@@ -3315,7 +3638,7 @@
 		# this indicates undoing a previous cut
 		$times=-$times;
 		$undo_cut=1;
-		$num_frames+=$end-$start+1;
+		$new_frames=$num_frames+$end-$start+1;
 	    }
 	    else {
 		if ($start>=0) {
@@ -3332,7 +3655,9 @@
 	if ($with_audio<2) {
 	    if (!$undo_cut) {
 		$img_ext2=&get_img_ext("$tmpdir/$from_handle",$start);
+		$img_prefix2=&get_img_prefix($img_ext2);
 	    }
+
 	    &insert;
 	    if ($panic) {
 		unlink "$pidfile"; 
@@ -3348,35 +3673,41 @@
 	    $asigned=$ARGV[15];
 	    $aendian=$ARGV[16];
 
-	    if (!$undo_cut) {
-		if ($with_audio<2) {
-		    $end/=$fps;
-		    $start=($start-1.)/$fps;
-		    $where/=$fps;
-		}
-
-		if (-f "audio") {
-		    smog_copy("audio", "audio.bak");
+	    if ($arate*$achans*$asamps!=0) {
+		if (!$undo_cut) {
+		    if ($with_audio<2) {
+			$end/=$fps;
+			$start=($start-1.)/$fps;
+			$where/=$fps;
+		    }
+		    if (! -f "audio") {
+			unlink "audio.bak";
+		    }
+		    else {
+			smog_copy("audio","audio.bak");
+		    }
 		    if ($panic) {
 			unlink "$pidfile"; 
 			exit 1;
 		    }
 		    smog_system_sync();
 		}
-	    }
-	    else {
-                $end=-s "$curtmpdir/audio.bak";
-                $end/=$arate*$achans*$asamps/8;
-                $start=0.;
-		if ($with_audio<2) {
-		    $where/=$fps;
+		else {
+		    $end=-s "$curtmpdir/audio.bak";
+		    $end/=$arate*$achans*$asamps/8;
+		    $start=0.;
+		    if ($with_audio<2) {
+			$where/=$fps;
+		    }
+		}
+		&insert_audio($asamps,$achans,$asigned,$aendian,$undo_cut);
+		if (&rc_get("conserve_space") eq "true") {
+		    unlink "audio.bak";
+		}
+		if ($panic) {
+		    unlink "$pidfile"; 
+		    exit 1;
 		}
-	    }
-
-	    &insert_audio($asamps,$achans,$asigned,$aendian,$undo_cut);
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
 	    }
 	}
 
@@ -3428,24 +3759,45 @@
 	    $nheight=$height=$ARGV[6];
 
 	    $img_ext=".".$ARGV[7];
+	    $img_prefix=&get_img_prefix($img_ext);
 	    splice(@ARGV,7,1);
 	    
+
+	    $convert_command=$smog_convert_command;
+	    $composite_command=$smog_composite_command;
+
 	    # call render plugins in plugins/effects/rendered/$command
 
 	    unless (defined($fx_prev)) {
 		$out_ext=".mgk";
+		$out_prefix=$img_prefix;
 		&clean_old;
 	    }
 	    if ($status==0) {
 		$plugin_name="$command";
 	    }
 	    elsif ($status==1) {
-		$plugin_name="$home/.lives-dir/plugins/effects/rendered/custom/$command";
+		$plugin_dir="$lives_home_dir/plugins/effects/rendered/custom";
+		$plugin_name="$plugin_dir/$command";
 	    }
 	    else {
-		$plugin_name="$home/.lives-dir/plugins/effects/rendered/test/$command";
+		$plugin_dir="$lives_home_dir/plugins/effects/rendered/test";
+		$plugin_name="$plugin_dir/$command";
+	    }
+	    if ($^O eq "MSWin32") {
+		# adjust depending on file ext
+		my $ext=&get_ext("$plugin_name");
+		if ($ext eq ".py") {
+		    $cmd="python";
+		}
+		else {
+		    $cmd="perl";
+		}
+		$smcom="$cmd \"$plugin_name\" get_description";
+	    }
+	    else {
+		$smcom="\"$plugin_name\" get_description";
 	    }
-	    $smcom="\"$plugin_name\" get_description";
 	    $fx_desc=smog_system_direct($smcom);
 	    if ($?) {
 		sig_system_error($smcom,$?);
@@ -3457,23 +3809,34 @@
 	    if ($num_in_channels==0) {
 		# generators get the out_extension
 		$out_ext=$img_ext;
+		$out_prefix=&get_img_prefix($img_ext);
 	    }
 
 	    if ($num_in_channels==2) {
 		# transitions get some extra params
 		$img_ext2=".".$ARGV[7];
+		$img_prefix2=&get_img_prefix($img_ext2);
 		splice(@ARGV,7,1);
 		$start2=$ARGV[7];
 		$clipboard=$ARGV[8];
 	    }
 
-	    if ($img_ext eq ".png") {
-		$convert_command.=" -alpha on";
-	    }
-
 	    $fps=0;
 
-	    $fx_caps=smog_system_direct("\"$plugin_name\" get_capabilities");
+	    if ($^O eq "MSWin32") {
+		# adjust depending on file ext
+		my $ext=&get_ext("$plugin_name");
+		if ($ext eq ".py") {
+		    $cmd="python";
+		}
+		else {
+		    $cmd="perl";
+		}
+		$fx_caps=smog_system_direct("$cmd \"$plugin_name\" get_capabilities");
+	    }
+	    else {
+		$fx_caps=smog_system_direct("\"$plugin_name\" get_capabilities");
+	    }
 	    if ($?) {
 		sig_system_error($smcom,$?);
 		unlink $pidfile;
@@ -3490,20 +3853,35 @@
 		    shift; shift;
 		}
 
+		if ($^O eq "MSWin32") {
+		    push @INC,"$plugin_dir";
+		}
+
 		$ARGV[0]="process";
 		if ($status>1) {
 		    $error="";
-		    unless (eval "require (\"$plugin_name\")") {
-			$error=$@;
+		    if ($^O eq "MSWin32") {
+			unless (eval "require (\"$command\")") {
+			    $error=$@;
+			}
+		    }
+		    else {
+			unless (eval "require (\"$plugin_name\")") {
+			    $error=$@;
+			}
 		    }
 		    unless ($error eq "") {
 			&sig_error("$plugin_name failed:","$error");
 		    }
 		}
 		else {
-		    require("$plugin_name");
+		    if ($^O eq "MSWin32") {
+			require("$command");
+		    }
+		    else {
+			require("$plugin_name");
+		    }
 		}
-
 		if ($num_in_channels>0) {
 		    unless (defined($fx_prev)) {
 			&mv_mgk;
@@ -3529,13 +3907,52 @@
 		#img_ext is also in ARGV, but never mind
 
 		if ($num_in_channels==2) {
-		    $err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
+		    if ($^O eq "MSWin32") {
+			# adjust depending on file ext
+			my $ext=&get_ext("$plugin_name");
+			if ($ext eq ".py") {
+			    $cmd="python";
+			}
+			else {
+			    $cmd="perl";
+			}
+			$err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
+		    }
+		    else {
+			$err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
+		    }
 		}
 		elsif ($num_in_channels==1) {
-		    $err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
+		    if ($^O eq "MSWin32") {
+			# adjust depending on file ext
+			my $ext=&get_ext("$plugin_name");
+			if ($ext eq ".py") {
+			    $cmd="python";
+			}
+			else {
+			    $cmd="perl";
+			}
+			$err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
+		    }
+		    else {
+			$err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
+		    }
 		}
 		else {
-		    $err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
+		    if ($^O eq "MSWin32") {
+			# adjust depending on file ext
+			my $ext=&get_ext("$plugin_name");
+			if ($ext eq ".py") {
+			    $cmd="python";
+			}
+			else {
+			    $cmd="perl";
+			}
+			$err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
+		    }
+		    else {
+			$err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
+		    }
 		}
 		if (!$err) {
 		    if (defined(open IN,"< $res_file")) {
@@ -3693,9 +4110,19 @@
     $exists=(-f "$nfile");
     if (!$exists) {
 	umask 0;
-	$ret=smog_system("/bin/touch \"$nfile\"");
+	if ($^O eq "MSWin32") {
+	    $ret=smog_system("touch.exe \"$nfile\"");
+	}
+	else {
+	    $ret=smog_system("touch \"$nfile\"");
+	}
 	if ($ret) {return !$ret;}
-	smog_system("/bin/chmod o+w \"$nfile\"");
+	if ($^O eq "MSWin32") {
+	    smog_system("chmod.exe o+w \"$nfile\"");
+	}
+	else {
+	    smog_system("/bin/chmod o+w \"$nfile\"");
+	}
 	umask $umask;
     }
     smog_system_sync();
@@ -3707,6 +4134,7 @@
 }
 
 
+
 sub get_img_ext {
     my $ckdir=shift;
     my $imgno=shift;
@@ -3730,6 +4158,18 @@
 }
     
 
+sub get_img_prefix {
+    my $imgext=shift;
+
+    if ($imgext eq ".png") {
+	return "PNG32:";
+    }
+
+    return "";
+
+}
+
+
 
 sub try_to_recover {
     #something failed badly during processing
@@ -3819,7 +4259,7 @@
     }
 
     smog_chdir("$curtmpdir");
-    unlink <*.mgk>;
+    unlink glob "*.mgk";
 
     for ($i=$start;$i<=$end;$i++) {
 	$name=&mkname($i);
@@ -3833,7 +4273,7 @@
 			print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
 		    }
 		    sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
-		    unlink $pidfile;
+		    unlink "$pidfile";
 		    exit 1;
 		}
 	    }
@@ -3844,7 +4284,7 @@
 		    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name.pre\",\"$curtmpdir/$name$img_ext\"\n";
 		}
 		sig_system_error("Renaming \"$curtmpdir/$name.pre\" to \"$curtmpdir/$name$img_ext\"");
-		unlink $pidfile;
+		unlink "$pidfile";
 		exit 1;
 	    }
 	}
@@ -3883,9 +4323,15 @@
     }
     else {
 	unlink "$curtmpdir/audio.new";
-	smog_rename( "$curtmpdir/audio","$curtmpdir/audio.new");
-	smog_rename( "$curtmpdir/audio.bak","$curtmpdir/audio");
-	smog_rename( "$curtmpdir/audio.new","$curtmpdir/audio.bak");
+	if (-f "$curtmpdir/audio") {
+	    smog_rename( "$curtmpdir/audio","$curtmpdir/audio.new");
+	}
+	if (-f "$curtmpdir/audio.bak") {
+	    smog_rename( "$curtmpdir/audio.bak","$curtmpdir/audio");
+	}
+	if (-f "$curtmpdir/audio.new") {
+	    smog_rename( "$curtmpdir/audio.new","$curtmpdir/audio.bak");
+	}
     }
 }
 
@@ -3895,7 +4341,6 @@
     smog_copy("$curtmpdir/audio", "$curtmpdir/audio.bak"); # may set $panic
 }
 
-
 sub cut {
     my ($start,$end)=@_;
     my ($i,$name);
@@ -4002,7 +4447,7 @@
 	   print STDERR "smogrify debug - rename failed ($!): $smfrom $smto\n";
        }
        sig_system_error("Renaming \"$smfrom\" to \"$smto\"",$!);
-       unlink $pidfile;
+       unlink "$pidfile";
        exit 1;
    }
 
@@ -4014,14 +4459,21 @@
 
 sub smog_copy {
    my ($smfrom,$smto)=@_;
+   my $smcomret;
 
-   my $smcomret=system("/bin/cp -f \"$smfrom\" \"$smto\"");
+   if ($^O eq "MSWin32") {
+       $smcomret=system("cp.exe -f \"$smfrom\" \"$smto\"");
+       
+   }
+   else {
+       $smcomret=system("/bin/cp -f \"$smfrom\" \"$smto\"");
+   }
 
    if ($smcomret!=0 && -f $smfrom) {
        if ($DEBUG_SMOGRIFY) {
 	   print STDERR "smogrify debug - copy failed ($!): $smfrom $smto\n";
        }
-       $panic=sig_system_error("Copying \"$smfrom\" to \"$smto\"",$!);
+       $panic=sig_system_error("Copying $smcomret \"$smfrom\" to \"$smto\"",$!);
    }
 
    $smcomret;
@@ -4042,7 +4494,7 @@
 	}
 
 	sig_system_error("Changing to directory \"$smdir\"",$!);
-	unlink $pidfile;
+	unlink "$pidfile";
 	exit 1;
     }
 }
@@ -4057,12 +4509,6 @@
     my ($nwhere)=$where;
     my ($nfromdir)=$fromdir;
 
-    my $conv_command=$convert_command;
-
-    if ($img_ext2 eq ".jpg" && $img_ext eq ".png") {
-	$conv_command.=" -alpha on";
-    }
-
     my $quick_copy=-1;
 
     if (!defined($times)) {
@@ -4072,6 +4518,13 @@
 	$undo_cut=0;
     }
 
+    if (!defined($img_prefix2)) {
+	$img_prefix2=&get_img_prefix($img_ext2);
+    }
+    if (!defined($img_prefix)) {
+	$img_prefix=&get_img_prefix($img_ext);
+    }
+
     $fromdir="$tmpdir/$from_handle";
     $frames_to_move=($nend-$nstart+1)*$times;
 
@@ -4079,13 +4532,13 @@
     for ($i=$num_frames;$i>$nwhere;$i--) {
 	$from=&mkname($i);
 	$to=&mkname($i+$frames_to_move);
-	if ($i<=($num_frames-$frames_to_move)&&!$undo_cut&&-f "$curtmpdir/$from$img_ext") {
+	if ($i<=($new_frames-$frames_to_move)&&!$undo_cut&&-f "$curtmpdir/$from$img_ext") {
 	    # this frame will get overwritten, so back it up
 	    smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$from.bak");
 	    return if $panic;
 	}
 	smog_rename( "$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
-	&sig_progress($num_frames-$i);
+	&sig_progress($new_frames-$i);
     }
 
     $resize_ext=$img_ext;
@@ -4094,6 +4547,7 @@
 	$antialias="false";
     }
 
+
     #move from $from_handle
     $j=$start;
     while ($times_inserted<$times) {
@@ -4136,7 +4590,7 @@
 		}
 		else {
 		    if ($antialias eq "false") {
-			$com="$conv_command +antialias -size $width"."x$height \"$fromdir/$from$img_ext2\" -scale $width!x$height! \"$curtmpdir/$to$img_ext\" >/dev/null 2>&1";
+			$com="$smog_convert_command +antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1";
 			$smerr=smog_system($com);
 			if ($smerr) {
 			    sig_system_error("$com",$smerr);
@@ -4145,7 +4599,7 @@
 			}
 		    }
 		    else {
-			$com="$conv_command -antialias -size $width"."x$height \"$fromdir/$from$img_ext2\" -scale $width!x$height! \"$curtmpdir/$to$img_ext\" >/dev/null 2>&1";
+			$com="$smog_convert_command -antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1";
 			$smerr=smog_system($com);
 			if ($smerr) {
 			    sig_system_error("$com",$smerr);
@@ -4157,7 +4611,7 @@
 		
 	    }
 	    
-	    &sig_progress(int($num_frames-$where+$j++-$start+1));
+	    &sig_progress(int($new_frames-$where+$j++-$start+1));
 	}
 
 	$times_inserted+=$factor;
@@ -4193,13 +4647,20 @@
 	$antialias="false";
     }
 
+    if (!defined($input_prefix)) {
+	$input_prefix=&get_img_prefix($input_ext);
+    }
+    if (!defined($resize_prefix)) {
+	$resize_prefix=&get_img_prefix($resize_ext);
+    }
+
     # TODO ****  !!! provide alternate if imagemagick is not available
 
     if ($antialias eq "false") {
-	$com="$convert_command +antialias -size $width"."x$height \"$name$input_ext\" -scale $width!x$height! \"$name$resize_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -scale $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
     else {
-	$com="$convert_command -size $width"."x$height \"$name$input_ext\" -resize $width!x$height! \"$name$resize_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command -size $width"."x$height $input_prefix\"$name$input_ext\" -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
     $smerr=smog_system($com);
     if ($smerr) {
@@ -4222,20 +4683,6 @@
     my $from="$name$in_ext";
     my $to="$name$out_ext";
 
-    # make a background frame
-    if (!defined($bgcolour)) {
-	$bgcolour="#000000";
-    }
-    
-    $com="$convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >/dev/null 2>&1";
-    $smerr=smog_system($com);
-    if ($smerr) {
-	sig_system_error("$com",$smerr);
-	$panic=1; 
-	return;
-    }
-
-
     # overlay frame
     $xstart=int(($owidth-$iwidth)/2);
     $ystart=int(($oheight-$iheight)/2);
@@ -4243,7 +4690,7 @@
     #must unlink first in case $to is a symlink (when saving selection)
     unlink "$to";
 
-    $com="$composite_command -compose plus -dissolve 100 -geometry $iwidth!x$iheight!+$xstart!+$ystart! \"$from\" blank.jpg \"$to\" >/dev/null 2>&1";
+    $com="$smog_composite_command -compose plus -dissolve 100 -geometry $iwidth!x$iheight!+$xstart!+$ystart! \"$from\" blank.jpg \"$to\" >$nulfile 2>&1";
     $smerr=smog_system($com);
     if ($smerr) {
 	sig_system_error("$com",$smerr);
@@ -4251,8 +4698,6 @@
 	return;
     }
 
-    unlink "blank.jpg";
-
 }
 
 
@@ -4274,6 +4719,13 @@
 	$input_ext=$img_ext;
     }
     
+    if (!defined($input_prefix)) {
+	$input_prefix=&get_img_prefix($input_ext);
+    }
+    if (!defined($resize_prefix)) {
+	$resize_prefix=&get_img_prefix($resize_ext);
+    }
+
     my ($left)=int($centre_x-($width/(2.*$rscale)))-1;
     my ($top)=int($centre_y-($height/(2.*$rscale)))-1;
     my ($right)=int($centre_x+($width/(2.*$rscale)))+1;
@@ -4305,10 +4757,10 @@
     my ($nheight)=$bottom-$top+1;
     
     if ($antialias eq "false") {
-	$com="$convert_command -antialias -size $width"."x$height \"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! \"$name$resize_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
     else {
-	$com="$convert_command +antialias -size $width"."x$height \"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! \"$name$resize_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
 
     $smerror=smog_system($com);
@@ -4328,14 +4780,20 @@
     if (!defined($input_ext)) {
 	$input_ext=$img_ext;
     }
+    if (!defined($input_prefix)) {
+	$input_prefix=&get_img_prefix($input_ext);
+    }
+    if (!defined($resize_prefix)) {
+	$resize_prefix=&get_img_prefix($resize_ext);
+    }
     if (!defined($antialias)) {
 	$antialias="false";
     }
     if ($antialias eq "false") {
-	$com="$convert_command +antialias -size $width"."x$height \"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y \"$name$resize_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
     else {
-	$com="$convert_command -antialias -size $width"."x$height \"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y \"$name$resize_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
 
     $smerror=smog_system($com);
@@ -4360,6 +4818,14 @@
     &get_image_size("$name$input_ext");
     return if ($panic||$hsize==-1);
 
+    if (!defined($input_prefix)) {
+	$input_prefix=&get_img_prefix($input_ext);
+    }
+
+    if (!defined($resize_prefix)) {
+	$resize_prefix=&get_img_prefix($resize_ext);
+    }
+
     unless ($hsize>=$width&&$vsize>=$height) {
 	#composite over a large enough frame
 	$size=$hsize;
@@ -4375,7 +4841,7 @@
 	    $bgcolour="#000000";
 	}
 
-	$com="$convert_command -size $size!x$size! xc:$bgcolour blank.jpg >/dev/null 2>&1";
+	$com="$smog_convert_command -size $size!x$size! xc:$bgcolour $input_prefix"."blank$input_ext >$nulfile 2>&1";
 
 	$smerror=smog_system($com);
 	
@@ -4385,7 +4851,7 @@
 	    return;
 	}
 
-	$com="$composite_command -compose plus -dissolve 100 -geometry $hsize!x$vsize!+$xstart!+$ystart! \"$name$input_ext\" blank.jpg \"$name$input_ext\" >/dev/null 2>&1";
+	$com="$smog_composite_command -compose plus -dissolve 100 -geometry $hsize!x$vsize!+$xstart!+$ystart! $input_prefix\"$name$input_ext\" $input_prefix"."blank$input_ext $input_prefix\"$name$input_ext\" >$nulfile 2>&1";
 
 	$smerror=smog_system($com);
 	
@@ -4401,7 +4867,7 @@
     $x=int(($hsize-$width)/2);
     $y=int(($vsize-$height)/2);
 
-    $com="$convert_command \"$name$input_ext\" -crop $width" . "!x" . $height . "!+" . $x . "+" . $y . " \"$name$resize_ext\" >/dev/null 2>&1";
+    $com="$smog_convert_command $input_prefix\"$name$input_ext\" -crop $width" . "!x" . $height . "!+" . $x . "+" . $y . " $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     
     $smerror=smog_system($com);
     
@@ -4414,13 +4880,6 @@
 }
 
 
-sub get_ext {
-    # return the extension of a file (including the '.')
-    my ($file)=shift;
-    return substr($file,-4);
-}
-
-
 
 sub get_formats {
     if ($asamps==8){
@@ -4460,14 +4919,16 @@
 
     $endian="";
 
-    # try to force language to English
-    $mplay_command="LANGUAGE=en LANG=en ";
+    if ($^O ne "MSWin32") {
+	# try to force language to English
+	$mplay_command="LANGUAGE=en LANG=en ";
+    }
 
     $mplay_command.=&rc_get("video_open_command");
-    $file_ident="$curtmpdir/file_info";
+    $file_ident="file_info";
 
     if ($mplay_command eq "") {
-	$mplay_command=&get_location("mplayer");
+	$mplay_command="\"".&location("mplayer")."\"";
     }
 
     if ($mplay_command eq "") {
@@ -4481,51 +4942,80 @@
 	$type="Audio";
     }
 
+    smog_chdir("$curtmpdir");
+
     # if mplayer supports the -identify command, use that
     # the format changed for 1.0pre1 so now we use -vo null -ao null -frames 0
 
     unless ($mplay_command eq "") {
 	if (defined($is_remote)&&($is_remote>0)) {
 	    # remote files might be streams, so we need to cache a bit before we can identify them
-	    $com="$mplay_command -identify -vo null -ao null -frames 0 -cache 32 \"$file\">\"$file_ident\" 2>/dev/null </dev/null";
+	    $com="$mplay_command -identify -vo null -ao null -frames 0 -cache 32 \"$file\" > $file_ident 2>$nulfile <$nulfile";
 	    
 	}
 	else {
-	    $com="$mplay_command -identify -vo null -ao null -frames 0 \"$file\">\"$file_ident\" 2>/dev/null </dev/null";
+	    $com="$mplay_command -identify -vo null -ao null -frames 0 \"$file\" > $file_ident 2>$nulfile <$nulfile";
 	}
 
-
 	$smerr=smog_system($com);
+
 	if ($smerr) {
-	    do_system_error("$com",$smerr);
+	    sig_system_error("$com",$smerr);
 	    $panic=1;
 	    return;
 	}
+
+
+
 	
 	if (-f $file_ident) {
-	    $id_vid_form=smog_system_direct("grep ID_VIDEO_CODEC \"$file_ident\" 2>/dev/null");
+
+	    $length=smog_system_direct("grep ID_LENGTH \"$file_ident\" 2>$nulfile");
+	    $length=(split("=",(split("\n",$length))[0]))[1];
+	    chomp($length);
+
+	    if ($length eq "0" &&!(defined($is_remote)&&($is_remote>0))) {
+		$com="$mplay_command -demuxer lavf -identify -vo null -ao null -frames 0 \"$file\" > $file_ident 2>$nulfile <$nulfile";
+
+		$smerr=smog_system($com);
+		
+		if ($smerr) {
+		    sig_system_error("$com",$smerr);
+		    $panic=1;
+		    return;
+		}
+
+
+
+	    }
+
+	}
+
+
+	if (-f $file_ident) {
+	$id_vid_form=smog_system_direct("grep ID_VIDEO_CODEC \"$file_ident\" 2>$nulfile");
         $id_vid_form=(split("=",(split("\n",$id_vid_form))[0]))[1];
         chomp($id_vid_form);
 
 	if ($id_vid_form eq "") {
-	    $id_vid_form=smog_system_direct("grep ID_VIDEO_FORMAT \"$file_ident\" 2>/dev/null");
+	    $id_vid_form=smog_system_direct("grep ID_VIDEO_FORMAT \"$file_ident\" 2>$nulfile");
 	    $id_vid_form=(split("=",(split("\n",$id_vid_form))[0]))[1];
 	    chomp($id_vid_form);
 	}
 
 	if ($id_vid_form eq "") {
-	    $id_vid_form=smog_system_direct("grep VIDEO: \"$file_ident\" 2>/dev/null");
+	    $id_vid_form=smog_system_direct("grep VIDEO: \"$file_ident\" 2>$nulfile");
 	    $id_vid_form=(split("  ",(split("\n",$id_vid_form))[0]))[1];
 	    chomp($id_vid_form);
 	}
 	if (! -f $file_ident) {return;};
 
-	$id_aud_form=smog_system_direct("grep ID_AUDIO_FORMAT \"$file_ident\" 2>/dev/null");
+	$id_aud_form=smog_system_direct("grep ID_AUDIO_FORMAT \"$file_ident\" 2>$nulfile");
 	$id_aud_form=(split("=",(split("\n",$id_aud_form))[0]))[1];
 	chomp($id_aud_form);
 
 	if ($id_aud_form eq "") {
-	    $id_aud_form=smog_system_direct("grep AUDIO: \"$file_ident\" 2>/dev/null");
+	    $id_aud_form=smog_system_direct("grep AUDIO: \"$file_ident\" 2>$nulfile");
 	    $id_aud_form=(split("  ",(split("\n",$id_aud_form))[0]))[1];
 	    chomp($id_aud_form);
 	}
@@ -4542,7 +5032,7 @@
 	    # this could probably be done better using regexp...
 	    $type=$id_vid_form;
 	    if (! -f $file_ident) {return;};
-	    $asamps=smog_system_direct("grep AUDIO: \"$file_ident\" 2>/dev/null");
+	    $asamps=smog_system_direct("grep AUDIO: \"$file_ident\" 2>$nulfile");
 	    $asamps=(split(" ",$asamps))[5];
 	    chomp($asamps);
 
@@ -4570,34 +5060,34 @@
 	    }
 
 	    if (! -f $file_ident) {return;};
-	    $bpp=smog_system_direct("grep VIDEO: \"$file_ident\" 2>/dev/null");
+	    $bpp=smog_system_direct("grep VIDEO: \"$file_ident\" 2>$nulfile");
 	    $bpp=(split("bpp",(split("  ",$bpp))[3]))[0];
 	    chomp($bpp);
 
 	    if (! -f $file_ident) {return;};
 	    if ($bpp eq "") {
-		$bpp=smog_system_direct("grep \"Image size:\" \"$file_ident\" 2>/dev/null");
+		$bpp=smog_system_direct("grep \"Image size:\" \"$file_ident\" 2>$nulfile");
 		@tmp=split(" ",$bpp);
 		$bpp=substr($tmp[5],1,2);
 	    }
 
 	    if (! -f $file_ident) {return;};
-	    $hsize=smog_system_direct("grep ID_VIDEO_WIDTH \"$file_ident\" 2>/dev/null");
+	    $hsize=smog_system_direct("grep ID_VIDEO_WIDTH \"$file_ident\" 2>$nulfile");
 	    $hsize=(split("=",(split("\n",$hsize))[0]))[1];
 	    chomp($hsize);
 	    
 	    if (! -f $file_ident) {return;};
-	    $vsize=smog_system_direct("grep ID_VIDEO_HEIGHT \"$file_ident\" 2>/dev/null");
+	    $vsize=smog_system_direct("grep ID_VIDEO_HEIGHT \"$file_ident\" 2>$nulfile");
 	    $vsize=(split("=",(split("\n",$vsize))[0]))[1];
 	    chomp($vsize);
 	    
 	    if (! -f $file_ident) {return;};
-	    $fps=smog_system_direct("grep ID_VIDEO_FPS \"$file_ident\" 2>/dev/null");
+	    $fps=smog_system_direct("grep ID_VIDEO_FPS \"$file_ident\" 2>$nulfile");
 	    $fps=(split("=",(split("\n",$fps))[0]))[1];
 	    chomp($fps);
 
 	    if (! -f $file_ident) {return;};
-	    $arate=smog_system_direct("grep ID_AUDIO_RATE \"$file_ident\" 2>/dev/null");
+	    $arate=smog_system_direct("grep ID_AUDIO_RATE \"$file_ident\" 2>$nulfile");
 	    my @results=split("\n",$arate);
 	    foreach my $val (@results) {
 		$arate=(split("=",$val))[1];
@@ -4606,20 +5096,20 @@
 	    }
 	    if (! -f $file_ident) {return;};
 	    if ($arate==0) {
-		$arate=smog_system_direct("grep Samplerate \"$file_ident\" 2>/dev/null");
+		$arate=smog_system_direct("grep Samplerate \"$file_ident\" 2>$nulfile");
 		$arate=(split(": ",(split("\n",$arate))[0]))[1];
 		chomp($arate);
 	    }
 
 	    
 	    if (! -f $file_ident) {return;};
-	    $achans=smog_system_direct("grep ID_AUDIO_NCH \"$file_ident\" 2>/dev/null");
+	    $achans=smog_system_direct("grep ID_AUDIO_NCH \"$file_ident\" 2>$nulfile");
 	    chomp($achans);
 	    $achans=(split("\n",$achans))[-1];
 	    $achans=(split("=",(split("\n",$achans))[0]))[1];
 
 	    if (! -f $file_ident) {return;};
-	    $abitrate=smog_system_direct("grep ID_AUDIO_BITRATE \"$file_ident\" 2>/dev/null");
+	    $abitrate=smog_system_direct("grep ID_AUDIO_BITRATE \"$file_ident\" 2>$nulfile");
 	    chomp($abitrate);
 	    $abitrate=(split("\n",$abitrate))[-1];
 	    $abitrate=(split("=",(split("\n",$abitrate))[0]))[1];
@@ -4627,7 +5117,7 @@
 
 	    unless ($id_aud_form eq "" || $achans>0) {
 		# need to look deeper for $achans
-		$adets=smog_system_direct("grep AO: \"$file_ident\" 2>/dev/null");
+		$adets=smog_system_direct("grep AO: \"$file_ident\" 2>$nulfile");
 
 		$adets=(split("AO: ",$adets))[1];
 		chomp($adets);
@@ -4651,36 +5141,33 @@
 	    # grep may fail with error 256
 
 	    if (! -f $file_ident) {return;};
-	    $comment=smog_system_direct("grep Comments: \"$file_ident\" 2>/dev/null");
+	    $comment=smog_system_direct("grep Comments: \"$file_ident\" 2>$nulfile");
 	    @tmp=split(" ",$comment);
 	    shift(@tmp);
 	    $comment=join(" ",@tmp);
 	    chomp($comment);
 
 	    if (! -f $file_ident) {return;};
-	    $title=smog_system_direct("grep Title: \"$file_ident\" 2>/dev/null");
+	    $title=smog_system_direct("grep Title: \"$file_ident\" 2>$nulfile");
 	    @tmp=split(" ",$title);
 	    shift(@tmp);
 	    $title=join(" ",@tmp);
 	    chomp($title);
 
 	    if (! -f $file_ident) {return;};
-	    $title=smog_system_direct("grep Author: \"$file_ident\" 2>/dev/null");
+	    $title=smog_system_direct("grep Author: \"$file_ident\" 2>$nulfile");
 	    @tmp=split(" ",$author);
 	    shift(@tmp);
 	    $author=join(" ",@tmp);
 	    chomp($author);
 
 	    if (! -f $file_ident) {return;};
-	    $count=smog_system_direct("grep \"frames  total\" \"$file_ident\" 2>/dev/null");
+	    $count=smog_system_direct("grep \"frames  total\" \"$file_ident\" 2>$nulfile");
 	    @tmp=split(" ",$count);
 	    $count=$tmp[2];
 	    chomp($count);
 
             if ($count eq "") {
-                $length=smog_system_direct("grep ID_LENGTH \"$file_ident\" 2>/dev/null");
-                $length=(split("=",(split("\n",$length))[0]))[1];
-                chomp($length);
                 $count=int($fps*$length+.5);
             }
             if ($count eq "") {
@@ -4711,7 +5198,7 @@
 		    $count++;
 		    $imresact="none";
 		    if ($only_first) {
-			unlink <$curtmpdir/*$img_ext>;
+			unlink glob "$curtmpdir/*$img_ext";
 			last;
 		    }
 		    else {
@@ -4781,11 +5268,11 @@
     my $smcom;
     &get_formats;
     if (!(&rc_get("audio_player") eq "mplayer")) {
-	$smcom="sox -t .wav \"$audio_in\" -t .raw $xsigned \"$audio_out\" > /dev/null 2>&1";
+	$smcom="sox -t .wav \"$audio_in\" -t .raw $xsigned \"$audio_out\" > $nulfile 2>&1";
     }
     else {
 	$format=&get_mplayer_format;
-	$smcom=&rc_get("video_open_command") . " -quiet \"$audio_in\" -ao pcm:nowaveheader:file=\"$audio_out\" $format >/dev/null 2>&1";
+	$smcom=&rc_get("video_open_command") . " -quiet \"$audio_in\" -ao pcm:nowaveheader:file=\"$audio_out\" $format >$nulfile 2>&1";
     }
 
     my $smerr=smog_system($smcom);
@@ -4808,15 +5295,12 @@
     my ($aasamps)=$asamps/8;
     my $smcom;
 
-
-
     smog_chdir("$curtmpdir");
-    if (&rc_get("audio_player") eq "mplayer") {
+    if (&location("sox") eq "") {
 	$format=&get_mplayer_format;
-	$smcom=&rc_get("video_open_command") . " -quiet -ao pcm -demuxer rawaudio -rawaudio rate=$arate:channels=$achans:samplesize=$aasamps -ao pcm:waveheader $format -vo null \"$audio_in\" >/dev/null 2>&1 </dev/null";
+	$smcom=&rc_get("video_open_command") . " -quiet -ao pcm -demuxer rawaudio -rawaudio rate=$arate:channels=$achans:samplesize=$aasamps -ao pcm:waveheader $format -vo null \"$audio_in\" >$nulfile 2>&1 <$nulfile";
     }
     else {
-
 	if (!defined($sox_version)) {
 	    $sox_version=&get_sox_version;
 	}
@@ -4865,7 +5349,7 @@
 		$nsigned=$asigned;
 	    }
 	}
-	$smcom="sox $nodither -t .raw -r $arate $asigned -$sasamps -c $achans \"$audio_in\" -t .wav -r $nrate -c $nchans $nsigned -$nasamps \"$curtmpdir/audiodump.wav\" >/dev/null 2>&1";
+	$smcom="sox $nodither -t .raw -r $arate $asigned -$sasamps -c $achans \"$audio_in\" -t .wav -r $nrate -c $nchans $nsigned -$nasamps \"$curtmpdir/audiodump.wav\" >$nulfile 2>&1";
     }
 
     my $smerr=smog_system("$smcom");
@@ -4884,6 +5368,7 @@
 #clip (actually, trim) the audio from $start seconds to $end seconds
 sub clip_audio {
     my ($start,$end)=@_;
+    my $smres;
 
     if ($achans==0) {
 	return;
@@ -4893,14 +5378,23 @@
     $audio_out=$curtmpdir."/audioclip";
 
     unlink "$audio_out";
-    my $smres=smog_system("/bin/touch \"$audio_out\"");
+    if ($^O eq "MSWin32") {
+	$smres=smog_system("touch.exe \"$audio_out\"");
+    }
+    else {
+	$smres=smog_system("touch \"$audio_out\"");
+    }
     if ($smres) {
 	$panic=sig_write_error("$audio_out"); 
 	return;
     }
 
-
-    smog_system("/bin/chmod 600 \"$audio_out\"");
+    if ($^O eq "MSWin32") {
+	#smog_system("chmod.exe 600 \"$audio_out\"");
+    }
+    else {
+	smog_system("/bin/chmod 600 \"$audio_out\"");
+    }
 
     $align=$achans*$asamps/8;
 
@@ -4994,10 +5488,10 @@
     }
     
     if (defined($stretch)) {
-	$com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\" stretch $stretch>/dev/null 2>&1";
+	$com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\" stretch $stretch>$nulfile 2>&1";
     }
     else {
-	$com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\">/dev/null 2>&1";
+	$com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\">$nulfile 2>&1";
     }
     $smerr=smog_system($com);
     if ($smerr) {
@@ -5006,21 +5500,35 @@
     }
 }
 
+sub get_ext {
+    my $fname=shift;
+
+    my $ext=(split(/\./,$fname))[-1];
+
+    if ($ext=~/(.*)\"$/) {
+	$ext=$1;
+    }
+
+    return ".".$ext;
+}
 
 
 
 sub insert_audio {
 #what we are going to do:
-# 1) copy the end of the audio (after insertion) to a new file
-# 2) then insert the new section
-# 3) then put the end back
+# 1) copy the end of the audio (after insertion) to a new file [$where to $to_end]
+# 2) insert silence up to $where (if necessary)
+# 3) insert the new section [$start to $end at $where]
+# 4) insert silence up to $where+$end (if necessary)
+# 5) then put the end back
 
 #input params:
 # $where - insertion pt -in seconds
 # $start, $end - new section - in seconds
 # $from_handle - handle of from file
+# $to_end - size of to file
 
-    #if $arate<0, we will insert silence
+    #if $arate<0, we will insert silence from $where to $where+$start-$end
 
     my ($xxsamps,$xxchans,$xxsigned,$xxendian,$needstemp)=@_;
 
@@ -5046,13 +5554,24 @@
     my ($audio_temp)="$curtmpdir/audio.temp";
 
     unlink "$audio_temp";
-    $smres=smog_system("/bin/touch \"$audio_temp\"");
+    if ($^O eq "MSWin32") {
+	$smres=smog_system("touch.exe \"$audio_temp\"");
+    }
+    else {
+	$smres=smog_system("touch \"$audio_temp\"");
+    }
+    
     if ($smres) {
-	$panic=sig_write_error("$audio_temp"); 
+	$panic=sig_write_error("$audio_temp");
 	return;
     }
 
-    smog_system("/bin/chmod 600 \"$audio_temp\"");
+    if ($^O eq "MSWin32") {
+	#smog_system("chmod.exe 600 \"$audio_temp\"");
+    }
+    else {
+	smog_system("/bin/chmod 600 \"$audio_temp\"");
+    }
 
     $silence=0;
     if ($arate<0) {
@@ -5062,17 +5581,15 @@
 
     $align=$achans*$asamps/8;
 
-    $ospos=$spos=&align($arate*$align*$start);
-    $oepos=$epos=&align($arate*$align*$end);
-    $owpos=$wpos=&align($arate*$align*$where);
+    my $ospos=$spos=&align($arate*$align*$start);
+    my $oepos=$epos=&align($arate*$align*$end);
+    my $owpos=$wpos=&align($arate*$align*$where);
 
 
-    # step 1 - move end to temp
-    # we can omit this if not undo_cut as we have audio.bak
+    # step 1 - copy end to temp
     if ($needstemp) {
-	$fsize=-s $audio_to;
-	
-	my ($size)=$fsize-$wpos;
+	my $to_end=-s $audio_to;
+	my $size=$to_end-$wpos;
 	if ($size>0) {
 	    $fdd_in=$audio_to;
 	    $fdd_out=$audio_temp;
@@ -5082,15 +5599,17 @@
 	}
     }
 
-    # step 2 - insert new section (possibly multiple times)
     $audio_file=$audio_to;
 
 
-    # pad with silence to insertion point
+    # step 2 - pad with silence to insertion point (if necessary)
     &append_silence(0,$wpos,$xxsamps,$xxchans,$xxsigned,$xxendian);
     return if $panic;
 
+
 ####################################################
+    # step 3 - insert new section (possibly multiple times)
+
     my ($nepos)=$epos;
     my ($nspos)=$spos;
     my ($nwpos)=$wpos;
@@ -5118,10 +5637,10 @@
 		return if ($panic);
 	    }
 	}
-	
+
 	$times_inserted+=$factor;
-	# pad with silence if necessary
-	if (-s $audio_temp||$times_inserted<$times) {
+	# step 4, pad with silence if necessary
+	if (! $silence && (-s $audio_temp||$times_inserted<$times)) {
 	    $inserted=$oepos-$nspos;
 	    &append_silence(0,$nwpos+$inserted,$xxsamps,$xxchans,$xxsigned,$xxendian);
 	    return if ($panic);
@@ -5150,18 +5669,20 @@
 	    $nspos+=($oepos-$nspos)/2;
 	    $factor/=2;
 	}
+
 	if ($factor+$times_inserted==$times) {
 	    # this will be our last insertion...
 	    if (-s $audio_temp==0) {
 		$nepos-=$silence_remembered;
 	    }
 	}
+
     }
 
 
 ####################################################
 
-    #step 3 - copy end back after insertion
+    #step 5 - copy end back after insertion
     if ($needstemp) {
 	$size=&align(-s $audio_temp);
 	if ($size>0) {
@@ -5189,6 +5710,7 @@
     }
 
     smog_system_sync();
+
 }
 
 
@@ -5217,12 +5739,22 @@
 	smog_rename("$audio_in","$audio_bak");
     }
     else {
-	$smres=smog_system("/bin/touch \"$audio_temp\"");
+	if ($^O eq "MSWin32") {
+	    $smres=smog_system("touch.exe \"$audio_temp\"");
+	}
+	else {
+	    $smres=smog_system("touch \"$audio_temp\"");
+	}
 	if ($smres) {
 	    $panic=sig_write_error("$audio_temp"); 
 	    return;
 	}
-	smog_system("/bin/chmod 600 \"$audio_temp\"");
+	if ($^O eq "MSWin32") {
+	    #smog_system("chmod.exe 600 \"$audio_temp\"");
+	}
+	else {
+	    smog_system("/bin/chmod 600 \"$audio_temp\"");
+	}
 	
 	$align=$achans*$asamps/8;
 	
@@ -5300,40 +5832,71 @@
 
 
 sub append_silence {
-    #pad from end of file to byte $end-1 with zeros
+    #pad from end - $offset of $audio_file to byte $end-1 with zeros
     my ($offset,$end,$asamps,$achans,$asigned,$aendian,$audio_file)=@_;
     if ($audio_file eq "") {
 	$audio_file="$curtmpdir/audio";
     }
 
     unless (-f $audio_file) {
-	$smres=smog_system("/bin/touch \"$audio_file\"");
+	if ($^O eq "MSWin32") {
+	    $smres=smog_system("touch.exe \"$audio_file\"");
+	}
+	else {
+	    $smres=smog_system("touch \"$audio_file\"");
+	}
 	if ($smres) {
 	    $panic=sig_write_error("$audio_file"); 
 	    return;
 	}
-	smog_system("/bin/chmod 600 \"$audio_file\"");
+	if ($^O eq "MSWin32") {
+	    #smog_system("chmod.exe 600 \"$audio_file\"");
+	}
+	else {
+	    smog_system("/bin/chmod 600 \"$audio_file\"");
+	}
     }
 
     my $fsize= -s $audio_file;
-    $fsize=&align($fsize-$offset);
-    my $size=&align($end-$fsize);
+    $fsize=&align($fsize-$offset); #insert at $fsize-$offset
+    my $size=&align($end-$fsize); #insert to $end
 
     if ($size>0) {
 	if ($asigned==1) {
-	    $fdd_in="/dev/zero";
 	    $fdd_out=$audio_file;
-
-	    &fast_dd($size,0,$fsize);
+	    if ($^O eq "MSWin32") {
+		$smres=smog_system("touch.exe \"$audio_file\"");
+		if ($smres) {
+		    $panic=sig_write_error("$audio_file"); 
+		    return;
+		}
+		open AUD,"+<","$audio_file" or $panic=sig_write_error("$audio_file");
+		return if $panic;
+		seek AUD,-$offset,SEEK_END or $panic=sig_write_error("$audio_file");
+		return if $panic;
+		for ($i=0;$i<$size;$i++) {
+		    print AUD chr(0) or $panic=sig_write_error("$audio_file");
+		    return if $panic;
+		}
+	    }
+	    else {
+		$fdd_in="/dev/zero";
+		&fast_dd($size,0,$fsize);
+	    }
 	    return if $panic;
 	}
 	else {
-	    $smres=smog_system("/bin/touch \"$audio_file\"");
+	    if ($^O eq "MSWin32") {
+		$smres=smog_system("touch.exe \"$audio_file\"");
+	    }
+	    else {
+		$smres=smog_system("touch \"$audio_file\"");
+	    }
 	    if ($smres) {
 		$panic=sig_write_error("$audio_file"); 
 		return;
 	    }
-	    open AUD,"+<$audio_file" or $panic=sig_write_error("$audio_file");
+	    open AUD,"+<","$audio_file" or $panic=sig_write_error("$audio_file");
 	    return if $panic;
 	    seek AUD,-$offset,SEEK_END or $panic=sig_write_error("$audio_file");
 	    return if $panic;
@@ -5466,37 +6029,35 @@
     $name=&mkname($i);
     my $nframes=0;
 
-    my $conv_command=$convert_command;
-
     if ($file =~ /:\/\//) {
 	return 0;
     }
 
     if (!defined($file_ext)) {
-	$file_ext=&get_ext($file);
+	$file_ext=&get_ext("$file");
     }
 
-    if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg"||$file_ext eq ".ogg"||$file_ext eq ".mov"||$file_ext eq ".ogv"||$file_ext eq ".webm"||$file_ext eq ".mkv"||$file_ext eq ".asf"||$file_ext eq ".wmv"||$file_ext eq ".flv"||$file_ext eq ".mng"||$file_ext eq ".dv"||$file_ext eq ".mp3") {
+    if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg"||$file_ext eq ".ogg"||$file_ext eq ".mov"||$file_ext eq ".ogv"||$file_ext eq ".webm"||$file_ext eq ".mkv"||$file_ext eq ".asf"||$file_ext eq ".wmv"||$file_ext eq ".flv"||$file_ext eq ".mng"||$file_ext eq ".dv"||$file_ext eq ".mp3" || $file_ext eq ".mpeg") {
 	# need to set $name before we return
 	return 0;
     }
 
     if ($hsize*$vsize==0) {
 	&get_image_size($file);
-	return if ($panic||$hsize==-1);
+	return 0 if ($panic||$hsize==-1);
     }
 
-    smog_system_sync();
-
-    if ($img_ext eq ".png") {
-	$conv_command.=" -alpha on";
+    if ($hsize*$vsize==0) {
+	return 0;
     }
 
+    smog_system_sync();
+
     if ($antialias eq "false") {
-	$com="$conv_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! \"$curtmpdir/$name$img_ext\" > /dev/null 2>&1";
+	$com="$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1";
     }
     else {
-	$com="$conv_command \"$file\" -resize $hsize"."!x"."$vsize! \"$curtmpdir/$name$img_ext\" >/dev/null 2>&1";
+	$com="$smog_convert_command \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" >$nulfile 2>&1";
     }
 
 
@@ -5505,7 +6066,7 @@
     if ($smerr) {
 	sig_system_error("$com",$smerr);
 	$panic=1;
-	return;
+	return 0;
     }
 
 
@@ -5543,9 +6104,9 @@
     my ($i);
 
     #identify hangs if the file extension is ".avi" or ".mp4"...maybe more...
-    my ($file_ext)=&get_ext($file);
+    my ($file_ext)=&get_ext("$file");
 
-    if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg") {
+    if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg"||$file_ext eq ".mpeg") {
 	$height=$width=$bpp=0;
 	return;
     }
@@ -5560,7 +6121,7 @@
     my ($id_cmd)=&location("identify");
 
     unless ($id_cmd eq "") {
-	$com="$id_cmd \"$file\" 2>/dev/null";
+	$com="\"$id_cmd\" \"$file\" 2>$nulfile";
 	@info=split / /, smog_system_direct($com);
 
 	if ($?) {
@@ -5583,10 +6144,8 @@
 	$hsize=$size[0];
 	$vsize=$size[1];
 	
-	if ($imresact eq ""||$imresact eq "default") {
-	    $hsize=$vsize="";
-	}
-	elsif ($imresact eq "bound") {
+
+	if ($imresact eq "bound") {
 	    if ($hsize>$dwidth) {
 		$shrink=$hsize/$dwidth;
 		$hsize/=$shrink;
@@ -5600,6 +6159,9 @@
 	    $hsize=int($hsize);
 	    $vsize=int($vsize);
 	}
+	else {
+	    $hsize=$vsize="";
+	}
     }
     if (!defined($hsize)||$hsize eq "") {
 	$hsize=$dwidth;
@@ -5615,14 +6177,9 @@
     # resample and fill gaps in frames
 
     my $next=0;
-    $conv_command=$convert_command;
 
     smog_chdir("$curtmpdir");
 
-    if ($img_ext eq ".png") {
-	$conv_command.=" -alpha on";
-    }
-    
 
     for ($i=1;$i<=$end;$i++) {
 	$name=&mkname($i);
@@ -5662,10 +6219,10 @@
 	    return if ($panic||$hsize==-1);
 
 	    if ($hsize<$width||$vsize<$height) {
-		$com="$conv_command -resize $width" . "!x" . $height . "!+0+0 \"$xname$img_ext\" \"$xname.mgk\" >/dev/null 2>&1";
+		$com="$smog_convert_command -resize $width" . "!x" . $height . "!+0+0 $img_prefix_prefix\"$xname$img_ext\" $img_prefix\"$xname.mgk\" >$nulfile 2>&1";
 	    }
 	    else {
-		$com="$conv_command -crop $width" . "!x" . $height . "! \"$xname$img_ext\" \"$xname.mgk\" >/dev/null 2>&1";
+		$com="$smog_convert_command -crop $width" . "!x" . $height . "! $img_prefix\"$xname$img_ext\" $img_prefix\"$xname.mgk\" >$nulfile 2>&1";
 	    }
 	    $smerr=smog_system($com);
 	    if ($smerr) {
@@ -5692,12 +6249,12 @@
 
     # prefer mpg321 if it's available
     unless (&location("mpg321") eq "") {
-	smog_system("mpg321 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >/dev/null 2>&1");
+	smog_system("mpg321 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >$nulfile 2>&1");
 	$f_size=-s $audio_in;
     }
     if ($f_size==0) {
 	unless (&location("mpg123") eq "") {
-	    smog_system("mpg123 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >/dev/null 2>&1");
+	    smog_system("mpg123 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >$nulfile 2>&1");
 	    $f_size=-s $audio_in;
 	}
     }
@@ -5744,8 +6301,8 @@
     }
     
     unless (&location("ogg123") eq "") {
-	smog_system("ogg123 -d wav -f \"$audio_in\" \"$file\" >/dev/null 2>&1");
-	$f_size= -s $audiofile;
+	smog_system("ogg123 -d wav -f \"$audio_in\" \"$file\" >$nulfile 2>&1");
+	$f_size= -s $audio_in;
     }
 
     if ($f_size==0) {
@@ -5753,6 +6310,7 @@
 	return;
     }
 
+
     $file=$audio_in;
     $is_audio=1;
 
@@ -5779,7 +6337,7 @@
     if ($f_size==0) {
 	$f_size= -s $audio_in;
     }
-
+    
 }
 
 
@@ -5831,7 +6389,8 @@
     $asigned=1;
     $format=&get_mplayer_format;
 
-    $com=&rc_get("video_open_command") . " -quiet \"$file\" -ao pcm:waveheader:file=\"$audio_in\" $format >/dev/null 2>&1 </dev/null";
+    $com=&rc_get("video_open_command") . " -quiet \"$file\" -ao pcm:waveheader:file=\"$audio_in\" $format >$nulfile 2>&1 <$nulfile";
+
     $smerr=smog_system($com);
 
     if ($smerr) {
@@ -5969,22 +6528,24 @@
     # clear away any old backup files, etc.
     return if (! -d "$tmpdir/$handle");
     smog_chdir("$tmpdir/$handle");
-    unlink <*.mgk *.bak *.pre *.tmp pause audio.* audiodump*>;
+    unlink glob "*.mgk *.bak *.pre *.tmp pause audio.* audiodump* audioclip";
     smog_system_sync();
 }
 
 
 
 sub sig_complete {
+
     return if (! -d "$curtmpdir");
     my($status)="completed";
     foreach (@_) {
 	$status.="|".$_;
     }
+
     smog_system_sync();
 
     if (-d $curtmpdir) {
-	open OUT,"> $statusfile";
+	open OUT,">","$statusfile";
 	print OUT "$status";
 	close OUT;
 	unlink "$pidfile";
@@ -6045,6 +6606,7 @@
     print OUT $status;
     close OUT;
     unlink "$pidfile";
+
     smog_system_sync();
     exit 1;
 }
@@ -6167,18 +6729,22 @@
 sub location {
     # return the location of an executable
     my ($command)=shift;
-    my ($location)=smog_system_direct("which \"$command\" 2>/dev/null");
+
+    if ($^O eq "MSWin32") {
+	return "$command.exe";
+    }
+
+    my ($location)=smog_system_direct("which \"$command\" 2>$nulfile");
     chomp($location);
+
     $location;
 }
 
 
 sub rc_set_if_not_set {
-    my ($key)=$_[0];
-    shift (@_);
-    my ($value)=join(" ",@_);
+    my ($key,$value)=@_;
     $skip_if_exist=1;
-    &rc_set($key,$value);
+    &rc_set("$key","$value");
 }
 
 sub rc_delete {
@@ -6191,10 +6757,8 @@
 
 
 sub rc_set {
-    # set/mdoify/delete a value in the .rc file
-    my ($key)=$_[0];
-    shift (@_);
-    my ($value)=join(" ",@_);
+    # set/modify/delete a value in the .rc file
+    my ($key,$value)=@_;
 
     my ($rcfile)=$home."/".$rc_filename;
 
@@ -6206,6 +6770,10 @@
 	exit 3;
     }
 
+    if (substr($value,-1,1) eq "\"" && substr($value,0,1) ne "\"") {
+	$value=substr($value,0,length($value)-1);
+    }
+
     # autoflush output
     select((select(OUT), $| = 1)[0]);
 
@@ -6291,7 +6859,7 @@
 	if ($found==0&&$delpref==0) {
 	    if ($priority==1) {
 		$priority=2;
-		&rc_set($key,$value);
+		&rc_set("$key","$value");
 	    }
 	    else {
 		print OUT "\n<$key>\n$value\n</$key>\n";
@@ -6311,8 +6879,8 @@
 sub rc_get {
     # return a value from our .rc file
     my ($key)=shift;
-    my ($rcfile)=$home.'/'.$rc_filename;
-    my ($string)='';
+    my $rcfile="$home/$rc_filename";
+    my $string="";
 
     if (defined($prefs_file)) {
 	$rcfile=$prefs_file;
@@ -6365,7 +6933,16 @@
 
     my $data,$i;
 
-    if (! open FFIN,"<$fdd_in") {
+    my $sizecheck = -s $fdd_in;
+
+    if ($fdd_in ne "/dev/zero" && $size > $sizecheck) {
+	if ($DEBUG_SMOGRIFY) {
+	    print STDERR "smogrify debug - fast_dd was asked to read $size bytes from a $sizecheck byte file\n$fdd_in\n";
+	}
+	$size=$sizecheck;
+    }
+
+    if (! open FFIN,"<","$fdd_in") {
 	if (-f "$fdd_in") {
 	    $panic=sig_read_error("$fdd_in");
 	}
@@ -6375,13 +6952,18 @@
     seek FFIN,$skip,SEEK_START or $panic=sig_read_error("$fdd_in");
     return if $panic;
 
-    $smres=smog_system("/bin/touch $fdd_out");
+    if ($^O eq "MSWin32") {
+	$smres=smog_system("touch.exe $fdd_out");
+    }
+    else {
+	$smres=smog_system("touch $fdd_out");
+    }
     if ($smres) {
 	$panic=sig_write_error("$fdd_out"); 
 	return;
     }
-
-    open FFOUT,"+<$fdd_out" or $panic=sig_write_error("$fdd_out");
+    
+    open FFOUT,"+<","$fdd_out" or $panic=sig_write_error("$fdd_out");
     return if $panic;
     seek FFOUT,$seek,SEEK_START or $panic=sig_write_error("$fdd_out");
     return if $panic;
@@ -6437,7 +7019,6 @@
 	    $gap/=2;
 	}
     }
-    
     return $count;
 }
     
@@ -6468,7 +7049,7 @@
 	unless (mkdir $tmpdir,0777) {
 	    unless ($gui_bootstrap_file eq "") {
 		open OUT,"> $gui_bootstrap_file" or exit 4;
-		print OUT "$version|$tmpdir|$msg|$msg2";
+		print OUT "$version#$tmpdir#$msg#$msg2";
 		close OUT;
 	    }
 	    exit 5;
@@ -6481,7 +7062,14 @@
 sub fndset {
     # check if a directory is in a set (old style)
     # but useful for frontend marking the currently opened clips, so we do not prune them by accident
-    /^set\./ or return;
+
+    if ($^O eq "MSWin32") {
+	/^set/ or return;
+    }
+    else {
+	/^set\./ or return;
+    }
+
     $in_set=1;
 }
 
@@ -6500,18 +7088,18 @@
     my ($ret)="";
 
     if ($key eq "mplayer_play_video_command") {
-	$ret=&location("mplayer");
+	$ret="\"".&location("mplayer")."\"";
 	if (!($ret eq "")) {
 	    $ret.=" -double";
 	}
     }
 
     elsif ($key eq "sox_command") {
-	$ret=&location("play");
+	$ret="\"".&location("play")."\"";
     }
 
     elsif ($key eq "mplayer_audio_command") {
-	$ret=&location("mplayer");
+	$ret="\"".&location("mplayer")."\"";
     }
 
     $ret;
@@ -6532,7 +7120,7 @@
     $msg="";
 
     # throw a warning if using png and convert_version < 6.0.0
-    if (&rc_get("default_image_format") eq "png" && $convert_version_hash<6000) {
+    if (&rc_get("default_image_format") eq "png" && $convert_version_hash<6000 && $convert_version_hash>0) {
 	$msg="You are advised to upgrade to at least version 6.0 of Image Magick if using png files";
     }
 
@@ -6542,8 +7130,6 @@
 	    $msg="!updmsg";
 	}
 
-	print STDERR "vals $version_hash and $new_version_hash\n";
-
 	if ($version_hash<8005) {
 	    # not used now
 	    &rc_delete("frontend");
@@ -6598,9 +7184,9 @@
 	    $msg="Default OSC port has been changed to 49999.";
 	}
 	unless ($old_version eq $version) {
-	    $current_keymap=smog_system_direct("grep \"keymap file version 4\" \"$lives_home_dir$default_keymap\" 2>/dev/null");
+	    $current_keymap=smog_system_direct("grep \"keymap file version 4\" \"$lives_home_dir/$default_keymap\" 2>$nulfile");
 	    if ($current_keymap eq "") {
-		unlink "$lives_home_dir$default_keymap";
+		unlink "$lives_home_dir/$default_keymap";
 	    }
 	    unless (&location("build-lives-plugin-multi") eq "") {
 		smog_system("build-lives-plugin-multi custom");
@@ -6611,7 +7197,7 @@
 
 
     # bless this version
-    &rc_set("version",$version);
+    &rc_set("version","$version");
 }
 
 
@@ -6635,7 +7221,7 @@
     # convert input like 255,255,255 to #FFFFFF
 
     my ($red,$green,$blue)=@_;
-    sprintf("'#%02X%02X%02X'",int($red),int($green),int($blue));
+    sprintf("\"#%02X%02X%02XFF\"",int($red),int($green),int($blue));
 }
 
 
@@ -6647,6 +7233,18 @@
 	return &get_format_request;
     }
     else {
+	
+	if ($^O eq "MSWin32") {
+	    # filter by file ext
+	    my $ext=&get_ext("$plugin");
+	    if ($ext eq ".py") {
+		$cmd="python";
+	    }
+	    else {
+		$cmd="perl";
+	    }
+	    return smog_system_direct("$cmd \"$plugin\" get_format_request");
+	}
 	return smog_system_direct("\"$plugin\" get_format_request");
     }
 }
@@ -6658,7 +7256,7 @@
     # a * 1,000,000 plus b * 1,000 plus c
     # eg. 1.4.6 becomes 10004006
 
-    my $real_convert_command=(split(" ",$convert_command))[0];
+    my $real_convert_command=(split(" ",$smog_convert_command))[0];
     my $convert_version=smog_system_direct("$real_convert_command | grep -i version");
     $convert_version=(split(" ",$convert_version))[2];
     return &version_hash($convert_version);
@@ -6683,15 +7281,15 @@
     smog_chdir("$tmpdir");
 
     # get starting disk space
-    my $start_total=(split / /, (smog_system_direct("du -sb 2>/dev/null")))[0];
+    my $start_total=(split / /, (smog_system_direct("du -sb 2>$nulfile")))[0];
 
     use File::Find;
     opendir DIR,$tmpdir;
     while ($file=readdir(DIR)) {
 	unless ($file =~ /^\./) {
+
 	    if (-d "$tmpdir/$file") {
                 # remove a set unlesss it has clips OR (layouts AND NOT (opts & 0x04))
-          
 		if (&is_non_empty_dir("$tmpdir/$file/clips") || (&is_non_empty_dir("$tmpdir/$file/layouts") && !($opts & 0x04))) {
 		    # new style sets, check clips and optionally layouts
 		    unless (!defined($new_temp)||$new_temp eq "") {
@@ -6710,11 +7308,23 @@
 		    }
 		}
 		else {
+
+
                     # dir is of no interest
 		    $in_set=0;
 		    find (\&fndset,"$tmpdir/$file/");
 		    if (!$in_set && !($opts & 0x01)) {
-                       smog_system("/bin/rm -rf \"$tmpdir/$file\"");
+    	                if ($^O eq "MSWin32") {
+	                  if (chdir("$tmpdir/$file")) {
+		            unlink glob "* *.* .*";
+		            smog_chdir("$tmpdir");
+		            rmdir "$tmpdir/$file";
+	                  }
+
+	                }
+	                else {
+                           smog_system("/bin/rm -rf \"$tmpdir/$file\"");
+	                }
 		    }
 		    else {
                        unless ($opts & 0x02) {
@@ -6757,14 +7367,17 @@
     unless ($opts & 0x10) {
       # clean up a few extra remnants
       smog_chdir("$tmpdir");
-      unlink < .* rfx.* /tmp/.smogval* /tmp/lives-symlinks >;
-	 unless (!defined($new_temp)||$new_temp eq "") {
-              unlink < firew.* encoder_log_* stream.* >;
-         }
+      unlink glob ".* rfx.* smogplugin.*";
+      if ($^O ne "MSWin32") {
+	  unlink glob "/tmp/.smogval* /tmp/lives-symlinks";
+      }
+      unless (!defined($new_temp)||$new_temp eq "") {
+	  unlink glob "firew.* encoder_log_* stream.*";
+      }
     }
 
     # total disk space at end
-    my $end_total=(split / /, (smog_system_direct("du -sb 2>/dev/null")))[0];
+    my $end_total=(split / /, (smog_system_direct("du -sb")))[0];
 
     # return disk space gained (in bytes)
     return $start_total-$end_total;
@@ -6822,14 +7435,30 @@
     
     if (-d $linksdir) {
 	# remove directory + contents
-	smog_system("/bin/rm -rf \"$linksdir\"");
+	if ($^O eq "MSWin32") {
+	    smog_system("DEL /q \"$linksdir\"");
+	    smog_system("RMDIR \"$linksdir\"");
+	}
+	else {
+	    smog_system("/bin/rm -rf \"$linksdir\"");
+	}
     }
     
     #create dir so next step works
-    smog_system("/bin/mkdir -p \"$linksdir\"");
+    if ($^O eq "MSWin32") {
+	smog_system("mkdir.exe /p \"$linksdir\"");
+    }
+    else {
+	make_path("$linksdir");
+    }
 
     # remove dir + any empty parents
-    smog_system("/bin/rmdir -p \"$linksdir\" 2>/dev/null");
+    if ($^O eq "MSWin32") {
+	smog_system("rmdir.exe /p \"$linksdir\" 2>$nulfile");
+    }
+    else {
+	smog_system("/bin/rmdir -p \"$linksdir\" 2>$nulfile");
+    }
 }

LiVES-1.6.1.tar.bz2/src/Makefile.am -> LiVES-2.0.3.tar.bz2/src/Makefile.am Changed

@@ -23,6 +23,16 @@
 solaris_CFLAGS=-DIS_SOLARIS=1
 endif
 
+if IS_MINGW
+mingw_CFLAGS= -DIS_MINGW=1  -DUSE_SWSCALE=1
+#yuv4mpeg_SOURCES=lives-yuv4mpeg.c lives-yuv4mpeg.h
+#yuv4mpeg_CFLAGS = -DHAVE_MJPEGTOOLS=1
+gtk_LIBFLAGS = @GTK_LIBS_NODYNAMIC@ -lpthread -Wl,/home/gabriel/lives-wine-test/ffmpeg/swscale-2.dll
+else
+gtk_LIBFLAGS = @GTK_LIBS_NODYNAMIC@ -pthread
+endif
+
+
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DLIVES_DIR=\""$(livesdir)"\" \
@@ -76,8 +86,11 @@
 
 
 if ENABLE_LIBOIL
-
-oil_LDADD = @OIL_LIBS@ -loil-0.3
+if IS_MINGW
+oil_LIBFLAGS = @OIL_LIBS@
+else
+oil_LIBFLAGS = @OIL_LIBS@ -loil-0.3
+endif
 oil_CFLAGS =  @OIL_CFLAGS@ -DENABLE_OIL=1
 
 endif
@@ -117,14 +130,6 @@
 pulse_SOURCES=pulse.c pulse.h
 endif
 
-if HAVE_GTK_VERSION214
-gtk_def += -DHAVE_GTK_NICE_VERSION=1
-endif
-
-if HAVE_GTK_VERSION216
-gtk_def += -DHAVE_GTK_VERSION216=1
-endif
-
 if HAVE_LIBPNG
 png_LDADD=@PNG_LIBS@
 png_CFLAGS=@PNG_CFLAGS@ -DUSE_LIBPNG=1
@@ -133,15 +138,15 @@
 if HAVE_SWSCALE
 if HAVE_AVCODEC
 if HAVE_AVUTIL
-swscale_LDADD=@LIBSWSCALE_LIBS@
-swscale_CFLAGS=@LIBSWSCALE_CFLAGS@ -DUSE_SWSCALE=1
+swscale_LDADD=@LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
+swscale_CFLAGS=@LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ -DUSE_SWSCALE=1
 endif
 endif
 endif
 
 
 if ENABLE_GIW
-giw_SOURCES=giw/giwknob.c giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c giw/giwled.h
+giw_SOURCES=giw/giwknob.c giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c giw/giwled.h giw/giwtimeline.c giw/giwtimeline.h
 giw_LDADD=-lm
 giw_CFLAGS=-DENABLE_GIW=1
 endif
@@ -154,6 +159,7 @@
 	effects.c\
 	plugins.c plugins.h\
 	effects-weed.c effects-weed.h\
+	effects-data.c effects-data.h \
 	framedraw.c framedraw.h\
 	interface.c interface.h \
 	paramspecial.c paramspecial.h\
@@ -188,16 +194,24 @@
 	$(ldvgrab_SOURCES) \
 	$(giw_SOURCES)
 
-lives_exe_LDADD = @GTK_LIBS_NODYNAMIC@ @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \
-	$(oil_LDADD) $(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) -lpthread $(libweed_LDADD) \
-	 $(giw_LDADD) $(v4l1_LDADD) $(lives_exe_LDFLAGS) \
+
+
+lives_exe_LDFLAGS = $(gtk_LIBFLAGS) -shared $(oil_LIBFLAGS)
+
+lives_exe_LDADD = @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \
+	$(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) $(pthread_LDADD) $(libweed_LDADD) \
+	 $(giw_LDADD) $(v4l1_LDADD) \
 	@UNICAP_LIBS@
 
-AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) $(oil_CFLAGS) \
-	$(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(alsa_CFLAGS) $(png_CFLAGS) $(swscale_CFLAGS) \
+#-D__STDC_CONSTANT_MACROS
+
+AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) \
+	$(oil_CFLAGS) \
+	$(darwin_CFLAGS) $(irix_CFLAGS) $(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) $(mingw_CFLAGS) $(alsa_CFLAGS) $(png_CFLAGS) $(swscale_CFLAGS) \
 	$(jack_CFLAGS) $(pulse_CFLAGS) $(giw_CFLAGS) $(unicap_CFLAGS) $(libweed_CFLAGS) $(libweed_compat_CFLAGS) \
 	-DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def)
 
+AM_CXXFLAGS = -D__STDC_CONSTANT_MACROS
 
 if HAVE_AVFORMAT
 if HAVE_AVCODEC
@@ -207,4 +221,9 @@
 endif
 endif
 
+if ENABLE_PROFILING
+AM_CFLAGS += -pg
+AM_CXXFLAGS += -pg
+endif
+

LiVES-1.6.1.tar.bz2/src/Makefile.in -> LiVES-2.0.3.tar.bz2/src/Makefile.in Changed

LiVES-1.6.1.tar.bz2/src/audio.c -> LiVES-2.0.3.tar.bz2/src/audio.c Changed

@@ -1,31 +1,33 @@
 // audio.c
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2011
+// (c) G. Finch 2005 - 2012
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "main.h"
-#include "audio.h"
-#include "events.h"
-#include "callbacks.h"
-#include "effects.h"
-#include "support.h"
-
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-host.h>
+#include <weed/weed-effects.h>
 #include <weed/weed-palettes.h>
 #else
 #include "../libweed/weed.h"
 #include "../libweed/weed-host.h"
+#include "../libweed/weed-effects.h"
 #include "../libweed/weed-palettes.h"
 #endif
 
+#include "main.h"
+#include "audio.h"
+#include "events.h"
+#include "callbacks.h"
+#include "effects.h"
+#include "support.h"
+
 
-// keep first 16 audio_in filesysten handles open - mulitrack only
+// keep first 16 audio_in filesysten handles open - multitrack only
 #define NSTOREDFDS 16
 static gchar *storedfnames[NSTOREDFDS];
 static int storedfds[NSTOREDFDS];
@@ -62,13 +64,13 @@
 
 
 
-LIVES_INLINE void sample_silence_dS (float *dst, unsigned long nsamples) {
+LIVES_INLINE void sample_silence_dS (float *dst, uint64_t nsamples) {
   memset(dst,0,nsamples*sizeof(float));
 }
 
 
 void sample_move_d8_d16(short *dst, unsigned char *src,
-			unsigned long nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
+			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
   // convert 8 bit audio to 16 bit audio
 
   register int nSrcCount, nDstCount;
@@ -121,9 +123,9 @@
 
 
 
-/* convert from any number of source channels to any number of destination channels */
+/* convert from any number of source channels to any number of destination channels - both interleaved */
 void sample_move_d16_d16(short *dst, short *src,
-			 unsigned long nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign) {
+			 uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign) {
   register int nSrcCount, nDstCount;
   register float src_offset_f=0.f;
   register int src_offset_i=0;
@@ -198,7 +200,7 @@
 
 /* convert from any number of source channels to any number of destination channels - 8 bit output */
 void sample_move_d16_d8(uint8_t *dst, short *src,
-			 unsigned long nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
+			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
   register int nSrcCount, nDstCount;
   register float src_offset_f=0.f;
   register int src_offset_i=0;
@@ -239,7 +241,7 @@
       /* then start the src channels back where we were */
       if(!nSrcCount && nDstCount) {
 	ccount=0;
-	  nSrcCount = nSrcChannels;
+	nSrcCount = nSrcChannels;
       }
     }
     
@@ -250,10 +252,9 @@
 
 
 
-void sample_move_d16_float (float *dst, short *src, unsigned long nsamples, unsigned long src_skip, int is_unsigned, float vol) {
+void sample_move_d16_float (float *dst, short *src, uint64_t nsamples, uint64_t src_skip, int is_unsigned, boolean rev_endian, float vol) {
   // convert 16 bit audio to float audio
 
-
   register float svolp,svoln;
 
 #ifdef ENABLE_OIL
@@ -265,6 +266,10 @@
   register short valss;
 #endif
 
+  uint8_t srcx[2];
+  short srcxs;
+  short *srcp;
+
   if (vol==0.) vol=0.0000001f;
   svolp=SAMPLE_MAX_16BIT_P/vol;
   svoln=SAMPLE_MAX_16BIT_N/vol;
@@ -277,24 +282,32 @@
 
   while (nsamples--) {
 
+    if (rev_endian) {
+      memcpy(&srcx,src+1,2);
+      srcxs=(srcx[0]<<8) + srcx[1];
+      srcp=&srcxs;
+    }
+    else srcp=src;
+
     if (!is_unsigned) {
 #ifdef ENABLE_OIL
-      oil_scaleconv_f32_s16(&val,src,1,&y,val>0?&xp:&xn);
+      oil_scaleconv_f32_s16(&val,srcp,1,&y,val>0?&xp:&xn);
 #else
-      if ((val = (float)((float)(*src) / (*src>0?svolp:svoln) ))>1.0f) val=1.0f;
+      if ((val = (float)((float)(*srcp) / (*srcp>0?svolp:svoln) ))>1.0f) val=1.0f;
       else if (val<-1.0f) val=-1.0f;
 #endif
     }
     else {
 #ifdef ENABLE_OIL
-      oil_scaleconv_f32_u16(&val,(unsigned short *)src,1,&y,&xa);
+      oil_scaleconv_f32_u16(&val,(unsigned short *)srcp,1,&y,&xa);
       val-=vol;
 #else
-      valss=(unsigned short)*src-SAMPLE_MAX_16BITI;
+      valss=(unsigned short)*srcp-SAMPLE_MAX_16BITI;
       if ((val = (float)((float)(valss) / (valss>0?svolp:svoln) ))>1.0f) val=1.0f;
       else if (val<-1.0f) val=-1.0f;
 #endif
     }
+
     *(dst++)=val;
     src += src_skip;
   }
@@ -303,37 +316,46 @@
 
 
 
+void sample_move_float_float (float *dst, float *src, uint64_t nsamples, uint64_t src_skip, float vol) {
+  // copy one channel of (interleaved) float to a buffer, applying the volume
+  register int i;
 
+  for (i=0;i<nsamples;i++) {
+    *(dst++)=*src*vol;
+    src+=src_skip;
+  }
+}
 
 
 
-
-
-long sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, int usigned, gboolean swap_endian, float vol) {
+int64_t sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, 
+			      int usigned, gboolean little_endian, gboolean interleaved, float vol) {
   // convert float samples back to int
-  long frames_out=0l;
+  // interleaved is for the float buffer; output int is always interleaved
+  int64_t frames_out=0l;
   register int i;
   register int offs=0,coffs=0;
   register float coffs_f=0.f;
   short *hbuffs=(short *)holding_buff;
   unsigned short *hbuffu=(unsigned short *)holding_buff;
-  unsigned char *hbuffc=(guchar *)holding_buff;
+  unsigned char *hbuffc=(unsigned char *)holding_buff;
 
   register short val;
   register unsigned short valu=0;
   register float valf;
 
+
   while ((nsamps-coffs)>0) {
     frames_out++;
     for (i=0;i<chans;i++) {
-      valf=*(float_buffer[i]+coffs);
+      valf=*(float_buffer[i]+(interleaved?(coffs*chans):coffs));
       valf*=vol;
       val=(short)(valf*(valf>0.?SAMPLE_MAX_16BIT_P:SAMPLE_MAX_16BIT_N));
 
       if (usigned) valu=(val+SAMPLE_MAX_16BITI);
 
       if (asamps==16) {
-	if (!swap_endian) {
+	if (!little_endian) {
 	  if (usigned) *(hbuffu+offs)=valu;
 	  else *(hbuffs+offs)=val;
 	}
@@ -349,7 +371,7 @@
 	}
       }
       else {
-	*(hbuffc+offs)=(guchar)((float)val/256.);
+	*(hbuffc+offs)=(unsigned char)((float)val/256.);
       }
       offs++;
     }
@@ -363,7 +385,7 @@
 
 // play from memory buffer
 
-long sample_move_abuf_float (float **obuf, int nchans, int nsamps, int out_arate, float vol) {
+int64_t sample_move_abuf_float (float **obuf, int nchans, int nsamps, int out_arate, float vol) {
 
   int samples_out=0;
 
@@ -468,7 +490,7 @@
 
 
 
-long sample_move_abuf_int16 (short *obuf, int nchans, int nsamps, int out_arate) {
+int64_t sample_move_abuf_int16 (short *obuf, int nchans, int nsamps, int out_arate) {
 
   int samples_out=0;
 
@@ -565,6 +587,7 @@
     }
 
   }
+
 #endif
 
   return samples_out;
@@ -574,7 +597,7 @@
 
 
 
-/// copy a memory chunk into an audio buffer, applying overall volume control
+/// copy a memory chunk into an audio buffer
 
 
 static size_t chunk_to_float_abuf(lives_audio_buf_t *abuf, float **float_buffer, int nsamps) {
@@ -589,6 +612,43 @@
 }
 
 
+boolean float_deinterleave(float *fbuffer, int nsamps, int nchans) {
+  // deinterleave a float buffer
+  register int i,j;
+
+  float *tmpfbuffer=(float *)g_try_malloc(nsamps*nchans*sizeof(float));
+  if (tmpfbuffer==NULL) return FALSE;
+  
+  for (i=0;i<nsamps;i++) {
+    for (j=0;j<nchans;j++) {
+      tmpfbuffer[nsamps*j+i]=fbuffer[i*nchans+j];
+    }
+  }
+  lives_memcpy(fbuffer,tmpfbuffer,nsamps*nchans*sizeof(float));
+  g_free(tmpfbuffer);
+  return TRUE;
+}
+
+
+boolean float_interleave(float *fbuffer, int nsamps, int nchans) {
+  // deinterleave a float buffer
+  register int i,j;
+
+  float *tmpfbuffer=(float *)g_try_malloc(nsamps*nchans*sizeof(float));
+  if (tmpfbuffer==NULL) return FALSE;
+  
+  for (i=0;i<nsamps;i++) {
+    for (j=0;j<nchans;j++) {
+      tmpfbuffer[i*nchans+j]=fbuffer[j*nsamps+i];
+    }
+  }
+  lives_memcpy(fbuffer,tmpfbuffer,nsamps*nchans*sizeof(float));
+  g_free(tmpfbuffer);
+  return TRUE;
+}
+
+
+
 // for pulse audio we use int16, and let it apply the volume
 
 static size_t chunk_to_int16_abuf(lives_audio_buf_t *abuf, float **float_buffer, int nsamps) {
@@ -615,9 +675,9 @@
 
 //#define DEBUG_ARENDER
 
-static gboolean pad_with_silence(int out_fd, off64_t oins_size, long ins_size, int asamps, int aunsigned, gboolean big_endian) {
+static gboolean pad_with_silence(int out_fd, off64_t oins_size, int64_t ins_size, int asamps, int aunsigned, gboolean big_endian) {
   // fill to ins_pt with zeros (or 0x80.. for unsigned)
-  guchar *zero_buff;
+  uint8_t *zero_buff;
   size_t sblocksize=SILENCE_BLOCK_SIZE;
   gint sbytes=ins_size-oins_size;
   register int i;
@@ -629,9 +689,9 @@
 #endif
   if (sbytes>0) {
     lseek64(out_fd,oins_size,SEEK_SET);
-    if (!aunsigned) zero_buff=(guchar *)g_malloc0(SILENCE_BLOCK_SIZE);
+    if (!aunsigned) zero_buff=(uint8_t *)g_malloc0(SILENCE_BLOCK_SIZE);
     else {
-      zero_buff=(guchar *)g_malloc(SILENCE_BLOCK_SIZE);
+      zero_buff=(uint8_t *)g_malloc(SILENCE_BLOCK_SIZE);
       if (asamps==1) memset(zero_buff,0x80,SILENCE_BLOCK_SIZE);
       else {
 	for (i=0;i<SILENCE_BLOCK_SIZE;i+=2) {
@@ -664,7 +724,57 @@
 
 
 
-long render_audio_segment(gint nfiles, gint *from_files, gint to_file, gdouble *avels, gdouble *fromtime, weed_timecode_t tc_start, weed_timecode_t tc_end, gdouble *chvol, gdouble opvol_start, gdouble opvol_end, lives_audio_buf_t *obuf) {
+static void audio_process_events_to(weed_timecode_t tc) {
+  // process events from mainw->audio_event up to tc
+  // at playback start we should have set mainw->audio_event and mainw->afilter_map
+
+  int hint,error;
+
+  weed_plant_t *event=mainw->audio_event;
+
+  weed_timecode_t ctc;
+
+
+  while (event!=NULL && get_event_timecode(event)<=tc) {
+    hint=get_event_hint (event);
+    ctc=get_event_timecode(event);
+
+    switch (hint) {
+      
+    case WEED_EVENT_HINT_FILTER_INIT:
+      {
+	weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value (event,"deinit_event",&error);
+	if (get_event_timecode(deinit_event)<tc) break;
+	process_events(event,TRUE,ctc);
+      }
+      break;
+    case WEED_EVENT_HINT_FILTER_DEINIT:
+      {
+	weed_plant_t *init_event=(weed_plant_t *)weed_get_voidptr_value (event,"init_event",&error);
+	if (weed_plant_has_leaf(init_event,"host_tag")) {
+	  process_events(event,TRUE,ctc);
+	}
+      }
+      break;
+    case WEED_EVENT_HINT_FILTER_MAP:
+#ifdef DEBUG_EVENTS
+      g_print ("got new audio effect map\n");
+#endif
+      mainw->afilter_map=event;
+      break;
+    default:
+      break;
+    }
+    event=get_next_event(event);
+  }
+
+  mainw->audio_event=event;
+
+}
+
+
+
+int64_t render_audio_segment(gint nfiles, gint *from_files, gint to_file, gdouble *avels, gdouble *fromtime, weed_timecode_t tc_start, weed_timecode_t tc_end, gdouble *chvol, gdouble opvol_start, gdouble opvol_end, lives_audio_buf_t *obuf) {
   // called during multitrack rendering to create the actual audio file
   // (or in-memory buffer for preview playback in multitrack)
 
@@ -681,7 +791,7 @@
 
   // write this into our float buffers (1 buffer per channel per track)
 
-  // we then send small chunks at a time to our audio volume/pan effect; this is to allow for parameter interpolation
+  // we then send small chunks at a time to any audio effects; this is to allow for parameter interpolation
 
   // the small chunks are processed and mixed, converted from float to int, and then written to the outfile
 
@@ -698,7 +808,7 @@
 
 
   size_t tbytes;
-  guchar *in_buff;
+  uint8_t *in_buff;
 
   gint out_asamps=to_file>-1?outfile->asampsize/8:0;
   gint out_achans=to_file>-1?outfile->achans:obuf->out_achans;
@@ -714,17 +824,25 @@
   int c,x;
   register int i,j;
   ssize_t bytes_read;
+
   int in_fd[nfiles],out_fd=-1;
-  gulong nframes;
+
+  uint64_t nframes;
+
   gboolean in_reverse_endian[nfiles],out_reverse_endian=FALSE;
+
   off64_t seekstart[nfiles];
   gchar *infilename,*outfilename;
+
   weed_timecode_t tc=tc_start;
+
   gdouble ins_pt=tc/U_SEC;
-  long ins_size=0l,cur_size;
   gdouble time=0.;
   gdouble opvol=opvol_start;
-  long frames_out=0;
+  gdouble *vis=NULL;
+
+  int64_t frames_out=0;
+  int64_t ins_size=0l,cur_size;
 
   int track;
 
@@ -737,9 +855,9 @@
   gboolean is_silent[nfiles];
   gint first_nonsilent=-1;
 
-  long tsamples=((tc_end-tc_start)/U_SEC*out_arate+.5);
+  int64_t tsamples=((tc_end-tc_start)/U_SEC*out_arate+.5);
 
-  long blocksize,zsamples,xsamples;
+  int64_t blocksize,zsamples,xsamples;
 
   void *finish_buff;
 
@@ -749,7 +867,7 @@
   gint max_segments;
   gdouble zavel,zavel_max=0.;
 
-  long tot_frames=0l;
+  int64_t tot_frames=0l;
 
   int render_block_size=RENDER_BLOCK_SIZE;
 
@@ -757,7 +875,7 @@
 
   if (!storedfdsset) audio_reset_stored_fnames();
 
-  if (mainw->multitrack==NULL) render_block_size*=100;
+  if (mainw->event_list==NULL||(mainw->multitrack==NULL&&nfiles==1&&from_files[0]==mainw->ascrap_file)) render_block_size*=100;
 
   if (to_file>-1) {
     // prepare outfile stuff
@@ -775,10 +893,14 @@
       return 0l;
     }
 
+#ifdef IS_MINGW
+    setmode(out_fd, O_BINARY);
+#endif
+
     cur_size=get_file_size(out_fd);
 
     ins_pt*=out_achans*out_arate*out_asamps;
-    ins_size=((long)(ins_pt/out_achans/out_asamps+.5))*out_achans*out_asamps;
+    ins_size=((int64_t)(ins_pt/out_achans/out_asamps+.5))*out_achans*out_asamps;
 
     if ((!out_bendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
 	(out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
@@ -856,6 +978,9 @@
 	  mainw->read_failed=TRUE;
 	}
 
+#ifdef IS_MINGW
+	setmode(in_fd[track], O_BINARY);
+#endif
 	if (track<NSTOREDFDS) {
 	  storedfds[track]=in_fd[track];
 	  storedfnames[track]=g_strdup(infilename);
@@ -879,10 +1004,10 @@
     // all in tracks are empty
     // output silence
     if (to_file>-1) {
-      long oins_size=ins_size;
+      int64_t oins_size=ins_size;
       ins_pt=tc_end/U_SEC;
       ins_pt*=out_achans*out_arate*out_asamps;
-      ins_size=((long)(ins_pt/out_achans/out_asamps)+.5)*out_achans*out_asamps;
+      ins_size=((int64_t)(ins_pt/out_achans/out_asamps)+.5)*out_achans*out_asamps;
       pad_with_silence(out_fd,oins_size,ins_size,out_asamps,out_unsigned,out_bendian);
       //sync();
       close (out_fd);
@@ -908,6 +1033,7 @@
     return tsamples;
   }
 
+
   // we don't want to use more than MAX_AUDIO_MEM bytes
   // (numbers will be much larger than examples given)
 
@@ -937,13 +1063,7 @@
     float_buffer[i]=(float *)g_malloc(xsamples*sizeof(float));
   }
 
-  finish_buff=g_malloc(render_block_size*out_achans*out_asamps);
-
-  for (i=0;i<nfiles;i++) {
-    for (c=0;c<out_achans;c++) {
-      chunk_float_buffer[i*out_achans+c]=(float *)g_malloc(render_block_size*sizeof(float));
-    }
-  }
+  finish_buff=g_malloc(tsamples*out_achans*out_asamps);
 
 #ifdef DEBUG_ARENDER
   g_print("  rendering %ld samples\n",tsamples);
@@ -970,11 +1090,12 @@
       tbytes=(gint)((gdouble)xsamples*ABS(zavel)+((gdouble)fastrand()/(gdouble)G_MAXUINT32))*
 	in_asamps[track]*in_achans[track];
 
-      in_buff=(guchar *)g_malloc(tbytes);
+      in_buff=(uint8_t *)g_malloc(tbytes);
 
       if (zavel<0. && in_fd[track]>-1) lseek64(in_fd[track],seekstart[track]-tbytes,SEEK_SET);
 
       bytes_read=0;
+      mainw->read_failed=FALSE;
       if (in_fd[track]>-1) bytes_read=lives_read(in_fd[track],in_buff,tbytes,TRUE);
 
       if (bytes_read<0) bytes_read=0;
@@ -998,7 +1119,7 @@
 
       // convert to float
       if (in_asamps[track]==1) {
-	sample_move_d8_d16 (holding_buff,(guchar *)in_buff,nframes,tbytes,zavel,out_achans,in_achans[track],0);
+	sample_move_d8_d16 (holding_buff,(uint8_t *)in_buff,nframes,tbytes,zavel,out_achans,in_achans[track],0);
       }
       else {
 	sample_move_d16_d16(holding_buff,(short*)in_buff,nframes,tbytes,zavel,out_achans,
@@ -1009,7 +1130,7 @@
 
       for(c=0;c<out_achans;c++) {
 	sample_move_d16_float(float_buffer[c+track*out_achans],holding_buff+c,nframes,
-			      out_achans,in_unsigned[track],chvol[track]);
+			      out_achans,in_unsigned[track],FALSE,chvol[track]);
       }
     }
 
@@ -1023,74 +1144,107 @@
       for (track=0;track<nfiles;track++) {
 	for (c=0;c<out_achans;c++) {
 	  //g_print("xvals %.4f\n",*(float_buffer[track*out_achans+c]+i));
-	  lives_memcpy(chunk_float_buffer[track*out_achans+c],float_buffer[track*out_achans+c]+i,blocksize*sizeof(float));
+	  chunk_float_buffer[track*out_achans+c]=float_buffer[track*out_achans+c]+i;
 	}
       }
 
-      // apply audio filter(s)
-      if (mainw->multitrack!=NULL) {
-	// we work out the "visibility" of each track at tc
-	gdouble *vis=get_track_visibility_at_tc(mainw->multitrack->event_list,nfiles,
-						mainw->multitrack->opts.back_audio_tracks,tc,&shortcut,
-						mainw->multitrack->opts.audio_bleedthru);
+      if (mainw->event_list!=NULL&&mainw->filter_map!=NULL&&!(mainw->multitrack==NULL&&from_files[0]==mainw->ascrap_file)) {
+	// we need to apply all audio effects with output here.
+	// even in clipedit mode (for preview/rendering with an event list)
+	// also, we will need to keep updating the mainw->filter_map from mainw->event_list, as filters may switched on and off during the block
+
+	int nbtracks=0;
+
+	// apply audio filter(s)
+	if (mainw->multitrack!=NULL) {
+	  // we work out the "visibility" of each track at tc
+	  vis=get_track_visibility_at_tc(mainw->multitrack->event_list,nfiles,
+					 mainw->multitrack->opts.back_audio_tracks,tc,&shortcut,
+					 mainw->multitrack->opts.audio_bleedthru);
+
+	  // first track is ascrap_file - flag that no effects should be applied to it, except for the audio mixer
+	  if (mainw->ascrap_file>-1&&from_files[0]==mainw->ascrap_file) vis[0]=-vis[0];
+
+	  nbtracks=mainw->multitrack->opts.back_audio_tracks;
+	}
+	
+	// process events up to current tc:
+	// filter inits and deinits, and filter maps
+
+	audio_process_events_to(tc);
 
 	// locate the master volume parameter, and multiply all values by vis[track]
-	weed_apply_audio_effects(mainw->filter_map,chunk_float_buffer,mainw->multitrack->opts.back_audio_tracks,
+	weed_apply_audio_effects(mainw->afilter_map,chunk_float_buffer,nbtracks,
 				 out_achans,blocksize,out_arate,tc,vis);
 	
-	g_free(vis);
+	if (vis!=NULL) g_free(vis);
+
       }
-      
-      if (to_file>-1) {
+
+      if (mainw->multitrack==NULL&&opvol_end!=opvol_start) {
+	time+=(gdouble)frames_out/(gdouble)out_arate;
+	opvol=opvol_start+(opvol_end-opvol_start)*(time/(gdouble)((tc_end-tc_start)/U_SEC));
+      }
+
+      if (to_file>-1&&mainw->multitrack==NULL&&opvol_start!=opvol_end) {
 	// output to file
 	// convert back to int; use out_scale of 1., since we did our resampling in sample_move_*_d16
 	frames_out=sample_move_float_int((void *)finish_buff,chunk_float_buffer,blocksize,1.,out_achans,
-					 out_asamps*8,out_unsigned,out_reverse_endian,opvol);
+					 out_asamps*8,out_unsigned,out_reverse_endian,FALSE,opvol);
 	lives_write (out_fd,finish_buff,frames_out*out_asamps*out_achans,TRUE);
+	tot_frames+=frames_out;
+	
 #ifdef DEBUG_ARENDER
 	g_print(".");
 #endif
       }
-      else {
-	// output to memory buffer
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
-	  frames_out=chunk_to_float_abuf(obuf,chunk_float_buffer,blocksize);
-	}
-	else {
-	  frames_out=chunk_to_int16_abuf(obuf,chunk_float_buffer,blocksize);
-	}
-	obuf->samples_filled+=frames_out;
-      }
+      tc+=(gdouble)blocksize/(gdouble)out_arate*U_SEC;
+    }
 
-      if (mainw->multitrack==NULL) {
-	time+=(gdouble)frames_out/(gdouble)out_arate;
-	opvol=opvol_start+(opvol_end-opvol_start)*(time/(gdouble)((tc_end-tc_start)/U_SEC));
+    if (to_file>-1&&(mainw->multitrack!=NULL||opvol_end==opvol_start)) {
+      // output to file
+      // convert back to int; use out_scale of 1., since we did our resampling in sample_move_*_d16
+      frames_out=sample_move_float_int((void *)finish_buff,float_buffer,xsamples,1.,out_achans,
+				       out_asamps*8,out_unsigned,out_reverse_endian,FALSE,opvol);
+      lives_write (out_fd,finish_buff,frames_out*out_asamps*out_achans,TRUE);
+#ifdef DEBUG_ARENDER
+      g_print(".");
+#endif
+      tot_frames+=frames_out;
+    }
+    else {
+      // output to memory buffer
+      if (prefs->audio_player==AUD_PLAYER_JACK) {
+	frames_out=chunk_to_float_abuf(obuf,float_buffer,xsamples);
+      }
+      else {
+	frames_out=chunk_to_int16_abuf(obuf,float_buffer,xsamples);
       }
-      else tc+=(gdouble)blocksize/(gdouble)out_arate*U_SEC;
+      obuf->samples_filled+=frames_out;
+      tot_frames+=frames_out;
     }
-    xsamples=zsamples;
 
-    tot_frames+=frames_out;
+    xsamples=zsamples;
   }
 
-  if (xsamples>0)
+
+
+  if (xsamples>0) {
     for (i=0;i<out_achans*nfiles;i++) {
       if (float_buffer[i]!=NULL) g_free(float_buffer[i]);
     }
+  }
 
   if (finish_buff!=NULL) g_free(finish_buff);
   if (holding_buff!=NULL) g_free(holding_buff);
-
+  
   // close files
   for (track=0;track<nfiles;track++) {
     if (!is_silent[track]) {
       if (track>=NSTOREDFDS && in_fd[track]>-1) close (in_fd[track]);
     }
-    for (c=0;c<out_achans;c++) {
-      if (chunk_float_buffer[track*out_achans+c]!=NULL) g_free(chunk_float_buffer[track*out_achans+c]);
-    }
   }
-
+    
   if (to_file>-1) {
 #ifdef DEBUG_ARENDER
     g_print("fs is %ld\n",get_file_size(out_fd));
@@ -1125,50 +1279,90 @@
 #ifdef ENABLE_JACK
 void jack_rec_audio_to_clip(gint fileno, gint old_file, lives_rec_audio_type_t rec_type) {
   // open audio file for writing
-  file *outfile=mainw->files[fileno];
-  gchar *outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+  file *outfile;
   int retval;
+
+  if (fileno==-1) {
+    // respond to external audio, but do not record it (yet)
+    mainw->jackd_read=jack_get_driver(0,FALSE);
+    mainw->jackd_read->playing_file=fileno;
+    mainw->jackd_read->frames_written=0;
+
+    mainw->jackd_read->reverse_endian=FALSE;
+      
+    // start jack "recording"
+    jack_open_device_read(mainw->jackd_read);
+    jack_read_driver_activate(mainw->jackd_read);
+
+    return;
+  }
+
+  outfile=mainw->files[fileno];
   
-  do {
-    retval=0;
-    mainw->aud_rec_fd=open(outfilename,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR);
-    if (mainw->aud_rec_fd<0) {
-      retval=do_write_failed_error_s_with_retry(outfilename,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free(outfilename);
-	return;
+  if (mainw->aud_rec_fd==-1) {
+    gchar *outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+    do {
+      retval=0;
+      mainw->aud_rec_fd=open(outfilename,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR);
+      if (mainw->aud_rec_fd<0) {
+	retval=do_write_failed_error_s_with_retry(outfilename,g_strerror(errno),NULL);
+	if (retval==LIVES_CANCEL) {
+	  g_free(outfilename);
+	  return;
+	}
       }
-    }
-  } while (retval==LIVES_RETRY);
+    } while (retval==LIVES_RETRY);
+    g_free(outfilename);
+  }
 
-  g_free(outfilename);
+  if (rec_type==RECA_GENERATED) {
+    mainw->jackd->playing_file=fileno;
+  }
+  else {
+    mainw->jackd_read=jack_get_driver(0,FALSE);
+    mainw->jackd_read->playing_file=fileno;
+    mainw->jackd_read->frames_written=0;
+  }
 
-  mainw->jackd_read=jack_get_driver(0,FALSE);
-  mainw->jackd_read->playing_file=fileno;
-  mainw->jackd_read->frames_written=0;
 
+#ifdef IS_MINGW
+  setmode(mainw->aud_rec_fd, O_BINARY);
+#endif
 
-  if (rec_type==RECA_EXTERNAL) {
+  if (rec_type==RECA_EXTERNAL||rec_type==RECA_GENERATED) {
     gint asigned;
     gint aendian;
-    gulong fsize=get_file_size(mainw->aud_rec_fd);
-
-    mainw->jackd_read->reverse_endian=FALSE;
- 
-    // start jack recording
-    jack_open_device_read(mainw->jackd_read);
-    jack_read_driver_activate(mainw->jackd_read);
-
-    outfile->arate=outfile->arps=mainw->jackd_read->sample_in_rate;
-    outfile->achans=mainw->jackd_read->num_input_channels;
-
-    outfile->asampsize=16;
-    outfile->signed_endian=get_signed_endian(TRUE,TRUE);
+    uint64_t fsize=get_file_size(mainw->aud_rec_fd);
     
-    asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
-    aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
-
-    mainw->jackd_read->frames_written=fsize/(outfile->achans*(outfile->asampsize>>3));
+    if (rec_type==RECA_EXTERNAL) {
+      mainw->jackd_read->reverse_endian=FALSE;
+      
+      // start jack recording
+      jack_open_device_read(mainw->jackd_read);
+      jack_read_driver_activate(mainw->jackd_read);
+      
+      outfile->arate=outfile->arps=mainw->jackd_read->sample_in_rate;
+      outfile->achans=mainw->jackd_read->num_input_channels;
+      
+      outfile->asampsize=16;
+      outfile->signed_endian=get_signed_endian(TRUE,TRUE);
+      
+      asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
+      aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
+      
+      mainw->jackd_read->frames_written=fsize/(outfile->achans*(outfile->asampsize>>3));
+    }
+    else {
+      mainw->jackd->reverse_endian=FALSE;
+      outfile->arate=outfile->arps=mainw->jackd->sample_out_rate;
+      outfile->achans=mainw->jackd->num_output_channels;
+      
+      outfile->asampsize=16;
+      outfile->signed_endian=get_signed_endian(TRUE,TRUE);
+      
+      asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
+      aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
+    }
 
     save_clip_value(fileno,CLIP_DETAILS_ACHANS,&outfile->achans);
     save_clip_value(fileno,CLIP_DETAILS_ARATE,&outfile->arps);
@@ -1192,7 +1386,7 @@
   }
 
   // in grab window mode, just return, we will call rec_audio_end on playback end
-  if (rec_type==RECA_WINDOW_GRAB||rec_type==RECA_EXTERNAL) return;
+  if (rec_type==RECA_WINDOW_GRAB||rec_type==RECA_EXTERNAL||rec_type==RECA_GENERATED) return;
 
   mainw->cancelled=CANCEL_NONE;
   mainw->cancel_type=CANCEL_SOFT;
@@ -1209,24 +1403,25 @@
     on_playsel_activate(NULL,NULL);
     mainw->current_file=current_file;
   }
-  jack_rec_audio_end();
+  jack_rec_audio_end(TRUE);
 }
 
 
 
-void jack_rec_audio_end(void) {
+void jack_rec_audio_end(boolean close_fd) {
   // recording ended
 
   // stop recording
-  jack_close_device(mainw->jackd_read);
+  if (mainw->jackd_read!=NULL) jack_close_device(mainw->jackd_read);
   mainw->jackd_read=NULL;
 
-  // close file
-  close(mainw->aud_rec_fd);
-  mainw->aud_rec_fd=-1;
-  mainw->cancel_type=CANCEL_KILL;
+  if (close_fd&&mainw->aud_rec_fd!=-1) {
+    // close file
+    close(mainw->aud_rec_fd);
+    mainw->aud_rec_fd=-1;
+    mainw->cancel_type=CANCEL_KILL;
+  }
 }
-
 #endif
 
 
@@ -1235,45 +1430,86 @@
 #ifdef HAVE_PULSE_AUDIO
 void pulse_rec_audio_to_clip(gint fileno, gint old_file, lives_rec_audio_type_t rec_type) {
   // open audio file for writing
-  file *outfile=mainw->files[fileno];
-  gchar *outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+  file *outfile;
   int retval;
 
-  do {
-    retval=0;
-    mainw->aud_rec_fd=open(outfilename,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR);
-    if (mainw->aud_rec_fd<0) {
-      retval=do_write_failed_error_s_with_retry(outfilename,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free(outfilename);
-	return;
-      }
-    }
-  } while (retval==LIVES_RETRY);
-
-  mainw->pulsed_read=pulse_get_driver(FALSE);
-  mainw->pulsed_read->playing_file=fileno;
-  mainw->pulsed_read->frames_written=0;
-
-  if (rec_type==RECA_EXTERNAL) {
-    gint asigned;
-    gint aendian;
-    gulong fsize=get_file_size(mainw->aud_rec_fd);
+  if (fileno==-1) {
+    mainw->pulsed_read=pulse_get_driver(FALSE);
+    mainw->pulsed_read->playing_file=-1;
+    mainw->pulsed_read->frames_written=0;
 
     mainw->pulsed_read->reverse_endian=FALSE;
+    mainw->aud_rec_fd=-1;
 
     pulse_driver_activate(mainw->pulsed_read);
 
-    outfile->arate=outfile->arps=mainw->pulsed_read->out_arate;
-    outfile->achans=mainw->pulsed_read->out_achans;
-    outfile->asampsize=mainw->pulsed_read->out_asamps;
-    outfile->signed_endian=get_signed_endian(mainw->pulsed_read->out_signed!=AFORM_UNSIGNED,
-					     mainw->pulsed_read->out_endian!=AFORM_BIG_ENDIAN);
-    
-    asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
-    aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
+    return;
+  }
+
 
-    mainw->pulsed_read->frames_written=fsize/(outfile->achans*(outfile->asampsize>>3));
+  outfile=mainw->files[fileno];
+
+  if (mainw->aud_rec_fd==-1) {
+    gchar *outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+    do {
+      retval=0;
+      mainw->aud_rec_fd=open(outfilename,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR);
+      if (mainw->aud_rec_fd<0) {
+	retval=do_write_failed_error_s_with_retry(outfilename,g_strerror(errno),NULL);
+	if (retval==LIVES_CANCEL) {
+	  g_free(outfilename);
+	  return;
+	}
+      }
+    } while (retval==LIVES_RETRY);
+    g_free(outfilename);
+  }
+
+  if (rec_type==RECA_GENERATED) {
+    mainw->pulsed->playing_file=fileno;
+  }
+  else {
+    mainw->pulsed_read=pulse_get_driver(FALSE);
+    mainw->pulsed_read->playing_file=fileno;
+    mainw->pulsed_read->frames_written=0;
+  }
+
+#ifdef IS_MINGW
+  setmode(mainw->aud_rec_fd, O_BINARY);
+#endif
+
+  if (rec_type==RECA_EXTERNAL||rec_type==RECA_GENERATED) {
+    gint asigned;
+    gint aendian;
+    uint64_t fsize=get_file_size(mainw->aud_rec_fd);
+
+    if (rec_type==RECA_EXTERNAL) {
+      mainw->pulsed_read->reverse_endian=FALSE;
+      
+      pulse_driver_activate(mainw->pulsed_read);
+      
+      outfile->arate=outfile->arps=mainw->pulsed_read->out_arate;
+      outfile->achans=mainw->pulsed_read->out_achans;
+      outfile->asampsize=mainw->pulsed_read->out_asamps;
+      outfile->signed_endian=get_signed_endian(mainw->pulsed_read->out_signed!=AFORM_UNSIGNED,
+					       mainw->pulsed_read->out_endian!=AFORM_BIG_ENDIAN);
+      
+      asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
+      aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
+      
+      mainw->pulsed_read->frames_written=fsize/(outfile->achans*(outfile->asampsize>>3));
+    }
+    else {
+      mainw->pulsed->reverse_endian=FALSE;
+      outfile->arate=outfile->arps=mainw->pulsed->out_arate;
+      outfile->achans=mainw->pulsed->out_achans;
+      outfile->asampsize=mainw->pulsed->out_asamps;
+      outfile->signed_endian=get_signed_endian(mainw->pulsed->out_signed!=AFORM_UNSIGNED,
+					       mainw->pulsed->out_endian!=AFORM_BIG_ENDIAN);
+      
+      asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
+      aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
+    }
 
     save_clip_value(fileno,CLIP_DETAILS_ACHANS,&outfile->achans);
     save_clip_value(fileno,CLIP_DETAILS_ARATE,&outfile->arps);
@@ -1296,7 +1532,7 @@
   }
 
   // in grab window mode, just return, we will call rec_audio_end on playback end
-  if (rec_type==RECA_WINDOW_GRAB||rec_type==RECA_EXTERNAL) return;
+  if (rec_type==RECA_WINDOW_GRAB||rec_type==RECA_EXTERNAL||rec_type==RECA_GENERATED) return;
 
   mainw->cancelled=CANCEL_NONE;
   mainw->cancel_type=CANCEL_SOFT;
@@ -1311,27 +1547,32 @@
     on_playsel_activate(NULL,NULL);
     mainw->current_file=current_file;
   }
-  pulse_rec_audio_end();
+  pulse_rec_audio_end(TRUE);
 }
 
 
 
-void pulse_rec_audio_end(void) {
+void pulse_rec_audio_end(boolean close_fd) {
   // recording ended
 
   // stop recording
 
-  pa_threaded_mainloop_lock(mainw->pulsed->mloop);
-  pulse_flush_read_data(mainw->pulsed_read,0,NULL);
-  pulse_close_client(mainw->pulsed_read);
-  pa_threaded_mainloop_unlock(mainw->pulsed->mloop);
+  if (mainw->pulsed_read!=NULL) {
+    pa_threaded_mainloop_lock(mainw->pulsed_read->mloop);
+    if (mainw->pulsed_read->playing_file>-1)
+      pulse_flush_read_data(mainw->pulsed_read,mainw->pulsed_read->playing_file,0,mainw->pulsed_read->reverse_endian,NULL);
+    pulse_close_client(mainw->pulsed_read);
+    pa_threaded_mainloop_unlock(mainw->pulsed_read->mloop);
 
-  mainw->pulsed_read=NULL;
+    mainw->pulsed_read=NULL;
+  }
 
-  // close file
-  close(mainw->aud_rec_fd);
-  mainw->aud_rec_fd=-1;
-  mainw->cancel_type=CANCEL_KILL;
+  if (mainw->aud_rec_fd!=-1&&close_fd) {
+    // close file
+    close(mainw->aud_rec_fd);
+    mainw->aud_rec_fd=-1;
+    mainw->cancel_type=CANCEL_KILL;
+  }
 }
 
 #endif
@@ -1393,6 +1634,7 @@
 
   int btoffs=mainw->multitrack!=NULL?mainw->multitrack->opts.back_audio_tracks:1;
 
+
   for (i=0;i<num_aclips;i+=2) {
     if (aclips[i+1]>0) { // else ignore
       atrack=aclips[i];
@@ -1416,7 +1658,8 @@
 
 
 
-lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event, gboolean get_audstate, gboolean exact) {
+lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event, 
+							  gboolean get_audstate, gboolean exact) {
 
   // if exact is set, we must rewind back to first active stateful effect, 
   // and play forwards from there (not yet implemented - TODO)
@@ -1434,19 +1677,23 @@
   // and initialises audio buffers
 
   mainw->filter_map=NULL;
+  mainw->afilter_map=NULL;
+
+  mainw->audio_event=st_event;
 
   fill_tc=get_event_timecode(st_event);
 
   do {
     event=nevent;
     if (WEED_EVENT_IS_FILTER_MAP(event)) {
-      mainw->filter_map=event;
+      mainw->afilter_map=mainw->filter_map=event;
     }
     else if (WEED_EVENT_IS_FILTER_INIT(event)) {
       deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
       if (get_event_timecode(deinit_event)>=fill_tc) {
 	// this effect should be activated
-	process_events(event,get_event_timecode(event));
+	process_events(event,FALSE,get_event_timecode(event));
+	process_events(event,TRUE,get_event_timecode(event));
       }
     }
     else if (get_audstate&&weed_plant_has_leaf(event,"audio_clips")) {
@@ -1485,7 +1732,6 @@
     nevent=get_next_event(event);
   } while (event!=st_event);
 
-
   if (audstate!=NULL) {
     for (nfiles=0;audstate[nfiles].afile!=-1;nfiles++);
 
@@ -1510,12 +1756,12 @@
 
   // otherwise, we continue from where we left off the last time
 
-
+  
   // all we really do here is set from_files,aseeks and avels arrays and call render_audio_segment
 
-  lives_audio_track_state_t *atstate;
+  lives_audio_track_state_t *atstate=NULL;
   int nnfiles,i;
-  gdouble chvols[65536]; // TODO - use list
+  gdouble chvols[MAX_AUDIO_TRACKS]; // TODO - use list
 
   static weed_timecode_t last_tc;
   static weed_timecode_t fill_tc;
@@ -1533,7 +1779,6 @@
 
   if (st_event!=NULL) {
     // this is only called for the first buffered read
-
     event=st_event;
     last_tc=get_event_timecode(event);
 
@@ -1564,8 +1809,14 @@
     // start of the track buffer
 
 
-    atstate=get_audio_and_effects_state_at(event_list,event,TRUE,exact);
+    if (event!=get_first_event(event_list)) 
+      atstate=get_audio_and_effects_state_at(event_list,event,TRUE,exact);
+
+    // process audio updates at this frame
+    else atstate=aframe_to_atstate(event);
     
+    mainw->audio_event=event;
+
     if (atstate!=NULL) {
       
       for (nnfiles=0;atstate[nnfiles].afile!=-1;nnfiles++);
@@ -1736,7 +1987,7 @@
       }
       g_free(mainw->jackd->abufs[i]->bufferf);
       g_free(mainw->jackd->abufs[i]);
-   }
+    }
   }
   g_free(mainw->jackd->abufs);
 #endif
@@ -1782,7 +2033,8 @@
   if (!(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) return FALSE;
 
   // if recording external audio, we are intrinsically in sync
-  if (mainw->record&&(prefs->rec_opts&REC_EXT_AUDIO)) return TRUE;
+  if (mainw->record&&prefs->audio_src==AUDIO_SRC_EXT) return TRUE;
+
 
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
@@ -1792,10 +2044,13 @@
 	if (jack_try_reconnect()) jack_audio_seek_frame(mainw->jackd,frameno);
       }
 
-      mainw->rec_aclip=mainw->current_file;
-      mainw->rec_avel=cfile->pb_fps/cfile->fps;
-      mainw->rec_aseek=(gdouble)mainw->jackd->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(FALSE)) {
+	mainw->rec_aclip=mainw->current_file;
+	mainw->rec_avel=cfile->pb_fps/cfile->fps;
+	mainw->rec_aseek=(gdouble)mainw->jackd->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      }
     }
+
     return TRUE;
   }
 #endif
@@ -1806,9 +2061,11 @@
       if (!pulse_audio_seek_frame(mainw->pulsed,frameno)) {
 	if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,frameno);
       }
-      mainw->rec_aclip=mainw->current_file;
-      mainw->rec_avel=cfile->pb_fps/cfile->fps;
-      mainw->rec_aseek=(gdouble)mainw->pulsed->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(FALSE)) {
+	mainw->rec_aclip=mainw->current_file;
+	mainw->rec_avel=cfile->pb_fps/cfile->fps;
+	mainw->rec_aseek=(gdouble)mainw->pulsed->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      }
     }
     return TRUE;
   }
@@ -1909,7 +2166,7 @@
 	  // ouput channels increased
 	  cbuffer->buffer16 = (short **) 
 	    g_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-	  for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i<cbuffer->out_achans;i++) {
+	  for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i<(cbuffer->out_interleaf?1:cbuffer->out_achans);i++) {
 	    cbuffer->buffer16[i]=NULL;
 	  }
 	}
@@ -1926,11 +2183,11 @@
 	  free(cbuffer->buffer16[i]);
 	}
 
-	// output channels decreased
-
-	cbuffer->buffer16 = (short **)
-	  g_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-
+	if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) < (cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) {
+	  // output channels decreased
+	  cbuffer->buffer16 = (short **)
+	    g_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
+	}
       }
 
       break;
@@ -1948,7 +2205,7 @@
 	  // ouput channels increased
 	  cbuffer->buffer16 = (short **) 
 	    g_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-	  for (i=(cbuffer->_cin_interleaf?1:cbuffer->_cachans);i<cbuffer->out_achans;i++) {
+	  for (i=(cbuffer->_cin_interleaf?1:cbuffer->_cachans);i<(cbuffer->in_interleaf?1:cbuffer->out_achans);i++) {
 	    cbuffer->buffer16[i]=NULL;
 	  }
 	}
@@ -1965,11 +2222,12 @@
 	  free(cbuffer->buffer16[i]);
 	}
 
-	// output channels decreased
-
-	cbuffer->buffer16 = (short **)
-	  g_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
 
+	if ((cbuffer->in_interleaf?1:cbuffer->out_achans)<(cbuffer->_cin_interleaf?1:cbuffer->_cachans)) {
+	  // output channels decreased
+	  cbuffer->buffer16 = (short **)
+	    g_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
+	}
       }
 
 
@@ -1983,7 +2241,7 @@
 	  // ouput channels increased
 	  cbuffer->bufferf = (float **)
 	    g_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
-	  for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i<cbuffer->out_achans;i++) {
+	  for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i<(cbuffer->out_interleaf?1:cbuffer->out_achans);i++) {
 	    cbuffer->bufferf[i]=NULL;
 	  }
 	}
@@ -2000,11 +2258,12 @@
 	  free(cbuffer->bufferf[i]);
 	}
 
-	// output channels decreased
-
-	cbuffer->bufferf = (float **)
-	  g_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
 
+	if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) {
+	  // output channels decreased
+	  cbuffer->bufferf = (float **)
+	    g_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
+	}
       }
 
       break;
@@ -2026,20 +2285,24 @@
 
       if (cbuffer->_fd!=-1) close(cbuffer->_fd);
 
-	if (afile->opening) 
-	  filename=g_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
-	else filename=g_strdup_printf("%s/%s/audio",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
-
-	cbuffer->_fd=open(filename,O_RDONLY);
-	if (cbuffer->_fd==-1) {
-	  g_printerr("audio cache thread: error opening %s\n",filename);
-	  cbuffer->in_achans=0;
-	  cbuffer->fileno=-1;  ///< let client handle this
-	  cbuffer->is_ready=TRUE;
-	  continue;
-	}
+      if (afile->opening) 
+	filename=g_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
+      else filename=g_strdup_printf("%s/%s/audio",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
+
+      cbuffer->_fd=open(filename,O_RDONLY);
+      if (cbuffer->_fd==-1) {
+	g_printerr("audio cache thread: error opening %s\n",filename);
+	cbuffer->in_achans=0;
+	cbuffer->fileno=-1;  ///< let client handle this
+	cbuffer->is_ready=TRUE;
+	continue;
+      }
 
-	g_free(filename);
+#ifdef IS_MINGW
+      setmode(cbuffer->_fd, O_BINARY);
+#endif
+
+      g_free(filename);
     }
 
     if (cbuffer->fileno!=cbuffer->_cfileno||cbuffer->seek!=cbuffer->_cseek) {
@@ -2076,7 +2339,7 @@
     
     if (cbuffer->_cbytesize<cbuffer->bytesize) {
       cbuffer->eof=TRUE;
-      cbuffer->_csamp_space=(long)((double)cbuffer->samp_space/(double)cbuffer->bytesize*(double)cbuffer->_cbytesize);
+      cbuffer->_csamp_space=(int64_t)((double)cbuffer->samp_space/(double)cbuffer->bytesize*(double)cbuffer->_cbytesize);
       cbuffer->samp_space=cbuffer->_csamp_space;
     }
 
@@ -2091,16 +2354,16 @@
     if(cbuffer->in_asamps==8) {
 
       // TODO - error on non-interleaved
-      sample_move_d8_d16 (cbuffer->buffer16[0],(guchar *)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize, 
+      sample_move_d8_d16 (cbuffer->buffer16[0],(uint8_t *)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize, 
 			  cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans, 0);
-	}
+    }
     // 16 bit input samples 
     // resample as we go 
-	else {
-	  sample_move_d16_d16(cbuffer->buffer16[0], (short*)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize, 
-			      cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans, 
-			      cbuffer->swap_endian?SWAP_X_TO_L:0, 0);
-	}
+    else {
+      sample_move_d16_d16(cbuffer->buffer16[0], (short*)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize, 
+			  cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans, 
+			  cbuffer->swap_endian?SWAP_X_TO_L:0, 0);
+    }
 	
 
     // if our out_asamps is 16, we are done
@@ -2158,7 +2421,7 @@
 
   // free all buffers
   
-  for (i=0;i<cache_buffer->_cachans;i++) {
+  for (i=0;i<(cache_buffer->_cin_interleaf?1:cache_buffer->_cachans);i++) {
     if (cache_buffer->buffer8!=NULL&&cache_buffer->buffer8[i]!=NULL) free(cache_buffer->buffer8[i]);
     if (cache_buffer->buffer16!=NULL&&cache_buffer->buffer16[i]!=NULL) free(cache_buffer->buffer16[i]);
     if (cache_buffer->buffer24!=NULL&&cache_buffer->buffer24[i]!=NULL) free(cache_buffer->buffer24[i]);
@@ -2186,13 +2449,366 @@
 }
 
 
+///////////////////////////////////////
+
+// plugin handling
+
+gboolean get_audio_from_plugin(float *fbuffer, int nchans, int arate, int nsamps) {
+  // get audio from an audio generator; fbuffer is filled with non-interleaved float
+
+  weed_timecode_t tc;
+
+  int error;
+
+  int xnchans;
+  int aint;
+
+  weed_plant_t *inst=rte_keymode_get_instance(mainw->agen_key,rte_key_getmode(mainw->agen_key));
+  weed_plant_t *filter;
+  weed_plant_t *channel;
+  weed_plant_t *ctmpl;
+
+  weed_process_f *process_func_ptr_ptr;
+  weed_process_f process_func;
+
+  if (mainw->agen_needs_reinit) return FALSE; // wait for other thread to reinit us
+  tc=(double)mainw->agen_samps_count/(double)arate*U_SEC; // we take our timing from the number of samples read
+
+ getaud1:
+
+  aint=WEED_FALSE;
+  xnchans=nchans;
+  filter=weed_instance_get_filter(inst,FALSE);
+  channel=get_enabled_channel(inst,0,FALSE);
+
+  if (channel!=NULL) {
+    ctmpl=weed_get_plantptr_value(channel,"template",&error);
+    
+    if (weed_plant_has_leaf(ctmpl,"audio_rate")&&weed_get_int_value(ctmpl,"audio_rate",&error)!=arate) {
+      // TODO - resample if audio rate is wrong
+      return FALSE;
+    }
+    
+    if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+    if (weed_plant_has_leaf(ctmpl,"audio_channels")) xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
+    
+    // stop video thread from possibly interpolating/deiniting
+    if (pthread_mutex_trylock(&mainw->interp_mutex)) return FALSE;
+    
+    
+    // make sure values match, else we need to reinit the plugin
+    if (xnchans!=weed_get_int_value(channel,"audio_channels",&error)||
+	arate!=weed_get_int_value(channel,"audio_rate",&error)||
+	weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
+      // reinit plugin
+      mainw->agen_needs_reinit=TRUE;
+    }
+    
+    weed_set_int_value(channel,"audio_channels",xnchans);
+    weed_set_int_value(channel,"audio_rate",arate);
+    weed_set_boolean_value(channel,"audio_interleaf",aint);
+    weed_set_int_value(channel,"audio_data_length",nsamps);
+    weed_set_voidptr_value(channel,"audio_data",fbuffer);
+    
+    weed_set_double_value(inst,"fps",cfile->pb_fps);
+
+    if (mainw->agen_needs_reinit) {
+      // allow main thread to complete the reinit so we do not delay; just return silence
+      memset(fbuffer,0,nsamps*nchans*sizeof(float));
+      pthread_mutex_unlock(&mainw->interp_mutex);
+      return FALSE;
+    }
+
+    weed_set_int64_value(channel,"timecode",tc);
+  }
+
+
+  if (mainw->pconx!=NULL&&!(mainw->preview||mainw->is_rendering)) {
+    // chain any data pipelines
+    if (!pthread_mutex_trylock(&mainw->data_mutex)) {
+      mainw->agen_needs_reinit=pconx_chain_data(mainw->agen_key-1,rte_key_getmode(mainw->agen_key));
+      pthread_mutex_unlock(&mainw->data_mutex);
+      
+      if (mainw->agen_needs_reinit) {
+	// allow main thread to complete the reinit so we do not delay; just return silence
+	memset(fbuffer,0,nsamps*nchans*sizeof(float));
+	pthread_mutex_unlock(&mainw->interp_mutex);
+	return FALSE;
+      }
+    }
+  }
+
+
+
+  weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
+  process_func=process_func_ptr_ptr[0];
+
+  if ((*process_func)(inst,tc)==WEED_ERROR_PLUGIN_INVALID) {
+    pthread_mutex_unlock(&mainw->interp_mutex);
+    return FALSE;
+  }
+  pthread_mutex_unlock(&mainw->interp_mutex);
+
+  if (channel!=NULL&&aint==WEED_TRUE) {
+    if (!float_deinterleave(fbuffer,nsamps,nchans)) return FALSE;
+  }
+
+  if (xnchans==1&&nchans==2) {
+    // if we got mono but we wanted stereo, copy to right channel
+    weed_memcpy(&fbuffer[nsamps],fbuffer,nsamps*sizeof(float));
+  }
+
+  if (weed_plant_has_leaf(inst,"host_next_instance")) {
+    // handle compound fx
+    inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+    goto getaud1;
+  }
+
+  mainw->agen_samps_count+=nsamps;
+
+  return TRUE;
+}
+
+
+void reinit_audio_gen(void) {
+  int agen_key=mainw->agen_key;
+  int ret;
+
+  weed_plant_t *inst=rte_keymode_get_instance(agen_key,rte_key_getmode(mainw->agen_key));
+
+  ret=weed_reinit_effect(inst,TRUE);
+  if (ret==FILTER_NO_ERROR||ret==FILTER_INFO_REINITED) {
+    mainw->agen_needs_reinit=FALSE;
+    mainw->agen_key=agen_key;
+  }
+}
+
+
+////////////////////////////////////////
+// apply audio as "rendered effect"
+
+static int audio_fd;
+static char *audio_file;
+
+off64_t audio_pos;
+
+weed_timecode_t aud_tc;
+
+boolean apply_rte_audio_init(void) {
+  gchar *com;
+
+  if (!prefs->conserve_space) {
+    mainw->error=FALSE;
+    com=g_strdup_printf("%s backup_audio %s",prefs->backend_sync,cfile->handle);
+    lives_system(com,FALSE);
+    g_free(com);
+    
+    if (mainw->error) {
+      d_print_failed();
+      return FALSE;
+    }
+  }
+
+audio_pos=(double)((cfile->start-1)*cfile->arate*cfile->achans*cfile->asampsize/8)/cfile->fps;
+  audio_file=g_build_filename(prefs->tmpdir,cfile->handle,"audio",NULL);
+
+  audio_fd=open(audio_file,O_RDWR|O_CREAT,DEF_FILE_PERMS);
+
+  if (audio_fd==-1) return FALSE;
+
+#ifdef IS_MINGW
+  setmode(audio_fd,O_BINARY);
+#endif
+
+  if (audio_pos>cfile->afilesize) {
+    off64_t audio_end_pos=(double)((cfile->start-1)*cfile->arate*cfile->achans*cfile->asampsize/8)/cfile->fps;
+    pad_with_silence(audio_fd, audio_pos, audio_end_pos, cfile->asampsize, cfile->signed_endian&AFORM_UNSIGNED, cfile->signed_endian&AFORM_BIG_ENDIAN);
+  }
+  else lseek64(audio_fd,audio_pos,SEEK_SET);
+
+  aud_tc=0;
+
+  return TRUE;
+}
+
+
+void apply_rte_audio_end(boolean del) {
+  close(audio_fd);
+  if (del) unlink(audio_file);
+  g_free(audio_file);
+}
+
+
+boolean apply_rte_audio(int nframes) {
+  size_t tbytes;
+  uint8_t *in_buff;
+  float **fltbuf,*fltbufni=NULL;
+  short *shortbuf=NULL;
+
+  boolean rev_endian=FALSE;
+
+  register int i;
+
+  int abigendian=cfile->signed_endian&AFORM_BIG_ENDIAN;
+  int onframes;
+
+  // read nframes of audio from clip or generator
+
+  if ((abigendian&&capable->byte_order==LIVES_LITTLE_ENDIAN)||(!abigendian&&capable->byte_order==LIVES_BIG_ENDIAN)) rev_endian=TRUE;
+
+  tbytes=nframes*cfile->achans*cfile->asampsize/8;
+
+  if (mainw->agen_key==0) {
+    if (tbytes+audio_pos>cfile->afilesize) tbytes=cfile->afilesize-audio_pos;
+    if (tbytes<=0) return TRUE;
+    nframes=tbytes/cfile->achans/(cfile->asampsize/8);
+  }
+
+  onframes=nframes;
+
+  in_buff=(uint8_t *)g_try_malloc(tbytes);
+  if (in_buff==NULL) return FALSE;
+
+  if (cfile->asampsize==8) {
+    shortbuf=(short *)g_try_malloc(tbytes);
+    if (shortbuf==NULL) {
+      g_free(in_buff);
+      return FALSE;
+    }
+  }
+
+  fltbuf=(float **)g_malloc(cfile->achans*sizeof(float *));
+
+
+  if (mainw->agen_key==0) {
+    mainw->read_failed=FALSE;
+
+    tbytes=lives_read(audio_fd,in_buff,tbytes,FALSE);
+      
+    if (mainw->read_failed) {
+      do_read_failed_error_s(audio_file,NULL);
+      if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+      mainw->read_failed_file=NULL;
+      g_free(fltbuf);
+      g_free(in_buff);
+      if (shortbuf!=NULL) g_free(shortbuf);
+      return FALSE;
+    }
+
+
+    if (cfile->asampsize==8) {
+      sample_move_d8_d16 (shortbuf, in_buff, nframes, tbytes, 
+			  1.0, cfile->achans, cfile->achans, 0);
+    }
+    else shortbuf=(short *)in_buff;
+
+    nframes=tbytes/cfile->achans/(cfile->asampsize/8);
+
+    // convert to float
+
+    for (i=0;i<cfile->achans;i++) {
+      // convert s16 to non-interleaved float
+      fltbuf[i]=(float *)g_try_malloc(nframes*sizeof(float));
+      if (fltbuf[i]==NULL) {
+	for (--i;i>=0;i--) {
+	  g_free(fltbuf[i]);
+	}
+	g_free(fltbuf);
+	if (shortbuf!=(short *)in_buff) g_free(shortbuf);
+	g_free(in_buff);
+	return FALSE;
+      }
+      memset(fltbuf[i],0,nframes*sizeof(float));
+      if (nframes>0) sample_move_d16_float(fltbuf[i],shortbuf+i,nframes,cfile->achans,(cfile->signed_endian&AFORM_UNSIGNED),rev_endian,1.0);
+    }
+    
+  }
+  else {
+    fltbufni=(float *)g_try_malloc(nframes*cfile->achans*sizeof(float));
+    if (fltbufni==NULL) {
+      g_free(fltbuf);
+      if (shortbuf!=(short *)in_buff) g_free(shortbuf);
+      g_free(in_buff);
+      return FALSE;
+    }
+    get_audio_from_plugin(fltbufni, cfile->achans, cfile->arate, nframes);
+    for (i=0;i<cfile->achans;i++) {
+      fltbuf[i]=fltbufni+i*nframes;
+    }
+  }
+
+
+  // apply any audio effects
+
+  aud_tc+=(double)onframes/(double)cfile->arate*U_SEC;
+  // apply any audio effects with in_channels
+    
+  weed_apply_audio_effects_rt(fltbuf,cfile->achans,onframes,cfile->arate,aud_tc,FALSE);
+
+  if (!((has_audio_filters(FALSE)&&!has_audio_filters(TRUE))||mainw->agen_key!=0)) {
+    // analysers only - no need to save
+    audio_pos+=tbytes;
+
+    if (fltbufni==NULL) {
+      for (i=0;i<cfile->achans;i++) {
+	g_free(fltbuf[i]);
+      }
+    }
+    else g_free(fltbufni);
+    
+    g_free(fltbuf);
+  
+    if (shortbuf!=(short *)in_buff) g_free(shortbuf);
+    g_free(in_buff);
+  }
+    
+  // convert float audio back to int
+  sample_move_float_int(in_buff,fltbuf,onframes,1.0,cfile->achans,cfile->asampsize,(cfile->signed_endian&AFORM_UNSIGNED),
+			!(cfile->signed_endian&AFORM_BIG_ENDIAN),FALSE,1.0);
+  
+  if (fltbufni==NULL) {
+    for (i=0;i<cfile->achans;i++) {
+      g_free(fltbuf[i]);
+    }
+  }
+  else g_free(fltbufni);
+  
+  g_free(fltbuf);
+  
+  
+  // save to file
+  mainw->write_failed=FALSE;
+  lseek64(audio_fd,audio_pos,SEEK_SET);
+  tbytes=onframes*cfile->achans*cfile->asampsize/8;
+  lives_write(audio_fd,in_buff,tbytes,FALSE);
+  audio_pos+=tbytes;
+
+  if (shortbuf!=(short *)in_buff) g_free(shortbuf);
+  g_free(in_buff);
+
+  if (mainw->write_failed) {
+    do_write_failed_error_s(audio_file,NULL);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+
+
 
 ////////////////////////////////////////
 // audio streaming
 
+#ifndef IS_MINGW
 static int astream_pid=0;
+#endif
 
 gboolean start_audio_stream(void) {
+#ifdef IS_MINGW
+  return FALSE;
+#else
+
   const gchar *playername="audiostreamer.pl";
   gchar *astream_name=NULL;
   gchar *astream_name_out=NULL;
@@ -2208,6 +2824,7 @@
   gboolean timeout=FALSE;
 
   astream_name=g_build_filename(prefs->tmpdir,astname,NULL);
+
   mkfifo(astream_name,S_IRUSR|S_IWUSR);
 
   astream_name_out=g_build_filename(prefs->tmpdir,astname_out,NULL);
@@ -2215,20 +2832,20 @@
   g_free(astname);
   g_free(astname_out);
 
-    if (prefs->audio_player==AUD_PLAYER_PULSE) {
+  if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-      arate=(int)mainw->pulsed->out_arate;
-      // TODO - chans, samps, signed, endian
+    arate=(int)mainw->pulsed->out_arate;
+    // TODO - chans, samps, signed, endian
 #endif
-    }
+  }
 
-    if (prefs->audio_player==AUD_PLAYER_JACK) {
+  if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-      arate=(int)mainw->jackd->sample_out_rate;
-      // TODO - chans, samps, signed, endian
+    arate=(int)mainw->jackd->sample_out_rate;
+    // TODO - chans, samps, signed, endian
       
 #endif
-    }
+  }
 
 
   astream_pid=fork();
@@ -2260,6 +2877,10 @@
 
   lives_alarm_clear(alarm_handle);
 
+#ifdef IS_MINGW
+  setmode(afd, O_BINARY);
+#endif
+
   if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
     mainw->pulsed->astream_fd=afd;
@@ -2272,15 +2893,21 @@
 #endif
   }
 
+#ifdef IS_MINGW
+  setmode(afd, O_BINARY);
+#endif
+
   g_free(astream_name);
   g_free(astream_name_out);
 
   return TRUE;
+#endif
 }
 
 
 
 void stop_audio_stream(void) {
+#ifndef IS_MINGW
   if (astream_pid>0) {
     // if we were streaming audio, kill it
     const gchar *playername="audiostreamer.pl";
@@ -2324,7 +2951,7 @@
 
   }
 
-
+#endif
 }

LiVES-1.6.1.tar.bz2/src/audio.h -> LiVES-2.0.3.tar.bz2/src/audio.h Changed

@@ -25,7 +25,7 @@
 # define DEFAULT_AUDIO_CHANS 2
 # define DEFAULT_AUDIO_SAMPS 16
 # define DEFAULT_AUDIO_SIGNED8 (AFORM_UNSIGNED)
-# define DEFAULT_AUDIO_SIGNED16 !(AFORM_UNSIGNED)
+# define DEFAULT_AUDIO_SIGNED16 (!AFORM_UNSIGNED)
 
 /// KO time before declaring audio server dead
 #define LIVES_ACONNECT_TIMEOUT (10 * U_SEC)
@@ -57,8 +57,8 @@
 
 /* message passing structure */
 typedef struct _aserver_message_t {
-  gint command;
-  gchar *data;
+  volatile gint command;
+  volatile gchar *data;
   volatile struct _aserver_message_t *next;
 } aserver_message_t;
 
@@ -144,26 +144,31 @@
 
 
 
-void sample_silence_dS (float *dst, unsigned long nsamples);
+void sample_silence_dS (float *dst, uint64_t nsamples);
 
 void sample_move_d8_d16(short *dst, guchar *src,
-			unsigned long nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
+			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
 
 void sample_move_d16_d16(short *dst, short *src,
-			 unsigned long nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign);
+			 uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign);
 
 void sample_move_d16_d8(uint8_t *dst, short *src,
-			unsigned long nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
+			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
 
-void sample_move_d16_float (float *dst, short *src, unsigned long nsamples, unsigned long src_skip, int is_unsigned, float vol);
+void sample_move_d16_float (float *dst, short *src, uint64_t nsamples, uint64_t src_skip, int is_unsigned, boolean rev_endian, float vol);
 
-long sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, int usigned, gboolean swap_endian, float vol); ///< returns frames output
+int64_t sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, int usigned, gboolean swap_endian, gboolean float_interleaved, float vol); ///< returns frames output
 
-long sample_move_abuf_float (float **obuf, int nchans, int nsamps, int out_arate, float vol);
+int64_t sample_move_abuf_float (float **obuf, int nchans, int nsamps, int out_arate, float vol);
 
-long sample_move_abuf_int16 (short *obuf, int nchans, int nsamps, int out_arate);
+int64_t sample_move_abuf_int16 (short *obuf, int nchans, int nsamps, int out_arate);
 
-long render_audio_segment(gint nfiles, gint *from_files, gint to_file, gdouble *avels, gdouble *fromtime, weed_timecode_t tc_start, weed_timecode_t tc_end, gdouble *chvol, gdouble opvol_start, gdouble opvol_end, lives_audio_buf_t *obuf);
+void sample_move_float_float (float *dst, float *src, uint64_t nsamples, uint64_t src_skip, float vol);
+
+boolean float_deinterleave(float *fbuffer, int nsamps, int nchans);
+boolean float_interleave(float *fbuffer, int nsamps, int nchans);
+
+int64_t render_audio_segment(gint nfiles, gint *from_files, gint to_file, gdouble *avels, gdouble *fromtime, weed_timecode_t tc_start, weed_timecode_t tc_end, gdouble *chvol, gdouble opvol_start, gdouble opvol_end, lives_audio_buf_t *obuf);
 
 void aud_fade(gint fileno, gdouble startt, gdouble endt, gdouble startv, gdouble endv); ///< fade in/fade out
 
@@ -171,17 +176,18 @@
   RECA_WINDOW_GRAB,
   RECA_NEW_CLIP,
   RECA_EXISTING,
-  RECA_EXTERNAL
+  RECA_EXTERNAL,
+  RECA_GENERATED
 } lives_rec_audio_type_t;
 
 #ifdef ENABLE_JACK
 void jack_rec_audio_to_clip(gint fileno, gint oldfileno, lives_rec_audio_type_t rec_type);  ///< record from external source to clip
-void jack_rec_audio_end(void);
+void jack_rec_audio_end(boolean close_fd);
 #endif
 
 #ifdef HAVE_PULSE_AUDIO
 void pulse_rec_audio_to_clip(gint fileno, gint oldfileno, lives_rec_audio_type_t rec_type);  ///< record from external source to clip
-void pulse_rec_audio_end(void);
+void pulse_rec_audio_end(boolean close_fd);
 #endif
 
 void fill_abuffer_from(lives_audio_buf_t *abuf, weed_plant_t *event_list, weed_plant_t *st_event, gboolean exact);
@@ -192,6 +198,8 @@
 
 lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event, gboolean get_audstate, gboolean exact);
 
+gboolean get_audio_from_plugin(float *fbuffer, int nchans, int arate, int nsamps);
+void reinit_audio_gen(void);
 
 void init_jack_audio_buffers (gint achans, gint arate, gboolean exact);
 void free_jack_audio_buffers(void);
@@ -205,6 +213,10 @@
 void audio_cache_end (void);
 lives_audio_buf_t *audio_cache_get_buffer(void);
 
+boolean apply_rte_audio_init(void);
+void apply_rte_audio_end(boolean del);
+boolean apply_rte_audio(int nframes);
+
 gboolean start_audio_stream(void);
 void stop_audio_stream(void);
 void clear_audio_stream(void);

LiVES-1.6.1.tar.bz2/src/callbacks.c -> LiVES-2.0.3.tar.bz2/src/callbacks.c Changed

@@ -1,6 +1,6 @@
 // callbacks.c
 // LiVES
-// (c) G. Finch 2003 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2003 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -47,10 +47,18 @@
 
 
 void lives_exit (void) {
+  register int i;
+
+  if (!mainw->only_close) mainw->is_exiting=TRUE;
 
   if (mainw->is_ready) {
-    int i;
     gchar *com;
+    gchar *cwd;
+
+    if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) {
+      //g_source_remove(mainw->multitrack->idlefunc);
+      mainw->multitrack->idlefunc=0;
+    }
 
     threaded_dialog_spin();
 
@@ -62,10 +70,6 @@
       stored_event_list_free_all(FALSE);
     }
 
-    if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) {
-       g_source_remove(mainw->multitrack->idlefunc);
-    }
-
     if (mainw->multitrack!=NULL&&!mainw->only_close) {
        if (mainw->multitrack->undo_mem!=NULL) g_free(mainw->multitrack->undo_mem);
        mainw->multitrack->undo_mem=NULL;
@@ -73,7 +77,6 @@
 
     if (mainw->playing_file>-1) {
       mainw->ext_keyboard=FALSE;
-      gtk_timeout_remove (mainw->kb_timer);
       if (mainw->ext_playback) {
 	if (mainw->vpp->exit_screen!=NULL) (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
 	stop_audio_stream();
@@ -84,11 +87,15 @@
       if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE&&mainw->aud_file_to_kill>-1&&
 	  mainw->files[mainw->aud_file_to_kill]!=NULL) {
 	gchar *lsname=g_build_filename(prefs->tmpdir,mainw->files[mainw->aud_file_to_kill]->handle,NULL);
+#ifndef IS_MINGW
 	com=g_strdup_printf ("/bin/touch \"%s\" 2>/dev/null",lsname);
+#else
+	com=g_strdup_printf ("touch.exe \"%s\" 2>NUL",lsname);
+#endif
 	g_free(lsname);
 	lives_system(com,TRUE);
 	g_free (com);
-	com=g_strdup_printf("smogrify stop_audio \"%s\"",mainw->files[mainw->aud_file_to_kill]->handle);
+	com=g_strdup_printf("%s stop_audio \"%s\"",prefs->backend,mainw->files[mainw->aud_file_to_kill]->handle);
 	lives_system(com,TRUE);
 	g_free(com);
       }
@@ -97,9 +104,26 @@
     // stop any background processing for the current clip
     if (mainw->current_file>-1) {
       if (cfile->handle!=NULL&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
-	com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+	com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 	lives_system(com,TRUE);
+#else
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
 	g_free(com);
+
       }
     }
     
@@ -108,11 +132,14 @@
 
     if (!mainw->only_close) {
 #ifdef HAVE_PULSE_AUDIO
-      if (mainw->pulsed!=NULL) pulse_close_client(mainw->pulsed);
-      if (mainw->pulsed_read!=NULL) pulse_close_client(mainw->pulsed_read);
-      pulse_shutdown();
+    pthread_mutex_lock(&mainw->abuf_mutex);
+    if (mainw->pulsed!=NULL) pulse_close_client(mainw->pulsed);
+    if (mainw->pulsed_read!=NULL) pulse_close_client(mainw->pulsed_read);
+    pulse_shutdown();
+    pthread_mutex_unlock(&mainw->abuf_mutex);
 #endif
 #ifdef ENABLE_JACK
+      pthread_mutex_lock(&mainw->abuf_mutex);
       lives_jack_end();
       if (mainw->jackd!=NULL) {
 	jack_close_device(mainw->jackd);
@@ -120,6 +147,7 @@
       if (mainw->jackd_read!=NULL) {
 	jack_close_device(mainw->jackd_read);
       }
+      pthread_mutex_unlock(&mainw->abuf_mutex);
 #endif
     }
 
@@ -137,7 +165,7 @@
       unlink(mainw->recovery_file);
       // hide the main window
       threaded_dialog_spin();
-      while (g_main_context_iteration (NULL,FALSE));
+      lives_widget_context_update();
       threaded_dialog_spin();
     }
 
@@ -147,13 +175,13 @@
       end_threaded_dialog();
       if (do_move_tmpdir_dialog()) {
 	do_do_not_close_d();
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
 
 	// TODO *** - check for namespace collisions between sets in old dir and sets in new dir
 
 
 	// use backend to move the sets
-	com=g_strdup_printf("smogrify weed \"%s\" &",future_prefs->tmpdir);
+	com=g_strdup_printf("%s weed \"%s\" &",prefs->backend_sync,future_prefs->tmpdir);
 	lives_system (com,FALSE);
 	g_free (com);
       }
@@ -161,13 +189,61 @@
     }
     else if (!mainw->only_close) g_snprintf(future_prefs->tmpdir,256,"NULL");
 
-    if (mainw->leave_files) {
+    if (mainw->leave_files&&!mainw->fatal) {
       gchar *msg;
       msg=g_strdup_printf(_("Saving as set %s..."),mainw->set_name);
       d_print(msg);
       g_free(msg);
     }
 
+    cwd=g_get_current_dir();
+
+    for (i=1;i<=MAX_FILES;i++) {
+      if (mainw->files[i]!=NULL) {
+	mainw->current_file=i;
+	threaded_dialog_spin();
+	if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
+	if (cfile->event_list!=NULL) event_list_free (cfile->event_list);
+
+	cfile->event_list=cfile->event_list_back=NULL;
+
+	if (cfile->layout_map!=NULL) {
+	  g_list_free_strings(cfile->layout_map);
+	  g_list_free(cfile->layout_map);
+	}
+
+	if (cfile->laudio_drawable!=NULL) {
+	  lives_painter_surface_destroy(cfile->laudio_drawable);
+	}
+
+	if (cfile->raudio_drawable!=NULL) {
+	  lives_painter_surface_destroy(cfile->raudio_drawable);
+	}
+
+
+	if (mainw->files[i]->clip_type==CLIP_TYPE_FILE&&mainw->files[i]->ext_src!=NULL) {
+	  // must do this before we move it
+	  gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+	  lives_chdir(ppath,FALSE);
+	  g_free(ppath);
+	  threaded_dialog_spin();
+	  close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
+	  mainw->files[i]->ext_src=NULL;
+	  threaded_dialog_spin();
+	}
+	
+	if (mainw->files[i]->frame_index!=NULL) {
+	  g_free(mainw->files[i]->frame_index);
+	  mainw->files[i]->frame_index=NULL;
+	}
+
+	cfile->layout_map=NULL;
+
+      }
+    }
+
+    lives_chdir(cwd,FALSE);
+    g_free(cwd);
 
     for (i=0;i<=MAX_FILES;i++) {
       if (mainw->files[i]!=NULL) {
@@ -179,6 +255,13 @@
 	    (mainw->multitrack!=NULL&&i==mainw->multitrack->render_file)) {
 	  // close all open clips, except for ones we want to retain
 
+#ifdef IS_MINGW
+	  FILE *rfile;
+	  ssize_t rlen;
+	  char val[16];
+	  int pid;
+#endif
+
 #ifdef HAVE_YUV4MPEG
 	  if (mainw->files[i]->clip_type==CLIP_TYPE_YUV4MPEG) {
 	    lives_yuv_stream_stop_read((lives_yuv4m_t *)mainw->files[i]->ext_src);
@@ -192,7 +275,19 @@
 	  }
 #endif
 	  threaded_dialog_spin();
-	  com=g_strdup_printf("smogrify close \"%s\"",mainw->files[i]->handle);
+#ifdef IS_MINGW
+	  // kill any active processes: for other OSes the backend does this
+	  // get pid from backend
+	  com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	  rfile=popen(com,"r");
+	  rlen=fread(val,1,16,rfile);
+	  pclose(rfile);
+	  memset(val+rlen,0,1);
+	  pid=atoi(val);
+	  
+	  lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+	  com=g_strdup_printf("%s close \"%s\"",prefs->backend,mainw->files[i]->handle);
 	  lives_system(com,FALSE);
 	  g_free(com);
 	  threaded_dialog_spin();
@@ -200,7 +295,7 @@
 	else {
 	  threaded_dialog_spin();
 	  // or just clean them up
-	  com=g_strdup_printf("smogrify clear_tmp_files \"%s\"",mainw->files[i]->handle);
+	  com=g_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,mainw->files[i]->handle);
 	  lives_system(com,FALSE);
 	  threaded_dialog_spin();
 	  g_free(com);
@@ -209,22 +304,6 @@
 	  }
 	  lives_freep((void**)&mainw->files[i]->op_dir);
 	}
-	if (!mainw->only_close) {
-	  if (mainw->files[i]->frame_index!=NULL) {
-	    g_free(mainw->files[i]->frame_index);
-	    mainw->files[i]->frame_index=NULL;
-	  }
-
-	  if (mainw->files[i]->clip_type==CLIP_TYPE_FILE&&mainw->files[i]->ext_src!=NULL) {
-	    threaded_dialog_spin();
-	    close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
-	    mainw->files[i]->ext_src=NULL;
-	  }
-
-	  g_free(mainw->files[i]);
-	  mainw->files[i]=NULL;
-	  threaded_dialog_spin();
-	}
       }
     }
 
@@ -234,7 +313,11 @@
 	gchar *sdname=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 
 	// note, we do not use the flag -f
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null",sdname);
+#else
+	com=g_strdup_printf("rm.exe -r \"%s/\" 2>NUL",sdname);
+#endif
 	g_free(sdname);
 	lives_system(com,TRUE);
 	threaded_dialog_spin();
@@ -242,13 +325,21 @@
       }
       else {
 	gchar *dname=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/rm -r \"%s\" 2>/dev/null",dname);
+#else
+	com=g_strdup_printf("rm.exe -r \"%s\" 2>NUL",dname);
+#endif
 	g_free(dname);
 	lives_system(com,TRUE);
 	threaded_dialog_spin();
 	g_free(com);
 	dname=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",dname);
+#else
+	com=g_strdup_printf("rm.exe \"%s\" 2>NUL",dname);
+#endif
 	g_free(dname);
 	lives_system(com,TRUE);
 	threaded_dialog_spin();
@@ -263,39 +354,7 @@
       g_free(set_lock_file);
       threaded_dialog_spin();
     }
-
-    for (i=1;i<=MAX_FILES;i++) {
-      if (mainw->files[i]!=NULL) {
-	mainw->current_file=i;
-	threaded_dialog_spin();
-	if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
-	if (cfile->event_list!=NULL) event_list_free (cfile->event_list);
-
-	cfile->event_list=cfile->event_list_back=NULL;
-
-	if (cfile->layout_map!=NULL) {
-	  g_list_free_strings(cfile->layout_map);
-	  g_list_free(cfile->layout_map);
-	}
-
-	if (mainw->files[i]->clip_type==CLIP_TYPE_FILE&&mainw->files[i]->ext_src!=NULL) {
-	  // must do this before we move it
-	  close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
-	  mainw->files[i]->ext_src=NULL;
-	}
-	
-	if (mainw->files[i]->frame_index!=NULL) {
-	  g_free(mainw->files[i]->frame_index);
-	  mainw->files[i]->frame_index=NULL;
-	}
-
-	cfile->layout_map=NULL;
-
-      }
-    }
-
-
-  
+    
     if (mainw->only_close) {
       mainw->suppress_dprint=TRUE;
       for (i=1;i<=MAX_FILES;i++) {
@@ -335,10 +394,13 @@
     save_future_prefs();
 
     // stop valgrind from complaining
+#ifdef VALG_COMPLAIN
     if (mainw->preview_image!=NULL && GTK_IS_IMAGE(mainw->preview_image)) 
       gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL);
+
     if (mainw->image272!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272), NULL);
     if (mainw->image273!=NULL) gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273), NULL);
+#endif
 
     if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
 
@@ -359,6 +421,7 @@
     if (capable->has_encoder_plugins) plugin_request("encoders",prefs->encoder.name,"finalise");
 
     weed_unload_all();
+
     threaded_dialog_spin();
 
     rfx_free_all();
@@ -366,12 +429,20 @@
 
 #ifdef ENABLE_OSC
     if (prefs->osc_udp_started) lives_osc_end();
+
+#ifdef IS_MINGW
+    WSACleanup();
+#endif
+
 #endif
   }
 
+  pconx_delete_all();
+  cconx_delete_all();
+
   if (mainw->multitrack!=NULL) {
     event_list_free_undos(mainw->multitrack);
-    
+
     if (mainw->multitrack->event_list!=NULL) {
       event_list_free(mainw->multitrack->event_list);
       mainw->multitrack->event_list=NULL;
@@ -381,15 +452,23 @@
   if (prefs->fxdefsfile!=NULL) g_free(prefs->fxdefsfile);
   if (prefs->fxsizesfile!=NULL) g_free(prefs->fxsizesfile);
 
-  g_free(prefs->wm);
+  if (prefs->wm!=NULL) g_free(prefs->wm);
+
+  if (mainw->recovery_file!=NULL) g_free(mainw->recovery_file);
+
+  for (i=0;i<NUM_LIVES_STRING_CONSTANTS;i++) if (mainw->string_constants[i]!=NULL) g_free(mainw->string_constants[i]);
+
+  if (mainw->video_drawable!=NULL) {
+    lives_painter_surface_destroy(mainw->video_drawable);
+  }
 
-  g_free(mainw->recovery_file);
+  if (mainw->laudio_drawable!=NULL) {
+    lives_painter_surface_destroy(mainw->laudio_drawable);
+  }
 
-  g_free(mainw->any_string);
-  g_free(mainw->none_string);
-  g_free(mainw->disabled_string);
-  g_free(mainw->recommended_string);
-  g_free(mainw->cl_string);
+  if (mainw->raudio_drawable!=NULL) {
+    lives_painter_surface_destroy(mainw->raudio_drawable);
+  }
 
   if (mainw->foreign_visual!=NULL) g_free(mainw->foreign_visual);
   if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
@@ -398,7 +477,12 @@
 
   unload_decoder_plugins();
 
-  end_threaded_dialog();
+  if (mainw->multitrack!=NULL) g_free(mainw->multitrack);
+  mainw->multitrack=NULL;
+  mainw->is_ready=FALSE;
+
+  //end_threaded_dialog();
+
   if (mainw->mgeom!=NULL) g_free(mainw->mgeom);
 
   if (prefs->disabled_decoders!=NULL) {
@@ -421,88 +505,83 @@
 
 
 
-gboolean
-return_true                  (GtkWidget       *widget,
-			      GdkEvent        *event,
-		      	      gpointer         user_data)
-{
-  // event callback that just returns TRUE
-  return TRUE;
-}
-
 
-void on_fileread_clicked (GtkFileChooser *fch, gpointer user_data) {
+void on_filesel_button_clicked (GtkButton *button, gpointer user_data) {
   GtkWidget *tentry=GTK_WIDGET(user_data);
-  gchar *text=gtk_file_chooser_get_filename(fch);
+  gchar *dirname;
+  gchar *fname;
   gchar *tmp;
 
-  if (text==NULL) return;
+  gchar *def_dir=(gchar *)g_object_get_data(G_OBJECT(button),"def_dir");
+
+  boolean is_dir=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"is_dir"));
 
-  if (GTK_IS_TEXT_VIEW(tentry)) tentry=(GtkWidget *)gtk_text_view_get_buffer(GTK_TEXT_VIEW(tentry));
+  if (GTK_IS_TEXT_VIEW(tentry)) fname=text_view_get_text(LIVES_TEXT_VIEW(tentry));
+  else fname=g_strdup(gtk_entry_get_text(GTK_ENTRY(tentry)));
+
+  if (!strlen(fname)) {
+    g_free(fname);
+    fname=def_dir;
+  }
+
+  lives_widget_context_update();
+
+  dirname=choose_file(fname,NULL,NULL,
+		      is_dir?LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+		      (fname==def_dir&&!strcmp(def_dir,LIVES_DEVICE_DIR))?LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE:
+		      LIVES_FILE_CHOOSER_ACTION_OPEN,
+		      NULL,NULL);
+
+  if (fname!=NULL&&fname!=def_dir) g_free(fname);
+
+  if (dirname==NULL) return;
+
+  g_snprintf(file_name,PATH_MAX,"%s",dirname);
+  g_free(dirname);
 
-  if (GTK_IS_ENTRY(tentry)) gtk_entry_set_text(GTK_ENTRY(tentry),(tmp=g_filename_to_utf8(text,-1,NULL,NULL,NULL)));
-  else gtk_text_buffer_set_text (GTK_TEXT_BUFFER(tentry), (tmp=g_filename_to_utf8(text,-1,NULL,NULL,NULL)), -1);
+  if (button!=NULL) {
+    if (GTK_IS_ENTRY(tentry)) gtk_entry_set_text(GTK_ENTRY(tentry),(tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)));
+    else text_view_set_text (LIVES_TEXT_VIEW(tentry), (tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)), -1);
+    g_free(tmp);
+  }
 
   // force update to be recognized
   if (g_object_get_data(G_OBJECT(tentry),"rfx")!=NULL) 
     after_param_text_changed(tentry,(lives_rfx_t *)g_object_get_data(G_OBJECT(tentry),"rfx"));
-
-  g_free(tmp);
-  g_free(text);
-
 }
 
 
 
-void
-on_filesel_complex_clicked                      (GtkButton *button,
-						 GtkEntry *entry)
-{
+void on_filesel_complex_clicked (GtkButton *button, GtkEntry *entry) {
   // append /livestmp
-  on_filesel_simple_clicked (NULL,entry);
+  size_t chklen=strlen(LIVES_TMP_NAME);
 
-  // TODO - dirsep
+  on_filesel_button_clicked (NULL,entry);
 
+  // TODO - dirsep
+#ifndef IS_MINGW
   if (strcmp(file_name+strlen(file_name)-1,"/")) {
     g_strappend(file_name,PATH_MAX,"/");
   }
+  if (strlen (file_name)<chklen+2||strncmp (file_name+strlen (file_name)-chklen-2,"/"LIVES_TMP_NAME"/",chklen-2)) 
+    g_strappend (file_name,PATH_MAX,LIVES_TMP_NAME"/");
+#else
+  if (strcmp(file_name+strlen(file_name)-1,"\\")) {
+    g_strappend(file_name,PATH_MAX,"\\");
+  }
+  if (strlen (file_name)<chklen-2||strncmp (file_name+strlen (file_name)-chklen-2,"\\"LIVES_TMP_NAME"\\",chklen-2)) 
+    g_strappend (file_name,PATH_MAX,LIVES_TMP_NAME"\\");
+#endif
 
-  if (strlen (file_name)<10||strncmp (file_name+strlen (file_name)-10,"/livestmp/",10)) 
-    g_strappend (file_name,PATH_MAX,"livestmp/");
   gtk_entry_set_text(entry,file_name);
 
 }
 
 
-void
-on_filesel_simple_clicked (GtkButton *button, GtkEntry *entry) {
-  // callback for directory browsing buttons
-  gchar *dirname;
-  gchar *fname=g_strdup(gtk_entry_get_text(entry));
-  while (g_main_context_iteration(NULL,FALSE));
-  dirname=choose_file(fname,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,NULL,NULL);
-  if (dirname!=NULL) {
-    g_snprintf(file_name,PATH_MAX,"%s",dirname);
-    g_free(dirname);
-  }
-  else g_snprintf(file_name,PATH_MAX,"%s",fname);
-  g_free(fname);
-  if (button!=NULL) gtk_entry_set_text(entry,file_name);
-}
-
-
-
-
-void
-on_open_activate                      (GtkMenuItem     *menuitem,
-				       gpointer         user_data)
-{
 
+void on_open_sel_activate (GtkMenuItem *menuitem, gpointer user_data) {
   // OPEN A FILE
 
-
-  GtkWidget *fileselection;
-
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
       g_source_remove(mainw->multitrack->idlefunc);
@@ -513,52 +592,45 @@
     gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
   }
 
-  while (g_main_context_iteration(NULL,FALSE));
+  choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,1);
+}
 
-  fileselection = create_fileselection (_ ("Select File"),1,NULL);
 
-  if (strlen(mainw->vid_load_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),mainw->vid_load_dir);
-  }
 
-  gtk_file_selection_set_select_multiple(GTK_FILE_SELECTION(fileselection),TRUE);
+void on_ok_filesel_open_clicked (GtkFileChooser *chooser, gpointer user_data) {
+  gchar *fname=gtk_file_chooser_get_filename (chooser);
+  gchar *tmp;
 
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_ok_button1_clicked),NULL);
-  gtk_widget_show (fileselection);
-}
+  if (fname==NULL) return;
 
-void
-on_open_sel_activate                      (GtkMenuItem     *menuitem,
-					   gpointer         user_data)
-{
-  GtkWidget *fileselection;
+  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(fname,-1,NULL,NULL,NULL)));
+  g_free(tmp); g_free(fname);
 
-  if (mainw->multitrack!=NULL) {
-    if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
-      mainw->multitrack->idlefunc=0;
-    }
-    mt_desensitise(mainw->multitrack);
-    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
-  }
+  end_fs_preview();
+  gtk_widget_destroy(GTK_WIDGET(chooser));
 
-  while (g_main_context_iteration(NULL,FALSE));
+  g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",file_name);
+  get_dirname(mainw->vid_load_dir);
 
-  fileselection = create_fileselection (_ ("Select File"),1,NULL);
+  if (mainw->multitrack==NULL) gtk_widget_queue_draw(mainw->LiVES);
+  else gtk_widget_queue_draw(mainw->multitrack->window);
+  lives_widget_context_update();
+  
+  mainw->fs_playarea=NULL;
+  
+  if (prefs->save_directories) {
+    set_pref ("vid_load_dir",(tmp=g_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
+    g_free(tmp);
+  }
+  
+  mainw->cancelled=CANCEL_NONE;
 
-  if (strlen(mainw->vid_load_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),mainw->vid_load_dir);
-  } 
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",
-		    G_CALLBACK (on_open_sel_ok_button_clicked),NULL);
-  gtk_widget_show (fileselection);
+  open_sel_range_activate();
 }
 
-void
-on_open_vcd_activate                      (GtkMenuItem     *menuitem,
-					   gpointer         user_data)
-{
+
+
+void on_open_vcd_activate (GtkMenuItem *menuitem, gpointer user_data) {
   GtkWidget *vcdtrack_dialog;
   
   if (mainw->multitrack!=NULL) {
@@ -630,7 +702,7 @@
     prefs->ar_layout=!prefs->ar_layout;
     if (cdsw->warn_checkbutton!=NULL) {
       if (prefs->ar_layout) {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cdsw->warn_checkbutton),FALSE);
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cdsw->warn_checkbutton),FALSE);
 	gtk_widget_set_sensitive(cdsw->warn_checkbutton,FALSE);
       }
       else {
@@ -663,7 +735,7 @@
   }
 
 
-  while (g_main_context_iteration (NULL,FALSE)); // hide menu popdown
+  lives_widget_context_update(); // hide menu popdown
 
   pref=g_strdup_printf("recent%d",pno);
 
@@ -705,7 +777,7 @@
 {
   g_snprintf(file_name,PATH_MAX,"%s",gtk_entry_get_text(GTK_ENTRY(locw->entry)));
   gtk_widget_destroy(locw->dialog);
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_widget_context_update();
   g_free(locw);
 
   mainw->opening_loc=TRUE;
@@ -754,9 +826,11 @@
   }
 
   dirname=g_strdup(gtk_entry_get_text(GTK_ENTRY(locw->dir_entry)));
+  ensure_isdir(dirname);
+  g_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",dirname);
 
   gtk_widget_destroy(locw->dialog);
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_widget_context_update();
   g_free(locw);
 
   dfile=g_build_filename(dirname,fname,NULL);
@@ -786,7 +860,7 @@
 
   unlink(cfile->info_file);
 
-  com=g_strdup_printf("smogrify download_clip \"%s\" \"%s\" \"%s\"",cfile->handle,url,dfile);
+  com=g_strdup_printf("%s download_clip \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,url,dfile);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   g_free(com);
@@ -810,8 +884,24 @@
     }
     else {
       if (current_file==-1) {
+#ifdef IS_MINGW
+	// kill any active processes: for other OSes the backend does this
+      // get pid from backend
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+      int pid;
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+      
+      lives_win32_kill_subprocesses(pid,TRUE);
+#endif
       // we made a temp file so close it
-      com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
       lives_system(com,TRUE);
       g_free(com);
       g_free(cfile);
@@ -837,13 +927,13 @@
     return;
     }
   }
-
+  
   cfile->nopreview=FALSE;
   cfile->no_proc_sys_errors=FALSE;
   cfile->keep_without_preview=FALSE;
 
   if (current_file==-1) {
-    com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
     lives_system(com,TRUE);
     g_free(com);
     g_free(cfile);
@@ -886,6 +976,13 @@
 // 'enough' button for open, open location, and record audio
   gchar *com;
 
+#ifdef IS_MINGW
+  FILE *rfile;
+  ssize_t rlen;
+  char val[16];
+  int pid;
+#endif
+
 #ifdef ENABLE_JACK
   if (mainw->jackd!=NULL&&mainw->jackd_read!=NULL) {
     mainw->cancelled=CANCEL_KEEP;
@@ -899,8 +996,20 @@
   }
 #endif
 
-  com=g_strdup_printf("smogrify stopsubsubs \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+  com=g_strdup_printf("%s stopsubsubs \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
   lives_system(com,TRUE);
+#else
+  // get pid from backend
+  com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+  rfile=popen(com,"r");
+  rlen=fread(val,1,16,rfile);
+  pclose(rfile);
+  memset(val+rlen,0,1);
+  pid=atoi(val);
+  
+  lives_win32_kill_subprocesses(pid,FALSE);
+#endif
   g_free(com);
 
   if (mainw->current_file>-1&&cfile!=NULL&&cfile->proc_ptr!=NULL) {
@@ -909,20 +1018,40 @@
     gtk_widget_set_sensitive(cfile->proc_ptr->cancel_button, FALSE);
   }
 
-  // resume for next time
+  // resume to allow return
   if (mainw->effects_paused) {
-    com=g_strdup_printf("smogrify resume \"%s\"",cfile->handle);
+#ifndef IS_MINGW
+    com=g_strdup_printf("%s stopsubsub \"%s\" SIGCONT 2>/dev/null",prefs->backend_sync,cfile->handle);
+    lives_system(com,TRUE);
+#else
+    FILE *rfile;
+    ssize_t rlen;
+    char val[16];
+    
+    // get pid from backend
+    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    rfile=popen(com,"r");
+    rlen=fread(val,1,16,rfile);
+    pclose(rfile);
+    memset(val+rlen,0,1);
+    pid=atoi(val);
+    
+    lives_win32_suspend_resume_process(pid,FALSE);
+#endif
+    g_free(com);
+    
+    com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
     lives_system(com,FALSE);
     g_free(com);
   }
 
+
 }
 
 
 
 
-void
-on_save_as_activate (GtkMenuItem *menuitem, gpointer user_data) {
+void on_save_as_activate (GtkMenuItem *menuitem, gpointer user_data) {
 
   if (cfile->frames==0) {
     on_export_audio_activate (NULL,NULL);
@@ -963,7 +1092,7 @@
     acurrent=used_in_current_layout(mainw->multitrack,mainw->current_file);
     if (acurrent) {
       if (mainw->xlays==NULL) only_current=TRUE;
-      mainw->xlays=g_list_append_unique(mainw->xlays,mainw->cl_string);
+      mainw->xlays=g_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
     }
 
     if (mainw->xlays!=NULL) {
@@ -1049,7 +1178,6 @@
     gchar *com;
 
     gboolean has_layout_map=FALSE;
-
     int i;
 
 
@@ -1070,37 +1198,73 @@
 	    }
 	  }
 	}
+
 	// delete layout directory
 	laydir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null &",laydir);
+#else
+	com=g_strdup_printf("START /MIN /b rm.exe -r \"%s/\" 2>NUL",laydir);
+#endif
 	lives_system(com,TRUE);
 	g_free(com);
 	g_free(laydir);
       }
     }
 
-    // TODO - dirsep
+    cdir=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+
 
-    cdir=g_build_filename(prefs->tmpdir,mainw->set_name,"clips/",NULL);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",cdir);
-    lives_system(com,TRUE);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s\"",cdir);
+#endif
+    do {
+      // keep trying until backend has deleted the clip
+      mainw->com_failed=FALSE;
+      lives_system(com,TRUE);
+      if (g_file_test(cdir,G_FILE_TEST_IS_DIR)) {
+	lives_widget_context_update();
+	g_usleep(prefs->sleep_time);
+      }
+    } while (g_file_test(cdir,G_FILE_TEST_IS_DIR));
+
+    mainw->com_failed=FALSE;
+
     g_free(com);
     g_free(cdir);
 
     lfiles=g_build_filename(prefs->tmpdir,mainw->set_name,"lock",NULL);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rm \"%s\"* 2>/dev/null",lfiles);
+#else
+    com=g_strdup_printf("DEL \"%s*\" 2>NUL",lfiles);
+#endif
     lives_system(com,TRUE);
     g_free(com);
     g_free(lfiles);
 
     ofile=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",ofile);
+#else
+    com=g_strdup_printf("rm.exe \"%s\" 2>NUL",ofile);
+#endif
     lives_system(com,TRUE);
     g_free(com);
     g_free(ofile);
 
+
+    lives_sync();
+
+
     sdir=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s/\" 2>/dev/null",sdir);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s/\" 2>NUL",sdir);
+#endif
     lives_system(com,TRUE);
     g_free(com);
     g_free(sdir);
@@ -1128,7 +1292,7 @@
 {
   gchar *com;
   gchar *filt[]={"*.lv2",NULL};
-  gchar *proj_file=choose_file(NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
+  gchar *proj_file=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
   gchar *info_file;
   gchar *new_set;
   int info_fd;
@@ -1140,7 +1304,7 @@
   info_file=g_strdup_printf("%s/.impname.%d",prefs->tmpdir,getpid());
   unlink(info_file);
   mainw->com_failed=FALSE;
-  com=g_strdup_printf("smogrify get_proj_set \"%s\">\"%s\"",proj_file,info_file);
+  com=g_strdup_printf("%s get_proj_set \"%s\">\"%s\"",prefs->backend_sync,proj_file,info_file);
   lives_system(com,FALSE);
   g_free(com);
 
@@ -1193,7 +1357,7 @@
     return;
   }
 
-  com=g_strdup_printf("smogrify import_project \"%s\" \"%s\"",cfile->handle,proj_file);
+  com=g_strdup_printf("%s import_project \"%s\" \"%s\"",prefs->backend,cfile->handle,proj_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   g_free(com);
@@ -1206,7 +1370,7 @@
 
   do_progress_dialog(TRUE,FALSE,_("Importing project"));
 
-  com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
+  com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
   lives_system(com,TRUE);
   g_free(com);
   g_free(cfile);
@@ -1257,7 +1421,7 @@
       g_snprintf(new_set_name,128,"%s",gtk_entry_get_text (GTK_ENTRY (renamew->entry)));
       gtk_widget_destroy(renamew->dialog);
       g_free(renamew);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
     } while (!is_legal_set_name(new_set_name,FALSE));
     g_snprintf(mainw->set_name,128,"%s",new_set_name);
   }
@@ -1276,7 +1440,7 @@
   }
 
   def_file=g_strdup_printf("%s.lv2",mainw->set_name);
-  proj_file=choose_file(NULL,def_file,filt,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
+  proj_file=choose_file(NULL,def_file,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
   g_free(def_file);
 
   if (proj_file==NULL) return;
@@ -1284,7 +1448,7 @@
   unlink((tmp=g_filename_from_utf8(proj_file,-1,NULL,NULL,NULL)));
   g_free(tmp);
 
-  if (!check_file(proj_file,TRUE)) {
+  if (!check_file(proj_file,FALSE)) {
     g_free(proj_file);
     return;
   }
@@ -1293,7 +1457,7 @@
   d_print(msg);
   g_free(msg);
 
-  com=g_strdup_printf("smogrify export_project \"%s\" \"%s\" \"%s\"",cfile->handle,mainw->set_name,proj_file);
+  com=g_strdup_printf("%s export_project \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,mainw->set_name,proj_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   g_free(com);
@@ -1318,80 +1482,36 @@
 
 
 
-void
-on_restore_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
-  while (g_main_context_iteration(NULL,FALSE));
-
-  fileselection = create_fileselection (_ ("Restore .lv1 file"),0,NULL);
-  if (strlen(mainw->proj_load_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->proj_load_dir);
-  }
-  gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection), "*.lv1");
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_restore_ok_clicked),NULL);
-  gtk_widget_show (fileselection);
-}
-
-
-
-void
-on_backup_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
-
-  while (g_main_context_iteration(NULL,FALSE));
 
-  fileselection = create_fileselection (_ ("Backup as .lv1 file"),0,NULL);
-  if (strlen(mainw->proj_save_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->proj_save_dir);
-  }
-  gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection), "*.lv1");
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_backup_ok_clicked),NULL);
-  gtk_widget_show (fileselection);
 
-}
+void on_backup_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  gchar *filt[]={"*.lv1",NULL};
+  gchar *file_name = choose_file (strlen(mainw->proj_save_dir)?mainw->proj_save_dir:NULL,NULL,filt,
+				  LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Backup as .lv1 file"),NULL);
 
-
-void
-on_backup_ok_clicked                  (GtkButton       *button,
-				       gpointer         user_data)
-{
-  gchar *tmp;
-  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8
-				 (gtk_file_selection_get_filename(GTK_FILE_SELECTION
-								  (gtk_widget_get_toplevel(GTK_WIDGET(button)))),
-				  -1,NULL,NULL,NULL)));
-  g_free(tmp);
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-
-  gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+  if (file_name==NULL) return;
 
   backup_file(mainw->current_file,1,cfile->frames,file_name);
 
   g_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",file_name);
   get_dirname (mainw->proj_save_dir);
+  g_free(file_name);
 }
 
-void
-on_restore_ok_clicked                  (GtkButton       *button,
-                                        gpointer         user_data)
-{
-  gchar *tmp;
-  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8
-				 (gtk_file_selection_get_filename(GTK_FILE_SELECTION
-								  (gtk_widget_get_toplevel(GTK_WIDGET(button)))),
-				  -1,NULL,NULL,NULL)));
-  g_free(tmp);
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
 
-  gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+
+void on_restore_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  gchar *filt[]={"*.lv1",NULL};
+  gchar *file_name = choose_file (strlen(mainw->proj_load_dir)?mainw->proj_load_dir:NULL,NULL,filt,
+				  LIVES_FILE_CHOOSER_ACTION_OPEN,_ ("Restore .lv1 file"),NULL);
+
+  if (file_name==NULL) return;
 
   restore_file(file_name);
 
   g_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",file_name);
   get_dirname (mainw->proj_load_dir);
-
+  g_free(file_name);
 }
 
 
@@ -1415,8 +1535,8 @@
     g_list_free (mainw->multitrack->video_draws);
   }
   
-  gtk_widget_unref(mainw->multitrack->clip_scroll);
-  gtk_widget_unref(mainw->multitrack->in_out_box);
+  g_object_unref(mainw->multitrack->clip_scroll);
+  g_object_unref(mainw->multitrack->in_out_box);
   
   g_list_free(mainw->multitrack->tl_marks);
   
@@ -1566,7 +1686,11 @@
 	}
 	// delete layout directory
 	esave_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null &",esave_dir);
+#else
+	com=g_strdup_printf("START /MIN /b rm.exe -r \"%s/\" 2>NUL",esave_dir);
+#endif
 	lives_system(com,TRUE);
 	g_free(com);
 	g_free(esave_dir);
@@ -1575,7 +1699,7 @@
   }
 
   if (mainw->multitrack!=NULL&&!mainw->only_close) mt_memory_free();
-  else if (mainw->multitrack!=NULL) wipe_layout(mainw->multitrack);
+  else if (mainw->multitrack!=NULL) wipe_layout(mainw->multitrack);;
 
   mainw->was_set=mainw->leave_files=mainw->leave_recovery=FALSE;
 
@@ -1641,7 +1765,6 @@
     mainw->no_switch_dprint=FALSE;
   }
 
-  // TODO - maybe use a switch()
 
   if (cfile->undo_action==UNDO_INSERT_SILENCE) {
     on_del_audio_activate(NULL,NULL);
@@ -1668,21 +1791,24 @@
       if (cfile->undo1_dbl==cfile->undo2_dbl&&cfile->undo1_dbl==0.) {
 	// undo delete_all_audio
 	reset_achans=cfile->undo_achans;
-	com=g_strdup_printf("smogrify undo_audio \"%s\"",cfile->handle);
+	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
       }
       // undo delete selected audio
-      // (set with with_audio==2 [audio only],therfore start,end,where are is secs.; times==-1)
-      else com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d -1",
-			       cfile->handle,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",cfile->undo1_dbl,
+      // (set with with_audio==2 [audio only],therfore start,end,where are in secs.; times==-1)
+      else com=g_strdup_printf("%s insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d -1",
+			       prefs->backend,
+			       cfile->handle,get_image_ext_for_type(cfile->img_type),cfile->undo1_dbl,
 			       cfile->undo2_dbl-cfile->undo1_dbl, cfile->handle, cfile->arps, cfile->achans, 
 			       cfile->asampsize,!(cfile->signed_endian&AFORM_UNSIGNED),
 			       !(cfile->signed_endian&AFORM_BIG_ENDIAN));
     }
     else {
       // undo cut or delete (times to insert is -1)
+      // start,end, where are in frames
       cfile->undo1_boolean&=mainw->ccpd_with_sound;
-      com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d 0 0 %.3f %d %d %d %d %d -1",cfile->handle,
-			  cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",cfile->undo_start-1,cfile->undo_start,
+      com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d 0 0 %.3f %d %d %d %d %d -1",
+			  prefs->backend,cfile->handle,
+			  get_image_ext_for_type(cfile->img_type),cfile->undo_start-1,cfile->undo_start,
 			  cfile->undo_end,cfile->handle, cfile->undo1_boolean, cfile->frames, cfile->fps, 
 			  cfile->arps, cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
 			  !(cfile->signed_endian&AFORM_BIG_ENDIAN));
@@ -1763,8 +1889,8 @@
 					cfile->vsize!=cfile->ovsize||cfile->fps!=cfile->undo1_dbl))) {
     gchar *audfile;
 
-    com=g_strdup_printf("smogrify undo \"%s\" %d %d \"%s\"",cfile->handle,cfile->undo_start,cfile->undo_end,
-			cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+    com=g_strdup_printf("%s undo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,cfile->undo_end,
+			get_image_ext_for_type(cfile->img_type));
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
@@ -1772,6 +1898,7 @@
 
     if (mainw->com_failed) return;
     
+    mainw->com_failed=FALSE;
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
     
@@ -1784,7 +1911,7 @@
       audfile=g_strdup_printf("%s/%s/audio.bak",prefs->tmpdir,cfile->handle);
       if (g_file_test (audfile, G_FILE_TEST_EXISTS)) {
 	// restore overwritten audio
-	com=g_strdup_printf("smogrify undo_audio %s",cfile->handle);
+	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
 	mainw->com_failed=FALSE;
 	unlink (cfile->info_file);
 	lives_system(com,FALSE);
@@ -1792,7 +1919,7 @@
 	if (mainw->com_failed) return;
 
 	retvalb=do_auto_dialog(_("Restoring audio..."),0);
-	if (retvalb) {
+	if (!retvalb) {
 	  d_print_failed();
 	  //cfile->may_be_damaged=TRUE;
 	  return;
@@ -1824,8 +1951,9 @@
 							cfile->hsize!=cfile->ohsize||cfile->vsize!=cfile->ovsize)) {
 
     if (cfile->frames>cfile->old_frames) {
-      com=g_strdup_printf("smogrify cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",cfile->handle,cfile->old_frames+1, 
-			  cfile->frames, FALSE, cfile->frames, cfile->img_type==IMG_TYPE_JPEG?"jpg":"png", 
+      com=g_strdup_printf("%s cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",
+			  prefs->backend,cfile->handle,cfile->old_frames+1, 
+			  cfile->frames, FALSE, cfile->frames, get_image_ext_for_type(cfile->img_type), 
 			  cfile->fps, cfile->arate, cfile->achans, cfile->asampsize);
 
       cfile->progress_start=cfile->old_frames+1;
@@ -1929,7 +2057,7 @@
       cfile->undo_action==UNDO_TRIM_AUDIO||cfile->undo_action==UNDO_APPEND_AUDIO||
       (cfile->undo_action==UNDO_ATOMIC_RESAMPLE_RESIZE&&cfile->arate!=cfile->undo1_int)) {
     unlink(cfile->info_file);
-    com=g_strdup_printf("smogrify undo_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
     mainw->com_failed=FALSE;
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
@@ -1991,7 +2119,7 @@
     
   if (cfile->undo_action==UNDO_NEW_AUDIO) {
     unlink(cfile->info_file);
-    com=g_strdup_printf("smogrify undo_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
     g_free(com);
@@ -2238,7 +2366,7 @@
 
   if (cfile->undo_action==UNDO_REC_AUDIO||cfile->undo_action==UNDO_FADE_AUDIO||cfile->undo_action==UNDO_TRIM_AUDIO||
       cfile->undo_action==UNDO_APPEND_AUDIO) {
-    com=g_strdup_printf("smogrify undo_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
@@ -2263,8 +2391,8 @@
     return;
   }
 
-  com=g_strdup_printf("smogrify redo \"%s\" %d %d \"%s\"",cfile->handle,cfile->undo_start,cfile->undo_end,
-		      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+  com=g_strdup_printf("%s redo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,cfile->undo_end,
+		      get_image_ext_for_type(cfile->img_type));
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
@@ -2362,8 +2490,8 @@
 
   clipboard->img_type=cfile->img_type;
 
-  com=g_strdup_printf("smogrify insert \"%s\" \"%s\" 0 %d %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",
-		      clipboard->handle, clipboard->img_type==IMG_TYPE_JPEG?"jpg":"png",
+  com=g_strdup_printf("%s insert \"%s\" \"%s\" 0 %d %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",prefs->backend,
+		      clipboard->handle, get_image_ext_for_type(clipboard->img_type),
 		      start, end, cfile->handle, mainw->ccpd_with_sound, cfile->fps, cfile->arate, 
 		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
 		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
@@ -2385,8 +2513,26 @@
   // stop the 'preview' and 'pause' buttons from appearing
   cfile->nopreview=TRUE;
   if (!do_progress_dialog(TRUE,TRUE,_ ("Copying to the clipboard"))) {
+#ifdef IS_MINGW
+    // kill any active processes: for other OSes the backend does this
+    // get pid from backend
+    FILE *rfile;
+    ssize_t rlen;
+    char val[16];
+    int pid;
+    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    rfile=popen(com,"r");
+    rlen=fread(val,1,16,rfile);
+    pclose(rfile);
+    memset(val+rlen,0,1);
+    pid=atoi(val);
+    
+    lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+
     // close clipboard, it is invalid
-    com=g_strdup_printf ("smogrify close \"%s\"",clipboard->handle);
+
+    com=g_strdup_printf ("%s close \"%s\"",prefs->backend,clipboard->handle);
     lives_system (com,FALSE);
     g_free (com);
     clipboard=NULL;
@@ -2486,8 +2632,9 @@
   g_free (msg);
   mainw->no_switch_dprint=FALSE;
 
-  com=g_strdup_printf("smogrify insert \"%s\" \"%s\" 0 1 %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",cfile->handle, 
-		      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",clipboard->frames, clipboard->handle, 
+  com=g_strdup_printf("%s insert \"%s\" \"%s\" 0 1 %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",
+		      prefs->backend,cfile->handle, 
+		      get_image_ext_for_type(cfile->img_type),clipboard->frames, clipboard->handle, 
 		      mainw->ccpd_with_sound, clipboard->fps, clipboard->arate, clipboard->achans, 
 		      clipboard->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
 		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
@@ -2554,46 +2701,43 @@
   mainw->fx1_bool=FALSE;
   mainw->fx1_val=1;
 
-  mainw->fx2_bool=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(insertw->with_sound));
+  mainw->fx2_bool=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(insertw->with_sound));
 }
 
 
 
-void
-on_insert_activate                    (GtkButton     *button,
-				       gpointer         user_data)
-{
-  gint where=cfile->start-1;
-  gint start=cfile->start;
-  gint end=cfile->end;
+void on_insert_activate (GtkButton *button, gpointer user_data) {
+  int where=cfile->start-1;
+  int start=cfile->start;
+  int end=cfile->end;
 
-  gint hsize=cfile->hsize;
-  gint vsize=cfile->vsize;
+  int hsize=cfile->hsize;
+  int vsize=cfile->vsize;
 
-  gint cfile_signed=0,cfile_endian=0,clipboard_signed=0,clipboard_endian=0;
-  gint current_file=mainw->current_file;
+  int cfile_signed=0,cfile_endian=0,clipboard_signed=0,clipboard_endian=0;
+  int current_file=mainw->current_file;
 
-  gdouble times_to_insert=mainw->fx1_val;
-  gdouble audio_stretch;
+  double times_to_insert=mainw->fx1_val;
+  double audio_stretch;
 
   // have we resampled ?
-  gboolean cb_audio_change=FALSE;
-  gboolean cb_video_change=FALSE;
+  boolean cb_audio_change=FALSE;
+  boolean cb_video_change=FALSE;
 
-  gint remainder_frames;
-  gint cb_start=1,cb_end=clipboard->frames;
+  int remainder_frames;
+  int cb_start=1,cb_end=clipboard->frames;
   
   gchar *msg,*com;
-  gboolean with_sound=mainw->fx2_bool;
-  gint ocarps=clipboard->arps;
-  gint leave_backup=1;
-  gboolean has_lmap_error=FALSE;
+  boolean with_sound=mainw->fx2_bool;
+  int ocarps=clipboard->arps;
+  int leave_backup=1;
+  boolean has_lmap_error=FALSE;
 
-  gboolean insert_silence=FALSE;
+  boolean insert_silence=FALSE;
 
-  gint orig_frames=cfile->frames;
+  int orig_frames=cfile->frames;
 
-  gboolean bad_header=FALSE;
+  boolean bad_header=FALSE;
 
   // don't ask smogrify to resize if frames are the same size and type
   if (((cfile->hsize==clipboard->hsize && cfile->vsize==clipboard->vsize)||orig_frames==0)&&
@@ -2639,7 +2783,7 @@
 							 cfile->asampsize!=clipboard->asampsize||
 							 cfile_signed!=clipboard_signed||cfile_endian!=clipboard_endian||
 							 cfile->arate!=clipboard->arate)) {
-      if (!(capable->has_sox)) {
+      if (!(capable->has_sox_sox)) {
 	if (cfile->arps!=clipboard->arps) {
 	  do_error_dialog(_ ("LiVES cannot insert because the audio rates do not match.\nPlease install 'sox', and try again."));
 	  mainw->error=TRUE;
@@ -2651,7 +2795,7 @@
 
 
   if ((!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES)||(!prefs->warning_mask&&WARN_MASK_LAYOUT_ALTER_FRAMES))) {
-    gint insert_start;
+    int insert_start;
     if (mainw->insert_after) {
       insert_start=cfile->end+1;
     }
@@ -2701,7 +2845,7 @@
 
   if (with_sound&&(!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)||
 		   (!prefs->warning_mask&&WARN_MASK_LAYOUT_ALTER_AUDIO))) {
-    gint insert_start;
+    int insert_start;
     if (mainw->insert_after) {
       insert_start=cfile->end+1;
     }
@@ -2746,7 +2890,7 @@
 
   if (button!=NULL) {
     gtk_widget_destroy(insertw->insert_dialog);
-    while (g_main_context_iteration (NULL,FALSE));
+    lives_widget_context_update();
     g_free(insertw);
     if ((cfile->fps!=clipboard->fps&&orig_frames>0)||(cfile->arps!=clipboard->arps&&clipboard->achans>0&&with_sound)) {
       if (!do_clipboard_fps_warning()) {
@@ -2800,10 +2944,11 @@
 
 	if (clipboard->arps!=clipboard->arps||cfile->arate!=clipboard->arate) {
 	  // pb rate != real rate - stretch to pb rate and resample
-	  if ((audio_stretch=(gdouble)clipboard->arps/(gdouble)clipboard->arate*
-	       (gdouble)cfile->arate/(gdouble)cfile->arps)!=1.) {
+	  if ((audio_stretch=(double)clipboard->arps/(double)clipboard->arate*
+	       (double)cfile->arate/(double)cfile->arps)!=1.) {
 	    unlink (clipboard->info_file);
-	    com=g_strdup_printf ("smogrify resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",
+	    com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",
+				 prefs->backend,
 				 clipboard->handle,clipboard->arps,clipboard->achans,clipboard->asampsize,
 				 clipboard_signed,clipboard_endian,cfile->arps,clipboard->achans,
 				 clipboard->asampsize,clipboard_signed,clipboard_endian,audio_stretch);
@@ -2833,7 +2978,8 @@
 				  cfile->asampsize!=clipboard->asampsize||cfile_signed!=clipboard_signed||
 				  cfile_endian!=clipboard_endian)) {
 	  unlink (clipboard->info_file);
-	  com=g_strdup_printf ("smogrify resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",clipboard->handle,
+	  com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",
+			       prefs->backend,clipboard->handle,
 			       clipboard->arps,clipboard->achans,clipboard->asampsize,clipboard_signed,
 			       clipboard_endian,cfile->arps,cfile->achans,cfile->asampsize,cfile_signed,cfile_endian);
 	  mainw->com_failed=FALSE;
@@ -2866,7 +3012,7 @@
 	  else {
 	    unlink (clipboard->info_file);
 	    mainw->current_file=0;
-	    com=g_strdup_printf ("smogrify undo_audio \"%s\"",clipboard->handle);
+	    com=g_strdup_printf ("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
 	    lives_system (com,FALSE);
 	    g_free (com);
 	    mainw->current_file=current_file;
@@ -2899,8 +3045,8 @@
   }
 
   if (with_sound&&cfile->achans==0) {
-    gint asigned=!(clipboard->signed_endian&AFORM_UNSIGNED);
-    gint endian=clipboard->signed_endian&AFORM_BIG_ENDIAN;
+    int asigned=!(clipboard->signed_endian&AFORM_UNSIGNED);
+    int endian=clipboard->signed_endian&AFORM_BIG_ENDIAN;
 
     cfile->achans=clipboard->achans;
     cfile->asampsize=clipboard->asampsize;
@@ -2924,7 +3070,7 @@
   }
 
   // first remainder frames
-  remainder_frames=(gint)(times_to_insert-(gdouble)(gint)times_to_insert)*clipboard->frames;
+  remainder_frames=(int)(times_to_insert-(double)(int)times_to_insert)*clipboard->frames;
 
   if (!mainw->insert_after&&remainder_frames>0) {
     msg=g_strdup_printf(_ ("Inserting %d%s frames from the clipboard..."),remainder_frames,
@@ -2932,8 +3078,9 @@
     d_print(msg);
     g_free(msg);
 
-    com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d",cfile->handle, 
-			cfile->img_type==IMG_TYPE_JPEG?"jpg":"png", where, clipboard->frames-remainder_frames+1, 
+    com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d",
+			prefs->backend,cfile->handle, 
+			get_image_ext_for_type(cfile->img_type), where, clipboard->frames-remainder_frames+1, 
 			clipboard->frames, clipboard->handle, with_sound, cfile->frames, hsize, vsize, cfile->fps, 
 			cfile->arate, cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
 			!(cfile->signed_endian&AFORM_BIG_ENDIAN));
@@ -3000,8 +3147,9 @@
   // this should indicate to the back end to leave our
   // backup frames alone
 
-  com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d %d",cfile->handle, 
-		      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",where, cb_start*leave_backup, cb_end, 
+  com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d %d",
+		      prefs->backend,cfile->handle, 
+		      get_image_ext_for_type(cfile->img_type),where, cb_start*leave_backup, cb_end, 
 		      clipboard->handle, with_sound, cfile->frames, hsize, vsize, cfile->fps, cfile->arate, 
 		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
 		      !(cfile->signed_endian&AFORM_BIG_ENDIAN), (int)times_to_insert);
@@ -3031,9 +3179,10 @@
     }
 
     // clean up moved/inserted frames
-    com=g_strdup_printf ("smogrify undo_insert \"%s\" %d %d %d \"%s\"",cfile->handle,where+1,
+    com=g_strdup_printf ("%s undo_insert \"%s\" %d %d %d \"%s\"",
+			 prefs->backend,cfile->handle,where+1,
 			 where+(cb_end-cb_start+1)*(int)times_to_insert,cfile->frames,
-			 cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+			 get_image_ext_for_type(cfile->img_type));
     lives_system (com,FALSE);
     g_free(com);
 
@@ -3044,7 +3193,7 @@
       // desample clipboard audio
       if (cb_audio_change&&!prefs->conserve_space) {
 	unlink (clipboard->info_file);
-	com=g_strdup_printf ("smogrify undo_audio \"%s\"",clipboard->handle);
+	com=g_strdup_printf ("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
 	mainw->current_file=0;
 	lives_system (com,FALSE);
 	g_free (com);
@@ -3099,8 +3248,9 @@
     d_print(msg);
     g_free(msg);
 
-    com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %3f %d %d %d %d %d",cfile->handle, 
-			cfile->img_type==IMG_TYPE_JPEG?"jpg":"png", where, 1, remainder_frames, clipboard->handle, 
+    com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %3f %d %d %d %d %d",
+			prefs->backend,cfile->handle, 
+			get_image_ext_for_type(cfile->img_type), where, 1, remainder_frames, clipboard->handle, 
 			with_sound, cfile->frames, hsize, vsize, cfile->fps, cfile->arate, cfile->achans, 
 			cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
 			!(cfile->signed_endian&AFORM_BIG_ENDIAN ));
@@ -3209,7 +3359,7 @@
     if (cb_audio_change&&!prefs->conserve_space&&clipboard->achans>0) {
       unlink (clipboard->info_file);
       mainw->current_file=0;
-      com=g_strdup_printf ("smogrify undo_audio \"%s\"",clipboard->handle);
+      com=g_strdup_printf ("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
       lives_system (com,FALSE);
       g_free (com);
       mainw->current_file=current_file;
@@ -3254,8 +3404,8 @@
   gint start=cfile->start;
   gint end=cfile->end;
   gchar *com;
-  gboolean has_lmap_error=FALSE;
-  gboolean bad_header=FALSE;
+  boolean has_lmap_error=FALSE;
+  boolean bad_header=FALSE;
 
   // occasionally we get a keyboard misread, so this should prevent that
   if (mainw->playing_file>-1) return;
@@ -3397,8 +3547,9 @@
     g_free(com);
   }
 
-  com=g_strdup_printf("smogrify cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",cfile->handle,cfile->start,cfile->end, 
-		      mainw->ccpd_with_sound, cfile->frames, cfile->img_type==IMG_TYPE_JPEG?"jpg":"png", 
+  com=g_strdup_printf("%s cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",
+		      prefs->backend,cfile->handle,cfile->start,cfile->end, 
+		      mainw->ccpd_with_sound, cfile->frames, get_image_ext_for_type(cfile->img_type), 
 		      cfile->fps, cfile->arate, cfile->achans, cfile->asampsize);
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
@@ -3676,7 +3827,7 @@
     unlink(cfile->info_file);
 
     play_file();
-    GTK_RULER (mainw->hruler)->position=cfile->pointer_time;
+    lives_ruler_set_value(LIVES_RULER (mainw->hruler),cfile->pointer_time);
     get_play_times();
     mainw->noswitch=FALSE;
   }
@@ -3714,7 +3865,7 @@
   play_file();
 
   mainw->playing_sel=FALSE;
-  GTK_RULER (mainw->hruler)->position=cfile->pointer_time;
+  lives_ruler_set_value(LIVES_RULER (mainw->hruler),cfile->pointer_time);
   gtk_widget_queue_draw (mainw->hruler);
 
   // in case we are rendering and previewing, in case we now have audio
@@ -3731,8 +3882,8 @@
 {
   // play the clipboard
   gint current_file=mainw->current_file;
-  gboolean oloop=mainw->loop;
-  gboolean oloop_cont=mainw->loop_cont;
+  boolean oloop=mainw->loop;
+  boolean oloop_cont=mainw->loop_cont;
 
   // switch to the clipboard
   switch_to_file (current_file,0);
@@ -3768,12 +3919,6 @@
 					      gpointer         user_data)
 {
   // real time recording
-  gulong frames_written=0;
-#ifdef HAVE_PULSE_AUDIO
-  pa_usec_t usec_start=0;
-#endif
-  gulong audio_ticks=0;
-  gulong seek_pos=0;
 
   if (mainw->multitrack!=NULL) return;
 
@@ -3787,61 +3932,9 @@
 
       toggle_record();
 
-      if (prefs->rec_opts&REC_EXT_AUDIO&&
+      if ((prefs->rec_opts&REC_AUDIO)&&(mainw->agen_key!=0||mainw->agen_needs_reinit||prefs->audio_src==AUDIO_SRC_EXT)&&
 	  ((prefs->audio_player==AUD_PLAYER_JACK) ||
 	   (prefs->audio_player==AUD_PLAYER_PULSE))) {
-	// remove play head and add record head
-	// creat temp clip
-
-#ifdef ENABLE_JACK
-	if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
-
-	  // tell jack client to close audio file
-	  if (mainw->jackd->playing_file>0) {
-	    gboolean timeout;
-	    int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-	    while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
-	      sched_yield(); // wait for seek
-	    }
-	    if (timeout) jack_try_reconnect();
-	    lives_alarm_clear(alarm_handle);
-	    frames_written=mainw->jackd->frames_written;
-	    seek_pos=mainw->jackd->seek_pos;
-	    audio_ticks=mainw->pulsed->audio_ticks;
-	    
-	    jack_message.command=ASERVER_CMD_FILE_CLOSE;
-	    jack_message.data=NULL;
-	    jack_message.next=NULL;
-	    mainw->jackd->msgq=&jack_message;
-
-	  }
-	}
-#endif
-#ifdef HAVE_PULSE_AUDIO
-	if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-	  
-	  // tell pulse client to close audio file
-	  if (mainw->pulsed->fd>0) {
-	    gboolean timeout;
-	    int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-	    while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
-	      sched_yield(); // wait for seek
-	    }
-	    if (timeout) pulse_try_reconnect();
-	    lives_alarm_clear(alarm_handle);
-	    frames_written=mainw->pulsed->frames_written;
-	    usec_start=mainw->pulsed->usec_start;
-	    seek_pos=mainw->pulsed->seek_pos;
-	    audio_ticks=mainw->pulsed->audio_ticks;
-
-	    pulse_message.command=ASERVER_CMD_FILE_CLOSE;
-	    pulse_message.data=NULL;
-	    pulse_message.next=NULL;
-	    mainw->pulsed->msgq=&pulse_message;
-	  }
-	  
-	}
-#endif
 
 	if (mainw->ascrap_file==-1) open_ascrap_file();
 	if (mainw->ascrap_file!=-1) {
@@ -3850,32 +3943,33 @@
 	  mainw->rec_aclip=mainw->ascrap_file;
 	  mainw->rec_avel=1.;
 	  
-	  if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-	    jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-	    mainw->rec_aseek=(double)mainw->jackd_read->frames_written/(double)mainw->files[mainw->ascrap_file]->arps;
-	    mainw->jackd_read->frames_written=frames_written;
-	    mainw->jackd_read->audio_ticks=audio_ticks;
-	    mainw->jackd_read->seek_pos=seek_pos;
-#endif
+	if (prefs->audio_player==AUD_PLAYER_JACK) {
+	  if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+	    if (mainw->jackd_read!=NULL) jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
 	  }
-	  if (prefs->audio_player==AUD_PLAYER_PULSE) {
-#ifdef HAVE_PULSE_AUDIO
-	    pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-	    mainw->rec_aseek=(double)mainw->pulsed_read->frames_written/(double)mainw->files[mainw->ascrap_file]->arps;
-	    mainw->pulsed_read->frames_written=frames_written;
-	    mainw->pulsed_read->usec_start=usec_start;
-	    mainw->pulsed_read->audio_ticks=audio_ticks;
-	    mainw->pulsed_read->seek_pos=seek_pos;
-	    pulse_driver_uncork(mainw->pulsed_read);
-#endif
+	  else {
+	    if (mainw->jackd!=NULL) jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
 	  }
 
 	}
 
+#endif
+#ifdef HAVE_PULSE_AUDIO
+	if (prefs->audio_player==AUD_PLAYER_PULSE) {
+	  if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+	    if (mainw->pulsed_read!=NULL) pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+	  }
+	  else {
+	    if (mainw->pulsed!=NULL) pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+	  }
+	}
+#endif
+	}
 	return;
       }
 
+
       if (prefs->rec_opts&REC_AUDIO) {
 	// recording INTERNAL audio
 #ifdef ENABLE_JACK
@@ -3904,35 +3998,6 @@
       }
 #endif
 
-      if (prefs->rec_opts&REC_EXT_AUDIO) {
-	// remove record head and add play head
-#ifdef ENABLE_JACK
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
-	  if (mainw->jackd_read!=NULL) {
-	    jack_rec_audio_end();
-	  }
-	}
-#endif
-#ifdef HAVE_PULSE_AUDIO
-	if (prefs->audio_player==AUD_PLAYER_PULSE) {
-	  if (mainw->pulsed_read!=NULL) {
-	    pulse_rec_audio_end();
-	  }
-	}
-#endif
-
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
-#ifdef ENABLE_JACK
-	  jack_aud_pb_ready(mainw->current_file);
-#endif
-	}
-	else if (prefs->audio_player==AUD_PLAYER_PULSE) {
-#ifdef HAVE_PULSE_AUDIO
-	  pulse_aud_pb_ready(mainw->current_file);
-#endif
-	}
-      }
-
       if (prefs->rec_opts&REC_EFFECTS) {
 	// add deinit events for all active effects
 	add_filter_deinit_events(mainw->event_list);
@@ -3992,11 +4057,11 @@
 				       gpointer         user_data)
 {
   if (mainw->multitrack!=NULL) {
-    mt_tl_move(mainw->multitrack,-GTK_RULER (mainw->multitrack->timeline)->position);
+    mt_tl_move(mainw->multitrack,-lives_ruler_get_value(LIVES_RULER (mainw->multitrack->timeline)));
     return;
   }
 
-  cfile->pointer_time=GTK_RULER (mainw->hruler)->position=0.;
+  cfile->pointer_time=lives_ruler_set_value(LIVES_RULER (mainw->hruler),0.);
   gtk_widget_queue_draw (mainw->hruler);
   gtk_widget_set_sensitive (mainw->rewind, FALSE);
   gtk_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
@@ -4009,7 +4074,7 @@
   if (mainw->multitrack!=NULL&&mainw->multitrack->is_paused&&mainw->playing_file==-1) {
     mainw->multitrack->is_paused=FALSE;
     mainw->multitrack->playing_sel=FALSE;
-    mt_tl_move(mainw->multitrack,mainw->multitrack->ptr_time-GTK_RULER (mainw->multitrack->timeline)->position);
+    mt_tl_move(mainw->multitrack,mainw->multitrack->ptr_time-lives_ruler_get_value(LIVES_RULER (mainw->multitrack->timeline)));
     gtk_widget_set_sensitive (mainw->stop, FALSE);
     gtk_widget_set_sensitive (mainw->m_stopbutton, FALSE);
     return;
@@ -4054,7 +4119,7 @@
   GList *ofmt_all=NULL;
   GList *ofmt=NULL;
 
-  gchar *new_encoder_name = g_strdup(gtk_combo_box_get_active_text(combo));
+  gchar *new_encoder_name = lives_combo_get_active_text(combo);
   gchar *msg;
   gchar **array;
   int i;
@@ -4066,20 +4131,20 @@
     return;
   }
 
-  if (!strcmp(new_encoder_name,mainw->any_string)) { 
+  if (!strcmp(new_encoder_name,mainw->string_constants[LIVES_STRING_CONSTANT_ANY])) { 
     GList *ofmt = NULL;
-    ofmt = g_list_append(ofmt,g_strdup(mainw->any_string));
+    ofmt = g_list_append(ofmt,g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
 
-    g_signal_handler_block(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name_fn);
+    g_signal_handler_block(rdet->encoder_combo, rdet->encoder_name_fn);
     // ---
-    set_combo_box_active_string(GTK_COMBO_BOX(rdet->encoder_combo), mainw->any_string);
+    lives_combo_set_active_string(LIVES_COMBO(rdet->encoder_combo), mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
     // ---
-    g_signal_handler_unblock(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name_fn);
+    g_signal_handler_unblock(rdet->encoder_combo, rdet->encoder_name_fn);
 
-    populate_combo_box(GTK_COMBO_BOX(rdet->ofmt_combo), ofmt);
-    g_signal_handler_block (GTK_COMBO_BOX(rdet->ofmt_combo), rdet->encoder_ofmt_fn);
-    set_combo_box_active_string(GTK_COMBO_BOX(rdet->ofmt_combo),mainw->any_string);
-    g_signal_handler_unblock (GTK_COMBO_BOX(rdet->ofmt_combo), rdet->encoder_ofmt_fn);
+    lives_combo_populate(LIVES_COMBO(rdet->ofmt_combo), ofmt);
+    g_signal_handler_block (rdet->ofmt_combo, rdet->encoder_ofmt_fn);
+    lives_combo_set_active_string(LIVES_COMBO(rdet->ofmt_combo),mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
+    g_signal_handler_unblock (rdet->ofmt_combo, rdet->encoder_ofmt_fn);
 
     g_list_free(ofmt);
     if (prefs->acodec_list!=NULL) {
@@ -4087,11 +4152,11 @@
       g_list_free (prefs->acodec_list);
       prefs->acodec_list=NULL;
     }
-    prefs->acodec_list = g_list_append(prefs->acodec_list, g_strdup(mainw->any_string));
+    prefs->acodec_list = g_list_append(prefs->acodec_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
 
-    populate_combo_box(GTK_COMBO_BOX(rdet->acodec_combo), prefs->acodec_list);
+    lives_combo_populate(LIVES_COMBO(rdet->acodec_combo), prefs->acodec_list);
 
-    set_combo_box_active_string(GTK_COMBO_BOX(rdet->acodec_combo),mainw->any_string);
+    lives_combo_set_active_string(LIVES_COMBO(rdet->acodec_combo),mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
 
     g_free(new_encoder_name);
   
@@ -4116,35 +4181,30 @@
     }
     g_free(new_encoder_name);
 
-    if (rdet != NULL){
-        // FIXME: what to hide ?
-        //gtk_widget_hide(gtk_widget_get_toplevel(GTK_COMBO(rdet->encoder_combo)->list));
-    }
-    else if (prefsw != NULL){
-        // FIXME: what to hide ?
-        //gtk_widget_hide(gtk_widget_get_toplevel(GTK_COMBO(prefsw->encoder_combo)->list));
-    }
-
     if (mainw->is_ready){
-        do_blocking_error_dialog (msg);
+      GtkWindow *twindow=GTK_WINDOW(mainw->LiVES);
+      if (prefsw!=NULL) twindow=GTK_WINDOW(prefsw->prefs_dialog);
+      else if (mainw->multitrack!=NULL) twindow=GTK_WINDOW(mainw->multitrack->window);
+      if (!prefs->show_gui) twindow=(GtkWindow *)NULL;
+      do_error_dialog_with_check_transient(msg,TRUE,0,twindow);
     }
 
     g_free (msg);
 
     if (prefsw != NULL) {
-      g_signal_handler_block(GTK_COMBO_BOX(prefsw->encoder_combo), prefsw->encoder_name_fn);
+      g_signal_handler_block(prefsw->encoder_combo, prefsw->encoder_name_fn);
       // ---
-      set_combo_box_active_string(GTK_COMBO_BOX(prefsw->encoder_combo), prefs->encoder.name);
+      lives_combo_set_active_string(LIVES_COMBO(prefsw->encoder_combo), prefs->encoder.name);
       // ---
-      g_signal_handler_unblock(GTK_COMBO_BOX(prefsw->encoder_combo), prefsw->encoder_name_fn);
+      g_signal_handler_unblock(prefsw->encoder_combo, prefsw->encoder_name_fn);
     }
 
     if (rdet != NULL) {
-      g_signal_handler_block(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name_fn);
+      g_signal_handler_block(rdet->encoder_combo, rdet->encoder_name_fn);
       // ---
-      set_combo_box_active_string(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name);
+      lives_combo_set_active_string(LIVES_COMBO(rdet->encoder_combo), rdet->encoder_name);
       // ---
-      g_signal_handler_unblock(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name_fn);
+      g_signal_handler_unblock(rdet->encoder_combo, rdet->encoder_name_fn);
     }
 
     dummy_list = plugin_request(PLUGIN_ENCODERS, prefs->encoder.name, "init");
@@ -4161,26 +4221,23 @@
   g_free(new_encoder_name);
 
   if ((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,future_prefs->encoder.name,"get_capabilities"))==NULL) {
-    if (rdet != NULL){
-        // FIXME: what to hide ?
-        // gtk_widget_hide(gtk_widget_get_toplevel(GTK_COMBO(rdet->encoder_combo)->list));
-    }
+ 
     do_plugin_encoder_error(future_prefs->encoder.name);
 
     if (prefsw!=NULL) {
-      g_signal_handler_block(GTK_COMBO_BOX(prefsw->encoder_combo), prefsw->encoder_name_fn);
+      g_signal_handler_block(prefsw->encoder_combo, prefsw->encoder_name_fn);
       // ---
-      set_combo_box_active_string(GTK_COMBO_BOX(prefsw->encoder_combo), prefs->encoder.name);
+      lives_combo_set_active_string(LIVES_COMBO(prefsw->encoder_combo), prefs->encoder.name);
       // ---
-      g_signal_handler_unblock(GTK_COMBO_BOX(prefsw->encoder_combo), prefsw->encoder_name_fn);
+      g_signal_handler_unblock(prefsw->encoder_combo, prefsw->encoder_name_fn);
     }
 
     if (rdet!=NULL) {
-      g_signal_handler_block (GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name_fn);
+      g_signal_handler_block (rdet->encoder_combo, rdet->encoder_name_fn);
       // ---
-      set_combo_box_active_string(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name);
+      lives_combo_set_active_string(LIVES_COMBO(rdet->encoder_combo), rdet->encoder_name);
       // ---
-      g_signal_handler_unblock (GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name_fn);
+      g_signal_handler_unblock (rdet->encoder_combo, rdet->encoder_name_fn);
     }
 
     plugin_request(PLUGIN_ENCODERS, prefs->encoder.name, "init");
@@ -4203,20 +4260,20 @@
 
     if (prefsw!=NULL) {
       // we have to block here, otherwise on_ofmt_changed gets called for every added entry !
-      g_signal_handler_block(GTK_COMBO_BOX(prefsw->ofmt_combo), prefsw->encoder_ofmt_fn);
+      g_signal_handler_block(prefsw->ofmt_combo, prefsw->encoder_ofmt_fn);
 
-      populate_combo_box(GTK_COMBO_BOX(prefsw->ofmt_combo), ofmt);
+      lives_combo_populate(LIVES_COMBO(prefsw->ofmt_combo), ofmt);
 
-      g_signal_handler_unblock(GTK_COMBO_BOX(prefsw->ofmt_combo), prefsw->encoder_ofmt_fn);
+      g_signal_handler_unblock(prefsw->ofmt_combo, prefsw->encoder_ofmt_fn);
     }
 
     if (rdet!=NULL) {
       // we have to block here, otherwise on_ofmt_changed gets called for every added entry !
-      g_signal_handler_block (GTK_COMBO_BOX(rdet->ofmt_combo), rdet->encoder_ofmt_fn);
+      g_signal_handler_block (rdet->ofmt_combo, rdet->encoder_ofmt_fn);
 
-      populate_combo_box(GTK_COMBO_BOX(rdet->ofmt_combo), ofmt);
+      lives_combo_populate(LIVES_COMBO(rdet->ofmt_combo), ofmt);
 
-      g_signal_handler_unblock(GTK_COMBO_BOX(rdet->ofmt_combo), rdet->encoder_ofmt_fn);
+      g_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
     }
     
     g_list_free(ofmt);
@@ -4225,7 +4282,7 @@
     array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,0),"|",-1);
 
     if (rdet!=NULL) {
-      set_combo_box_active_string(GTK_COMBO_BOX(rdet->ofmt_combo), array[1]);
+      lives_combo_set_active_string(LIVES_COMBO(rdet->ofmt_combo), array[1]);
 
       if (prefsw==NULL&&strcmp(prefs->encoder.name,future_prefs->encoder.name)) {
 	g_snprintf(prefs->encoder.name,51,"%s",future_prefs->encoder.name);
@@ -4239,7 +4296,7 @@
     }
 
     if (prefsw!=NULL) {
-      set_combo_box_active_string(GTK_COMBO_BOX(prefsw->ofmt_combo), array[1]);
+      lives_combo_set_active_string(LIVES_COMBO(prefsw->ofmt_combo), array[1]);
     }
     on_encoder_ofmt_changed (NULL, rdet);
     g_strfreev (array);
@@ -4255,7 +4312,7 @@
 on_insertwsound_toggled                (GtkToggleButton *togglebutton,
                                         gpointer         user_data)
 {
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(togglebutton))) {
     gtk_widget_set_sensitive (insertw->fit_checkbutton,FALSE);
   }
   else {
@@ -4271,7 +4328,7 @@
 {
   mainw->fx1_bool=!mainw->fx1_bool;
 
-  if (gtk_toggle_button_get_active(togglebutton)) {
+  if (lives_toggle_button_get_active(togglebutton)) {
     gtk_widget_set_sensitive(insertw->with_sound,FALSE);
     gtk_widget_set_sensitive(insertw->without_sound,FALSE);
     gtk_widget_set_sensitive(insertw->spinbutton_times,FALSE);
@@ -4479,6 +4536,7 @@
   gboolean is_append=FALSE; // we will overwrite the target layout.map file
   gchar *text;
   gchar *new_dir;
+  gchar *cwd;
 
   int ord_fd;
   int retval;
@@ -4530,13 +4588,13 @@
       g_snprintf(new_set_name,128,"%s",gtk_entry_get_text (GTK_ENTRY (renamew->entry)));
       gtk_widget_destroy(renamew->dialog);
       g_free(renamew);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
     } while (!is_legal_set_name(new_set_name,TRUE));
   }
   else g_snprintf(new_set_name,128,"%s",(gchar *)user_data);
 
   gtk_widget_queue_draw (mainw->LiVES);
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_widget_context_update();
 
   g_snprintf(mainw->set_name,128,"%s",new_set_name);
 
@@ -4567,7 +4625,11 @@
 	  // user answered "yes" - delete
 	  // clear _old_ layout maps
 	  gchar *dfile=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+#ifndef IS_MINGW
 	  com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null",dfile);
+#else
+	  com=g_strdup_printf("rm.exe -r \"%s/\" 2>NUL",dfile);
+#endif
 	  g_free(dfile);
 	  lives_system(com,TRUE);
 	  g_free(com);
@@ -4587,17 +4649,12 @@
 
   current_clips_dir=g_build_filename(prefs->tmpdir,old_set,"clips/",NULL);
   if (strlen(old_set)&&strcmp(mainw->set_name,old_set)&&g_file_test(current_clips_dir,G_FILE_TEST_IS_DIR)) {
-    // set name was chenged for an existing set
+    // set name was changed for an existing set
 
     if (!is_append) {
       // create new dir, in case it doesn't already exist
       dfile=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
-      com=g_strdup_printf("/bin/mkdir -p \"%s/\" 2>/dev/null",dfile);
-      mainw->com_failed=FALSE;
-      lives_system(com,FALSE);
-      g_free(com);
-
-      if (mainw->com_failed) {
+      if (g_mkdir_with_parents(dfile,S_IRWXU)==-1) {
 	if (!check_dir_access(dfile)) {
 	  // abort if we cannot create the new subdir
 	  LIVES_ERROR("Could not create directory");
@@ -4610,21 +4667,13 @@
 	}
       }
       g_free(dfile);
-
-
     }
   }
   else {
     // saving as same name (or as new set)
 
     dfile=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
-    com=g_strdup_printf("/bin/mkdir -p \"%s/\" 2>/dev/null",dfile);
-    mainw->com_failed=FALSE;
-    lives_system(com,FALSE);
-    g_free(com);
-
-
-    if (mainw->com_failed) {
+    if (g_mkdir_with_parents(dfile,S_IRWXU)==-1) {
       if (!check_dir_access(dfile)) {
 	// abort if we cannot create the new subdir
 	LIVES_ERROR("Could not create directory");
@@ -4642,6 +4691,8 @@
 
   ordfile=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
 
+  cwd=g_get_current_dir();
+
   do {
     // create the orderfile which lists all the clips in order
     retval=0;
@@ -4656,6 +4707,7 @@
 	return;
       }
     }
+
     else {
       mainw->write_failed=FALSE;
       cliplist=mainw->cliplist;
@@ -4663,7 +4715,7 @@
       while (cliplist!=NULL) {
 	if (mainw->write_failed) break;
 	threaded_dialog_spin();
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
 
 	// TODO - dirsep
 
@@ -4688,16 +4740,14 @@
 	    // move the files
 
 
-	    if (mainw->files[i]->clip_type==CLIP_TYPE_FILE&&mainw->files[i]->ext_src!=NULL) {
-	      // must do this before we move it
-	      // otherwise decoder plugin will be pointing at wrong file
-	      close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
-	      mainw->files[i]->ext_src=NULL;
-	    }
-	
 	    mainw->com_failed=FALSE;
+#ifndef IS_MINGW
 	    com=g_strdup_printf("/bin/mv \"%s/%s\" \"%s/%s\"",
 				prefs->tmpdir,mainw->files[i]->handle,prefs->tmpdir,new_handle);
+#else
+	    com=g_strdup_printf("mv.exe \"%s\\%s\" \"%s\\%s\"",
+				prefs->tmpdir,mainw->files[i]->handle,prefs->tmpdir,new_handle);
+#endif
 	    lives_system(com,FALSE);
 	    g_free(com);
 	
@@ -4710,7 +4760,11 @@
 	    got_new_handle=TRUE;
 	
 	    g_snprintf(mainw->files[i]->handle,256,"%s",new_handle);
+#ifndef IS_MINGW
 	    dfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,".status",NULL);
+#else
+	    dfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"status",NULL);
+#endif
 	    g_snprintf(mainw->files[i]->info_file,PATH_MAX,"%s",dfile);
 	    g_free(dfile);
 	  }
@@ -4731,10 +4785,13 @@
     }
 
   } while (retval==LIVES_RETRY);
-
+  
   close (ord_fd);
   g_free(ordfile);
 
+  lives_chdir(cwd,FALSE);
+  g_free(cwd);
+
   if (retval==LIVES_CANCEL) {
     end_threaded_dialog();
     return;
@@ -4743,7 +4800,7 @@
   if (got_new_handle&&!strlen(old_set)) migrate_layouts(NULL,mainw->set_name);
 
   if (strlen(old_set)&&strcmp(old_set,mainw->set_name)) {
-    layout_map_dir=g_strdup_printf("%s/%s/layouts/",prefs->tmpdir,old_set);
+    layout_map_dir=g_build_filename(prefs->tmpdir,old_set,"layouts",G_DIR_SEPARATOR_S,NULL);
     layout_map_file=g_build_filename(layout_map_dir,"layout.map",NULL);
     // update details for layouts - needs_set, current_layout_map and affected_layout_map
     if (g_file_test(layout_map_file,G_FILE_TEST_EXISTS)) {
@@ -4762,10 +4819,18 @@
       nsetn=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
 
       //append current layout.map to target one
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/cat \"%s\" >> \"%s\" 2>/dev/null",osetn,nsetn);
+#else
+      com=g_strdup_printf("cat.exe \"%s\" >> \"%s\" 2>NUL",osetn,nsetn);
+#endif
       lives_system(com,TRUE);
       g_free(com);
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",osetn);
+#else
+      com=g_strdup_printf("rm.exe \"%s\" 2>NUL",osetn);
+#endif
       lives_system(com,TRUE);
       g_free(com);
       g_free(osetn);
@@ -4776,7 +4841,11 @@
     nsetn=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 
     // move any layouts from old set to new (including layout.map)
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/cp -a \"%s\" \"%s/\" 2>/dev/null",osetn,nsetn);
+#else
+    com=g_strdup_printf("cp.exe -a \"%s\" \"%s/\" 2>NUL",osetn,nsetn);
+#endif
     lives_system(com,TRUE);
     g_free(com);
 
@@ -4786,17 +4855,20 @@
     osetn=g_build_filename(prefs->tmpdir,old_set,NULL);
 
     // remove old set dir
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rm -r \"%s\" 2>/dev/null",osetn);
+#else
+    com=g_strdup_printf("rm.exe -r \"%s\" 2>NUL",osetn);
+#endif
     lives_system(com,TRUE);
     g_free(com);
     g_free(osetn);
   }
 
-  // TODO - dirsep
 
   if (!mainw->was_set&&!strcmp(old_set,mainw->set_name)) {
     // set name was set by export or save layout, now we need to update our layout map
-    layout_map_dir=g_strdup_printf("%s/%s/layouts/",prefs->tmpdir,old_set);
+    layout_map_dir=g_build_filename(prefs->tmpdir,old_set,"layouts",G_DIR_SEPARATOR_S,NULL);
     layout_map_file=g_build_filename(layout_map_dir,"layout.map",NULL);
     if (g_file_test(layout_map_file,G_FILE_TEST_EXISTS)) save_layout_map(NULL,NULL,NULL,layout_map_dir);
     mainw->was_set=TRUE;
@@ -4805,18 +4877,6 @@
     g_free(layout_map_file);
   }
 
-  /*
-  if (got_new_handle) {
-    // new file(s) were added to an existing set
-    layout_map_dir=g_strdup_printf("%s/%s/layouts/",prefs->tmpdir,mainw->set_name);
-    layout_map_file=g_build_filename(layout_map_dir,"layout.map",NULL);
-    save_layout_map(NULL,NULL,NULL,layout_map_dir);
-    g_free(layout_map_file);
-    g_free(layout_map_dir);
-  }
-  */
-
-
   if (mainw->current_layouts_map!=NULL&&strcmp(old_set,mainw->set_name)&&!mainw->is_exiting) {
     // warn the user about layouts if the set name changed
     // but, don't bother the user with errors if we are exiting
@@ -4855,10 +4915,7 @@
     mt_desensitise(mainw->multitrack);
   }
 
-  lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
-  while (g_main_context_iteration(NULL,FALSE));
   renamew=create_rename_dialog(3);
-  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
   gtk_widget_show(renamew->dialog);
 }
 
@@ -4874,20 +4931,27 @@
   // (user_data TRUE skips threaded dialog and allows use of
   // return value FALSE to indicate error)
 
-  gchar *com;
-  gint last_file=-1,new_file=-1;
-  gint current_file=mainw->current_file;
-  gint clipnum=0;
+  FILE *orderfile;
+
+  const lives_clip_data_t *cdata=NULL;
+  lives_image_type_t img_type;
+
   gchar *msg;
+  gchar *com;
   gchar *ordfile;
   gchar *subfname;
   gchar vid_open_dir[PATH_MAX];
-  FILE *orderfile;
-  gboolean added_recovery=FALSE;
   gchar set_name[128];
-  gboolean skip_threaded_dialog=(gboolean)GPOINTER_TO_INT(user_data);
-  const lives_clip_data_t *cdata=NULL;
-  lives_image_type_t img_type;
+  gchar *cwd;
+
+  boolean added_recovery=FALSE;
+  boolean skip_threaded_dialog=(boolean)GPOINTER_TO_INT(user_data);
+  boolean needs_update=FALSE;
+
+  gint last_file=-1,new_file=-1;
+  gint current_file=mainw->current_file;
+  gint clipnum=0;
+
 
   threaded_dialog_spin();
 
@@ -4946,6 +5010,9 @@
 
   g_snprintf(vid_open_dir,PATH_MAX,"%s",mainw->vid_load_dir);
 
+  cwd=g_get_current_dir();
+
+
   while (1) {
     if (!skip_threaded_dialog&&prefs->show_gui) {
       threaded_dialog_spin();
@@ -4958,7 +5025,8 @@
 
     if (orderfile==NULL) {
       // old style (pre 0.9.6)
-      com=g_strdup_printf ("smogrify get_next_in_set \"%s\" \"%s\" %d",mainw->msg,mainw->set_name,getpid());
+      com=g_strdup_printf ("%s get_next_in_set \"%s\" \"%s\" %d",prefs->backend_sync,mainw->msg,
+			   mainw->set_name,getpid());
       lives_system (com,FALSE);
       g_free (com);
 
@@ -4977,6 +5045,7 @@
 	    mt_sensitise(mainw->multitrack);
 	    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
 	  }
+	  g_free(cwd);
 	  return !skip_threaded_dialog;
 	}
 	mainw->current_file=new_file;
@@ -5014,7 +5083,8 @@
 	
 	recover_layout_map(MAX_FILES);
 
-	msg=g_strdup_printf (_ ("%d clips and %d layouts were recovered from set (%s).\n"),clipnum,g_list_length(mainw->current_layouts_map),mainw->set_name);
+	msg=g_strdup_printf (_ ("%d clips and %d layouts were recovered from set (%s).\n"),
+			     clipnum,g_list_length(mainw->current_layouts_map),mainw->set_name);
 	d_print (msg);
 	g_free (msg);
 
@@ -5031,7 +5101,7 @@
 	    load_start_image (cfile->start);
 	    load_end_image (cfile->end);
 	  }
-	  while (g_main_context_iteration(NULL,FALSE));
+	  lives_widget_context_update();
 	}
       }
       else {
@@ -5044,6 +5114,7 @@
       threaded_dialog_spin();
 
       if (!skip_threaded_dialog) end_threaded_dialog();
+      g_free(cwd);
       return TRUE;
     }
 
@@ -5082,7 +5153,7 @@
 	}
 
 	recover_layout_map(MAX_FILES);
-
+	g_free(cwd);
 	return !skip_threaded_dialog;
       }
       mainw->current_file=new_file;
@@ -5091,11 +5162,15 @@
       cfile->clip_type=CLIP_TYPE_DISK; // the default
 
       // lock the set
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/touch \"%s/%s/lock.%d\"",prefs->tmpdir,mainw->set_name,getpid());
+#else
+      com=g_strdup_printf("touch.exe \"%s\\%s\\lock.%d\"",prefs->tmpdir,mainw->set_name,getpid());
+#endif
       lives_system(com,FALSE);
       g_free(com);
     }
-
+  
     //create a new cfile and fill in the details
     create_cfile();
     threaded_dialog_spin();
@@ -5104,28 +5179,35 @@
     // get file details
     read_headers(".");
     threaded_dialog_spin();
-
+    
     // if the clip has a frame_index file, then it is CLIP_TYPE_FILE
     // and we must load the frame_index and locate a suitable decoder plugin
 
     if (load_frame_index(mainw->current_file)) {
       gboolean next=FALSE;
       gchar *orig_file_name=g_strdup(cfile->file_name);
-      gboolean needs_update=FALSE;
+
+      // cd to clip directory - so decoder plugins can read temp files
+      gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+
+      lives_chdir(ppath,FALSE);
+      g_free(ppath);
 
       cfile->img_type=img_type; // ignore value from read_headers
 
       while (1) {
 	threaded_dialog_spin();
+
 	if ((cdata=get_decoder_cdata(cfile,NULL))==NULL) {
 	  if (mainw->error) {
 	    if (do_original_lost_warning(orig_file_name)) {
-	      gchar *new_file_name=choose_file(vid_open_dir,NULL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
+	      gchar *new_file_name=choose_file(vid_open_dir,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
 	      if (new_file_name!=NULL) {
 		g_snprintf(cfile->file_name,PATH_MAX,"%s",new_file_name);
 		g_snprintf(vid_open_dir,PATH_MAX,"%s",cfile->file_name);
 		get_dirname(vid_open_dir);
 		needs_update=TRUE;
+		g_free(new_file_name);
 	      }
 	      continue;
 	    }
@@ -5141,15 +5223,10 @@
 	  next=TRUE;
 	}
 	else {
-	  if (!check_clip_integrity(cfile,cdata)) {
+	  if (!check_clip_integrity(mainw->current_file,cdata)) {
 	    needs_update=TRUE;
 	  }
 	}
-
-	if (needs_update) {
-	  save_clip_values(mainw->current_file);
-	}
-
 	break;
       }
       g_free(orig_file_name);
@@ -5163,17 +5240,32 @@
       }
       cfile->clip_type=CLIP_TYPE_FILE;
       get_mime_type(cfile->type,40,cdata);
+	
+      lives_chdir(cwd,FALSE);
+      
     }
     else {
-      if (!check_frame_count(mainw->current_file)) get_frame_count(mainw->current_file);
+      if (!check_frame_count(mainw->current_file)) {
+	get_frame_count(mainw->current_file);
+	needs_update=TRUE;
+      }
+      if (cfile->frames>0&&(cfile->hsize*cfile->vsize==0)) {
+	get_frames_sizes(mainw->current_file,1);
+	if (cfile->hsize*cfile->vsize>0) needs_update=TRUE;
+      }
     }
 
     last_file=new_file;
 
-    // read the plaback fps, play frame, and name
+    // read the playback fps, play frame, and name
     open_set_file (mainw->set_name,++clipnum);
     threaded_dialog_spin();
 
+    if (needs_update) {
+      save_clip_values(mainw->current_file);
+      needs_update=FALSE;
+    }
+
     if (mainw->cached_list!=NULL) {
       g_list_free_strings(mainw->cached_list);
       g_list_free(mainw->cached_list);
@@ -5197,7 +5289,7 @@
     }
 
     get_total_time (cfile);
-    if (cfile->achans) cfile->aseek_pos=(long)((gdouble)(cfile->frameno-1.)/
+    if (cfile->achans) cfile->aseek_pos=(int64_t)((gdouble)(cfile->frameno-1.)/
 					       cfile->fps*cfile->arate*cfile->achans*cfile->asampsize/8);
 
     // add to clip menu
@@ -5214,7 +5306,7 @@
     if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
       mainw->current_file=mainw->multitrack->render_file;
       mt_init_clips(mainw->multitrack,new_file,TRUE);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       mt_clip_select(mainw->multitrack,TRUE);
     }
 
@@ -5238,6 +5330,7 @@
   recover_layout_map(MAX_FILES);
 
   mainw->suppress_dprint=FALSE;
+  g_free(cwd);
   return TRUE;
 }
 
@@ -5246,13 +5339,14 @@
 void on_cleardisk_activate (GtkWidget *widget, gpointer user_data) {
   // recover disk space
 
+  gint64 bytes=0,fspace;
 
-  gint current_file=mainw->current_file;
   gchar *markerfile;
   gchar **array;
-  int marker_fd;
-  guint64 bytes=0;
   gchar *com;
+
+  gint current_file=mainw->current_file;
+  int marker_fd;
   int i;
   int retval=0;
 
@@ -5287,12 +5381,15 @@
     mt_desensitise(mainw->multitrack);
   }
 
+
   for (i=0;i<MAX_FILES;i++) {
     // mark all free-floating files (directories) which we do not want to remove
     // we do error checking here
 
-    if (mainw->files[i]!=NULL&&mainw->files[i]->clip_type==CLIP_TYPE_DISK) {
+    if ((i==mainw->current_file)||(mainw->files[i]!=NULL&&(mainw->files[i]->clip_type==CLIP_TYPE_DISK||
+							   mainw->files[i]->clip_type==CLIP_TYPE_FILE))) {
       markerfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"set.",NULL);
+
       do {
 	retval=0;
 	marker_fd=creat(markerfile,S_IRUSR|S_IWUSR);
@@ -5319,12 +5416,16 @@
   }
 
 
+  // get space before
+  fspace=get_fs_free(prefs->tmpdir);
+
   // call "smogrify bg_weed" to do the actual cleanup
   // its parameters are the handle of a temp file, and opts mask
 
   if (retval!=LIVES_CANCEL) {
     mainw->com_failed=FALSE;
-    com=g_strdup_printf("smogrify bg_weed \"%s\" %d",cfile->handle,prefs->clear_disk_opts);
+    unlink(cfile->info_file);
+    com=g_strdup_printf("%s bg_weed \"%s\" %d",prefs->backend,cfile->handle,prefs->clear_disk_opts);
     lives_system(com,FALSE);
     g_free(com);
     
@@ -5343,7 +5444,7 @@
 
 
   // close the temporary clip
-  com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
+  com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
   lives_system(com,FALSE);
   g_free(com);
   g_free(cfile);
@@ -5373,10 +5474,18 @@
     mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
   }
 
+
+  if (bytes==0) {
+    // get after
+    bytes=get_fs_free(prefs->tmpdir)-fspace;
+  }
+
+  if (bytes<0) bytes=0;
+
   if (retval!=LIVES_CANCEL&&!mainw->com_failed) {
     d_print_done();
-    do_error_dialog(g_strdup_printf(_("%s of disk space was recovered.\n"), 
-				    lives_format_storage_space_string((uint64_t)bytes)));
+    do_info_dialog(g_strdup_printf(_("%s of disk space was recovered.\n"), 
+				   lives_format_storage_space_string((uint64_t)bytes)));
     if (user_data!=NULL) gtk_widget_set_sensitive(gtk_widget_get_toplevel(GTK_WIDGET(user_data)),FALSE);
   }
   else d_print_failed();
@@ -5462,37 +5571,31 @@
 }
 
 
-void
-on_show_file_info_activate            (GtkMenuItem     *menuitem,
-				       gpointer         user_data)
-{
+void on_show_file_info_activate (GtkMenuItem *menuitem, gpointer user_data) {
   char buff[512];
-  fileinfo *filew;
+  lives_clipinfo_t *filew;
 
   gchar *sigs,*ends,*tmp;
   
   if (mainw->current_file==-1) return;
 
-  filew = create_info_window (cfile->achans,FALSE);
-
-  g_snprintf(buff,512,"LiVES - %s",cfile->name);
-  gtk_window_set_title (GTK_WINDOW (filew->info_window), buff);
+  filew = create_clip_info_window (cfile->achans,FALSE);
   
   if (cfile->frames>0) {
     // type
-    g_snprintf(buff,512,_("\nExternal: %s\nInternal: %s (%d bpp)\n"),cfile->type,
+    g_snprintf(buff,512,_("\nExternal: %s\nInternal: %s (%d bpp) / %s\n"),cfile->type,
 	       (tmp=g_strdup((cfile->clip_type==CLIP_TYPE_YUV4MPEG||
 			      cfile->clip_type==CLIP_TYPE_VIDEODEV)?(_("buffered")):
-			     (cfile->img_type==IMG_TYPE_JPEG?"jpeg":"png"))),cfile->bpp);
+			     (cfile->img_type==IMG_TYPE_JPEG?"jpeg":"png"))),cfile->bpp,"pcm");
     g_free(tmp);
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview24)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview24),buff, -1);
     // fps
     g_snprintf(buff,512,"\n  %.3f%s",cfile->fps,cfile->ratio_fps?"...":"");
 
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview25)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview25),buff, -1);
     // image size
     g_snprintf(buff,512,"\n  %dx%d",cfile->hsize,cfile->vsize);
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview26)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview26),buff, -1);
     // frames
     if ((cfile->opening&&!cfile->opening_audio&&cfile->frames==0)||cfile->frames==123456789) {
       g_snprintf(buff,512,"%s",_ ("\n  Opening..."));
@@ -5511,7 +5614,7 @@
       }
 
     }
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview27)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview27),buff, -1);
     // video time
     if ((cfile->opening&&!cfile->opening_audio&&cfile->frames==0)||cfile->frames==123456789) {
       g_snprintf(buff,512,"%s",_ ("\n  Opening..."));
@@ -5519,7 +5622,7 @@
     else {
       g_snprintf(buff,512,_("\n  %.2f sec."),cfile->video_time);
     }
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview28)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview28),buff, -1);
     // file size
     if (cfile->f_size>=0l) {
       gchar *file_ds=lives_format_storage_space_string((guint64)cfile->f_size);
@@ -5527,7 +5630,7 @@
       g_free(file_ds);
     }
     else g_snprintf(buff,512,"%s",_ ("\n  Unknown"));
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview29)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview29),buff, -1);
   }
 
   if (cfile->achans>0) {
@@ -5537,7 +5640,7 @@
     else {
       g_snprintf(buff,512,_("\n  %.2f sec."),cfile->laudio_time);
     }
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview_ltime)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview_ltime),buff, -1);
 
     if (cfile->signed_endian&AFORM_UNSIGNED) sigs=g_strdup(_("unsigned"));
     else sigs=g_strdup(_("signed"));
@@ -5546,7 +5649,7 @@
     else ends=g_strdup(_("little-endian"));
 
     g_snprintf(buff,512,_("  %d Hz %d bit\n%s %s"),cfile->arate,cfile->asampsize,sigs,ends);
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview_lrate)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview_lrate),buff, -1);
 
     g_free(sigs);
     g_free(ends);
@@ -5560,7 +5663,7 @@
     else ends=g_strdup(_("little-endian"));
 
     g_snprintf(buff,512,_("  %d Hz %d bit\n%s %s"),cfile->arate,cfile->asampsize,sigs,ends);
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview_rrate)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview_rrate),buff, -1);
 
     g_free(sigs);
     g_free(ends);
@@ -5571,9 +5674,9 @@
     else {
       g_snprintf(buff,512,_("\n  %.2f sec."),cfile->raudio_time);
     }
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview_rtime)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview_rtime),buff, -1);
   }
-  gtk_widget_show (filew->info_window);
+
 }
 
 void
@@ -5627,7 +5730,8 @@
                                         gpointer         user_data)
 {
 
-#ifdef HAVE_GTK_NICE_VERSION
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
   gchar *license = g_strdup(_(
         "This program is free software; you can redistribute it and/or modify\n"
         "it under the terms of the GNU General Public License as published by\n"
@@ -5644,34 +5748,44 @@
         "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"));
 
   gchar *comments= g_strdup(_("A video editor and VJ program."));
+  gchar *title= g_strdup(_("About LiVES"));
+
+  gchar *translator_credits = g_strdup(_("translator_credits"));
 
+#if GTK_CHECK_VERSION(3,0,0)
+  gchar *authors[2]={"salsaman@gmail.com",NULL};
+#else
   gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
   gtk_about_dialog_set_email_hook (activate_url, NULL, NULL);
+#endif
 
-  gtk_show_about_dialog (NULL,
-			 //        "logo", logo,
+  gtk_show_about_dialog (GTK_WINDOW(mainw->LiVES),
+			 "logo", NULL,
 			 "name", "LiVES",
 			 "version", LiVES_VERSION,
 			 "comments",comments,
-			 "copyright", "(C) 2002-2012 salsaman <salsaman@gmail.com> and others",
+			 "copyright", "(C) 2002-2013 salsaman <salsaman@gmail.com> and others",
 			 "website", "http://lives.sourceforge.net",
-			 //			 "authors", authors,
 			 "license", license,
+			 "title", title,
+			 "translator_credits", translator_credits,
+#if GTK_CHECK_VERSION(3,0,0)
+			 "authors", authors,
+			 "license-type", GTK_LICENSE_GPL_3_0,
+#endif
 			 NULL);
 
-
+  g_free(translator_credits);
   g_free(comments);
+  g_free(title);
   g_free(license);
+  return;
+#endif
+#endif
 
-#else
-
-  gchar *mesg=g_strdup_printf(_ ("LiVES Version %s\n(c) G. Finch (salsaman) %s\n\nReleased under the GPL 3 or later (http://www.gnu.org/licenses/gpl.txt)\nLiVES is distributed WITHOUT WARRANTY\n\nContact the author at:\nsalsaman@gmail.com\nHomepage: http://lives.sourceforge.net"),LiVES_VERSION,"2002-2012");
+  gchar *mesg=g_strdup_printf(_ ("LiVES Version %s\n(c) G. Finch (salsaman) %s\n\nReleased under the GPL 3 or later (http://www.gnu.org/licenses/gpl.txt)\nLiVES is distributed WITHOUT WARRANTY\n\nContact the author at:\nsalsaman@gmail.com\nHomepage: http://lives.sourceforge.net"),LiVES_VERSION,"2002-2013");
   do_error_dialog(mesg);
   g_free(mesg);
-
-#endif
-
-
   
 }
 
@@ -5729,15 +5843,15 @@
 
 
 
-void on_fs_preview_clicked (GtkButton *button, gpointer user_data) {
+void on_fs_preview_clicked (GtkWidget *widget, gpointer user_data) {
   // file selector preview
   gdouble start_time=0.;
 
-  unsigned long xwin=0;
+  uint64_t xwin=0;
 
   FILE *ifile=NULL;
 
-  cairo_t *cr;
+  lives_painter_t *cr;
 
   LiVESPixbuf *blank;
 
@@ -5750,23 +5864,41 @@
   int fwidth,fheight,owidth,oheight;
 
   int offs_x,offs_y;
-  int pid=getpid();
+  pid_t pid=lives_getpid();
   int alarm_handle;
   int retval;
   gboolean timeout;
 
-  gchar *info_file=g_strdup_printf ("%s/thm%d/.status",prefs->tmpdir,pid);
+  gchar *info_file,*thm_dir;
   gchar *file_open_params=NULL;
-  gchar *tmp;
+  gchar *tmp,*tmp2;
   gchar *com;
-
+  gchar *dfile;
 
   if (mainw->in_fs_preview) {
     end_fs_preview();
-    com=g_strdup_printf ("smogrify stopsubsub thm%d 2>/dev/null",pid);
+
+#ifndef IS_MINGW
+    com=g_strdup_printf ("%s stopsubsub thm%d 2>/dev/null",prefs->backend_sync,pid);
     lives_system (com,TRUE);
+#else
+    // get pid from backend
+    FILE *rfile;
+    ssize_t rlen;
+    char val[16];
+    int xpid;
+    com=g_strdup_printf("%s get_pid_for_handle thm%d",prefs->backend_sync,pid);
+    rfile=popen(com,"r");
+    rlen=fread(val,1,16,rfile);
+    pclose(rfile);
+    memset(val+rlen,0,1);
+    xpid=atoi(val);
+    if (xpid!=0) 
+      lives_win32_kill_subprocesses(xpid,TRUE);
+#endif
     g_free (com);
-    while (g_main_context_iteration (NULL, FALSE));
+
+    lives_widget_context_update();
   }
 
   if (preview_type==3) {
@@ -5777,13 +5909,18 @@
   else {
     // open file
     g_snprintf(file_name,PATH_MAX,"%s",
-	       (tmp=g_filename_to_utf8(gtk_file_selection_get_filename
-				       (GTK_FILE_SELECTION(gtk_widget_get_toplevel
-							   (GTK_WIDGET(button)))),-1,NULL,NULL,NULL)));
-    g_free(tmp);
+	       (tmp=g_filename_to_utf8((tmp2=gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(gtk_widget_get_toplevel(widget)))),
+				       -1,NULL,NULL,NULL)));
+    g_free(tmp); g_free(tmp2);
+    
   }
 
-  info_file=g_strdup_printf ("%s/thm%d/.status",prefs->tmpdir,getpid());
+
+#ifndef IS_MINGW
+  info_file=g_strdup_printf ("%s/thm%d/.status",prefs->tmpdir,lives_getpid());
+#else
+  info_file=g_strdup_printf ("%s/thm%d/status",prefs->tmpdir,lives_getpid());
+#endif
   unlink (info_file);
 
   if (preview_type==1) {
@@ -5792,48 +5929,60 @@
 
     clear_mainw_msg();
     
-    // make thumb from any image file
-    com=g_strdup_printf("smogrify make_thumb thm%d %d %d \"%s\" \"%s\"",pid,DEFAULT_FRAME_HSIZE,
-			DEFAULT_FRAME_VSIZE,prefs->image_ext,(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
-    g_free(tmp);
-    lives_system(com,FALSE);
-    g_free(com);
-
-#define LIVES_FILE_READ_TIMEOUT  (5 * U_SEC) // 5 sec timeout
+    if (capable->has_identify) {
+      mainw->error=FALSE;
 
-    do {
-      retval=0;
-      timeout=FALSE;
-      alarm_handle=lives_alarm_set(LIVES_FILE_READ_TIMEOUT);
- 
-      while (!((ifile=fopen (info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-	g_usleep (prefs->sleep_time);
-      }
+      // make thumb from any image file
+      com=g_strdup_printf("%s make_thumb thm%d %d %d \"%s\" \"%s\"",prefs->backend_sync,pid,DEFAULT_FRAME_HSIZE,
+			  DEFAULT_FRAME_VSIZE,prefs->image_ext,(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+      g_free(tmp);
+      lives_system(com,FALSE);
+      g_free(com);
       
-      lives_alarm_clear(alarm_handle);
+#define LIVES_FILE_READ_TIMEOUT  (10 * U_SEC) // 5 sec timeout
       
-      if (!timeout) {
+      do {
+	retval=0;
+	timeout=FALSE;
+	alarm_handle=lives_alarm_set(LIVES_FILE_READ_TIMEOUT);
+	
+	while (!((ifile=fopen (info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
+	  lives_widget_context_update();
+	  g_usleep (prefs->sleep_time);
+	}
+	
+	lives_alarm_clear(alarm_handle);
+	
+	if (!timeout) {
+	  mainw->read_failed=FALSE;
+	  lives_fgets(mainw->msg,512,ifile);
+	  fclose (ifile);
+	}
+	
+	if (timeout || mainw->read_failed) {
+	  retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
+	}
+	
+      } while (retval==LIVES_RETRY);
+      
+      if (retval==LIVES_CANCEL) {
 	mainw->read_failed=FALSE;
-	lives_fgets(mainw->msg,512,ifile);
-	fclose (ifile);
+	return;
       }
-
-      if (timeout || mainw->read_failed) {
-	retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
+      
+      if (!mainw->error) {
+	array=g_strsplit(mainw->msg,"|",3);
+	width=atoi(array[1]);
+	height=atoi(array[2]);
+	g_strfreev(array);
       }
-
-    } while (retval==LIVES_RETRY);
-
-    if (retval==LIVES_CANCEL) {
-      mainw->read_failed=FALSE;
-      return;
+      else height=width=0;
+      mainw->error=FALSE;
+    }
+    else {
+      height=width=0;
     }
 
-    array=g_strsplit(mainw->msg,"|",3);
-    width=atoi(array[1]);
-    height=atoi(array[2]);
-    g_strfreev(array);
-    
     if (height*width) {
       // draw image
       GError *error=NULL;
@@ -5842,11 +5991,11 @@
       g_free(tmp);
 
       if (error==NULL) {
-	fwidth=mainw->fs_playalign->allocation.width-20;
-	fheight=mainw->fs_playalign->allocation.height-20;
+	fwidth=lives_widget_get_allocation_width(mainw->fs_playalign)-20;
+	fheight=lives_widget_get_allocation_height(mainw->fs_playalign)-20;
 
-	owidth=width;
-	oheight=height;
+	owidth=width=lives_pixbuf_get_width(pixbuf);
+	oheight=height=lives_pixbuf_get_height(pixbuf);
 
 	calc_maxspect(fwidth,fheight,
 		      &width,&height);
@@ -5862,80 +6011,92 @@
 	gtk_alignment_set(GTK_ALIGNMENT(mainw->fs_playalign),0.5,
 			  0.5,1.,1.);
 
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
 
 	blank=lives_pixbuf_new_blank(fwidth+20,fheight+20,WEED_PALETTE_RGB24);
 
-	cr = gdk_cairo_create (mainw->fs_playarea->window);
-	gdk_cairo_set_source_pixbuf (cr, blank, 0, 0);
-	cairo_paint (cr);
-	cairo_destroy (cr);
-	gdk_pixbuf_unref(blank);
+	cr = lives_painter_create_from_widget (mainw->fs_playarea);
+	lives_painter_set_source_pixbuf (cr, blank, 0, 0);
+	lives_painter_paint (cr);
+	lives_painter_destroy (cr);
+	lives_object_unref(blank);
 
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
 	
 
 	offs_x=(fwidth-width)/2;
 	offs_y=(fheight-height)/2;
 
-	cr = gdk_cairo_create (mainw->fs_playarea->window);
-	gdk_cairo_set_source_pixbuf (cr, pixbuf, offs_x, offs_y);
-	cairo_paint (cr);
-	cairo_destroy (cr);
+	cr = lives_painter_create_from_widget (mainw->fs_playarea);
+	lives_painter_set_source_pixbuf (cr, pixbuf, offs_x, offs_y);
+	lives_painter_paint (cr);
+	lives_painter_destroy (cr);
       }	
       else {
 	g_error_free(error);
       }
       if (pixbuf!=NULL) {
-	gdk_pixbuf_unref(pixbuf);
+	lives_object_unref(pixbuf);
       }
       g_free(thumb);
     }
     g_free(info_file);
-    info_file=g_strdup_printf ("%s/thm%d/",prefs->tmpdir,getpid());
-    com=g_strdup_printf("rm -rf \"%s\"",info_file);
+
+    thm_dir=g_strdup_printf ("%s/thm%d",prefs->tmpdir,getpid());
+#ifndef IS_MINGW
+    com=g_strdup_printf("/bin/rm -rf \"%s\"",thm_dir);
+#else
+    com=g_strdup_printf("DEL /q \"%s\"",thm_dir);
     lives_system(com,TRUE);
     g_free(com);
-    g_free(info_file);
+    com=g_strdup_printf("RMDIR \"%s\"",thm_dir);
+#endif
+    lives_system(com,TRUE);
+    g_free(com);
+    g_free(thm_dir);
   } 
 
 
   if (!(height*width)) {
     // media preview
     if (!capable->has_mplayer) {
-      gchar *msg=g_strdup(_ ("\n\nYou need to install mplayer to be able to preview this file.\n"));
+      gchar *msg;
+      if (capable->has_identify) {
+	msg=g_strdup(_ ("\n\nYou need to install mplayer to be able to preview this file.\n"));
+      }
+      else {
+	msg=g_strdup(_ ("\n\nYou need to install mplayer or imageMagick to be able to preview this file.\n"));
+      }
       do_blocking_error_dialog(msg);
       g_free(msg);
       return;
     }
 
-    com=g_strdup_printf("/bin/mkdir -p \"%s/fsp%d/\" 2>/dev/null",prefs->tmpdir,getpid());
-    lives_system(com,TRUE);
-    g_free(com);
+#ifndef IS_MINGW
+    dfile=g_strdup_printf("%s/fsp%d/",prefs->tmpdir,getpid());
+#else
+    dfile=g_strdup_printf("%s\\fsp%d\\",prefs->tmpdir,getpid());
+#endif
 
-    info_file=g_strdup_printf ("%s/fsp%d/.status",prefs->tmpdir,getpid());
+    g_mkdir_with_parents(dfile,S_IRWXU);
 
-    if (preview_type==1||preview_type==3) {
-#ifdef USE_X11
-      xwin=(unsigned long)GDK_WINDOW_XID (mainw->fs_playarea->window);
+#ifndef IS_MINGW
+    info_file=g_strdup_printf ("%s.status",dfile);
 #else
-      // need equivalent to get XID of win on other platforms
-      msg=g_strdup(_("Preview will not work without X11. We need the window id of the preview window.\nPlease send a patch if you know how to do this.\n"));
-      do_blocking_error_dialog(msg);
-      g_free(msg);
-
+    info_file=g_strdup_printf ("%sstatus",dfile);
 #endif
 
-    }
+    g_free(dfile);
+
 
-    gtk_widget_modify_bg (mainw->fs_playarea, GTK_STATE_NORMAL, &palette->black);
-    gtk_widget_modify_bg (mainw->fs_playframe, GTK_STATE_NORMAL, &palette->black);
-    gtk_widget_modify_bg (mainw->fs_playalign, GTK_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color (mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color (mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color (mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
 
     mainw->in_fs_preview=TRUE;
 
     // get width and height of clip
-    com=g_strdup_printf("smogrify get_details fsp%d \"%s\" \"%s\" %d %d",getpid(),
+    com=g_strdup_printf("%s get_details fsp%d \"%s\" \"%s\" %d %d",prefs->backend,getpid(),
 			(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),
 			prefs->image_ext,FALSE,FALSE);
 
@@ -5950,19 +6111,19 @@
       return;
     }
 
-    
+
     do {
       retval=0;
       timeout=FALSE;
       clear_mainw_msg();
       
-#define LIVES_LONGER_TIMEOUT  (30 * U_SEC) // 30 second timeout
+#define LIVES_LONGER_TIMEOUT  (10 * U_SEC) // 10 second timeout
 
       alarm_handle=lives_alarm_set(LIVES_LONGER_TIMEOUT);
     
       while (!((ifile=fopen(info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))
 	     &&mainw->in_fs_preview) {
-	while (g_main_context_iteration (NULL,FALSE));
+	lives_widget_context_update();
 	threaded_dialog_spin();
 	g_usleep(prefs->sleep_time);
       }
@@ -6000,42 +6161,44 @@
 
     unlink(info_file);
 
-    owidth=width;
-    oheight=height;
-
-    // -20 since border width was set to 10 pixels
-    fwidth=mainw->fs_playalign->allocation.width-20;
-    fheight=mainw->fs_playalign->allocation.height-20;
-
-    calc_maxspect(fwidth,fheight,
-    		  &width,&height);
-
-    width=(width>>1)<<1;
-    height=(height>>1)<<1;
+    if (preview_type!=2) {
 
-    if (width>owidth && height>oheight) {
-      width=owidth;
-      height=oheight;
+      owidth=width;
+      oheight=height;
+      
+      // -20 since border width was set to 10 pixels
+      fwidth=lives_widget_get_allocation_width(mainw->fs_playalign)-20;
+      fheight=lives_widget_get_allocation_height(mainw->fs_playalign)-20;
+      
+      calc_maxspect(fwidth,fheight,
+		    &width,&height);
+      
+      width=(width>>1)<<1;
+      height=(height>>1)<<1;
+      
+      if (width>owidth && height>oheight) {
+	width=owidth;
+	height=oheight;
+      }
+      
+      gtk_alignment_set(GTK_ALIGNMENT(mainw->fs_playalign),0.5,
+			0.5,0.,
+			(float)height/(float)fheight);
+      
+      
+      lives_widget_context_update();
+      
+      blank=lives_pixbuf_new_blank(fwidth+20,fheight+20,WEED_PALETTE_RGB24);
+      
+      cr = lives_painter_create_from_widget (mainw->fs_playarea);
+      lives_painter_set_source_pixbuf (cr, blank, 0, 0);
+      lives_painter_paint (cr);
+      lives_painter_destroy (cr);
+      lives_object_unref(blank);
+      
+      lives_widget_context_update();
     }
 
-    gtk_alignment_set(GTK_ALIGNMENT(mainw->fs_playalign),0.5,
-		      0.5,(float)width/(float)fwidth,
-		      (float)height/(float)fheight);
-
-
-    while (g_main_context_iteration(NULL,FALSE));
-    
-    blank=lives_pixbuf_new_blank(fwidth+20,fheight+20,WEED_PALETTE_RGB24);
-    
-    cr = gdk_cairo_create (mainw->fs_playarea->window);
-    gdk_cairo_set_source_pixbuf (cr, blank, 0, 0);
-    cairo_paint (cr);
-    cairo_destroy (cr);
-    gdk_pixbuf_unref(blank);
-
-    while (g_main_context_iteration(NULL,FALSE));
-	
-
     if (prefs->audio_player==AUD_PLAYER_JACK) {
       file_open_params=g_strdup_printf("%s %s -ao jack",mainw->file_open_params!=NULL?
 				       mainw->file_open_params:"",get_deinterlace_string());
@@ -6045,28 +6208,40 @@
 				       mainw->file_open_params:"",get_deinterlace_string());
     }
     else {
-      file_open_params=g_strdup_printf("%s %s",mainw->file_open_params!=NULL?
+      file_open_params=g_strdup_printf("%s %s -ao null",mainw->file_open_params!=NULL?
 				       mainw->file_open_params:"",get_deinterlace_string());
     }
 
+
+    if (preview_type==1||preview_type==3) {
+      xwin=lives_widget_get_xwinid(mainw->fs_playarea,"Unsupported display type for preview.");
+      if (xwin==-1) {
+	end_fs_preview();
+	g_free(info_file);
+	return;
+      }
+    }
+
+
+
     if (file_open_params!=NULL) {
-      com=g_strdup_printf("smogrify fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\" \"%s\"",getpid(),
+      com=g_strdup_printf("%s fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\" \"%s\"",prefs->backend,getpid(),
 			  xwin, width, height, start_time, preview_frames,
 			  (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),file_open_params);
+
     }
     else {
-      com=g_strdup_printf("smogrify fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\"",getpid(),
+      com=g_strdup_printf("%s fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\"",prefs->backend,getpid(),
 			  xwin, width, height, start_time, preview_frames,
 			  (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
     }
     
     g_free(tmp);
 
-    if (prefs->pause_xmms&&capable->has_xmms) lives_system("xmms -u",TRUE);
-    
-    gtk_widget_set_app_paintable(mainw->fs_playarea,TRUE);
+    if (preview_type!=2) gtk_widget_set_app_paintable(mainw->fs_playarea,TRUE);
     
     mainw->com_failed=FALSE;
+
     lives_system(com,FALSE);
     g_free(com);
     
@@ -6079,7 +6254,7 @@
     // loop here until preview has finished, or the user cancels
 
     while ((!(ifile=fopen (info_file,"r")))&&mainw->in_fs_preview) {
-      while (g_main_context_iteration (NULL,FALSE));
+      lives_widget_context_update();
       g_usleep (prefs->sleep_time);
     }
 
@@ -6095,75 +6270,73 @@
 
 
 
-void
-on_ok_button1_clicked                  (GtkButton       *button,
-                                        gpointer         user_data)
-{
-  // FILE OPENING
+
+void on_open_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  // OPEN A FILE
+
+  if (mainw->multitrack!=NULL) {
+    if (mainw->multitrack->idlefunc>0) {
+      g_source_remove(mainw->multitrack->idlefunc);
+      mainw->multitrack->idlefunc=0;
+    }
+    mt_desensitise(mainw->multitrack);
+    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
+    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
+  }
+
+  choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,3);
+}
 
 
 
 
-  GtkWidget *filesel;
-  gchar **fnames;
-  int i=0;
+void on_ok_file_open_clicked(GtkFileChooser *chooser, GSList *fnames) {
+  GSList *ofnames;
   gchar *tmp;
 
-  if (user_data==NULL) {
-    g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8
-				   (gtk_file_selection_get_filename(GTK_FILE_SELECTION
-								    ((filesel=gtk_widget_get_toplevel
-								      (GTK_WIDGET(button))))),-1,NULL,NULL,NULL)));
-    g_free(tmp);
+  if (chooser!=NULL) {
+    fnames=gtk_file_chooser_get_filenames (chooser);
 
-				 
-    g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",file_name);
-    get_dirname(mainw->vid_load_dir);
-    fnames=gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
     end_fs_preview();
-    gtk_widget_destroy(filesel);
-  
+    gtk_widget_destroy(GTK_WIDGET(chooser));
+
+    if (fnames==NULL) return;
+
+    if (fnames->data==NULL) {
+      g_list_free_strings((GList *)fnames);
+      g_slist_free(fnames);
+      return;
+    }
+
+    g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",(gchar *)fnames->data);
+    get_dirname(mainw->vid_load_dir);
+
     if (mainw->multitrack==NULL) gtk_widget_queue_draw(mainw->LiVES);
     else gtk_widget_queue_draw(mainw->multitrack->window);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     
     mainw->fs_playarea=NULL;
-
+    
     if (prefs->save_directories) {
       set_pref ("vid_load_dir",(tmp=g_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
       g_free(tmp);
     }
-
-    mainw->cancelled=CANCEL_NONE;
-  }
-  else {
-    fnames=(gchar **)user_data;
-
-    if (mainw->multitrack!=NULL) {
-      if (mainw->multitrack->idlefunc>0) {
-	g_source_remove(mainw->multitrack->idlefunc);
-	mainw->multitrack->idlefunc=0;
-      }
-      mt_desensitise(mainw->multitrack);
-      gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-      gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
-    }
     
-    while (g_main_context_iteration(NULL,FALSE));
+    mainw->cancelled=CANCEL_NONE;
   }
 
-  if (fnames[0]!=NULL&&fnames[1]!=NULL) mainw->opening_multi=TRUE;
-  mainw->img_concat_clip=-1;
+  ofnames=fnames;
 
-  while (fnames[i]!=NULL&&mainw->cancelled==CANCEL_NONE) {
-    g_snprintf(file_name,PATH_MAX,"%s",fnames[i]);
+  while (fnames!=NULL&&mainw->cancelled==CANCEL_NONE) {
+    g_snprintf(file_name,PATH_MAX,"%s",(gchar *)fnames->data);
+    g_free(fnames->data);
     open_file(file_name);
-    i++;
+    fnames=fnames->next;
   }
 
-  mainw->opening_multi=FALSE;
+  g_slist_free(ofnames);
 
-  g_strfreev(fnames);
+  mainw->opening_multi=FALSE;
 
   if (mainw->multitrack!=NULL) {
     polymorph(mainw->multitrack,POLY_NONE);
@@ -6174,10 +6347,18 @@
 
 }
 
+
+
 // files dragged onto target from outside - try to open them
 void drag_from_outside(GtkWidget *widget, GdkDragContext *dcon, gint x, gint y, 
 		       GtkSelectionData *data, guint info, guint time, gpointer user_data) {
-  gchar *filelist=(gchar *)data->data,*nfilelist,**array,**fnames;
+  GSList *fnames=NULL;
+#if GTK_CHECK_VERSION(3,0,0)
+  gchar *filelist=(gchar *)gtk_selection_data_get_data(data);
+#else
+  gchar *filelist=(gchar *)data->data;
+#endif
+  gchar *nfilelist,**array;
   int nfiles,i;
 
   if (filelist==NULL) {
@@ -6186,13 +6367,13 @@
   }
 
   if (mainw->multitrack!=NULL&&widget==mainw->multitrack->window) {
-    if (!GTK_WIDGET_SENSITIVE(mainw->multitrack->open_menu)) {
+    if (!lives_widget_is_sensitive(mainw->multitrack->open_menu)) {
       gtk_drag_finish(dcon,FALSE,FALSE,time);
       return;
     }
   }
   else {
-    if (!GTK_WIDGET_SENSITIVE(mainw->open)) {
+    if (!lives_widget_is_sensitive(mainw->open)) {
       gtk_drag_finish(dcon,FALSE,FALSE,time);
       return;
     }
@@ -6204,14 +6385,11 @@
   array=g_strsplit(nfilelist,"\n",nfiles);
   g_free(nfilelist);
 
-  fnames=(gchar **)g_malloc((nfiles+1)*sizeof(char *));
-
   for (i=0;i<nfiles;i++) {
-    fnames[i]=array[i];
+    fnames=g_slist_append(fnames,array[i]);
   }
-  fnames[i]=NULL;
 
-  on_ok_button1_clicked(NULL,(gpointer)fnames);
+  on_ok_file_open_clicked(NULL,fnames);
 
   // fn will free array elements and fnames
 
@@ -6222,39 +6400,11 @@
 
 
 
-void
-on_open_sel_ok_button_clicked                  (GtkButton       *button,
-						gpointer         user_data)
-{
-  gchar *tmp;
-  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8
-				      (gtk_file_selection_get_filename(GTK_FILE_SELECTION
-								       (gtk_widget_get_toplevel(GTK_WIDGET(button)))),
-				       -1,NULL,NULL,NULL)));
-  g_free(tmp);
-
-  g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",file_name);
-  get_dirname(mainw->vid_load_dir);
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
 
-  gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
-  if (prefs->save_directories) {
-    set_pref ("vid_load_dir",(tmp=g_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
-    g_free(tmp);
-  }
-  open_sel_range_activate();
-}
-
-
-void
-on_opensel_range_ok_clicked                  (GtkButton       *button,
-					      gpointer         user_data)
-{
+void on_opensel_range_ok_clicked (GtkButton *button, gpointer user_data) {
   // open file selection
   end_fs_preview();
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
 
   mainw->fs_playarea=NULL;
   mainw->img_concat_clip=-1;
@@ -6266,14 +6416,10 @@
     mt_sensitise(mainw->multitrack);
     mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
   }
-
-
 }
 
 
-void
-open_sel_range_activate(void)
-{
+void open_sel_range_activate(void) {
   // open selection range dialog
 
   GtkWidget *opensel_dialog = create_opensel_dialog ();
@@ -6284,17 +6430,19 @@
 }
 
 
-void on_open_new_audio_clicked (GtkButton *button, gpointer user_data) {
+void on_open_new_audio_clicked (GtkFileChooser *chooser, gpointer user_data) {
   // open audio file
   gchar *a_type;
   gchar *com,*mesg,*tmp;
   gchar **array;
-  gint oundo_start;
-  gint oundo_end;
-  gint israw=1;
-  gint asigned,aendian;
-  gboolean has_lmap_error=FALSE;
-  gboolean bad_header=FALSE;
+
+  int oundo_start;
+  int oundo_end;
+  int israw=1;
+  int asigned,aendian;
+
+  boolean has_lmap_error=FALSE;
+  boolean bad_header=FALSE;
 
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
     if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
@@ -6341,19 +6489,18 @@
   oundo_end=cfile->undo_end;
 
   if (user_data==NULL) {
-    g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(gtk_file_selection_get_filename
-							       (GTK_FILE_SELECTION(gtk_widget_get_toplevel
-										   (GTK_WIDGET(button)))),
-							       -1,NULL,NULL,NULL)));
+    gchar *filename=gtk_file_chooser_get_filename(chooser);
+    g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(filename,-1,NULL,NULL,NULL)));
+    g_free(filename);
     g_free(tmp);
   }
-  else g_snprintf(file_name,PATH_MAX,(char *)user_data);
+  else g_snprintf(file_name,PATH_MAX,"%s",(char *)user_data);
 
   g_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
   get_dirname(mainw->audio_dir);
   end_fs_preview();
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration(NULL,FALSE));
+  gtk_widget_destroy(GTK_WIDGET(chooser));
+  lives_widget_context_update();
   mainw->fs_playarea=NULL;
 
   a_type=file_name+strlen(file_name)-3;
@@ -6364,7 +6511,7 @@
       !g_ascii_strncasecmp(a_type,"wav",3)||
       !g_ascii_strncasecmp(a_type,"mod",3)||
       !g_ascii_strncasecmp(a_type,".xm",3)) {
-    com=g_strdup_printf("smogrify audioopen \"%s\" \"%s\"",cfile->handle,
+    com=g_strdup_printf("%s audioopen \"%s\" \"%s\"",prefs->backend,cfile->handle,
 			(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
     g_free(tmp);
   }
@@ -6431,12 +6578,12 @@
 
   if (!(do_progress_dialog(TRUE,TRUE,_ ("Opening audio")))) {
     gtk_widget_queue_draw(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
     mainw->com_failed=FALSE;
     unlink (cfile->info_file);
-    com=g_strdup_printf("smogrify cancel_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
     lives_system(com,FALSE);
     do_auto_dialog(_("Cancelling"),0);
     g_free(com);
@@ -6459,7 +6606,7 @@
   cfile->opening_audio=cfile->opening=cfile->opening_only_audio=FALSE;
 
   gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   array=g_strsplit(mainw->msg,"|",7);
   cfile->afilesize=strtol(array[6],NULL,10);
@@ -6472,7 +6619,7 @@
     mainw->error=FALSE;
     unlink (cfile->info_file);
 
-    com=g_strdup_printf("smogrify cancel_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
 
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
@@ -6497,7 +6644,8 @@
   cfile->changed=TRUE;
   d_print_done();
 
-  mesg=g_strdup_printf(_ ("New audio: %d Hz %d channel(s) %d bps\n"),cfile->arate,cfile->achans,cfile->asampsize);
+  mesg=g_strdup_printf(P_("New audio: %d Hz %d channel %d bps\n","New audio: %d Hz %d channels %d bps\n",cfile->achans),
+		       cfile->arate,cfile->achans,cfile->asampsize);
   d_print(mesg);
   g_free(mesg);
 
@@ -6506,7 +6654,7 @@
   mainw->error=FALSE;
   unlink (cfile->info_file);
 
-  com=g_strdup_printf("smogrify commit_audio \"%s\" %d",cfile->handle,israw);
+  com=g_strdup_printf("%s commit_audio \"%s\" %d",prefs->backend,cfile->handle,israw);
   lives_system(com,FALSE);
   g_free(com);
 
@@ -6568,23 +6716,36 @@
   // clean up if we were playing a preview - should be called from all callbacks 
   // where there is a possibility of fs preview still playing
   gchar *com;
-  gint mypid;
+  pid_t mypid;
 
   if (mainw->in_fs_preview) {
-    if (prefs->pause_xmms&&capable->has_xmms) lives_system("xmms -u",TRUE);
-    mainw->in_fs_preview=FALSE;
-    com=g_strdup_printf ("smogrify stopsubsub fsp%d 2>/dev/null",(mypid=getpid()));
+#ifndef IS_MINGW
+    com=g_strdup_printf ("%s stopsubsub fsp%d 2>/dev/null",prefs->backend_sync,(mypid=lives_getpid()));
     lives_system (com,TRUE);
+#else
+    // get pid from backend
+    FILE *rfile;
+    ssize_t rlen;
+    char val[16];
+    int pid;
+    com=g_strdup_printf("%s get_pid_for_handle fsp%d",prefs->backend_sync,(mypid=lives_getpid()));
+    rfile=popen(com,"r");
+    rlen=fread(val,1,16,rfile);
+    pclose(rfile);
+    memset(val+rlen,0,1);
+    pid=atoi(val);
+    
+    lives_win32_kill_subprocesses(pid,TRUE);
+#endif
     g_free (com);
-
-    com=g_strdup_printf ("smogrify close fsp%d",mypid);
+    com=g_strdup_printf ("%s close fsp%d",prefs->backend,mypid);
     lives_system (com,TRUE);
     g_free (com);
 
+    mainw->in_fs_preview=FALSE;
+
     if (mainw->fs_playarea!=NULL&&(GTK_IS_WIDGET(mainw->fs_playarea))) {
       gtk_widget_set_app_paintable(mainw->fs_playarea,FALSE);
-      //gtk_widget_hide (mainw->fs_playarea);
-      //gtk_widget_show (mainw->fs_playarea);
     }
   }
 }
@@ -6598,47 +6759,62 @@
   gchar *save_file;
 
   gtk_widget_hide(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_widget_context_update();
 
-  save_file=choose_file(NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
+  save_file=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
 
   if (save_file==NULL) {
     gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(button)));
     return;
   }
 
+#ifndef IS_MINGW
   if ((fd=creat(save_file,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))==-1) {
+#else
+  if ((fd=creat(save_file,S_IRUSR|S_IWUSR))==-1) {
+#endif
     gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-    do_file_perm_error(save_file);
+    do_write_failed_error_s(save_file,g_strerror(errno));
     g_free(save_file);
     return;
   }
 
-  g_free(save_file);
-
   btext=text_view_get_text(textview);
   
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
 
+  mainw->write_failed=FALSE;
   lives_write(fd,btext,strlen(btext),FALSE);
   g_free(btext);
   
   close (fd);
+
+  if (mainw->write_failed) {
+    do_write_failed_error_s(save_file,g_strerror(errno));
+  }
+  else {
+    gchar *msg=g_strdup_printf(_("Text was saved as\n%s\n"),save_file);
+    do_blocking_error_dialog(msg);
+    g_free(msg);
+  }
+
+  g_free(save_file);
+
 }
 
 
 
 
-void on_cancel_button1_clicked (GtkButton *button, gpointer user_data) {
+void on_cancel_button1_clicked (GtkWidget *widget, gpointer user_data) {
   // generic cancel callback
 
   end_fs_preview();
-  if (button!=NULL) gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration (NULL,FALSE));
 
-  if (user_data!=NULL) {
-    g_free(user_data);
+  if (LIVES_IS_BUTTON(widget)) 
+    lives_general_button_clicked(LIVES_BUTTON(widget),user_data);
+  else {
+    gtk_widget_destroy(widget);
+    if (user_data!=NULL) g_free(user_data);
   }
 
   mainw->fs_playarea=NULL;
@@ -6657,21 +6833,11 @@
 }
 
 
-gboolean on_cancel_button1_clicked_del(GtkWidget *widget, GdkEvent *event, gpointer user_data) {
-  on_cancel_button1_clicked(GTK_BUTTON(widget),user_data);
-  return TRUE;
-}
-
-
 
 
-void
-on_cancel_opensel_clicked              (GtkButton       *button,
-                                        gpointer         user_data)
-{
+void on_cancel_opensel_clicked (GtkButton  *button, gpointer user_data) {
   end_fs_preview();
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
   mainw->fs_playarea=NULL;
 
   if (mainw->multitrack!=NULL) {
@@ -6702,9 +6868,11 @@
     gtk_widget_set_sensitive(cfile->proc_ptr->stop_button,FALSE);
     gtk_widget_set_sensitive(cfile->proc_ptr->preview_button,FALSE);
   }
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
-  if (!mainw->effects_paused||cfile->nokeep) {
+  if ((!mainw->effects_paused||cfile->nokeep)&&(!mainw->is_rendering||
+						(mainw->multitrack!=NULL&&(!mainw->multitrack->is_rendering||
+									   !mainw->preview)))) {
     // Cancel
     if (mainw->cancel_type==CANCEL_SOFT) {
       // cancel in record audio
@@ -6714,7 +6882,11 @@
     }
     else if (mainw->cancel_type==CANCEL_KILL) {
       // kill processes and subprocesses working on cfile
-      com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+      com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+#else
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+#endif
     }
 
     if (!cfile->opening&&!mainw->internal_messaging) {
@@ -6722,12 +6894,32 @@
       // otherwise, come here
 
       // kill off the background process
-      if (com!=NULL) lives_system(com,TRUE);
+      if (com!=NULL) {
+#ifndef IS_MINGW
+	lives_system(com,TRUE);
+#else
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	g_free(com);
+	com=NULL;
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+      }
 
       // resume for next time
       if (mainw->effects_paused) {
 	if (com!=NULL) g_free(com);
-	com=g_strdup_printf("smogrify resume \"%s\"",cfile->handle);
+	com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
 	lives_system(com,FALSE);
       }
 
@@ -6766,8 +6958,11 @@
       mainw->cancelled=CANCEL_KEEP;
       return;
     }
-    if (!mainw->is_rendering) 
+    if (!mainw->is_rendering) {
       keep_frames=cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start-1+mainw->internal_messaging*2;
+      if (mainw->internal_messaging && atoi(mainw->msg)>cfile->proc_ptr->frames_done) 
+	keep_frames=atoi(mainw->msg)-cfile->progress_start+cfile->start-1+2;
+    }
     else keep_frames=cfile->frames+1;
     if (keep_frames>mainw->internal_messaging) {
       gchar *msg=g_strdup_printf(_ ("%d frames are enough !\n"),keep_frames-cfile->start);
@@ -6776,27 +6971,44 @@
 
       lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
       if (!mainw->internal_messaging) {
-	com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+	com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 	lives_system(com,TRUE);
+#else
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
 	g_free(com);
-	com=g_strdup_printf("smogrify resume \"%s\"",cfile->handle);
+
+	com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
 	lives_system(com,FALSE);
 	g_free(com);
-	if (!mainw->keep_pre) com=g_strdup_printf("smogrify mv_mgk \"%s\" %d %d \"%s\"",cfile->handle,
-						  cfile->start,keep_frames-1,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	if (!mainw->keep_pre) com=g_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,
+						  cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
 	else {
-	  com=g_strdup_printf("smogrify mv_pre \"%s\" %d %d \"%s\" &",cfile->handle,
-			      cfile->start,keep_frames-1,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	  com=g_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\" &",prefs->backend_sync,cfile->handle,
+			      cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
 	  mainw->keep_pre=FALSE;
 	}
       }
       else {
 	mainw->internal_messaging=FALSE;
-	if (!mainw->keep_pre) com=g_strdup_printf ("smogrify mv_mgk \"%s\" %d %d \"%s\"",cfile->handle,
-						   cfile->start,keep_frames,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	if (!mainw->keep_pre) com=g_strdup_printf ("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,
+						   cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
 	else {
-	  com=g_strdup_printf("smogrify mv_pre \"%s\" %d %d \"%s\" &",cfile->handle,
-			      cfile->start,keep_frames,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	  com=g_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\" &",prefs->backend_sync,cfile->handle,
+			      cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
 	  mainw->keep_pre=FALSE;
 	}
       }
@@ -6811,11 +7023,33 @@
     else {
       // no frames there, nothing to keep
       d_print_cancelled();
-      com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+
+#ifndef IS_MINGW
+      com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+#else
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+#endif
       if (!mainw->internal_messaging&&!mainw->is_rendering) {
+
+#ifndef IS_MINGW
 	lives_system(com,TRUE);
+#else
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
 	g_free(com);
-	com=g_strdup_printf("smogrify resume \"%s\"",cfile->handle);
+	
+	com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
 	lives_system(com,FALSE);
       }
       mainw->cancelled=CANCEL_USER;
@@ -6826,18 +7060,6 @@
 }
 
 
-void
-on_general_button_clicked            (GtkButton       *button,
-				      gpointer         user_data)
-{
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-
-  if (user_data!=NULL) {
-    g_free(user_data);
-  }
-
-}
-
 
 
 void
@@ -6846,7 +7068,7 @@
 {
   text_window *textwindow;
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 
   g_object_ref(mainw->optextview);
   textwindow=create_text_window(_("LiVES: - Encoder debug output"),NULL,NULL);
@@ -6913,12 +7135,12 @@
 	  kill_play_window();
 	  make_play_window();
 	  if (mainw->play_window!=NULL) {
-	    hide_cursor(mainw->play_window->window);
+	    hide_cursor(lives_widget_get_xwindow(mainw->play_window));
 	    gtk_widget_set_app_paintable(mainw->play_window,TRUE);
 	  }
 	}
 	if (cfile->frames==1||cfile->play_paused) {
-	  while (g_main_context_iteration (NULL,FALSE));
+	  lives_widget_context_update();
 	}
       }
 
@@ -6950,7 +7172,7 @@
 	  gtk_widget_show(mainw->framebar);
 	}
 	
-	gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), 10);
+	gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), widget_opts.border_width);
 	
 	gtk_widget_set_sensitive(mainw->fade,TRUE);
 	gtk_widget_set_sensitive(mainw->dsize,TRUE);
@@ -7006,12 +7228,12 @@
 	  kill_play_window();
 	  make_play_window();
 	  if (mainw->play_window!=NULL) {
-	    hide_cursor(mainw->play_window->window);
+	    hide_cursor(lives_widget_get_xwindow(mainw->play_window));
 	    gtk_widget_set_app_paintable(mainw->play_window,TRUE);
 	  }
 	}
 	if (mainw->multitrack==NULL&&(cfile->frames==1||cfile->play_paused)) {
-	  while (g_main_context_iteration (NULL,FALSE));
+	  lives_widget_context_update();
 	  if (mainw->play_window!=NULL&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
 							   cfile->clip_type==CLIP_TYPE_FILE)) {
 	    weed_plant_t *frame_layer=mainw->frame_layer;
@@ -7024,10 +7246,10 @@
       else {
 	if (mainw->multitrack==NULL) {
 	  // in-frame window
-	  while (g_main_context_iteration(NULL,FALSE));
+	  lives_widget_context_update();
 	  
-	  mainw->pwidth=mainw->playframe->allocation.width-H_RESIZE_ADJUST;
-	  mainw->pheight=mainw->playframe->allocation.height-V_RESIZE_ADJUST;
+	  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+	  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
 	  
 	  // double size
 	  if (mainw->double_size) {
@@ -7124,9 +7346,9 @@
     // needed
     block_expose();
     do {
-      while (g_main_context_iteration (NULL, FALSE));
-      mainw->pwidth=mainw->playframe->allocation.width-H_RESIZE_ADJUST;
-      mainw->pheight=mainw->playframe->allocation.height-V_RESIZE_ADJUST;
+      lives_widget_context_update();
+      mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+      mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
     } while (!(mainw->pwidth*mainw->pheight));
     unblock_expose();
 
@@ -7149,12 +7371,12 @@
 	}
 	make_play_window();
 	if (mainw->play_window!=NULL) {
-	  hide_cursor(mainw->play_window->window);
+	  hide_cursor(lives_widget_get_xwindow(mainw->play_window));
 	  gtk_widget_set_app_paintable(mainw->play_window,TRUE);
 	}
       }
       if (cfile->frames==1||cfile->play_paused) {
-	while (g_main_context_iteration (NULL,FALSE));
+	lives_widget_context_update();
 	if (!(mainw->play_window==NULL)&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
 							    cfile->clip_type==CLIP_TYPE_FILE)) {
 	  weed_plant_t *frame_layer=mainw->frame_layer;
@@ -7202,8 +7424,8 @@
 
 
 
-void on_sepwin_pressed (GtkButton *button,
-			gpointer user_data) {
+void on_sepwin_pressed (GtkButton *button, gpointer user_data) {
+  if (mainw->go_away) return;
 
   // toolbar button (separate window)
   if (mainw->multitrack!=NULL) {
@@ -7215,20 +7437,21 @@
 
 
 
-void
-on_sepwin_activate               (GtkMenuItem     *menuitem,
-				  gpointer         user_data)
-{
-  gchar buff[PATH_MAX];
+void on_sepwin_activate (GtkMenuItem *menuitem, gpointer user_data) {
   GtkWidget *sep_img;
   GtkWidget *sep_img2;
+
+  gchar buff[PATH_MAX];
   gchar *fnamex;
 
+  if (mainw->go_away) return;
+
   mainw->sep_win=!mainw->sep_win;
 
   if (mainw->multitrack!=NULL) {
     unpaint_lines(mainw->multitrack);
     mainw->multitrack->redraw_block=TRUE; // stop pb cursor from updating
+    mt_show_current_frame(mainw->multitrack, FALSE);
   }
 
   fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
@@ -7274,13 +7497,14 @@
       if (mainw->sep_win) {
 	// switch to separate window during pb
 	if (mainw->multitrack==NULL) {
+
 	  if (prefs->show_framecount&&((!mainw->preview&&(cfile->frames>0||mainw->foreign))||cfile->opening)) {
 	    gtk_widget_show(mainw->framebar);
 	  }
 	  if ((!mainw->faded&&mainw->fs&&((prefs->play_monitor!=prefs->gui_monitor&&prefs->play_monitor>0)))||
 					 (mainw->fs&&mainw->vpp!=NULL&&
 					  !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))) {
-	    gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), 10);
+	    gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), widget_opts.border_width);
 	    unfade_background();
 	    gtk_widget_show(mainw->frame1);
 	    gtk_widget_show(mainw->frame2);
@@ -7316,6 +7540,11 @@
 
 	make_play_window();
 
+	mainw->pw_scroll_func=g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event",
+						G_CALLBACK (on_mouse_scroll),
+						NULL);
+
+
 	if (mainw->ext_playback&&mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {	  
 	  // fixed o/p size for stream
 	  if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
@@ -7334,17 +7563,13 @@
 	  resize_play_window();
 	}
 	
-	if (!mainw->pw_exp_is_blocked) g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	mainw->pw_exp_is_blocked=TRUE;
-     
-	
-	if (mainw->play_window!=NULL&&GDK_IS_WINDOW(mainw->play_window->window)) {
-	  hide_cursor(mainw->play_window->window);
+	if (mainw->play_window!=NULL&&GDK_IS_WINDOW(lives_widget_get_xwindow(mainw->play_window))) {
+	  hide_cursor(lives_widget_get_xwindow(mainw->play_window));
 	  gtk_widget_set_app_paintable(mainw->play_window,TRUE);
 	}
 	if (cfile->frames==1||cfile->play_paused) {
-	  while (g_main_context_iteration (NULL,FALSE));
-	  if (mainw->play_window!=NULL&&GDK_IS_WINDOW(mainw->play_window->window)&&
+	  lives_widget_context_update();
+	  if (mainw->play_window!=NULL&&GDK_IS_WINDOW(lives_widget_get_xwindow(mainw->play_window))&&
 	      !mainw->noswitch&&mainw->multitrack==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
 							  cfile->clip_type==CLIP_TYPE_FILE)) {
 	    weed_plant_t *frame_layer=mainw->frame_layer;
@@ -7373,9 +7598,9 @@
 	  }
 	  
 	  gtk_widget_queue_draw (mainw->playframe);
-	  while (g_main_context_iteration (NULL, FALSE));
-	  mainw->pwidth=mainw->playframe->allocation.width-H_RESIZE_ADJUST;
-	  mainw->pheight=mainw->playframe->allocation.height-V_RESIZE_ADJUST;
+	  lives_widget_context_update();
+	  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+	  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
 	}
 	else {
 	  if (mainw->ext_playback) {
@@ -7386,7 +7611,7 @@
 	    gtk_widget_hide(mainw->framebar);
 	    if (!mainw->faded) fade_background();
 	    fullscreen_internal();
-	    while (g_main_context_iteration (NULL, FALSE));
+	    lives_widget_context_update();
 	  }
 	}
 	if (mainw->multitrack!=NULL) {
@@ -7396,7 +7621,8 @@
 	}
 	kill_play_window();
 	if (mainw->multitrack==NULL) add_to_playframe();
-	hide_cursor(mainw->playarea->window);
+
+	hide_cursor(lives_widget_get_xwindow(mainw->playarea));
 	if (mainw->multitrack==NULL&&(cfile->frames==1||cfile->play_paused)&&
 	    !mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
 			       cfile->clip_type==CLIP_TYPE_FILE)) {
@@ -7412,14 +7638,17 @@
     mainw->multitrack->redraw_block=FALSE;
     if (mainw->sep_win&&prefs->play_monitor!=prefs->gui_monitor&&prefs->play_monitor!=0) {
       gtk_widget_hide(mainw->multitrack->play_box);
-      gtk_widget_hide(mainw->multitrack->play_box->parent);
-      gtk_widget_hide(mainw->multitrack->play_box->parent->parent);
+      gtk_widget_hide(lives_widget_get_parent(mainw->multitrack->play_box));
+      gtk_widget_hide(lives_widget_get_parent(lives_widget_get_parent(mainw->multitrack->play_box)));
     }
     else {
       gtk_widget_show(mainw->multitrack->play_box);
-      gtk_widget_show(mainw->multitrack->play_box->parent);
-      gtk_widget_show(mainw->multitrack->play_box->parent->parent);
+      gtk_widget_show(lives_widget_get_parent(mainw->multitrack->play_box));
+      gtk_widget_show(lives_widget_get_parent(lives_widget_get_parent(mainw->multitrack->play_box)));
+      if (mainw->playing_file>-1) mt_show_current_frame(mainw->multitrack, FALSE);
     }
+
+
   }
 }
 
@@ -7637,22 +7866,9 @@
 }
 
 
-#ifdef HAVE_GTK_NICE_VERSION
-void
-on_volume_slider_value_changed           (GtkScaleButton   *sbutton,
-					  gpointer user_data) {
-  gchar *ttip;
-  mainw->volume=gtk_scale_button_get_value(sbutton);
-
-#else
-void
-on_volume_slider_value_changed           (GtkRange   *slider,
-					  gpointer user_data) {
+void on_volume_slider_value_changed (LiVESScaleButton *sbutton, gpointer user_data) {
   gchar *ttip;
-  mainw->volume=(GTK_ADJUSTMENT(slider->adjustment))->value;
-
-
-#endif
+  mainw->volume=lives_scale_button_get_value(sbutton);
   ttip=g_strdup_printf(_("Audio volume (%.2f)"),mainw->volume);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->vol_toolitem),_(ttip));
   g_free(ttip);
@@ -7849,8 +8065,8 @@
   mainw->current_file=0;
 
   d_print(_ ("Reversing clipboard..."));
-  com=g_strdup_printf("smogrify reverse \"%s\" %d %d \"%s\"",clipboard->handle,1,clipboard->frames,
-		      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+  com=g_strdup_printf("%s reverse \"%s\" %d %d \"%s\"",prefs->backend,clipboard->handle,1,clipboard->frames,
+		      get_image_ext_for_type(cfile->img_type));
 
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
@@ -7888,14 +8104,14 @@
   if (cfile->subt!=NULL) if (!do_existing_subs_warning()) return;
 
   // try to repaint the screen, as it may take a few seconds to get a directory listing
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   ttl=g_strdup (_("LiVES: Load subtitles from..."));
 
   if (strlen(mainw->vid_load_dir)) {
-    subfile=choose_file(mainw->vid_load_dir,NULL,filt,GTK_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
+    subfile=choose_file(mainw->vid_load_dir,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
   }
-  else subfile=choose_file(NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
+  else subfile=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
   g_free(ttl);
 
   if (subfile==NULL) return; // cancelled
@@ -7936,7 +8152,11 @@
   }
 
   mainw->com_failed=FALSE;
+#ifndef IS_MINGW
   com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",lfile_name,subfname);
+#else
+  com=g_strdup_printf("cp.exe \"%s\" \"%s\"",lfile_name,subfname);
+#endif
   lives_system(com,FALSE);
   g_free(com);
 
@@ -7972,7 +8192,7 @@
   GtkEntry *entry=(GtkEntry *)user_data;
 
   // try to repaint the screen, as it may take a few seconds to get a directory listing
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   g_snprintf(xfname,512,"%s",mainw->subt_save_file);
   get_dirname(xfname);
@@ -7980,7 +8200,7 @@
   g_snprintf(xfname2,512,"%s",mainw->subt_save_file);
   get_basename(xfname2);
 
-  subfile=choose_file(xfname,xfname2,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
+  subfile=choose_file(xfname,xfname2,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
 
   if (subfile==NULL) return; // cancelled
 
@@ -8027,19 +8247,21 @@
 }
 
 
-void
-on_load_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
 
-  // try to repaint the screen, as it may take a few seconds to get a directory listing
-  while (g_main_context_iteration(NULL,FALSE));
 
-  fileselection = create_fileselection (_ ("Select Audio File"),2,NULL);
-  if (strlen(mainw->audio_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->audio_dir);
+
+void on_load_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  if (mainw->multitrack!=NULL) {
+    if (mainw->multitrack->idlefunc>0) {
+      g_source_remove(mainw->multitrack->idlefunc);
+      mainw->multitrack->idlefunc=0;
+    }
+    mt_desensitise(mainw->multitrack);
+    gtk_widget_set_sensitive(mainw->multitrack->playall,TRUE);
+    gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
   }
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_open_new_audio_clicked),NULL);
-  gtk_widget_show (fileselection);
+
+  choose_file_with_preview(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,_ ("LiVES: - Select Audio File"),2);
 }
 
 
@@ -8066,7 +8288,7 @@
 				     gpointer         user_data)
 {
   gchar *com=g_strdup_printf("eject \"%s\"",prefs->cdplay_device);
-  while(g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   lives_system(com,TRUE);
   g_free(com);
 }
@@ -8084,8 +8306,7 @@
   gboolean has_lmap_error=FALSE;
   gboolean bad_header=FALSE;
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while(g_main_context_iteration(NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
 
   if (mainw->current_file>-1) {
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
@@ -8150,7 +8371,7 @@
     cfile->undo_arps=cfile->arps;
   }
 
-  com=g_strdup_printf("smogrify cdopen \"%s\" %d",cfile->handle,(int)mainw->fx1_val);
+  com=g_strdup_printf("%s cdopen \"%s\" %d",prefs->backend,cfile->handle,(int)mainw->fx1_val);
 
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
@@ -8176,7 +8397,7 @@
 
   if (!(do_progress_dialog(TRUE,TRUE,_ ("Opening CD track...")))) {
     gtk_widget_queue_draw(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     if (!was_new) {
       mainw->com_failed=FALSE;
@@ -8184,7 +8405,7 @@
       mainw->error=FALSE;
       unlink (cfile->info_file);
 
-      com=g_strdup_printf("smogrify cancel_audio \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
       lives_system(com,FALSE);
       g_free(com);
 
@@ -8213,16 +8434,16 @@
   }
 
   gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   if (mainw->error) {
     d_print(_ ("Error loading CD track\n"));
 
     gtk_widget_queue_draw(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     if (!was_new) {
-      com=g_strdup_printf("smogrify cancel_audio \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
       unlink (cfile->info_file);
@@ -8265,7 +8486,7 @@
     d_print(_ ("Error loading CD track\n"));
   
     if (!was_new) {
-      com=g_strdup_printf("smogrify cancel_audio \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
       mainw->com_failed=FALSE;
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
@@ -8296,7 +8517,7 @@
   mainw->com_failed=FALSE;
   unlink (cfile->info_file);
 
-  com=g_strdup_printf("smogrify commit_audio \"%s\"",cfile->handle);
+  com=g_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
   lives_system(com, FALSE);
   g_free(com);
 
@@ -8339,7 +8560,8 @@
   get_play_times();
   cfile->changed=TRUE;
   d_print_done();
-  mesg=g_strdup_printf(_ ("New audio: %d Hz %d channel(s) %d bps\n"),cfile->arate,cfile->achans,cfile->asampsize);
+  mesg=g_strdup_printf(P_("New audio: %d Hz %d channel %d bps\n","New audio: %d Hz %d channels %d bps\n",cfile->achans),
+		       cfile->arate,cfile->achans,cfile->asampsize);
   d_print(mesg);
   g_free(mesg);
   
@@ -8359,11 +8581,9 @@
 
 }
 
-void 
-on_load_vcd_ok_clicked                (GtkButton     *button,
-				       gpointer         user_data)
+void on_load_vcd_ok_clicked (GtkButton *button, gpointer         user_data)
 {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
   if (GPOINTER_TO_INT (user_data)==1) {
     g_snprintf (file_name,PATH_MAX,"dvd://%d",(int)mainw->fx1_val);
     if (mainw->file_open_params!=NULL) g_free(mainw->file_open_params);
@@ -8376,120 +8596,6 @@
 }
 
 
-void
-on_xmms_play_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
-
-  while (g_main_context_iteration(NULL,FALSE));
-
-  fileselection = create_fileselection (_ ("Select Audio File"),2,NULL);
-  g_signal_connect(GTK_FILE_SELECTION(fileselection)->ok_button, "clicked", G_CALLBACK (on_xmms_ok_clicked),NULL);
-  gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->audio_dir);
-  gtk_widget_show (fileselection);
-}
-
-void
-on_xmms_random_audio_activate                (GtkMenuItem     *menuitem,
-					    gpointer         user_data)
-{
-  xranw = create_rp_dialog();
-  gtk_widget_show (xranw->rp_dialog);
-  g_snprintf(file_name,PATH_MAX,"%s",mainw->xmms_dir);
-}
-
-
-void on_xmms_ok_clicked                (GtkButton     *button,
-					gpointer         user_data)
-{
-  gchar *com=g_strdup_printf("smogrify xmmsplay \"%s\"",
-			     gtk_file_selection_get_filename(GTK_FILE_SELECTION
-							     (gtk_widget_get_toplevel(GTK_WIDGET(button)))));
-  lives_system(com,TRUE);
-  g_free(com);
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-}
-
-
-void on_xmms_ran_ok_clicked                (GtkButton     *button,
-					gpointer         user_data)
-{
-  gchar *com,*tmp;
-  gint curr_file=mainw->current_file;
-  // we need to do some extra work, because we could be called whilst an effect is processing
-
-  gchar *dir=g_strdup(gtk_entry_get_text(GTK_ENTRY(xranw->dir)));
-  get_dirname(dir);
-
-  // an example of using 'get_temp_handle()' ////////////////////
-  if (!get_temp_handle(mainw->first_free_file,TRUE)) {
-    g_free(dir);
-    return;
-  }
-
-  com=g_strdup_printf("smogrify xmmsrandom \"%s\" %d %d %d %d \"%s\"",cfile->handle,
-		      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(xranw->numtracks)),
-		      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(xranw->subdir_check)),
-		      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(xranw->minsize)),
-		      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(xranw->maxsize)),
-		      (tmp=g_filename_from_utf8 (dir,-1,NULL,NULL,NULL)));
-  g_free(tmp);
-  g_free(dir);
-
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration(NULL,FALSE));
-  g_free(xranw);
-
-
-  mainw->com_failed=FALSE;
-  lives_system(com,TRUE);
-  g_free(com);
-
-  if (!mainw->com_failed) do_progress_dialog(TRUE,TRUE,_ ("Selecting tracks"));
-
-  com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
-  lives_system(com,FALSE);
-  g_free(com);
-  g_free(cfile);
-  cfile=NULL;
-  if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) mainw->first_free_file=mainw->current_file;
-
-  mainw->current_file=curr_file;
-  ////////////////////////////////////////
-
-  if (mainw->current_file>-1&&!(cfile->proc_ptr==NULL)) {
-    // if we are in another processing dialogue
-    desensitize();
-    procw_desensitize();
-  }
-  else {
-    // or not
-    if (mainw->current_file>-1) {
-      sensitize();
-    }
-    else {
-      close_current_file(curr_file);
-    }
-  }
-
-  if (mainw->error) {
-    do_error_dialog(mainw->msg);
-  }
-
-  clear_mainw_msg();
-
-  g_snprintf(mainw->xmms_dir,PATH_MAX,"%s",file_name);
-
-}
-
-
-void on_xmms_stop_audio_activate                (GtkMenuItem     *menuitem,
-						 gpointer         user_data)
-{
-  gchar *com=g_strdup("smogrify xmmsstop");
-  lives_system(com,TRUE);
-  g_free(com);
-}
-
 
 void popup_lmap_errors(GtkMenuItem *menuitem, gpointer user_data) {
   // popup layout map errors dialog
@@ -8501,8 +8607,8 @@
 
   textwindow=create_text_window(_("layout errors"),NULL,mainw->layout_textbuffer);
 
-  dialog_action_area = GTK_DIALOG (textwindow->dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (textwindow->dialog));
+
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_SPREAD);
 
   vbox = lives_dialog_get_content_area(GTK_DIALOG(textwindow->dialog));
@@ -8510,39 +8616,39 @@
   add_warn_check(GTK_BOX(vbox),WARN_MASK_LAYOUT_POPUP);
 
   button = gtk_button_new_with_mnemonic (_("Close _Window"));
-  gtk_widget_show (button);
+
   gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), button, GTK_RESPONSE_OK);
 
   g_signal_connect (GTK_OBJECT (button), "clicked",
-		    G_CALLBACK (on_general_button_clicked),
+		    G_CALLBACK (lives_general_button_clicked),
 		    textwindow);
 
-  gtk_container_set_border_width (GTK_CONTAINER (button), 12);
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  gtk_container_set_border_width (GTK_CONTAINER (button), widget_opts.border_width);
+  lives_widget_set_can_focus_and_default (button);
 
   textwindow->clear_button = gtk_button_new_with_mnemonic (_("Clear _Errors"));
-  gtk_widget_show (textwindow->clear_button);
+
   gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), textwindow->clear_button, GTK_RESPONSE_CANCEL);
 
   g_signal_connect (GTK_OBJECT (textwindow->clear_button), "clicked",
 		    G_CALLBACK (on_lerrors_clear_clicked),
 		    GINT_TO_POINTER(FALSE));
 
-  gtk_container_set_border_width (GTK_CONTAINER (textwindow->clear_button), 12);
-  GTK_WIDGET_SET_FLAGS (textwindow->clear_button, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  gtk_container_set_border_width (GTK_CONTAINER (textwindow->clear_button), widget_opts.border_width);
+  lives_widget_set_can_focus_and_default (textwindow->clear_button);
 
   textwindow->delete_button = gtk_button_new_with_mnemonic (_("_Delete affected layouts"));
-  gtk_widget_show (textwindow->delete_button);
+
   gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), textwindow->delete_button, GTK_RESPONSE_CANCEL);
 
-  gtk_container_set_border_width (GTK_CONTAINER (textwindow->delete_button), 12);
-  GTK_WIDGET_SET_FLAGS (textwindow->delete_button, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  gtk_container_set_border_width (GTK_CONTAINER (textwindow->delete_button), widget_opts.border_width);
+  lives_widget_set_can_focus_and_default (textwindow->delete_button);
 
   g_signal_connect (GTK_OBJECT (textwindow->delete_button), "clicked",
 		    G_CALLBACK (on_lerrors_delete_clicked),
 		    NULL);
 
-  gtk_widget_show(textwindow->dialog);
+  gtk_widget_show_all(textwindow->dialog);
   
 }
 
@@ -8590,8 +8696,12 @@
 
 
 void on_toy_activate  (GtkMenuItem *menuitem, gpointer user_data) {
+#ifdef ENABLE_OSC
+#ifndef IS_MINGW
   gchar string[PATH_MAX];
+#endif
   gchar *com;
+#endif
 
   if (menuitem!=NULL&&mainw->toy_type==GPOINTER_TO_INT(user_data)) {
     // switch is off
@@ -8605,10 +8715,12 @@
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->toy_autolives),FALSE);
     g_signal_handler_unblock (mainw->toy_autolives, mainw->toy_func_autolives);
 
+#ifndef IS_MINGW
     if (mainw->toy_alives_pid>1) {
       lives_killpg(mainw->toy_alives_pid,LIVES_SIGHUP);
     }
-    
+#endif    
+
     // switch off rte so as not to cause alarm
     if (mainw->autolives_reset_fx) 
       rte_on_off_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(0));
@@ -8648,6 +8760,7 @@
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->toy_none),TRUE);
     g_signal_handler_unblock (mainw->toy_none, mainw->toy_func_none);
     return;
+#ifdef ENABLE_OSC
   case LIVES_TOY_AUTOLIVES:
     if (mainw->current_file<1) {
       do_autolives_needs_clips_error();
@@ -8669,6 +8782,7 @@
       return;
     }
 
+#ifndef IS_MINGW
     // search for autolives.pl
     if (!capable->has_autolives) {
       get_location("autolives.pl",string,PATH_MAX);
@@ -8679,7 +8793,7 @@
 	return;
       }
     }
-    
+#endif
 
     // chek if osc is started; if not ask permission
     if (!prefs->osc_udp_started) {
@@ -8702,11 +8816,19 @@
       mainw->autolives_reset_fx=TRUE;
     }
 
+#ifndef IS_MINGW
     com=g_strdup_printf("autolives.pl localhost %d %d >/dev/null 2>&1",prefs->osc_udp_port,prefs->osc_udp_port-1);
+#else
+    com=g_strdup_printf("START /MIN /B perl \"%s\\bin\\autolives.pl\" localhost %d %d >NUL 2>&1",
+			prefs->prefix_dir,prefs->osc_udp_port,prefs->osc_udp_port-1);
+#endif
+
     mainw->toy_alives_pid=lives_fork(com);
+
     g_free(com);
 
     break;
+#endif
   case LIVES_TOY_MAD_FRAMES:
     break;
   case LIVES_TOY_TV:
@@ -8720,7 +8842,7 @@
     else {
       // keep it
       gint current_file=mainw->current_file;
-      gchar *com=g_strdup_printf("smogrify commit_audio \"%s\"",cfile->handle);
+      gchar *com=g_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
       cfile->start=1;
       get_frame_count(mainw->current_file);
       cfile->end=cfile->frames;
@@ -8749,7 +8871,7 @@
 					gpointer         user_data)
 {
   // update the play window preview
-  gint preview_frame=gtk_spin_button_get_value_as_int(spinbutton);
+  int preview_frame=gtk_spin_button_get_value_as_int(spinbutton);
   if ((preview_frame)==mainw->preview_frame) return;
   mainw->preview_frame=preview_frame;
   load_preview_image(TRUE);
@@ -8759,7 +8881,7 @@
 on_prv_link_toggled                (GtkToggleButton *togglebutton,
 				    gpointer         user_data)
 {
-  if (!gtk_toggle_button_get_active(togglebutton)) return;
+  if (!lives_toggle_button_get_active(togglebutton)) return;
   mainw->prv_link=GPOINTER_TO_INT(user_data);
   if (mainw->is_processing&&(mainw->prv_link==PRV_START||mainw->prv_link==PRV_END)) {
     // block spinbutton in play window
@@ -8812,6 +8934,11 @@
   }
   set_sel_label(mainw->sel_label);
   get_play_times();
+
+  if (mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded) {
+    if (mainw->prv_link==PRV_START&&mainw->preview_frame!=cfile->start)
+      load_preview_image(FALSE);
+  }
 }
 
 
@@ -8860,16 +8987,33 @@
   set_sel_label(mainw->sel_label);
   get_play_times();
 
+  if (mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded) {
+    if (mainw->prv_link==PRV_END&&mainw->preview_frame!=cfile->end)
+      load_preview_image(FALSE);
+  }
+
 }
 
 
 // for the timer bars
 
-gint
-expose_vid_event (GtkWidget *widget, GdkEventExpose *event) {
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_vid_event (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  GdkEventExpose *event=NULL;
+  boolean dest_cr=FALSE;
+#else
+boolean expose_vid_event (GtkWidget *widget, GdkEventExpose *event) {
+  lives_painter_t *cr=lives_painter_create_from_widget(mainw->video_draw);
+  boolean dest_cr=TRUE;
+#endif
+
   gint ex,ey,ew,eh;
   gint width;
 
+  if (mainw->recoverable_layout) return FALSE;
+
+  if (mainw->draw_blocked) return TRUE;
+
   if (!prefs->show_gui||mainw->multitrack!=NULL||
       (mainw->fs&&(prefs->play_monitor==prefs->gui_monitor||
 		   prefs->play_monitor==0)&&mainw->playing_file>-1&&
@@ -8888,54 +9032,182 @@
   }
   else {
     ex=ey=0;
-    ew=mainw->video_draw->allocation.width;
-    eh=mainw->video_draw->allocation.height;
+    ew=lives_widget_get_allocation_width(mainw->video_draw);
+    eh=lives_widget_get_allocation_height(mainw->video_draw);
   }
 
-  block_expose();
+
 
   if (mainw->video_drawable!=NULL) {
-    gdk_drawable_get_size(GDK_DRAWABLE(mainw->video_drawable),&width,NULL);
-    if (width!=mainw->LiVES->allocation.width) {
-      gdk_drawable_unref(GDK_DRAWABLE(mainw->video_drawable));
+    // check if a resize happened
+
+    width = lives_painter_image_surface_get_width (mainw->video_drawable);
+
+    if (width!=lives_widget_get_allocation_width(mainw->LiVES)) {
+      lives_painter_surface_destroy(mainw->video_drawable);
       mainw->video_drawable=NULL;
     }
   }
 
   if (mainw->video_drawable==NULL) {
-    mainw->video_drawable = gdk_pixmap_new(mainw->video_draw->window,
-					   mainw->video_draw->allocation.width,
-					   mainw->video_draw->allocation.height,
-					   -1);
+    mainw->video_drawable = lives_painter_surface_create_from_widget(mainw->video_draw,
+								       LIVES_PAINTER_CONTENT_COLOR,
+								       lives_widget_get_allocation_width(mainw->video_draw),
+								       lives_widget_get_allocation_height(mainw->video_draw));
+    block_expose();
     get_play_times();
+    unblock_expose();
+
+
   }
 
   if (mainw->current_file==-1) {
-    gdk_draw_rectangle (mainw->video_drawable,
-                        mainw->video_draw->style->bg_gc[GTK_WIDGET_STATE (widget)],
-                        TRUE,
-                        0, 0,
-                        mainw->video_draw->allocation.width,
-                        mainw->video_draw->allocation.height
-                        );
+    lives_painter_t *cr2=lives_painter_create(mainw->video_drawable);
+
+    lives_painter_set_source_to_bg(cr2,mainw->video_draw);
+    lives_painter_rectangle(cr2,0,0,
+		    lives_widget_get_allocation_width(mainw->video_draw),
+		    lives_widget_get_allocation_height(mainw->video_draw));
+    lives_painter_fill(cr2);
+    lives_painter_destroy(cr2);
   }
 
-  gdk_draw_pixmap(widget->window,
-		  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-		  mainw->video_drawable,
-		  ex, ey,
-		  ex, ey,
-		  ew, eh);
-  
+  lives_painter_set_source_surface (cr, mainw->video_drawable,0.,0.);
+  lives_painter_rectangle (cr,ex,ey,ew,eh);
+  lives_painter_paint(cr);
+
   unblock_expose();
-  return FALSE;
+
+  if (dest_cr) lives_painter_destroy(cr);
+
+  return TRUE;
   
 }
 
-gint
-expose_laud_event (GtkWidget *widget, GdkEventExpose *event) {
+
+static void redraw_laudio(lives_painter_t *cr, int ex, int ey, int ew, int eh) {
+  int width;
+
+  block_expose();
+
+  if (mainw->laudio_drawable!=NULL) {
+    // check if a resize happened
+
+    width = lives_painter_image_surface_get_width (mainw->laudio_drawable);
+
+    if (width!=lives_widget_get_allocation_width(mainw->LiVES)) {
+      lives_painter_surface_destroy(mainw->laudio_drawable);
+      mainw->laudio_drawable=NULL;
+    }
+  }
+
+  if (mainw->laudio_drawable==NULL) {
+    mainw->laudio_drawable = lives_painter_surface_create_from_widget(mainw->laudio_draw,
+							       LIVES_PAINTER_CONTENT_COLOR,
+							       lives_widget_get_allocation_width(mainw->laudio_draw),
+							       lives_widget_get_allocation_height(mainw->laudio_draw));
+
+    block_expose();
+    get_play_times();
+    unblock_expose();
+
+    if (1||mainw->current_file==-1) mainw->blank_laudio_drawable=mainw->laudio_drawable;
+    else cfile->laudio_drawable=mainw->laudio_drawable;
+
+  }
+
+
+  if (mainw->current_file==-1) {
+    lives_painter_t *cr2=lives_painter_create(mainw->laudio_drawable);
+    lives_painter_set_source_to_bg(cr2,mainw->laudio_draw);
+    lives_painter_rectangle(cr2,0,0,
+		    lives_widget_get_allocation_width(mainw->laudio_draw),
+		    lives_widget_get_allocation_height(mainw->laudio_draw));
+    lives_painter_fill(cr2);
+    lives_painter_destroy(cr2);
+  }
+
+  lives_painter_set_source_surface (cr, mainw->laudio_drawable,0.,0.);
+  lives_painter_rectangle (cr,ex,ey,ew,eh);
+  lives_painter_paint(cr);
+
+  unblock_expose();
+}
+
+
+
+
+static void redraw_raudio(lives_painter_t *cr, int ex, int ey, int ew, int eh) {
+
+  int width;
+
+  block_expose();
+
+  if (mainw->raudio_drawable!=NULL) {
+    // check if a resize happened
+
+    width = lives_painter_image_surface_get_width (mainw->raudio_drawable);
+
+    if (width!=lives_widget_get_allocation_width(mainw->LiVES)) {
+      lives_painter_surface_destroy(mainw->raudio_drawable);
+      mainw->raudio_drawable=NULL;
+    }
+  }
+
+  if (mainw->raudio_drawable==NULL) {
+    mainw->raudio_drawable = lives_painter_surface_create_from_widget(mainw->raudio_draw,
+							       LIVES_PAINTER_CONTENT_COLOR,
+							       lives_widget_get_allocation_width(mainw->raudio_draw),
+							       lives_widget_get_allocation_height(mainw->raudio_draw));
+
+
+    block_expose();
+    get_play_times();
+    unblock_expose();
+  }
+
+  // TODO - *** 
+  if (mainw->current_file==-1) {
+    lives_painter_t *cr2=lives_painter_create(mainw->raudio_drawable);
+    lives_painter_set_source_to_bg(cr2,mainw->raudio_draw);
+
+    lives_painter_rectangle(cr2,0,0,
+		    lives_widget_get_allocation_width(mainw->raudio_draw),
+		    lives_widget_get_allocation_height(mainw->raudio_draw));
+    lives_painter_fill(cr2);
+    lives_painter_destroy(cr2);
+
+  }
+
+
+  lives_painter_set_source_surface (cr, mainw->raudio_drawable, 0., 0.);
+  lives_painter_rectangle (cr,ex,ey,ew,eh);
+  lives_painter_paint(cr);
+
+  if (1||mainw->current_file==-1) mainw->blank_raudio_drawable=mainw->raudio_drawable;
+  else cfile->raudio_drawable=mainw->raudio_drawable;
+
+  unblock_expose();
+}
+
+
+
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_laud_event (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  GdkEventExpose *event=NULL;
+  boolean need_cr=TRUE;
+#else
+boolean expose_laud_event (GtkWidget *widget, GdkEventExpose *event) {
+  lives_painter_t *cr;
+  boolean need_cr=TRUE;
+#endif
   gint ex,ey,ew,eh;
-  gint width;
+
+  if (mainw->recoverable_layout) return FALSE;
+
+  if (mainw->draw_blocked) return TRUE;
 
   if (!prefs->show_gui||mainw->multitrack!=NULL||
       (mainw->fs&&(prefs->play_monitor==prefs->gui_monitor||
@@ -8945,7 +9217,7 @@
     return FALSE;
   }
 
-  if (!mainw->is_ready||(event!=NULL&&event->count>0)) return TRUE;
+  if ((event!=NULL&&event->count>0)) return TRUE;
 
   if (event!=NULL) {
     ex=event->area.x;
@@ -8955,53 +9227,36 @@
   }
   else {
     ex=ey=0;
-    ew=mainw->laudio_draw->allocation.width;
-    eh=mainw->laudio_draw->allocation.height;
+    ew=lives_widget_get_allocation_width(mainw->laudio_draw);
+    eh=lives_widget_get_allocation_height(mainw->laudio_draw);
   }
 
-  block_expose();
+  if (need_cr) cr=lives_painter_create_from_widget(mainw->laudio_draw);
 
-  if (mainw->laudio_drawable!=NULL) {
-    gdk_drawable_get_size(GDK_DRAWABLE(mainw->laudio_drawable),&width,NULL);
-    if (width!=mainw->LiVES->allocation.width) {
-      gdk_drawable_unref(GDK_DRAWABLE(mainw->laudio_drawable));
-      mainw->laudio_drawable=NULL;
-    }
-  }
+  redraw_laudio(cr,ex,ey,ew,eh);
 
-  if (mainw->laudio_drawable==NULL) {
-    mainw->laudio_drawable = gdk_pixmap_new(mainw->laudio_draw->window,
-					    mainw->laudio_draw->allocation.width,
-					    mainw->laudio_draw->allocation.height,
-					    -1);
-    get_play_times();
-  }
-  
-  if (mainw->current_file==-1) {
-    gdk_draw_rectangle (mainw->laudio_drawable,
-                        mainw->laudio_draw->style->bg_gc[GTK_WIDGET_STATE (widget)],
-                        TRUE,
-                        0, 0,
-                        mainw->laudio_draw->allocation.width,
-                        mainw->laudio_draw->allocation.height
-                        );
-  }
-  gdk_draw_pixmap(widget->window,
-		  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-		  mainw->laudio_drawable,
-		  ex, ey,
-		  ex, ey,
-		  ew, eh);
+  if (need_cr) lives_painter_destroy(cr);
 
-  unblock_expose();
-  return FALSE;
+  return TRUE;
+  
 }
 
 
-gint
-expose_raud_event (GtkWidget *widget, GdkEventExpose *event) {
+
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_raud_event (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  GdkEventExpose *event=NULL;
+  boolean need_cr=FALSE;
+#else
+boolean expose_raud_event (GtkWidget *widget, GdkEventExpose *event) {
+  lives_painter_t *cr;
+  boolean need_cr=TRUE;
+#endif
   gint ex,ey,ew,eh;
-  gint width;
+
+  if (mainw->recoverable_layout) return FALSE;
+
+  if (mainw->draw_blocked) return TRUE;
 
   if (!prefs->show_gui||mainw->multitrack!=NULL||
       (mainw->fs&&(prefs->play_monitor==prefs->gui_monitor||
@@ -9011,7 +9266,7 @@
     return FALSE;
   }
 
-  if (!mainw->is_ready||(event!=NULL&&event->count>0)) return TRUE;
+  if ((event!=NULL&&event->count>0)) return TRUE;
 
   if (event!=NULL) {
     ex=event->area.x;
@@ -9021,63 +9276,42 @@
   }
   else {
     ex=ey=0;
-    ew=mainw->raudio_draw->allocation.width;
-    eh=mainw->raudio_draw->allocation.height;
+    ew=lives_widget_get_allocation_width(mainw->raudio_draw);
+    eh=lives_widget_get_allocation_height(mainw->raudio_draw);
   }
 
-  block_expose();
+  if (need_cr) cr=lives_painter_create_from_widget(mainw->raudio_draw);
 
-  if (mainw->raudio_drawable!=NULL) {
-    gdk_drawable_get_size(GDK_DRAWABLE(mainw->raudio_drawable),&width,NULL);
-    if (width!=mainw->LiVES->allocation.width) {
-      gdk_drawable_unref(GDK_DRAWABLE(mainw->raudio_drawable));
-      mainw->raudio_drawable=NULL;
-    }
-  }
+  redraw_raudio(cr,ex,ey,ew,eh);
 
-  if (mainw->raudio_drawable==NULL) {
-    mainw->raudio_drawable = gdk_pixmap_new(mainw->raudio_draw->window,
-					    mainw->raudio_draw->allocation.width,
-					    mainw->raudio_draw->allocation.height,
-					    -1);
-    get_play_times();
-  }
+  if (need_cr) lives_painter_destroy(cr);
 
-  if (mainw->current_file==-1) {
-    gdk_draw_rectangle (mainw->raudio_drawable,
-			mainw->raudio_draw->style->bg_gc[GTK_WIDGET_STATE (widget)],
-                        TRUE,
-                        0, 0,
-                        mainw->raudio_draw->allocation.width,
-                        mainw->raudio_draw->allocation.height
-                        );
-  }
-  gdk_draw_pixmap(widget->window,
-		  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-		  mainw->raudio_drawable,
-		  ex, ey,
-		  ex, ey,
-		  ew, eh);
+  return TRUE;
   
-  unblock_expose();
-  return FALSE;
 }
 
 
-gboolean config_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) {
+
+boolean config_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) {
+  int scr_width=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].width;
+  int scr_height=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].height;
 
   if (mainw->is_ready) {
-    if (mainw->gc==NULL) {
-      mainw->gc=gdk_gc_new (GDK_DRAWABLE (mainw->LiVES->window));
-      // this is nice, but it sets button text and entries too
-      //gdk_gc_set_rgb_fg_color (GDK_GC (mainw->LiVES->style->fg_gc[2]),&palette->black);
+    if (scr_width!=mainw->scr_width||scr_height!=mainw->scr_height) {
+      mainw->scr_width=scr_width;
+      mainw->scr_height=scr_height;
+      resize_widgets_for_monitor(FALSE);
     }
-    if (mainw->current_file>-1) {
+
+    if (mainw->current_file>-1&&!mainw->recoverable_layout) {
       get_play_times();
     }
   }
 
   if (!mainw->is_ready) {
+    mainw->scr_width=scr_width;
+    mainw->scr_height=scr_height;
+
     if (prefs->startup_interface==STARTUP_CE) {
 
 #ifdef ENABLE_JACK
@@ -9092,107 +9326,51 @@
 #endif
     }
     mainw->is_ready=TRUE;
+    if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
     resize(1);
   }
   return FALSE;
 }
 
 
-gint expose_play_window (GtkWidget *widget, GdkEventExpose *event) {
-  GdkRegion *reg;
-  GdkRectangle rect;
-  cairo_t *cr;
-
-  // only act on last event
-  if (event->count>0) {
-    return TRUE;
-  }
-
-  reg=event->region;
-
-  gdk_region_get_clipbox(reg,&rect);
-
-  if ((mainw->multitrack==NULL||mainw->multitrack->sepwin_pixbuf==NULL)&&
-      (mainw->current_file==-1||!cfile->is_loaded||(cfile->clip_type!=CLIP_TYPE_FILE&&
-						    cfile->clip_type!=CLIP_TYPE_DISK))&&mainw->imframe!=NULL) {
-    if (!mainw->pw_exp_is_blocked) g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=TRUE;
-    block_expose();
-
-    if (rect.width>lives_pixbuf_get_width(GDK_PIXBUF (mainw->imframe))) {
-      rect.width=lives_pixbuf_get_width(GDK_PIXBUF (mainw->imframe));
-    }
-    if (rect.height>lives_pixbuf_get_height(GDK_PIXBUF (mainw->imframe))) {
-      rect.height=lives_pixbuf_get_height(GDK_PIXBUF (mainw->imframe));
-    }
-
-    if (mainw->current_file>0&&cfile!=NULL&&
-	(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
-      if (mainw->camframe==NULL) {
-	GError *error=NULL;
-	gchar *tmp=g_strdup_printf("%s/%s/camera/frame.jpg",prefs->prefix_dir,THEME_DIR);
-	mainw->camframe=lives_pixbuf_new_from_file(tmp,&error);
-	if (mainw->camframe!=NULL) gdk_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
-	g_free(tmp);
-      }
-      
-      cr = gdk_cairo_create (mainw->play_window->window);
-      gdk_cairo_set_source_pixbuf (cr, GDK_PIXBUF(mainw->camframe), 0, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-    }
-    else {
-      cr = gdk_cairo_create (mainw->play_window->window);
-      gdk_cairo_set_source_pixbuf (cr, GDK_PIXBUF(mainw->imframe), 0, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-    }
-
-    unblock_expose();
-    g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=FALSE;
-  }
-  if (mainw->multitrack!=NULL&&mainw->multitrack->sepwin_pixbuf!=NULL) {
-    if (!mainw->pw_exp_is_blocked) g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=TRUE;
-    block_expose();
-    if (rect.width>lives_pixbuf_get_width(GDK_PIXBUF (mainw->multitrack->sepwin_pixbuf))) {
-      rect.width=lives_pixbuf_get_width(GDK_PIXBUF (mainw->multitrack->sepwin_pixbuf));
-    }
-    if (rect.height>lives_pixbuf_get_height(GDK_PIXBUF (mainw->multitrack->sepwin_pixbuf))) {
-      rect.height=lives_pixbuf_get_height(GDK_PIXBUF (mainw->multitrack->sepwin_pixbuf));
-    }
-    cr = gdk_cairo_create (mainw->play_window->window);
-    gdk_cairo_set_source_pixbuf (cr, GDK_PIXBUF(mainw->multitrack->sepwin_pixbuf), 0, 0);
-    cairo_paint (cr);
-    cairo_destroy (cr);
-    unblock_expose();
-    g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=FALSE;
-  }
-  return FALSE;
-}
-
-
-
-
 
 // these two really belong with the processing widget
 
 
 
 void on_effects_paused (GtkButton *button, gpointer user_data) {
-  gchar *com;
+  gchar *com=NULL;
   gint64 xticks;
+#ifdef IS_MINGW
+  int pid;
+#endif
 
   if (mainw->iochan!=NULL||cfile->opening) {
     // pause during encoding (if we start using mainw->iochan for other things, this will
     // need changing...)
 
     if (!mainw->effects_paused) {
-      // use effects_paused for this
-      com=g_strdup_printf("smogrify stopsubsub \"%s\" SIGTSTP 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+      com=g_strdup_printf("%s stopsubsub \"%s\" SIGTSTP 2>/dev/null",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE);
+#else
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+
+      // get pid from backend
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+
+      lives_win32_suspend_resume_process(pid,TRUE);
+#endif
+      g_free(com);
+      com=NULL;
+
       if (!cfile->opening) {
 	gtk_button_set_label(GTK_BUTTON(button),_ ("Resume"));
 	gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label2),_ ("\nPaused\n(click Resume to continue processing)"));
@@ -9201,8 +9379,26 @@
     }
 
     else {
-      com=g_strdup_printf("smogrify stopsubsub \"%s\" SIGCONT 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+      com=g_strdup_printf("%s stopsubsub \"%s\" SIGCONT 2>/dev/null",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE);
+#else
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+
+      // get pid from backend
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+
+      lives_win32_suspend_resume_process(pid,FALSE);
+#endif
+      g_free(com);
+      com=NULL;
 
       if (!cfile->opening) {
 	gtk_button_set_label(GTK_BUTTON(button),_ ("Pause"));
@@ -9211,6 +9407,7 @@
       }
     }
   }
+
   if (mainw->iochan==NULL) {
     // pause during effects processing
     gettimeofday(&tv, NULL);
@@ -9218,13 +9415,14 @@
     
     if (!mainw->effects_paused) {
       mainw->timeout_ticks-=xticks;
-      com=g_strdup_printf("smogrify pause \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s pause \"%s\"",prefs->backend_sync,cfile->handle);
       if (!mainw->preview) {
 	gtk_button_set_label(GTK_BUTTON(button),_ ("Resume"));
 	if (!cfile->nokeep) {
 	  if (!cfile->opening) gtk_button_set_label(GTK_BUTTON(cfile->proc_ptr->cancel_button),_ ("Keep"));
 	  else gtk_button_set_label(GTK_BUTTON(cfile->proc_ptr->cancel_button),_ ("Enough"));
-	  gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label2),_ ("\nPaused\n(click Keep to keep what you have and stop)\n(click Resume to continue processing)"));
+	  gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label2),
+			     _ ("\nPaused\n(click Keep to keep what you have and stop)\n(click Resume to continue processing)"));
 	}
 	d_print(_ ("paused..."));
       }
@@ -9234,7 +9432,7 @@
 #endif
     } else {
       mainw->timeout_ticks+=xticks;
-      com=g_strdup_printf("smogrify resume \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
       if (!mainw->preview) {
 	if (cfile->opening) gtk_button_set_label(GTK_BUTTON(button),_ ("Pause/_Enough"));
 	else gtk_button_set_label(GTK_BUTTON(button),_ ("Pause"));
@@ -9256,8 +9454,9 @@
       lives_system(com,FALSE);
     }
   }
-  g_free(com);
+  if (com!=NULL) g_free(com);
   mainw->effects_paused=!mainw->effects_paused;
+
 }
 
 
@@ -9283,7 +9482,8 @@
   gint64 xticks;
   gint current_file=mainw->current_file;
   weed_plant_t *filter_map=mainw->filter_map; // back this up in case we are rendering
-
+  weed_plant_t *afilter_map=mainw->afilter_map; // back this up in case we are rendering
+  weed_plant_t *audio_event=mainw->audio_event;
 
   if (in_preview_func) {
     // this is a special value of cancel - don't propogate it to "open"
@@ -9310,9 +9510,9 @@
     if (cfile->opening) {
       // set vid player to int, and audio player to sox
       
-      if (prefs->audio_player==AUD_PLAYER_MPLAYER) {
+      /*      if (prefs->audio_player==AUD_PLAYER_MPLAYER) {
 	switch_aud_to_sox(FALSE);
-      }
+	}*/
       if (!cfile->opening_only_audio) {
 	mainw->toy_type=LIVES_TOY_NONE;
 	gtk_widget_set_sensitive(mainw->toys,FALSE);
@@ -9321,8 +9521,6 @@
 
       if (mainw->multitrack==NULL&&!cfile->is_loaded) {
 	if (mainw->play_window!=NULL) {
-	  if (!mainw->pw_exp_is_blocked) g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	  mainw->pw_exp_is_blocked=TRUE;
 	  cfile->is_loaded=TRUE;
 	  resize_play_window();
 	  cfile->is_loaded=FALSE;
@@ -9343,8 +9541,6 @@
     if (user_data!=NULL) {
       // called from multitrack
       if (mainw->play_window!=NULL) {
-	if (!mainw->pw_exp_is_blocked) g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	mainw->pw_exp_is_blocked=TRUE;
 	resize_play_window();
       }
       if (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering) {
@@ -9454,13 +9650,6 @@
 	    gtk_widget_set_sensitive (mainw->files[i]->menuentry, TRUE);
 	    }}}*/
       if (mainw->play_window!=NULL) {
-	if (!cfile->opening_audio) {
-	  g_signal_handlers_block_matched(mainw->play_window,
-					  (GSignalMatchType)(G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_UNBLOCKED),
-					  0,0,0,(gpointer)expose_play_window,NULL);
-	  if (mainw->pw_exp_is_blocked) g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-	  mainw->pw_exp_is_blocked=FALSE;
-	}
 	resize_play_window();
       }
     }
@@ -9484,7 +9673,7 @@
     // this prevents a hang when the separate window is visible
     // it may be the first time we have shown it
     block_expose();
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     unblock_expose();
     gtk_widget_queue_draw (mainw->LiVES);
   }
@@ -9492,6 +9681,8 @@
   xticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
   mainw->timeout_ticks+=xticks;
   mainw->filter_map=filter_map;
+  mainw->afilter_map=afilter_map;
+  mainw->audio_event=audio_event;
 
   if (mainw->multitrack!=NULL) {
     current_file=mainw->current_file;
@@ -9523,23 +9714,27 @@
   if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
 #ifdef ENABLE_JACK
     if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->jackd->playing_file==mainw->current_file&&
-	!(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO))) {
+	!(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
       
       mainw->jackd->sample_in_rate=cfile->arate*cfile->pb_fps/cfile->fps;
-      mainw->rec_aclip=mainw->current_file;
-      mainw->rec_avel=cfile->pb_fps/cfile->fps;
-      mainw->rec_aseek=(gdouble)mainw->jackd->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(FALSE)) {
+	mainw->rec_aclip=mainw->current_file;
+	mainw->rec_avel=cfile->pb_fps/cfile->fps;
+	mainw->rec_aseek=(gdouble)mainw->jackd->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      }
     }
 #endif
 
 #ifdef HAVE_PULSE_AUDIO
     if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==mainw->current_file&&
-      !(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO))) {
+      !(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
 
       mainw->pulsed->in_arate=cfile->arate*cfile->pb_fps/cfile->fps;
-      mainw->rec_aclip=mainw->current_file;
-      mainw->rec_avel=cfile->pb_fps/cfile->fps;
-      mainw->rec_aseek=(gdouble)mainw->pulsed->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(FALSE)) {
+	mainw->rec_aclip=mainw->current_file;
+	mainw->rec_avel=cfile->pb_fps/cfile->fps;
+	mainw->rec_aseek=(gdouble)mainw->pulsed->seek_pos/(gdouble)(cfile->arate*cfile->achans*cfile->asampsize/8);
+      }
     }
 #endif
   }
@@ -9567,22 +9762,16 @@
 
   if (!prefs->mouse_scroll_clips||mainw->noswitch) return FALSE;
 
-  if (!gtk_window_has_toplevel_focus(GTK_WINDOW(mainw->LiVES))&&
-      ((mainw->multitrack!=NULL&&!(widget==mainw->multitrack->clip_scroll))||
-       (mainw->multitrack==NULL&&mainw->playing_file==-1
-	&&(mainw->play_window==NULL||!gtk_window_is_active(GTK_WINDOW(mainw->play_window)))))) return FALSE;
-  
   if (mainw->multitrack!=NULL) {
     if (event->direction==GDK_SCROLL_UP) mt_prevclip(NULL,NULL,0,(GdkModifierType)0,user_data);
     else if (event->direction==GDK_SCROLL_DOWN) mt_nextclip(NULL,NULL,0,(GdkModifierType)0,user_data);
     return FALSE;
   }
 
-
   kstate=event->state;
 
-  if (kstate==GDK_SHIFT_MASK) type=2; // bg
-  else if (kstate==GDK_CONTROL_MASK) type=0; // fg or bg
+  if (kstate==LIVES_SHIFT_MASK) type=2; // bg
+  else if (kstate==LIVES_CONTROL_MASK) type=0; // fg or bg
 
   if (event->direction==GDK_SCROLL_UP) prevclip_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(type));
   else if (event->direction==GDK_SCROLL_DOWN) nextclip_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(type));
@@ -9600,31 +9789,32 @@
   if (mainw->current_file>-1&&mainw->sel_start>0) {
     gint x,sel_current;
 
-    gdk_window_get_pointer(GDK_WINDOW (mainw->LiVES->window), &x, NULL, NULL);
+    lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			     mainw->LiVES, &x, NULL);
 
     if (mainw->sel_move==SEL_MOVE_AUTO) 
       sel_current=calc_frame_from_time3(mainw->current_file,
-					(gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+					(gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
     else
       sel_current=calc_frame_from_time(mainw->current_file,
-				       (gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+				       (gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
 
 
     if (mainw->sel_move==SEL_MOVE_SINGLE) {
       sel_current=calc_frame_from_time3(mainw->current_file,
-					(gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+					(gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),sel_current);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),sel_current);
     }
 
     if (mainw->sel_move==SEL_MOVE_START||(mainw->sel_move==SEL_MOVE_AUTO&&sel_current<mainw->sel_start)) {
       sel_current=calc_frame_from_time(mainw->current_file,
-				       (gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+				       (gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),sel_current);
     }
     else if (mainw->sel_move==SEL_MOVE_END||(mainw->sel_move==SEL_MOVE_AUTO&&sel_current>mainw->sel_start)) {
       sel_current=calc_frame_from_time2(mainw->current_file,
-					(gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+					(gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),sel_current-1);
     }
   }
@@ -9655,15 +9845,16 @@
   gint x;
   if (mainw->current_file<=0) return FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (mainw->LiVES->window), &x, NULL, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mainw->LiVES, &x, NULL);
 
   mainw->sel_start=calc_frame_from_time(mainw->current_file,
-					(gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+					(gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
 
   
   if (event->button==3&&!mainw->selwidth_locked) {
     mainw->sel_start=calc_frame_from_time3(mainw->current_file,
-					   (gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+					   (gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start);
     mainw->sel_move=SEL_MOVE_AUTO;
@@ -9672,7 +9863,7 @@
   else {
     if (event->button==2&&!mainw->selwidth_locked) {
       mainw->sel_start=calc_frame_from_time3(mainw->current_file,
-					     (gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+					     (gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),(gint)mainw->sel_start);
       mainw->sel_move=SEL_MOVE_SINGLE;
@@ -9687,7 +9878,7 @@
 	}
 	else {
 	  mainw->sel_start=calc_frame_from_time2(mainw->current_file,
-						 (gdouble)x/(gdouble)mainw->vidbar->allocation.width*cfile->total_time);
+						 (gdouble)x/(gdouble)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
 	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start-1);
 	  mainw->sel_move=SEL_MOVE_END;
 	}
@@ -9728,14 +9919,14 @@
   return FALSE;
 }
 
-gboolean
-on_hrule_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
-  GdkCursor *cursor;
-  cursor=gdk_cursor_new_for_display (gdk_display_get_default(), GDK_CENTER_PTR);
-  gdk_window_set_cursor (widget->window, cursor);
+
+boolean on_hrule_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
+  if (mainw->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
+  lives_set_cursor_style(LIVES_CURSOR_CENTER_PTR,widget);
   return FALSE;
 }
 
+
 gboolean
 on_hrule_update           (GtkWidget       *widget,
 			   GdkEventMotion  *event,
@@ -9743,14 +9934,17 @@
   gint x;
   if (mainw->current_file<=0) return FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (mainw->LiVES->window), &x, NULL, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mainw->LiVES, &x, NULL);
   if (x<0) x=0;
 
   // figure out where ptr should be even when > cfile->frames
-  if ((GTK_RULER (mainw->hruler)->position=cfile->pointer_time=
+  
+  if ((lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=
        calc_time_from_frame(mainw->current_file,calc_frame_from_time
-			    (mainw->current_file,(gdouble)x/mainw->vidbar->allocation.width*cfile->total_time)))<=0.) 
-    GTK_RULER (mainw->hruler)->position=cfile->pointer_time=(gdouble)x/mainw->vidbar->allocation.width*cfile->total_time;
+			    (mainw->current_file,(gdouble)x/lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time)))))<=0.) 
+    lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=(gdouble)x/
+						       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
   gtk_widget_queue_draw (mainw->hruler);
   get_play_times();
   return FALSE;
@@ -9766,13 +9960,15 @@
   gint x;
   if (mainw->current_file<=0) return FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (mainw->LiVES->window), &x, NULL, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mainw->LiVES, &x, NULL);
   if (x<0) x=0;
-  if ((GTK_RULER (mainw->hruler)->position=cfile->pointer_time=
+  if ((lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=
        calc_time_from_frame(mainw->current_file,
 			    calc_frame_from_time(mainw->current_file,(gdouble)x/
-						 mainw->vidbar->allocation.width*cfile->total_time)))<=0.) 
-    GTK_RULER (mainw->hruler)->position=cfile->pointer_time=(gdouble)x/mainw->vidbar->allocation.width*cfile->total_time;
+						 lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time)))))<=0.) 
+    lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=(gdouble)x/
+						       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
 
   if (!mainw->hrule_blocked) {
     g_signal_handler_block (mainw->eventbox5,mainw->hrule_func);
@@ -9806,21 +10002,33 @@
 			gpointer         user_data)
 {
   // button press
-  gint x;
+  int x;
+  int frame;
+
   if (mainw->current_file<=0) return FALSE;
-  gdk_window_get_pointer(GDK_WINDOW (mainw->LiVES->window), &x, NULL, NULL);
+
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mainw->LiVES, &x, NULL);
   if (x<0) x=0;
-  if ((GTK_RULER (mainw->hruler)->position=cfile->pointer_time=
-       calc_time_from_frame(mainw->current_file,calc_frame_from_time(mainw->current_file,
-								     (gdouble)x/mainw->vidbar->allocation.width*
-								     cfile->total_time)))<=0.) 
-    GTK_RULER (mainw->hruler)->position=cfile->pointer_time=(gdouble)x/mainw->vidbar->allocation.width*cfile->total_time;
+
+  frame=calc_frame_from_time(mainw->current_file,(double)x/lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+
+  if ((lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=
+							  calc_time_from_frame(mainw->current_file,frame))))<=0.)
+    lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=(gdouble)x/
+						       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
   gtk_widget_queue_draw (mainw->hruler);
   get_play_times();
   if (mainw->hrule_blocked) {
     g_signal_handler_unblock (mainw->eventbox5,mainw->hrule_func);
     mainw->hrule_blocked=FALSE;
   }
+
+  if (mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded) {
+    if (mainw->prv_link==PRV_PTR&&mainw->preview_frame!=frame)
+      load_preview_image(FALSE);
+  }
+
   return FALSE;
 }
 
@@ -9863,7 +10071,7 @@
   gtk_menu_set_title (GTK_MENU(menu),_("LiVES: Selected frame"));
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   if (cfile->frames>0||mainw->multitrack!=NULL) {
@@ -10186,9 +10394,8 @@
   gint response;
   gdouble rec_end_time=-1.;
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
-#ifndef USE_X11
+#if !GTK_CHECK_VERSION(3,0,0)
+#ifndef GDK_WINDOWING_X11
   do_blocking_error_dialog(_("\n\nThis function will only work with X11.\nPlease send a patch to get it working on other platforms.\n\n"));
   return;
 #endif
@@ -10238,10 +10445,10 @@
     mainw->rec_achans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
     mainw->rec_asamps=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
   
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       mainw->rec_signed_endian=AFORM_UNSIGNED;
     }
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
       mainw->rec_signed_endian|=AFORM_BIG_ENDIAN;
     }
   }
@@ -10251,7 +10458,7 @@
 
   mainw->rec_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(resaudw->fps_spinbutton));
 
-  if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->unlim_radiobutton))) {
+  if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton))) {
     rec_end_time=(gtk_spin_button_get_value(GTK_SPIN_BUTTON(resaudw->hour_spinbutton))*60.
 		  +gtk_spin_button_get_value(GTK_SPIN_BUTTON(resaudw->minute_spinbutton)))*60.
       +gtk_spin_button_get_value(GTK_SPIN_BUTTON(resaudw->second_spinbutton));
@@ -10260,7 +10467,7 @@
   else mainw->rec_vid_frames=-1;
 
   gtk_widget_destroy (resaudw->dialog);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   if (resaudw!=NULL) g_free(resaudw);
   resaudw=NULL;
   
@@ -10298,7 +10505,7 @@
   // an example of using 'get_temp_handle()' ////////
   if (!get_temp_handle(mainw->first_free_file,TRUE)) {
     if (prefs->show_gui) gtk_widget_show(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     if (mainw->multitrack!=NULL) {
       mt_sensitise(mainw->multitrack);
       mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
@@ -10306,14 +10513,14 @@
     return;
   }
 
-  com=g_strdup_printf("smogrify get_window_id \"%s\"",cfile->handle);
+  com=g_strdup_printf("%s get_window_id \"%s\"",prefs->backend,cfile->handle);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   g_free(com);
 
   if (mainw->com_failed) {
     if (prefs->show_gui) gtk_widget_show(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     if (mainw->multitrack!=NULL) {
       mt_sensitise(mainw->multitrack);
       mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
@@ -10325,7 +10532,7 @@
 
   if (get_token_count(mainw->msg,'|')<6) {
     if (prefs->show_gui) gtk_widget_show(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     if (mainw->multitrack!=NULL) {
       mt_sensitise(mainw->multitrack);
       mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
@@ -10333,15 +10540,19 @@
     return;
   }
 
-  array=g_strsplit(mainw->msg,"|",5);
-  mainw->foreign_id=atoi(array[1]);
+  array=g_strsplit(mainw->msg,"|",-1);
+#if GTK_CHECK_VERSION(3,0,0)
+  mainw->foreign_id=(Window)atoi(array[1]);
+#else
+  mainw->foreign_id=(GdkNativeWindow)atoi(array[1]);
+#endif
   mainw->foreign_width=atoi(array[2]);
   mainw->foreign_height=atoi(array[3]);
   mainw->foreign_bpp=atoi(array[4]);
   mainw->foreign_visual=g_strdup(array[5]);
   g_strfreev(array);
 
-  com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
+  com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
   lives_system(com,TRUE);
   g_free(com);
   g_free(cfile);
@@ -10357,13 +10568,13 @@
   g_free (msg);
 
   // start another copy of LiVES and wait for it to return values
-  com=g_strdup_printf("%s -capture %d %u %d %d \"%s\" %d %d %.4f %d %d %d %d",capable->myname_full,getpid(),
-		      mainw->foreign_id,mainw->foreign_width,mainw->foreign_height,prefs->image_ext,
+  com=g_strdup_printf("%s -capture %d %u %d %d %s %d %d %.4f %d %d %d %d \"%s\"",capable->myname_full,getpid(),
+		      (unsigned int)mainw->foreign_id,mainw->foreign_width,mainw->foreign_height,prefs->image_ext,
 		      mainw->foreign_bpp,mainw->rec_vid_frames,mainw->rec_fps,mainw->rec_arate,
-		      mainw->rec_asamps,mainw->rec_achans,mainw->rec_signed_endian);
+		      mainw->rec_asamps,mainw->rec_achans,mainw->rec_signed_endian,mainw->foreign_visual);
 
   // force the dialog to disappear
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   lives_system(com,FALSE);
 
@@ -10373,7 +10584,7 @@
   }
 
   mainw->noswitch=TRUE;
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   mainw->noswitch=FALSE;
 
   if (!after_foreign_play()&&mainw->cancelled==CANCEL_NONE) {
@@ -10393,11 +10604,22 @@
 
 void on_capture2_activate(void) {
   // this is in the second copy of lives, we are now going to grab frames from the X window
-  int capture_fd;
-  gchar *capfile=g_strdup_printf("%s/.capture.%d",prefs->tmpdir,mainw->foreign_key);
-  int i;
+  gchar *capfilename=g_strdup_printf(".capture.%d",mainw->foreign_key);
+  gchar *capfile=g_build_filename(prefs->tmpdir,capfilename,NULL);
+
   gchar buf[32];
-  prepare_to_play_foreign();
+
+  boolean retval;
+  int capture_fd;
+  register int i;
+
+
+  retval=prepare_to_play_foreign();
+
+  if (mainw->foreign_visual!=NULL) g_free(mainw->foreign_visual);
+
+  if (!retval) exit (2);
+
   mainw->record_foreign=TRUE;  // for now...
 
   play_file();
@@ -10417,7 +10639,9 @@
     lives_write(capture_fd,buf,strlen (buf),TRUE);
     lives_write(capture_fd,"|",1,TRUE);
   }
+
   close(capture_fd);
+  g_free(capfilename);
   g_free(capfile);
   exit(0);
 
@@ -10438,14 +10662,15 @@
   render_details *rdet = (render_details *)user_data;
 
   if (rdet == NULL){
-      new_fmt = g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(prefsw->ofmt_combo)));
+      new_fmt = lives_combo_get_active_text(LIVES_COMBO(prefsw->ofmt_combo));
   }
   else{
-      new_fmt = g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(rdet->ofmt_combo)));
+      new_fmt = lives_combo_get_active_text(LIVES_COMBO(rdet->ofmt_combo));
   }
 
-  if ( !strlen( new_fmt ) || !strcmp( new_fmt, mainw->any_string ) ){
-      return;
+  if ( !strlen( new_fmt ) || !strcmp( new_fmt, mainw->string_constants[LIVES_STRING_CONSTANT_ANY] ) ){
+    g_free(new_fmt);
+    return;
   }
 
   if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,future_prefs->encoder.name,"get_formats"))!=NULL) {
@@ -10459,19 +10684,11 @@
 	  if (prefsw!=NULL) {
 	    g_signal_handler_block(GTK_COMBO_BOX(prefsw->ofmt_combo), prefsw->encoder_ofmt_fn);
             gtk_combo_box_set_active(GTK_COMBO_BOX(prefsw->ofmt_combo), counter);
-
-	    // gtk_widget_queue_draw (GTK_COMBO(prefsw->ofmt_combo)->entry); FIXME: ???
-
 	    g_signal_handler_unblock(GTK_COMBO_BOX(prefsw->ofmt_combo), prefsw->encoder_ofmt_fn);
 	  }
 	  if (rdet!=NULL) {
 	    g_signal_handler_block(GTK_COMBO_BOX(rdet->ofmt_combo), rdet->encoder_ofmt_fn);
-
-            // TODO: switch to this line when rdet->ofmt_combo is gtk_combo_box
             gtk_combo_box_set_active(GTK_COMBO_BOX(rdet->ofmt_combo), counter);
-
-	    // gtk_widget_queue_draw (GTK_COMBO(rdet->ofmt_combo)->entry); FIXME: ???
-
 	    g_signal_handler_unblock(GTK_COMBO_BOX(rdet->ofmt_combo), rdet->encoder_ofmt_fn);
 	  }
 	  g_snprintf(future_prefs->encoder.of_name,51,"%s",array[0]);
@@ -10504,10 +10721,6 @@
     set_acodec_list_from_allowed(prefsw,rdet);
   }
   else {
-    if (rdet!=NULL){
-        // FIXME: what to hide ?
-        //gtk_widget_hide(gtk_widget_get_toplevel(GTK_COMBO(rdet->encoder_combo)->list));
-    }
     do_plugin_encoder_error(future_prefs->encoder.name);
   }
 }
@@ -10520,52 +10733,33 @@
 
 // TODO - move all this to audio.c
 
-void
-on_export_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
-
-  if (cfile->end>0&&!GPOINTER_TO_INT (user_data)) {
-    fileselection = create_fileselection (_ ("Export Selected Audio as..."),0,NULL);
-  }
-  else {
-    fileselection = create_fileselection (_ ("Export Audio as..."),0,NULL);
-  }
-
-  if (strlen(mainw->audio_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->audio_dir);
-  }
-  gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection), "*.wav");
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_ok_export_audio_clicked),
-		    user_data);
-  gtk_widget_show (fileselection);
-}
+void on_export_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
 
-
-void
-on_ok_export_audio_clicked                      (GtkButton *button,
-						 gpointer user_data)
-{
   gchar *com,*tmp;
   gint nrate=cfile->arps;
   gdouble start,end;
   gint asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
 
-  gchar *filename=g_filename_to_utf8 (gtk_file_selection_get_filename
-				      (GTK_FILE_SELECTION(gtk_widget_get_toplevel(GTK_WIDGET(button)))),-1,NULL,NULL,NULL);
+  gchar *filt[]={"*.wav",NULL};
+  gchar *filename,*file_name;
 
-  if (strrchr(filename,'.')==NULL) {
-    g_snprintf(file_name,PATH_MAX,"%s.wav",filename);
+  if (cfile->end>0&&!GPOINTER_TO_INT (user_data)) {
+    filename = choose_file (strlen(mainw->audio_dir)?mainw->audio_dir:NULL,NULL,
+			    filt,LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Export Selected Audio as..."),NULL);
   }
   else {
-    g_snprintf(file_name,PATH_MAX,"%s",filename);
+    filename = choose_file (strlen(mainw->audio_dir)?mainw->audio_dir:NULL,NULL,
+			    filt,LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Export Audio as..."),NULL);
   }
+
+  if (filename==NULL) return;
+  file_name=ensure_extension(filename,".wav");
   g_free (filename);
   
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
-
-  if (!check_file(file_name,TRUE)) return;
+  if (!check_file(file_name,FALSE)) {
+    g_free(file_name);
+    return;
+  }
 
   // warn if arps!=arate
   if ((prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_JACK||
@@ -10588,7 +10782,7 @@
 
   d_print (mainw->msg);
   
-  com=g_strdup_printf ("smogrify export_audio \"%s\" %.8f %.8f %d %d %d %d %d \"%s\"",cfile->handle,
+  com=g_strdup_printf ("%s export_audio \"%s\" %.8f %.8f %d %d %d %d %d \"%s\"",prefs->backend,cfile->handle,
 		       start,end,cfile->arps,cfile->achans,cfile->asampsize,asigned,nrate,
 		       (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)));
   g_free(tmp);
@@ -10599,6 +10793,7 @@
   g_free (com);
 
   if (mainw->com_failed) {
+    g_free(file_name);
     d_print_failed();
     return;
   }
@@ -10614,16 +10809,14 @@
   }
   else {
     d_print_done();
-    get_dirname (file_name);
     g_snprintf (mainw->audio_dir,PATH_MAX,"%s",file_name);
+    get_dirname (mainw->audio_dir);
   }
+  g_free(file_name);
 }
 
 
-void
-on_append_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  GtkWidget *fileselection;
-  
+void on_append_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
       (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
     if (!do_layout_alter_audio_warning()) {
@@ -10639,42 +10832,40 @@
     mainw->xlays=NULL;
   }
 
-  fileselection = create_fileselection (_ ("Append Audio File..."),2,NULL);
-  if (strlen(mainw->audio_dir)) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection), mainw->audio_dir);
-  }
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_ok_append_audio_clicked),NULL);
-  gtk_widget_show (fileselection);
+  choose_file_with_preview(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,_ ("LiVES: - Append Audio File"),5);
+
 }
 
 
 
 
-void
-on_ok_append_audio_clicked                      (GtkButton *button,
-						 GtkEntry *entry)
-{
-  gchar *com,*tmp;
+void on_ok_append_audio_clicked (GtkFileChooser *chooser, gpointer user_data) {
+
+  gchar *com,*tmp,*tmp2;
   gchar *a_type;
-  gint asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
-  gint aendian=!(cfile->signed_endian&AFORM_BIG_ENDIAN);
 
-  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(gtk_file_selection_get_filename
-							     (GTK_FILE_SELECTION(gtk_widget_get_toplevel
-										 (GTK_WIDGET(button)))),
+  int asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
+  int aendian=!(cfile->signed_endian&AFORM_BIG_ENDIAN);
+
+  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8((tmp2=gtk_file_chooser_get_filename(chooser)),
 							     -1,NULL,NULL,NULL)));
-  g_free(tmp);
+  g_free(tmp); g_free(tmp2);
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  end_fs_preview();
+  gtk_widget_destroy(GTK_WIDGET(chooser));
 
   gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   
   a_type=file_name+strlen(file_name)-3;
 
+  g_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
+  get_dirname(mainw->audio_dir);
+
   if (!g_ascii_strncasecmp(a_type,".it",2)||!g_ascii_strncasecmp(a_type,"mp3",3)||!g_ascii_strncasecmp(a_type,"ogg",3)||
       !g_ascii_strncasecmp(a_type,"wav",3)||!g_ascii_strncasecmp(a_type,"mod",3)||!g_ascii_strncasecmp(a_type,"xm",2)) {
-    com=g_strdup_printf ("smogrify append_audio \"%s\" \"%s\" %d %d %d %d %d \"%s\"",cfile->handle,a_type,cfile->arate,
+    com=g_strdup_printf ("%s append_audio \"%s\" \"%s\" %d %d %d %d %d \"%s\"",prefs->backend,cfile->handle,
+			 a_type,cfile->arate,
 			 cfile->achans,cfile->asampsize,asigned,aendian,
 			 (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)));
     g_free(tmp);
@@ -10697,12 +10888,12 @@
 
   if (!do_progress_dialog (TRUE, TRUE,_ ("Appending audio"))) {
     gtk_widget_queue_draw(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
     mainw->com_failed=FALSE;
     unlink (cfile->info_file);
-    com=g_strdup_printf ("smogrify cancel_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf ("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
     lives_system (com,FALSE);
     if (!mainw->com_failed) {
       do_auto_dialog(_("Cancelling"),0);
@@ -10721,8 +10912,8 @@
   }
   else {
     gtk_widget_queue_draw(mainw->LiVES);
-    while (g_main_context_iteration(NULL,FALSE));
-    com=g_strdup_printf ("smogrify commit_audio \"%s\"",cfile->handle);
+    lives_widget_context_update();
+    com=g_strdup_printf ("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
     mainw->com_failed=FALSE;
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
@@ -10756,15 +10947,16 @@
 
 
 
-void
-on_trim_audio_activate (GtkMenuItem     *menuitem,
-			gpointer         user_data)
-{
+void on_trim_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  // type 0 == trim selected
+  // type 1 == trim to play pointer
+
   gchar *com,*msg;
+
   gint type=GPOINTER_TO_INT (user_data);
 
-  gdouble start,end;
-  gboolean has_lmap_error=FALSE;
+  double start,end;
+  boolean has_lmap_error=FALSE;
 
   if (type==0) {
     start=calc_time_from_frame (mainw->current_file,cfile->start);
@@ -10775,7 +10967,6 @@
     end=cfile->pointer_time;
   }
 
-
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
     if (end<cfile->laudio_time&&(mainw->xlays=layout_audio_is_affected(mainw->current_file,end))!=NULL) {
       if (!do_warning_dialog
@@ -10810,11 +11001,16 @@
     mainw->xlays=NULL;
   }
 
-  msg=g_strdup_printf(_ ("Trimming audio from %.2f to %.2f seconds..."),start,end);
+  if (end>cfile->laudio_time&&end>cfile->raudio_time)
+    msg=g_strdup_printf(_ ("Padding audio to %.2f seconds..."),end);
+  else
+    msg=g_strdup_printf(_ ("Trimming audio from %.2f to %.2f seconds..."),start,end);
+
   d_print(msg);
   g_free(msg);
 
-  com=g_strdup_printf("smogrify trim_audio \"%s\" %.8f %.8f %d %d %d %d %d", cfile->handle, start, end, cfile->arate, 
+  com=g_strdup_printf("%s trim_audio \"%s\" %.8f %.8f %d %d %d %d %d",prefs->backend, cfile->handle, 
+		      start, end, cfile->arate, 
 		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
 		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
   unlink (cfile->info_file);
@@ -10854,16 +11050,16 @@
 
 
 
-void
-on_fade_audio_activate (GtkMenuItem     *menuitem,
-			gpointer         user_data) {
-
+void on_fade_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
   // type == 0 fade in
   // type == 1 fade out
-  gint type;
-  gdouble startt,endt,startv,endv,time=0.;
+
+  double startt,endt,startv,endv,time=0.;
   gchar *msg,*msg2,*utxt,*com;
-  gboolean has_lmap_error=FALSE;
+
+  boolean has_lmap_error=FALSE;
+  int alarm_handle;
+  int type;
 
   aud_dialog_t *aud_d=NULL;
 
@@ -10901,8 +11097,8 @@
     }
   }
   else {
-    cfile->undo2_dbl=startt=((gdouble)cfile->start-1.)/cfile->fps;
-    cfile->undo1_dbl=endt=(gdouble)cfile->end/cfile->fps;
+    cfile->undo2_dbl=startt=((double)cfile->start-1.)/cfile->fps;
+    cfile->undo1_dbl=endt=(double)cfile->end/cfile->fps;
   }
   
  
@@ -10949,18 +11145,20 @@
 
   desensitize();
   do_threaded_dialog(_("Fading audio..."),FALSE);
+  alarm_handle=lives_alarm_set(1);
 
   threaded_dialog_spin();
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   threaded_dialog_spin();
 
   if (!prefs->conserve_space) {
     mainw->error=FALSE;
-    com=g_strdup_printf("smogrify backup_audio \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
     lives_system(com,FALSE);
     g_free(com);
 
     if (mainw->error) {
+      lives_alarm_clear(alarm_handle);
       end_threaded_dialog();
       d_print_failed();
       return;
@@ -10969,7 +11167,13 @@
 
   aud_fade(mainw->current_file,startt,endt,startv,endv);
   audio_free_fnames();
-  sleep(1);
+
+  while (!lives_alarm_get(alarm_handle)) {
+    g_usleep(prefs->sleep_time);
+  }
+
+  lives_alarm_clear(alarm_handle);
+
   end_threaded_dialog();
   d_print_done();
 
@@ -11126,7 +11330,8 @@
     g_free(msg);
   }
 
-  com=g_strdup_printf("smogrify delete_audio \"%s\" %.8f %.8f %d %d %d", cfile->handle, start, end, cfile->arps, 
+  com=g_strdup_printf("%s delete_audio \"%s\" %.8f %.8f %d %d %d", prefs->backend, 
+		      cfile->handle, start, end, cfile->arps, 
 		      cfile->achans, cfile->asampsize);
   unlink (cfile->info_file);
   mainw->com_failed=FALSE;
@@ -11181,7 +11386,7 @@
 					  gpointer         user_data)
 {
   _resaudw *resaudw=(_resaudw *)user_data;  
-  if (gtk_toggle_button_get_active(togglebutton)) {
+  if (lives_toggle_button_get_active(togglebutton)) {
     gtk_widget_set_sensitive(resaudw->hour_spinbutton,TRUE);
     gtk_widget_set_sensitive(resaudw->minute_spinbutton,TRUE);
     gtk_widget_set_sensitive(resaudw->second_spinbutton,TRUE);
@@ -11296,7 +11501,7 @@
   cfile->achans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
   cfile->asampsize=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->unlim_radiobutton))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton))) {
     mainw->rec_end_time=-1.;
     mainw->rec_samples=-1;
   }
@@ -11307,10 +11512,10 @@
     mainw->rec_samples=mainw->rec_end_time*cfile->arate;
   }
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
     asigned=0;
   }
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
     aendian=0;
   }
 
@@ -11318,7 +11523,7 @@
 
   cfile->signed_endian=get_signed_endian(asigned,aendian);
   gtk_widget_destroy (resaudw->dialog);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   if (resaudw!=NULL) g_free(resaudw);
   resaudw=NULL;
 
@@ -11403,7 +11608,7 @@
   }
 
   mainw->cancelled=CANCEL_NONE;
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   
   if (type==1) {
     // set these again in case reget_afilesize() reset them
@@ -11421,7 +11626,7 @@
 
     if (!prefs->conserve_space) {
       mainw->error=FALSE;
-      com=g_strdup_printf("smogrify backup_audio \"%s\"",mainw->files[old_file]->handle);
+      com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
       lives_system(com,FALSE);
       g_free(com);
 
@@ -11454,7 +11659,7 @@
       
       if (!prefs->conserve_space&&type==1) {
 	// try to recover backup
-	com=g_strdup_printf("smogrify undo_audio \"%s\"",mainw->files[old_file]->handle);
+	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
 	lives_system(com,FALSE);
 	g_free(com);
 	backr=TRUE;
@@ -11463,9 +11668,11 @@
 
     if (mainw->read_failed) {
       do_read_failed_error_s(mainw->read_failed_file,NULL);
+      if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+      mainw->read_failed_file=NULL;
       if (!prefs->conserve_space&&type==1&&!backr) {
 	// try to recover backup
-	com=g_strdup_printf("smogrify undo_audio \"%s\"",mainw->files[old_file]->handle);
+	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
 	lives_system(com,FALSE);
 	g_free(com);
       }
@@ -11500,13 +11707,11 @@
 #endif
 }
 
-void
-on_ins_silence_activate (GtkMenuItem     *menuitem,
-			 gpointer         user_data)
-{
-  gdouble start=0,end=0;
+void on_ins_silence_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  double start=0,end=0;
   gchar *com,*msg;
-  gboolean has_lmap_error=FALSE;
+  boolean has_lmap_error=FALSE;
+  boolean has_new_audio=FALSE;
 
   if (menuitem==NULL) {
     // redo
@@ -11525,8 +11730,12 @@
     mainw->fx3_val=DEFAULT_AUDIO_SAMPS;
     mainw->fx4_val=mainw->endian;
     resaudw=create_resaudw(2,NULL,NULL);
-    gtk_widget_show (resaudw->dialog);
-    return;
+    if (gtk_dialog_run(GTK_DIALOG(resaudw->dialog))!=GTK_RESPONSE_OK) return;
+    if (mainw->error) {
+      mainw->error=FALSE;
+      return;
+    }
+    has_new_audio=TRUE;
   }
 
 
@@ -11540,6 +11749,7 @@
 	  g_list_free_strings(mainw->xlays);
 	  g_list_free(mainw->xlays);
 	  mainw->xlays=NULL;
+	  if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
 	  return;
 	}
 	add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,start,
@@ -11557,6 +11767,7 @@
 	g_list_free_strings(mainw->xlays);
 	g_list_free(mainw->xlays);
 	mainw->xlays=NULL;
+	if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
 	return;
       }
       add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,start,
@@ -11579,8 +11790,9 @@
   end*=(gdouble)cfile->arate/(gdouble)cfile->arps;
 
   // with_sound is 2 (audio only), therfore start, end, where, are in seconds. rate is -ve to indicate silence
-  com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d", cfile->handle, 
-		      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png", start, end-start, cfile->handle, -cfile->arps, 
+  com=g_strdup_printf("%s insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d", 
+		      prefs->backend, cfile->handle, 
+		      get_image_ext_for_type(cfile->img_type), start, end-start, cfile->handle, -cfile->arps, 
 		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
 		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
 
@@ -11591,6 +11803,7 @@
 
   if (mainw->com_failed) {
     d_print_failed();
+    if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
     return;
   }
 
@@ -11598,6 +11811,7 @@
 
   if (mainw->error) {
     d_print_failed();
+    if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
     return;
   }
 
@@ -11628,25 +11842,22 @@
 
 
 
-void
-on_ins_silence_details_clicked                      (GtkButton *button,
-						     GtkEntry *entry)
-{
+void on_ins_silence_details_clicked (GtkButton *button, gpointer user_data) {
   int asigned=1,aendian=1;
   gboolean bad_header=FALSE;
   
   cfile->arps=cfile->arate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
   cfile->achans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
   cfile->asampsize=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
     asigned=0;
   }
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
     aendian=0;
   }
   cfile->signed_endian=get_signed_endian(asigned,aendian);
   gtk_widget_destroy (resaudw->dialog);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   if (resaudw!=NULL) g_free(resaudw);
   resaudw=NULL;
   if (cfile->arate<=0) {
@@ -11662,9 +11873,10 @@
     if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
 
     if (bad_header) do_header_write_error(mainw->current_file);
+    mainw->error=TRUE;
     return;
   }
-  on_ins_silence_activate(GTK_MENU_ITEM(mainw->ins_silence),NULL);
+  mainw->error=FALSE;
 }
 
 
@@ -11681,7 +11893,7 @@
 
   clear_lmap_errors();
   save_layout_map(NULL,NULL,NULL,NULL);
-  if (close) on_cancel_button1_clicked(button,textwindow);
+  if (close) lives_general_button_clicked(button,textwindow);
   else {
     gtk_widget_queue_draw(gtk_widget_get_toplevel(GTK_WIDGET(button)));
     gtk_widget_set_sensitive(textwindow->clear_button,FALSE);
@@ -11697,7 +11909,7 @@
 
 void on_lerrors_delete_clicked (GtkButton *button, gpointer user_data) {
   gint num_maps=g_list_length(mainw->affected_layouts_map);
-  gchar *msg=g_strdup_printf(_("\nDelete %d layout(s)...are you sure ?\n"),num_maps);
+  gchar *msg=g_strdup_printf(P_("\nDelete %d layout...are you sure ?\n","\nDelete %d layouts...are you sure ?\n",num_maps),num_maps);
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {

LiVES-1.6.1.tar.bz2/src/callbacks.h -> LiVES-2.0.3.tar.bz2/src/callbacks.h Changed

@@ -1,6 +1,6 @@
 // callbacks.h
 // LiVES
-// (c) G. Finch <salsaman@xs4all.nl,salsaman@gmail.com> 2003 - 2012
+// (c) G. Finch <salsaman@gmail.com> 2003 - 2013
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -12,11 +12,6 @@
                                         GdkEvent        *event,
                                         gpointer         user_data);
 
-gboolean
-return_true                  (GtkWidget       *widget,
-			      GdkEvent        *event,
-			      gpointer         user_data);
-
 void
 on_open_activate                      (GtkMenuItem     *menuitem,
 				       gpointer         user_data);
@@ -146,10 +141,9 @@
                                         gpointer         user_data);
 
 void 
-on_encoder_entry_changed(GtkComboBox *combo, gpointer ptr);
+on_encoder_entry_changed(GtkComboBox *, gpointer ptr);
 
-void 
-on_vid_playback_plugin_changed (GtkEntry *vpp_entry, gpointer user_data);
+void on_vid_playback_plugin_changed (GtkEntry *vpp_entry, gpointer user_data);
 
 
 void
@@ -196,8 +190,12 @@
 on_ok_button1_clicked                  (GtkButton       *button,
                                         gpointer         user_data);
 
-void
-open_sel_range_activate                 (void);
+
+void on_ok_file_open_clicked(GtkFileChooser *, GSList *fnames);
+
+void on_ok_filesel_open_clicked (GtkFileChooser *, gpointer);
+
+void open_sel_range_activate (void);
 
 
 
@@ -218,18 +216,11 @@
 					      gpointer         user_data);
 
 
-void
-on_open_sel_ok_button_clicked                  (GtkButton       *button,
-                                        gpointer         user_data);
-
-
-void on_save_textview_clicked (GtkButton *button, gpointer user_data);
+void on_open_sel_ok_button_clicked (GtkButton *, gpointer user_data);
 
-void
-on_cancel_button1_clicked              (GtkButton       *button,
-                                        gpointer         user_data);
+void on_save_textview_clicked (GtkButton *, gpointer);
 
-gboolean on_cancel_button1_clicked_del(GtkWidget *widget, GdkEvent *event, gpointer user_data);
+void on_cancel_button1_clicked (GtkWidget *, gpointer data_to_free);
 
 
 void
@@ -279,10 +270,6 @@
 
 
 void
-on_general_button_clicked            (GtkButton       *button,
-				      gpointer         user_data);
-
-void
 on_details_button_clicked            (GtkButton       *button,
 				      gpointer         user_data);
 
@@ -307,28 +294,15 @@
 on_spinbutton_end_value_changed          (GtkSpinButton   *spinbutton,
 					  gpointer         user_data);
 
-void on_open_new_audio_clicked (GtkButton *, gpointer opt_filename);
-
-void on_load_audio_activate (GtkMenuItem *, gpointer user_data);
+void on_open_new_audio_clicked (GtkFileChooser *, gpointer opt_filename);
 
-void on_load_subs_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_load_audio_activate (GtkMenuItem *, gpointer);
 
-void on_save_subs_activate (GtkMenuItem *menuitem, gpointer entry_widget);
+void on_load_subs_activate (GtkMenuItem *, gpointer);
 
-void on_erase_subs_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_save_subs_activate (GtkMenuItem *, gpointer entry_widget);
 
-
-void
-on_xmms_play_audio_activate                  (GtkMenuItem     *menuitem,
-					      gpointer         user_data);
-
-void 
-on_xmms_ok_clicked                (GtkButton     *menuitem,
-					 gpointer         user_data);
-
-void 
-on_xmms_stop_audio_activate                (GtkMenuItem     *menuitem,
-					    gpointer         user_data);
+void on_erase_subs_activate (GtkMenuItem *, gpointer);
 
 
 void 
@@ -364,14 +338,24 @@
 on_spin_end_value_changed           (GtkSpinButton   *spinbutton,
 				       gpointer         user_data);
 
-gint
-expose_vid_event (GtkWidget *widget, GdkEventExpose *event);
 
-gint
-expose_laud_event (GtkWidget *widget, GdkEventExpose *event);
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_vid_event (GtkWidget *, lives_painter_t *cr, gpointer user_data);
+#else
+boolean expose_vid_event (GtkWidget *, GdkEventExpose *event);
+#endif
 
-gint
-expose_raud_event (GtkWidget *widget, GdkEventExpose *event);
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_laud_event (GtkWidget *, lives_painter_t *cr, gpointer user_data);
+#else
+boolean expose_laud_event (GtkWidget *, GdkEventExpose *event);
+#endif
+
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_raud_event (GtkWidget *, lives_painter_t *cr, gpointer user_data);
+#else
+boolean expose_raud_event (GtkWidget *, GdkEventExpose *event);
+#endif
 
 
 
@@ -383,7 +367,7 @@
 on_recent_activate                      (GtkMenuItem     *menuitem,
 					 gpointer         user_data);
 
-gboolean config_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data);
+boolean config_event (GtkWidget *, GdkEventConfigure *, gpointer);
 
 void
 changed_fps_during_pb           (GtkSpinButton   *spinbutton,
@@ -437,12 +421,9 @@
 on_forward_pressed (GtkButton *button,
 		   gpointer user_data);
 
-void
-on_capture_activate                (GtkMenuItem     *menuitem,
-				    gpointer         user_data);
+void on_capture_activate (GtkMenuItem *, gpointer user_data);
 
-void 
-on_capture2_activate(void);
+void on_capture2_activate(void);
 
 
 void
@@ -457,9 +438,8 @@
 frame_context           (GtkWidget       *widget,
 			  GdkEventButton  *event,
 			  gpointer         which);
-void
-on_fs_preview_clicked                  (GtkButton       *button,
-                                        gpointer         user_data);
+
+void on_fs_preview_clicked (GtkWidget *widget, gpointer user_data);
 
 
 void
@@ -470,35 +450,20 @@
 on_backup_activate                      (GtkMenuItem     *menuitem,
 					 gpointer         user_data);
 
-void
-on_backup_ok_clicked                  (GtkButton       *button,
-				       gpointer         user_data);
-
-void
-on_restore_ok_clicked                  (GtkButton       *button,
-				       gpointer         user_data);
-
-void
-on_xmms_ran_ok_clicked                  (GtkButton       *button,
-				       gpointer         user_data);
-
 
 void
 on_record_perf_activate                      (GtkMenuItem     *menuitem,
 					      gpointer         user_data);
 
-gboolean record_toggle_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
+gboolean record_toggle_callback (GtkAccelGroup *, GObject *, guint keyval, GdkModifierType mod, gpointer);
 
 
-gboolean fps_reset_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+gboolean fps_reset_callback (GtkAccelGroup *, GObject *, guint keyval, GdkModifierType mod, gpointer);
 
 
-gboolean mute_audio_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer);
+gboolean mute_audio_callback (GtkAccelGroup *, GObject *, guint keyval, GdkModifierType mod, gpointer);
 
 
-void
-on_xmms_random_audio_activate                (GtkMenuItem     *menuitem,
-					      gpointer         user_data);
 
 gboolean
 on_stop_activate_by_del                  (GtkWidget       *widget,
@@ -517,17 +482,10 @@
 					    gpointer         user_data);
 
 void
-on_filesel_simple_clicked                      (GtkButton *button,
-						GtkEntry *entry);
-void
 on_filesel_complex_clicked                      (GtkButton *button,
 						GtkEntry *entry);
 
 void
-on_filesel_simple_ok_clicked                      (GtkButton *button,
-						   GtkEntry *entry);
-
-void
 on_filesel_complex_ok_clicked                      (GtkButton *button,
 						   GtkEntry *entry);
 
@@ -538,9 +496,7 @@
 on_ok_export_audio_clicked                      (GtkButton *button,
 						 gpointer user_data);
 
-void
-on_append_audio_activate (GtkMenuItem     *menuitem,
-			  gpointer         user_data);
+void on_append_audio_activate (GtkMenuItem *, gpointer user_data);
 
 void
 on_menubar_activate_menuitem                    (GtkMenuItem     *menuitem,
@@ -562,23 +518,15 @@
 void
 on_recaudclip_ok_clicked                      (GtkButton *button,
 					       gpointer user_data);
-#ifdef HAVE_GTK_NICE_VERSION
-void
-on_volume_slider_value_changed           (GtkScaleButton   *sbutton,
-					  gpointer user_data);
+#if GTK_CHECK_VERSION(2,14,0)
+void on_volume_slider_value_changed (GtkScaleButton *, gpointer);
 #else
-void
-on_volume_slider_value_changed           (GtkRange   *slider,
-					  gpointer user_data);
+void on_volume_slider_value_changed (GtkRange *, gpointer);
 #endif
 
-void
-on_fade_audio_activate (GtkMenuItem     *menuitem,
-			  gpointer         user_data);
+void on_fade_audio_activate (GtkMenuItem *, gpointer user_data);
 
-void
-on_ok_append_audio_clicked                      (GtkButton *button,
-						 GtkEntry *entry);
+void on_ok_append_audio_clicked (GtkFileChooser *, gpointer);
 
 void
 on_resample_video_activate (GtkMenuItem     *menuitem,
@@ -588,9 +536,7 @@
 on_resample_vid_ok                  (GtkButton       *button,
 				  GtkEntry         *entry);
 
-void
-on_trim_audio_activate (GtkMenuItem     *menuitem,
-			gpointer         user_data);
+void on_trim_audio_activate (GtkMenuItem *, gpointer user_data);
 
 void
 on_resample_audio_activate (GtkMenuItem     *menuitem,
@@ -618,8 +564,7 @@
 on_sticky_activate               (GtkMenuItem     *menuitem,
 				  gpointer         user_data);
 
-void 
-on_resaudw_asamps_changed (GtkWidget *irrelevant, gpointer rubbish);
+void on_resaudw_asamps_changed (GtkWidget *, gpointer);
 
 
 void 
@@ -639,8 +584,7 @@
 on_show_messages_activate            (GtkMenuItem     *menuitem,
 				      gpointer         user_data);
 
-gboolean
-on_hrule_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
+gboolean on_hrule_enter (GtkWidget *, GdkEventCrossing *, gpointer);
 
 gboolean
 on_hrule_update           (GtkWidget       *widget,
@@ -683,35 +627,29 @@
 on_preview_spinbutton_changed          (GtkSpinButton   *spinbutton,
 					  gpointer         user_data);
 
-gboolean prevclip_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+gboolean prevclip_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer );
 
-gboolean nextclip_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+gboolean nextclip_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer );
 
-gboolean freeze_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+gboolean freeze_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer );
 
-gboolean storeclip_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+gboolean storeclip_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer );
 
-gboolean nervous_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+gboolean nervous_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer );
 
-gboolean show_sync_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer clip_number);
+gboolean show_sync_callback (GtkAccelGroup *, GObject *, guint keyval, GdkModifierType mod, gpointer clip_number);
 
-void on_save_set_activate (GtkMenuItem *, gpointer user_data);
+void on_save_set_activate (GtkMenuItem *, gpointer );
 
 void on_save_set_ok (void);
 
-void on_load_set_activate (GtkMenuItem *, gpointer user_data);
+void on_load_set_activate (GtkMenuItem *, gpointer );
 
 gboolean on_load_set_ok (GtkButton *, gpointer skip_threaded_dialog);
 
+void on_open_vcd_activate (GtkMenuItem *, gpointer int_type);
 
-void
-on_open_vcd_activate                      (GtkMenuItem     *menuitem,
-					   gpointer         user_data);
-
-
-void 
-on_load_vcd_ok_clicked                (GtkButton     *button,
-				       gpointer         user_data);
+void on_load_vcd_ok_clicked (GtkButton *, gpointer user_data);
 
 
 
@@ -728,9 +666,6 @@
 on_vj_reset_activate            (GtkMenuItem     *menuitem,
 				 gpointer         user_data);
 
-gint
-expose_play_window (GtkWidget *widget, GdkEventExpose *event);
-
 void
 on_prv_link_toggled                (GtkToggleButton *togglebutton,
 				    gpointer         user_data);
@@ -742,19 +677,14 @@
 on_ins_silence_activate (GtkMenuItem     *menuitem,
 			 gpointer         user_data);
 
-void
-on_ins_silence_details_clicked                      (GtkButton *button,
-						     GtkEntry *entry);
-
-
-void popup_lmap_errors(GtkMenuItem *, gpointer);
+void on_ins_silence_details_clicked (GtkButton *, gpointer);
 
 void on_lerrors_close_clicked (GtkButton *, gpointer);
 void on_lerrors_clear_clicked (GtkButton *, gpointer);
 void on_lerrors_delete_clicked (GtkButton *, gpointer);
 
-void drag_from_outside(GtkWidget *widget, GdkDragContext *dcon, gint x, gint y, 
-		       GtkSelectionData *data, guint info, guint time, gpointer user_data);
+void drag_from_outside(GtkWidget *, GdkDragContext *, gint x, gint y, 
+		       GtkSelectionData *, guint info, guint time, gpointer user_data);

LiVES-1.6.1.tar.bz2/src/colourspace.c -> LiVES-2.0.3.tar.bz2/src/colourspace.c Changed

@@ -1,6 +1,6 @@
 // colourspace.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -33,9 +33,6 @@
 #include <math.h>
 #ifdef USE_SWSCALE
 
-
-#define  __STDC_CONSTANT_MACROS
-#include <stdint.h>
 #include <libswscale/swscale.h>
 
 // for libweed-compat.h
@@ -73,14 +70,15 @@
 #ifdef USE_SWSCALE
 #define N_SWS_CTX 16
 
-gboolean swscale_ctx_list_inited=FALSE;
+boolean swscale_ctx_list_inited=FALSE;
 
 struct _swscale_ctx {
   int iwidth;
   int iheight;
   int width;
   int height;
-  int pixfmt;
+  enum PixelFormat ipixfmt;
+  enum PixelFormat opixfmt;
   int flags;
   struct SwsContext *ctx;
 };
@@ -113,12 +111,12 @@
 }
 
 static void
-lives_free_buffer (guchar *pixels, gpointer data)
+lives_free_buffer (uint8_t *pixels, gpointer data)
 {
   g_free (pixels);
 }
 
-LIVES_INLINE G_GNUC_CONST guchar CLAMP0255(gint32 a)
+LIVES_INLINE G_GNUC_CONST uint8_t CLAMP0255(int32_t a)
 {
   return a>255?255:(a<0)?0:a;
 }
@@ -126,107 +124,114 @@
 /* precomputed tables */
 
 // generic
-static gint *Y_R;
-static gint *Y_G;
-static gint *Y_B;
-static gint *Cb_R;
-static gint *Cb_G;
-static gint *Cb_B;
-static gint *Cr_R;
-static gint *Cr_G;
-static gint *Cr_B;
+static int *Y_R;
+static int *Y_G;
+static int *Y_B;
+static int *Cb_R;
+static int *Cb_G;
+static int *Cb_B;
+static int *Cr_R;
+static int *Cr_G;
+static int *Cr_B;
 
 
 // clamped Y'CbCr
-static gint Y_Rc[256];
-static gint Y_Gc[256];
-static gint Y_Bc[256];
-static gint Cb_Rc[256];
-static gint Cb_Gc[256];
-static gint Cb_Bc[256];
-static gint Cr_Rc[256];
-static gint Cr_Gc[256];
-static gint Cr_Bc[256];
+static int Y_Rc[256];
+static int Y_Gc[256];
+static int Y_Bc[256];
+static int Cb_Rc[256];
+static int Cb_Gc[256];
+static int Cb_Bc[256];
+static int Cr_Rc[256];
+static int Cr_Gc[256];
+static int Cr_Bc[256];
 
 
 // unclamped Y'CbCr
-static gint Y_Ru[256];
-static gint Y_Gu[256];
-static gint Y_Bu[256];
-static gint Cb_Ru[256];
-static gint Cb_Gu[256];
-static gint Cb_Bu[256];
-static gint Cr_Ru[256];
-static gint Cr_Gu[256];
-static gint Cr_Bu[256];
+static int Y_Ru[256];
+static int Y_Gu[256];
+static int Y_Bu[256];
+static int Cb_Ru[256];
+static int Cb_Gu[256];
+static int Cb_Bu[256];
+static int Cr_Ru[256];
+static int Cr_Gu[256];
+static int Cr_Bu[256];
 
 // clamped BT.701
-static gint HY_Rc[256];
-static gint HY_Gc[256];
-static gint HY_Bc[256];
-static gint HCb_Rc[256];
-static gint HCb_Gc[256];
-static gint HCb_Bc[256];
-static gint HCr_Rc[256];
-static gint HCr_Gc[256];
-static gint HCr_Bc[256];
+static int HY_Rc[256];
+static int HY_Gc[256];
+static int HY_Bc[256];
+static int HCb_Rc[256];
+static int HCb_Gc[256];
+static int HCb_Bc[256];
+static int HCr_Rc[256];
+static int HCr_Gc[256];
+static int HCr_Bc[256];
 
 
 // unclamped BT.701
-static gint HY_Ru[256];
-static gint HY_Gu[256];
-static gint HY_Bu[256];
-static gint HCb_Ru[256];
-static gint HCb_Gu[256];
-static gint HCb_Bu[256];
-static gint HCr_Ru[256];
-static gint HCr_Gu[256];
-static gint HCr_Bu[256];
+static int HY_Ru[256];
+static int HY_Gu[256];
+static int HY_Bu[256];
+static int HCb_Ru[256];
+static int HCb_Gu[256];
+static int HCb_Bu[256];
+static int HCr_Ru[256];
+static int HCr_Gu[256];
+static int HCr_Bu[256];
 
-static gint conv_RY_inited = 0;
+static boolean conv_RY_inited = FALSE;
 
 
 
 
 // generic
-static gint *RGB_Y;
-static gint *R_Cr;
-static gint *G_Cb;
-static gint *G_Cr;
-static gint *B_Cb;
+static int *RGB_Y;
+static int *R_Cr;
+static int *G_Cb;
+static int *G_Cr;
+static int *B_Cb;
 
 
 // clamped Y'CbCr
-static gint RGB_Yc[256];
-static gint R_Crc[256];
-static gint G_Cbc[256];
-static gint G_Crc[256];
-static gint B_Cbc[256];
+static int RGB_Yc[256];
+static int R_Crc[256];
+static int G_Cbc[256];
+static int G_Crc[256];
+static int B_Cbc[256];
 
 // unclamped Y'CbCr
-static gint RGB_Yu[256];
-static gint R_Cru[256];
-static gint G_Cbu[256];
-static gint G_Cru[256];
-static gint B_Cbu[256];
+static int RGB_Yu[256];
+static int R_Cru[256];
+static int G_Cbu[256];
+static int G_Cru[256];
+static int B_Cbu[256];
 
 // clamped BT.701
-static gint HRGB_Yc[256];
-static gint HR_Crc[256];
-static gint HG_Cbc[256];
-static gint HG_Crc[256];
-static gint HB_Cbc[256];
+static int HRGB_Yc[256];
+static int HR_Crc[256];
+static int HG_Cbc[256];
+static int HG_Crc[256];
+static int HB_Cbc[256];
+
+// unclamped BT.701
+static int HRGB_Yu[256];
+static int HR_Cru[256];
+static int HG_Cbu[256];
+static int HG_Cru[256];
+static int HB_Cbu[256];
 
-static gint conv_YR_inited = 0;
+static int conv_YR_inited = 0;
 
 
 static short min_Y,max_Y,min_UV,max_UV;
 
 
 // averaging
-static guchar *cavg;
-static guchar cavgc[256][256];
-static guchar cavgu[256][256];
+static uint8_t *cavg;
+static uint8_t cavgc[256][256];
+static uint8_t cavgu[256][256];
 static int avg_inited = 0;
 
 
@@ -244,25 +249,25 @@
 // clamping and subspace converters
 
 // generic
-static guchar *Y_to_Y;
-static guchar *U_to_U;
-static guchar *V_to_V;
+static uint8_t *Y_to_Y;
+static uint8_t *U_to_U;
+static uint8_t *V_to_V;
 
 // same subspace, clamped to unclamped
-static guchar Yclamped_to_Yunclamped[256];
-static guchar UVclamped_to_UVunclamped[256];
+static uint8_t Yclamped_to_Yunclamped[256];
+static uint8_t UVclamped_to_UVunclamped[256];
 
 
 // same subspace, unclamped to clamped
-static guchar Yunclamped_to_Yclamped[256];
-static guchar UVunclamped_to_UVclamped[256];
+static uint8_t Yunclamped_to_Yclamped[256];
+static uint8_t UVunclamped_to_UVclamped[256];
 
-static gint conv_YY_inited=0;
+static int conv_YY_inited=0;
 
 
 // gamma correction
 
-unsigned char gamma_lut[256];
+uint8_t gamma_lut[256];
 double current_gamma=-1.;
 
 /* Updates the gamma look-up-table. */
@@ -281,7 +286,7 @@
 
 
 static void init_RGB_to_YUV_tables(void) {
-  gint i;
+  register int i;
 
   // Digital Y'UV proper [ITU-R BT.601-5] for digital NTSC
   // uses Kr = 0.299 and Kb = 0.114
@@ -293,51 +298,51 @@
 
 
   for (i = 0; i < 256; i++) {
-    Y_Rc[i] = myround(0.299 * (gdouble)i 
+    Y_Rc[i] = myround(0.299 * (double)i 
 		      * 219./255. * (1<<FP_BITS));   // Kr 
-    Y_Gc[i] = myround(0.587 * (gdouble)i 
+    Y_Gc[i] = myround(0.587 * (double)i 
 		      * 219./255. * (1<<FP_BITS));   // Kb
-    Y_Bc[i] = myround((0.114 * (gdouble)i 
+    Y_Bc[i] = myround((0.114 * (double)i 
 		       // here we add the 16 which goes into all components
 		       * 219./255. + 16.) * (1<<FP_BITS));
 
-    Cb_Bc[i] = myround(-0.168736 * (gdouble)i 
+    Cb_Bc[i] = myround(-0.168736 * (double)i 
 		       * 224./255. * (1<<FP_BITS));
-    Cb_Gc[i] = myround(-0.331264 * (gdouble)i 
+    Cb_Gc[i] = myround(-0.331264 * (double)i 
 		       * 224./255. * (1<<FP_BITS));
-    Cb_Rc[i] = myround((0.500 * (gdouble)i 
+    Cb_Rc[i] = myround((0.500 * (double)i 
 			* 224./255. + 128.) * (1<<FP_BITS));
     
-    Cr_Bc[i] = myround(0.500 * (gdouble)i 
+    Cr_Bc[i] = myround(0.500 * (double)i 
 		       * 224./255. * (1<<FP_BITS));
-    Cr_Gc[i] = myround(-0.418688 * (gdouble)i 
+    Cr_Gc[i] = myround(-0.418688 * (double)i 
 		       * 224./255. * (1<<FP_BITS));
-    Cr_Rc[i] = myround((-0.081312 * (gdouble)i 
+    Cr_Rc[i] = myround((-0.081312 * (double)i 
 			* 224./255. + 128.) * (1<<FP_BITS));
   }
 
 
   for (i = 0; i < 256; i++) {
-    Y_Ru[i] = myround(0.299 * (gdouble)i
+    Y_Ru[i] = myround(0.299 * (double)i
 		      * (1<<FP_BITS));
-    Y_Gu[i] = myround(0.587 * (gdouble)i 
+    Y_Gu[i] = myround(0.587 * (double)i 
 		      * (1<<FP_BITS));
-    Y_Bu[i] = myround(0.114 * (gdouble)i 
+    Y_Bu[i] = myround(0.114 * (double)i 
                       * (1<<FP_BITS));
 
     
-    Cb_Bu[i] = myround(-0.168736 * (gdouble)i 
+    Cb_Bu[i] = myround(-0.168736 * (double)i 
 		       * (1<<FP_BITS));
-    Cb_Gu[i] = myround(-0.331264 * (gdouble)i 
+    Cb_Gu[i] = myround(-0.331264 * (double)i 
 		       * (1<<FP_BITS));
-    Cb_Ru[i] = myround((0.500 * (gdouble)i
+    Cb_Ru[i] = myround((0.500 * (double)i
 			+ 128.) * (1<<FP_BITS));
 
-    Cr_Bu[i] = myround(0.500 * (gdouble)i
+    Cr_Bu[i] = myround(0.500 * (double)i
 		       * (1<<FP_BITS));
-    Cr_Gu[i] = myround(-0.418688 * (gdouble)i 
+    Cr_Gu[i] = myround(-0.418688 * (double)i 
 		       * (1<<FP_BITS));
-    Cr_Ru[i] = myround((-0.081312 * (gdouble)i 
+    Cr_Ru[i] = myround((-0.081312 * (double)i 
 			+ 128.) * (1<<FP_BITS));
   }
 
@@ -353,68 +358,62 @@
 
 
   for (i = 0; i < 256; i++) {
-    HY_Rc[i] = myround(0.183 * (gdouble)i 
+    HY_Rc[i] = myround(0.183 * (double)i 
 		       * (1<<FP_BITS));   // Kr 
-    HY_Gc[i] = myround(0.614 * (gdouble)i 
+    HY_Gc[i] = myround(0.614 * (double)i 
 		       * (1<<FP_BITS));   // Kb
-    HY_Bc[i] = myround((0.062 * (gdouble)i 
+    HY_Bc[i] = myround((0.062 * (double)i 
 			// here we add the 16 which goes into all components
 		        + 16.) * (1<<FP_BITS));
 
-    HCb_Bc[i] = myround(-0.101 * (gdouble)i 
+    HCb_Bc[i] = myround(-0.101 * (double)i 
 		        * (1<<FP_BITS));
-    HCb_Gc[i] = myround(-0.339 * (gdouble)i 
+    HCb_Gc[i] = myround(-0.339 * (double)i 
 			* (1<<FP_BITS));
-    HCb_Rc[i] = myround((0.439 * (gdouble)i 
+    HCb_Rc[i] = myround((0.439 * (double)i 
 			 + 128.) * (1<<FP_BITS));
     
-    HCr_Bc[i] = myround(0.439 * (gdouble)i 
+    HCr_Bc[i] = myround(0.439 * (double)i 
 			* (1<<FP_BITS));
-    HCr_Gc[i] = myround(-0.399 * (gdouble)i 
+    HCr_Gc[i] = myround(-0.399 * (double)i 
 			* (1<<FP_BITS));
-    HCr_Rc[i] = myround((-0.040 * (gdouble)i 
+    HCr_Rc[i] = myround((-0.040 * (double)i 
 			 + 128.) * (1<<FP_BITS));
   }
 
 
   for (i = 0; i < 256; i++) {
-    HY_Ru[i] = myround(0.213 * (gdouble)i 
+    HY_Ru[i] = myround(0.213 * (double)i 
 		       * (1<<FP_BITS));   // Kr 
-    HY_Gu[i] = myround(0.715 * (gdouble)i 
+    HY_Gu[i] = myround(0.715 * (double)i 
 		       * (1<<FP_BITS));   // Kb
-    HY_Bu[i] = myround(0.0722 * (gdouble)i 
+    HY_Bu[i] = myround(0.0722 * (double)i 
 		       * (1<<FP_BITS));
 
-    HCb_Bu[i] = myround(-0.115 * (gdouble)i 
+    HCb_Bu[i] = myround(-0.115 * (double)i 
 		        * (1<<FP_BITS));
-    HCb_Gu[i] = myround(-0.4542 * (gdouble)i 
+    HCb_Gu[i] = myround(-0.4542 * (double)i 
 			* (1<<FP_BITS));
-    HCb_Ru[i] = myround((0.5 * (gdouble)i 
+    HCb_Ru[i] = myround((0.5 * (double)i 
 			 + 128.) * (1<<FP_BITS));
     
-    HCr_Bu[i] = myround(0.5 * (gdouble)i 
+    HCr_Bu[i] = myround(0.5 * (double)i 
 			* (1<<FP_BITS));
-    HCr_Gu[i] = myround(-0.4542 * (gdouble)i 
+    HCr_Gu[i] = myround(-0.4542 * (double)i 
 			* (1<<FP_BITS));
-    HCr_Ru[i] = myround((-0.4554 * (gdouble)i 
+    HCr_Ru[i] = myround((-0.4554 * (double)i 
 			 + 128.) * (1<<FP_BITS));
 
   }
 
-
-
-
-  conv_RY_inited = 1;
+  conv_RY_inited = TRUE;
 }
 
 
 
 
 static void init_YUV_to_RGB_tables(void) {
-  // tables here are currently for Y'CbCr only 
-  // TODO - add tables for BT.709
-
-  gint i;
+  register int i;
 
   // These values are for what I call YUV_SUBSPACE_YCBCR
 
@@ -423,7 +422,7 @@
     RGB_Yc[i] = 0;
   }
   for (i = 17; i < 235; i++) {
-    RGB_Yc[i] = myround(((gdouble)i-16.)/219.*255. * (1<<FP_BITS));
+    RGB_Yc[i] = myround(((double)i-16.)/219.*255. * (1<<FP_BITS));
   }
   /* clip Y values above 235 */
   for (i = 235; i < 256; i++) {
@@ -438,10 +437,10 @@
     B_Cbc[i] = 0;
   }
   for (i = 17; i < 240; i++) {
-    R_Crc[i] = myround(1.402 * ((((gdouble)i-16.)/224.*255.)-128.) * (1<<FP_BITS)); // 2*(1-Kr)
-    G_Crc[i] = myround(-0.714136 * ((((gdouble)i-16.)/224.*255.)-128.)  * (1<<FP_BITS));
-    G_Cbc[i] = myround(-0.344136 * ((((gdouble)i-16.)/224.*255.)-128.) * (1<<FP_BITS));
-    B_Cbc[i] = myround(1.772 * ((((gdouble)i-16.)/224.*255.)-128.) * (1<<FP_BITS)); // 2*(1-Kb)
+    R_Crc[i] = myround(1.402 * ((((double)i-16.)/224.*255.)-128.) * (1<<FP_BITS)); // 2*(1-Kr)
+    G_Crc[i] = myround(-0.714136 * ((((double)i-16.)/224.*255.)-128.)  * (1<<FP_BITS));
+    G_Cbc[i] = myround(-0.344136 * ((((double)i-16.)/224.*255.)-128.) * (1<<FP_BITS));
+    B_Cbc[i] = myround(1.772 * ((((double)i-16.)/224.*255.)-128.) * (1<<FP_BITS)); // 2*(1-Kb)
   }
   /* clip Cb/Cr values above 240 */	 
   for (i = 240; i < 256; i++) {
@@ -459,10 +458,10 @@
   }
 
   for (i = 0; i <= 255; i++) {
-    R_Cru[i] = myround(1.402 * ((gdouble)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kr)
-    G_Cru[i] = myround(-0.714136 * ((gdouble)(i)-128.)) * (1<<FP_BITS); // 
-    G_Cbu[i] = myround(-0.344136 * ((gdouble)(i)-128.)) * (1<<FP_BITS);
-    B_Cbu[i] = myround(1.772 * ((gdouble)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kb)
+    R_Cru[i] = myround(1.402 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kr)
+    G_Cru[i] = myround(-0.714136 * ((double)(i)-128.)) * (1<<FP_BITS); // 
+    G_Cbu[i] = myround(-0.344136 * ((double)(i)-128.)) * (1<<FP_BITS);
+    B_Cbu[i] = myround(1.772 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kb)
   }
 
 
@@ -476,7 +475,7 @@
     HRGB_Yc[i] = 0;
   }
   for (i = 17; i < 235; i++) {
-    HRGB_Yc[i] = myround(((gdouble)i-16.) * 1.164 * (1<<FP_BITS));
+    HRGB_Yc[i] = myround(((double)i-16.) * 1.164 * (1<<FP_BITS));
   }
   /* clip Y values above 235 */
   for (i = 235; i < 256; i++) {
@@ -491,21 +490,32 @@
     HB_Cbc[i] = 0;
   }
   for (i = 17; i < 240; i++) {
-    HR_Crc[i] = myround(1.793 * (((gdouble)i-16.)-128.) * (1<<FP_BITS)); // 2*(1-Kr)
-    HG_Crc[i] = myround(-0.533 * (((gdouble)i-16.)-128.)  * (1<<FP_BITS));
-    HG_Cbc[i] = myround(-0.213 * (((gdouble)i-16.)-128.) * (1<<FP_BITS));
-    HB_Cbc[i] = myround(2.112 * (((gdouble)i-16.)-128.) * (1<<FP_BITS)); // 2*(1-Kb)
+    HR_Crc[i] = myround(1.793 * (((double)i-16.)-128.) * (1<<FP_BITS)); // 2*(1-Kr)
+    HG_Crc[i] = myround(-0.533 * (((double)i-16.)-128.)  * (1<<FP_BITS));
+    HG_Cbc[i] = myround(-0.213 * (((double)i-16.)-128.) * (1<<FP_BITS));
+    HB_Cbc[i] = myround(2.112 * (((double)i-16.)-128.) * (1<<FP_BITS)); // 2*(1-Kb)
   }
   /* clip Cb/Cr values above 240 */	 
   for (i = 240; i < 256; i++) {
     HR_Crc[i] = myround(1.793 * 127. * (1<<FP_BITS)); // 2*(1-Kr)
-    HG_Crc[i] = myround(-0.213 * 127.  * (1<<FP_BITS));
-    HG_Cbc[i] = myround(-0.533 * 127. * (1<<FP_BITS));
+    HG_Crc[i] = myround(-0.533 * 127.  * (1<<FP_BITS));
+    HG_Cbc[i] = myround(-0.213 * 127. * (1<<FP_BITS));
     HB_Cbc[i] = myround(2.112 * 127. * (1<<FP_BITS)); // 2*(1-Kb)
   }
 
-  // no unclamped for bt.709
+  // unclamped for bt.709
+
+  for (i = 0; i < 255; i++) {
+    HRGB_Yu[i] = i * (1<<FP_BITS);
+  }
+
 
+  for (i = 0; i <= 255; i++) {
+    HR_Cru[i] = myround(1.57503 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kr)
+    HG_Cru[i] = myround(-0.468204 * ((double)(i)-128.)) * (1<<FP_BITS); // 
+    HG_Cbu[i] = myround(-0.186375 * ((double)(i)-128.)) * (1<<FP_BITS);
+    HB_Cbu[i] = myround(1.85524 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kb)
+  }
 
   conv_YR_inited = 1;
 }
@@ -513,7 +523,7 @@
 
 
 static void init_YUV_to_YUV_tables (void) {
-  int i;
+  register int i;
 
   // init clamped -> unclamped, same subspace
   for (i=0;i<17;i++) {
@@ -554,9 +564,9 @@
       a=(short)(x-128);
       b=(short)(y-128);
       if ((c=(a+b-((a*b)>>8)+128))>240) c=240;
-      cavgc[x][y]=(guchar)(c>16?c:16);         // this is fine because headroom==footroom==16
+      cavgc[x][y]=(uint8_t)(c>16?c:16);         // this is fine because headroom==footroom==16
       if ((c=(a+b-((a*b)>>8)+128))>255) c=255;
-      cavgu[x][y]=(guchar)(c>0?c:0);
+      cavgu[x][y]=(uint8_t)(c>0?c:0);
     }
   }
   avg_inited=1;
@@ -639,25 +649,47 @@
     }
     break;
   case WEED_YUV_SUBSPACE_BT709:
-    //untested
-    Y_R=HY_Rc;
-    Y_G=HY_Gc;
-    Y_B=HY_Bc;
+    if (clamping==WEED_YUV_CLAMPING_CLAMPED) {
+      Y_R=HY_Rc;
+      Y_G=HY_Gc;
+      Y_B=HY_Bc;
       
-    Cb_R=HCb_Rc;
-    Cb_G=HCb_Gc;
-    Cb_B=HCb_Bc;
+      Cb_R=HCb_Rc;
+      Cb_G=HCb_Gc;
+      Cb_B=HCb_Bc;
       
-    Cr_R=HCr_Rc;
-    Cr_G=HCr_Gc;
-    Cr_B=HCr_Bc;
+      Cr_R=HCr_Rc;
+      Cr_G=HCr_Gc;
+      Cr_B=HCr_Bc;
       
-    RGB_Y=HRGB_Yc;
+      RGB_Y=HRGB_Yc;
       
-    R_Cr=HR_Crc;
-    G_Cr=HG_Crc;
-    G_Cb=HG_Cbc;
-    B_Cb=HB_Cbc;
+      R_Cr=HR_Crc;
+      G_Cr=HG_Crc;
+      G_Cb=HG_Cbc;
+      B_Cb=HB_Cbc;
+    }
+    else {
+      Y_R=HY_Ru;
+      Y_G=HY_Gu;
+      Y_B=HY_Bu;
+      
+      Cb_R=HCb_Ru;
+      Cb_G=HCb_Gu;
+      Cb_B=HCb_Bu;
+      
+      Cr_R=HCr_Ru;
+      Cr_G=HCr_Gu;
+      Cr_B=HCr_Bu;
+      
+      RGB_Y=HRGB_Yu;
+      
+      R_Cr=HR_Cru;
+      G_Cr=HG_Cru;
+      G_Cb=HG_Cbu;
+      B_Cb=HB_Cbu;
+    }
+ 
     break;
   }
 
@@ -667,12 +699,12 @@
     min_Y=min_UV=16;
     max_Y=235;
     max_UV=240;
-    cavg=(guchar *)cavgc;
+    cavg=(uint8_t *)cavgc;
   }
   else {
     min_Y=min_UV=0;
     max_Y=max_UV=255;
-    cavg=(guchar *)cavgu;
+    cavg=(uint8_t *)cavgu;
   }
 }
 
@@ -736,7 +768,13 @@
 //////////////////////////
 // pixel conversions
 
-static LIVES_INLINE void rgb2yuv (guchar r0, guchar g0, guchar b0, guchar *y, guchar *u, guchar *v) {
+static LIVES_INLINE uint8_t avg_chroma (size_t x, size_t y) {
+  // cavg == cavgc for clamped, cavgu for unclamped
+  return *(cavg+(x<<8)+y);
+}
+
+
+static LIVES_INLINE void rgb2yuv (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t *y, uint8_t *u, uint8_t *v) {
   register short a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   *y=a<min_Y?min_Y:a;
@@ -746,44 +784,39 @@
   *v=a<min_UV?min_UV:a;
 }
 
-static LIVES_INLINE void rgb2uyvy (guchar r0, guchar g0, guchar b0, guchar r1, guchar g1, guchar b1, uyvy_macropixel *uyvy) {
-  register short a,b,c;
+static LIVES_INLINE void rgb2uyvy (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, uyvy_macropixel *uyvy) {
+  register short a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   uyvy->y0=a<min_Y?min_Y:a;
   if ((a=((Y_R[r1]+Y_G[g1]+Y_B[b1])>>FP_BITS))>max_Y) a=max_Y;
   uyvy->y1=a<min_Y?min_Y:a;
 
-  a=((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS)-128;
-  b=((Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS)-128;
-  if ((c=a+b-((a*b)>>8)+128)>max_UV) c=max_UV;
-  uyvy->v0=c<min_UV?min_UV:c;
-
-  a=((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS)-128;
-  b=((Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS)-128;
-  if ((c=a+b-((a*b)>>8)+128)>max_UV) c=max_UV;
-  uyvy->u0=c<min_UV?min_UV:c;
+  uyvy->u0=avg_chroma((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS,
+		      (Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS);
+
+  uyvy->v0=avg_chroma((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS,
+		      (Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS);
+
 }
 
-static LIVES_INLINE void rgb2yuyv (guchar r0, guchar g0, guchar b0, guchar r1, guchar g1, guchar b1, yuyv_macropixel *yuyv) {
-  register short a,b,c;
+static LIVES_INLINE void rgb2yuyv (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, yuyv_macropixel *yuyv) {
+  register short a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   yuyv->y0=a<min_Y?min_Y:a;
   if ((a=((Y_R[r1]+Y_G[g1]+Y_B[b1])>>FP_BITS))>max_Y) a=max_Y;
   yuyv->y1=a<min_Y?min_Y:a;
 
-  a=((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS)-128;
-  b=((Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS)-128;
-  if ((c=a+b-((a*b)>>8)+128)>max_UV) c=max_UV;
-  yuyv->v0=c<min_UV?min_UV:c;
-
-  a=((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS)-128;
-  b=((Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS)-128;
-  if ((c=a+b-((a*b)>>8)+128)>max_UV) c=max_UV;
-  yuyv->u0=c<min_UV?min_UV:c;
+  yuyv->u0=avg_chroma((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS,
+		      (Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS);
+
+  yuyv->v0=avg_chroma((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS,
+		      (Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS);
+
+
 }
 
-static LIVES_INLINE void rgb2_411 (guchar r0, guchar g0, guchar b0, guchar r1, guchar g1, guchar b1, 
-			     guchar r2, guchar g2, guchar b2, guchar r3, guchar g3, guchar b3, yuv411_macropixel *yuv) {
+static LIVES_INLINE void rgb2_411 (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, 
+			     uint8_t r2, uint8_t g2, uint8_t b2, uint8_t r3, uint8_t g3, uint8_t b3, yuv411_macropixel *yuv) {
   register int a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   yuv->y0=a<min_Y?min_Y:a;
@@ -802,68 +835,68 @@
   yuv->u2=a<min_UV?min_UV:a;
 }
 
-static LIVES_INLINE void yuv2rgb (guchar y, guchar u, guchar v, guchar *r, guchar *g, guchar *b) {
+static LIVES_INLINE void yuv2rgb (uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b) {
   *r = CLAMP0255((RGB_Y[y] + R_Cr[v]) >> FP_BITS);
   *g = CLAMP0255((RGB_Y[y] + G_Cb[u]+ G_Cr[v]) >> FP_BITS);
   *b = CLAMP0255((RGB_Y[y] + B_Cb[u]) >> FP_BITS);
 }
 
-static LIVES_INLINE void uyvy2rgb (uyvy_macropixel *uyvy, guchar *r0, guchar *g0, guchar *b0, 
-			     guchar *r1, guchar *g1, guchar *b1) {
+static LIVES_INLINE void uyvy2rgb (uyvy_macropixel *uyvy, uint8_t *r0, uint8_t *g0, uint8_t *b0, 
+			     uint8_t *r1, uint8_t *g1, uint8_t *b1) {
   yuv2rgb(uyvy->y0,uyvy->u0,uyvy->v0,r0,g0,b0);
   yuv2rgb(uyvy->y1,uyvy->u0,uyvy->v0,r1,g1,b1);
   //if (uyvy->y0>240||uyvy->u0>240||uyvy->v0>240||uyvy->y1>240) g_printerr("got unclamped !\n");
 }
 
 
-static LIVES_INLINE void yuyv2rgb (yuyv_macropixel *yuyv, guchar *r0, guchar *g0, guchar *b0, 
-			     guchar *r1, guchar *g1, guchar *b1) {
+static LIVES_INLINE void yuyv2rgb (yuyv_macropixel *yuyv, uint8_t *r0, uint8_t *g0, uint8_t *b0, 
+			     uint8_t *r1, uint8_t *g1, uint8_t *b1) {
   yuv2rgb(yuyv->y0,yuyv->u0,yuyv->v0,r0,g0,b0);
   yuv2rgb(yuyv->y1,yuyv->u0,yuyv->v0,r1,g1,b1);
 }
 
 
-static LIVES_INLINE void yuv888_2_rgb (guchar *yuv, guchar *rgb, gboolean add_alpha) {
+static LIVES_INLINE void yuv888_2_rgb (uint8_t *yuv, uint8_t *rgb, boolean add_alpha) {
   yuv2rgb(yuv[0],yuv[1],yuv[2],&(rgb[0]),&(rgb[1]),&(rgb[2]));
   if (add_alpha) rgb[3]=255;
 }
 
 
-static LIVES_INLINE void yuva8888_2_rgba (guchar *yuva, guchar *rgba, gboolean del_alpha) {
+static LIVES_INLINE void yuva8888_2_rgba (uint8_t *yuva, uint8_t *rgba, boolean del_alpha) {
   yuv2rgb(yuva[0],yuva[1],yuva[2],&(rgba[0]),&(rgba[1]),&(rgba[2]));
   if (!del_alpha) rgba[3]=yuva[3];
 }
 
-static LIVES_INLINE void yuv888_2_bgr (guchar *yuv, guchar *bgr, gboolean add_alpha) {
+static LIVES_INLINE void yuv888_2_bgr (uint8_t *yuv, uint8_t *bgr, boolean add_alpha) {
   yuv2rgb(yuv[0],yuv[1],yuv[2],&(bgr[2]),&(bgr[1]),&(bgr[0]));
   if (add_alpha) bgr[3]=255;
 }
 
 
-static LIVES_INLINE void yuva8888_2_bgra (guchar *yuva, guchar *bgra, gboolean del_alpha) {
+static LIVES_INLINE void yuva8888_2_bgra (uint8_t *yuva, uint8_t *bgra, boolean del_alpha) {
   yuv2rgb(yuva[0],yuva[1],yuva[2],&(bgra[2]),&(bgra[1]),&(bgra[0]));
   if (!del_alpha) bgra[3]=yuva[3];
 }
 
-static LIVES_INLINE void yuv888_2_argb (guchar *yuv, guchar *argb) {
+static LIVES_INLINE void yuv888_2_argb (uint8_t *yuv, uint8_t *argb) {
   argb[0]=255;
   yuv2rgb(yuv[0],yuv[1],yuv[2],&(argb[1]),&(argb[2]),&(argb[3]));
 }
 
 
-static LIVES_INLINE void yuva8888_2_argb (guchar *yuva, guchar *argb) {
+static LIVES_INLINE void yuva8888_2_argb (uint8_t *yuva, uint8_t *argb) {
   argb[0]=yuva[3];
   yuv2rgb(yuva[0],yuva[1],yuva[2],&(argb[1]),&(argb[2]),&(argb[3]));
 }
 
-static LIVES_INLINE void uyvy_2_yuv422 (uyvy_macropixel *uyvy, guchar *y0, guchar *u0, guchar *v0, guchar *y1) {
+static LIVES_INLINE void uyvy_2_yuv422 (uyvy_macropixel *uyvy, uint8_t *y0, uint8_t *u0, uint8_t *v0, uint8_t *y1) {
   *u0=uyvy->u0;
   *y0=uyvy->y0;
   *v0=uyvy->v0;
   *y1=uyvy->y1;
 }
 
-static LIVES_INLINE void yuyv_2_yuv422 (yuyv_macropixel *yuyv, guchar *y0, guchar *u0, guchar *v0, guchar *y1) {
+static LIVES_INLINE void yuyv_2_yuv422 (yuyv_macropixel *yuyv, uint8_t *y0, uint8_t *u0, uint8_t *v0, uint8_t *y1) {
   *y0=yuyv->y0;
   *u0=yuyv->u0;
   *y1=yuyv->y1;
@@ -871,28 +904,23 @@
 }
 
 
-static LIVES_INLINE guchar avg_chroma (size_t x, size_t y) {
-  // cavg == cavgc for clamped, cavgu for unclamped
-  return *(cavg+(x<<8)+y);
-}
-
 
 /////////////////////////////////////////////////
 //utilities
 
-LIVES_INLINE gboolean weed_palette_is_alpha_palette(int pal) {
+LIVES_INLINE boolean weed_palette_is_alpha_palette(int pal) {
   return (pal>=1024&&pal<2048)?TRUE:FALSE;
 }
 
-LIVES_INLINE gboolean weed_palette_is_rgb_palette(int pal) {
+LIVES_INLINE boolean weed_palette_is_rgb_palette(int pal) {
   return (pal<512)?TRUE:FALSE;
 }
 
-LIVES_INLINE gboolean weed_palette_is_yuv_palette(int pal) {
+LIVES_INLINE boolean weed_palette_is_yuv_palette(int pal) {
   return (pal>=512&&pal<1024)?TRUE:FALSE;
 }
 
-LIVES_INLINE gint weed_palette_get_numplanes(int pal) {
+LIVES_INLINE int weed_palette_get_numplanes(int pal) {
   if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||
       pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV411||
       pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888||pal==WEED_PALETTE_AFLOAT||pal==WEED_PALETTE_A8||
@@ -902,12 +930,12 @@
   return 0; // unknown palette
 }
 
-LIVES_INLINE gboolean weed_palette_is_valid_palette(int pal) {
+LIVES_INLINE boolean weed_palette_is_valid_palette(int pal) {
   if (weed_palette_get_numplanes(pal)==0) return FALSE;
   return TRUE;
 }
 
-LIVES_INLINE gint weed_palette_get_bits_per_macropixel(int pal) {
+LIVES_INLINE int weed_palette_get_bits_per_macropixel(int pal) {
   if (pal==WEED_PALETTE_A8||pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||
       pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P) return 8;
   if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) return 24;
@@ -923,23 +951,23 @@
 }
 
 
-LIVES_INLINE gint weed_palette_get_pixels_per_macropixel(int pal) {
+LIVES_INLINE int weed_palette_get_pixels_per_macropixel(int pal) {
   if (pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888) return 2;
   if (pal==WEED_PALETTE_YUV411) return 4;
   return 1;
 }
 
-LIVES_INLINE gboolean weed_palette_is_float_palette(int pal) {
+LIVES_INLINE boolean weed_palette_is_float_palette(int pal) {
   return (pal==WEED_PALETTE_RGBAFLOAT||pal==WEED_PALETTE_AFLOAT||pal==WEED_PALETTE_RGBFLOAT)?TRUE:FALSE;
 }
 
-LIVES_INLINE gboolean weed_palette_has_alpha_channel(int pal) {
+LIVES_INLINE boolean weed_palette_has_alpha_channel(int pal) {
   return (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||
 	  pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_YUVA8888||pal==WEED_PALETTE_RGBAFLOAT||
 	  weed_palette_is_alpha_palette(pal))?TRUE:FALSE;
 }
 
-LIVES_INLINE gdouble weed_palette_get_plane_ratio_horizontal(int pal, int plane) {
+LIVES_INLINE double weed_palette_get_plane_ratio_horizontal(int pal, int plane) {
   // return ratio of plane[n] width/plane[0] width; 
   if (plane==0) return 1.0;
   if (plane==1||plane==2) {
@@ -952,7 +980,7 @@
   return 0.0;
 }
 
-LIVES_INLINE gdouble weed_palette_get_plane_ratio_vertical(int pal, int plane) {
+LIVES_INLINE double weed_palette_get_plane_ratio_vertical(int pal, int plane) {
   // return ratio of plane[n] height/plane[n] height
   if (plane==0) return 1.0;
   if (plane==1||plane==2) {
@@ -965,7 +993,7 @@
   return 0.0;
 }
 
-gboolean weed_palette_is_lower_quality(int p1, int p2) {
+boolean weed_palette_is_lower_quality(int p1, int p2) {
   // return TRUE if p1 is lower quality than p2
   // we don't yet handle float palettes, or RGB or alpha properly
 
@@ -1092,10 +1120,13 @@
 /////////////////////////////////////////////////////////
 // just as an example: 1.0 == RGB(A), 0.5 == compressed to 50%, etc
 
-gdouble weed_palette_get_compression_ratio (int pal) {
+double weed_palette_get_compression_ratio (int pal) {
+  double tbits=0.;
+
   int nplanes=weed_palette_get_numplanes(pal);
-  gdouble tbits=0.;
-  int i,pbits;
+  int pbits;
+
+  register int i;
 
   if (!weed_palette_is_valid_palette(pal)) return 0.;
   if (weed_palette_is_alpha_palette(pal)) return 0.; // invalid for alpha palettes
@@ -1116,7 +1147,7 @@
   int height=lives_pixbuf_get_height(pixbuf);
   int rstride=lives_pixbuf_get_rowstride(pixbuf);
   boolean has_alpha=lives_pixbuf_get_has_alpha(pixbuf);
-  const guchar *pdata=lives_pixbuf_get_pixels_readonly(pixbuf);
+  const uint8_t *pdata=lives_pixbuf_get_pixels_readonly(pixbuf);
 
   int offs=0;  // TODO *** - if it is a QImage, offs may be 1
   int psize=has_alpha?4:3;
@@ -1172,19 +1203,19 @@
 ///////////////////////////////////////////////////////////
 // frame conversions
 
-static void convert_yuv888_to_rgb_frame(guchar *src, gint hsize, gint vsize, gint irowstride, 
-					gint orowstride, guchar *dest, gboolean add_alpha, 
-					gboolean clamped, int thread_id) {
+static void convert_yuv888_to_rgb_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
+					int orowstride, uint8_t *dest, boolean add_alpha, 
+					boolean clamped, int thread_id) {
   register int x,y,i;
   size_t offs=3;
   
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
-    guchar *end=src+vsize*irowstride;
+    uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1220,7 +1251,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1244,8 +1275,8 @@
 
 void *convert_yuv888_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuv888_to_rgb_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			      ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->out_alpha,
+  convert_yuv888_to_rgb_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->out_alpha,
 			      ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -1254,8 +1285,8 @@
 
 
 
-static void convert_yuva8888_to_rgba_frame(guchar *src, gint hsize, gint vsize, gint irowstride, 
-					   gint orowstride, guchar *dest, gboolean del_alpha, gboolean clamped,
+static void convert_yuva8888_to_rgba_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
+					   int orowstride, uint8_t *dest, boolean del_alpha, boolean clamped,
 					   int thread_id) {
   register int x,y,i;
 
@@ -1264,10 +1295,10 @@
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
-    guchar *end=src+vsize*irowstride;
+    uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1303,7 +1334,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1327,8 +1358,8 @@
 
 void *convert_yuva8888_to_rgba_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuva8888_to_rgba_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-				 ccparams->orowstrides[0],(guchar *)ccparams->dest,!ccparams->out_alpha,
+  convert_yuva8888_to_rgba_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+				 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,!ccparams->out_alpha,
 				 ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -1337,8 +1368,8 @@
 
 
 
-static void convert_yuv888_to_bgr_frame(guchar *src, gint hsize, gint vsize, gint irowstride, 
-					gint orowstride, guchar *dest, gboolean add_alpha, gboolean clamped,
+static void convert_yuv888_to_bgr_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
+					int orowstride, uint8_t *dest, boolean add_alpha, boolean clamped,
 					int thread_id) {
   register int x,y,i;
   size_t offs=3;
@@ -1346,10 +1377,10 @@
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
-    guchar *end=src+vsize*irowstride;
+    uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1385,7 +1416,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1411,8 +1442,8 @@
 
 void *convert_yuv888_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuv888_to_bgr_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			      ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->out_alpha,
+  convert_yuv888_to_bgr_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->out_alpha,
 			      ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -1420,8 +1451,8 @@
 
 
 
-static void convert_yuva8888_to_bgra_frame(guchar *src, gint hsize, gint vsize, gint irowstride, 
-					   gint orowstride, guchar *dest, gboolean del_alpha, gboolean clamped,
+static void convert_yuva8888_to_bgra_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
+					   int orowstride, uint8_t *dest, boolean del_alpha, boolean clamped,
 					   int thread_id) {
   register int x,y,i;
 
@@ -1430,10 +1461,10 @@
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
-    guchar *end=src+vsize*irowstride;
+    uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1469,7 +1500,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1494,27 +1525,27 @@
 
 void *convert_yuva8888_to_bgra_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuva8888_to_bgra_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-				 ccparams->orowstrides[0],(guchar *)ccparams->dest,!ccparams->out_alpha,
+  convert_yuva8888_to_bgra_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+				 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,!ccparams->out_alpha,
 				 ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_yuv888_to_argb_frame(guchar *src, gint hsize, gint vsize, gint irowstride, 
-					 gint orowstride, guchar *dest, 
-					 gboolean clamped, int thread_id) {
+static void convert_yuv888_to_argb_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
+					 int orowstride, uint8_t *dest, 
+					 boolean clamped, int thread_id) {
   register int x,y,i;
   size_t offs=4;
   
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
-    guchar *end=src+vsize*irowstride;
+    uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1549,7 +1580,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1572,8 +1603,8 @@
 
 void *convert_yuv888_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuv888_to_argb_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			       ccparams->orowstrides[0],(guchar *)ccparams->dest,
+  convert_yuv888_to_argb_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,
 			       ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -1582,8 +1613,8 @@
 
 
 
-static void convert_yuva8888_to_argb_frame(guchar *src, gint hsize, gint vsize, gint irowstride, 
-					   gint orowstride, guchar *dest, gboolean clamped,
+static void convert_yuva8888_to_argb_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
+					   int orowstride, uint8_t *dest, boolean clamped,
 					   int thread_id) {
   register int x,y,i;
 
@@ -1592,10 +1623,10 @@
   if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
-    guchar *end=src+vsize*irowstride;
+    uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1630,7 +1661,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1653,24 +1684,24 @@
 
 void *convert_yuva8888_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuva8888_to_argb_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-				 ccparams->orowstrides[0],(guchar *)ccparams->dest,
+  convert_yuva8888_to_argb_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+				 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,
 				 ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_yuv420p_to_rgb_frame(guchar **src, gint width, gint height, gint orowstride, 
-					 guchar *dest, gboolean add_alpha, gboolean is_422, int sample_type, 
-					 gboolean clamped) {
+static void convert_yuv420p_to_rgb_frame(uint8_t **src, int width, int height, int orowstride, 
+					 uint8_t *dest, boolean add_alpha, boolean is_422, int sample_type, 
+					 boolean clamped) {
   // TODO - handle dvpal in sampling type
   register int i,j;
-  guchar *s_y=src[0],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
   int widthx,hwidth=width>>1;
   int opsize=3,opsize2;
-  guchar y,u,v;
+  uint8_t y,u,v;
 
   if (add_alpha) opsize=4;
 
@@ -1744,16 +1775,16 @@
 }
 
 
-static void convert_yuv420p_to_bgr_frame(guchar **src, gint width, gint height, gint orowstride, 
-					 guchar *dest, gboolean add_alpha, gboolean is_422, int sample_type, 
-					 gboolean clamped) {
+static void convert_yuv420p_to_bgr_frame(uint8_t **src, int width, int height, int orowstride, 
+					 uint8_t *dest, boolean add_alpha, boolean is_422, int sample_type, 
+					 boolean clamped) {
   // TODO - handle dvpal in sampling type
   register int i,j;
-  guchar *s_y=src[0],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
   int widthx,hwidth=width>>1;
   int opsize=3,opsize2;
-  guchar y,u,v;
+  uint8_t y,u,v;
 
   if (add_alpha) opsize=4;
 
@@ -1827,16 +1858,16 @@
 }
 
 
-static void convert_yuv420p_to_argb_frame(guchar **src, gint width, gint height, gint orowstride, 
-					  guchar *dest, gboolean is_422, int sample_type, 
-					  gboolean clamped) {
+static void convert_yuv420p_to_argb_frame(uint8_t **src, int width, int height, int orowstride, 
+					  uint8_t *dest, boolean is_422, int sample_type, 
+					  boolean clamped) {
   // TODO - handle dvpal in sampling type
   register int i,j;
-  guchar *s_y=src[0],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
   int widthx,hwidth=width>>1;
   int opsize=4,opsize2;
-  guchar y,u,v;
+  uint8_t y,u,v;
 
   widthx=width*opsize;
   opsize2=opsize*2;
@@ -1908,11 +1939,11 @@
 }
 
 
-static void convert_rgb_to_uyvy_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-			       uyvy_macropixel *u, gboolean has_alpha, gboolean clamped, int thread_id) {
+static void convert_rgb_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+			       uyvy_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
-  gint hs3,ipsize=3,ipsize2;
-  guchar *end;
+  int hs3,ipsize=3,ipsize2;
+  uint8_t *end;
   register int i;
 
   int x=3,y=4,z=5;
@@ -1924,7 +1955,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -1960,7 +1991,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -1988,17 +2019,17 @@
 
 void *convert_rgb_to_uyvy_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_rgb_to_uyvy_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+  convert_rgb_to_uyvy_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
 			    (uyvy_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_rgb_to_yuyv_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				      yuyv_macropixel *u, gboolean has_alpha, gboolean clamped, int thread_id) {
+static void convert_rgb_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				      yuyv_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
-  gint hs3,ipsize=3,ipsize2;
-  guchar *end=rgbdata+(rowstride*vsize)-5;
+  int hs3,ipsize=3,ipsize2;
+  uint8_t *end=rgbdata+(rowstride*vsize)-5;
   register int i;
 
   int x=3,y=4,z=5;
@@ -2008,7 +2039,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2043,7 +2074,7 @@
     for (i=0;i<prefs->nfx_threads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2070,17 +2101,17 @@
 
 void *convert_rgb_to_yuyv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_rgb_to_yuyv_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+  convert_rgb_to_yuyv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
 			    (yuyv_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_bgr_to_uyvy_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				      uyvy_macropixel *u, gboolean has_alpha, gboolean clamped, int thread_id) {
+static void convert_bgr_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				      uyvy_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
-  gint hs3,ipsize=3,ipsize2;
-  guchar *end=rgbdata+(rowstride*vsize)-5;
+  int hs3,ipsize=3,ipsize2;
+  uint8_t *end=rgbdata+(rowstride*vsize)-5;
   register int i;
 
   int x=3,y=4,z=5;
@@ -2089,7 +2120,7 @@
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     int dheight;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
@@ -2125,7 +2156,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2152,7 +2183,7 @@
 
 void *convert_bgr_to_uyvy_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_bgr_to_uyvy_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+  convert_bgr_to_uyvy_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
 			    (uyvy_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -2161,12 +2192,12 @@
 
 
 
-static void convert_bgr_to_yuyv_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				      yuyv_macropixel *u, gboolean has_alpha, gboolean clamped, int thread_id) {
+static void convert_bgr_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				      yuyv_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
-  gint hs3,ipsize=3,ipsize2;
+  int hs3,ipsize=3,ipsize2;
 
-  guchar *end=rgbdata+(rowstride*vsize)-5;
+  uint8_t *end=rgbdata+(rowstride*vsize)-5;
   register int i;
 
   int x=3,y=4,z=5;
@@ -2175,7 +2206,7 @@
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     int dheight;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
@@ -2211,7 +2242,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2238,7 +2269,7 @@
 
 void *convert_bgr_to_yuyv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_bgr_to_yuyv_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+  convert_bgr_to_yuyv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
 			    (yuyv_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -2246,11 +2277,11 @@
 
 
 
-static void convert_argb_to_uyvy_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				       uyvy_macropixel *u, gboolean clamped, int thread_id) {
+static void convert_argb_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				       uyvy_macropixel *u, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
-  gint hs3,ipsize=4,ipsize2;
-  guchar *end;
+  int hs3,ipsize=4,ipsize2;
+  uint8_t *end;
   register int i;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
@@ -2260,7 +2291,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2295,7 +2326,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2316,7 +2347,7 @@
 
 void *convert_argb_to_uyvy_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_argb_to_uyvy_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+  convert_argb_to_uyvy_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
 			    (uyvy_macropixel *)ccparams->dest,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -2324,11 +2355,11 @@
 
 
 
-static void convert_argb_to_yuyv_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				       yuyv_macropixel *u, gboolean clamped, int thread_id) {
+static void convert_argb_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				       yuyv_macropixel *u, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
-  gint hs3,ipsize=4,ipsize2;
-  guchar *end;
+  int hs3,ipsize=4,ipsize2;
+  uint8_t *end;
   register int i;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
@@ -2338,7 +2369,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2373,7 +2404,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2394,7 +2425,7 @@
 
 void *convert_argb_to_yuyv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_argb_to_yuyv_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+  convert_argb_to_yuyv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
 			    (yuyv_macropixel *)ccparams->dest,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
@@ -2403,21 +2434,21 @@
 
 
 
-static void convert_rgb_to_yuv_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				     guchar *u, gboolean in_has_alpha, gboolean out_has_alpha, 
-				     gboolean clamped, int thread_id) {
+static void convert_rgb_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				     uint8_t *u, boolean in_has_alpha, boolean out_has_alpha, 
+				     boolean clamped, int thread_id) {
   int ipsize=3,opsize=3;
   int iwidth;
-  guchar *end=rgbdata+(rowstride*vsize);
+  uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
-  guchar in_alpha=255;
+  uint8_t in_alpha=255;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2426,7 +2457,7 @@
 
 	ccparams[i].src=rgbdata+dheight*i*rowstride;
 	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*hsize;
+	ccparams[i].dest=u+dheight*i*hsize*opsize;
 
 	if (dheight*(i+1)>(vsize-4)) {
 	  dheight=vsize-(dheight*i);
@@ -2453,7 +2484,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2478,22 +2509,22 @@
 
 void *convert_rgb_to_yuv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_rgb_to_yuv_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			   (guchar *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
+  convert_rgb_to_yuv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_rgb_to_yuvp_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				      guchar **yuvp, gboolean in_has_alpha, gboolean out_has_alpha, gboolean clamped,
+static void convert_rgb_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				      uint8_t **yuvp, boolean in_has_alpha, boolean out_has_alpha, boolean clamped,
 				      int thread_id) {
   int ipsize=3;
   int iwidth;
-  guchar *end=rgbdata+(rowstride*vsize);
+  uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
-  guchar in_alpha=255,*a=NULL;
+  uint8_t in_alpha=255,*a=NULL;
 
-  guchar *y,*u,*v;
+  uint8_t *y,*u,*v;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
@@ -2505,7 +2536,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2545,7 +2576,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2571,29 +2602,29 @@
 
 void *convert_rgb_to_yuvp_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_rgb_to_yuvp_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (guchar **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
+  convert_rgb_to_yuvp_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			    (uint8_t **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
 			    ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_bgr_to_yuv_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				     guchar *u, gboolean in_has_alpha, gboolean out_has_alpha, 
-				     gboolean clamped, int thread_id) {
+static void convert_bgr_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				     uint8_t *u, boolean in_has_alpha, boolean out_has_alpha, 
+				     boolean clamped, int thread_id) {
   int ipsize=3,opsize=3;
   int iwidth;
-  guchar *end=rgbdata+(rowstride*vsize);
+  uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
-  guchar in_alpha=255;
+  uint8_t in_alpha=255;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2602,7 +2633,7 @@
 
 	ccparams[i].src=rgbdata+dheight*i*rowstride;
 	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*hsize;
+	ccparams[i].dest=u+dheight*i*hsize*opsize;
 
 	if (dheight*(i+1)>(vsize-4)) {
 	  dheight=vsize-(dheight*i);
@@ -2629,7 +2660,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2654,26 +2685,26 @@
 
 void *convert_bgr_to_yuv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_bgr_to_yuv_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			   (guchar *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
+  convert_bgr_to_yuv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_bgr_to_yuvp_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				      guchar **yuvp, gboolean in_has_alpha, gboolean out_has_alpha, gboolean clamped,
+static void convert_bgr_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				      uint8_t **yuvp, boolean in_has_alpha, boolean out_has_alpha, boolean clamped,
 				      int thread_id) {
 
   // TESTED !
 
   int ipsize=3;
   int iwidth;
-  guchar *end=rgbdata+(rowstride*vsize);
+  uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
-  guchar in_alpha=255,*a=NULL;
+  uint8_t in_alpha=255,*a=NULL;
 
-  guchar *y,*u,*v;
+  uint8_t *y,*u,*v;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
@@ -2685,7 +2716,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2725,7 +2756,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2751,8 +2782,8 @@
 
 void *convert_bgr_to_yuvp_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_bgr_to_yuvp_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (guchar **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
+  convert_bgr_to_yuvp_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			    (uint8_t **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
 			    ccparams->thread_id);
   return NULL;
 }
@@ -2760,12 +2791,12 @@
 
 
 
-static void convert_argb_to_yuv_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				      guchar *u, gboolean out_has_alpha, 
-				      gboolean clamped, int thread_id) {
+static void convert_argb_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				      uint8_t *u, boolean out_has_alpha, 
+				      boolean clamped, int thread_id) {
   int ipsize=4,opsize=3;
   int iwidth;
-  guchar *end=rgbdata+(rowstride*vsize);
+  uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
@@ -2773,7 +2804,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2783,7 +2814,7 @@
 	ccparams[i].src=rgbdata+dheight*i*rowstride;
 	ccparams[i].hsize=hsize;
 
-	ccparams[i].dest=u+dheight*i*hsize;
+	ccparams[i].dest=u+dheight*i*hsize*opsize;
 
 	if (dheight*(i+1)>(vsize-4)) {
 	  dheight=vsize-(dheight*i);
@@ -2809,7 +2840,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2831,21 +2862,21 @@
 
 void *convert_argb_to_yuv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_argb_to_yuv_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			   (guchar *)ccparams->dest,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
+  convert_argb_to_yuv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			   (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_argb_to_yuvp_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				       guchar **yuvp, gboolean out_has_alpha, gboolean clamped,
+static void convert_argb_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				       uint8_t **yuvp, boolean out_has_alpha, boolean clamped,
 				       int thread_id) {
   int ipsize=4;
   int iwidth;
-  guchar *end=rgbdata+(rowstride*vsize);
+  uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
-  guchar *a=NULL;
-  guchar *y,*u,*v;
+  uint8_t *a=NULL;
+  uint8_t *y,*u,*v;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
@@ -2857,7 +2888,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
@@ -2896,7 +2927,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -2921,8 +2952,8 @@
 
 void *convert_argb_to_yuvp_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_argb_to_yuvp_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			     (guchar **)ccparams->destp,ccparams->out_alpha,ccparams->out_clamped,
+  convert_argb_to_yuvp_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			     (uint8_t **)ccparams->destp,ccparams->out_alpha,ccparams->out_clamped,
 			     ccparams->thread_id);
   return NULL;
 }
@@ -2932,16 +2963,16 @@
 
 
 
-static void convert_rgb_to_yuv420_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				 guchar **dest, gboolean is_422, gboolean has_alpha, int samtype, gboolean clamped) {
+static void convert_rgb_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				 uint8_t **dest, boolean is_422, boolean has_alpha, int samtype, boolean clamped) {
   // for odd sized widths, cut the rightmost pixel
   // TODO - handle different out sampling types
-  gint hs3;
+  int hs3;
 
-  guchar *y,*Cb,*Cr;
+  uint8_t *y,*Cb,*Cr;
   uyvy_macropixel u;
   register int i,j;
-  gboolean chroma_row=TRUE;
+  boolean chroma_row=TRUE;
 
   int ipsize=3,ipsize2;
   size_t hhsize;
@@ -2998,16 +3029,16 @@
 
 
 
-static void convert_argb_to_yuv420_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-				  guchar **dest, gboolean is_422, int samtype, gboolean clamped) {
+static void convert_argb_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+				  uint8_t **dest, boolean is_422, int samtype, boolean clamped) {
   // for odd sized widths, cut the rightmost pixel
   // TODO - handle different out sampling types
-  gint hs3;
+  int hs3;
 
-  guchar *y,*Cb,*Cr;
+  uint8_t *y,*Cb,*Cr;
   uyvy_macropixel u;
   register int i,j;
-  gboolean chroma_row=TRUE;
+  boolean chroma_row=TRUE;
 
   int ipsize=4,ipsize2;
   size_t hhsize;
@@ -3062,16 +3093,16 @@
 
 
 
-static void convert_bgr_to_yuv420_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-					guchar **dest, gboolean is_422, gboolean has_alpha, int samtype, gboolean clamped) {
+static void convert_bgr_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+					uint8_t **dest, boolean is_422, boolean has_alpha, int samtype, boolean clamped) {
   // for odd sized widths, cut the rightmost pixel
   // TODO - handle different out sampling types
-  gint hs3;
+  int hs3;
 
-  guchar *y,*Cb,*Cr;
+  uint8_t *y,*Cb,*Cr;
   uyvy_macropixel u;
   register int i,j;
-  gint chroma_row=TRUE;
+  int chroma_row=TRUE;
   int ipsize=3,ipsize2;
   size_t hhsize;
 
@@ -3120,12 +3151,12 @@
 }
 
 
-static void convert_yuv422p_to_uyvy_frame(guchar **src, int width, int height, guchar *dest) {
+static void convert_yuv422p_to_uyvy_frame(uint8_t **src, int width, int height, uint8_t *dest) {
   // TODO - handle different in sampling types
-  guchar *src_y=src[0];
-  guchar *src_u=src[1];
-  guchar *src_v=src[2];
-  guchar *end=src_y+width*height;
+  uint8_t *src_y=src[0];
+  uint8_t *src_u=src[1];
+  uint8_t *src_v=src[2];
+  uint8_t *end=src_y+width*height;
 
   while (src_y<end) {
     *(dest++)=*(src_u++);
@@ -3136,13 +3167,13 @@
 }
 
 
-static void convert_yuv422p_to_yuyv_frame(guchar **src, int width, int height, guchar *dest) {
+static void convert_yuv422p_to_yuyv_frame(uint8_t **src, int width, int height, uint8_t *dest) {
   // TODO - handle different in sampling types
 
-  guchar *src_y=src[0];
-  guchar *src_u=src[1];
-  guchar *src_v=src[2];
-  guchar *end=src_y+width*height;
+  uint8_t *src_y=src[0];
+  uint8_t *src_u=src[1];
+  uint8_t *src_v=src[2];
+  uint8_t *end=src_y+width*height;
 
   while (src_y<end) {
     *(dest++)=*(src_u++);
@@ -3153,13 +3184,13 @@
 }
 
 
-static void convert_rgb_to_yuv411_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-					yuv411_macropixel *u, gboolean has_alpha, gboolean clamped) {
+static void convert_rgb_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+					yuv411_macropixel *u, boolean has_alpha, boolean clamped) {
   // for odd sized widths, cut the rightmost one, two or three pixels. Widths should be divisible by 4.
   // TODO - handle different out sampling types
-  gint hs3=(int)(hsize>>2)*12,ipstep=12;
+  int hs3=(int)(hsize>>2)*12,ipstep=12;
 
-  guchar *end;
+  uint8_t *end;
   register int i;
 
   int x=3,y=4,z=5,a=6,b=7,c=8,d=9,e=10,f=11;
@@ -3193,13 +3224,13 @@
 }
 
 
-static void convert_bgr_to_yuv411_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-					yuv411_macropixel *u, gboolean has_alpha, gboolean clamped) {
+static void convert_bgr_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+					yuv411_macropixel *u, boolean has_alpha, boolean clamped) {
   // for odd sized widths, cut the rightmost one, two or three pixels
   // TODO - handle different out sampling types
-  gint hs3=(int)(hsize>>2)*12,ipstep=12;
+  int hs3=(int)(hsize>>2)*12,ipstep=12;
 
-  guchar *end;
+  uint8_t *end;
   register int i;
 
   int x=3,y=4,z=5,a=6,b=7,c=8,d=9,e=10,f=11;
@@ -3233,13 +3264,13 @@
 }
 
 
-static void convert_argb_to_yuv411_frame(guchar *rgbdata, gint hsize, gint vsize, gint rowstride, 
-					yuv411_macropixel *u, gboolean clamped) {
+static void convert_argb_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
+					yuv411_macropixel *u, boolean clamped) {
   // for odd sized widths, cut the rightmost one, two or three pixels. Widths should be divisible by 4.
   // TODO - handle different out sampling types
-  gint hs3=(int)(hsize>>2)*12,ipstep=12;
+  int hs3=(int)(hsize>>2)*12,ipstep=12;
 
-  guchar *end;
+  uint8_t *end;
   register int i;
 
   if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
@@ -3261,7 +3292,7 @@
 }
 
 static void convert_uyvy_to_rgb_frame(uyvy_macropixel *src, int width, int height, int orowstride, 
-				      guchar *dest, gboolean add_alpha, gboolean clamped, int thread_id) {
+				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int i,j;
   int psize=6;
   int a=3,b=4,c=5;
@@ -3271,7 +3302,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3306,7 +3337,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3335,13 +3366,13 @@
 void *convert_uyvy_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_uyvy_to_rgb_frame((uyvy_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (guchar *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 static void convert_uyvy_to_bgr_frame(uyvy_macropixel *src, int width, int height, int orowstride, 
-				      guchar *dest, gboolean add_alpha, gboolean clamped, int thread_id) {
+				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int i,j;
   int psize=6;
 
@@ -3352,7 +3383,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3387,7 +3418,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3417,13 +3448,13 @@
 void *convert_uyvy_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_uyvy_to_bgr_frame((uyvy_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (guchar *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 static void convert_uyvy_to_argb_frame(uyvy_macropixel *src, int width, int height, int orowstride, 
-				       guchar *dest, gboolean clamped, int thread_id) {
+				       uint8_t *dest, boolean clamped, int thread_id) {
   register int i,j;
   int psize=8;
 
@@ -3432,7 +3463,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3466,7 +3497,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3489,13 +3520,13 @@
 void *convert_uyvy_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_uyvy_to_argb_frame((uyvy_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			     (guchar *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
+			     (uint8_t *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 static void convert_yuyv_to_rgb_frame(yuyv_macropixel *src, int width, int height, int orowstride, 
-				      guchar *dest, gboolean add_alpha, gboolean clamped, int thread_id) {
+				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int i,j;
   int psize=6;
   int a=3,b=4,c=5;
@@ -3505,7 +3536,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3539,7 +3570,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3568,13 +3599,13 @@
 void *convert_yuyv_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuyv_to_rgb_frame((yuyv_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (guchar *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 static void convert_yuyv_to_bgr_frame(yuyv_macropixel *src, int width, int height, int orowstride, 
-				      guchar *dest, gboolean add_alpha, gboolean clamped, int thread_id) {
+				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int x;
   int size=width*height,psize=6;
   int a=3,b=4,c=5;
@@ -3585,7 +3616,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3620,7 +3651,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3645,13 +3676,13 @@
 void *convert_yuyv_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuyv_to_bgr_frame((yuyv_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (guchar *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 static void convert_yuyv_to_argb_frame(yuyv_macropixel *src, int width, int height, int orowstride, 
-				       guchar *dest, gboolean clamped, int thread_id) {
+				       uint8_t *dest, boolean clamped, int thread_id) {
   register int i,j;
   int psize=8;
 
@@ -3660,7 +3691,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3694,7 +3725,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3717,16 +3748,16 @@
 void *convert_yuyv_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuyv_to_argb_frame((yuyv_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			     (guchar *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
+			     (uint8_t *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_yuv420_to_uyvy_frame(guchar **src, int width, int height, uyvy_macropixel *dest) {
+static void convert_yuv420_to_uyvy_frame(uint8_t **src, int width, int height, uyvy_macropixel *dest) {
   register int i=0,j;
-  guchar *y,*u,*v,*end;
+  uint8_t *y,*u,*v,*end;
   int hwidth=width>>1;
-  gboolean chroma=TRUE;
+  boolean chroma=TRUE;
 
   // TODO - handle different in sampling types
   if (!avg_inited) init_average();
@@ -3764,11 +3795,11 @@
 }
 
 
-static void convert_yuv420_to_yuyv_frame(guchar **src, int width, int height, yuyv_macropixel *dest) {
+static void convert_yuv420_to_yuyv_frame(uint8_t **src, int width, int height, yuyv_macropixel *dest) {
   register int i=0,j;
-  guchar *y,*u,*v,*end;
+  uint8_t *y,*u,*v,*end;
   int hwidth=width>>1;
-  gboolean chroma=TRUE;
+  boolean chroma=TRUE;
 
   // TODO - handle different in sampling types
   if (!avg_inited) init_average();
@@ -3806,14 +3837,14 @@
 }
 
 
-static void convert_yuv_planar_to_rgb_frame(guchar **src, int width, int height, int orowstride, guchar *dest, 
-					    gboolean in_alpha, gboolean out_alpha, gboolean clamped, int thread_id) {
-  guchar *y=src[0];
-  guchar *u=src[1];
-  guchar *v=src[2];
-  guchar *a=NULL;
+static void convert_yuv_planar_to_rgb_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest, 
+					    boolean in_alpha, boolean out_alpha, boolean clamped, int thread_id) {
+  uint8_t *y=src[0];
+  uint8_t *u=src[1];
+  uint8_t *v=src[2];
+  uint8_t *a=NULL;
 
-  guchar *end=y+width*height;
+  uint8_t *end=y+width*height;
 
   size_t opstep=3,rowstride;
   register int i,j;
@@ -3825,7 +3856,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3866,7 +3897,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3893,21 +3924,21 @@
 
 void *convert_yuv_planar_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuv_planar_to_rgb_frame((guchar **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-				  (guchar *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
+  convert_yuv_planar_to_rgb_frame((uint8_t **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
+				  (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
 				  ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_yuv_planar_to_bgr_frame(guchar **src, int width, int height, int orowstride, guchar *dest, 
-					    gboolean in_alpha, gboolean out_alpha, gboolean clamped, int thread_id) {
-  guchar *y=src[0];
-  guchar *u=src[1];
-  guchar *v=src[2];
-  guchar *a=NULL;
+static void convert_yuv_planar_to_bgr_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest, 
+					    boolean in_alpha, boolean out_alpha, boolean clamped, int thread_id) {
+  uint8_t *y=src[0];
+  uint8_t *u=src[1];
+  uint8_t *v=src[2];
+  uint8_t *a=NULL;
 
-  guchar *end=y+width*height;
+  uint8_t *end=y+width*height;
 
   size_t opstep=4,rowstride;
   register int i,j;
@@ -3919,7 +3950,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -3960,7 +3991,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -3986,22 +4017,22 @@
 
 void *convert_yuv_planar_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuv_planar_to_bgr_frame((guchar **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-				  (guchar *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
+  convert_yuv_planar_to_bgr_frame((uint8_t **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
+				  (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
 				  ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_yuv_planar_to_argb_frame(guchar **src, int width, int height, int orowstride, guchar *dest, 
-					     gboolean in_alpha, gboolean clamped, int thread_id) {
-  guchar *y=src[0];
-  guchar *u=src[1];
-  guchar *v=src[2];
-  guchar *a=NULL;
+static void convert_yuv_planar_to_argb_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest, 
+					     boolean in_alpha, boolean clamped, int thread_id) {
+  uint8_t *y=src[0];
+  uint8_t *u=src[1];
+  uint8_t *v=src[2];
+  uint8_t *a=NULL;
 
-  guchar *end=y+width*height;
+  uint8_t *end=y+width*height;
 
   size_t opstep=4,rowstride;
   register int i,j;
@@ -4013,7 +4044,7 @@
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -4053,7 +4084,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -4075,21 +4106,21 @@
 
 void *convert_yuv_planar_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_yuv_planar_to_argb_frame((guchar **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-				   (guchar *)ccparams->dest,ccparams->in_alpha,ccparams->in_clamped,ccparams->thread_id);
+  convert_yuv_planar_to_argb_frame((uint8_t **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
+				   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
 
-static void convert_yuv_planar_to_uyvy_frame(guchar **src, int width, int height, uyvy_macropixel *uyvy, gboolean clamped) {
+static void convert_yuv_planar_to_uyvy_frame(uint8_t **src, int width, int height, uyvy_macropixel *uyvy, boolean clamped) {
   register int x;
   int size=(width*height)>>1;
 
-  guchar *y=src[0];
-  guchar *u=src[1];
-  guchar *v=src[2];
+  uint8_t *y=src[0];
+  uint8_t *u=src[1];
+  uint8_t *v=src[2];
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -4107,13 +4138,13 @@
 }
 
 
-static void convert_yuv_planar_to_yuyv_frame(guchar **src, int width, int height, yuyv_macropixel *yuyv, gboolean clamped) {
+static void convert_yuv_planar_to_yuyv_frame(uint8_t **src, int width, int height, yuyv_macropixel *yuyv, boolean clamped) {
   register int x;
   int hsize=(width*height)>>1;
 
-  guchar *y=src[0];
-  guchar *u=src[1];
-  guchar *v=src[2];
+  uint8_t *y=src[0];
+  uint8_t *u=src[1];
+  uint8_t *v=src[2];
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -4129,18 +4160,18 @@
 }
 
 
-static void convert_combineplanes_frame(guchar **src, int width, int height, guchar *dest, gboolean in_alpha, 
-					gboolean out_alpha) {
+static void convert_combineplanes_frame(uint8_t **src, int width, int height, uint8_t *dest, boolean in_alpha, 
+					boolean out_alpha) {
   // turn 3 or 4 planes into packed pixels, src and dest can have alpha
 
   // e.g yuv444(4)p to yuv888(8)
 
   int size=width*height;
 
-  guchar *y=src[0];
-  guchar *u=src[1];
-  guchar *v=src[2];
-  guchar *a=NULL;
+  uint8_t *y=src[0];
+  uint8_t *u=src[1];
+  uint8_t *v=src[2];
+  uint8_t *a=NULL;
 
   register int x;
 
@@ -4158,16 +4189,16 @@
 }
 
 
-static void convert_yuvap_to_yuvp_frame(guchar **src, int width, int height, guchar **dest) {
+static void convert_yuvap_to_yuvp_frame(uint8_t **src, int width, int height, uint8_t **dest) {
   size_t size=width*height;
 
-  guchar *ys=src[0];
-  guchar *us=src[1];
-  guchar *vs=src[2];
-
-  guchar *yd=dest[0];
-  guchar *ud=dest[1];
-  guchar *vd=dest[2];
+  uint8_t *ys=src[0];
+  uint8_t *us=src[1];
+  uint8_t *vs=src[2];
+
+  uint8_t *yd=dest[0];
+  uint8_t *ud=dest[1];
+  uint8_t *vd=dest[2];
 
   if (yd!=ys) lives_memcpy(yd,ys,size);
   if (ud!=us) lives_memcpy(ud,us,size);
@@ -4176,13 +4207,13 @@
 }
 
 
-static void convert_yuvp_to_yuvap_frame(guchar **src, int width, int height, guchar **dest) {
+static void convert_yuvp_to_yuvap_frame(uint8_t **src, int width, int height, uint8_t **dest) {
   convert_yuvap_to_yuvp_frame(src,width,height,dest);
   memset(dest[3],255,width*height);
 }
 
 
-static void convert_yuvp_to_yuv420_frame(guchar **src, int width, int height, guchar **dest, gboolean clamped) {
+static void convert_yuvp_to_yuv420_frame(uint8_t **src, int width, int height, uint8_t **dest, boolean clamped) {
   // halve the chroma samples vertically and horizontally, with sub-sampling
 
   // convert 444p to 420p
@@ -4192,9 +4223,9 @@
   // y-plane should be copied before entering here
 
   register int i,j;
-  guchar *d_u,*d_v,*s_u=src[1],*s_v=src[2];
+  uint8_t *d_u,*d_v,*s_u=src[1],*s_v=src[2];
   register short x_u,x_v;
-  gboolean chroma=FALSE;
+  boolean chroma=FALSE;
 
   int hwidth=width>>1;
 
@@ -4235,14 +4266,14 @@
 }
 
 
-static void convert_yuvp_to_yuv411_frame(guchar **src, int width, int height, yuv411_macropixel *yuv, gboolean clamped) {
+static void convert_yuvp_to_yuv411_frame(uint8_t **src, int width, int height, yuv411_macropixel *yuv, boolean clamped) {
   // quarter the chroma samples horizontally, with sub-sampling
 
   // convert 444p to 411 packed
   // TODO - handle different output sampling types
 
   register int i,j;
-  guchar *s_y=src[0],*s_u=src[1],*s_v=src[2];
+  uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
   register short x_u,x_v;
 
   int widtha=(width>>1)<<1; // cut rightmost odd bytes
@@ -4277,15 +4308,15 @@
 }
 
 
-static void convert_uyvy_to_yuvp_frame(uyvy_macropixel *uyvy, int width, int height, guchar **dest, gboolean add_alpha) {
+static void convert_uyvy_to_yuvp_frame(uyvy_macropixel *uyvy, int width, int height, uint8_t **dest, boolean add_alpha) {
   // TODO - avg_chroma
 
   int size=width*height;
   register int x;
 
-  guchar *y=dest[0];
-  guchar *u=dest[1];
-  guchar *v=dest[2];
+  uint8_t *y=dest[0];
+  uint8_t *u=dest[1];
+  uint8_t *v=dest[2];
 
   for (x=0;x<size;x++) {
     *(u++)=uyvy->u0;
@@ -4301,15 +4332,15 @@
 }
 
 
-static void convert_yuyv_to_yuvp_frame(yuyv_macropixel *yuyv, int width, int height, guchar **dest, gboolean add_alpha) {
+static void convert_yuyv_to_yuvp_frame(yuyv_macropixel *yuyv, int width, int height, uint8_t **dest, boolean add_alpha) {
   // TODO - subsampling
 
   int size=width*height;
   register int x;
 
-  guchar *y=dest[0];
-  guchar *u=dest[1];
-  guchar *v=dest[2];
+  uint8_t *y=dest[0];
+  uint8_t *u=dest[1];
+  uint8_t *v=dest[2];
 
   for (x=0;x<size;x++) {
     *(y++)=yuyv->y0;
@@ -4325,7 +4356,7 @@
 }
 
 
-static void convert_uyvy_to_yuv888_frame(uyvy_macropixel *uyvy, int width, int height, guchar *yuv, gboolean add_alpha) {
+static void convert_uyvy_to_yuv888_frame(uyvy_macropixel *uyvy, int width, int height, uint8_t *yuv, boolean add_alpha) {
   int size=width*height;
   register int x;
 
@@ -4346,7 +4377,7 @@
 }
 
 
-static void convert_yuyv_to_yuv888_frame(yuyv_macropixel *yuyv, int width, int height, guchar *yuv, gboolean add_alpha) {
+static void convert_yuyv_to_yuv888_frame(yuyv_macropixel *yuyv, int width, int height, uint8_t *yuv, boolean add_alpha) {
   int size=width*height;
   register int x;
 
@@ -4366,20 +4397,20 @@
 }
 
 
-static void convert_uyvy_to_yuv420_frame(uyvy_macropixel *uyvy, int width, int height, guchar **yuv, gboolean clamped) {
+static void convert_uyvy_to_yuv420_frame(uyvy_macropixel *uyvy, int width, int height, uint8_t **yuv, boolean clamped) {
   // subsample vertically
 
   // TODO - handle different sampling types
 
   register int j;
 
-  guchar *y=yuv[0];
-  guchar *u=yuv[1];
-  guchar *v=yuv[2];
+  uint8_t *y=yuv[0];
+  uint8_t *u=yuv[1];
+  uint8_t *v=yuv[2];
 
-  gboolean chroma=TRUE;
+  boolean chroma=TRUE;
 
-  guchar *end=y+width*height*2;
+  uint8_t *end=y+width*height*2;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -4408,20 +4439,20 @@
 }
 
 
-static void convert_yuyv_to_yuv420_frame(yuyv_macropixel *yuyv, int width, int height, guchar **yuv, gboolean clamped) {
+static void convert_yuyv_to_yuv420_frame(yuyv_macropixel *yuyv, int width, int height, uint8_t **yuv, boolean clamped) {
   // subsample vertically
 
   // TODO - handle different sampling types
 
   register int j;
 
-  guchar *y=yuv[0];
-  guchar *u=yuv[1];
-  guchar *v=yuv[2];
+  uint8_t *y=yuv[0];
+  uint8_t *u=yuv[1];
+  uint8_t *v=yuv[2];
 
-  gboolean chroma=TRUE;
+  boolean chroma=TRUE;
 
-  guchar *end=y+width*height*2;
+  uint8_t *end=y+width*height*2;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -4451,7 +4482,7 @@
 
 
 static void convert_uyvy_to_yuv411_frame(uyvy_macropixel *uyvy, int width, int height, yuv411_macropixel *yuv, 
-					 gboolean clamped) {
+					 boolean clamped) {
   // subsample chroma horizontally
 
   uyvy_macropixel *end=uyvy+width*height;
@@ -4482,7 +4513,7 @@
 
 
 static void convert_yuyv_to_yuv411_frame(yuyv_macropixel *yuyv, int width, int height, yuv411_macropixel *yuv, 
-					 gboolean clamped) {
+					 boolean clamped) {
   // subsample chroma horizontally
 
   // TODO - handle different sampling types
@@ -4513,8 +4544,8 @@
   }
 }
 
-static void convert_yuv888_to_yuv420_frame(guchar *yuv8, int width, int height, int irowstride, 
-					   guchar **yuv4, gboolean src_alpha, gboolean clamped) {
+static void convert_yuv888_to_yuv420_frame(uint8_t *yuv8, int width, int height, int irowstride, 
+					   uint8_t **yuv4, boolean src_alpha, boolean clamped) {
   // subsample vertically and horizontally
 
   // 
@@ -4528,9 +4559,9 @@
   register int j;
   register short x_u,x_v;
 
-  guchar *d_y,*d_u,*d_v,*end;
+  uint8_t *d_y,*d_u,*d_v,*end;
 
-  gboolean chroma=TRUE;
+  boolean chroma=TRUE;
 
   size_t hwidth=width>>1,ipsize=3,ipsize2;
   int widthx;
@@ -4574,12 +4605,12 @@
 }
 
 
-static void convert_uyvy_to_yuv422_frame(uyvy_macropixel *uyvy, int width, int height, guchar **yuv) {
+static void convert_uyvy_to_yuv422_frame(uyvy_macropixel *uyvy, int width, int height, uint8_t **yuv) {
   int size=width*height; // y is twice this, u and v are equal
 
-  guchar *y=yuv[0];
-  guchar *u=yuv[1];
-  guchar *v=yuv[2];
+  uint8_t *y=yuv[0];
+  uint8_t *u=yuv[1];
+  uint8_t *v=yuv[2];
 
   register int x;
 
@@ -4591,12 +4622,12 @@
   }
 }
 
-static void convert_yuyv_to_yuv422_frame(yuyv_macropixel *yuyv, int width, int height, guchar **yuv) {
+static void convert_yuyv_to_yuv422_frame(yuyv_macropixel *yuyv, int width, int height, uint8_t **yuv) {
   int size=width*height; // y is twice this, u and v are equal
 
-  guchar *y=yuv[0];
-  guchar *u=yuv[1];
-  guchar *v=yuv[2];
+  uint8_t *y=yuv[0];
+  uint8_t *u=yuv[1];
+  uint8_t *v=yuv[2];
 
   register int x;
 
@@ -4609,8 +4640,8 @@
 }
 
 
-static void convert_yuv888_to_yuv422_frame(guchar *yuv8, int width, int height, int irowstride, 
-					   guchar **yuv4, gboolean has_alpha, gboolean clamped) {
+static void convert_yuv888_to_yuv422_frame(uint8_t *yuv8, int width, int height, int irowstride, 
+					   uint8_t **yuv4, boolean has_alpha, boolean clamped) {
 
   // 888(8) packed to 422p
 
@@ -4618,9 +4649,9 @@
 
   int size=width*height; // y is equal this, u and v are half, chroma subsampled horizontally
 
-  guchar *y=yuv4[0];
-  guchar *u=yuv4[1];
-  guchar *v=yuv4[2];
+  uint8_t *y=yuv4[0];
+  uint8_t *u=yuv4[1];
+  uint8_t *v=yuv4[2];
 
   register int x,i,j;
 
@@ -4660,8 +4691,8 @@
 }
 
 
-static void convert_yuv888_to_uyvy_frame(guchar *yuv, int width, int height, int irowstride, 
-					 uyvy_macropixel *uyvy, gboolean has_alpha, gboolean clamped) {
+static void convert_yuv888_to_uyvy_frame(uint8_t *yuv, int width, int height, int irowstride, 
+					 uyvy_macropixel *uyvy, boolean has_alpha, boolean clamped) {
   int size=width*height;
 
   register int x,i,j;
@@ -4705,8 +4736,8 @@
 }
 
 
-static void convert_yuv888_to_yuyv_frame(guchar *yuv, int width, int height, int irowstride, 
-					 yuyv_macropixel *yuyv, gboolean has_alpha, gboolean clamped) {
+static void convert_yuv888_to_yuyv_frame(uint8_t *yuv, int width, int height, int irowstride, 
+					 yuyv_macropixel *yuyv, boolean has_alpha, boolean clamped) {
   int size=width*height;
 
   register int x,i,j;
@@ -4747,13 +4778,13 @@
   }
 } 
     
-static void convert_yuv888_to_yuv411_frame(guchar *yuv8, int width, int height, int irowstride, 
-					   yuv411_macropixel *yuv411, gboolean has_alpha) {
+static void convert_yuv888_to_yuv411_frame(uint8_t *yuv8, int width, int height, int irowstride, 
+					   yuv411_macropixel *yuv411, boolean has_alpha) {
   // yuv 888(8) packed to yuv411. Chroma pixels are averaged.
 
   // TODO - handle different sampling types
 
-  guchar *end=yuv8+width*height;
+  uint8_t *end=yuv8+width*height;
   register int x;
   size_t ipsize=3;
   int widtha=(width>>1)<<1; // cut rightmost odd bytes
@@ -4781,10 +4812,10 @@
 
 
 static void convert_yuv411_to_rgb_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride, 
-					guchar *dest, gboolean add_alpha, gboolean clamped) {
+					uint8_t *dest, boolean add_alpha, boolean clamped) {
   uyvy_macropixel uyvy;
   int m=3,n=4,o=5;
-  guchar u,v,h_u,h_v,q_u,q_v,y0,y1;
+  uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   size_t psize=3,psize2;
@@ -4889,10 +4920,10 @@
 
 
 static void convert_yuv411_to_bgr_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride, 
-					guchar *dest, gboolean add_alpha, gboolean clamped) {
+					uint8_t *dest, boolean add_alpha, boolean clamped) {
   uyvy_macropixel uyvy;
   int m=3,n=4,o=5;
-  guchar u,v,h_u,h_v,q_u,q_v,y0,y1;
+  uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   size_t psize=3,psize2;
@@ -4998,9 +5029,9 @@
 
 
 static void convert_yuv411_to_argb_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride, 
-					 guchar *dest, gboolean clamped) {
+					 uint8_t *dest, boolean clamped) {
   uyvy_macropixel uyvy;
-  guchar u,v,h_u,h_v,q_u,q_v,y0,y1;
+  uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   size_t psize=4,psize2;
@@ -5098,11 +5129,11 @@
 
 
 static void convert_yuv411_to_yuv888_frame(yuv411_macropixel *yuv411, int width, int height, 
-					   guchar *dest, gboolean add_alpha, gboolean clamped) {
+					   uint8_t *dest, boolean add_alpha, boolean clamped) {
   size_t psize=3;
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
-  guchar u,v,h_u,h_v,q_u,q_v,y0,y1;
+  uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -5216,16 +5247,16 @@
 }
 
 
-static void convert_yuv411_to_yuvp_frame(yuv411_macropixel *yuv411, int width, int height, guchar **dest, 
-					 gboolean add_alpha, gboolean clamped) {
+static void convert_yuv411_to_yuvp_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest, 
+					 boolean add_alpha, boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
-  guchar u,v,h_u,h_v,q_u,q_v,y0;
+  uint8_t u,v,h_u,h_v,q_u,q_v,y0;
 
-  guchar *d_y=dest[0];
-  guchar *d_u=dest[1];
-  guchar *d_v=dest[2];
-  guchar *d_a=dest[3];
+  uint8_t *d_y=dest[0];
+  uint8_t *d_u=dest[1];
+  uint8_t *d_v=dest[2];
+  uint8_t *d_a=dest[3];
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -5322,10 +5353,10 @@
 
 
 static void convert_yuv411_to_uyvy_frame(yuv411_macropixel *yuv411, int width, int height, 
-					 uyvy_macropixel *uyvy, gboolean clamped) {
+					 uyvy_macropixel *uyvy, boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
-  guchar u,v,h_u,h_v,y0;
+  uint8_t u,v,h_u,h_v,y0;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -5393,10 +5424,10 @@
 
 
 static void convert_yuv411_to_yuyv_frame(yuv411_macropixel *yuv411, int width, int height, yuyv_macropixel *yuyv, 
-					 gboolean clamped) {
+					 boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
-  guchar u,v,h_u,h_v,y0;
+  uint8_t u,v,h_u,h_v,y0;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -5463,15 +5494,15 @@
 }
 
 
-static void convert_yuv411_to_yuv422_frame(yuv411_macropixel *yuv411, int width, int height, guchar **dest, 
-					   gboolean clamped) {
+static void convert_yuv411_to_yuv422_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest, 
+					   boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
-  guchar h_u,h_v;
+  uint8_t h_u,h_v;
 
-  guchar *d_y=dest[0];
-  guchar *d_u=dest[1];
-  guchar *d_v=dest[2];
+  uint8_t *d_y=dest[0];
+  uint8_t *d_u=dest[1];
+  uint8_t *d_v=dest[2];
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -5521,17 +5552,17 @@
 }
 
 
-static void convert_yuv411_to_yuv420_frame(yuv411_macropixel *yuv411, int width, int height, guchar **dest, 
-					   gboolean is_yvu, gboolean clamped) {
+static void convert_yuv411_to_yuv420_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest, 
+					   boolean is_yvu, boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
-  guchar h_u,h_v,u,v;
+  uint8_t h_u,h_v,u,v;
 
-  guchar *d_y=dest[0];
-  guchar *d_u;
-  guchar *d_v;
+  uint8_t *d_y=dest[0];
+  uint8_t *d_u;
+  uint8_t *d_v;
 
-  gboolean chroma=FALSE;
+  boolean chroma=FALSE;
 
   size_t width2=width<<1;
 
@@ -5636,13 +5667,13 @@
 }
 
 
-static void convert_yuv420_to_yuv411_frame(guchar **src, gint hsize, gint vsize, yuv411_macropixel *dest, 
-					   gboolean is_422, gboolean clamped) {
+static void convert_yuv420_to_yuv411_frame(uint8_t **src, int hsize, int vsize, yuv411_macropixel *dest, 
+					   boolean is_422, boolean clamped) {
   // TODO -handle various sampling types
 
   register int i=0,j;
-  guchar *y,*u,*v,*end;
-  gboolean chroma=TRUE;
+  uint8_t *y,*u,*v,*end;
+  boolean chroma=TRUE;
 
   size_t qwidth,hwidth;
 
@@ -5687,19 +5718,19 @@
 
 
 
-static void convert_splitplanes_frame(guchar *src, int width, int height, int irowstride, 
-				      guchar **dest, gboolean src_alpha, gboolean dest_alpha) {
+static void convert_splitplanes_frame(uint8_t *src, int width, int height, int irowstride, 
+				      uint8_t **dest, boolean src_alpha, boolean dest_alpha) {
 
   // convert 888(8) packed to 444(4)P planar
   size_t size=width*height;
   int ipsize=3;
 
-  guchar *y=dest[0];
-  guchar *u=dest[1];
-  guchar *v=dest[2];
-  guchar *a=dest[3];
+  uint8_t *y=dest[0];
+  uint8_t *u=dest[1];
+  uint8_t *v=dest[2];
+  uint8_t *a=dest[3];
 
-  guchar *end;
+  uint8_t *end;
 
   register int i,j;
 
@@ -5741,16 +5772,16 @@
 /////////////////////////////////////////////////////////////////
 // RGB palette conversions
 
-static void convert_swap3_frame (guchar *src, int width, int height, int irowstride, int orowstride, 
-				 guchar *dest, int thread_id) {
+static void convert_swap3_frame (uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				 uint8_t *dest, int thread_id) {
   // swap 3 byte palette
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -5784,7 +5815,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -5817,23 +5848,23 @@
 
 void *convert_swap3_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap3_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		      ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap3_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+		      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_swap4_frame (guchar *src, int width, int height, int irowstride, int orowstride, 
-				 guchar *dest, int thread_id) {
+static void convert_swap4_frame (uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				 uint8_t *dest, int thread_id) {
   // swap 4 byte palette
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -5864,7 +5895,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -5896,22 +5927,22 @@
 
 void *convert_swap4_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap4_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		      ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap4_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+		      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_swap3addpost_frame(guchar *src, int width, int height, int irowstride, int orowstride, 
-				       guchar *dest, int thread_id) {
+static void convert_swap3addpost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				       uint8_t *dest, int thread_id) {
   // swap 3 bytes, add post alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -5945,7 +5976,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -5977,23 +6008,23 @@
 
 void *convert_swap3addpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap3addpost_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			     ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap3addpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			     ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_swap3addpre_frame(guchar *src, int width, int height, int irowstride, int orowstride, 
-				      guchar *dest, int thread_id) {
+static void convert_swap3addpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				      uint8_t *dest, int thread_id) {
   // swap 3 bytes, add pre alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6027,7 +6058,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6058,22 +6089,22 @@
 
 void *convert_swap3addpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap3addpre_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap3addpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			    ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_swap3postalpha_frame(guchar *src, int width, int height, int irowstride, int orowstride, 
-					 guchar *dest, int thread_id) {
+static void convert_swap3postalpha_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
+					 uint8_t *dest, int thread_id) {
   // swap 3 bytes, leave alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6107,7 +6138,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6139,22 +6170,22 @@
 
 void *convert_swap3postalpha_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap3postalpha_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			       ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap3postalpha_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_addpost_frame(guchar *src, int width, int height, int irowstride, int orowstride, 
-				  guchar *dest, int thread_id) {
+static void convert_addpost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				  uint8_t *dest, int thread_id) {
   // add post alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6188,7 +6219,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6224,22 +6255,22 @@
 
 void *convert_addpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_addpost_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_addpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_addpre_frame(guchar *src, int width, int height, int irowstride, int orowstride, 
-				 guchar *dest, int thread_id) {
+static void convert_addpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				 uint8_t *dest, int thread_id) {
   // add pre alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6273,7 +6304,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6305,21 +6336,21 @@
 
 void *convert_addpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_addpre_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		       ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_addpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+		       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
-static void convert_swap3delpost_frame(guchar *src,int width,int height, int irowstride, int orowstride, 
-				       guchar *dest, int thread_id) {
+static void convert_swap3delpost_frame(uint8_t *src,int width,int height, int irowstride, int orowstride, 
+				       uint8_t *dest, int thread_id) {
   // swap 3 bytes, delete post alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6353,7 +6384,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6382,22 +6413,22 @@
 
 void *convert_swap3delpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap3delpost_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			     ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap3delpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			     ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_delpost_frame(guchar *src,int width,int height, int irowstride, int orowstride, 
-				  guchar *dest, int thread_id) {
+static void convert_delpost_frame(uint8_t *src,int width,int height, int irowstride, int orowstride, 
+				  uint8_t *dest, int thread_id) {
   // delete post alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6431,7 +6462,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6439,9 +6470,8 @@
   if ((irowstride==width*4)&&(orowstride==width*3)) {
     // quick version
     for (;src<end;src+=4) {
-      *(dest++)=src[0]; // r
-      *(dest++)=src[1]; // g
-      *(dest++)=src[2]; // b
+      weed_memcpy(dest,src,3);
+      dest+=3;
     }
   }
   else {
@@ -6449,9 +6479,8 @@
     orowstride-=width*3;
     for (;src<end;src+=irowstride) {
       for (i=0;i<width4;i+=4) {
-	*(dest++)=src[i]; // r
-	*(dest++)=src[i+1]; // g
-	*(dest++)=src[i+2]; // b
+	weed_memcpy(dest,&src[i],3);
+	dest+=3;
       }
       dest+=orowstride;
     }
@@ -6461,23 +6490,23 @@
 
 void *convert_delpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_delpost_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_delpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_delpre_frame(guchar *src,int width,int height, int irowstride, int orowstride, 
-				 guchar *dest, int thread_id) {
+static void convert_delpre_frame(uint8_t *src,int width,int height, int irowstride, int orowstride, 
+				 uint8_t *dest, int thread_id) {
   // delete pre alpha
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6511,7 +6540,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6520,9 +6549,8 @@
   if ((irowstride==width*4)&&(orowstride==width*3)) {
     // quick version
     for (;src<end;src+=4) {
-      *(dest++)=src[0]; // r
-      *(dest++)=src[1]; // g
-      *(dest++)=src[2]; // b
+      weed_memcpy(dest,src,3);
+      dest+=3;
     }
   }
   else {
@@ -6530,9 +6558,8 @@
     orowstride-=width*3;
     for (;src<end;src+=irowstride) {
       for (i=0;i<width4;i+=4) {
-	*(dest++)=src[i]; // r
-	*(dest++)=src[i+1]; // g
-	*(dest++)=src[i+2]; // b
+	weed_memcpy(dest,&src[i],3);
+	dest+=3;
       }
       dest+=orowstride;
     }
@@ -6543,22 +6570,22 @@
 
 void *convert_delpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_delpre_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		       ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_delpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+		       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_swap3delpre_frame(guchar *src, int width, int height, int irowstride, int orowstride, 
-				      guchar *dest, int thread_id) {
+static void convert_swap3delpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				      uint8_t *dest, int thread_id) {
   // delete pre alpha, swap last 3
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6592,7 +6619,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6621,23 +6648,23 @@
 
 void *convert_swap3delpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swap3delpre_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swap3delpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			    ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_swapprepost_frame (guchar *src, int width, int height, int irowstride, int orowstride, 
-				       guchar *dest, gboolean alpha_first, int thread_id) {
+static void convert_swapprepost_frame (uint8_t *src, int width, int height, int irowstride, int orowstride, 
+				       uint8_t *dest, boolean alpha_first, int thread_id) {
   // swap first and last bytes in a 4 byte palette
-  guchar *end=src+height*irowstride;
+  uint8_t *end=src+height*irowstride;
   register int i;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6674,7 +6701,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6725,23 +6752,23 @@
 
 void *convert_swapprepost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swapprepost_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    ccparams->orowstrides[0],(guchar *)ccparams->dest,ccparams->alpha_first,ccparams->thread_id);
+  convert_swapprepost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
+			    ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->alpha_first,ccparams->thread_id);
   return NULL;
 }
 
 //////////////////////////
 // genric YUV
 
-static void convert_swab_frame(guchar *src, int width, int height, guchar *dest, int thread_id) {
+static void convert_swab_frame(uint8_t *src, int width, int height, uint8_t *dest, int thread_id) {
   register int i;
   int width4=width*4;
-  guchar *end=src+height*width4;
+  uint8_t *end=src+height*width4;
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
-    gboolean useme=FALSE;
+    boolean useme=FALSE;
     lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
@@ -6773,7 +6800,7 @@
     for (i=0;i<nthreads;i++) {
       pthread_join(cthreads[i],NULL);
     }
-    free(ccparams);
+    g_free(ccparams);
     return;
   }
 
@@ -6789,13 +6816,13 @@
 
 void *convert_swab_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
-  convert_swab_frame((guchar *)ccparams->src,ccparams->hsize,ccparams->vsize,
-		     (guchar *)ccparams->dest,ccparams->thread_id);
+  convert_swab_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,
+		     (uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_halve_chroma(guchar **src, int width, int height, guchar **dest, gboolean clamped) {
+static void convert_halve_chroma(uint8_t **src, int width, int height, uint8_t **dest, boolean clamped) {
   // width and height here are width and height of src *chroma* planes, in bytes
   
   // halve the chroma samples vertically, with sub-sampling, e.g. 422p to 420p
@@ -6803,8 +6830,8 @@
   // TODO : handle different sampling methods in and out
 
   register int i,j;
-  guchar *d_u=dest[1],*d_v=dest[2],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *d_u=dest[1],*d_v=dest[2],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -6834,7 +6861,7 @@
 }
 
 
-static void convert_double_chroma(guchar **src, int width, int height, guchar **dest, gboolean clamped) {
+static void convert_double_chroma(uint8_t **src, int width, int height, uint8_t **dest, boolean clamped) {
   // width and height here are width and height of src *chroma* planes, in bytes
   
   // double two chroma planes vertically, with interpolation: eg: 420p to 422p
@@ -6842,8 +6869,8 @@
   // TODO - handle different sampling methods in and out
 
   register int i,j;
-  guchar *d_u=dest[1],*d_v=dest[2],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *d_u=dest[1],*d_v=dest[2],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
   int height2=height<<1;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
@@ -6872,7 +6899,7 @@
 }
 
 
-static void convert_quad_chroma(guchar **src, int width, int height, guchar **dest, gboolean add_alpha, gboolean clamped) {
+static void convert_quad_chroma(uint8_t **src, int width, int height, uint8_t **dest, boolean add_alpha, boolean clamped) {
   // width and height here are width and height of dest chroma planes, in bytes
   
   // double the chroma samples vertically and horizontally, with interpolation, eg. 420p to 444p
@@ -6884,8 +6911,8 @@
   // TESTED !
 
   register int i,j;
-  guchar *d_u=dest[1],*d_v=dest[2],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *d_u=dest[1],*d_v=dest[2],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
   int height2;
   int width2;
 
@@ -6938,8 +6965,8 @@
 }
 
 
-static void convert_quad_chroma_packed(guchar **src, int width, int height, guchar *dest, gboolean add_alpha, 
-				       gboolean clamped) {
+static void convert_quad_chroma_packed(uint8_t **src, int width, int height, uint8_t *dest, boolean add_alpha, 
+				       boolean clamped) {
   // width and height here are width and height of dest chroma planes, in bytes
   // stretch (double) the chroma samples vertically and horizontally, with interpolation
 
@@ -6952,8 +6979,8 @@
   // TESTED !
 
   register int i,j;
-  guchar *s_y=src[0],*s_u=src[1],*s_v=src[2];
-  gboolean chroma=FALSE;
+  uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
+  boolean chroma=FALSE;
   int widthx,hwidth=width>>1;
   int opsize=3,opsize2;
 
@@ -7011,8 +7038,8 @@
   }
 }
 
-static void convert_double_chroma_packed(guchar **src, int width, int height, guchar *dest, gboolean add_alpha, 
-					 gboolean clamped) {
+static void convert_double_chroma_packed(uint8_t **src, int width, int height, uint8_t *dest, boolean add_alpha, 
+					 boolean clamped) {
   // width and height here are width and height of dest chroma planes, in bytes
   // double the chroma samples horizontally, with interpolation
 
@@ -7023,7 +7050,7 @@
   //TODO: handle non-dvntsc in
 
   register int i,j;
-  guchar *s_y=src[0],*s_u=src[1],*s_v=src[2];
+  uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
   int widthx;
   int opsize=3,opsize2;
 
@@ -7126,13 +7153,13 @@
 
   void **pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
 
-  guchar *src,*src1,*src2,*end;
+  uint8_t *src,*src1,*src2,*end;
 
   get_YUV_to_YUV_conversion_arrays(iclamping,isubspace,oclamping,osubspace);
 
   switch (palette) {
   case WEED_PALETTE_YUVA8888:
-    src=(guchar *)pixel_data[0];
+    src=(uint8_t *)pixel_data[0];
     end=src+width*height*4;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7144,7 +7171,7 @@
     }
     break;
   case WEED_PALETTE_YUV888:
-    src=(guchar *)pixel_data[0];
+    src=(uint8_t *)pixel_data[0];
     end=src+width*height*3;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7157,9 +7184,9 @@
     break;
   case WEED_PALETTE_YUVA4444P:
   case WEED_PALETTE_YUV444P:
-    src=(guchar *)pixel_data[0];
-    src1=(guchar *)pixel_data[1];
-    src2=(guchar *)pixel_data[2];
+    src=(uint8_t *)pixel_data[0];
+    src1=(uint8_t *)pixel_data[1];
+    src2=(uint8_t *)pixel_data[2];
     end=src+width*height;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7171,7 +7198,7 @@
     }
     break;
   case WEED_PALETTE_UYVY:
-    src=(guchar *)pixel_data[0];
+    src=(uint8_t *)pixel_data[0];
     end=src+width*height*4;
     while (src<end) {
       *src=U_to_U[*src];
@@ -7185,7 +7212,7 @@
     }
     break;
   case WEED_PALETTE_YUYV:
-    src=(guchar *)pixel_data[0];
+    src=(uint8_t *)pixel_data[0];
     end=src+width*height*4;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7199,9 +7226,9 @@
     }
     break;
   case WEED_PALETTE_YUV422P:
-    src=(guchar *)pixel_data[0];
-    src1=(guchar *)pixel_data[1];
-    src2=(guchar *)pixel_data[2];
+    src=(uint8_t *)pixel_data[0];
+    src1=(uint8_t *)pixel_data[1];
+    src2=(uint8_t *)pixel_data[2];
     end=src+width*height;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7215,9 +7242,9 @@
     }
     break;
   case WEED_PALETTE_YVU420P:
-    src=(guchar *)pixel_data[0];
-    src1=(guchar *)pixel_data[2];
-    src2=(guchar *)pixel_data[1];
+    src=(uint8_t *)pixel_data[0];
+    src1=(uint8_t *)pixel_data[2];
+    src2=(uint8_t *)pixel_data[1];
     end=src+width*height;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7235,9 +7262,9 @@
     }
     break;
   case WEED_PALETTE_YUV420P:
-    src=(guchar *)pixel_data[0];
-    src1=(guchar *)pixel_data[1];
-    src2=(guchar *)pixel_data[2];
+    src=(uint8_t *)pixel_data[0];
+    src1=(uint8_t *)pixel_data[1];
+    src2=(uint8_t *)pixel_data[2];
     end=src+width*height;
     while (src<end) {
       *src=Y_to_Y[*src];
@@ -7255,7 +7282,7 @@
     }
     break;
   case WEED_PALETTE_YUV411:
-    src=(guchar *)pixel_data[0];
+    src=(uint8_t *)pixel_data[0];
     end=src+width*height*6;
     while (src<end) {
       *src=U_to_U[*src];
@@ -7283,7 +7310,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
 
-void create_empty_pixel_data(weed_plant_t *layer, gboolean black_fill, gboolean may_contig) {
+void create_empty_pixel_data(weed_plant_t *layer, boolean black_fill, boolean may_contig) {
   // width, height are src size in (macro) pixels
   // warning, width and height may be adjusted
 
@@ -7300,9 +7327,9 @@
   int y_black=16;
   int clamping=WEED_YUV_CLAMPING_CLAMPED;
 
-  guchar *pixel_data;
-  guchar *memblock;
-  guchar **pd_array;
+  uint8_t *pixel_data;
+  uint8_t *memblock;
+  uint8_t **pd_array;
 
   unsigned char black[6]={0,0,0,255,255,255};
   float blackf[4]={0.,0.,0.,1.};
@@ -7326,24 +7353,33 @@
   switch (palette) {
   case WEED_PALETTE_RGB24:
   case WEED_PALETTE_BGR24:
+#ifdef USE_SWSCALE
+    rowstride=CEIL(width*3,mainw->rowstride_alignment);
+#else
     rowstride=width*3;
-    framesize=CEIL(width*height*3,32);
-    pixel_data=(guchar *)calloc(framesize>>2,4);
+#endif
+    framesize=CEIL(rowstride*height,32);
+    pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
     if (pixel_data==NULL) return;
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     weed_set_int_value(layer,"rowstrides",rowstride);
     break;
 
   case WEED_PALETTE_YUV888:
-    framesize=CEIL(width*height*3,32);
+#ifdef USE_SWSCALE
+    rowstride=CEIL(width*3,mainw->rowstride_alignment);
+#else
+    rowstride=width*3;
+#endif
+    framesize=CEIL(rowstride*height,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
       black[0]=y_black;
       black[1]=black[2]=128;
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7353,7 +7389,6 @@
 	}
       }
     }
-    rowstride=width*3;
     weed_set_int_value(layer,"rowstrides",rowstride);
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     break;
@@ -7361,13 +7396,13 @@
   case WEED_PALETTE_UYVY8888:
     framesize=CEIL(width*height*4,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
       black[1]=black[3]=y_black;
       black[0]=black[2]=128;
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7385,13 +7420,13 @@
   case WEED_PALETTE_YUYV8888:
     framesize=CEIL(width*height*4,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
       black[0]=black[2]=y_black;
       black[1]=black[3]=128;
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7407,13 +7442,18 @@
     break;
 
   case WEED_PALETTE_RGBA32:
-    framesize=CEIL(width*height*4,32);
+#ifdef USE_SWSCALE
+    rowstride=CEIL(width*4,mainw->rowstride_alignment);
+#else
+    rowstride=width*4;
+#endif
+    framesize=CEIL(rowstride*height,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7423,19 +7463,23 @@
 	}
       }
     }
-    rowstride=width*4;
     weed_set_int_value(layer,"rowstrides",rowstride);
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     break;
 
   case WEED_PALETTE_BGRA32:
-    framesize=CEIL(width*height*4,32);
+#ifdef USE_SWSCALE
+    rowstride=CEIL(width*4,mainw->rowstride_alignment);
+#else
+    rowstride=width*4;
+#endif
+    framesize=CEIL(rowstride*height,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7445,21 +7489,25 @@
 	}
       }
     }
-    rowstride=width*4;
     weed_set_int_value(layer,"rowstrides",rowstride);
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     break;
 
   case WEED_PALETTE_ARGB32:
-    framesize=CEIL(width*height*4,32);
+#ifdef USE_SWSCALE
+    rowstride=CEIL(width*4,mainw->rowstride_alignment);
+#else
+    rowstride=width*4;
+#endif
+    framesize=CEIL(rowstride*height,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
       black[0]=255;
       black[3]=0;
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7469,21 +7517,25 @@
 	}
       }
     }
-    rowstride=width*4;
     weed_set_int_value(layer,"rowstrides",rowstride);
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     break;
 
   case WEED_PALETTE_YUVA8888:
-    framesize=CEIL(width*height*4,32);
+#ifdef USE_SWSCALE
+    rowstride=CEIL(width*4,mainw->rowstride_alignment);
+#else
+    rowstride=width*4;
+#endif
+    framesize=CEIL(rowstride*height,32);
     if (!black_fill) {
-      pixel_data=(guchar *)calloc(framesize>>2,4);
+      pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
     }
     else {
       black[0]=y_black;
       black[1]=black[2]=128;
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7493,7 +7545,6 @@
 	}
       }
     }
-    rowstride=width*4;
     weed_set_int_value(layer,"rowstrides",rowstride);
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     break;
@@ -7509,7 +7560,7 @@
     rowstrides[1]=rowstrides[2]=(width>>1);
     weed_set_int_array(layer,"rowstrides",3,rowstrides);
     g_free(rowstrides);
-    pd_array=(guchar **)g_malloc(3*sizeof(guchar *));
+    pd_array=(uint8_t **)g_malloc(3*sizeof(uint8_t *));
 
     framesize=CEIL(width*height,32);
 
@@ -7517,18 +7568,18 @@
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
       if (!black_fill) {
-	pd_array[0]=(guchar *)calloc(framesize>>2,4);
+	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[1]=(guchar *)calloc(framesize>>4,4);
+	pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,4);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[2]=(guchar *)calloc(framesize>>4,4);
+	pd_array[2]=(uint8_t *)lives_calloc(framesize>>4,4);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7537,20 +7588,20 @@
 	}
       }
       else {
-	pd_array[0]=(guchar *)g_try_malloc(framesize);
+	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(guchar *)g_try_malloc(framesize>>2);
+	pd_array[1]=(uint8_t *)g_try_malloc(framesize>>2);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[1],128,width*height/4);
-	pd_array[2]=(guchar *)g_try_malloc(framesize>>2);
+	pd_array[2]=(uint8_t *)g_try_malloc(framesize>>2);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7564,20 +7615,20 @@
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
 
       if (!black_fill) {
-	memblock=(guchar *)calloc((framesize*3)>>3,4);
+	memblock=(uint8_t *)lives_calloc((framesize*3)>>3,4);
 	if (memblock==NULL) return;
-	pd_array[0]=(guchar *)memblock;
-	pd_array[1]=(guchar *)(memblock+framesize);
-	pd_array[2]=(guchar *)(memblock+((framesize*5)>>2));
+	pd_array[0]=(uint8_t *)memblock;
+	pd_array[1]=(uint8_t *)(memblock+framesize);
+	pd_array[2]=(uint8_t *)(memblock+((framesize*5)>>2));
       }
       else {
-	memblock=(guchar *)g_try_malloc(framesize*3/2);
+	memblock=(uint8_t *)g_try_malloc(framesize*3/2);
 	if (memblock==NULL) return;
-	pd_array[0]=(guchar *)memblock;
+	pd_array[0]=(uint8_t *)memblock;
 	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(guchar *)(memblock+framesize);
+	pd_array[1]=(uint8_t *)(memblock+framesize);
 	memset(pd_array[1],128,width*height/2);
-	pd_array[2]=(guchar *)(memblock+((framesize*5)>>2));
+	pd_array[2]=(uint8_t *)(memblock+((framesize*5)>>2));
       }
 
     }
@@ -7594,25 +7645,25 @@
     rowstrides[1]=rowstrides[2]=width>>1;
     weed_set_int_array(layer,"rowstrides",3,rowstrides);
     g_free(rowstrides);
-    pd_array=(guchar **)g_malloc(3*sizeof(guchar *));
+    pd_array=(uint8_t **)g_malloc(3*sizeof(uint8_t *));
     framesize=CEIL(width*height,32);
 
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
       if (!black_fill) {
-	pd_array[0]=(guchar *)calloc(framesize>>2,4);
+	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[1]=(guchar *)calloc(framesize>>3,4);
+	pd_array[1]=(uint8_t *)lives_calloc(framesize>>3,4);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[2]=(guchar *)calloc(framesize>>3,4);
+	pd_array[2]=(uint8_t *)lives_calloc(framesize>>3,4);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7621,20 +7672,20 @@
 	}
       }
       else {
-	pd_array[0]=(guchar *)g_try_malloc(framesize);
+	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(guchar *)g_try_malloc(framesize>>1);
+	pd_array[1]=(uint8_t *)g_try_malloc(framesize>>1);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[1],128,width*height/2);
-	pd_array[2]=(guchar *)g_try_malloc(framesize>>1);
+	pd_array[2]=(uint8_t *)g_try_malloc(framesize>>1);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7650,18 +7701,18 @@
 
 
       if (!black_fill) {
-	memblock=(guchar *)calloc(framesize>>1,4);
+	memblock=(uint8_t *)lives_calloc(framesize>>1,4);
 	if (memblock==NULL) return;
-	pd_array[0]=(guchar *)memblock;
-	pd_array[1]=(guchar *)(memblock+framesize);
-	pd_array[2]=(guchar *)(memblock+((3*framesize)>>1));
+	pd_array[0]=(uint8_t *)memblock;
+	pd_array[1]=(uint8_t *)(memblock+framesize);
+	pd_array[2]=(uint8_t *)(memblock+((3*framesize)>>1));
       }
       else {
-	memblock=(guchar *)g_try_malloc(framesize*2);
+	memblock=(uint8_t *)g_try_malloc(framesize*2);
 	if (memblock==NULL) return;
-	pd_array[0]=(guchar *)memblock;
-	pd_array[1]=(guchar *)(memblock+framesize);
-	pd_array[2]=(guchar *)(memblock+((3*framesize)>>1));
+	pd_array[0]=(uint8_t *)memblock;
+	pd_array[1]=(uint8_t *)(memblock+framesize);
+	pd_array[2]=(uint8_t *)(memblock+((3*framesize)>>1));
 	memset(pd_array[0],y_black,width*height);
 	memset(pd_array[1],128,width*height);
       }
@@ -7677,25 +7728,25 @@
     rowstrides[0]=rowstrides[1]=rowstrides[2]=width;
     weed_set_int_array(layer,"rowstrides",3,rowstrides);
     g_free(rowstrides);
-    pd_array=(guchar **)g_malloc(3*sizeof(guchar *));
+    pd_array=(uint8_t **)g_malloc(3*sizeof(uint8_t *));
     framesize=CEIL(width*height,32);
 
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
       if (!black_fill) {
-	pd_array[0]=(guchar *)calloc(framesize>>2,4);
+	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[1]=(guchar *)calloc(framesize>>2,4);
+	pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[2]=(guchar *)calloc(framesize>>2,4);
+	pd_array[2]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7704,20 +7755,20 @@
 	}
       }
       else {
-	pd_array[0]=(guchar *)g_try_malloc(framesize);
+	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(guchar *)g_try_malloc(framesize);
+	pd_array[1]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[1],128,width*height);
-	pd_array[2]=(guchar *)g_try_malloc(framesize);
+	pd_array[2]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7731,7 +7782,7 @@
     } else {
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
       if (!black_fill) {
-	memblock=(guchar *)calloc((framesize*3)>>2,4);
+	memblock=(uint8_t *)lives_calloc((framesize*3)>>4,16);
 	if (memblock==NULL) return;
 	pd_array[0]=memblock;
 	pd_array[1]=memblock+framesize;
@@ -7739,7 +7790,7 @@
 
       }
       else {
-	memblock=(guchar *)g_try_malloc(framesize*3);
+	memblock=(uint8_t *)g_try_malloc(framesize*3);
 	if (memblock==NULL) return;
 	pd_array[0]=memblock;
 	memset(pd_array[0],y_black,width*height);
@@ -7758,7 +7809,7 @@
     rowstrides[0]=rowstrides[1]=rowstrides[2]=rowstrides[3]=width;
     weed_set_int_array(layer,"rowstrides",4,rowstrides);
     g_free(rowstrides);
-    pd_array=(guchar **)g_malloc(4*sizeof(guchar *));
+    pd_array=(uint8_t **)g_malloc(4*sizeof(uint8_t *));
     framesize=CEIL(width*height,32);
 
     if (!may_contig) {
@@ -7766,25 +7817,25 @@
 
 
       if (!black_fill) {
-	pd_array[0]=(guchar *)calloc(framesize>>2,4);
+	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[1]=(guchar *)calloc(framesize>>2,4);
+	pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[2]=(guchar *)calloc(framesize>>2,4);
+	pd_array[2]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
-	pd_array[3]=(guchar *)calloc(framesize>>2,4);
+	pd_array[3]=(uint8_t *)lives_calloc(framesize>>4,16);
 	if (pd_array[3]==NULL) {
 	  g_free(pd_array[2]);
 	  g_free(pd_array[1]);
@@ -7794,20 +7845,20 @@
 	}
       }
       else {
-	pd_array[0]=(guchar *)g_try_malloc(framesize);
+	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[0]==NULL) {
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(guchar *)g_try_malloc(framesize);
+	pd_array[1]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[1]==NULL) {
 	  g_free(pd_array[0]);
 	  g_free(pd_array);
 	  return;
 	}
 	memset(pd_array[1],128,width*height);
-	pd_array[2]=(guchar *)g_try_malloc(framesize);
+	pd_array[2]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[2]==NULL) {
 	  g_free(pd_array[1]);
 	  g_free(pd_array[0]);
@@ -7815,7 +7866,7 @@
 	  return;
 	}
 	memset(pd_array[2],128,width*height);
-	pd_array[3]=(guchar *)g_try_malloc(framesize);
+	pd_array[3]=(uint8_t *)g_try_malloc(framesize);
 	if (pd_array[3]==NULL) {
 	  g_free(pd_array[2]);
 	  g_free(pd_array[1]);
@@ -7831,7 +7882,7 @@
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
     
       if (!black_fill) {
-	memblock=(guchar *)calloc(framesize,4);
+	memblock=(uint8_t *)lives_calloc(framesize,4);
 	if (memblock==NULL) return;
 	pd_array[0]=memblock;
 	pd_array[1]=memblock+framesize;
@@ -7839,7 +7890,7 @@
 	pd_array[3]=memblock+framesize*3;
       }
       else {
-	memblock=(guchar *)g_try_malloc(framesize*4);
+	memblock=(uint8_t *)g_try_malloc(framesize*4);
 	if (memblock==NULL) return;
 	pd_array[0]=memblock;
 	memset(pd_array[0],y_black,width*height);
@@ -7861,11 +7912,11 @@
   case WEED_PALETTE_YUV411:
     weed_set_int_value(layer,"width",width);
     rowstride=width*6; // a macro-pixel is 6 bytes, and contains 4 real pixels
-    if (!black_fill) pixel_data=(guchar *)calloc(width*height*3,2);
+    if (!black_fill) pixel_data=(uint8_t *)lives_calloc(width*height*3,2);
     else {
       black[0]=black[3]=128;
       black[1]=black[2]=black[4]=black[5]=y_black;
-      pixel_data=(guchar *)calloc(width*height*3,2);
+      pixel_data=(uint8_t *)lives_calloc(width*height*3,2);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7882,7 +7933,7 @@
 
   case WEED_PALETTE_RGBFLOAT:
     rowstride=width*3*sizeof(float);
-    pixel_data=(guchar *)calloc(width*height*3,sizeof(float));
+    pixel_data=(uint8_t *)lives_calloc(width*height*3,sizeof(float));
     if (pixel_data==NULL) return;
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     weed_set_int_value(layer,"rowstrides",rowstride);
@@ -7890,10 +7941,10 @@
 
   case WEED_PALETTE_RGBAFLOAT:
     rowstride=width*4*sizeof(float);
-    if (!black_fill) pixel_data=(guchar *)calloc(width*height*4,sizeof(float));
+    if (!black_fill) pixel_data=(uint8_t *)lives_calloc(width*height*4,sizeof(float));
     else {
       size_t sizf=4*sizeof(float);
-      pixel_data=(guchar *)g_try_malloc(width*height*sizf);
+      pixel_data=(uint8_t *)g_try_malloc(width*height*sizf);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       for (i=0;i<height;i++) {
@@ -7910,10 +7961,10 @@
 
   case WEED_PALETTE_AFLOAT:
     rowstride=width*sizeof(float);
-    if (!black_fill) pixel_data=(guchar *)calloc(width*height,sizeof(float));
+    if (!black_fill) pixel_data=(uint8_t *)lives_calloc(width*height,sizeof(float));
     else {
       size_t sizf=sizeof(float);
-      pixel_data=(guchar *)g_try_malloc(width*height*sizf);
+      pixel_data=(uint8_t *)g_try_malloc(width*height*sizf);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       blackf[0]=1.;
@@ -7932,9 +7983,9 @@
   case WEED_PALETTE_A8:
     rowstride=width;
     framesize=CEIL(width*height,32);
-    if (!black_fill) pixel_data=(guchar *)calloc(framesize,1);
+    if (!black_fill) pixel_data=(uint8_t *)lives_calloc(framesize,1);
     else {
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       memset(pixel_data,255,width*height);
     }
@@ -7946,9 +7997,9 @@
   case WEED_PALETTE_A1:
     rowstride=(width+7)>>3;
     framesize=CEIL(rowstride*height,32);
-    if (!black_fill) pixel_data=(guchar *)calloc(framesize,1);
+    if (!black_fill) pixel_data=(uint8_t *)lives_calloc(framesize,1);
     else {
-      pixel_data=(guchar *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)g_try_malloc(framesize);
       if (pixel_data==NULL) return;
       memset(pixel_data,255,rowstride*height);
     }
@@ -8007,7 +8058,7 @@
   case WEED_PALETTE_ARGB32:
     widthx=width*4;
     psize=4;
-    psizel=3;
+    psizel=4;
     coffs=1;
     aoffs=0;
     clamped=FALSE;
@@ -8084,8 +8135,8 @@
     if (un) {
       for (i=0;i<height;i++) {
 	for (j=0;j<widthx;j+=psize) {
-	  alpha=ptr[aoffs];
-	  for (p=0;p<psizel;p++) {
+	  alpha=ptr[j+aoffs];
+	  for (p=coffs;p<psizel;p++) {
 	    ptr[j+p]=unal[alpha][ptr[j+p]];
 	  }
 	}
@@ -8095,9 +8146,9 @@
     else {
       for (i=0;i<height;i++) {
 	for (j=0;j<widthx;j+=psize) {
-	  alpha=ptr[aoffs];
+	  alpha=ptr[j+aoffs];
 	  for (p=coffs;p<psizel;p++) {
-	    ptr[j+p]=unal[alpha][ptr[j+p]];
+	    ptr[j+p]=al[alpha][ptr[j+p]];
 	  }
 	}
 	ptr+=rowstride;
@@ -8144,7 +8195,7 @@
 
 
 
-gboolean convert_layer_palette_full(weed_plant_t *layer, int outpl, int osamtype, gboolean oclamping, int osubspace) {
+boolean convert_layer_palette_full(weed_plant_t *layer, int outpl, int osamtype, boolean oclamping, int osubspace) {
   // here we will not handle RGB float palettes (wait for libabl for that...)
   // but we will convert to/from the 5 other RGB palettes and 10 YUV palettes
   // giving a total of 15*14=210 conversions
@@ -8175,11 +8226,11 @@
 
 
 
-  guchar *gusrc=NULL,**gusrc_array=NULL,*gudest,**gudest_array,*tmp;
+  uint8_t *gusrc=NULL,**gusrc_array=NULL,*gudest,**gudest_array,*tmp;
   int width,height,orowstride,irowstride;
   int error,inpl,flags=0;
   int isamtype,isubspace;
-  gboolean iclamped,contig=FALSE;
+  boolean iclamped,contig=FALSE;
 
 
   inpl=weed_get_int_value(layer,"current_palette",&error);
@@ -8194,14 +8245,6 @@
   if (weed_plant_has_leaf(layer,"YUV_subspace")) isubspace=weed_get_int_value(layer,"YUV_subspace",&error);
   else isubspace=WEED_YUV_SUBSPACE_YUV;
 
-  if (osubspace==WEED_YUV_SUBSPACE_BT709&&oclamping==WEED_YUV_CLAMPING_UNCLAMPED) {
-    LIVES_INFO("bt709 unclamped output not supported !");
-  }
-
-  if (isubspace==WEED_YUV_SUBSPACE_BT709&&iclamped==WEED_YUV_CLAMPING_UNCLAMPED) {
-    LIVES_INFO("bt709 unclamped input not supported !");
-  }
-
   //#define DEBUG_PCONV
 #ifdef DEBUG_PCONV
   gchar *tmp2,*tmp3;
@@ -8213,13 +8256,35 @@
 #endif
 
   if (weed_palette_is_yuv_palette(inpl)&&weed_palette_is_yuv_palette(outpl)&&(iclamped!=oclamping||isubspace!=osubspace)) {
+    if (isubspace==osubspace) {
 #ifdef DEBUG_PCONV
-    g_printerr("converting clamping %d to %d\n",!iclamped,!oclamping);
+      g_printerr("converting clamping %d to %d\n",!iclamped,!oclamping);
+#endif
+      switch_yuv_clamping_and_subspace(layer,oclamping?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,osubspace);
+      iclamped=oclamping;
+    }
+    else {
+      // convert first to RGB(A)
+      if (weed_palette_has_alpha_channel(inpl)) {
+	convert_layer_palette_full(layer, WEED_PALETTE_RGBA32, WEED_YUV_SAMPLING_DEFAULT, FALSE, WEED_YUV_SUBSPACE_YUV);
+      }
+      else {
+	convert_layer_palette_full(layer, WEED_PALETTE_RGB24, WEED_YUV_SAMPLING_DEFAULT, FALSE, WEED_YUV_SUBSPACE_YUV);
+      }
+      inpl=weed_get_int_value(layer,"current_palette",&error);
+      isubspace=osubspace;
+      isamtype=osamtype;
+      iclamped=oclamping;
+#ifdef DEBUG_PCONV
+      gchar *tmp2,*tmp3;
+      g_print("subspace conversion via palette %s\n",weed_palette_get_name(inpl));
+      g_free(tmp2);
+      g_free(tmp3);
 #endif
-    switch_yuv_clamping_and_subspace(layer,oclamping?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,osubspace);
-    iclamped=oclamping;
+    }
   }
-
+    
+  
   if (inpl==outpl) {
 #ifdef DEBUG_PCONV
     g_printerr("not converting palette\n");
@@ -8271,67 +8336,67 @@
 
   switch (inpl) {
   case WEED_PALETTE_BGR24:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3addpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_addpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3addpre_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuv_frame(gusrc,width,height,irowstride,gudest,FALSE,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuv_frame(gusrc,width,height,irowstride,gudest,FALSE,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,
 				  FALSE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
       weed_free(gudest_array);
@@ -8341,7 +8406,7 @@
     case WEED_PALETTE_YUV420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE,osamtype,oclamping);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8350,14 +8415,14 @@
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
@@ -8365,7 +8430,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,FALSE,oclamping);
       break;
     default:
@@ -8375,67 +8440,67 @@
     }
     break;
   case WEED_PALETTE_RGBA32:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3delpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_delpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3postalpha_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swapprepost_frame(gusrc,width,height,irowstride,orowstride,gudest,FALSE,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuv_frame(gusrc,width,height,irowstride,gudest,TRUE,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuv_frame(gusrc,width,height,irowstride,gudest,TRUE,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8444,7 +8509,7 @@
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,osamtype,oclamping);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8453,14 +8518,14 @@
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
@@ -8468,7 +8533,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,TRUE,oclamping);
       break;
     default:
@@ -8478,67 +8543,67 @@
     }
     break;
   case WEED_PALETTE_RGB24:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_addpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3addpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_addpre_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuv_frame(gusrc,width,height,irowstride,gudest,FALSE,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuv_frame(gusrc,width,height,irowstride,gudest,FALSE,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE,osamtype,oclamping);
       weed_free(gudest_array);
       break;
@@ -8546,7 +8611,7 @@
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,
 				  FALSE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
       weed_free(gudest_array);
@@ -8556,14 +8621,14 @@
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
@@ -8571,7 +8636,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_rgb_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,FALSE,oclamping);
       break;
     default:
@@ -8581,67 +8646,67 @@
     }
     break;
   case WEED_PALETTE_BGRA32:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_delpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3delpost_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3postalpha_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap4_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuv_frame(gusrc,width,height,irowstride,gudest,TRUE,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuv_frame(gusrc,width,height,irowstride,gudest,TRUE,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,
 				  WEED_YUV_SAMPLING_DEFAULT,oclamping);
       weed_free(gudest_array);
@@ -8651,7 +8716,7 @@
     case WEED_PALETTE_YUV420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,osamtype,oclamping);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8660,14 +8725,14 @@
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
@@ -8675,7 +8740,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_bgr_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,TRUE,oclamping);
       break;
     default:
@@ -8685,81 +8750,81 @@
     }
     break;
   case WEED_PALETTE_ARGB32:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap3delpre_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_delpre_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swapprepost_frame(gusrc,width,height,irowstride,orowstride,gudest,TRUE,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swap4_frame(gusrc,width,height,irowstride,orowstride,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_argb_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_argb_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_argb_to_yuv_frame(gusrc,width,height,irowstride,gudest,FALSE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_argb_to_yuv_frame(gusrc,width,height,irowstride,gudest,TRUE,oclamping,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,oclamping,-USE_THREADS);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8768,7 +8833,7 @@
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,osamtype,oclamping);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8778,7 +8843,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_argb_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,oclamping);
       break;
     default:
@@ -8788,12 +8853,12 @@
     }
     break;
   case WEED_PALETTE_YUV444P:
-    gusrc_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+    gusrc_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
@@ -8805,67 +8870,67 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,FALSE,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,FALSE,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,FALSE,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,FALSE,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_argb_frame(gusrc_array,width,height,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_uyvy_frame(gusrc_array,width,height,(uyvy_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_yuyv_frame(gusrc_array,width,height,(yuyv_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_combineplanes_frame(gusrc_array,width,height,gudest,FALSE,FALSE);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_combineplanes_frame(gusrc_array,width,height,gudest,FALSE,TRUE);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvp_to_yuvap_frame(gusrc_array,width,height,gudest_array);
       weed_free(gudest_array);
       break;
@@ -8873,7 +8938,7 @@
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvp_to_yuv420_frame(gusrc_array,width,height,gudest_array,iclamped);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8883,7 +8948,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuvp_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
@@ -8902,12 +8967,12 @@
     }
     break;
   case WEED_PALETTE_YUVA4444P:
-    gusrc_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+    gusrc_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
@@ -8919,67 +8984,67 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,TRUE,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,TRUE,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,TRUE,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,TRUE,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_argb_frame(gusrc_array,width,height,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_uyvy_frame(gusrc_array,width,height,(uyvy_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv_planar_to_yuyv_frame(gusrc_array,width,height,(yuyv_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_combineplanes_frame(gusrc_array,width,height,gudest,TRUE,FALSE);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_combineplanes_frame(gusrc_array,width,height,gudest,TRUE,TRUE);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvap_to_yuvp_frame(gusrc_array,width,height,gudest_array);
       weed_free(gudest_array);
       break;
@@ -8987,7 +9052,7 @@
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvp_to_yuv420_frame(gusrc_array,width,height,gudest_array,iclamped);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -8997,7 +9062,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuvp_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
@@ -9017,19 +9082,19 @@
     }
     break;
   case WEED_PALETTE_UYVY8888:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swab_frame(gusrc,width,height,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuv422_frame((uyvy_macropixel *)gusrc,width,height,gudest_array);
       weed_free(gudest_array);
       break;
@@ -9037,7 +9102,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_uyvy_to_rgb_frame((uyvy_macropixel *)gusrc,width,height,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
@@ -9045,7 +9110,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_uyvy_to_rgb_frame((uyvy_macropixel *)gusrc,width,height,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
@@ -9053,7 +9118,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_uyvy_to_bgr_frame((uyvy_macropixel *)gusrc,width,height,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
@@ -9061,7 +9126,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_uyvy_to_bgr_frame((uyvy_macropixel *)gusrc,width,height,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
@@ -9069,7 +9134,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_uyvy_to_argb_frame((uyvy_macropixel *)gusrc,width,height,orowstride,gudest,iclamped,-USE_THREADS);
       break;
@@ -9077,7 +9142,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuvp_frame((uyvy_macropixel *)gusrc,width,height,gudest_array,FALSE);
       weed_free(gudest_array);
       break;
@@ -9085,7 +9150,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuvp_frame((uyvy_macropixel *)gusrc,width,height,gudest_array,TRUE);
       weed_free(gudest_array);
       break;
@@ -9093,14 +9158,14 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_uyvy_to_yuv888_frame((uyvy_macropixel *)gusrc,width,height,gudest,FALSE);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_uyvy_to_yuv888_frame((uyvy_macropixel *)gusrc,width,height,gudest,TRUE);
       break;
     case WEED_PALETTE_YUV420P:
@@ -9108,7 +9173,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuv420_frame((uyvy_macropixel *)gusrc,width,height,gudest_array,iclamped);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -9118,7 +9183,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_uyvy_to_yuv411_frame((uyvy_macropixel *)gusrc,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
@@ -9128,19 +9193,19 @@
     }
     break;
   case WEED_PALETTE_YUYV8888:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_swab_frame(gusrc,width,height,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuv422_frame((yuyv_macropixel *)gusrc,width,height,gudest_array);
       weed_free(gudest_array);
       break;
@@ -9148,7 +9213,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_yuyv_to_rgb_frame((yuyv_macropixel *)gusrc,width,height,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
@@ -9156,7 +9221,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_yuyv_to_rgb_frame((yuyv_macropixel *)gusrc,width,height,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
@@ -9164,7 +9229,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_yuyv_to_bgr_frame((yuyv_macropixel *)gusrc,width,height,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
@@ -9172,7 +9237,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_yuyv_to_bgr_frame((yuyv_macropixel *)gusrc,width,height,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
@@ -9180,7 +9245,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
       convert_yuyv_to_argb_frame((yuyv_macropixel *)gusrc,width,height,orowstride,gudest,iclamped,-USE_THREADS);
       break;
@@ -9188,7 +9253,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuvp_frame((yuyv_macropixel *)gusrc,width,height,gudest_array,FALSE);
       weed_free(gudest_array);
       break;
@@ -9196,7 +9261,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuvp_frame((yuyv_macropixel *)gusrc,width,height,gudest_array,TRUE);
       weed_free(gudest_array);
       break;
@@ -9204,14 +9269,14 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuyv_to_yuv888_frame((yuyv_macropixel *)gusrc,width,height,gudest,FALSE);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuyv_to_yuv888_frame((yuyv_macropixel *)gusrc,width,height,gudest,TRUE);
       break;
     case WEED_PALETTE_YUV420P:
@@ -9219,7 +9284,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuv420_frame((yuyv_macropixel *)gusrc,width,height,gudest_array,iclamped);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -9229,7 +9294,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuyv_to_yuv411_frame((yuyv_macropixel *)gusrc,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
@@ -9240,26 +9305,26 @@
     break;
   case WEED_PALETTE_YUV888:
     // need to check rowstrides (may have been resized)
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_addpost_frame(gusrc,width,height,irowstride,width*4,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE);
       weed_free(gudest_array);
       break;
@@ -9267,35 +9332,35 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_rgb_frame(gusrc,width,height,irowstride,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_rgb_frame(gusrc,width,height,irowstride,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_bgr_frame(gusrc,width,height,irowstride,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_bgr_frame(gusrc,width,height,irowstride,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_argb_frame(gusrc,width,height,irowstride,orowstride,gudest,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_YVU420P:
@@ -9303,7 +9368,7 @@
     case WEED_PALETTE_YUV420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,iclamped);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -9312,7 +9377,7 @@
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv422_frame(gusrc,width,height,irowstride,gudest_array,FALSE,iclamped);
       weed_free(gudest_array);
       break;
@@ -9320,21 +9385,21 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,FALSE);
       break;
     default:
@@ -9344,26 +9409,26 @@
     }
     break;
   case WEED_PALETTE_YUVA8888:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     irowstride=weed_get_int_value(layer,"rowstrides",&error);
     switch (outpl) {
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_delpost_frame(gusrc,width,height,irowstride,width*3,gudest,-USE_THREADS);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE);
       weed_free(gudest_array);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE);
       weed_free(gudest_array);
       break;
@@ -9371,42 +9436,42 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuva8888_to_rgba_frame(gusrc,width,height,irowstride,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuva8888_to_rgba_frame(gusrc,width,height,irowstride,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuva8888_to_bgra_frame(gusrc,width,height,irowstride,orowstride,gudest,TRUE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuva8888_to_bgra_frame(gusrc,width,height,irowstride,orowstride,gudest,FALSE,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuva8888_to_argb_frame(gusrc,width,height,irowstride,orowstride,gudest,iclamped,-USE_THREADS);
       break;
     case WEED_PALETTE_YUV420P:
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,iclamped);
       weed_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
@@ -9415,7 +9480,7 @@
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv422_frame(gusrc,width,height,irowstride,gudest_array,TRUE,iclamped);
       weed_free(gudest_array);
       break;
@@ -9423,21 +9488,21 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_uyvy_frame(gusrc,width,height,irowstride,(uyvy_macropixel *)gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_yuyv_frame(gusrc,width,height,irowstride,(yuyv_macropixel *)gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv888_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,TRUE);
       break;
     default:
@@ -9448,68 +9513,68 @@
     break;
   case WEED_PALETTE_YVU420P:
     // swap u and v planes, then fall through to YUV420P
-    gusrc_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+    gusrc_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
     tmp=gusrc_array[1];
     gusrc_array[1]=gusrc_array[2];
     gusrc_array[2]=tmp;
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)gusrc_array);
     weed_free(gusrc_array);
   case WEED_PALETTE_YUV420P:
-    gusrc_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+    gusrc_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,FALSE,FALSE,isamtype,iclamped);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,TRUE,FALSE,isamtype,iclamped);
       break;
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,FALSE,FALSE,isamtype,iclamped);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,TRUE,FALSE,isamtype,iclamped);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_argb_frame(gusrc_array,width,height,orowstride,gudest,FALSE,isamtype,iclamped);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420_to_uyvy_frame(gusrc_array,width,height,(uyvy_macropixel *)gudest);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420_to_yuyv_frame(gusrc_array,width,height,(yuyv_macropixel *)gudest);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
@@ -9520,7 +9585,7 @@
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
@@ -9531,7 +9596,7 @@
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",4,(void **)gudest_array);
@@ -9555,20 +9620,20 @@
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_quad_chroma_packed(gusrc_array,width,height,gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_quad_chroma_packed(gusrc_array,width,height,gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,FALSE,iclamped);
       break;
     default:
@@ -9588,62 +9653,62 @@
     }
     break;
   case WEED_PALETTE_YUV422P:
-    gusrc_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+    gusrc_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,FALSE,TRUE,isamtype,iclamped);
       break;
     case WEED_PALETTE_RGBA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_rgb_frame(gusrc_array,width,height,orowstride,gudest,TRUE,TRUE,isamtype,iclamped);
       break;
     case WEED_PALETTE_BGR24:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,FALSE,TRUE,isamtype,iclamped);
       break;
     case WEED_PALETTE_BGRA32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_bgr_frame(gusrc_array,width,height,orowstride,gudest,TRUE,TRUE,isamtype,iclamped);
       break;
     case WEED_PALETTE_ARGB32:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420p_to_argb_frame(gusrc_array,width,height,orowstride,gudest,TRUE,isamtype,iclamped);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv422p_to_uyvy_frame(gusrc_array,width,height,gudest);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv422p_to_yuyv_frame(gusrc_array,width,height,gudest);
       break;
     case WEED_PALETTE_YUV420P:
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
@@ -9655,7 +9720,7 @@
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
@@ -9666,7 +9731,7 @@
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       g_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",4,(void **)gudest_array);
@@ -9678,20 +9743,20 @@
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_double_chroma_packed(gusrc_array,width,height,gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_double_chroma_packed(gusrc_array,width,height,gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width>>2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv420_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,TRUE,iclamped);
       break;
     default:
@@ -9710,14 +9775,14 @@
     }
     break;
   case WEED_PALETTE_YUV411:
-    gusrc=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+    gusrc=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
     switch (outpl) {
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_rgb_frame((yuv411_macropixel *)gusrc,width,height,orowstride,gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_RGBA32:
@@ -9725,7 +9790,7 @@
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_rgb_frame((yuv411_macropixel *)gusrc,width,height,orowstride,gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_BGR24:
@@ -9733,7 +9798,7 @@
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_bgr_frame((yuv411_macropixel *)gusrc,width,height,orowstride,gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_BGRA32:
@@ -9741,7 +9806,7 @@
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_bgr_frame((yuv411_macropixel *)gusrc,width,height,orowstride,gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_ARGB32:
@@ -9749,28 +9814,28 @@
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
       orowstride=weed_get_int_value(layer,"rowstrides",&error);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_argb_frame((yuv411_macropixel *)gusrc,width,height,orowstride,gudest,iclamped);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_yuv888_frame((yuv411_macropixel *)gusrc,width,height,gudest,FALSE,iclamped);
       break;
     case WEED_PALETTE_YUVA8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_yuv888_frame((yuv411_macropixel *)gusrc,width,height,gudest,TRUE,iclamped);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuvp_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,FALSE,iclamped);
       weed_free(gudest_array);
       break;
@@ -9778,7 +9843,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuvp_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,TRUE,iclamped);
       weed_free(gudest_array);
       break;
@@ -9786,21 +9851,21 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_uyvy_frame((yuv411_macropixel *)gusrc,width,height,(uyvy_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUYV8888:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<1);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+      gudest=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
       convert_yuv411_to_yuyv_frame((yuv411_macropixel *)gusrc,width,height,(yuyv_macropixel *)gudest,iclamped);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuv422_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,iclamped);
       weed_free(gudest_array);
       break;
@@ -9808,7 +9873,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuv420_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,FALSE,iclamped);
       weed_free(gudest_array);
       break;
@@ -9816,7 +9881,7 @@
       weed_set_int_value(layer,"current_palette",outpl);
       weed_set_int_value(layer,"width",width<<2);
       create_empty_pixel_data(layer,FALSE,TRUE);
-      gudest_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
+      gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuv420_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,TRUE,iclamped);
       weed_free(gudest_array);
       break;
@@ -9833,6 +9898,7 @@
   }
   if (gusrc!=NULL) g_free(gusrc);
 
+
   if (weed_palette_is_rgb_palette(outpl)) {
     weed_leaf_delete(layer,"YUV_clamping");
     weed_leaf_delete(layer,"YUV_subspace");
@@ -9854,8 +9920,8 @@
 
   if ((outpl==WEED_PALETTE_YVU420P&&inpl!=WEED_PALETTE_YVU420P&&inpl!=WEED_PALETTE_YUV420P)) {
     // swap u and v planes
-    guchar **pd_array=(guchar **)weed_get_voidptr_array(layer,"pixel_data",&error);
-    guchar *tmp=pd_array[1];
+    uint8_t **pd_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
+    uint8_t *tmp=pd_array[1];
     pd_array[1]=pd_array[2];
     pd_array[2]=tmp;
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)pd_array);
@@ -9865,7 +9931,7 @@
 }
 
 
-gboolean convert_layer_palette (weed_plant_t *layer, int outpl, int op_clamping) {
+boolean convert_layer_palette (weed_plant_t *layer, int outpl, int op_clamping) {
   return convert_layer_palette_full(layer,outpl,WEED_YUV_SAMPLING_DEFAULT,
 				    op_clamping==WEED_YUV_CLAMPING_CLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 }
@@ -9873,10 +9939,10 @@
 /////////////////////////////////////////////////////////////////////////////////////
 
 
-LiVESPixbuf *lives_pixbuf_new_blank(gint width, gint height, int palette) {
+LiVESPixbuf *lives_pixbuf_new_blank(int width, int height, int palette) {
   LiVESPixbuf *pixbuf;
   int rowstride;
-  guchar *pixels;
+  uint8_t *pixels;
   size_t size;
 
   switch (palette) {
@@ -9911,8 +9977,8 @@
 
 
 
-static LIVES_INLINE LiVESPixbuf *lives_pixbuf_cheat(gboolean has_alpha, 
-						    int width, int height, guchar *buf) {
+static LIVES_INLINE LiVESPixbuf *lives_pixbuf_cheat(boolean has_alpha, 
+						    int width, int height, uint8_t *buf) {
   // we can cheat if our buffer is correctly sized
   LiVESPixbuf *pixbuf;
   int channels=has_alpha?4:3;
@@ -9926,7 +9992,7 @@
 
 LiVESPixbuf *layer_to_pixbuf (weed_plant_t *layer) {
   // create a weed layer from a pixbuf
-  // layer "pixel_data" is then shared with with the pixbuf pixels 
+  // layer "pixel_data" is then either shared with with the pixbuf pixels, or set to NULL
 
   int error;
   LiVESPixbuf *pixbuf;
@@ -9935,7 +10001,7 @@
   int height;
   int irowstride;
   int rowstride,orowstride;
-  guchar *pixel_data,*pixels,*end,*orig_pixel_data;
+  uint8_t *pixel_data,*pixels,*end,*orig_pixel_data;
   boolean cheat=FALSE,done;
   int n_channels;
 
@@ -9945,7 +10011,7 @@
   width=weed_get_int_value(layer,"width",&error);
   height=weed_get_int_value(layer,"height",&error);
   irowstride=weed_get_int_value(layer,"rowstrides",&error);
-  orig_pixel_data=pixel_data=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+  orig_pixel_data=pixel_data=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
 
   do {
     done=TRUE;
@@ -9994,7 +10060,7 @@
     boolean done=FALSE;
     pixels=lives_pixbuf_get_pixels (pixbuf);
     orowstride=lives_pixbuf_get_rowstride(pixbuf);
-    
+
     if (irowstride>orowstride) rowstride=orowstride;
     else rowstride=irowstride;
     end=pixels+orowstride*height;
@@ -10016,12 +10082,21 @@
 }
 
 
-LIVES_INLINE gboolean weed_palette_is_resizable(int pal) {
+LIVES_INLINE boolean weed_palette_is_resizable(int pal, int clamped, boolean in_out) {
+  // in_out is TRUE for input, FALSE for output
+
   // in future we may also have resize candidates/delegates for other palettes
   // we will need to check for these
 
+  if (pal==WEED_PALETTE_YUV888&&clamped==WEED_YUV_CLAMPING_UNCLAMPED) pal=WEED_PALETTE_RGB24;
+  if (pal==WEED_PALETTE_YUVA8888&&clamped==WEED_YUV_CLAMPING_UNCLAMPED) pal=WEED_PALETTE_RGBA32;
+
+#ifdef USE_SWSCALE
+  if (in_out&&sws_isSupportedInput(weed_palette_to_avi_pix_fmt(pal,&clamped))) return TRUE;
+  else if (sws_isSupportedOutput(weed_palette_to_avi_pix_fmt(pal,&clamped))) return TRUE;
+#endif
   if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_BGR24||
-      pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) return TRUE;
+      pal==WEED_PALETTE_BGRA32) return TRUE;
   return FALSE;
 }
 
@@ -10067,7 +10142,7 @@
 
   void **pixel_data,**new_pixel_data,*npixel_data;
 
-  gboolean needs_change=FALSE;
+  boolean needs_change=FALSE;
 
 
   pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
@@ -10138,8 +10213,8 @@
 
 static struct SwsContext *swscale_find_context(int iwidth, int iheight,
 					       int width, int height,
-					       int pixfmt, int flags) {
-  int i;
+					       enum PixelFormat ipixfmt, enum PixelFormat opixfmt, int flags) {
+  register int i;
   struct _swscale_ctx tmpctx;
 
   if (!swscale_ctx_list_inited) {
@@ -10156,14 +10231,15 @@
 	swscale_ctx[i].iheight==iheight &&
 	swscale_ctx[i].width==width &&
 	swscale_ctx[i].height==height &&
-	swscale_ctx[i].pixfmt==pixfmt &&
+	swscale_ctx[i].ipixfmt==ipixfmt &&
+	swscale_ctx[i].opixfmt==opixfmt &&
 	swscale_ctx[i].flags==flags) {
       // move to front
       if (i>0) {
 	lives_memcpy(&tmpctx,&swscale_ctx[i],sizeof(struct _swscale_ctx));
 	for (;i>0;i--) {
 	  lives_memcpy(&swscale_ctx[i],&swscale_ctx[i-1],sizeof(struct _swscale_ctx));
-	}
+	} 
 	lives_memcpy(&swscale_ctx[0],&tmpctx,sizeof(struct _swscale_ctx));
       }
       return swscale_ctx[0].ctx;
@@ -10175,10 +10251,10 @@
 }
 
 
-static void swscale_add_context(int iwidth, int iheight, int width, int height, int pixfmt, int flags, 
-				struct SwsContext *ctx) {
+static void swscale_add_context(int iwidth, int iheight, int width, int height, enum PixelFormat ipixfmt, enum PixelFormat opixfmt, 
+				int flags, struct SwsContext *ctx) {
   // add at head of list
-  int i;
+  register int i;
 
   for (i=N_SWS_CTX-1;i>0;i--) {
     // make space by shifting up
@@ -10197,14 +10273,15 @@
   swscale_ctx[0].iheight=iheight;
   swscale_ctx[0].width=width;
   swscale_ctx[0].height=height;
-  swscale_ctx[0].pixfmt=pixfmt;
+  swscale_ctx[0].ipixfmt=ipixfmt;
+  swscale_ctx[0].opixfmt=opixfmt;
   swscale_ctx[0].flags=flags;
   swscale_ctx[0].ctx=ctx;
 }
 
 
 void sws_free_context(void) {
-  int i;
+  register int i;
   if (!swscale_ctx_list_inited) return;
 
   for (i=0;i<N_SWS_CTX;i++) {
@@ -10214,24 +10291,21 @@
 
 #endif
 
-void resize_layer (weed_plant_t *layer, int width, int height, LiVESInterpType interp) {
+boolean resize_layer (weed_plant_t *layer, int width, int height, LiVESInterpType interp, int opal_hint, int oclamp_hint) {
   // resize a layer; width is in macropixels
 
   // TODO ** - see if there is a resize plugin candidate/delegate which supports this palette : 
   // this allows e.g libabl or a hardware rescaler
 
-  // NOTE: a) a good single plane resizer is needed for YUV compressed and alpha palettes
-  //       b) there is as yet no float palette resizer
-
-  // IMPORTANT: for yuv palettes except YUV888 and YUVA8888 the palette will be converted to YUV(A)888(8) 
-  // depending on whether it has alpha or not
-
-  // "current_palette" should therefore be checked on return
+  // opal_hint and oclamp_hint may be set to hint the desired output palette and clamping
+  // this is simply to ensure more efficient resizing
+  // - setting opal_hint to WEED_PALETTE_END will attempt to minimise palette changes
 
+  // "current_palette" should be checked on return
 
   // don't forget also - layer "width" is in *macro-pixels* so it may not come back exactly as expected
 
-
+  // return FALSE if we were unable to resize
 
   int error;
   LiVESPixbuf *pixbuf=NULL;
@@ -10241,65 +10315,132 @@
   // original width and height (in macropixels)
   int iwidth=weed_get_int_value(layer,"width",&error);
   int iheight=weed_get_int_value(layer,"height",&error);
+  int iclamped=WEED_YUV_CLAMPING_UNCLAMPED;
+
+  boolean keep_in_pixel_data=FALSE;
+  boolean retval=TRUE;
 
-  if (iwidth==width&&iheight==height) return; // no resize needed
+  if (iwidth==width&&iheight==height) return TRUE; // no resize needed
 
   if (width<=0||height<=0) {
-    g_printerr("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
-    return;
+    char *msg=g_strdup_printf("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
+    LIVES_DEBUG(msg);
+    g_free(msg);
+    return FALSE;
   }
 
-  if (weed_palette_is_yuv_palette(palette)&&!weed_palette_is_resizable(palette)) {
-    // we should always convert to unclamped values before resizing
-    gint oclamping=WEED_YUV_CLAMPING_UNCLAMPED;
-    iwidth*=weed_palette_get_pixels_per_macropixel(palette); // orig width is in macropixels
-    width*=weed_palette_get_pixels_per_macropixel(palette); // desired width is in macropixels
 
-    if (weed_palette_has_alpha_channel(palette)) {
-      convert_layer_palette(layer,WEED_PALETTE_YUVA8888,oclamping);
-    }
-    else {
-      convert_layer_palette(layer,WEED_PALETTE_YUV888,oclamping);
+  // if in palette is a YUV palette which we cannot scale, convert to YUV888 (unclamped) or YUVA8888 (unclamped)
+  // we can always scale these
+  if (weed_palette_is_yuv_palette(palette)) {
+    iclamped=weed_get_int_value(layer,"YUV_clamping",&error);
+    if (!weed_palette_is_resizable(palette, iclamped, TRUE)) {
+      iwidth*=weed_palette_get_pixels_per_macropixel(palette); // orig width is in macropixels
+      width*=weed_palette_get_pixels_per_macropixel(palette); // desired width is in macropixels
+      if (opal_hint==WEED_PALETTE_END||weed_palette_is_yuv_palette(opal_hint)) {
+	// we should always convert to unclamped values before resizing
+	int oclamping=WEED_YUV_CLAMPING_UNCLAMPED;
+	
+	if (weed_palette_has_alpha_channel(palette)) {
+	  convert_layer_palette(layer,WEED_PALETTE_YUVA8888,oclamping);
+	}
+	else {
+	  convert_layer_palette(layer,WEED_PALETTE_YUV888,oclamping);
+	}
+	iclamped=oclamping;
+      }
+      else {
+	if (weed_palette_has_alpha_channel(palette)) {
+	  convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
+	}
+	else {
+	  convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+	}
+      }
+      palette=weed_get_int_value(layer,"current_palette",&error);
     }
-    palette=weed_get_int_value(layer,"current_palette",&error);
   }
 
-  switch (palette) {
-  case WEED_PALETTE_RGB24:
-  case WEED_PALETTE_BGR24:
-  case WEED_PALETTE_ARGB32:
-  case WEED_PALETTE_RGBA32:
-  case WEED_PALETTE_BGRA32:
+  // check if we can also convert to the output palette
+#ifdef USE_SWSCALE
+  // only swscale can convert and resize together
+  if (opal_hint==WEED_PALETTE_END||!weed_palette_is_resizable(opal_hint,oclamp_hint,FALSE)) {
+#endif
+    opal_hint=palette;
+    oclamp_hint=iclamped;
+#ifdef USE_SWSCALE
+  }
+#endif
 
-  case WEED_PALETTE_YUV888:
-  case WEED_PALETTE_YUVA8888:
+  if (weed_plant_has_leaf(layer,"host_orig_pdata")&&weed_get_boolean_value(layer,"host_orig_pdata",&error)==WEED_TRUE) {
+    keep_in_pixel_data=TRUE;
+    weed_leaf_delete(layer,"host_orig_pdata");
+  }
+
+  // if we cannot scale YUV888 (unclamped) or YUVA8888 (unclamped) directly, pretend they are RGB24 and RGBA32
+  if (palette==WEED_PALETTE_YUV888&&iclamped==WEED_YUV_CLAMPING_UNCLAMPED
+      &&!weed_palette_is_resizable(palette, iclamped, TRUE)) opal_hint=palette=WEED_PALETTE_RGB24;
+  if (palette==WEED_PALETTE_YUVA8888&&iclamped==WEED_YUV_CLAMPING_UNCLAMPED
+      &&!weed_palette_is_resizable(palette, iclamped, TRUE)) opal_hint=palette=WEED_PALETTE_RGBA32;
+
+  // check if we can convert to the target palette/clamping
+  if (!weed_palette_is_resizable(opal_hint, oclamp_hint, FALSE)) {
+    opal_hint=palette;
+    oclamp_hint=iclamped;
+  }
 
 
 #ifdef USE_SWSCALE
-    if (iwidth>1&&iheight>1) 
-    {
+  if (iwidth>1&&iheight>1&&weed_palette_is_resizable(palette, iclamped, TRUE)&&
+      weed_palette_is_resizable(opal_hint, oclamp_hint, FALSE)) {
       struct SwsContext *swscale;
-      int flags;
-      enum PixelFormat pixfmt;
 
+      enum PixelFormat ipixfmt,opixfmt;
+
+      void **pd_array;
       void **in_pixel_data,**out_pixel_data;
+
+      boolean store_ctx=FALSE;
+
       int *irowstrides,*orowstrides;
+      int *ir_array,*or_array;
 
-      gboolean store_ctx=FALSE;
+      int flags;
+
+      register int i;
+
+      av_log_set_level(AV_LOG_FATAL);
+
+      mainw->rowstride_alignment_hint=16;
 
       if (interp==LIVES_INTERP_BEST) flags=SWS_BICUBIC;
       if (interp==LIVES_INTERP_NORMAL) flags=SWS_BILINEAR;
       if (interp==LIVES_INTERP_FAST) flags=SWS_FAST_BILINEAR;
 
-      if (palette==WEED_PALETTE_YUV888) palette=WEED_PALETTE_RGB24;
-      if (palette==WEED_PALETTE_YUVA8888) palette=WEED_PALETTE_RGBA32;
-
-      pixfmt=weed_palette_to_avi_pix_fmt(palette,NULL);
+      ipixfmt=weed_palette_to_avi_pix_fmt(palette,&iclamped);
+      opixfmt=weed_palette_to_avi_pix_fmt(opal_hint,&oclamp_hint);
 
       in_pixel_data=(void **)g_malloc0(4*sizeof(void *));
-      in_pixel_data[0]=weed_get_voidptr_value(layer,"pixel_data",&error);
       irowstrides=(int *)g_malloc0(4*sizint);
-      irowstrides[0]=weed_get_int_value(layer,"rowstrides",&error);
+
+      pd_array=weed_get_voidptr_array(layer,"pixel_data",&error);
+      ir_array=weed_get_int_array(layer,"rowstrides",&error);
+
+      for (i=0;i<weed_palette_get_numplanes(palette);i++) {
+	in_pixel_data[i]=pd_array[i];
+	irowstrides[i]=ir_array[i];
+      }
+
+      weed_free(pd_array); weed_free(ir_array);
+
+      if (palette!=opal_hint) {
+	width*=weed_palette_get_pixels_per_macropixel(palette); // desired width is in macropixels
+	width/=weed_palette_get_pixels_per_macropixel(opal_hint); // desired width is in macropixels
+	weed_set_int_value(layer,"current_palette",opal_hint);
+      }
+
+      if (weed_palette_is_yuv_palette(opal_hint)) 
+	weed_set_int_value(layer,"YUV_clamping",oclamp_hint);
 
       weed_set_int_value(layer,"width",width);
       weed_set_int_value(layer,"height",height);
@@ -10307,34 +10448,54 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
 
       out_pixel_data=(void **)g_malloc0(4*sizeof(void *));
-      out_pixel_data[0]=weed_get_voidptr_value(layer,"pixel_data",&error);
       orowstrides=(int *)g_malloc0(4*sizint);
-      orowstrides[0]=weed_get_int_value(layer,"rowstrides",&error);
 
-      if ((swscale=swscale_find_context(iwidth,iheight,width,height,pixfmt,flags))==NULL) {
-	swscale = sws_getContext(iwidth, iheight, pixfmt, width, height, pixfmt, flags, NULL, NULL, NULL );
+      pd_array=weed_get_voidptr_array(layer,"pixel_data",&error);
+      or_array=weed_get_int_array(layer,"rowstrides",&error);
+
+      for (i=0;i<weed_palette_get_numplanes(opal_hint);i++) {
+	out_pixel_data[i]=pd_array[i];
+	orowstrides[i]=or_array[i];
+      }
+
+      weed_free(pd_array); weed_free(or_array);
+
+      if ((swscale=swscale_find_context(iwidth,iheight,width,height,ipixfmt,opixfmt,flags))==NULL) {
+	swscale = sws_getContext(iwidth, iheight, ipixfmt, width, height, opixfmt, flags, NULL, NULL, NULL );
 	store_ctx=TRUE;
       }
 
-      if (swscale==NULL) LIVES_ERROR("swscale is NULL !!");
+      if (swscale==NULL) {
+	LIVES_DEBUG("swscale is NULL !!");
+      }
       else {
 	sws_scale(swscale, (const uint8_t * const*)in_pixel_data, irowstrides, 0, iheight, 
 		  (uint8_t * const *)out_pixel_data, orowstrides);
-	if (store_ctx) swscale_add_context(iwidth,iheight,width,height,pixfmt,flags,swscale);
+	if (store_ctx) swscale_add_context(iwidth,iheight,width,height,ipixfmt,opixfmt,flags,swscale);
       }
 
+      if (!keep_in_pixel_data) g_free(*in_pixel_data);
 
-      g_free(*in_pixel_data);
       g_free(in_pixel_data);
       g_free(out_pixel_data);
 
       g_free(orowstrides);
       g_free(irowstrides);
 
-      return;
+      return TRUE;
     }
 #endif
 
+  switch (palette) {
+  case WEED_PALETTE_RGB24:
+  case WEED_PALETTE_BGR24:
+  case WEED_PALETTE_ARGB32:
+  case WEED_PALETTE_RGBA32:
+  case WEED_PALETTE_BGRA32:
+
+  case WEED_PALETTE_YUV888:
+  case WEED_PALETTE_YUVA8888:
+
     pixbuf=layer_to_pixbuf(layer);
     threaded_dialog_spin();
     new_pixbuf=lives_pixbuf_scale_simple(pixbuf,width,height,interp);
@@ -10344,16 +10505,31 @@
       weed_set_int_value(layer,"height",lives_pixbuf_get_height(new_pixbuf));
       weed_set_int_value(layer,"rowstrides",lives_pixbuf_get_rowstride(new_pixbuf));
     }
+
+    if (keep_in_pixel_data) {
+     // TODO - for QImage, cast to parent class and use parent destructor
+      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+      mainw->free_fn=lives_free_with_check;
+    }
     g_object_unref(pixbuf);
+    mainw->do_not_free=NULL;
+    mainw->free_fn=lives_free_normal;
 
     break;
   default:
     g_printerr("Warning: resizing unknown palette %d\n",palette);
+    retval=FALSE;
   }
 
   if (new_pixbuf==NULL||(width!=weed_get_int_value(layer,"width",&error)||
-			 height!=weed_get_int_value(layer,"height",&error))) 
+			 height!=weed_get_int_value(layer,"height",&error)))  {
     g_printerr("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
+    retval=FALSE;
+  }
+  else {
+    if (weed_plant_has_leaf(layer,"host_orig_pdata"))
+      weed_leaf_delete(layer,"host_orig_pdata");
+  }
 
 
   if (new_pixbuf!=NULL) {
@@ -10368,7 +10544,7 @@
   }
 
 
-  return;
+  return retval;
 }
 
 
@@ -10386,7 +10562,7 @@
   void **pixel_data;
   void **new_pixel_data;
 
-  guchar *dst,*src;
+  uint8_t *dst,*src;
 
   register int i;
 
@@ -10397,7 +10573,7 @@
   pal=weed_get_int_value(layer,"current_palette",&error);
   nwidth*=weed_palette_get_pixels_per_macropixel(pal); // convert from macropixels to pixels
 
-  resize_layer(layer,width,height,interp); // resize can change current_palette
+  resize_layer(layer,width,height,interp,WEED_PALETTE_END,0); // resize can change current_palette
 
   // get current pixel_data
   pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
@@ -10444,8 +10620,8 @@
   case WEED_PALETTE_BGR24:
   case WEED_PALETTE_YUV888:
     width*=3;
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*3);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*3);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10460,8 +10636,8 @@
   case WEED_PALETTE_UYVY:
   case WEED_PALETTE_YUYV:
     width*=4;
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*4);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*4);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10471,8 +10647,8 @@
 
   case WEED_PALETTE_YUV411:
     width*=6;
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*6);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*6);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10481,22 +10657,22 @@
     break;
 
   case WEED_PALETTE_YUV444P:
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
     }
-    dst=(guchar *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
-    src=(guchar *)pixel_data[1];
+    dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
+    src=(uint8_t *)pixel_data[1];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
-    dst=(guchar *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
-    src=(guchar *)pixel_data[2];
+    dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
+    src=(uint8_t *)pixel_data[2];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
@@ -10505,29 +10681,29 @@
     break;
 
   case WEED_PALETTE_YUVA4444P:
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
     }
-    dst=(guchar *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
-    src=(guchar *)pixel_data[1];
+    dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
+    src=(uint8_t *)pixel_data[1];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
-    dst=(guchar *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
-    src=(guchar *)pixel_data[2];
+    dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
+    src=(uint8_t *)pixel_data[2];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
       src+=irowstrides[2];
     }
-    dst=(guchar *)(new_pixel_data[3]+offs_y*rowstrides[3]+offs_x);
-    src=(guchar *)pixel_data[3];
+    dst=(uint8_t *)(new_pixel_data[3]+offs_y*rowstrides[3]+offs_x);
+    src=(uint8_t *)pixel_data[3];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[3];
@@ -10537,8 +10713,8 @@
 
   case WEED_PALETTE_YUV422P:
     width*=4;
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10546,15 +10722,15 @@
     }
     height>>=1;
     offs_x>>=1;
-    dst=(guchar *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
-    src=(guchar *)pixel_data[1];
+    dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
+    src=(uint8_t *)pixel_data[1];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
-    dst=(guchar *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
-    src=(guchar *)pixel_data[2];
+    dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
+    src=(uint8_t *)pixel_data[2];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
@@ -10564,8 +10740,8 @@
 
   case WEED_PALETTE_YUV420P:
   case WEED_PALETTE_YVU420P:
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10575,15 +10751,15 @@
     offs_x>>=1;
     width>>=1;
     offs_y>>=1;
-    dst=(guchar *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
-    src=(guchar *)pixel_data[1];
+    dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
+    src=(uint8_t *)pixel_data[1];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
-    dst=(guchar *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
-    src=(guchar *)pixel_data[2];
+    dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
+    src=(uint8_t *)pixel_data[2];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
@@ -10593,8 +10769,8 @@
 
   case WEED_PALETTE_RGBFLOAT:
     width*=3*sizeof(float);
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*3*sizeof(float));
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*3*sizeof(float));
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10604,8 +10780,8 @@
 
   case WEED_PALETTE_RGBAFLOAT:
     width*=4*sizeof(float);
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*4*sizeof(float));
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*4*sizeof(float));
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10615,8 +10791,8 @@
 
   case WEED_PALETTE_AFLOAT:
     width*=sizeof(float);
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*sizeof(float));
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*sizeof(float));
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10625,8 +10801,8 @@
     break;
 
   case WEED_PALETTE_A8:
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10637,8 +10813,8 @@
     // assume offs_x and width is a multiple of 8
   case WEED_PALETTE_A1:
     width>>=3;
-    dst=(guchar *)(new_pixel_data[0]+offs_y*rowstrides[0]+(offs_x>>3));
-    src=(guchar *)pixel_data[0];
+    dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+(offs_x>>3));
+    src=(uint8_t *)pixel_data[0];
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
@@ -10675,13 +10851,13 @@
 
   if (pixbuf!=NULL) {
     if (pixbuf_to_layer(layer,pixbuf)) {
-      mainw->do_not_free=gdk_pixbuf_get_pixels(pixbuf);
+      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
       mainw->free_fn=lives_free_with_check;
     }
     g_object_unref(pixbuf);
     mainw->do_not_free=NULL;
     mainw->free_fn=lives_free_normal;
-
+  }
   */
 
   int rowstride=lives_pixbuf_get_rowstride(pixbuf);
@@ -10701,6 +10877,7 @@
 #ifdef GUI_GTK
     if (nchannels==4) weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32);
     else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
+
 #endif
 #ifdef GUI_QT
     // TODO - need to check this, it may be endian dependent
@@ -10723,7 +10900,7 @@
 
   framesize=CEIL(rowstride*height,32);
 
-  pixel_data=calloc(framesize>>2,4);
+  pixel_data=lives_calloc(framesize>>4,16);
 
   if (pixel_data!=NULL) {
     in_pixel_data=(void *)lives_pixbuf_get_pixels_readonly(pixbuf);
@@ -10748,10 +10925,15 @@
 
 #ifdef GUI_GTK
 
-cairo_t *layer_to_cairo(weed_plant_t *layer) {
-  // convert a weed layer to cairo
-  // the layer shares pixel_data with cairo
-  // so it should be copied before the cairo is destroyed
+
+LIVES_INLINE int get_weed_palette_for_lives_painter(void) {
+  // TODO - should move to weed-compat.h
+  return (capable->byte_order==LIVES_BIG_ENDIAN)?WEED_PALETTE_ARGB32:WEED_PALETTE_BGRA32;
+}
+
+
+lives_painter_t *layer_to_lives_painter(weed_plant_t *layer) {
+  // convert a weed layer to lives_painter
 
   // "width","rowstrides" and "current_palette" of layer may all change
 
@@ -10762,32 +10944,32 @@
 
   register int i;
 
-  guchar *src,*dst,*orig_pixel_data,*pixel_data;
+  uint8_t *src,*dst,*orig_pixel_data,*pixel_data;
 
-  cairo_surface_t *surf;
-  cairo_t *cairo;
-  cairo_format_t cform;
+  lives_painter_surface_t *surf;
+  lives_painter_t *cairo;
+  lives_painter_format_t cform;
 
 
   width=weed_get_int_value(layer,"width",&error);
 
   pal=weed_get_int_value(layer,"current_palette",&error);
   if (pal==WEED_PALETTE_A8) {
-    cform=CAIRO_FORMAT_A8;
+    cform=LIVES_PAINTER_FORMAT_A8;
     widthx=width;
   }
   else if (pal==WEED_PALETTE_A1) {
-    cform=CAIRO_FORMAT_A1;
+    cform=LIVES_PAINTER_FORMAT_A1;
     widthx=width>>3;
   }
   else {
-    if (capable->byte_order==G_BIG_ENDIAN) {
+    if (capable->byte_order==LIVES_BIG_ENDIAN) {
       convert_layer_palette(layer,WEED_PALETTE_ARGB32,0);
     }
     else {
       convert_layer_palette(layer,WEED_PALETTE_BGRA32,0);
     }
-    cform=CAIRO_FORMAT_ARGB32;
+    cform=LIVES_PAINTER_FORMAT_ARGB32;
     widthx=width<<2;
   }
 
@@ -10795,15 +10977,15 @@
 
   irowstride=weed_get_int_value(layer,"rowstrides",&error);
 
-  orowstride=cairo_format_stride_for_width(cform,width);
+  orowstride=lives_painter_format_stride_for_width(cform,width);
 
-  orig_pixel_data=src=(guchar *)weed_get_voidptr_value(layer,"pixel_data",&error);
+  orig_pixel_data=src=(uint8_t *)weed_get_voidptr_value(layer,"pixel_data",&error);
 
   if (irowstride==orowstride) {
     pixel_data=src;
   }
   else {
-    dst=pixel_data=(guchar *)g_try_malloc(height*orowstride);
+    dst=pixel_data=(uint8_t *)g_try_malloc(height*orowstride);
     if (pixel_data==NULL) return NULL;
     for (i=0;i<height;i++) {
       lives_memcpy(dst,src,widthx);
@@ -10816,7 +10998,7 @@
     weed_set_int_value(layer,"rowstrides",orowstride);
   }
 
-  if (cform==CAIRO_FORMAT_ARGB32 && weed_palette_has_alpha_channel(pal)) {
+  if (cform==LIVES_PAINTER_FORMAT_ARGB32 && weed_palette_has_alpha_channel(pal)) {
     int flags=0;
     if (weed_plant_has_leaf(layer,"flags")) flags=weed_get_int_value(layer,"flags",&error);
     if (!(flags&WEED_CHANNEL_ALPHA_PREMULT)) {
@@ -10827,39 +11009,48 @@
     }
   }
 
-  surf=cairo_image_surface_create_for_data(pixel_data,
+  surf=lives_painter_image_surface_create_for_data(pixel_data,
 					   cform, 
 					   width, height,
 					   orowstride);
 
-  cairo=cairo_create(surf);
-  cairo_surface_destroy(surf);
+  if (surf==NULL) return NULL;
 
+  cairo=lives_painter_create(surf); // this copies the pixel_data
+  lives_painter_surface_destroy(surf);
 
   return cairo;
 }
 
 
 
-gboolean cairo_to_layer(cairo_t *cairo, weed_plant_t *layer) {
-  // updates a weed_layer from a cairo_t
-  // unlike doing this the other way around
-  // the cairo is not destroyed (data is copied)
+boolean lives_painter_to_layer(lives_painter_t *lives_painter, weed_plant_t *layer) {
+  // updates a weed_layer from a lives_painter_t
+
+  // TODO *** - keep the surface around using lives_painter_surface_reference() and destroy it when the "pixel_data" is freed or changed
+
   void *pixel_data,*src;
 
   int width,height,rowstride;
 
-  cairo_surface_t *surface=cairo_get_target(cairo);
+  lives_painter_surface_t *surface=lives_painter_get_target(lives_painter);
+  lives_painter_format_t  cform;
 
   // flush to ensure all writing to the image was done
-  cairo_surface_flush (surface);
+  lives_painter_surface_flush (surface);
 
-  src = cairo_image_surface_get_data (surface);
-  width = cairo_image_surface_get_width (surface);
-  height = cairo_image_surface_get_height (surface);
-  rowstride = cairo_image_surface_get_stride (surface);
+  src = lives_painter_image_surface_get_data (surface);
+  width = lives_painter_image_surface_get_width (surface);
+  height = lives_painter_image_surface_get_height (surface);
+  rowstride = lives_painter_image_surface_get_stride (surface);
 
-  pixel_data=g_try_malloc(height*rowstride);
+  if (weed_plant_has_leaf(layer,"pixel_data")) {
+    int error;
+    pixel_data=weed_get_voidptr_value(layer,"pixel_data",&error);
+    if (pixel_data!=NULL&&pixel_data!=src) g_free(pixel_data);
+  }
+
+  pixel_data=g_try_malloc(CEIL(height*rowstride,32));
 
   weed_set_voidptr_value(layer,"pixel_data",pixel_data);
 
@@ -10871,24 +11062,41 @@
   weed_set_int_value(layer,"width",width);
   weed_set_int_value(layer,"height",height);
 
-  if (capable->byte_order==G_BIG_ENDIAN) {
-    weed_set_int_value(layer,"current_palette",WEED_PALETTE_ARGB32);
-  }
-  else {
-    weed_set_int_value(layer,"current_palette",WEED_PALETTE_BGRA32);
-  }
+  cform = lives_painter_image_surface_get_format (surface);
 
-  if (prefs->alpha_post) {
-    // un-premultiply the alpha
-    alpha_unpremult(layer,TRUE);
-  }
-  else {
-    int flags=0,error;
-    if (weed_plant_has_leaf(layer,"flags"))
-      flags=weed_get_int_value(layer,"flags",&error);
+  switch (cform) {
+  case LIVES_PAINTER_FORMAT_ARGB32:
+    if (capable->byte_order==LIVES_BIG_ENDIAN) {
+      weed_set_int_value(layer,"current_palette",WEED_PALETTE_ARGB32);
+    }
+    else {
+      weed_set_int_value(layer,"current_palette",WEED_PALETTE_BGRA32);
+    }
+    
+    if (prefs->alpha_post) {
+      // un-premultiply the alpha
+      alpha_unpremult(layer,TRUE);
+    }
+    else {
+      int flags=0,error;
+      if (weed_plant_has_leaf(layer,"flags"))
+	flags=weed_get_int_value(layer,"flags",&error);
+      
+      flags|=WEED_CHANNEL_ALPHA_PREMULT;
+      weed_set_int_value(layer,"flags",flags);
+    }
+    break;
+
+  case LIVES_PAINTER_FORMAT_A8:
+    weed_set_int_value(layer,"current_palette",WEED_PALETTE_A8);
+    break;
 
-    flags|=WEED_CHANNEL_ALPHA_PREMULT;
-    weed_set_int_value(layer,"flags",flags);
+  case LIVES_PAINTER_FORMAT_A1:
+    weed_set_int_value(layer,"current_palette",WEED_PALETTE_A1);
+    break;
+
+  default:
+    break;
   }
 
   return TRUE;
@@ -10922,9 +11130,11 @@
   void **pd_array,**pixel_data;
   void *npixel_data;
   int height,width,palette,flags;
-  int i,*rowstrides;
+  int *rowstrides;
   size_t size,totsize=0;
-  gboolean deep=FALSE,contig;
+  boolean deep=FALSE,contig;
+
+  register int i;
 
   weed_plant_t *layer;
 
@@ -10951,7 +11161,7 @@
     pd_array=(void **)g_malloc(pd_elements*sizeof(void *));
 
     for (i=0;i<pd_elements;i++) {
-      size=(size_t)((gdouble)height*weed_palette_get_plane_ratio_vertical(palette,i)*(gdouble)rowstrides[i]);
+      size=(size_t)((double)height*weed_palette_get_plane_ratio_vertical(palette,i)*(double)rowstrides[i]);
       totsize+=CEIL(size,32);
     }
     
@@ -10959,7 +11169,7 @@
     if (npixel_data==NULL) return layer;
     
     for (i=0;i<pd_elements;i++) {
-      size=(size_t)((gdouble)height*weed_palette_get_plane_ratio_vertical(palette,i)*(gdouble)rowstrides[i]);
+      size=(size_t)((double)height*weed_palette_get_plane_ratio_vertical(palette,i)*(double)rowstrides[i]);
       pd_array[i]=npixel_data;
       lives_memcpy(pd_array[i],pixel_data[i],size);
       npixel_data+=CEIL(size,32);
@@ -10997,12 +11207,18 @@
 
 
 void weed_layer_free (weed_plant_t *layer) {
-  int i,error;
-  int pd_elements;
   void **pixel_data;
 
+  int error;
+  int pd_elements;
+
+  register int i;
+
   if (layer==NULL) return;
 
+  if (weed_plant_has_leaf(layer,"host_orig_pdata")&&weed_get_boolean_value(layer,"host_orig_pdata",&error)==WEED_TRUE) 
+    goto wpf;
+
   if (weed_plant_has_leaf(layer,"pixel_data")) {
     pd_elements=weed_leaf_num_elements(layer,"pixel_data");
     if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")&&
@@ -11022,6 +11238,9 @@
       }
     }
   }
+
+
+ wpf:
   weed_plant_free(layer);
 }

LiVES-1.6.1.tar.bz2/src/colourspace.h -> LiVES-2.0.3.tar.bz2/src/colourspace.h Changed

@@ -1,6 +1,6 @@
 // colourspace.h
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2012 <salsaman@gmail.com>
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -11,27 +11,27 @@
 
 
 typedef struct {
-  guchar u0;
-  guchar y0;
-  guchar v0;
-  guchar y1;
+  uint8_t u0;
+  uint8_t y0;
+  uint8_t v0;
+  uint8_t y1;
 } uyvy_macropixel;
 
 typedef struct {
-  guchar y0;
-  guchar u0;
-  guchar y1;
-  guchar v0;
+  uint8_t y0;
+  uint8_t u0;
+  uint8_t y1;
+  uint8_t v0;
 } yuyv_macropixel;
 
 
 typedef struct {
-  guchar u2;
-  guchar y0;
-  guchar y1;
-  guchar v2;
-  guchar y2;
-  guchar y3;
+  uint8_t u2;
+  uint8_t y0;
+  uint8_t y1;
+  uint8_t v2;
+  uint8_t y2;
+  uint8_t y3;
 } yuv411_macropixel;
 
 
@@ -40,10 +40,10 @@
 typedef struct {
   void *src;
   void *srcp[4];
-  gint hsize;
-  gint vsize;
-  gint irowstrides[4];
-  gint orowstrides[4];
+  int hsize;
+  int vsize;
+  int irowstrides[4];
+  int orowstrides[4];
   void *dest;
   void *destp[4];
   boolean in_alpha;
@@ -118,22 +118,22 @@
 boolean convert_layer_palette(weed_plant_t *layer, int outpl, int op_clamping);
 boolean convert_layer_palette_with_sampling(weed_plant_t *layer, int outpl, int out_sampling);
 boolean convert_layer_palette_full(weed_plant_t *layer, int outpl, int osamtype, boolean oclamping, int osubspace);
-boolean apply_gamma (weed_plant_t *ilayer, weed_plant_t *olayer, double gamma); ///< not used
-void resize_layer (weed_plant_t *layer, int width, int height, LiVESInterpType interp);
+//boolean apply_gamma (weed_plant_t *ilayer, weed_plant_t *olayer, double gamma); ///< not used
+boolean resize_layer (weed_plant_t *layer, int width, int height, LiVESInterpType interp, int opal_hint, int oclamp_hint);
 void letterbox_layer (weed_plant_t *layer, int width, int height, int nwidth, int nheight);
 void compact_rowstrides(weed_plant_t *layer);
 void create_empty_pixel_data(weed_plant_t *layer, boolean black_fill, boolean may_contig);
 void pixel_data_planar_from_membuf(void **pixel_data, void *data, size_t size, int palette);
 LiVESPixbuf *layer_to_pixbuf (weed_plant_t *layer);
-boolean pixbuf_to_layer(weed_plant_t *layer, LiVESPixbuf *);
+boolean pixbuf_to_layer(weed_plant_t *layer, LiVESPixbuf *) WARN_UNUSED;
 
 weed_plant_t *weed_layer_copy (weed_plant_t *dlayer, weed_plant_t *slayer);
 void weed_layer_free (weed_plant_t *layer);
 weed_plant_t *weed_layer_new(int width, int height, int *rowstrides, int current_palette);
 int weed_layer_get_palette(weed_plant_t *layer);
 
-cairo_t *layer_to_cairo(weed_plant_t *layer);
-gboolean cairo_to_layer(cairo_t *cairo, weed_plant_t *layer);
+lives_painter_t *layer_to_lives_painter(weed_plant_t *layer);
+boolean lives_painter_to_layer(lives_painter_t *cairo, weed_plant_t *layer);
 
 void alpha_unpremult(weed_plant_t *layer, boolean un);
 
@@ -145,14 +145,16 @@
 boolean weed_palette_is_yuv_palette(int pal);
 boolean weed_palette_is_float_palette(int pal);
 boolean weed_palette_has_alpha_channel(int pal);
-gint weed_palette_get_bits_per_macropixel(int pal);
-gint weed_palette_get_pixels_per_macropixel(int pal);
-gint weed_palette_get_numplanes(int pal);
-gdouble weed_palette_get_plane_ratio_horizontal(int pal, int plane);
-gdouble weed_palette_get_plane_ratio_vertical(int pal, int plane);
+int weed_palette_get_bits_per_macropixel(int pal);
+int weed_palette_get_pixels_per_macropixel(int pal);
+int weed_palette_get_numplanes(int pal);
+double weed_palette_get_plane_ratio_horizontal(int pal, int plane);
+double weed_palette_get_plane_ratio_vertical(int pal, int plane);
 boolean weed_palette_is_lower_quality(int p1, int p2);  ///< return TRUE if p1 is lower quality than p2
-boolean weed_palette_is_resizable(int pal);
-gdouble weed_palette_get_compression_ratio (int pal);
+boolean weed_palette_is_resizable(int pal, int clamped, boolean in_out);
+double weed_palette_get_compression_ratio (int pal);
+
+int get_weed_palette_for_lives_painter(void);
 
 #define BLACK_THRESH 20 ///< if R,G and B values are all <= this, we consider it a "black" pixel
 boolean lives_pixbuf_is_all_black(LiVESPixbuf *pixbuf);
@@ -163,7 +165,7 @@
 const char *weed_palette_get_name(int pal);
 const char *weed_yuv_clamping_get_name(int clamping);
 const char *weed_yuv_subspace_get_name(int subspace);
-gchar *weed_palette_get_name_full(int pal, int clamped, int subspace);
+char *weed_palette_get_name_full(int pal, int clamped, int subspace);
 
 
 #ifdef USE_SWSCALE

LiVES-1.6.1.tar.bz2/src/cvirtual.c -> LiVES-2.0.3.tar.bz2/src/cvirtual.c Changed

@@ -1,6 +1,6 @@
 // cvirtual.c
 // LiVES
-// (c) G. Finch 2008 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2008 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -19,15 +19,15 @@
 
 
 /** count virtual frames between start and end (inclusive) */
-LIVES_INLINE gint count_virtual_frames(int *findex, int start, int end) {
+LIVES_INLINE int count_virtual_frames(int *findex, int start, int end) {
   register int i;
-  gint count=0;
+  int count=0;
   for (i=start-1;i<end;i++) if (findex[i]!=-1) count++;
   return count;
 }
 
 
-void create_frame_index(gint fileno, gboolean init, gint start_offset, gint nframes) {
+void create_frame_index(int fileno, boolean init, int start_offset, int nframes) {
   register int i;
   file *sfile=mainw->files[fileno];
   if (sfile==NULL||sfile->frame_index!=NULL) return;
@@ -43,7 +43,7 @@
 
 
 // save frame_index to disk
-gboolean save_frame_index(gint fileno) {
+boolean save_frame_index(int fileno) {
   int fd,i;
   int retval;
   gchar *fname;
@@ -60,6 +60,11 @@
       retval=do_write_failed_error_s_with_retry(fname,g_strerror(errno),NULL);
     }
     else {
+
+#ifdef IS_MINGW
+  setmode(fd, O_BINARY);
+#endif
+
       mainw->write_failed=FALSE;
       for (i=0;i<sfile->frames;i++) {
 	lives_write_le(fd,&sfile->frame_index[i],4,TRUE);
@@ -84,7 +89,7 @@
 
 
 // load frame_index from disk
-gboolean load_frame_index(gint fileno) {
+boolean load_frame_index(int fileno) {
   int fd,i;
   int retval;
   gchar *fname;
@@ -116,6 +121,10 @@
       }
     }
     else {
+
+#ifdef IS_MINGW
+  setmode(fd, O_BINARY);
+#endif
       create_frame_index(fileno,FALSE,0,sfile->frames);
 
       mainw->read_failed=FALSE;
@@ -145,10 +154,16 @@
   // only done once all
 
   gchar *idxfile=g_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
-  gchar *com=g_strdup_printf("/bin/rm -f \"%s\"",idxfile);
+  gchar *com;
 
   register int i;
 
+#ifndef IS_MINGW
+  com=g_strdup_printf("/bin/rm -f \"%s\"",idxfile);
+#else
+  com=g_strdup_printf("rm.exe -f \"%s\"",idxfile);
+#endif
+
   // cannot call check_if_non_virtual() else we end up recursing
 
   if (sfile->frame_index!=NULL) {
@@ -172,10 +187,15 @@
 
 
 
-gboolean check_clip_integrity(file *sfile, const lives_clip_data_t *cdata) {
-  int i;
+boolean check_clip_integrity(int fileno, const lives_clip_data_t *cdata) {
+  file *sfile=mainw->files[fileno];
+
   lives_image_type_t empirical_img_type=sfile->img_type;
 
+  int first_real_frame=0;
+
+  register int i;
+
   // check clip integrity upon loading
 
   // check that cached values match with sfile (on disk) values
@@ -193,10 +213,31 @@
       if (g_file_test(frame,G_FILE_TEST_EXISTS)) empirical_img_type=IMG_TYPE_PNG;
       else empirical_img_type=IMG_TYPE_JPEG;
       g_free(frame);
+      first_real_frame=i+1;
       break;
     }
   }
 
+  // TODO *** check frame count
+
+  if (sfile->frames>0&&(sfile->hsize*sfile->vsize==0)) {
+    if (first_real_frame>0) {
+      sfile->img_type=empirical_img_type;
+      get_frames_sizes(fileno,first_real_frame);
+    }
+    else {
+      if (!prefs->auto_nobord) {
+	sfile->hsize=cdata->frame_width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
+	sfile->vsize=cdata->frame_height;
+      }
+      else {
+	sfile->hsize=cdata->width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
+	sfile->vsize=cdata->height;
+      }
+    }
+    goto mismatch;
+  }
+
   if (sfile->fps!=cdata->fps) goto mismatch;
 
   if (sfile->img_type!=empirical_img_type) goto mismatch;
@@ -216,12 +257,12 @@
 
 
 
-gboolean check_if_non_virtual(gint fileno, gint start, gint end) {
+boolean check_if_non_virtual(int fileno, int start, int end) {
   // check if there are no virtual frames from start to end inclusive in clip fileno
 
   register int i;
   file *sfile=mainw->files[fileno];
-  gboolean bad_header=FALSE;
+  boolean bad_header=FALSE;
 
   if (sfile->clip_type!=CLIP_TYPE_FILE) return TRUE;
 
@@ -281,17 +322,12 @@
       oname=NULL;
       threaded_dialog_spin();
 
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
 
-      pixbuf=pull_lives_pixbuf_at_size(sfileno,i,sfile->img_type==IMG_TYPE_JPEG?"jpg":"png",
+      pixbuf=pull_lives_pixbuf_at_size(sfileno,i,get_image_ext_for_type(sfile->img_type),
 				       q_gint64((i-1.)/sfile->fps,sfile->fps),sfile->hsize,sfile->vsize,LIVES_INTERP_BEST);
       
-      if (sfile->img_type==IMG_TYPE_JPEG) {
-	oname=g_strdup_printf("%s/%s/%08d.jpg",prefs->tmpdir,sfile->handle,i);
-      }
-      else if (sfile->img_type==IMG_TYPE_PNG) {
-	oname=g_strdup_printf("%s/%s/%08d.png",prefs->tmpdir,sfile->handle,i);
-      }
+      oname=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
 
       do {
 	retval=0;
@@ -304,7 +340,7 @@
       } while (retval==LIVES_RETRY);
 
       if (oname!=NULL) g_free(oname);
-      if (pixbuf!=NULL) gdk_pixbuf_unref(pixbuf);
+      if (pixbuf!=NULL) lives_object_unref(pixbuf);
       pixbuf=NULL;
 
       if (retval==LIVES_CANCEL) return FALSE;
@@ -317,7 +353,7 @@
       if (update_progress) {
 	// sig_progress...
 	g_snprintf (mainw->msg,256,"%d",progress++);
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
       }
 
       threaded_dialog_spin();
@@ -337,7 +373,7 @@
 
 
 
-void insert_images_in_virtual (gint sfileno, gint where, gint frames) {
+void insert_images_in_virtual (int sfileno, int where, int frames) {
   // insert physical (frames) images into sfile at position where [0 = before first frame]
   // this is the virtual (book-keeping) part
 
@@ -373,7 +409,7 @@
 
 
 
-void delete_frames_from_virtual (gint sfileno, gint start, gint end) {
+void delete_frames_from_virtual (int sfileno, int start, int end) {
   // delete (frames) images from sfile at position start to end
   // this is the virtual (book-keeping) part
 
@@ -410,7 +446,7 @@
 
 
 
-void restore_frame_index_back (gint sfileno) {
+void restore_frame_index_back (int sfileno) {
   // undo an operation
   // this is the virtual (book-keeping) part
 
@@ -438,7 +474,7 @@
 
 
 
-void clean_images_from_virtual (file *sfile, gint oldframes) {
+void clean_images_from_virtual (file *sfile, int oldframes) {
   // remove images on disk where the frame_index points to a frame in
   // the original clip
 
@@ -458,20 +494,17 @@
 
   for (i=0;i<oldframes;i++) {
     threaded_dialog_spin();
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     threaded_dialog_spin();
 
     if ((i<sfile->frames&&sfile->frame_index[i]!=-1)||i>=sfile->frames) {
-      if (sfile->img_type==IMG_TYPE_JPEG) {
-	iname=g_strdup_printf("%s/%s/%08d.jpg",prefs->tmpdir,sfile->handle,i);
-      }
-      else if (sfile->img_type==IMG_TYPE_PNG) {
-	iname=g_strdup_printf("%s/%s/%08d.png",prefs->tmpdir,sfile->handle,i);
-      }
-      //      else {
-	// ...
-      //}
+      iname=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/rm -f \"%s\"",iname);
+#else
+      com=g_strdup_printf("rm.exe -f \"%s\"",iname);
+#endif
       lives_system(com,FALSE);
       g_free(com);
     }
@@ -479,7 +512,7 @@
 }
 
 
-int *frame_index_copy(int *findex, gint nframes) {
+int *frame_index_copy(int *findex, int nframes) {
   // like it says on the label
   // copy first nframes from findex and return them
   // no checking is done to make sure nframes is in range
@@ -493,7 +526,7 @@
 }
 
 
-gboolean is_virtual_frame(int sfileno, int frame) {
+boolean is_virtual_frame(int sfileno, int frame) {
   // frame is virtual if it is still inside a video clip (read only)
   // once a frame is on disk as an image it is no longer virtual

LiVES-1.6.1.tar.bz2/src/cvirtual.h -> LiVES-2.0.3.tar.bz2/src/cvirtual.h Changed

@@ -1,6 +1,6 @@
 // cvirtual.h
 // LiVES
-// (c) G. Finch 2008 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2008 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -11,24 +11,24 @@
 #define HAS_LIVES_CVIRTUAL_H
 
 
-void create_frame_index(gint fileno, gboolean init, gint start_offset, gint nframes);
-gboolean save_frame_index(gint fileno);
-gboolean load_frame_index(gint fileno) WARN_UNUSED;
-gboolean check_clip_integrity(file *sfile, const lives_clip_data_t *cdata);
+void create_frame_index(int fileno, boolean init, int start_offset, int nframes);
+boolean save_frame_index(int fileno);
+boolean load_frame_index(int fileno) WARN_UNUSED;
+boolean check_clip_integrity(int fileno, const lives_clip_data_t *cdata);
 
 boolean virtual_to_images(int sfileno, int sframe, int eframe, boolean update_progress) WARN_UNUSED;
-void delete_frames_from_virtual (gint sfileno, gint start, gint end);
-void insert_images_in_virtual (gint sfileno, gint where, gint frames);
+void delete_frames_from_virtual (int sfileno, int start, int end);
+void insert_images_in_virtual (int sfileno, int where, int frames);
 void del_frame_index(file *sfile);
-void clean_images_from_virtual (file *sfile, gint oldframes);
-int *frame_index_copy(int *findex, gint nframes);
-gboolean check_if_non_virtual(gint fileno, gint start, gint end);
+void clean_images_from_virtual (file *sfile, int oldframes);
+int *frame_index_copy(int *findex, int nframes);
+boolean check_if_non_virtual(int fileno, int start, int end);
 
-void restore_frame_index_back (gint sfileno);
+void restore_frame_index_back (int sfileno);
 
-gboolean is_virtual_frame(int sfileno, int frame);
+boolean is_virtual_frame(int sfileno, int frame);
 
-gint count_virtual_frames(int *findex, int start, int end);
+int count_virtual_frames(int *findex, int start, int end);
 
 
 #endif

LiVES-1.6.1.tar.bz2/src/dialogs.c -> LiVES-2.0.3.tar.bz2/src/dialogs.c Changed

@@ -16,43 +16,44 @@
 #include "cvirtual.h"
 #include "audio.h" // for fill_abuffer_from
 #include "resample.h"
-
+#include "paramwindow.h"
 
 extern void reset_frame_and_clip_index (void);
 
 
 // processing
-static gint64 event_start;
-static gdouble audio_start;
-static gboolean accelerators_swapped;
-static gint frames_done;
-static gint disp_frames_done;
+static uint64_t event_start;
+static double audio_start;
+static boolean accelerators_swapped;
+static int frames_done;
+static int disp_frames_done;
+
+static uint64_t last_open_check_ticks;
 
-static gint64 last_open_check_ticks;
+static uint64_t prev_ticks,last_sc_ticks,consume_ticks;
 
-static gboolean shown_paused_frames;
-static gboolean force_show;
+static boolean shown_paused_frames;
+static boolean force_show;
 
-static gdouble est_time;
+static double est_time;
 
 
 // how often to we count frames when opening
 #define OPEN_CHECK_TICKS (U_SECL/10l)
 
-static volatile gboolean dlg_thread_ready=FALSE;
+static volatile boolean dlg_thread_ready=FALSE;
 
-void on_warn_mask_toggled (GtkToggleButton *togglebutton, gpointer user_data)
-{
+void on_warn_mask_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
   GtkWidget *tbutton;
 
-  if (gtk_toggle_button_get_active(togglebutton)) prefs->warning_mask|=GPOINTER_TO_INT(user_data);
+  if (lives_toggle_button_get_active(togglebutton)) prefs->warning_mask|=GPOINTER_TO_INT(user_data);
   else prefs->warning_mask^=GPOINTER_TO_INT(user_data);
   set_int_pref("lives_warning_mask",prefs->warning_mask);
 
   if ((tbutton=(GtkWidget *)g_object_get_data(G_OBJECT(togglebutton),"auto"))!=NULL) {
     // this is for the cds window - disable autoreload if we are not gonna show this window
-    if (gtk_toggle_button_get_active(togglebutton)) {
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tbutton),FALSE);
+    if (lives_toggle_button_get_active(togglebutton)) {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(tbutton),FALSE);
       gtk_widget_set_sensitive(tbutton,FALSE);
     }
     else {
@@ -78,9 +79,10 @@
 
   if (palette->style&STYLE_1) {
     label=gtk_expander_get_label_widget(GTK_EXPANDER(expander));
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_text(textview, GTK_STATE_NORMAL, &palette->info_text);
-    gtk_widget_modify_base(textview, GTK_STATE_NORMAL, &palette->info_base);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+    lives_widget_set_fg_color(expander, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+    lives_widget_set_bg_color(expander, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
   }
 
   gtk_text_buffer_insert_at_cursor(textbuffer,"\n",strlen("\n"));
@@ -91,7 +93,7 @@
     xlist=xlist->next;
   }
 
-  gtk_box_pack_start (box, expander, FALSE, FALSE, 10);
+  gtk_box_pack_start (box, expander, FALSE, FALSE, widget_opts.packing_height);
   gtk_widget_show_all(expander);
 }
 
@@ -100,34 +102,16 @@
 
 
 
-void add_warn_check (GtkBox *box, gint warn_mask_number) {
-  GtkWidget *checkbutton = gtk_check_button_new ();
-  GtkWidget *eventbox,*hbox;
-  GtkWidget *label=gtk_label_new_with_mnemonic 
-    (_("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"));
-
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-
-  eventbox=gtk_event_box_new();
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		      checkbutton);
-  
-  hbox = gtk_hbox_new (FALSE, 0);
-  
-  if (mainw->is_ready&&palette->style&STYLE_1&&mainw!=NULL) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  gtk_box_pack_start (box, hbox, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  gtk_widget_show_all (hbox);
-  GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+void add_warn_check (GtkBox *box, int warn_mask_number) {
+  GtkWidget *checkbutton;
+  GtkWidget *hbox=lives_hbox_new (FALSE, 0);
+
+  checkbutton=lives_standard_check_button_new (
+					       _("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"),
+					       TRUE,LIVES_BOX(box),NULL);
+
+  gtk_widget_show_all(hbox);
+ 
   g_signal_connect (GTK_OBJECT (checkbutton), "toggled",
 		    G_CALLBACK (on_warn_mask_toggled),
                       GINT_TO_POINTER(warn_mask_number));
@@ -153,10 +137,10 @@
 static void add_clear_ds_adv(GtkBox *box) {
   // add a button which opens up  Recover/Repair widget
   GtkWidget *button = gtk_button_new_with_mnemonic(_(" _Advanced Settings >>"));
-  GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+  GtkWidget *hbox = lives_hbox_new (FALSE, 0);
 
-  gtk_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, 20);
-  gtk_box_pack_start (box, hbox, FALSE, FALSE, 10);
+  gtk_box_pack_start (GTK_BOX(hbox), button, FALSE, FALSE, widget_opts.packing_width*2);
+  gtk_box_pack_start (box, hbox, FALSE, FALSE, widget_opts.packing_height);
 
   gtk_widget_show_all(hbox);
 
@@ -171,7 +155,7 @@
 
 
 //Warning or yes/no dialog
-static GtkWidget* create_warn_dialog (gint warn_mask_number, GtkWindow *transient, const gchar *text, lives_dialog_t diat) {
+static GtkWidget* create_warn_dialog (int warn_mask_number, GtkWindow *transient, const gchar *text, lives_dialog_t diat) {
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
   GtkWidget *dialog_action_area;
@@ -179,11 +163,13 @@
   GtkWidget *warning_okbutton=NULL;
   GtkWidget *abortbutton=NULL;
 
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+
   gchar *textx;
 
   switch (diat) {
   case LIVES_DIALOG_WARN:
-    dialog = gtk_message_dialog_new (transient,GTK_DIALOG_MODAL,GTK_MESSAGE_WARNING,GTK_BUTTONS_NONE,"%s","");
+    dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_WARNING,GTK_BUTTONS_NONE,"%s","");
 
     if (mainw->add_clear_ds_button) {
       mainw->add_clear_ds_button=FALSE;
@@ -191,29 +177,34 @@
     }
 
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Warning !"));
-    mainw->warning_label = gtk_label_new (_("warning"));
+    widget_opts.justify=LIVES_JUSTIFY_CENTER;
+    mainw->warning_label = lives_standard_label_new (_("warning"));
+    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     warning_cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
     gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, GTK_RESPONSE_CANCEL);
     warning_okbutton = gtk_button_new_from_stock ("gtk-ok");
     gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, GTK_RESPONSE_OK);
     break;
   case LIVES_DIALOG_YESNO:
-    dialog = gtk_message_dialog_new (transient,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s","");
+    dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s","");
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Question"));
-    mainw->warning_label = gtk_label_new (_("question"));
+    widget_opts.justify=LIVES_JUSTIFY_CENTER;
+    mainw->warning_label = lives_standard_label_new (_("question"));
+    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     warning_cancelbutton = gtk_button_new_from_stock ("gtk-no");
     gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, LIVES_NO);
     warning_okbutton = gtk_button_new_from_stock ("gtk-yes");
     gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_okbutton, LIVES_YES);
     break;
   case LIVES_DIALOG_ABORT_CANCEL_RETRY:
-    dialog = gtk_message_dialog_new (transient,GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,"%s","");
+    dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,"%s","");
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - File Error"));
-    mainw->warning_label = gtk_label_new (_("File Error"));
+    widget_opts.justify=LIVES_JUSTIFY_CENTER;
+    mainw->warning_label = lives_standard_label_new (_("File Error"));
+    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     abortbutton = gtk_button_new_from_stock ("gtk-quit");
     gtk_button_set_label(GTK_BUTTON(abortbutton),_("_Abort"));
     gtk_dialog_add_action_widget (GTK_DIALOG (dialog), abortbutton, LIVES_ABORT);
-    gtk_widget_show (abortbutton);
     warning_cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
     gtk_dialog_add_action_widget (GTK_DIALOG (dialog), warning_cancelbutton, LIVES_CANCEL);
     warning_okbutton = gtk_button_new_from_stock ("gtk-refresh");
@@ -225,12 +216,17 @@
     break;
   }
 
-  if (palette->style&STYLE_1) {
-    //gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
+
+  if (widget_opts.apply_theme&&(palette->style&STYLE_1)) {
+    lives_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
+    lives_widget_set_bg_color(dialog, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
   gtk_window_set_deletable(GTK_WINDOW(dialog), FALSE);
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog), widget_opts.border_width*2);
 
   textx=insert_newlines(text,MAX_MSG_WIDTH_CHARS);
   gtk_label_set_text(GTK_LABEL(mainw->warning_label),textx);
@@ -238,18 +234,10 @@
   g_free(textx);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_widget_show (dialog_vbox);
 
-  gtk_widget_show (mainw->warning_label);
   gtk_box_pack_start (GTK_BOX (dialog_vbox), mainw->warning_label, TRUE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (mainw->warning_label), GTK_JUSTIFY_CENTER);
-  gtk_label_set_line_wrap (GTK_LABEL (mainw->warning_label), FALSE);
   gtk_label_set_selectable (GTK_LABEL (mainw->warning_label), TRUE);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mainw->warning_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
   if (mainw->add_clear_ds_adv) {
     mainw->add_clear_ds_adv=FALSE;
     add_clear_ds_adv(GTK_BOX(dialog_vbox));
@@ -263,31 +251,40 @@
     add_xlays_widget(GTK_BOX(dialog_vbox));
   }
 
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
+
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
-  gtk_widget_show (warning_cancelbutton);
-  GTK_WIDGET_SET_FLAGS (warning_cancelbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (warning_cancelbutton);
 
-  gtk_widget_show (warning_okbutton);
+  gtk_widget_add_accelerator (warning_cancelbutton, "activate", accel_group,
+			      LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
-  GTK_WIDGET_SET_FLAGS (warning_okbutton, GTK_CAN_DEFAULT);
+  gtk_widget_add_accelerator (warning_okbutton, "activate", accel_group,
+			      LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
+
+  lives_widget_set_can_focus_and_default (warning_okbutton);
   gtk_widget_grab_default (warning_okbutton);
 
+  gtk_widget_show_all(dialog);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  if (prefs->present) {
+    gtk_window_present (GTK_WINDOW (dialog));
+    gdk_window_raise (lives_widget_get_xwindow(dialog));
+  }
 
   return dialog;
 }
 
 
 
-gboolean
-do_warning_dialog(const gchar *text) {
+boolean do_warning_dialog(const gchar *text) {
   return do_warning_dialog_with_check(text, 0);
 }
 
 
-gboolean do_warning_dialog_with_check (const gchar *text, gint warn_mask_number) {
+boolean do_warning_dialog_with_check (const gchar *text, int warn_mask_number) {
   if (!prefs->show_gui) {
     return do_warning_dialog_with_check_transient(text,warn_mask_number,NULL);
   } else {
@@ -299,11 +296,10 @@
 
 
 
-gboolean
-do_warning_dialog_with_check_transient(const gchar *text, gint warn_mask_number, GtkWindow *transient) {
+boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient) {
   // show OK/CANCEL, returns FALSE if cancelled
   GtkWidget *warning;
-  gint response=1;
+  int response=1;
   gchar *mytext;
 
   if (prefs->warning_mask&warn_mask_number) {
@@ -319,14 +315,14 @@
     gtk_widget_destroy (warning);
   } while (response==LIVES_RETRY);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   if (mytext!=NULL) g_free(mytext);
 
   return (response==GTK_RESPONSE_OK);
 }
 
 
-gboolean do_yesno_dialog(const gchar *text) {
+boolean do_yesno_dialog(const gchar *text) {
   // show Yes/No, returns TRUE if Yes
   GtkWidget *warning;
   int response;
@@ -345,7 +341,7 @@
   response=gtk_dialog_run (GTK_DIALOG (warning));
   gtk_widget_destroy (warning);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   return (response==LIVES_YES);
 }
 
@@ -374,15 +370,32 @@
     response=gtk_dialog_run (GTK_DIALOG (warning));
     gtk_widget_destroy (warning);
 
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     if (response==LIVES_ABORT) {
       if (do_abort_check()) {
 	if (mainw->current_file>-1) {
 	  if (cfile->handle!=NULL) {
+	    gchar *com;
 	    // stop any processing processing
-	    gchar *com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+	    com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 	    lives_system(com,TRUE);
+#else
+	    // get pid from backend
+	    FILE *rfile;
+	    ssize_t rlen;
+	    char val[16];
+	    int pid;
+	    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	    rfile=popen(com,"r");
+	    rlen=fread(val,1,16,rfile);
+	    pclose(rfile);
+	    memset(val+rlen,0,1);
+	    pid=atoi(val);
+	    
+	    lives_win32_kill_subprocesses(pid,TRUE);
+#endif
 	    g_free(com);
 	  }
 	}
@@ -400,9 +413,8 @@
 
 
 
-void 
-do_error_dialog(const gchar *text) {
-  // show error/info box
+void do_error_dialog(const gchar *text) {
+  // show error box
   if (!prefs->show_gui) {
     do_error_dialog_with_check_transient(text,FALSE,0,NULL);
   } else {
@@ -416,9 +428,23 @@
 }
 
 
-void 
-do_error_dialog_with_check(const gchar *text, gint warn_mask_number) {
-  // show error/info box
+void do_info_dialog(const gchar *text) {
+  // show info box
+  if (!prefs->show_gui) {
+    do_info_dialog_with_transient(text,FALSE,NULL);
+  } else {
+    if (prefsw!=NULL&&prefsw->prefs_dialog!=NULL) do_info_dialog_with_transient(text,FALSE,
+										GTK_WINDOW(prefsw->prefs_dialog));
+    else {
+      if (mainw->multitrack==NULL) do_info_dialog_with_transient(text,FALSE,GTK_WINDOW(mainw->LiVES));
+      else do_info_dialog_with_transient(text,FALSE,GTK_WINDOW(mainw->multitrack->window));
+    }
+  }
+}
+
+
+void do_error_dialog_with_check(const gchar *text, int warn_mask_number) {
+  // show warning box
   if (!prefs->show_gui) {
     do_error_dialog_with_check_transient(text,FALSE,warn_mask_number,NULL);
   } else {
@@ -428,9 +454,8 @@
 }
 
 
-void 
-do_blocking_error_dialog(const gchar *text) {
-  // show error/info box - blocks until OK is pressed
+void do_blocking_error_dialog(const gchar *text) {
+  // show error box - blocks until OK is pressed
   if (!prefs->show_gui) {
     do_error_dialog_with_check_transient(text,TRUE,0,NULL);
   } else {
@@ -440,30 +465,59 @@
 }
 
 
-void 
-do_error_dialog_with_check_transient(const gchar *text, gboolean is_blocking, gint warn_mask_number, GtkWindow *transient) {
-  // show error/info box
+void do_blocking_info_dialog(const gchar *text) {
+  // show info box - blocks until OK is pressed
+  if (!prefs->show_gui) {
+    do_info_dialog_with_transient(text,TRUE,NULL);
+  } else {
+    if (mainw->multitrack==NULL) do_info_dialog_with_transient(text,TRUE,GTK_WINDOW(mainw->LiVES));
+    else do_info_dialog_with_transient(text,TRUE,GTK_WINDOW(mainw->multitrack->window));
+  }
+}
+
+
+
+void do_error_dialog_with_check_transient(const gchar *text, boolean is_blocking, int warn_mask_number, GtkWindow *transient) {
+  // show error box
 
   GtkWidget *err_box;
   gchar *mytext;
   if (prefs->warning_mask&warn_mask_number) return;
   mytext=g_strdup(text);
-  err_box=create_dialog3(mytext,is_blocking,warn_mask_number);
+  err_box=create_info_error_dialog(mytext,is_blocking,warn_mask_number,warn_mask_number==0?LIVES_INFO_TYPE_ERROR:LIVES_INFO_TYPE_WARNING);
   if (mytext!=NULL) g_free(mytext);
   if (transient!=NULL) gtk_window_set_transient_for(GTK_WINDOW(err_box),transient);
-  gtk_widget_show(err_box);
-  gtk_window_present (GTK_WINDOW (err_box));
-  gdk_window_raise (err_box->window);
 
   if (is_blocking) {
     gtk_dialog_run(GTK_DIALOG (err_box));
-    if (mainw!=NULL&&mainw->is_ready) {
+    if (mainw!=NULL&&mainw->is_ready&&transient!=NULL) {
+      gtk_widget_queue_draw(GTK_WIDGET(transient));
+    }
+  }
+}
+
+
+
+void do_info_dialog_with_transient(const gchar *text, boolean is_blocking, GtkWindow *transient) {
+  // info box
+
+  GtkWidget *info_box;
+  gchar *mytext;
+  mytext=g_strdup(text);
+  info_box=create_info_error_dialog(mytext,is_blocking,0,LIVES_INFO_TYPE_INFO);
+  if (mytext!=NULL) g_free(mytext);
+  if (transient!=NULL) gtk_window_set_transient_for(GTK_WINDOW(info_box),transient);
+
+  if (is_blocking) {
+    gtk_dialog_run(GTK_DIALOG (info_box));
+    if (mainw!=NULL&&mainw->is_ready&&transient!=NULL) {
       gtk_widget_queue_draw(GTK_WIDGET(transient));
     }
   }
 }
 
 
+
 gchar *ds_critical_msg(const gchar *dir, guint64 dsval) {
   gchar *msg;
   gchar *msgx;
@@ -504,8 +558,7 @@
 				       TRUE,0,GTK_WINDOW(prefsw->prefs_dialog));
 }  
 
-void 
-do_memory_error_dialog (void) {
+void do_memory_error_dialog (void) {
   do_error_dialog (_ ("\n\nLiVES was unable to perform this operation due to unsufficient memory.\nPlease try closing some other applications first.\n"));
 }
 
@@ -518,7 +571,7 @@
   int pxstart=1;
   gchar **array;
   gchar *addinfo;
-  gint numtok;
+  int numtok;
 
   if (mainw->cancelled) return; // if the user/system cancelled we can expect errors !
 
@@ -576,7 +629,7 @@
 
 
 
-gboolean check_backend_return(file *sfile) {
+boolean check_backend_return(file *sfile) {
   // check return code after synchronous (foreground) backend commands
 
   FILE *infofile;
@@ -621,13 +674,16 @@
 }
 
 
-gboolean check_storage_space(file *sfile, gboolean is_processing) {
+boolean check_storage_space(file *sfile, boolean is_processing) {
   // check storage space in prefs->tmpdir, and if sfile!=NULL, in sfile->op_dir
   guint64 dsval;
-  gchar *msg,*tmp;
+
   int retval;
-  gboolean did_pause=FALSE;
+  boolean did_pause=FALSE;
+
   lives_storage_status_t ds;
+
+  gchar *msg,*tmp;
   gchar *pausstr=g_strdup(_("Processing has been paused."));
 
   do {
@@ -638,7 +694,7 @@
       if (mainw->next_ds_warn_level>(dsval>>1)) mainw->next_ds_warn_level=dsval>>1;
       if (mainw->next_ds_warn_level<prefs->ds_crit_level) mainw->next_ds_warn_level=prefs->ds_crit_level;
       if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	  GTK_WIDGET_VISIBLE(sfile->proc_ptr->pause_button)) {
+	  lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
 	on_effects_paused(GTK_BUTTON(sfile->proc_ptr->pause_button),NULL);
 	did_pause=TRUE;
       }
@@ -664,7 +720,7 @@
     }
     else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
       if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	  GTK_WIDGET_VISIBLE(sfile->proc_ptr->pause_button)) {
+	  lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
 	on_effects_paused(GTK_BUTTON(sfile->proc_ptr->pause_button),NULL);
 	did_pause=TRUE;
       }
@@ -698,7 +754,7 @@
 	if (sfile->op_ds_warn_level>(dsval>>1)) sfile->op_ds_warn_level=dsval>>1;
 	if (sfile->op_ds_warn_level<prefs->ds_crit_level) sfile->op_ds_warn_level=prefs->ds_crit_level;
 	if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	    GTK_WIDGET_VISIBLE(sfile->proc_ptr->pause_button)) {
+	    lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
 	  on_effects_paused(GTK_BUTTON(sfile->proc_ptr->pause_button),NULL);
 	  did_pause=TRUE;
 	}
@@ -724,7 +780,7 @@
       }
       else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
 	if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	    GTK_WIDGET_VISIBLE(sfile->proc_ptr->pause_button)) {
+	    lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
 	  on_effects_paused(GTK_BUTTON(sfile->proc_ptr->pause_button),NULL);
 	  did_pause=TRUE;
 	}
@@ -762,7 +818,7 @@
 
 
 
-void cancel_process(gboolean visible) {
+static void cancel_process(boolean visible) {
   if (prefs->show_player_stats&&!visible&&mainw->fps_measure>0.) {
     // statistics
     gettimeofday(&tv, NULL);
@@ -773,8 +829,8 @@
     if (mainw->preview_box!=NULL&&!mainw->preview) gtk_widget_set_tooltip_text( mainw->p_playbutton,_ ("Play all"));
     if (accelerators_swapped) {
       if (!mainw->preview) gtk_widget_set_tooltip_text( mainw->m_playbutton,_ ("Play all"));
-      gtk_widget_remove_accelerator (cfile->proc_ptr->preview_button, mainw->accel_group, GDK_p, (GdkModifierType)0);
-      gtk_widget_add_accelerator (mainw->playall, "activate", mainw->accel_group, GDK_p, (GdkModifierType)0, 
+      gtk_widget_remove_accelerator (cfile->proc_ptr->preview_button, mainw->accel_group, LIVES_KEY_p, (GdkModifierType)0);
+      gtk_widget_add_accelerator (mainw->playall, "activate", mainw->accel_group, LIVES_KEY_p, (GdkModifierType)0, 
 				  GTK_ACCEL_VISIBLE);
     }
     if (cfile->proc_ptr!=NULL) {
@@ -799,11 +855,13 @@
 
 
 
-static void disp_fraction(gint done, gint start, gint end, gdouble timesofar, xprocess *proc) {
+static void disp_fraction(int done, int start, int end, double timesofar, xprocess *proc) {
   // display fraction done and estimated time remaining
   gchar *prog_label;
-  gdouble est_time;
-  gdouble fraction_done=(done-start)/(end-start+1.);
+  double est_time;
+  double fraction_done=(done-start)/(end-start+1.);
+
+  const char *stretch="                                         ";
 
   if (fraction_done>1.) fraction_done=1.;
   if (fraction_done<0.) fraction_done=0.;
@@ -811,8 +869,8 @@
   if (done>disp_frames_done) gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(proc->progressbar),fraction_done);
 
   est_time=timesofar/fraction_done-timesofar;
-  prog_label=g_strdup_printf(_("\n%d%% done. Time remaining: %u sec\n"),(gint)(fraction_done*100.),(guint)(est_time+.5));
-  gtk_label_set_text(GTK_LABEL(proc->label3),prog_label);
+  prog_label=g_strdup_printf(_("\n%s%d%% done. Time remaining: %u sec%s\n"),stretch,(gint)(fraction_done*100.),(guint)(est_time+.5),stretch);
+  if (GTK_IS_LABEL(proc->label3)) gtk_label_set_text(GTK_LABEL(proc->label3),prog_label);
   g_free(prog_label);
 
   disp_frames_done=done;
@@ -826,7 +884,7 @@
 #define PROG_LOOP_VAL 50
 
 static void progbar_pulse_or_fraction(file *sfile, int frames_done) {
-  gdouble timesofar;
+  double timesofar;
 
   if (progress_count++>=PROG_LOOP_VAL) {
     if (frames_done<=sfile->progress_end&&sfile->progress_end>0&&!mainw->effects_paused&&
@@ -835,7 +893,7 @@
       gettimeofday(&tv, NULL);
       mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
       timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC;
-      
+
       disp_fraction(frames_done,sfile->progress_start,sfile->progress_end,
 		    timesofar,sfile->proc_ptr);
       progress_count=0;
@@ -851,17 +909,23 @@
 
 
 
-gboolean process_one (gboolean visible) {
-  gint64 new_ticks;
+boolean process_one (boolean visible) {
+  uint64_t new_ticks;
+  uint64_t current_ticks;
+  uint64_t sc_ticks=0;
 
   lives_time_source_t time_source;
-  gboolean show_frame;
+  boolean show_frame;
+
+  lives_rfx_t *xrfx;
 
 #ifdef RT_AUDIO
-  gdouble audio_stretch;
-  gint64 audio_ticks=0;
+  double audio_stretch;
+  uint64_t audio_ticks=0;
 #endif
 
+  double sc_ratio=1.;
+
   if (!visible) {
     // INTERNAL PLAYER
     if (G_UNLIKELY(mainw->new_clip!=-1)) {
@@ -877,7 +941,9 @@
     //         the system clock
     //  in these cases we adjust our audio rate slightly to keep in synch with video
     // - otherwise, we take the time from soundcard by counting samples played (the normal case),   
-    //   and we synch video with that
+    //   and we synch video with that; however, the soundcard time only updates when samples are played -
+    //   so, between updates we interpolate with the system clock and then adjust when we get a new value
+    //   from the card
 
 
     time_source=LIVES_TIME_SOURCE_NONE;
@@ -902,8 +968,10 @@
 	  (!mainw->is_rendering||(mainw->multitrack!=NULL&&!cfile->opening&&!mainw->multitrack->is_rendering))&&
 	  mainw->jackd!=NULL&&mainw->jackd->in_use) {
 	if (!(mainw->fixed_fpsd>0.||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback))) {
-	  if (mainw->aud_rec_fd!=-1) mainw->currticks=lives_jack_get_time(mainw->jackd_read,TRUE);
-	  else mainw->currticks=lives_jack_get_time(mainw->jackd,TRUE);
+	  last_sc_ticks=sc_ticks;
+	  if (mainw->jackd_read!=NULL&&mainw->aud_rec_fd!=-1&&mainw->agen_key==0) 
+	    sc_ticks=lives_jack_get_time(mainw->jackd_read,TRUE);
+	  else sc_ticks=lives_jack_get_time(mainw->jackd,TRUE);
 	  time_source=LIVES_TIME_SOURCE_SOUNDCARD;
 	}
       }
@@ -916,19 +984,71 @@
 						   !cfile->opening&&!mainw->multitrack->is_rendering))&&
 	  ((mainw->pulsed!=NULL&&mainw->pulsed->in_use)||mainw->pulsed_read!=NULL)) {
 	if (!(mainw->fixed_fpsd>0.||(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback))) {
-	  if (mainw->aud_rec_fd!=-1) mainw->currticks=lives_pulse_get_time(mainw->pulsed_read,TRUE);
-	  else mainw->currticks=lives_pulse_get_time(mainw->pulsed,TRUE);
+	  last_sc_ticks=sc_ticks;
+	  if (mainw->pulsed_read!=NULL&&mainw->aud_rec_fd!=-1&&mainw->agen_key==0&&!mainw->agen_needs_reinit) 
+	    sc_ticks=lives_pulse_get_time(mainw->pulsed_read,TRUE);
+	  else sc_ticks=lives_pulse_get_time(mainw->pulsed,TRUE);
+
 	  time_source=LIVES_TIME_SOURCE_SOUNDCARD;
 	}
       }
 #endif
     }
 
+    if (time_source==LIVES_TIME_SOURCE_SOUNDCARD) {
+      // soundcard time is only updated after sending audio
+      // so if we get the same value back we interpolate using the system clock
+
+      gettimeofday(&tv, NULL);
+      current_ticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
+
+      if (sc_ticks!=last_sc_ticks) {
+
+	// calculate ratio soundcard rate:sys clock rate
+	sc_ratio=(double)sc_ticks/(double)current_ticks;
+	if (sc_ratio==0.) sc_ratio=1.;
+
+	mainw->currticks+=(current_ticks-prev_ticks)*sc_ratio;
+
+	// we got updated time from the soundcard
+	if (sc_ticks>=mainw->currticks) {
+	  // timecard ahead of clock, so we resync with soundcard
+	  mainw->currticks=sc_ticks;
+	  consume_ticks=0;
+	}
+	else {
+	  // soundcard time was before our interpolated time, so we will not update the clock
+	  // but we will consume the extra ticks first
+	  consume_ticks=mainw->currticks-sc_ticks;
+	}
+      }
+      else {
+	// no update from soundcard
+	if (consume_ticks>0) {
+	  // we were ahead of the soundcard at the last update, so wait for it to catch up
+	  // (estimated)
+	  consume_ticks-=(current_ticks-prev_ticks)*sc_ratio;
+	  if (consume_ticks<0) {
+	    // card should have caught up, so we start advancing the clock again
+	    mainw->currticks+=consume_ticks;
+	    consume_ticks=0;
+	  }
+	}
+	else {
+	  // should be caught up now, so we keep advancing the system clock
+	  mainw->currticks+=(current_ticks-prev_ticks)*sc_ratio;
+	}
+      }
+      prev_ticks=current_ticks;
+    }
+
     if (time_source==LIVES_TIME_SOURCE_NONE) {
       // get time from system clock
       gettimeofday(&tv, NULL);
       mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
+      if (G_UNLIKELY(mainw->currticks<prev_ticks)) mainw->currticks=prev_ticks;
       time_source=LIVES_TIME_SOURCE_SYSTEM;
+      prev_ticks=mainw->currticks;
     }
 
     // adjust audio rate slightly if we are behind or ahead
@@ -1005,7 +1125,7 @@
 	if (mainw->multitrack!=NULL&&mainw->multitrack->playing_sel&&get_event_timecode(cfile->next_event)/U_SEC>=
 	    mainw->multitrack->region_end) mainw->cancelled=CANCEL_EVENT_LIST_END;
 	else {
-	  cfile->next_event=process_events (cfile->next_event,mainw->currticks);
+	  cfile->next_event=process_events (cfile->next_event,FALSE,mainw->currticks);
 	
 	  // see if we need to fill an audio buffer
 #ifdef ENABLE_JACK
@@ -1023,7 +1143,7 @@
 #endif
 	}
       }
-      while (g_main_context_iteration(NULL,FALSE)); // allow kb timer to run
+      lives_widget_context_update(); // allow kb timer to run
       if (cfile->next_event==NULL&&mainw->preview) mainw->cancelled=CANCEL_EVENT_LIST_END;
       if (mainw->cancelled==CANCEL_NONE) return TRUE;
       cancel_process(visible);
@@ -1183,7 +1303,14 @@
   }
 
   if (G_LIKELY(mainw->cancelled==CANCEL_NONE)) {
-    while (g_main_context_iteration(NULL,FALSE));
+
+    if ((xrfx=(lives_rfx_t *)mainw->vrfx_update)!=NULL&&fx_dialog[1]!=NULL) {
+      // the audio thread wants to update the parameter window
+      mainw->vrfx_update=FALSE;
+      update_visual_params(xrfx,FALSE);
+    }
+
+    lives_widget_context_update();
     if (G_UNLIKELY(mainw->cancelled!=CANCEL_NONE)) {
       cancel_process(visible);
       return FALSE;
@@ -1196,7 +1323,7 @@
 }
 
 
-gboolean do_progress_dialog(gboolean visible, gboolean cancellable, const gchar *text) {
+boolean do_progress_dialog(boolean visible, boolean cancellable, const gchar *text) {
   // monitor progress, return FALSE if the operation was cancelled
 
   // this is the outer loop for playback and all kinds of processing
@@ -1210,7 +1337,7 @@
 
   int frames_done;
 
-  gboolean got_err=FALSE;
+  boolean got_err=FALSE;
   
   // translation issues
   if (visible&&text!=NULL) mytext=g_strdup(text);
@@ -1302,19 +1429,19 @@
 	    if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void**)&cfile->op_dir);
 	    return FALSE;
 	  }
-	  while (g_main_context_iteration(NULL,FALSE));
+	  lives_widget_context_update();
 	}
 	cfile->fx_frame_pump+=FX_FRAME_PUMP_VAL>>1;
       }
     }
 
 
-    if (cfile->opening&&(capable->has_sox||(prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL)||
+    if (cfile->opening&&(capable->has_sox_play||(prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL)||
 			 (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL))&&mainw->playing_file==-1) {
       if (mainw->preview_box!=NULL) gtk_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview"));
       gtk_widget_set_tooltip_text( mainw->m_playbutton,_ ("Preview"));
-      gtk_widget_remove_accelerator (mainw->playall, mainw->accel_group, GDK_p, (GdkModifierType)0);
-      gtk_widget_add_accelerator (cfile->proc_ptr->preview_button, "clicked", mainw->accel_group, GDK_p,
+      gtk_widget_remove_accelerator (mainw->playall, mainw->accel_group, LIVES_KEY_p, (GdkModifierType)0);
+      gtk_widget_add_accelerator (cfile->proc_ptr->preview_button, "clicked", mainw->accel_group, LIVES_KEY_p,
 				  (GdkModifierType)0, (GtkAccelFlags)0);
       accelerators_swapped=TRUE;
     }
@@ -1337,6 +1464,10 @@
   gettimeofday(&tv, NULL);
   /***************************************************/
 
+  prev_ticks=0;
+  last_sc_ticks=0;
+  consume_ticks=0;
+
   // [IMPORTANT] we subtract these from every calculation to make the numbers smaller
   mainw->origsecs=tv.tv_sec;
   mainw->origusecs=tv.tv_usec;
@@ -1349,8 +1480,8 @@
 	!(mainw->record&&!(prefs->rec_opts&REC_FRAMES)&&cfile->next_event==NULL)) {
       // calculate the start position from jack transport
 
-      gint64 ntc=jack_transport_get_time()*U_SEC;
-      gboolean noframedrop=mainw->noframedrop;
+      uint64_t ntc=jack_transport_get_time()*U_SEC;
+      boolean noframedrop=mainw->noframedrop;
       mainw->noframedrop=FALSE;
       cfile->last_frameno=1;
       if (prefs->jack_opts&JACK_OPTS_TIMEBASE_START) {
@@ -1385,11 +1516,10 @@
 
 
   // set initial audio seek position for current file
-  if (cfile->achans) cfile->aseek_pos=(long)((gdouble)(mainw->play_start-1.)/
+  if (cfile->achans) cfile->aseek_pos=(int64_t)((gdouble)(mainw->play_start-1.)/
 					     cfile->fps*cfile->arate*cfile->achans*(cfile->asampsize/8));
 
 
-
   // MUST do re-seek after setting origsecs in order to set our clock properly
   // re-seek to new playback start
 #ifdef ENABLE_JACK
@@ -1402,7 +1532,7 @@
 
     mainw->rec_aclip=mainw->current_file;
     mainw->rec_avel=cfile->pb_fps/cfile->fps;
-    if (!(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO)))
+    if (!(mainw->record&&!mainw->record_paused&&(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0||mainw->agen_needs_reinit)))
       mainw->rec_aseek=(gdouble)cfile->aseek_pos/(gdouble)(cfile->arate*cfile->achans*(cfile->asampsize/8));
     else {
       mainw->rec_aclip=mainw->ascrap_file;
@@ -1410,9 +1540,11 @@
       mainw->rec_aseek=0;
     }
   }
-  if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->multitrack!=NULL&&
-      !mainw->multitrack->is_rendering&&cfile->achans>0) {
-    // have to set this here as we don't do a seek in multitrack
+  if (prefs->audio_player==AUD_PLAYER_JACK&&((mainw->jackd!=NULL&&mainw->multitrack!=NULL&&
+					      !mainw->multitrack->is_rendering&&cfile->achans>0)||
+					     ((prefs->audio_src==AUDIO_SRC_EXT&&mainw->jackd_read!=NULL)||
+					      mainw->agen_key!=0))) {
+    // have to set this here as we don't do a seek in multitrack, or when playing external audio, or from an audio gen
     mainw->jackd->audio_ticks=mainw->offsetticks;
     mainw->jackd->frames_written=0;
   }
@@ -1431,7 +1563,7 @@
 
     mainw->rec_aclip=mainw->current_file;
     mainw->rec_avel=cfile->pb_fps/cfile->fps;
-    if (!(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO)))
+    if (!(mainw->record&&!mainw->record_paused&&(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0||mainw->agen_needs_reinit)))
       mainw->rec_aseek=(gdouble)cfile->aseek_pos/(gdouble)(cfile->arate*cfile->achans*(cfile->asampsize/8));
     else {
       mainw->rec_aclip=mainw->ascrap_file;
@@ -1439,8 +1571,10 @@
       mainw->rec_aseek=0;
     }
   }
-  if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->multitrack!=NULL&&
-      !mainw->multitrack->is_rendering&&cfile->achans>0) {
+  if (prefs->audio_player==AUD_PLAYER_PULSE&&((mainw->pulsed!=NULL&&mainw->multitrack!=NULL&&
+					       !mainw->multitrack->is_rendering&&cfile->achans>0)||
+					      ((prefs->audio_src==AUDIO_SRC_EXT&&mainw->pulsed_read!=NULL)||
+					       mainw->agen_key!=0))) {
     mainw->pulsed->audio_ticks=mainw->offsetticks;
     mainw->pulsed->frames_written=0;
     mainw->pulsed->usec_start=0;
@@ -1460,9 +1594,9 @@
   // from the mainw->progress_fn function
 
   while (1) {
-    while (!mainw->internal_messaging&&((!visible&&(mainw->whentostop!=STOP_ON_AUD_END||
+    while (!mainw->internal_messaging&&(((!visible&&(mainw->whentostop!=STOP_ON_AUD_END||
 						    prefs->audio_player==AUD_PLAYER_JACK||
-						    prefs->audio_player==AUD_PLAYER_PULSE))||
+						     prefs->audio_player==AUD_PLAYER_PULSE)))||
 					!g_file_test(cfile->info_file,G_FILE_TEST_EXISTS))) {
 
 
@@ -1474,6 +1608,10 @@
 	return FALSE;
       }
 
+      if (G_UNLIKELY(mainw->agen_needs_reinit)) {
+	// we are generating audio from a plugin and it needs reinit - we do it in this thread so as not to hold up the player thread
+	reinit_audio_gen();
+      }
 
       // normal playback, wth realtime audio player
       if (!visible&&(mainw->whentostop!=STOP_ON_AUD_END||
@@ -1491,7 +1629,6 @@
     }
 
     if (!mainw->internal_messaging) {
-
       // background processing (e.g. rendered effects)
       if ((infofile=fopen(cfile->info_file,"r"))) {
 	// OK, now we might have some frames
@@ -1519,7 +1656,7 @@
       progbar_pulse_or_fraction(cfile,cfile->proc_ptr->frames_done);
     }
 
-
+    //#define DEBUG
 #ifdef DEBUG
     if (strlen(mainw->msg)) g_print("msg %s\n",mainw->msg);
 #endif
@@ -1527,9 +1664,7 @@
     // we got a message from the backend...
 
     if (visible&&(!accelerators_swapped||cfile->opening)&&cancellable&&(!cfile->nopreview||cfile->keep_without_preview)) {
-      if ((!cfile->opening||((capable->has_sox||(prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL)||
-			     (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL))&&
-			     mainw->playing_file==-1))&&!cfile->nopreview) 
+      if (!cfile->nopreview) 
 	gtk_widget_show (cfile->proc_ptr->preview_button);
       if (cfile->opening_loc) gtk_widget_show (cfile->proc_ptr->stop_button);
       else gtk_widget_show (cfile->proc_ptr->pause_button);
@@ -1538,8 +1673,8 @@
 	gtk_widget_grab_default (cfile->proc_ptr->preview_button);
 	if (mainw->preview_box!=NULL) gtk_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview"));
 	gtk_widget_set_tooltip_text( mainw->m_playbutton,_ ("Preview"));
-	gtk_widget_remove_accelerator (mainw->playall, mainw->accel_group, GDK_p, (GdkModifierType)0);
-	gtk_widget_add_accelerator (cfile->proc_ptr->preview_button, "clicked", mainw->accel_group, GDK_p,
+	gtk_widget_remove_accelerator (mainw->playall, mainw->accel_group, LIVES_KEY_p, (GdkModifierType)0);
+	gtk_widget_add_accelerator (cfile->proc_ptr->preview_button, "clicked", mainw->accel_group, LIVES_KEY_p,
 				    (GdkModifierType)0, (GtkAccelFlags)0);
 	accelerators_swapped=TRUE;
       }
@@ -1581,6 +1716,11 @@
 	return FALSE;
       }
 
+      if (G_UNLIKELY(mainw->agen_needs_reinit)) {
+	// we are generating audio from a plugin and it needs reinit - we do it in this thread so as not to hold up the player thread
+	reinit_audio_gen();
+      }
+
       if (mainw->iochan!=NULL&&progress_count==0) {
 	// pump data from stdout to textbuffer
 	pump_io_chan(mainw->iochan);
@@ -1606,8 +1746,8 @@
 									 _("Play all"));
     if (accelerators_swapped) {
       if (!mainw->preview) gtk_widget_set_tooltip_text( mainw->m_playbutton,_ ("Play all"));
-      gtk_widget_remove_accelerator (cfile->proc_ptr->preview_button, mainw->accel_group, GDK_p, (GdkModifierType)0);
-      gtk_widget_add_accelerator (mainw->playall, "activate", mainw->accel_group, GDK_p, (GdkModifierType)0,
+      gtk_widget_remove_accelerator (cfile->proc_ptr->preview_button, mainw->accel_group, LIVES_KEY_p, (GdkModifierType)0);
+      gtk_widget_add_accelerator (mainw->playall, "activate", mainw->accel_group, LIVES_KEY_p, (GdkModifierType)0,
 				  GTK_ACCEL_VISIBLE);
       accelerators_swapped=FALSE;
     }
@@ -1618,7 +1758,7 @@
       g_free(cfile->proc_ptr);
       cfile->proc_ptr=NULL;
       if (btext!=NULL) {
-	text_view_set_text(mainw->optextview,btext);
+	text_view_set_text(mainw->optextview,btext,-1);
 	g_free((gchar *)btext);
       }
     }
@@ -1662,16 +1802,16 @@
 
 
 
-gboolean do_auto_dialog (const gchar *text, gint type) {
+boolean do_auto_dialog (const gchar *text, int type) {
   // type 0 = normal auto_dialog
   // type 1 = countdown dialog for audio recording
   // type 2 = normal with cancel
 
   FILE *infofile=NULL;
-  gint count=0;
+  int count=0;
   guint64 time=0,end_time=1;
   gchar *label_text;
-  gint time_rem,last_time_rem=10000000;
+  int time_rem,last_time_rem=10000000;
   xprocess *proc_ptr;
   gchar *mytext=g_strdup(text);
 
@@ -1692,9 +1832,8 @@
   gtk_widget_show(proc_ptr->processing);
   
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
-  while (g_main_context_iteration(NULL,FALSE));
-
-  lives_set_cursor_style(LIVES_CURSOR_BUSY,proc_ptr->processing->window);
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,proc_ptr->processing);
+  lives_widget_context_update();
 
   if (type==0) {
     clear_mainw_msg();
@@ -1707,14 +1846,14 @@
     if (mainw->pulsed_read!=NULL) pulse_driver_uncork(mainw->pulsed_read);
 #endif
     if (mainw->rec_samples!=0) {
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       g_usleep(prefs->sleep_time);
     }
   }
 
   while ((type==1&&mainw->cancelled==CANCEL_NONE)||(type==0&&!(infofile=fopen(cfile->info_file,"r")))) {
     gtk_progress_bar_pulse(GTK_PROGRESS_BAR(proc_ptr->progressbar));
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     g_usleep(prefs->sleep_time);
     if (type==1&&mainw->rec_end_time!=-1.) {
       gettimeofday(&tv, NULL);
@@ -1738,7 +1877,7 @@
 
     while (count>0) {
       gtk_progress_bar_pulse(GTK_PROGRESS_BAR(proc_ptr->progressbar));
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       g_usleep(prefs->sleep_time);
       count--;
     }
@@ -1747,7 +1886,7 @@
   if (type==2) {
     while (!mainw->cancelled) {
       gtk_progress_bar_pulse(GTK_PROGRESS_BAR(proc_ptr->progressbar));
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       g_usleep(prefs->sleep_time);
     }
   }
@@ -1776,15 +1915,13 @@
 
 
 
-void
-too_many_files(void) {
+void too_many_files(void) {
   gchar *warn=g_strdup_printf(_ ("\nSorry, LiVES can only open %d files at once.\nPlease close a file and then try again."),MAX_FILES);
   do_error_dialog(warn);
   g_free(warn);
 }
 
-void
-tempdir_warning (void) {
+void tempdir_warning (void) {
   gchar *tmp,*com=g_strdup_printf(_ ("LiVES was unable to write to its temporary directory.\n\nThe current temporary directory is:\n\n%s\n\nPlease make sure you can write to this directory."),
 				  (tmp=g_filename_to_utf8(prefs->tmpdir,-1,NULL,NULL,NULL)));
   g_free(tmp);
@@ -1800,8 +1937,7 @@
 }
 
 
-void
-do_encoder_sox_error(void) {
+void do_encoder_sox_error(void) {
   do_error_dialog (_ ("Audio resampling is required for this format.\nPlease install 'sox'\nOr switch to another encoder format in Tools | Preferences | Encoding\n"));
 }
 
@@ -1823,7 +1959,10 @@
 
 
 
-gboolean rdet_suggest_values (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, gint asigned, gboolean swap_endian, gboolean anr, gboolean ignore_fps) {
+boolean rdet_suggest_values (int width, int height, double fps, int fps_num, int fps_denom, int arate, int asigned, 
+			     boolean swap_endian, boolean anr, boolean ignore_fps) {
+  GtkWidget *prep_dialog;
+
   gchar *msg1=g_strdup_printf (_ ("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
   gchar *msg2=g_strdup ("");
   gchar *msg3=g_strdup ("");
@@ -1833,11 +1972,9 @@
   gchar *msg7=g_strdup ("");
   gchar *msg8=g_strdup ("");
   gchar *msg_a;
-  gboolean ochange=FALSE;
-
-  gboolean ret;
 
-  GtkWidget *prep_dialog;
+  boolean ochange=FALSE;
+  boolean ret;
 
   mainw->fx1_bool=FALSE;
 
@@ -1920,8 +2057,10 @@
 
 
 
-gboolean 
-do_encoder_restrict_dialog (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, gint asigned, gboolean swap_endian, gboolean anr, gboolean save_all) {
+boolean do_encoder_restrict_dialog (int width, int height, double fps, int fps_num, int fps_denom, int arate, int asigned, 
+				    boolean swap_endian, boolean anr, boolean save_all) {
+  GtkWidget *prep_dialog;
+
   gchar *msg1=g_strdup_printf (_ ("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
   gchar *msg2=g_strdup ("");
   gchar *msg3=g_strdup ("");
@@ -1931,12 +2070,11 @@
   gchar *msg7=g_strdup ("");
   gchar *msg_a,*msg_b=NULL;
 
-  gboolean ret;
+  double cfps;
 
-  GtkWidget *prep_dialog;
+  boolean ret;
 
-  gint carate,chsize,cvsize;
-  gdouble cfps;
+  int carate,chsize,cvsize;
 
   if (rdet!=NULL) {
     carate=rdet->arate;
@@ -2022,21 +2160,18 @@
 }
 
 
-void
-perf_mem_warning(void) {
+void perf_mem_warning(void) {
   do_error_dialog(_ ("\n\nLiVES was unable to record a performance. There is currently insufficient memory available.\nTry recording for just a selection of the file."));
 }
 
-gboolean
-do_clipboard_fps_warning(void) {
+boolean do_clipboard_fps_warning(void) {
   if (prefs->warning_mask&WARN_MASK_FPS) {
     return TRUE;
   }
   return do_warning_dialog_with_check(_ ("The playback speed (fps), or the audio rate\n of the clipboard does not match\nthe playback speed or audio rate of the clip you are inserting into.\n\nThe insertion will be adjusted to fit into the clip.\n\nPlease press Cancel to abort the insert, or OK to continue."),WARN_MASK_FPS);
 }
 
-gboolean
-do_yuv4m_open_warning(void) {
+boolean do_yuv4m_open_warning(void) {
   if (prefs->warning_mask&WARN_MASK_OPEN_YUV4M) {
     return TRUE;
   }
@@ -2045,10 +2180,10 @@
 
 
 
-gboolean do_comments_dialog (file *sfile, gchar *filename) {
-  gboolean response;
-  gboolean ok=FALSE;
-  gboolean encoding=FALSE;
+boolean do_comments_dialog (file *sfile, gchar *filename) {
+  boolean response;
+  boolean ok=FALSE;
+  boolean encoding=FALSE;
 
   commentsw=create_comments_dialog(sfile,filename);
 
@@ -2062,7 +2197,7 @@
       g_snprintf (sfile->author,256,"%s",gtk_entry_get_text (GTK_ENTRY (commentsw->author_entry)));
       g_snprintf (sfile->comment,256,"%s",gtk_entry_get_text (GTK_ENTRY (commentsw->comment_entry)));
       
-      if (encoding&&sfile->subt!=NULL&&gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentsw->subt_checkbutton))) {
+      if (encoding&&sfile->subt!=NULL&&lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton))) {
 	gchar *ext=get_extension(gtk_entry_get_text(GTK_ENTRY(commentsw->subt_entry)));
 	if (strcmp(ext,"sub")&&strcmp(ext,"srt")) {
 	  if (!do_sub_type_warning(ext,sfile->subt->type==SUBTITLE_TYPE_SRT?"srt":"sub")) {
@@ -2122,24 +2257,29 @@
 
 void 
 do_text_window (const gchar *title, const gchar *text) {
-  text_window *textwindow=create_text_window (title,text,NULL);
-  gtk_widget_show (textwindow->dialog);
+  create_text_window (title,text,NULL);
 }
 
 
 
-void 
-do_upgrade_error_dialog (void) {
-  startup_message_nonfatal (g_strdup (_("After upgrading/installing, you may need to adjust the <prefix_dir> setting in your ~/.lives file")));
+void do_upgrade_error_dialog (void) {
+  gchar *tmp;
+  gchar *msg=g_strdup_printf (_("After upgrading/installing, you may need to adjust the <prefix_dir> setting in your %s file"),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+  startup_message_info (msg);
+  g_free(msg);
+  g_free(tmp);
 }
 
 
 void do_rendered_fx_dialog(void) {
-  gchar *msg=g_strdup_printf(_("\n\nLiVES could not find any rendered effect plugins.\nPlease make sure you have them installed in\n%s%s%s\nor change the value of <lib_dir> in ~/.lives\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN);
-    do_error_dialog_with_check(msg,WARN_MASK_RENDERED_FX);
-    g_free(msg);
+  gchar *tmp;
+  gchar *msg=g_strdup_printf(_("\n\nLiVES could not find any rendered effect plugins.\nPlease make sure you have them installed in\n%s%s%s\nor change the value of <lib_dir> in %s\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+  do_error_dialog_with_check(msg,WARN_MASK_RENDERED_FX);
+  g_free(msg);
+  g_free(tmp);
 }
 
+
 void do_audio_import_error(void) {
   do_error_dialog(_ ("Sorry, unknown audio type.\n\n (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"));
   d_print(_ ("failed (unknown type)\n"));
@@ -2151,24 +2291,24 @@
 }
 
 
-gboolean do_set_duplicate_warning (const gchar *new_set) {
+boolean do_set_duplicate_warning (const gchar *new_set) {
   gchar *msg=g_strdup_printf(_("\nA set entitled %s already exists.\nClick OK to add the current clips and layouts to the existing set.\nClick Cancel to pick a new name.\n"),new_set);
-  gboolean retcode=do_warning_dialog_with_check(msg,WARN_MASK_DUPLICATE_SET);
+  boolean retcode=do_warning_dialog_with_check(msg,WARN_MASK_DUPLICATE_SET);
   g_free(msg);
   return retcode;
 }
 
-gboolean do_layout_alter_frames_warning(void) {
+boolean do_layout_alter_frames_warning(void) {
   return do_warning_dialog(_("\nFrames from this clip are used in some multitrack layouts.\nAre you sure you wish to continue ?\n."));
 }
 
-gboolean do_layout_alter_audio_warning(void) {
+boolean do_layout_alter_audio_warning(void) {
   return do_warning_dialog(_("\nAudio from this clip is used in some multitrack layouts.\nAre you sure you wish to continue ?\n."));
 }
 
-gboolean do_original_lost_warning(const gchar *fname) {
+boolean do_original_lost_warning(const gchar *fname) {
   gchar *msg=g_strdup_printf(_("\nThe original file\n%s\ncould not be found.\nIf this file has been moved, click 'OK' to browse to the new location.\nOtherwise click Cancel to skip loading this file.\n"),fname);
-  gboolean retcode=do_warning_dialog(msg);
+  boolean retcode=do_warning_dialog(msg);
   g_free(msg);
   return retcode;
 }
@@ -2201,13 +2341,13 @@
   const gchar *otherbit="\"lives -aplayer sox\"";
 #endif
   gchar *msg=g_strdup_printf(_("\nAlternatively, try to start lives with either:\n\n\"lives -jackopts 16\", or\n\n%s\n"),otherbit);
-  do_blocking_error_dialog(msg);
+  do_blocking_info_dialog(msg);
   g_free(msg);
 }
 
 
 void do_jack_noopen_warn2(void) {
-  do_blocking_error_dialog(_("\nAlternately, you can restart LiVES and select another audio player.\n"));
+  do_blocking_info_dialog(_("\nAlternately, you can restart LiVES and select another audio player.\n"));
 }
 
 
@@ -2217,9 +2357,9 @@
     g_free(msg);
 }
 
-gboolean do_set_rename_old_layouts_warning(const gchar *new_set) {
+boolean do_set_rename_old_layouts_warning(const gchar *new_set) {
   gchar *msg=g_strdup_printf(_("\nSome old layouts for the set %s already exist.\nIt is recommended that you delete them.\nDo you wish to delete them ?\n"),new_set);
-  gboolean retcode=do_yesno_dialog(msg);
+  boolean retcode=do_yesno_dialog(msg);
   g_free(msg);
   return retcode;
 }
@@ -2232,7 +2372,7 @@
   do_error_dialog(_("\nOut of memory for undo.\nYou may need to increase the undo memory\nusing Preferences/Multitrack/Undo Memory\n"));
 }
 
-void do_mt_set_mem_error(gboolean has_mt, gboolean trans) {
+void do_mt_set_mem_error(boolean has_mt, boolean trans) {
   gchar *msg1=(_("\nLiVES was unable to reserve enough memory for the multitrack undo buffer.\n"));
   gchar *msg2;
   gchar *msg3=(_("or enter a smaller value.\n"));
@@ -2248,19 +2388,19 @@
 }
 
 
-void do_mt_audchan_error(gint warn_mask) {
-  do_error_dialog_with_check(_("Multitrack is set to 0 audio channels, but this layout has audio.\nYou should adjust the audio settings from the Tools menu.\n"),warn_mask);
+void do_mt_audchan_error(int warn_mask) {
+  do_error_dialog_with_check_transient(_("Multitrack is set to 0 audio channels, but this layout has audio.\nYou should adjust the audio settings from the Tools menu.\n"),warn_mask,FALSE,NULL);
 }
 
 void do_mt_no_audchan_error(void) {
   do_error_dialog(_("The current layout has audio, so audio channels may not be set to zero.\n"));
 }
 
-void do_mt_no_jack_error(gint warn_mask) {
+void do_mt_no_jack_error(int warn_mask) {
   do_error_dialog_with_check(_("Multitrack audio preview is only available with the\n\"jack\" or \"pulse audio\" audio player.\nYou can set this in Tools|Preferences|Playback."),warn_mask);
 }
 
-gboolean do_mt_rect_prompt(void) {
+boolean do_mt_rect_prompt(void) {
   return do_yesno_dialog(_("Errors were detected in the layout (which may be due to transferring from another system, or from an older version of LiVES).\nShould I try to repair the disk copy of the layout ?\n"));
 }
 
@@ -2274,7 +2414,7 @@
   do_error_dialog(_ ("\n\nAudio rate must be greater than 0.\n"));
 }
 
-gboolean do_event_list_warning(void) {
+boolean do_event_list_warning(void) {
   return do_yesno_dialog(_("\nEvent list will be very large\nand may take a long time to display.\nAre you sure you wish to view it ?\n"));
 }
 
@@ -2289,7 +2429,7 @@
 }
 
 void do_vpp_palette_error (void) {
-  do_error_dialog_with_check_transient(_("Video playback plugin failed to initialise palette !\n"),TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES->window));
+  do_error_dialog_with_check_transient(_("Video playback plugin failed to initialise palette !\n"),TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES));
 }
 
 void do_decoder_palette_error (void) {
@@ -2298,7 +2438,7 @@
 
 
 void do_vpp_fps_error (void) {
-  do_error_dialog_with_check_transient(_("Unable to set framerate of video plugin\n"),TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES->window));
+  do_error_dialog_with_check_transient(_("Unable to set framerate of video plugin\n"),TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES));
 }
 
 
@@ -2314,7 +2454,7 @@
 }
 
 
-void do_rmem_max_error (gint size) {
+void do_rmem_max_error (int size) {
   gchar *msg=g_strdup_printf((_("Stream frame size is too large for your network buffers.\nYou should do the following as root:\n\necho %d > /proc/sys/net/core/rmem_max\n")),size);
   do_error_dialog(msg);
   g_free(msg);
@@ -2325,67 +2465,48 @@
 
 static void create_threaded_dialog(gchar *text, gboolean has_cancel) {
 
-  GtkWidget *dialog_vbox1;
-  GtkWidget *vbox2;
-  GtkWidget *vbox3;
+  GtkWidget *dialog_vbox;
+  GtkWidget *vbox;
   gchar tmp_label[256];
  
   procw=(xprocess*)(g_malloc(sizeof(xprocess)));
 
-  procw->processing = gtk_dialog_new ();
-  gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_container_set_border_width (GTK_CONTAINER (procw->processing), 10);
-  gtk_window_add_accel_group (GTK_WINDOW (procw->processing), mainw->accel_group);
-  
-  gtk_widget_show(procw->processing);
+  procw->processing = lives_standard_dialog_new (_("LiVES: - Processing..."),FALSE);
 
-  gtk_widget_modify_bg(procw->processing, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_window_set_title (GTK_WINDOW (procw->processing), _("LiVES: - Processing..."));
+  gtk_window_add_accel_group (GTK_WINDOW (procw->processing), mainw->accel_group);
 
   if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->LiVES));
   else gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->multitrack->window));
 
-  gtk_window_set_modal (GTK_WINDOW (procw->processing), TRUE);
-
-  dialog_vbox1 = lives_dialog_get_content_area(GTK_DIALOG(procw->processing));
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(procw->processing));
 
-  gtk_widget_show (dialog_vbox1);
-
-  gtk_dialog_set_has_separator(GTK_DIALOG(procw->processing),FALSE);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox2);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox2, TRUE, TRUE, 0);
+  gtk_widget_show (dialog_vbox);
 
-  vbox3 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox3);
-  gtk_box_pack_start (GTK_BOX (vbox2), vbox3, TRUE, TRUE, 0);
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
   g_snprintf(tmp_label,256,"%s...\n",text);
-  procw->label = gtk_label_new (tmp_label);
-  gtk_widget_show (procw->label);
-  //gtk_widget_set_size_request (procw->label, PROG_LABEL_WIDTH, -1);
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->label, FALSE, FALSE, 0);
-  gtk_widget_modify_fg(procw->label, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_label_set_justify (GTK_LABEL (procw->label), GTK_JUSTIFY_LEFT);
+  procw->label = lives_standard_label_new (tmp_label);
+  gtk_box_pack_start (GTK_BOX (vbox), procw->label, FALSE, FALSE, 0);
 
   procw->progressbar = gtk_progress_bar_new ();
-  gtk_widget_show (procw->progressbar);
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->progressbar, FALSE, FALSE, 0);
-  gtk_widget_modify_fg(procw->progressbar, GTK_STATE_NORMAL, &palette->normal_fore);
-
-  procw->label2 = gtk_label_new (_("\nPlease Wait"));
-  gtk_widget_show (procw->label2);
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->label2, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (procw->label2), GTK_JUSTIFY_CENTER);
-  gtk_widget_modify_fg(procw->label2, GTK_STATE_NORMAL, &palette->normal_fore);
-
-  procw->label3 = gtk_label_new (PROCW_STRETCHER);
-  gtk_widget_show (procw->label3);
-  gtk_box_pack_start (GTK_BOX (vbox3), procw->label3, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (procw->label3), GTK_JUSTIFY_CENTER);
-  gtk_widget_modify_fg(procw->label3, GTK_STATE_NORMAL, &palette->normal_fore);
   gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(procw->progressbar),.01);
+  gtk_box_pack_start (GTK_BOX (vbox), procw->progressbar, FALSE, FALSE, 0);
+
+  if (widget_opts.apply_theme&&(palette->style&STYLE_1)) {
+    lives_widget_set_fg_color(procw->progressbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  procw->label2 = lives_standard_label_new (_("\nPlease Wait"));
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
+  gtk_box_pack_start (GTK_BOX (vbox), procw->label2, FALSE, FALSE, 0);
+
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  procw->label3 = lives_standard_label_new (PROCW_STRETCHER);
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
+  gtk_box_pack_start (GTK_BOX (vbox), procw->label3, FALSE, FALSE, 0);
 
   if (has_cancel) {
     GtkWidget *cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
@@ -2395,8 +2516,8 @@
       GtkWidget *enoughbutton = gtk_button_new_with_mnemonic (_ ("_Enough"));
       gtk_widget_show (enoughbutton);
       gtk_dialog_add_action_widget (GTK_DIALOG (procw->processing), enoughbutton, GTK_RESPONSE_CANCEL);
-      GTK_WIDGET_SET_FLAGS (enoughbutton, GTK_CAN_DEFAULT);
-      
+      lives_widget_set_can_focus_and_default (enoughbutton);
+
       g_signal_connect (GTK_OBJECT (enoughbutton), "clicked",
 			G_CALLBACK (on_dth_cancel_clicked),
 			GINT_TO_POINTER(1));
@@ -2405,7 +2526,7 @@
     }
 
     gtk_dialog_add_action_widget (GTK_DIALOG (procw->processing), cancelbutton, GTK_RESPONSE_CANCEL);
-    GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+    lives_widget_set_can_focus_and_default (cancelbutton);
 
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
                       G_CALLBACK (on_dth_cancel_clicked),
@@ -2414,13 +2535,9 @@
     mainw->cancel_type=CANCEL_SOFT;
   }
 
+  gtk_widget_show_all(procw->processing);
 
-  gtk_window_set_resizable (GTK_WINDOW (procw->processing), FALSE);
-
-  gtk_widget_queue_draw(procw->processing);
-
-  lives_set_cursor_style(LIVES_CURSOR_BUSY,procw->processing->window);
-
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,procw->processing);
 }
 
 
@@ -2451,7 +2568,8 @@
   }
 
   gtk_widget_queue_draw(procw->processing);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
+
 }
 
 
@@ -2463,7 +2581,7 @@
 
 
  
-void do_threaded_dialog(gchar *trans_text, gboolean has_cancel) {
+void do_threaded_dialog(gchar *trans_text, boolean has_cancel) {
   // calling this causes a threaded progress dialog to appear
   // until end_threaded_dialog() is called
   //
@@ -2482,7 +2600,7 @@
   create_threaded_dialog(copy_text, has_cancel);
   g_free(copy_text);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 }
 
 
@@ -2498,14 +2616,14 @@
     }
     else gtk_widget_queue_draw(mainw->multitrack->window);
   }
-  else lives_set_cursor_style(LIVES_CURSOR_NORMAL,mainw->splash_window->window);
+  else lives_set_cursor_style(LIVES_CURSOR_NORMAL,mainw->splash_window);
   if (procw!=NULL) {
     g_free(procw);
     procw=NULL;
   }
   mainw->cancel_type=CANCEL_KILL;
   mainw->threaded_dialog=FALSE;
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 }
 
 
@@ -2513,30 +2631,16 @@
 
 void do_splash_progress(void) {
   mainw->threaded_dialog=TRUE;
-  lives_set_cursor_style(LIVES_CURSOR_BUSY,mainw->splash_window->window);
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,mainw->splash_window);
   splash_prog();
 }
 
 
-
-
-
-
-
-
-
-
-
 void 
 response_ok (GtkButton *button, gpointer user_data) {
   gtk_dialog_response (GTK_DIALOG (gtk_widget_get_toplevel(GTK_WIDGET(button))), GTK_RESPONSE_OK);
 }
 
-void 
-response_cancel (GtkButton *button, gpointer user_data) {
-  gtk_dialog_response (GTK_DIALOG (gtk_widget_get_toplevel(GTK_WIDGET(button))), GTK_RESPONSE_CANCEL);
-}
-
 
 LIVES_INLINE void d_print_cancelled(void) {
   d_print(_("cancelled.\n"));
@@ -2783,7 +2887,7 @@
 
 
 
-gboolean do_header_write_error(int clip) {
+boolean do_header_write_error(int clip) {
   // returns TRUE if we manage to clear the error
 
   gchar *hname;
@@ -2858,14 +2962,21 @@
 }
 
 
-gboolean do_abort_check(void) {
+void do_dir_perm_access_error(const gchar *dir_name) {
+  gchar *msg=g_strdup_printf(_("\nLiVES was unable to read from the directory:\n%s\n"),dir_name);
+  do_blocking_error_dialog(msg);
+  g_free(msg);
+}
+
+
+boolean do_abort_check(void) {
   return do_yesno_dialog(_("\nAbort and exit immediately from LiVES\nAre you sure ?\n"));
 }
 
 
 
 void do_encoder_img_ftm_error(render_details *rdet) {
-  gchar *msg=g_strdup_printf(_("\nThe %s cannot encode clips with image type %s.\nPlease select another encoder from the list.\n"),prefs->encoder.name,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+  gchar *msg=g_strdup_printf(_("\nThe %s cannot encode clips with image type %s.\nPlease select another encoder from the list.\n"),prefs->encoder.name,get_image_ext_for_type(cfile->img_type));
 
   do_error_dialog_with_check_transient(msg,TRUE,0,GTK_WINDOW(rdet->dialog));
 
@@ -2885,34 +2996,34 @@
 }
 
 
-gboolean do_existing_subs_warning(void) {
-  return do_warning_dialog(_("\nThis file already has subtitles loaded.\nDo you wish to overwrite the existing subtitles ?\n"));
+boolean do_existing_subs_warning(void) {
+  return do_yesno_dialog(_("\nThis file already has subtitles loaded.\nDo you wish to overwrite the existing subtitles ?\n"));
 }
 
 void do_invalid_subs_error(void) {
   do_error_dialog(_("\nLiVES currently only supports subtitles of type .srt and .sub.\n"));
 }
 
-gboolean do_erase_subs_warning(void) {
-  return do_warning_dialog(_("\nErase all subtitles from this clip.\nAre you sure ?\n"));
+boolean do_erase_subs_warning(void) {
+  return do_yesno_dialog(_("\nErase all subtitles from this clip.\nAre you sure ?\n"));
 }
 
 
-gboolean do_sub_type_warning(const gchar *ext, const gchar *type_ext) {
-  gboolean ret;
+boolean do_sub_type_warning(const gchar *ext, const gchar *type_ext) {
+  boolean ret;
   gchar *msg=g_strdup_printf(_("\nLiVES does not recognise the subtitle file type \"%s\".\nClick Cancel to set another file name\nor OK to continue and save as type \"%s\"\n"),ext,type_ext);
   ret=do_warning_dialog(msg);
   g_free(msg);
   return ret;
 }
 
-gboolean do_move_tmpdir_dialog(void) {
+boolean do_move_tmpdir_dialog(void) {
   return do_yesno_dialog(_("\nDo you wish to move the current clip sets to the new directory ?\n(If unsure, click Yes)\n"));
 }
 
 void do_set_locked_warning (const gchar *setname) {
   gchar *msg=g_strdup_printf(_("\nWarning - the set %s\nis in use by another copy of LiVES.\nYou are strongly advised to close the other copy before clicking OK to continue\n."),setname);
-  do_error_dialog(msg);
+  do_warning_dialog(msg);
   g_free(msg);
 }
 
@@ -2926,7 +3037,7 @@
 
 void do_do_not_close_d (void) {
   gchar *msg=g_strdup(_("\n\nCLEANING AND COPYING FILES. THIS MAY TAKE SOME TIME.\nDO NOT SHUT DOWN OR CLOSE LIVES !\n"));
-  GtkWidget *err_box=create_dialog3(msg,FALSE,0);
+  GtkWidget *err_box=create_info_error_dialog(msg,FALSE,0,LIVES_INFO_TYPE_WARNING);
   GtkWindow *transient=NULL;
 
   g_free(msg);
@@ -2938,8 +3049,9 @@
 
   if (transient!=NULL) gtk_window_set_transient_for(GTK_WINDOW(err_box),transient);
   gtk_widget_show(err_box);
+
   gtk_window_present (GTK_WINDOW (err_box));
-  gdk_window_raise (err_box->window);
+  gdk_window_raise (lives_widget_get_xwindow(err_box));
 }
 
 
@@ -2984,9 +3096,9 @@
 
 
 
-gboolean ask_permission_dialog(int what) {
+boolean ask_permission_dialog(int what) {
   gchar *msg;
-  gboolean ret;
+  boolean ret;
 
   if (!prefs->show_gui) return FALSE;

LiVES-2.0.3.tar.bz2/src/effects-data.c Added

@@ -0,0 +1,3442 @@
+// effects-data.c
+// LiVES (lives-exe)
+// (c) G. Finch 2005 - 2013 (salsaman@gmail.com)
+// Released under the GPL 3 or later
+// see file ../COPYING for licensing details
+
+
+// functions for chaining and data passing between fx plugins
+
+
+//#define DEBUG_PCONX
+
+#if HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-host.h>
+#include <weed/weed-effects.h>
+#else
+#include "../libweed/weed.h"
+#include "../libweed/weed-host.h"
+#include "../libweed/weed-effects.h"
+#endif
+
+#include "main.h"
+#include "effects.h"
+#include "support.h"
+
+
+
+
+void pconx_delete_all(void) {
+  lives_pconnect_t *pconx=mainw->pconx,*pconx_next;
+
+  pthread_mutex_lock(&mainw->data_mutex);
+
+  while (pconx!=NULL) {
+    pconx_next=pconx->next;
+    g_free(pconx->params);
+    g_free(pconx->nconns);
+    g_free(pconx->ikey);
+    g_free(pconx->imode);
+    g_free(pconx->ipnum);
+    g_free(pconx->autoscale);
+    g_free(pconx);
+    pconx=pconx_next;
+  }
+  mainw->pconx=NULL;
+
+  pthread_mutex_unlock(&mainw->data_mutex);
+
+}
+
+
+static lives_pconnect_t *pconx_new (int okey, int omode) {
+  lives_pconnect_t *pconx=(lives_pconnect_t *)g_malloc0(sizeof(struct _lives_pconnect_t));
+  pconx->next=NULL;
+  pconx->okey=okey;
+  pconx->omode=omode;
+  pconx->nparams=0;
+  pconx->nconns=NULL;
+  return pconx;
+}
+
+
+static lives_pconnect_t *pconx_copy(lives_pconnect_t *spconx) {
+  lives_pconnect_t *pconx=NULL,*dpconx,*last_dpconx;
+
+  int totcons=0;
+
+  register int i,j=0;
+
+  while (spconx!=NULL) {
+    dpconx=pconx_new(spconx->okey,spconx->omode);
+    if (pconx==NULL) pconx=dpconx;
+    else last_dpconx->next=dpconx;
+
+    dpconx->nparams=spconx->nparams;
+
+    dpconx->nconns=(int *)g_malloc(dpconx->nparams*sizint);
+    dpconx->params=(int *)g_malloc(dpconx->nparams*sizint);
+
+    dpconx->ikey=dpconx->imode=dpconx->ipnum=dpconx->autoscale=NULL;
+
+    j=0;
+
+    for (i=0;i<dpconx->nparams;i++) {
+      dpconx->params[i]=spconx->params[i];
+      dpconx->nconns[i]=spconx->nconns[i];
+      totcons+=dpconx->nconns[i];
+
+      dpconx->ikey=(int *)g_realloc(dpconx->ikey,totcons*sizint);
+      dpconx->imode=(int *)g_realloc(dpconx->imode,totcons*sizint);
+      dpconx->ipnum=(int *)g_realloc(dpconx->ipnum,totcons*sizint);
+      dpconx->autoscale=(int *)g_realloc(dpconx->autoscale,totcons*sizint);
+
+      while (j<totcons) {
+	dpconx->ikey[j]=spconx->ikey[j];
+	dpconx->imode[j]=spconx->imode[j];
+	dpconx->ipnum[j]=spconx->ipnum[j];
+	dpconx->autoscale[j]=spconx->autoscale[j];
+	j++;
+      }
+    }
+
+    spconx=spconx->next;
+    last_dpconx=dpconx;
+  }
+
+  return pconx;
+}
+
+
+
+gchar *pconx_list(int okey, int omode, int opnum) {
+  gchar *st1=g_strdup(""),*st2;
+  lives_pconnect_t *pconx=mainw->pconx;
+
+  int totcons=0;
+
+  register int i,j;
+
+  while (pconx!=NULL) {
+    if (pconx->okey==okey&&pconx->omode==omode) {
+      for (i=0;i<pconx->nparams;i++) {
+	if (pconx->params[i]==opnum) {
+	  for (j=totcons;j<totcons+pconx->nconns[i];j++) {
+	    if (strlen(st1)==0) st2=g_strdup_printf("%d %d %d %d",pconx->ikey[j]+1,pconx->imode[j]+1,pconx->ipnum[j],pconx->autoscale[j]);
+	    st2=g_strdup_printf("%s %d %d %d %d",st1,pconx->ikey[j]+1,pconx->imode[j]+1,pconx->ipnum[j],pconx->autoscale[j]);
+	    g_free(st1);
+	    st1=st2;
+	  }
+	  return st1;
+	}
+	totcons+=pconx->nconns[i];
+      }
+      return st1;
+    }
+    pconx=pconx->next;
+  }
+  return st1;
+}
+
+
+
+
+
+void pconx_delete(int okey, int omode, int opnum, int ikey, int imode, int ipnum) {
+  lives_pconnect_t *pconx=mainw->pconx,*pconx_next,*pconx_prev=NULL;
+
+  register int i,j=0,k;
+
+  int totcons=0,maxcons=0;
+
+  pthread_mutex_lock(&mainw->data_mutex);
+
+  while (pconx!=NULL) {
+    pconx_next=pconx->next;
+    if (okey==-1||(pconx->okey==okey&&pconx->omode==omode)) {
+      if (ikey==-1) {
+	//g_print("rem all cons from %d %d to any param\n",okey,omode); 
+
+	// delete entire node
+	g_free(pconx->params);
+	g_free(pconx->nconns);
+	g_free(pconx->ikey);
+	g_free(pconx->imode);
+	g_free(pconx->ipnum);
+	g_free(pconx->autoscale);
+	g_free(pconx);
+	if (mainw->pconx==pconx) mainw->pconx=pconx_next;
+	else pconx_prev->next=pconx_next;
+	pthread_mutex_unlock(&mainw->data_mutex);
+	return;
+      }
+
+      for (i=0;i<pconx->nparams;i++) {
+	maxcons+=pconx->nconns[i];
+      }
+
+      for (i=0;pconx!=NULL&&i<pconx->nparams;i++) {
+	totcons+=pconx->nconns[i];
+
+	if (okey!=-1&&pconx->params[i]!=opnum) {
+	  j+=totcons;
+	  continue;
+	}
+
+	for (;j<totcons;j++) {
+	  if (pconx->ikey[j]==ikey && pconx->imode[j]==imode && (ipnum==-1||pconx->ipnum[j]==ipnum)) {
+	    maxcons--;
+	    for (k=j;k<maxcons;k++) {
+	      pconx->ikey[k]=pconx->ikey[k+1];
+	      pconx->imode[k]=pconx->imode[k+1];
+	      pconx->ipnum[k]=pconx->ipnum[k+1];
+	      pconx->autoscale[k]=pconx->autoscale[k+1];
+	    }
+
+	    pconx->ikey=(int *)g_realloc(pconx->ikey,maxcons*sizint);
+	    pconx->imode=(int *)g_realloc(pconx->imode,maxcons*sizint);
+	    pconx->ipnum=(int *)g_realloc(pconx->ipnum,maxcons*sizint);
+	    pconx->autoscale=(int *)g_realloc(pconx->autoscale,maxcons*sizint);
+
+	    pconx->nconns[i]--;
+
+	    if (pconx->nconns[i]==0) {
+	      pconx->nparams--;
+	      for (k=i;k<pconx->nparams;k++) {
+		pconx->params[k]=pconx->params[k+1];
+		pconx->nconns[k]=pconx->nconns[k+1];
+	      }
+
+	      if (pconx->nparams==0) {
+		// delete entire node
+		g_free(pconx->params);
+		g_free(pconx->nconns);
+		g_free(pconx->ikey);
+		g_free(pconx->imode);
+		g_free(pconx->ipnum);
+		g_free(pconx->autoscale);
+		g_free(pconx);
+		if (mainw->pconx==pconx) {
+		  mainw->pconx=pconx_next;
+		  pconx=NULL;
+		}
+		else {
+		  pconx=pconx_prev;
+		  pconx->next=pconx_next;
+		}
+	      }
+	      else {
+		pconx->nconns=(int *)g_realloc(pconx->nconns,pconx->nparams*sizint);
+	      }
+	    }
+	  }
+	}
+	j+=totcons;
+      }
+    }
+    pconx_prev=pconx;
+    pconx=pconx_next;
+  }
+  pthread_mutex_unlock(&mainw->data_mutex);
+}
+
+
+void pconx_remap_mode(int key, int omode, int nmode) {
+  lives_pconnect_t *pconx=mainw->pconx;
+
+  register int i,j,totcons;
+
+  while (pconx!=NULL) {
+    if (pconx->okey==key&&pconx->omode==omode) {
+      pconx->omode=nmode;
+    }
+    j=0;
+    totcons=0;
+    for (i=0;i<pconx->nparams;i++) {
+      totcons+=pconx->nconns[i];
+      for (;j<totcons;j++) {
+	if (pconx->ikey[j]==key && pconx->imode[j]==omode) {
+	  pconx->imode[j]=nmode;
+	}
+      }
+    }
+    pconx=pconx->next;
+  }
+}
+
+
+
+static void pconx_append(lives_pconnect_t *pconx) {
+ lives_pconnect_t *opconx=mainw->pconx;
+ lives_pconnect_t *last_pconx=opconx;
+
+  while (opconx!=NULL) {
+    last_pconx=opconx;
+    opconx=opconx->next;
+  }
+
+  if (last_pconx!=NULL) last_pconx->next=pconx;
+  if (mainw->pconx==NULL) mainw->pconx=pconx;
+}
+
+
+static lives_pconnect_t *pconx_find (int okey, int omode) {
+  //
+  lives_pconnect_t *pconx=mainw->pconx;
+  while (pconx!=NULL) {
+    if (pconx->okey==okey&&pconx->omode==omode) {
+      return pconx;
+    }
+    pconx=pconx->next;
+  }
+  return NULL;
+}
+
+
+
+static int pconx_get_numcons(lives_pconnect_t *pconx) {
+  int totcons=0;
+  register int j;
+
+  for (j=0;j<pconx->nparams;j++) {
+    totcons+=pconx->nconns[j];
+  }
+  return totcons;
+}
+
+
+
+void pconx_add_connection(int okey, int omode, int opnum, int ikey, int imode, int ipnum, boolean autoscale) {
+  lives_pconnect_t *pconx=pconx_find(okey,omode);
+  int posn=0,totcons=0;
+  register int i,j;
+
+  // delete any existing connection to the input param
+  pconx_delete(-1,0,0,ikey,imode,ipnum);
+
+  pthread_mutex_lock(&mainw->data_mutex);
+
+  if (pconx==NULL) {
+    // add whole new node
+    pconx=pconx_new(okey,omode);
+    pconx_append(pconx);
+  }
+  else {
+    // see if already in params
+    
+    for (i=0;i<pconx->nparams;i++) {
+      
+      if (pconx->params[i]==opnum) {
+	// located !
+	// add connection to existing
+
+	for (j=0;j<pconx->nparams;j++) {
+	  if (j<i) {
+	    // calc posn
+	    posn+=pconx->nconns[j];
+	  }
+	  totcons+=pconx->nconns[j];
+	}
+
+	// if already there, do not add again, just update autoscale
+	for (j=posn;j<posn+pconx->nconns[i];j++) {
+	  if (pconx->ikey[j]==ikey&&pconx->imode[j]==imode&&pconx->ipnum[j]==ipnum) {
+	    pconx->autoscale[j]=autoscale;
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    return;
+	  }
+
+	  // add in order key/mode/chan
+	  if (pconx->ikey[j]>ikey||(pconx->ikey[j]==ikey&&pconx->imode[j]>imode)||
+	      (pconx->ikey[j]==ikey&&pconx->imode[j]==imode&&pconx->ipnum[j]>ipnum)) break;
+
+	}
+
+	// increment nconns for this param
+	pconx->nconns[i]++;
+
+	totcons++;
+
+	posn=j;
+
+	// make space for new
+	pconx->ikey=(int *)g_realloc(pconx->ikey,totcons*sizint);
+	pconx->imode=(int *)g_realloc(pconx->imode,totcons*sizint);
+	pconx->ipnum=(int *)g_realloc(pconx->ipnum,totcons*sizint);
+	pconx->autoscale=(int *)g_realloc(pconx->autoscale,totcons*sizint);
+
+	// move up 1
+	for (j=totcons-1;j>posn;j--) {
+	  pconx->ikey[j]=pconx->ikey[j-1];
+	  pconx->imode[j]=pconx->imode[j-1];
+	  pconx->ipnum[j]=pconx->ipnum[j-1];
+	  pconx->autoscale[j]=pconx->autoscale[j-1];
+	}
+
+	// insert at posn
+	pconx->ikey[posn]=ikey;
+	pconx->imode[posn]=imode;
+	pconx->ipnum[posn]=ipnum;
+	pconx->autoscale[posn]=autoscale;
+
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	return;
+      }
+      
+    }
+
+    // so, we have data for key/mode but this is a new param to be mapped
+    
+    for (i=0;i<pconx->nparams;i++) {
+      totcons+=pconx->nconns[i];
+    }
+
+    totcons++;
+    
+    pconx->nparams++;
+    posn=pconx->nparams;
+    
+    // make space for new
+    pconx->nconns=(int *)g_realloc(pconx->nconns,posn*sizint);
+    pconx->params=(int *)g_realloc(pconx->params,posn*sizint);
+
+    pconx->ikey=(int *)g_realloc(pconx->ikey,totcons*sizint);
+    pconx->imode=(int *)g_realloc(pconx->imode,totcons*sizint);
+    pconx->ipnum=(int *)g_realloc(pconx->ipnum,totcons*sizint);
+    pconx->autoscale=(int *)g_realloc(pconx->autoscale,totcons*sizint);
+    
+    pconx->params[posn-1]=opnum;
+
+    pconx->nconns[posn-1]=1;
+    
+    posn=totcons-1;
+    
+    // insert at posn
+    pconx->ikey[posn]=ikey;
+    pconx->imode[posn]=imode;
+    pconx->ipnum[posn]=ipnum;
+    pconx->autoscale[posn]=autoscale;
+
+#ifdef DEBUG_PCONX
+    g_print("added another pconx from %d %d %d to %d %d %d\n",okey,omode,opnum,ikey,imode,ipnum);
+#endif
+
+    pthread_mutex_unlock(&mainw->data_mutex);
+
+    return;
+
+  }
+
+  // add new
+
+  totcons=pconx_get_numcons(pconx)+1;
+  pconx->nparams++;
+
+  pconx->nconns=(int *)g_realloc(pconx->params,pconx->nparams*sizint);
+  pconx->nconns[pconx->nparams-1]=1;
+
+  pconx->params=(int *)g_realloc(pconx->params,pconx->nparams*sizint);
+  pconx->params[pconx->nparams-1]=opnum;
+
+  pconx->ikey=(int *)g_realloc(pconx->ikey,totcons*sizint);
+  pconx->ikey[totcons-1]=ikey;
+
+  pconx->imode=(int *)g_realloc(pconx->imode,totcons*sizint);
+  pconx->imode[totcons-1]=imode;
+
+  pconx->ipnum=(int *)g_realloc(pconx->ipnum,totcons*sizint);
+  pconx->ipnum[totcons-1]=ipnum;
+
+  pconx->autoscale=(int *)g_realloc(pconx->autoscale,totcons*sizint);
+  pconx->autoscale[totcons-1]=autoscale;
+
+#ifdef DEBUG_PCONX
+  g_print("added new pconx from %d %d %d to %d %d %d (%d)\n",okey,omode,opnum,ikey,imode,ipnum,autoscale);
+#endif
+
+  pthread_mutex_unlock(&mainw->data_mutex);
+
+}
+
+
+
+weed_plant_t *pconx_get_out_param(boolean use_filt, int ikey, int imode, int ipnum, int *autoscale) {
+  // walk all pconx and find one which has ikey/imode/ipnum as destination
+  // then all we need do is copy the "value" leaf
+
+  lives_pconnect_t *pconx=mainw->pconx;
+
+  weed_plant_t *inst=NULL,*filter=NULL;
+
+  int totcons,error;
+  register int i,j;
+
+  while (pconx!=NULL) {
+    if (!use_filt) {
+      if (mainw->is_rendering) {
+	inst=get_new_inst_for_keymode(pconx->okey,pconx->omode);
+      }
+      else {
+	inst=rte_keymode_get_instance(pconx->okey+1,pconx->omode);
+      }
+      if (inst==NULL) {
+	pconx=pconx->next;
+	continue;
+      }
+      filter=weed_instance_get_filter(inst,TRUE);
+    }
+    else {
+      filter=rte_keymode_get_filter(pconx->okey+1,pconx->omode);
+      if (filter==NULL) {
+	pconx=pconx->next;
+	continue;
+      }
+    }
+    if (!weed_plant_has_leaf(filter,"out_parameter_templates")) {
+      pconx=pconx->next;
+      continue;
+    }
+    totcons=0;
+    j=0;
+    for (i=0;i<pconx->nparams;i++) {
+      totcons+=pconx->nconns[i];
+      for (;j<totcons;j++) {
+	if (pconx->ikey[j]==ikey && pconx->imode[j]==imode && pconx->ipnum[j]==ipnum) {
+	  weed_plant_t *param=NULL;
+	  if (use_filt) {
+	    weed_plant_t **outparams=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+	    if (pconx->params[i]<weed_leaf_num_elements(filter,"out_parameter_templates")) {
+	      param=outparams[pconx->params[i]];
+	    }
+	    weed_free(outparams);
+	  }
+	  else {
+	    param=weed_inst_out_param(inst,pconx->params[i]);
+	  }
+	  if (autoscale!=NULL) *autoscale=pconx->autoscale[j];
+	  return param;
+	}
+      }
+    }
+    pconx=pconx->next;
+  }
+
+  return NULL;
+}
+
+
+static boolean params_compatible(weed_plant_t *sparam, weed_plant_t *dparam) {
+ // allowed conversions
+  // type -> type
+
+  // bool -> double, bool -> int, bool -> string, (bool -> int64)
+  // int -> double, int -> string,  (int -> int64)
+  // double -> string
+  // (int64 -> string)
+
+  // int[3x]/double[3x] -> colourRGB
+  // int[4x]/double[4x] -> colourRGBA
+  //
+
+  int error;
+
+  weed_plant_t *dptmpl;
+
+  int dtype;
+
+  int stype;
+
+  int ndvals;
+  int nsvals;
+
+  int dhint;
+  int dflags;
+
+  if (WEED_PLANT_IS_PARAMETER(dparam)) {
+    dptmpl=weed_get_plantptr_value(dparam,"template",&error);
+    dtype=weed_leaf_seed_type(dparam,"value");
+    ndvals=weed_leaf_num_elements(dparam,"value");
+  }
+  else {
+    dptmpl=dparam;
+    dtype=weed_leaf_seed_type(dparam,"default");
+    ndvals=weed_leaf_num_elements(dparam,"default");
+  }
+
+  if (WEED_PLANT_IS_PARAMETER(sparam)) {
+    stype=weed_leaf_seed_type(sparam,"value");
+    nsvals=weed_leaf_num_elements(sparam,"value");
+  }
+  else {
+    stype=weed_leaf_seed_type(sparam,"default");
+    nsvals=weed_leaf_num_elements(sparam,"default");
+  }
+
+  dhint=weed_get_int_value(dptmpl,"hint",&error);
+  dflags=weed_get_int_value(dptmpl,"flags",&error);
+
+
+  if (dhint==WEED_HINT_COLOR) {
+    int cspace=weed_get_int_value(dptmpl,"colorspace",&error);
+    if (cspace==WEED_COLORSPACE_RGB&&(nsvals%3!=0)) return FALSE;
+    if (nsvals%4!=0) return FALSE;
+  }
+
+  if (ndvals>nsvals) {
+    if (!((dflags&WEED_PARAMETER_VARIABLE_ELEMENTS)&&!(dflags&WEED_PARAMETER_ELEMENT_PER_CHANNEL))) return FALSE;
+  }
+
+  if (dtype==stype) return TRUE;
+
+  switch (stype) {
+  case WEED_SEED_DOUBLE:
+    if (dtype==WEED_SEED_STRING) return TRUE;
+    return FALSE;
+  case WEED_SEED_INT:
+    if (dtype==WEED_SEED_DOUBLE||dtype==WEED_SEED_STRING) return TRUE;
+    return FALSE;
+  case WEED_SEED_BOOLEAN:
+    if (dtype==WEED_SEED_DOUBLE||dtype==WEED_SEED_INT||dtype==WEED_SEED_STRING) return TRUE;
+    return FALSE;
+  default:
+    return FALSE;
+  }
+
+  return FALSE;
+}
+
+
+
+boolean pconx_convert_value_data(weed_plant_t *inst, int pnum, weed_plant_t *dparam, weed_plant_t *sparam, boolean autoscale) {
+  // try to convert values of various type, if we succeed, copy the "value" and return TRUE (if changed)
+  weed_plant_t *dptmpl,*sptmpl;
+
+  double ratio;
+
+  int dtype,stype,nsvals,ndvals,error;
+  int copyto,ondvals;
+
+  int nsmin=0,nsmax=0;
+
+  int minct=0,maxct=0;
+  int sminct=0,smaxct=0;
+
+  int nmax=0,nmin=0;
+
+  boolean retval=FALSE;
+
+  register int i;
+
+  if (dparam==sparam) return FALSE;
+
+  nsvals=weed_leaf_num_elements(sparam,"value");
+  ondvals=ndvals=weed_leaf_num_elements(dparam,"value");
+  
+  dptmpl=weed_get_plantptr_value(dparam,"template",&error);
+  sptmpl=weed_get_plantptr_value(sparam,"template",&error);
+
+  dtype=weed_leaf_seed_type(dparam,"value");
+  stype=weed_leaf_seed_type(sparam,"value");
+
+  if (!params_compatible(sparam,dparam)) return FALSE;
+
+  if (ndvals>nsvals) ndvals=nsvals;
+ 
+  if (autoscale) {
+    if (weed_plant_has_leaf(sptmpl,"min")&&weed_plant_has_leaf(sptmpl,"max")) {
+      nsmin=weed_leaf_num_elements(sptmpl,"min");
+      nsmax=weed_leaf_num_elements(sptmpl,"max");
+    }
+    else autoscale=FALSE;
+  }
+
+  if (weed_plant_has_leaf(dptmpl,"max")) {
+    nmax=weed_leaf_num_elements(dptmpl,"max");
+    nmin=weed_leaf_num_elements(dptmpl,"min");
+  }
+
+  //g_print("got %d and %d\n",stype,dtype);
+
+  switch (stype) {
+  case WEED_SEED_STRING:
+    switch (dtype) {
+    case WEED_SEED_STRING:
+      {
+	char **valsS=weed_get_string_array(sparam,"value",&error);
+	char **valss=weed_get_string_array(dparam,"value",&error);
+
+	if (ndvals>ondvals) valss=(char **)g_realloc(valss,ndvals*sizeof(char *));
+
+	for (i=0;i<ndvals;i++) {
+	  if (i>=ondvals||strcmp(valss[i],valsS[i])) {
+	    retval=TRUE;
+	    if (i<ondvals) weed_free(valss[i]);
+	    valss[i]=valsS[i];
+	  }
+	  else weed_free(valsS[i]);
+	}
+	if (!retval) {
+	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	  weed_free(valss);
+	  weed_free(valsS);
+	  return FALSE;
+	}
+
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_string_array(dparam,"value",ndvals,valss);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	weed_free(valss);
+	weed_free(valsS);
+      }
+      return TRUE;
+  default:
+    return retval;
+    }
+  case WEED_SEED_DOUBLE:
+    switch (dtype) {
+    case WEED_SEED_DOUBLE:
+      {
+	double *valsD=weed_get_double_array(sparam,"value",&error);
+	double *valsd=weed_get_double_array(dparam,"value",&error);
+	
+	double *maxd=weed_get_double_array(dptmpl,"max",&error);
+	double *mind=weed_get_double_array(dptmpl,"min",&error);
+
+	double *mins=NULL,*maxs=NULL;
+
+	if (autoscale) {
+	  mins=weed_get_double_array(sptmpl,"min",&error);
+	  maxs=weed_get_double_array(sptmpl,"max",&error);
+	}
+
+	if (ndvals>ondvals) valsd=(double *)g_realloc(valsd,ndvals*sizeof(double));
+
+	for (i=0;i<ndvals;i++) {
+	  if (autoscale) {
+	    ratio=(valsD[i]-mins[sminct])/(maxs[smaxct]-mins[sminct]);
+	    valsD[i]=mind[minct]+(maxd[maxct]-mind[minct])*ratio;
+	    if (++smaxct==nsmax) smaxct=0;
+	    if (++sminct==nsmin) sminct=0;
+
+	    if (valsD[i]>maxd[maxct]) valsD[i]=maxd[maxct];
+	    if (valsD[i]<mind[minct]) valsD[i]=mind[minct];
+	  }
+
+	  if (i>=ondvals||valsd[i]!=valsD[i]) {
+	    retval=TRUE;
+	    valsd[i]=valsD[i];
+	  }
+	  if (++maxct==nmax) maxct=0;
+	  if (++minct==nmin) minct=0;
+	}
+
+	if (mins!=NULL) {
+	  weed_free(mins);
+	  weed_free(maxs);
+	}
+
+	if (retval) {
+
+	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    copyto=set_copy_to(inst,pnum,FALSE);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_double_array(dparam,"value",ndvals,valsd);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	weed_free(maxd);
+	weed_free(mind);
+	weed_free(valsD);
+	weed_free(valsd);
+      }
+      return retval;
+
+    case WEED_SEED_STRING:
+      {
+	char *opstring,*tmp,*bit;
+	double *valsd=weed_get_double_array(sparam,"value",&error);
+	char **valss,*vals;
+
+	if (ndvals==1) {
+	  opstring=g_strdup("");
+	  vals=weed_get_string_value(dparam,"value",&error);
+	  for (i=0;i<nsvals;i++) {
+	    bit=g_strdup_printf("%.4f",valsd[i]);
+	    if (strlen(opstring)==0)
+	      tmp=g_strconcat (opstring,bit,NULL);
+	    else 
+	      tmp=g_strconcat (opstring," ",bit,NULL);
+	    g_free(bit);
+	    g_free(opstring);
+	    opstring=tmp;
+	  }
+	  if (strcmp(vals,opstring)) {
+	    pthread_mutex_lock(&mainw->data_mutex);
+	    weed_set_string_value(dparam,"value",opstring);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    retval=TRUE;
+	  }
+	  weed_free(vals);
+	  weed_free(valsd);
+	  g_free(opstring);
+	  return retval;
+	}
+
+	valss=weed_get_string_array(dparam,"value",&error);
+
+	if (ndvals>ondvals) valss=(char **)g_realloc(valsd,ndvals*sizeof(char *));
+
+	for (i=0;i<ndvals;i++) {
+	  bit=g_strdup_printf("%.4f",valsd[i]);
+	  if (i>=ondvals||strcmp(valss[i],bit)) {
+	    retval=TRUE;
+	    if (i<ondvals) weed_free(valss[i]);
+	    valss[i]=bit;
+	  }
+	  else g_free(bit);
+	}
+	if (!retval) {
+	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	  weed_free(valss);
+	  weed_free(valsd);
+	  return FALSE;
+	}
+
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_string_array(dparam,"value",ndvals,valss);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	weed_free(valss);
+	weed_free(valsd);
+      }
+      return TRUE;
+    default:
+      break;
+    }
+
+    break;
+
+  case WEED_SEED_INT:
+    switch (dtype) {
+    case WEED_SEED_STRING:
+      {
+	char *opstring,*tmp,*bit;
+	int *valsi=weed_get_int_array(sparam,"value",&error);
+
+	char **valss,*vals;
+
+	if (ndvals==1) {
+	  opstring=g_strdup("");
+	  vals=weed_get_string_value(dparam,"value",&error);
+	  for (i=0;i<nsvals;i++) {
+	    bit=g_strdup_printf("%d",valsi[i]);
+	    if (strlen(opstring)==0)
+	      tmp=g_strconcat (opstring,bit,NULL);
+	    else 
+	      tmp=g_strconcat (opstring," ",bit,NULL);
+	    g_free(bit);
+	    g_free(opstring);
+	    opstring=tmp;
+	  }
+	  if (strcmp(vals,opstring)) {
+	    pthread_mutex_lock(&mainw->data_mutex);
+	    weed_set_string_value(dparam,"value",opstring);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    retval=TRUE;
+	  }
+	  weed_free(vals);
+	  weed_free(valsi);
+	  g_free(opstring);
+	  return retval;
+	}
+
+	valss=weed_get_string_array(dparam,"value",&error);
+
+	if (ndvals>ondvals) valss=(char **)g_realloc(valss,ndvals*sizeof(char *));
+
+	for (i=0;i<ndvals;i++) {
+	  bit=g_strdup_printf("%d",valsi[i]);
+	  if (i>=ondvals||strcmp(valss[i],bit)) {
+	    retval=TRUE;
+	    if (i<ondvals) weed_free(valss[i]);
+	    valss[i]=bit;
+	  }
+	  else g_free(bit);
+	}
+	if (!retval) {
+	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	  weed_free(valss);
+	  weed_free(valsi);
+	  return FALSE;
+	}
+
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_string_array(dparam,"value",ndvals,valss);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	weed_free(valss);
+	weed_free(valsi);
+      }
+      return retval;
+    case WEED_SEED_DOUBLE:
+      {
+	int *valsi=weed_get_int_array(sparam,"value",&error);
+	double * valsd=weed_get_double_array(dparam,"value",&error);
+	
+	double *maxd=weed_get_double_array(dptmpl,"max",&error);
+	double *mind=weed_get_double_array(dptmpl,"min",&error);
+	double vald;
+
+	int *mins=NULL,*maxs=NULL;
+
+	if (autoscale) {
+	  mins=weed_get_int_array(sptmpl,"min",&error);
+	  maxs=weed_get_int_array(sptmpl,"max",&error);
+	}
+
+	if (ndvals>ondvals) valsd=(double *)g_realloc(valsd,ndvals*sizeof(double));
+
+	for (i=0;i<ndvals;i++) {
+	  if (autoscale) {
+	    ratio=(double)(valsi[i]-mins[sminct])/(double)(maxs[smaxct]-mins[sminct]);
+	    vald=mind[minct]+(maxd[maxct]-mind[minct])*ratio;
+	    if (++smaxct==nsmax) smaxct=0;
+	    if (++sminct==nsmin) sminct=0;
+
+	    if (vald>maxd[maxct]) vald=maxd[maxct];
+	    if (vald<mind[minct]) vald=mind[minct];
+	  }
+	  else vald=(double)valsi[i];
+
+	  if (i>=ondvals||valsd[i]!=vald) {
+	    retval=TRUE;
+	    valsd[i]=vald;
+	  }
+	  if (++maxct==nmax) maxct=0;
+	  if (++minct==nmin) minct=0;
+	}
+
+	if (mins!=NULL) {
+	  weed_free(mins);
+	  weed_free(maxs);
+	}
+
+	if (retval) {
+
+	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    copyto=set_copy_to(inst,pnum,FALSE);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_double_array(dparam,"value",ndvals,valsd);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	weed_free(maxd);
+	weed_free(mind);
+	weed_free(valsi);
+	weed_free(valsd);
+      }
+      return retval;
+
+   case WEED_SEED_INT:
+      {
+	int *valsI=weed_get_int_array(sparam,"value",&error);
+	int *valsi=weed_get_int_array(dparam,"value",&error);
+	
+	int *maxi=weed_get_int_array(dptmpl,"max",&error);
+	int *mini=weed_get_int_array(dptmpl,"min",&error);
+
+	int *mins=NULL,*maxs=NULL;
+
+	if (autoscale) {
+	  mins=weed_get_int_array(sptmpl,"min",&error);
+	  maxs=weed_get_int_array(sptmpl,"max",&error);
+	}
+
+	if (ndvals>ondvals) valsi=(int *)g_realloc(valsi,ndvals*sizeof(int));
+
+	for (i=0;i<ndvals;i++) {
+	  if (autoscale) {
+	    ratio=(double)(valsI[i]-mins[sminct])/(double)(maxs[smaxct]-mins[sminct]);
+	    valsI[i]=myround(mini[minct]+(double)(maxi[maxct]-mini[minct])*ratio);
+	    if (++smaxct==nsmax) smaxct=0;
+	    if (++sminct==nsmin) sminct=0;
+
+	    if (valsI[i]>maxi[maxct]) valsI[i]=maxi[maxct];
+	    if (valsI[i]<mini[minct]) valsI[i]=mini[minct];
+	  }
+
+	  if (i>=ondvals||valsi[i]!=valsI[i]) {
+	    retval=TRUE;
+	    valsi[i]=valsI[i];
+	  }
+	  if (++maxct==nmax) maxct=0;
+	  if (++minct==nmin) minct=0;
+	}
+
+	if (mins!=NULL) {
+	  weed_free(mins);
+	  weed_free(maxs);
+	}
+
+	if (retval) {
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    copyto=set_copy_to(inst,pnum,FALSE);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_int_array(dparam,"value",ndvals,valsi);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	weed_free(maxi);
+	weed_free(mini);
+	weed_free(valsI);
+	weed_free(valsi);
+      }
+      return retval;
+
+    }
+    break;
+
+  case WEED_SEED_BOOLEAN:
+    switch (dtype) {
+    case WEED_SEED_STRING:
+      {
+	char *opstring,*tmp,*bit;
+	int *valsb=weed_get_boolean_array(sparam,"value",&error);
+
+	char **valss,*vals;
+
+	if (ndvals==1) {
+	  opstring=g_strdup("");
+	  vals=weed_get_string_value(dparam,"value",&error);
+	  for (i=0;i<nsvals;i++) {
+	    bit=g_strdup_printf("%d",valsb[i]);
+	    if (strlen(opstring)==0)
+	      tmp=g_strconcat (opstring,bit,NULL);
+	    else 
+	      tmp=g_strconcat (opstring," ",bit,NULL);
+	    g_free(bit);
+	    g_free(opstring);
+	    opstring=tmp;
+	  }
+	  if (strcmp(vals,opstring)) {
+	    pthread_mutex_lock(&mainw->data_mutex);
+	    weed_set_string_value(dparam,"value",opstring);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    retval=TRUE;
+	  }
+	  weed_free(vals);
+	  weed_free(valsb);
+	  g_free(opstring);
+	  return retval;
+	}
+
+	valss=weed_get_string_array(dparam,"value",&error);
+	if (ndvals>ondvals) valss=(char **)g_realloc(valss,ndvals*sizeof(char *));
+
+	for (i=0;i<ndvals;i++) {
+	  bit=g_strdup_printf("%d",valsb[i]);
+	  if (i>=ondvals||strcmp(valss[i],bit)) {
+	    retval=TRUE;
+	    if (i<ondvals) weed_free(valss[i]);
+	    valss[i]=bit;
+	  }
+	  else g_free(bit);
+	}
+	if (!retval) {
+	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	  weed_free(valss);
+	  weed_free(valsb);
+	  return FALSE;
+	}
+
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_string_array(dparam,"value",ndvals,valss);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	for (i=0;i<ndvals;i++) weed_free(valss[i]);
+	weed_free(valss);
+	weed_free(valsb);
+      }
+      return retval;
+    case WEED_SEED_DOUBLE:
+      {
+	int *valsb=weed_get_boolean_array(sparam,"value",&error);
+	double * valsd=weed_get_double_array(dparam,"value",&error);
+	
+	double *maxd=weed_get_double_array(dptmpl,"max",&error);
+	double *mind=weed_get_double_array(dptmpl,"min",&error);
+	double vald;
+
+	if (ndvals>ondvals) valsd=(double *)g_realloc(valsd,ndvals*sizeof(double));
+
+	for (i=0;i<ndvals;i++) {
+	  if (autoscale) {
+	    if (valsb[i]==WEED_TRUE) vald=maxd[maxct];
+	    else vald=mind[minct];
+	  }
+	  else {
+	    vald=(double)valsb[i];
+	    if (vald>maxd[maxct]) vald=maxd[maxct];
+	    if (vald<mind[minct]) vald=mind[minct];
+	  }
+	  if (i>=ondvals||valsd[i]!=vald) {
+	    retval=TRUE;
+	    valsd[i]=vald;
+	  }
+	  if (++maxct==nmax) maxct=0;
+	  if (++minct==nmin) minct=0;
+	}
+	if (retval) {
+
+	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    copyto=set_copy_to(inst,pnum,FALSE);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_double_array(dparam,"value",ndvals,valsd);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	weed_free(maxd);
+	weed_free(mind);
+	weed_free(valsb);
+	weed_free(valsd);
+      }
+      return retval;
+    case WEED_SEED_INT:
+      {
+	int *valsb=weed_get_boolean_array(sparam,"value",&error);
+	int *valsi=weed_get_int_array(dparam,"value",&error);
+
+	int *maxi=weed_get_int_array(dptmpl,"max",&error);
+	int *mini=weed_get_int_array(dptmpl,"min",&error);
+	
+	if (ndvals>ondvals) valsi=(int *)g_realloc(valsi,ndvals*sizeof(int));
+
+	for (i=0;i<ndvals;i++) {
+	  if (autoscale) {
+	    if (valsb[i]==WEED_TRUE) valsb[i]=maxi[maxct];
+	    else valsb[i]=mini[minct];
+	  }
+	  else {
+	    if (valsb[i]>maxi[maxct]) valsb[i]=maxi[maxct];
+	    if (valsb[i]<mini[minct]) valsb[i]=mini[maxct];
+	  }
+	  if (i>=ondvals||valsi[i]!=valsb[i]) {
+	    retval=TRUE;
+	    valsi[i]=valsb[i];
+	  }
+	  if (++maxct==nmax) maxct=0;
+	  if (++minct==nmin) minct=0;
+	}
+	if (retval) {
+
+	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    copyto=set_copy_to(inst,pnum,FALSE);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_int_array(dparam,"value",ndvals,valsi);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	weed_free(maxi);
+	weed_free(mini);
+	weed_free(valsi);
+	weed_free(valsb);
+      }
+      return retval;
+
+    case WEED_SEED_BOOLEAN:
+      {
+	int *valsB=weed_get_boolean_array(sparam,"value",&error);
+	int *valsb=weed_get_boolean_array(dparam,"value",&error);
+
+	if (ndvals>ondvals) valsb=(int *)g_realloc(valsb,ndvals*sizeof(int));
+
+	for (i=0;i<ndvals;i++) {
+	  if (i>=ondvals||valsb[i]!=valsB[i]) {
+	    retval=TRUE;
+	    valsb[i]=valsB[i];
+	  }
+	}
+	if (retval) {
+
+	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    copyto=set_copy_to(inst,pnum,FALSE);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_boolean_array(dparam,"value",ndvals,valsb);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	weed_free(valsB);
+	weed_free(valsb);
+      }
+      return retval;
+    default:
+      break;
+    }
+
+    break;
+
+  default:
+    break;
+    }
+
+  return retval;
+}
+
+
+
+boolean pconx_chain_data(int key, int mode) {
+
+  weed_plant_t **inparams;
+  weed_plant_t *oparam;
+  weed_plant_t *inst=NULL;
+
+  boolean changed,reinit_inst=FALSE;
+
+  int error;
+  int nparams=0;
+  int autoscale;
+  int pflags;
+
+  int copyto=-1;
+
+  register int i;
+
+  if (key>-1) {
+    if (mainw->is_rendering) {
+      if ((inst=get_new_inst_for_keymode(key,mode))==NULL) {
+	return FALSE; ///< dest effect is not found
+      }
+    }
+    else {
+      if ((inst=rte_keymode_get_instance(key+1,mode))==NULL) {
+	return FALSE; ///< dest effect is not enabled
+      }
+    }
+    
+    if (weed_plant_has_leaf(inst,"in_parameters")) nparams=weed_leaf_num_elements(inst,"in_parameters");
+  }
+  else if (key==-2) {
+    // playback plugin
+    if (mainw->vpp==NULL) return FALSE;
+    nparams=mainw->vpp->num_play_params;
+  }
+
+  if (nparams>0) {
+
+    if (key==-2) inparams=mainw->vpp->play_params;
+    else inparams=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+    for (i=0;i<nparams;i++) {
+      if ((oparam=pconx_get_out_param(FALSE,key,mode,i,&autoscale))!=NULL) {
+	//	#define DEBUG_PCONX
+#ifdef DEBUG_PCONX
+	g_print("got pconx from %d %d %d\n",key,mode,i);
+#endif
+	changed=pconx_convert_value_data(inst,i,key==-2?(weed_plant_t *)pp_get_param(mainw->vpp->play_params,i):inparams[i],oparam,autoscale);
+
+	if (changed&&inst!=NULL&&key>-1) {
+	  // only store value if it changed; for int, double or colour, store old value too
+
+	  copyto=set_copy_to(inst,i,TRUE);
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,i);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pflags=weed_get_int_value(inparams[i],"flags",&error);
+	  if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+	  if (copyto!=-1) {
+	    pflags=weed_get_int_value(inparams[copyto],"flags",&error);
+	    if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+	  }
+
+	  if (fx_dialog[1]!=NULL&&!reinit_inst) {
+	    lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
+	    if (!rfx->is_template) {
+	      gint keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
+	      gint modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+	      if (keyw==key&&modew==mode)
+		// ask the main thread to update the param window
+		mainw->vrfx_update=rfx;
+	    }
+	  }
+
+	}
+
+      }
+    }
+    if (key!=-2) weed_free(inparams);
+  }
+  return reinit_inst;
+}
+
+
+boolean pconx_chain_data_internal(weed_plant_t *inst) {
+  // special version for compound fx internal connections
+  weed_plant_t **in_params;
+
+  boolean autoscale,reinit_inst=FALSE;
+
+  int nparams=0,error,pflags,copyto;
+
+  register int i;
+
+  nparams=num_in_params(inst,FALSE,FALSE);
+  if (nparams==0) return FALSE;
+
+  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+  for (i=0;i<nparams;i++) {
+    if (weed_plant_has_leaf(in_params[i],"host_internal_connection")) {
+      autoscale=FALSE;
+      if (weed_plant_has_leaf(in_params[i],"host_internal_connection_autoscale")&&
+	  weed_get_boolean_value(in_params[i],"host_internal_connection_autoscale",&error)==WEED_TRUE) autoscale=TRUE;
+      if (pconx_convert_value_data(inst,i,in_params[i],weed_get_plantptr_value(in_params[i],"host_internal_connection",&error),autoscale)) {
+
+	copyto=set_copy_to(inst,i,TRUE);
+
+	pflags=weed_get_int_value(in_params[i],"flags",&error);
+	if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+	if (copyto!=-1) {
+	  pflags=weed_get_int_value(in_params[copyto],"flags",&error);
+	  if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+	}
+      }
+
+    }
+  }
+
+  weed_free(in_params);
+  return reinit_inst;
+}
+
+// alpha channs
+
+
+
+void cconx_delete_all(void) {
+  lives_cconnect_t *cconx=mainw->cconx,*cconx_next;
+  while (cconx!=NULL) {
+    cconx_next=cconx->next;
+    if (cconx->nchans>0) {
+      g_free(cconx->chans);
+      g_free(cconx->nconns);
+      g_free(cconx->ikey);
+      g_free(cconx->imode);
+      g_free(cconx->icnum);
+    }
+    g_free(cconx);
+    cconx=cconx_next;
+  }
+  mainw->cconx=NULL;
+}
+
+
+static lives_cconnect_t *cconx_new (int okey, int omode) {
+  lives_cconnect_t *cconx=(lives_cconnect_t *)g_malloc0(sizeof(struct _lives_cconnect_t));
+  cconx->next=NULL;
+  cconx->okey=okey;
+  cconx->omode=omode;
+  cconx->nchans=0;
+  cconx->nconns=NULL;
+  return cconx;
+}
+
+
+
+static lives_cconnect_t *cconx_copy(lives_cconnect_t *scconx) {
+  lives_cconnect_t *cconx=NULL,*dcconx,*last_dcconx;
+
+  int totcons=0;
+
+  register int i,j=0;
+
+  while (scconx!=NULL) {
+    dcconx=cconx_new(scconx->okey,scconx->omode);
+    if (cconx==NULL) cconx=dcconx;
+    else last_dcconx->next=dcconx;
+
+    dcconx->nchans=scconx->nchans;
+    
+    dcconx->nconns=(int *)g_malloc(dcconx->nchans*sizint);
+    dcconx->chans=(int *)g_malloc(dcconx->nchans*sizint);
+
+    dcconx->ikey=dcconx->imode=dcconx->icnum=NULL;
+
+    j=0;
+
+    for (i=0;i<dcconx->nchans;i++) {
+      dcconx->chans[i]=scconx->chans[i];
+      dcconx->nconns[i]=scconx->nconns[i];
+      totcons+=dcconx->nconns[i];
+
+      dcconx->ikey=(int *)g_realloc(dcconx->ikey,totcons*sizint);
+      dcconx->imode=(int *)g_realloc(dcconx->imode,totcons*sizint);
+      dcconx->icnum=(int *)g_realloc(dcconx->icnum,totcons*sizint);
+
+      while (j<totcons) {
+	dcconx->ikey[j]=scconx->ikey[j];
+	dcconx->imode[j]=scconx->imode[j];
+	dcconx->icnum[j]=scconx->icnum[j];
+	j++;
+      }
+    }
+
+    scconx=scconx->next;
+    last_dcconx=dcconx;
+  }
+
+  return cconx;
+}
+
+
+gchar *cconx_list(int okey, int omode, int ocnum) {
+  gchar *st1=g_strdup(""),*st2;
+  lives_cconnect_t *cconx=mainw->cconx;
+
+  int totcons=0;
+
+  register int i,j;
+
+  while (cconx!=NULL) {
+    if (cconx->okey==okey&&cconx->omode==omode) {
+      for (i=0;i<cconx->nchans;i++) {
+	if (cconx->chans[i]==ocnum) {
+	  for (j=totcons;j<totcons+cconx->nconns[i];j++) {
+	    if (strlen(st1)==0) st2=g_strdup_printf("%d %d %d",cconx->ikey[j]+1,cconx->imode[j]+1,cconx->icnum[j]);
+	    st2=g_strdup_printf("%s %d %d %d",st1,cconx->ikey[j]+1,cconx->imode[j]+1,cconx->icnum[j]);
+	    g_free(st1);
+	    st1=st2;
+	  }
+	  return st1;
+	}
+	totcons+=cconx->nconns[i];
+      }
+      return st1;
+    }
+    cconx=cconx->next;
+  }
+  return st1;
+}
+
+
+void cconx_delete(int okey, int omode, int ocnum, int ikey, int imode, int icnum) {
+  lives_cconnect_t *cconx=mainw->cconx,*cconx_next,*cconx_prev=NULL;
+
+  register int i,j=0,k;
+
+  int totcons=0,maxcons=0;
+
+  while (cconx!=NULL) {
+    cconx_next=cconx->next;
+    if (okey==-1||(cconx->okey==okey&&cconx->omode==omode)) {
+      if (ikey==-1) {
+	// delete entire node
+	g_free(cconx->chans);
+	g_free(cconx->nconns);
+	g_free(cconx->ikey);
+	g_free(cconx->imode);
+	g_free(cconx->icnum);
+	g_free(cconx);
+	if (mainw->cconx==cconx) mainw->cconx=cconx_next;
+	else cconx_prev->next=cconx_next;
+	return;
+      }
+
+      for (i=0;i<cconx->nchans;i++) {
+	maxcons+=cconx->nconns[i];
+      }
+
+      for (i=0;cconx!=NULL&&i<cconx->nchans;i++) {
+	totcons+=cconx->nconns[i];
+
+	if (okey!=-1&&cconx->chans[i]!=ocnum) {
+	  j+=totcons;
+	  continue;
+	}
+
+	for (;j<totcons;j++) {
+	  if (cconx->ikey[j]==ikey && cconx->imode[j]==imode && cconx->icnum[j]==icnum) {
+	    maxcons--;
+	    for (k=j;k<maxcons;k++) {
+	      cconx->ikey[k]=cconx->ikey[k+1];
+	      cconx->imode[k]=cconx->imode[k+1];
+	      cconx->icnum[k]=cconx->icnum[k+1];
+	    }
+
+	    cconx->ikey=(int *)g_realloc(cconx->ikey,maxcons*sizint);
+	    cconx->imode=(int *)g_realloc(cconx->imode,maxcons*sizint);
+	    cconx->icnum=(int *)g_realloc(cconx->icnum,maxcons*sizint);
+
+	    cconx->nconns[i]--;
+
+	    if (cconx->nconns[i]==0) {
+	      cconx->nchans--;
+	      for (k=i;k<cconx->nchans;k++) {
+		cconx->chans[k]=cconx->chans[k+1];
+		cconx->nconns[k]=cconx->nconns[k+1];
+	      }
+
+	      if (cconx->nchans==0) {
+		// delete entire node
+		g_free(cconx->chans);
+		g_free(cconx->nconns);
+		g_free(cconx->ikey);
+		g_free(cconx->imode);
+		g_free(cconx->icnum);
+		g_free(cconx);
+		if (mainw->cconx==cconx) {
+		  mainw->cconx=cconx_next;
+		  cconx=NULL;
+		}
+		else {
+		  cconx=cconx_prev;
+		  cconx->next=cconx_next;
+		}
+	      }
+	      else {
+		cconx->nconns=(int *)g_realloc(cconx->nconns,cconx->nchans*sizint);
+	      }
+	    }
+	  }
+	}
+	j+=totcons;
+      }
+    }
+    cconx_prev=cconx;
+    cconx=cconx_next;
+  }
+}
+
+
+void cconx_remap_mode(int key, int omode, int nmode) {
+  lives_cconnect_t *cconx=mainw->cconx;
+
+  register int i,j,totcons;
+
+  while (cconx!=NULL) {
+    if (cconx->okey==key&&cconx->omode==omode) {
+      cconx->omode=nmode;
+    }
+    j=0;
+    totcons=0;
+    for (i=0;i<cconx->nchans;i++) {
+      totcons+=cconx->nconns[i];
+      for (;j<totcons;j++) {
+	if (cconx->ikey[j]==key && cconx->imode[j]==omode) {
+	  cconx->imode[j]=nmode;
+	}
+      }
+    }
+    cconx=cconx->next;
+  }
+}
+
+
+
+static void cconx_append(lives_cconnect_t *cconx) {
+ lives_cconnect_t *occonx=mainw->cconx;
+ lives_cconnect_t *last_cconx=occonx;
+
+  while (occonx!=NULL) {
+    last_cconx=occonx;
+    occonx=occonx->next;
+  }
+
+  if (last_cconx!=NULL) last_cconx->next=cconx;
+  if (mainw->cconx==NULL) mainw->cconx=cconx;
+}
+
+
+static lives_cconnect_t *cconx_find (int okey, int omode) {
+  lives_cconnect_t *cconx=mainw->cconx;
+  while (cconx!=NULL) {
+    if (cconx->okey==okey&&cconx->omode==omode) {
+      return cconx;
+    }
+    cconx=cconx->next;
+  }
+  return NULL;
+}
+
+
+
+static int cconx_get_numcons(lives_cconnect_t *cconx) {
+  int totcons=0;
+  register int j;
+
+  for (j=0;j<cconx->nchans;j++) {
+    totcons+=cconx->nconns[j];
+  }
+  return totcons;
+}
+
+
+
+void cconx_add_connection(int okey, int omode, int ocnum, int ikey, int imode, int icnum) {
+  lives_cconnect_t *cconx=cconx_find(okey,omode);
+  int posn=0,totcons=0;
+  register int i,j;
+
+  // delete any existing connection to the input channel
+  cconx_delete(-1,0,0,ikey,imode,icnum);
+
+  if (cconx==NULL) {
+    // add whole new node
+    cconx=cconx_new(okey,omode);
+    cconx_append(cconx);
+  }
+  else {
+    // see if already in chans
+    
+    for (i=0;i<cconx->nchans;i++) {
+ 
+      if (cconx->chans[i]==ocnum) {
+	// add connection to existing
+
+	for (j=0;j<cconx->nchans;j++) {
+	  if (j<i) {
+	    // calc posn
+	    posn+=cconx->nconns[j];
+	  }
+	  totcons+=cconx->nconns[j];
+	}
+
+	// if already there, do not add again
+	for (j=posn;j<posn+cconx->nconns[i];j++) {
+	  if (cconx->ikey[j]==ikey&&cconx->imode[j]==imode&&cconx->icnum[j]==icnum) {
+	    return;
+	  }
+
+	  // add in order key/mode/chan
+	  if (cconx->ikey[j]>ikey||(cconx->ikey[j]==ikey&&cconx->imode[j]>imode)||
+	      (cconx->ikey[j]==ikey&&cconx->imode[j]==imode&&cconx->icnum[j]>icnum)) break;
+	      
+	}
+
+	posn=j; // we will insert here
+	cconx->nconns[i]++;
+	totcons++;
+
+	// make space for new
+	cconx->ikey=(int *)g_realloc(cconx->ikey,totcons*sizint);
+	cconx->imode=(int *)g_realloc(cconx->imode,totcons*sizint);
+	cconx->icnum=(int *)g_realloc(cconx->icnum,totcons*sizint);
+
+	// move up 1
+	for (j=totcons-1;j>posn;j--) {
+	  cconx->ikey[j]=cconx->ikey[j-1];
+	  cconx->imode[j]=cconx->imode[j-1];
+	  cconx->icnum[j]=cconx->icnum[j-1];
+	}
+
+	// insert at posn
+	cconx->ikey[posn]=ikey;
+	cconx->imode[posn]=imode;
+	cconx->icnum[posn]=icnum;
+
+	return;
+      }
+      
+    }
+
+    // so, we have data for key/mode but this is a new channel to be mapped
+
+    for (i=0;i<cconx->nchans;i++) {
+      totcons+=cconx->nconns[i];
+    }
+    
+    totcons++;
+    
+    cconx->nchans++;
+    posn=cconx->nchans;
+    
+    // make space for new
+    cconx->nconns=(int *)g_realloc(cconx->nconns,posn*sizint);
+    cconx->chans=(int *)g_realloc(cconx->chans,posn*sizint);
+
+    cconx->ikey=(int *)g_realloc(cconx->ikey,totcons*sizint);
+    cconx->imode=(int *)g_realloc(cconx->imode,totcons*sizint);
+    cconx->icnum=(int *)g_realloc(cconx->icnum,totcons*sizint);
+    
+    cconx->chans[posn-1]=ocnum;
+
+    cconx->nconns[posn-1]=1;
+    
+    posn=totcons-1;
+    
+    // insert at posn
+    cconx->ikey[posn]=ikey;
+    cconx->imode[posn]=imode;
+    cconx->icnum[posn]=icnum;
+
+#ifdef DEBUG_PCONX
+  g_print("added another cconx from %d %d %d to %d %d %d\n",okey,omode,ocnum,ikey,imode,icnum);
+#endif
+
+    return;
+  }
+
+  // add new
+
+  totcons=cconx_get_numcons(cconx)+1;
+  cconx->nchans++;
+
+  cconx->nconns=(int *)g_realloc(cconx->chans,cconx->nchans*sizint);
+  cconx->nconns[cconx->nchans-1]=1;
+
+  cconx->chans=(int *)g_realloc(cconx->chans,cconx->nchans*sizint);
+  cconx->chans[cconx->nchans-1]=ocnum;
+
+  cconx->ikey=(int *)g_realloc(cconx->ikey,totcons*sizint);
+  cconx->ikey[totcons-1]=ikey;
+
+  cconx->imode=(int *)g_realloc(cconx->imode,totcons*sizint);
+  cconx->imode[totcons-1]=imode;
+
+  cconx->icnum=(int *)g_realloc(cconx->icnum,totcons*sizint);
+  cconx->icnum[totcons-1]=icnum;
+
+#ifdef DEBUG_PCONX
+  g_print("added new cconx from %d %d %d to %d %d %d\n",okey,omode,ocnum,ikey,imode,icnum);
+#endif
+
+}
+
+
+
+weed_plant_t *cconx_get_out_alpha(boolean use_filt, int ikey, int imode, int icnum) {
+  // walk all cconx and find one which has ikey/imode/icnum as destination
+  // then all we need do is convert the pixel_data
+
+  lives_cconnect_t *cconx=mainw->cconx;
+
+  weed_plant_t *inst=NULL,*filter=NULL;
+
+  int totcons,error;
+  register int i,j;
+
+  while (cconx!=NULL) {
+    if (!use_filt) {
+      if (mainw->is_rendering) {
+	inst=get_new_inst_for_keymode(cconx->okey,cconx->omode);
+      }
+      else {
+	inst=rte_keymode_get_instance(cconx->okey+1,cconx->omode);
+      }
+      if (inst==NULL) {
+	cconx=cconx->next;
+	continue;
+      }
+
+      filter=weed_instance_get_filter(inst,TRUE);
+    }
+    else {
+      filter=rte_keymode_get_filter(cconx->okey+1,cconx->omode);
+      if (filter==NULL) {
+	cconx=cconx->next;
+	continue;
+      }
+    }
+    if (!weed_plant_has_leaf(filter,"out_channel_templates")) {
+      cconx=cconx->next;
+      continue;
+    }
+    totcons=0;
+    j=0;
+    for (i=0;i<cconx->nchans;i++) {
+      totcons+=cconx->nconns[i];
+      for (;j<totcons;j++) {
+	if (cconx->ikey[j]==ikey && cconx->imode[j]==imode && cconx->icnum[j]==icnum) {
+	  weed_plant_t **outchans;
+	  weed_plant_t *channel=NULL;
+	  if (use_filt) {
+	    outchans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+	    if (cconx->chans[i]<weed_leaf_num_elements(filter,"out_channel_templates")) {
+	      channel=outchans[cconx->chans[i]];
+	    }
+	  }
+	  else {
+	    while (weed_plant_has_leaf(inst,"host_next_instance")) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	    outchans=weed_get_plantptr_array(inst,"out_channels",&error);
+	    if (cconx->chans[i]<weed_leaf_num_elements(inst,"out_channels")) {
+	      channel=outchans[cconx->chans[i]];
+	    }
+	  }
+	  weed_free(outchans);
+	  return channel;
+	}
+      }
+    }
+    cconx=cconx->next;
+  }
+
+  return NULL;
+}
+
+
+boolean cconx_convert_pixel_data(weed_plant_t *dchan, weed_plant_t *schan) {
+  // convert pixel_data by possibly converting the type (palette)
+
+  // return TRUE if we need to reinit the instance (because channel palette changed)
+
+  // we set boolean "host_orig_pdata" if we steal the schan pdata (so do not free....)
+
+  int error;
+  int iwidth,iheight,ipal,irow;
+  int owidth,oheight,opal,orow,oflags;
+  boolean pal_ok,needs_reinit=FALSE;
+
+  weed_plant_t *dtmpl=weed_get_plantptr_value(dchan,"template",&error);
+
+  uint8_t *spdata,*dpdata;
+
+  register int i;
+
+  ipal=weed_get_int_value(schan,"current_palette",&error);
+  if (!weed_palette_is_alpha_palette(ipal)) return FALSE;
+
+  iwidth=weed_get_int_value(schan,"width",&error);
+  iheight=weed_get_int_value(schan,"height",&error);
+  irow=weed_get_int_value(schan,"rowstrides",&error);
+
+  owidth=weed_get_int_value(dchan,"width",&error);
+  oheight=weed_get_int_value(dchan,"height",&error);
+  opal=weed_get_int_value(dchan,"current_palette",&error);
+  orow=weed_get_int_value(dchan,"rowstrides",&error);
+
+  spdata=(uint8_t *)weed_get_voidptr_value(schan,"pixel_data",&error);
+
+  if (ipal==opal&&iwidth==owidth&&iheight==oheight&&irow==orow) {
+    /// everything matches - we can just do a steal
+    weed_set_voidptr_value(dchan,"pixel_data",spdata);
+    /// caller - do not free in dchan
+    weed_set_boolean_value(dchan,"host_orig_pdata",WEED_TRUE);
+    return FALSE;
+  }
+
+  /// check first if we can set the in-channel palette to match 
+  if (ipal==opal) pal_ok=TRUE;
+  else {
+    /// see if dest chan supports the source chan palette
+    int num_palettes=weed_leaf_num_elements(dtmpl,"palette_list");
+    int *palettes=weed_get_int_array(dtmpl,"palette_list",&error);
+    if (check_weed_palette_list(palettes,num_palettes,ipal)==ipal) pal_ok=TRUE; ///< yes
+    else pal_ok=FALSE; ///<no
+    oflags=weed_get_int_value(dtmpl,"flags",&error);
+    if (ipal!=opal&&(oflags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE)) needs_reinit=TRUE;
+    weed_free(palettes);
+  }
+
+  dpdata=(uint8_t *)weed_get_voidptr_value(dchan,"pixel_data",&error);
+
+  if (dpdata!=NULL) {
+    g_free(dpdata);
+    dpdata=NULL;
+  }
+
+  weed_set_int_value(dchan,"width",iwidth);
+  weed_set_int_value(dchan,"height",iheight);
+  weed_set_int_value(dchan,"current_palette",ipal);
+
+  if (pal_ok) {
+    weed_set_voidptr_value(dchan,"pixel_data",(void *)spdata);
+    weed_set_int_value(dchan,"rowstrides",irow);
+    
+    /// caller - do not free in dchan
+    weed_set_boolean_value(dchan,"host_orig_pdata",WEED_TRUE);
+    return FALSE;
+  }
+  create_empty_pixel_data(dchan,FALSE,TRUE);
+  dpdata=(uint8_t *)weed_get_voidptr_value(dchan,"pixel_data",&error);
+  
+  orow=weed_get_int_value(dchan,"rowstrides",&error);
+
+  if (irow==orow) {
+    memcpy((void *)dpdata,(void *)spdata,irow*iheight);
+  }
+  else {
+    int ipwidth = iwidth * weed_palette_get_bits_per_macropixel(ipal) / 8;
+    for (i=0;i<iheight;i++) {
+      memcpy((void *)dpdata,(void *)spdata,ipwidth);
+      spdata+=irow;
+      dpdata+=orow;
+    }
+  }
+
+  convert_layer_palette(dchan,opal,0);
+
+  if (needs_reinit) return TRUE;
+
+  return FALSE;
+}
+
+
+
+
+boolean cconx_chain_data(int key, int mode) {
+  // ret TRUE if we should reinit inst (because of palette change)
+
+  weed_plant_t *ichan,*ochan;
+  weed_plant_t *inst=NULL;
+
+  boolean needs_reinit=FALSE;
+
+  register int i=0;
+
+  if (key>-1) {
+    if (mainw->is_rendering) {
+      if ((inst=get_new_inst_for_keymode(key,mode))==NULL) {
+	return FALSE; ///< dest effect is not found
+      }
+    }
+    else {
+      if ((inst=rte_keymode_get_instance(key+1,mode))==NULL) {
+	return FALSE; ///< dest effect is not enabled
+      }
+    }
+  }
+  else if (key==-2) {
+    if (mainw->vpp==NULL||mainw->vpp->num_alpha_chans==0) return FALSE;
+  }
+
+  while ((ichan=(key==-2?(weed_plant_t *)pp_get_chan(mainw->vpp->play_params,i):get_enabled_channel(inst,i,TRUE)))!=NULL) {
+    if ((ochan=cconx_get_out_alpha(FALSE,key,mode,i++))!=NULL) {
+      if (cconx_convert_pixel_data(ichan,ochan)) needs_reinit=TRUE;
+    }
+  }
+  return needs_reinit;
+}
+ 
+
+
+
+boolean cconx_chain_data_internal(weed_plant_t *ichan) {
+  // special version for compound fx internal connections
+  boolean needs_reinit=FALSE;
+
+  if (weed_plant_has_leaf(ichan,"host_internal_connection")) {
+    int error;
+    weed_plant_t *ochan=weed_get_plantptr_value(ichan,"host_internal_connection",&error);
+    if (cconx_convert_pixel_data(ichan,ochan)) needs_reinit=TRUE;
+  }
+  return needs_reinit;
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// channel/param connection window
+
+// still TODO 
+
+// low priority:
+
+// add a new nb page, limit to one key/mode per page
+
+// show values w. nb pages
+
+// add expanders
+
+static lives_pconnect_t *pconx;
+static lives_cconnect_t *cconx;
+
+static GtkWidget *acbutton,*apbutton,*disconbutton;
+
+static void do_chan_connected_error(lives_conx_w *);
+static void do_param_connected_error(lives_conx_w *);
+static void do_param_incompatible_error(lives_conx_w *);
+
+
+enum {
+  KEY_COLUMN,
+  NAME_COLUMN,
+  KEYVAL_COLUMN,
+  MODEVAL_COLUMN,
+  NUM_COLUMNS
+};
+
+
+
+static void disconbutton_clicked(GtkButton *button, gpointer user_data) {
+  // disconnect all channels/params
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  register int i;
+
+  for (i=0;i<conxwp->num_alpha;i++) {
+    gtk_combo_box_set_active (LIVES_COMBO(conxwp->cfxcombo[i]),0);
+  }
+
+  for (i=0;i<conxwp->num_params;i++) {
+    gtk_combo_box_set_active (LIVES_COMBO(conxwp->pfxcombo[i]),0);
+  }
+
+}
+
+
+static void apbutton_clicked(GtkButton *button, gpointer user_data) {
+  // autoconnect each param with a compatible one in the target
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  GtkWidget *combo=(GtkWidget *)conxwp->pfxcombo[0];
+
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreePath *tpath;
+
+  weed_plant_t **iparams,**oparams;
+  weed_plant_t *filter,*param,*oparam;
+
+  int fidx,key,mode;
+  int niparams;
+  int error;
+
+  register int i,j=0,k=0;
+
+  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+  if (fidx==-1) return;
+
+  tpath=gtk_tree_model_get_path(model,&iter);
+  gtk_tree_model_get_iter(model,&iter,tpath);
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+  oparams=weed_get_plantptr_array(rte_keymode_get_filter(conxwp->okey+1,conxwp->omode),"out_parameter_templates",&error);
+
+  // set all pcombo with params
+  for (i=0;i<niparams;i++) {
+
+    param=iparams[j++];
+
+    if (weed_plant_has_leaf(param,"host_internal_connection")) {
+      i--;
+      continue;
+    }
+
+    if (pconx_get_out_param(TRUE,key,mode,j-1,NULL)!=NULL) continue;
+
+    oparam=oparams[k];
+
+    if (!params_compatible(oparam,param)) continue;
+ 
+    if (k>0) {
+      model=gtk_combo_box_get_model(GTK_COMBO_BOX(conxwp->pfxcombo[k]));
+      gtk_tree_model_get_iter(model,&iter,tpath);
+      gtk_combo_box_set_active_iter(LIVES_COMBO(conxwp->pfxcombo[k]),&iter);
+      lives_widget_context_update();
+    }
+    gtk_combo_box_set_active(LIVES_COMBO(conxwp->pcombo[k++]),i);
+
+    if (k>=conxwp->num_params) break;
+  }
+
+  // TODO - set others to blank ??
+
+
+  gtk_tree_path_free(tpath);
+
+  weed_free(iparams);
+  weed_free(oparams);
+
+}
+
+
+static void acbutton_clicked(GtkButton *button, gpointer user_data) {
+  // autoconnect each channel with a compatible one in the target
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  GtkWidget *combo=(GtkWidget *)conxwp->cfxcombo[0];
+
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreePath *tpath;
+
+  weed_plant_t **ichans;
+  weed_plant_t *filter,*chan;
+
+  int fidx,key,mode;
+  int nichans;
+  int error;
+
+  register int i,j=0,k=0;
+
+  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+
+  if (fidx==-1) return;
+
+  tpath=gtk_tree_model_get_path(model,&iter);
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+  nichans=weed_leaf_num_elements(filter,"in_channel_templates");
+
+  // set all ccombo with chans
+  for (i=0;i<nichans;i++) {
+
+    chan=ichans[j++];
+
+    if (!has_alpha_palette(chan)) {
+      i--;
+      continue;
+    }
+
+    if (cconx_get_out_alpha(TRUE,key,mode,j-1)!=NULL) continue;
+
+    if (k>0) {
+      model=gtk_combo_box_get_model(GTK_COMBO_BOX(conxwp->cfxcombo[k]));
+      gtk_tree_model_get_iter(model,&iter,tpath);
+      gtk_combo_box_set_active_iter(LIVES_COMBO(conxwp->cfxcombo[k]),&iter);
+      lives_widget_context_update();
+    }
+    gtk_combo_box_set_active(LIVES_COMBO(conxwp->ccombo[k++]),i);
+    if (k>=conxwp->num_alpha) break;
+  }
+
+  // TODO - set others to blank
+
+
+  gtk_tree_path_free(tpath);
+
+  weed_free(ichans);
+}
+
+
+
+static void dfxc_changed(GtkWidget *combo, gpointer user_data) {
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+
+  weed_plant_t **ichans;
+  weed_plant_t *filter,*chan;
+
+  GList *clist=NULL;
+
+  gchar *channame;
+
+  int fidx,key,mode;
+  int nichans;
+  int error;
+  int ours=-1;
+
+  register int i,j=0;
+
+  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) return;
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+  for (i=0;i<conxwp->num_alpha;i++) {
+    if (conxwp->cfxcombo[i]==combo) {
+      ours=i;
+      break;
+    }
+  }
+
+  if (fidx==-1) {
+    gtk_combo_box_set_active (LIVES_COMBO(combo),0);
+    lives_combo_populate(LIVES_COMBO(conxwp->ccombo[ours]),NULL);
+    lives_combo_set_active_string (LIVES_COMBO(conxwp->ccombo[ours]),"");
+    if (ours==0) gtk_widget_set_sensitive(acbutton,FALSE);
+    return;
+  }
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+  nichans=weed_leaf_num_elements(filter,"in_channel_templates");
+
+  // populate all ccombo with channels
+  for (i=0;i<nichans;i++) {
+    chan=ichans[j++];
+
+    if (!has_alpha_palette(chan)) continue;
+
+    channame=weed_get_string_value(chan,"name",&error);
+    clist=g_list_append(clist,channame);
+  }
+
+  weed_free(ichans);
+
+  lives_combo_populate(LIVES_COMBO(conxwp->ccombo[ours]),clist);
+  lives_combo_set_active_string (LIVES_COMBO(conxwp->ccombo[ours]),"");
+  
+  if (ours==0) gtk_widget_set_sensitive(acbutton,TRUE);
+
+  g_list_free_strings(clist);
+  g_list_free(clist);
+
+
+}
+
+
+
+static void dfxp_changed(GtkWidget *combo, gpointer user_data) {
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+
+  weed_plant_t **iparams;
+  weed_plant_t *filter,*param;
+
+  GList *plist=NULL;
+
+  gchar *paramname;
+
+  gchar *ptype,*range;
+  gchar *array_type,*text;
+
+  int defelems,pflags,stype;
+
+  int fidx,key,mode;
+  int niparams;
+  int error;
+  int ours=-1;
+
+  register int i,j=0;
+
+  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),&iter)) {
+    return;
+  }
+
+  for (i=0;i<conxwp->num_params;i++) {
+    if (conxwp->pfxcombo[i]==combo) {
+      ours=i;
+      break;
+    }
+  }
+
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
+
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+  if (fidx==-1) {
+    GtkWidget *acheck=conxwp->acheck[ours];
+    g_signal_handler_block(acheck,conxwp->acheck_func[ours]);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),FALSE);
+    gtk_widget_set_sensitive(acheck,FALSE);
+    g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
+
+    gtk_combo_box_set_active (LIVES_COMBO(combo),0);
+
+    lives_combo_populate(LIVES_COMBO(conxwp->pcombo[ours]),NULL);
+    lives_combo_set_active_string (LIVES_COMBO(conxwp->pcombo[ours]),"");
+
+    if (ours==0) gtk_widget_set_sensitive(apbutton,FALSE);
+    return;
+  }
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+  // populate all pcombo with params
+  for (i=0;i<niparams;i++) {
+    param=iparams[j++];
+
+    if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
+
+    paramname=weed_get_string_value(param,"name",&error);
+
+    ptype=weed_seed_type_to_text((stype=weed_leaf_seed_type(param,"default")));
+
+    pflags=weed_get_int_value(param,"flags",&error);
+
+    if (pflags&WEED_PARAMETER_VARIABLE_ELEMENTS) array_type=g_strdup("[]");
+    else if ((defelems=weed_leaf_num_elements(param,"default"))>1) array_type=g_strdup_printf("[%d]",defelems);
+    else array_type=g_strdup("");
+    
+    if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")) {
+      if (stype==WEED_SEED_INT) {
+	range=g_strdup_printf("Range: %d to %d",weed_get_int_value(param,"min",&error),weed_get_int_value(param,"max",&error));
+      }
+      else if (stype==WEED_SEED_DOUBLE) {
+	range=g_strdup_printf("Range: %f to %f",weed_get_double_value(param,"min",&error),weed_get_double_value(param,"max",&error));
+      }
+      else range=g_strdup("");
+    }
+    else range=g_strdup("");
+
+    text=g_strdup_printf("%s (%s%s) %s",paramname,ptype,array_type,range);
+    
+    plist=g_list_append(plist,text);
+
+    weed_free(paramname); g_free(ptype); g_free(array_type); g_free(range);
+
+  }
+
+  weed_free(iparams);
+
+  lives_combo_populate(LIVES_COMBO(conxwp->pcombo[ours]),plist);
+  lives_combo_set_active_string (LIVES_COMBO(conxwp->pcombo[ours]),"");
+
+  if (ours==0) gtk_widget_set_sensitive(apbutton,TRUE);
+
+  g_list_free_strings(plist);
+  g_list_free(plist);
+
+
+}
+
+
+
+static void dpp_changed(GtkWidget *combo, gpointer user_data) {
+  // receiver param was set
+
+  // 1) check if compatible
+
+  // 2) maybe enable autoscale
+
+  // 3) set text to just param name
+
+
+ 
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  weed_plant_t **iparams,**oparams;
+
+  weed_plant_t *param=NULL,*oparam;
+
+  weed_plant_t *filter=rte_keymode_get_filter(conxwp->okey+1,conxwp->omode);
+
+  GtkWidget *acheck;
+  GtkWidget *fxcombo;
+
+  GtkTreeModel *model;
+
+  GtkTreeIter iter;
+
+  gchar *paramname;
+
+  int niparams;
+
+  int fidx,key,mode,ours=-1,error;
+  gint idx=gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+
+  boolean hasone=FALSE;
+
+  register int i,j=0;
+
+  for (i=0;i<conxwp->num_params;i++) {
+    if (conxwp->pcombo[i]==combo) {
+      ours=i;
+      break;
+    }
+  }
+
+
+  if (idx==-1) {
+    for (i=0;i<conxwp->num_alpha;i++) if (gtk_combo_box_get_active(GTK_COMBO_BOX(conxwp->ccombo[i]))>-1) {
+	hasone=TRUE;
+	break;
+      }
+    if (!hasone) for (i=0;i<conxwp->num_params;i++) if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i]),"idx"))>-1) {
+	hasone=TRUE;
+	break;
+      }
+
+    if (!hasone) gtk_widget_set_sensitive(disconbutton,FALSE);
+
+    if (conxwp->ikeys[conxwp->num_alpha+ours]!=0) {
+      pconx_delete(conxwp->okey,conxwp->omode,ours,
+		   conxwp->ikeys[conxwp->num_alpha+ours]-1,
+		   conxwp->imodes[conxwp->num_alpha+ours],
+		   conxwp->idx[conxwp->num_alpha+ours]);
+
+    }
+    conxwp->ikeys[conxwp->num_alpha+ours]=0;
+    conxwp->imodes[conxwp->num_alpha+ours]=0;
+    conxwp->idx[conxwp->num_alpha+ours]=0;
+
+    g_object_set_data(G_OBJECT(combo),"idx",GINT_TO_POINTER(idx));
+
+    return;
+  }
+
+
+
+  fxcombo=conxwp->pfxcombo[ours];
+
+  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(fxcombo),&iter)) return;
+
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(fxcombo));
+
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+  oparams=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+  oparam=oparams[ours];
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+  for (i=0;i<niparams;i++) {
+    param=iparams[i];
+    if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
+    if (j==idx) break;
+    j++;
+  }
+
+  weed_free(iparams);
+  weed_free(oparams);
+
+  j=i;
+
+
+  if (!params_compatible(oparam,param)) {
+    do_param_incompatible_error(conxwp);
+    lives_combo_set_active_string (LIVES_COMBO(combo),"");
+    return;
+
+  }
+
+  if (pconx_get_out_param(TRUE,key-1,mode,j,NULL)!=NULL) {
+    // dest param already has a connection
+    do_param_connected_error(conxwp);
+    lives_combo_set_active_string (LIVES_COMBO(combo),"");
+    return;
+  }
+
+  g_object_set_data(G_OBJECT(combo),"idx",GINT_TO_POINTER(idx));
+
+  acheck=conxwp->acheck[ours];
+
+  g_signal_handler_block(acheck,conxwp->acheck_func[ours]);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),FALSE);
+  g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
+
+  if (weed_plant_has_leaf(param,"min")&&weed_plant_has_leaf(param,"max")) {
+    boolean hasrange=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(acheck),"available"));
+    if (hasrange) {
+      gtk_widget_set_sensitive(acheck,TRUE);
+      if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(conxwp->allcheckc))) {
+	g_signal_handler_block(acheck,conxwp->acheck_func[ours]);
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),TRUE);
+	g_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
+      }
+    }
+  }
+
+  paramname=weed_get_string_value(param,"name",&error);
+
+  g_signal_handler_block(combo,conxwp->dpp_func[ours]);
+  lives_combo_set_active_string (LIVES_COMBO(combo),paramname);
+  g_signal_handler_unblock(combo,conxwp->dpp_func[ours]);
+
+  weed_free(paramname);
+
+  if (conxwp->ikeys[conxwp->num_alpha+ours]!=0) pconx_delete(conxwp->okey,conxwp->omode,ours,
+							     conxwp->ikeys[conxwp->num_alpha+ours]-1,
+							     conxwp->imodes[conxwp->num_alpha+ours],
+							     conxwp->idx[conxwp->num_alpha+ours]);
+
+  pconx_add_connection(conxwp->okey,conxwp->omode,ours,key-1,mode,j,lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(acheck)));
+
+  conxwp->ikeys[conxwp->num_alpha+ours]=key;
+  conxwp->imodes[conxwp->num_alpha+ours]=mode;
+  conxwp->idx[conxwp->num_alpha+ours]=j;
+
+  gtk_widget_set_sensitive(disconbutton,TRUE);
+
+}
+
+
+static void dpc_changed(GtkWidget *combo, gpointer user_data) {
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  weed_plant_t **ichans,**ochans;
+
+  weed_plant_t *filter;
+  weed_plant_t *chan;
+
+  GtkTreeModel *model;
+
+  GtkTreeIter iter;
+
+  GtkWidget *fxcombo;
+
+  boolean hasone=FALSE;
+
+  int nichans,nochans;
+
+  int key,mode,fidx,ours=-1,error;
+
+  gint idx=gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+
+  register int i,j=0;
+
+  for (i=0;i<conxwp->num_alpha;i++) {
+    if (conxwp->ccombo[i]==combo) {
+      ours=i;
+      break;
+    }
+  }
+
+  if (idx==-1) {
+
+    for (i=0;i<conxwp->num_alpha;i++) if (gtk_combo_box_get_active(GTK_COMBO_BOX(conxwp->ccombo[i]))>-1) {
+	hasone=TRUE;
+	break;
+      }
+    if (!hasone) for (i=0;i<conxwp->num_params;i++) if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i]),"idx"))>-1) {
+	hasone=TRUE;
+	break;
+      }
+
+    if (!hasone) gtk_widget_set_sensitive(disconbutton,FALSE);
+
+    if (conxwp->ikeys[ours]!=0) cconx_delete(conxwp->okey,conxwp->omode,ours,
+					     conxwp->ikeys[ours]-1,
+					     conxwp->imodes[ours],
+					     conxwp->idx[ours]);
+
+    conxwp->ikeys[ours]=0;
+    conxwp->imodes[ours]=0;
+    conxwp->idx[ours]=0;
+
+    return;
+  }
+
+
+  fxcombo=conxwp->cfxcombo[ours];
+
+  if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(fxcombo),&iter)) return;
+
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(fxcombo));
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+  nichans=weed_leaf_num_elements(filter,"in_channel_templates");
+
+  for (i=0;i<nichans;i++) {
+    chan=ichans[i];
+    if (!has_alpha_palette(chan)) continue;
+    if (j==idx) break;
+    j++;
+  }
+
+  weed_free(ichans);
+
+  j=i;
+
+  if (cconx_get_out_alpha(TRUE,key-1,mode,j)!=NULL) {
+    // dest chan already has a connection
+    do_chan_connected_error(conxwp);
+    lives_combo_set_active_string (LIVES_COMBO(combo),"");
+    return;
+  }
+
+  if (conxwp->ikeys[ours]!=0) cconx_delete(conxwp->okey,conxwp->omode,ours,
+					   conxwp->ikeys[ours]-1,
+					   conxwp->imodes[ours],
+					   conxwp->idx[ours]);
+
+  filter=rte_keymode_get_filter(conxwp->okey+1,conxwp->omode);
+  ochans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+  nochans=weed_leaf_num_elements(filter,"out_channel_templates");
+
+  for (i=0;i<nochans;i++) {
+    chan=ochans[i];
+    if (!has_alpha_palette(chan)) {
+      ours++;
+      continue;
+    }
+    if (i==ours) break;
+  }
+
+  weed_free(ochans);
+
+
+  cconx_add_connection(conxwp->okey,conxwp->omode,ours,key-1,mode,j);
+
+  conxwp->ikeys[ours]=key;
+  conxwp->imodes[ours]=mode;
+  conxwp->idx[ours]=j;
+
+  gtk_widget_set_sensitive(disconbutton,TRUE);
+
+}
+
+
+
+static void on_allcheck_toggled(GtkToggleButton *button, gpointer user_data) {
+ lives_conx_w *conxwp=(lives_conx_w *)user_data;
+ boolean on=lives_toggle_button_get_active(button);
+
+ register int i;
+
+ for (i=0;i<conxwp->num_params;i++) {
+   if (lives_widget_is_sensitive(conxwp->acheck[i])) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(conxwp->acheck[i]),on);
+ }
+
+}
+
+
+static void on_acheck_toggled(GtkToggleButton *acheck, gpointer user_data) {
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  weed_plant_t **iparams;
+  weed_plant_t *param,*filter;
+
+  GtkTreeModel *model;
+
+  GtkTreeIter iter;
+
+  GtkWidget *fxcombo;
+
+  boolean on=lives_toggle_button_get_active(acheck);
+
+  int ours=-1,fidx,key,mode,error,niparams;
+  gint idx;
+
+  register int i,j=0;
+
+  for (i=0;i<conxwp->num_params;i++) {
+    if (conxwp->acheck[i]==(GtkWidget *)acheck) {
+      ours=i;
+      break;
+    }
+  }
+
+  idx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[ours]),"idx"));
+
+  fxcombo=conxwp->pfxcombo[ours];
+
+  model=gtk_combo_box_get_model(GTK_COMBO_BOX(fxcombo));
+  gtk_combo_box_get_active_iter(GTK_COMBO_BOX(fxcombo),&iter);
+
+  gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+
+  if (key==0) return;
+
+  fidx=rte_keymode_get_filter_idx(key,mode);
+
+
+  // find the receiving filter/instance
+  filter=get_weed_filter(fidx);
+
+  iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+  for (i=0;i<niparams;i++) {
+    param=iparams[j];
+    if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
+    if (j==idx) break;
+    j++;
+  }
+
+  j=i;
+
+  weed_free(iparams);
+
+  if (conxwp->ikeys[conxwp->num_alpha+ours]!=0) pconx_delete(conxwp->okey,conxwp->omode,ours,key-1,mode,j);
+  pconx_add_connection(conxwp->okey,conxwp->omode,ours,key-1,mode,j,on);
+
+  conxwp->ikeys[conxwp->num_alpha+ours]=key;
+  conxwp->imodes[conxwp->num_alpha+ours]=mode;
+  conxwp->idx[conxwp->num_alpha+ours]=j;
+
+}
+
+
+static LiVESTreeModel *inparam_fx_model (boolean is_chans) {
+  GtkTreeStore *tstore;
+
+  GtkTreeIter iter1,iter2;
+
+  weed_plant_t *filter;
+
+  gchar *fxname,*keystr,*text;
+
+  boolean key_added;
+
+  int idx;
+
+  int error;
+
+  int nmodes=rte_getmodespk();
+
+  register int i,j;
+
+  tstore=gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+
+  gtk_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
+  gtk_tree_store_set(tstore,&iter1,
+		     KEY_COLUMN,mainw->string_constants[LIVES_STRING_CONSTANT_NONE],
+		     NAME_COLUMN,mainw->string_constants[LIVES_STRING_CONSTANT_NONE],
+		     KEYVAL_COLUMN,0,
+		     MODEVAL_COLUMN,0,
+		     -1);
+
+
+  // go through all keys
+  for (i=1;i<=FX_KEYS_MAX_VIRTUAL;i++) {
+    key_added=FALSE;
+    keystr=g_strdup_printf(_("Key slot %d"),i);
+
+    for (j=0;j<nmodes;j++) {
+
+      if ((idx=rte_keymode_get_filter_idx(i,j))==-1) continue;
+
+      filter=get_weed_filter(idx);
+
+      if (!is_chans) {
+	if (num_in_params(filter,FALSE,TRUE)==0) continue;
+      }
+      else 
+	if (num_alpha_channels(filter,FALSE)==0) continue;
+	
+      fxname=weed_get_string_value(filter,"name",&error);
+      text=g_strdup_printf("(%d,%d) %s",i,j+1,fxname);
+
+      if (!key_added) {
+	// add key
+	gtk_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
+	gtk_tree_store_set(tstore,&iter1,KEY_COLUMN,keystr,NAME_COLUMN,keystr,KEYVAL_COLUMN,0,MODEVAL_COLUMN,0,-1);
+	key_added=TRUE;
+      }
+      gtk_tree_store_append (tstore, &iter2, &iter1);
+      gtk_tree_store_set(tstore,&iter2,KEY_COLUMN,text,NAME_COLUMN,text,KEYVAL_COLUMN,i,MODEVAL_COLUMN,j,-1);
+
+      weed_free(fxname); weed_free(text);
+    }
+
+    g_free(keystr);
+
+  }
+
+  return (LiVESTreeModel *)tstore;
+}
+
+
+
+
+
+static GtkWidget *conx_scroll_new(weed_plant_t *filter, lives_conx_w *conxwp) {
+  LiVESTreeModel *model;
+
+  GtkWidget *label;
+  GtkWidget *top_vbox;
+  GtkWidget *hbox,*hbox2;
+  GtkWidget *scrolledwindow;
+
+  GtkWidget *fx_entry;
+
+  weed_plant_t *chan,*param;
+
+  gchar *channame,*pname;
+  gchar *lctext;
+  gchar *ptype,*range;
+  gchar *array_type,*text;
+
+  boolean hasrange;
+
+  int defelems,pflags,stype;
+
+  int error;
+
+  register int i,j=0,x=0;
+
+  conxwp->cfxcombo=conxwp->ccombo=conxwp->pcombo=conxwp->pfxcombo=conxwp->acheck=NULL;
+  conxwp->dpp_func=conxwp->dpc_func=conxwp->acheck_func=NULL;
+
+  conxwp->ikeys=(int *)g_malloc((conxwp->num_params+conxwp->num_alpha)*sizint);
+  conxwp->imodes=(int *)g_malloc((conxwp->num_params+conxwp->num_alpha)*sizint);
+  conxwp->idx=(int *)g_malloc((conxwp->num_params+conxwp->num_alpha)*sizint);
+
+  for (i=0;i<conxwp->num_params+conxwp->num_alpha;i++) conxwp->ikeys[i]=conxwp->imodes[i]=conxwp->idx[i]=0;
+
+  lctext=g_strdup(_("Connected to -->"));
+
+  top_vbox=lives_vbox_new (FALSE, 0);
+
+  scrolledwindow = lives_standard_scrolled_window_new (-1,-1,top_vbox);
+
+  if (conxwp->num_alpha>0) {
+    weed_plant_t **ochans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+
+    conxwp->dpc_func=(gulong *)g_malloc(conxwp->num_alpha*sizeof(gulong));
+
+    conxwp->cfxcombo=(GtkWidget **)g_malloc(conxwp->num_alpha*sizeof(GtkWidget *));
+
+    conxwp->ccombo=(GtkWidget **)g_malloc(conxwp->num_alpha*sizeof(GtkWidget *));
+
+    label=lives_standard_label_new(_("Alpha Channel Connections"));
+    gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+
+    for (i=0;i<conxwp->num_alpha;i++) {
+      chan=ochans[j++];
+
+      if (!has_alpha_palette(chan)) continue;
+
+      hbox=lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
+
+      channame=weed_get_string_value(chan,"name",&error);
+      label=lives_standard_label_new(channame);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+      weed_free(channame);
+
+      label=lives_standard_label_new(lctext);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+
+
+      // create combo entry model
+      model=inparam_fx_model(TRUE);
+
+      conxwp->cfxcombo[x] = lives_combo_new_with_model (model);
+
+      lives_combo_set_entry_text_column(LIVES_COMBO(conxwp->cfxcombo[x]),NAME_COLUMN);
+
+      gtk_box_pack_start (GTK_BOX (hbox), conxwp->cfxcombo[x], FALSE, FALSE, widget_opts.packing_width);
+
+      fx_entry = lives_combo_get_entry(LIVES_COMBO(conxwp->cfxcombo[x]));
+      gtk_entry_set_text (GTK_ENTRY (fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+      lives_entry_set_editable (LIVES_ENTRY (fx_entry), FALSE);
+
+
+      conxwp->ccombo[x]=lives_standard_combo_new("",FALSE,NULL,LIVES_BOX(hbox),NULL);
+
+      g_signal_connect(GTK_OBJECT (conxwp->cfxcombo[x]), "changed",
+		       G_CALLBACK (dfxc_changed),(gpointer)conxwp);
+      
+
+      conxwp->dpc_func[x]=g_signal_connect(GTK_OBJECT (conxwp->ccombo[x]), "changed",
+					G_CALLBACK (dpc_changed),(gpointer)conxwp);
+      
+
+      x++;
+    }
+
+    weed_free(ochans);
+
+  }
+
+  if (conxwp->num_alpha>0&&conxwp->num_params>0) {
+    add_hsep_to_box (LIVES_BOX (top_vbox));
+  }
+
+
+  if (conxwp->num_params>0) {
+    weed_plant_t **oparams=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+
+    conxwp->pfxcombo=(GtkWidget **)g_malloc(conxwp->num_params*sizeof(GtkWidget *));
+    conxwp->pcombo=(GtkWidget **)g_malloc(conxwp->num_params*sizeof(GtkWidget *));
+    conxwp->dpp_func=(gulong *)g_malloc(conxwp->num_params*sizeof(gulong));
+    conxwp->acheck_func=(gulong *)g_malloc(conxwp->num_params*sizeof(gulong));
+
+    conxwp->acheck=(GtkWidget **)g_malloc(conxwp->num_params*sizeof(GtkWidget *));
+
+    x=0;
+
+    label=lives_standard_label_new(_("Parameter Data Connections"));
+    gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+
+    hbox=lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox2=lives_hbox_new (FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
+    conxwp->allcheckc=lives_standard_check_button_new(_("Autoscale All"),FALSE,LIVES_BOX(hbox2),NULL);
+
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(conxwp->allcheckc),TRUE);
+
+    g_signal_connect_after (GTK_OBJECT (conxwp->allcheckc), "toggled",
+			    G_CALLBACK (on_allcheck_toggled),
+			    (gpointer)conxwp);
+
+    for (i=0;i<conxwp->num_params;i++) {
+      hbox=lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+      param=oparams[i];
+
+      pname=weed_get_string_value(param,"name",&error);
+
+      ptype=weed_seed_type_to_text((stype=weed_leaf_seed_type(param,"default")));
+
+      pflags=weed_get_int_value(param,"flags",&error);
+
+      if (pflags&WEED_PARAMETER_VARIABLE_ELEMENTS) array_type=g_strdup("[]");
+      else if ((defelems=weed_leaf_num_elements(param,"default"))>1) array_type=g_strdup_printf("[%d]",defelems);
+      else array_type=g_strdup("");
+
+      hasrange=FALSE;
+
+      if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")) {
+	if (stype==WEED_SEED_INT) {
+	  range=g_strdup_printf("Range: %d to %d",weed_get_int_value(param,"min",&error),weed_get_int_value(param,"max",&error));
+	  hasrange=TRUE;
+	}
+	else if (stype==WEED_SEED_DOUBLE) {
+	  range=g_strdup_printf("Range: %f to %f",weed_get_double_value(param,"min",&error),weed_get_double_value(param,"max",&error));
+	  hasrange=TRUE;
+	}
+	else range=g_strdup("");
+      }
+      else range=g_strdup("");
+      
+      text=g_strdup_printf("%s (%s%s) %s",pname,ptype,array_type,range);
+
+      label=lives_standard_label_new(text);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+      weed_free(pname); g_free(ptype); g_free(array_type); g_free(range); g_free(text);
+
+      label=lives_standard_label_new(lctext);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+
+      // create combo entry model
+      model=inparam_fx_model(FALSE);
+
+      conxwp->pfxcombo[x] = lives_combo_new_with_model (model);
+
+      lives_combo_set_entry_text_column(LIVES_COMBO(conxwp->pfxcombo[x]),NAME_COLUMN);
+
+      gtk_box_pack_start (GTK_BOX (hbox), conxwp->pfxcombo[x], FALSE, FALSE, widget_opts.packing_width);
+
+      fx_entry = lives_combo_get_entry(LIVES_COMBO(conxwp->pfxcombo[x]));
+      gtk_entry_set_text (GTK_ENTRY (fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+      lives_entry_set_editable (LIVES_ENTRY (fx_entry), FALSE);
+
+
+      conxwp->pcombo[x]=lives_standard_combo_new("",FALSE,NULL,LIVES_BOX(hbox),NULL);
+      g_object_set_data(G_OBJECT(conxwp->pcombo[x]),"idx",GINT_TO_POINTER(-1));
+
+      add_fill_to_box(GTK_BOX(hbox));
+
+      conxwp->acheck[x]=lives_standard_check_button_new(_("Autoscale"),FALSE,LIVES_BOX(hbox),NULL);
+
+      gtk_widget_set_sensitive(conxwp->acheck[x],FALSE);
+      g_object_set_data(G_OBJECT(conxwp->acheck[x]),"available",GINT_TO_POINTER(hasrange));
+
+      conxwp->acheck_func[x]=g_signal_connect_after (GTK_OBJECT (conxwp->acheck[x]), "toggled",
+						     G_CALLBACK (on_acheck_toggled),
+						     (gpointer)conxwp);
+
+      g_signal_connect(GTK_OBJECT (conxwp->pfxcombo[x]), "changed",
+		       G_CALLBACK (dfxp_changed),(gpointer)conxwp);
+
+
+      conxwp->dpp_func[x]=g_signal_connect(GTK_OBJECT (conxwp->pcombo[x]), "changed",
+					   G_CALLBACK (dpp_changed),(gpointer)conxwp);
+      
+
+      x++;
+    }
+
+    weed_free(oparams);
+
+
+  }
+
+  g_free(lctext);
+
+  return scrolledwindow;
+}
+
+
+static void conxw_cancel_clicked(GtkWidget *button, gpointer user_data) {
+  lives_conx_w *conxwp=(lives_conx_w *)user_data;
+
+  if (conxwp->cfxcombo!=NULL) g_free(conxwp->cfxcombo);
+  if (conxwp->ccombo!=NULL) g_free(conxwp->ccombo);
+  if (conxwp->pfxcombo!=NULL) g_free(conxwp->pfxcombo);
+  if (conxwp->pcombo!=NULL) g_free(conxwp->pcombo);
+  if (conxwp->acheck!=NULL) g_free(conxwp->acheck);
+  if (conxwp->dpp_func!=NULL) g_free(conxwp->dpp_func);
+  if (conxwp->dpc_func!=NULL) g_free(conxwp->dpp_func);
+  if (conxwp->acheck_func!=NULL) g_free(conxwp->acheck_func);
+
+  g_free(conxwp->ikeys);
+  g_free(conxwp->imodes);
+  g_free(conxwp->idx);
+
+  pconx_delete_all();
+  cconx_delete_all();
+
+  if (button==NULL) return;
+
+  // restore old values
+  mainw->pconx=pconx;
+  mainw->cconx=cconx;
+
+ lives_general_button_clicked(LIVES_BUTTON(button),NULL);
+}
+
+
+
+static void conxw_ok_clicked(GtkWidget *button, gpointer user_data) {
+  lives_cconnect_t *cconx_bak=mainw->cconx;
+  lives_pconnect_t *pconx_bak=mainw->pconx;
+
+  mainw->pconx=pconx;
+  mainw->cconx=cconx;
+
+  conxw_cancel_clicked(NULL,user_data);
+
+  mainw->cconx=cconx_bak;
+  mainw->pconx=pconx_bak;
+
+  lives_general_button_clicked(LIVES_BUTTON(button),NULL);
+}
+
+
+static void set_to_keymode_vals(GtkComboBox *combo, int xkey, int xmode) {
+  GtkTreeIter iter,piter;
+  GtkTreeModel *model;
+
+  int key,mode;
+
+  model=gtk_combo_box_get_model(combo);
+  if (!gtk_tree_model_get_iter_first(model,&piter)) return;
+
+  do {
+    if (gtk_tree_model_iter_children(model,&iter,&piter)) {
+      do {
+	gtk_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+	if (key==xkey+1&&mode==xmode) goto iter_found;
+      } while (gtk_tree_model_iter_next(model,&iter));
+    }
+  } while (gtk_tree_model_iter_next(model,&piter));
+
+
+iter_found:
+  gtk_combo_box_set_active_iter(combo,&iter);
+
+}
+
+static int lastckey,lastcmode;
+static int lastpkey,lastpmode;
+
+static boolean show_existing(lives_conx_w *conxwp) {
+  lives_cconnect_t *cconx=cconx_find(conxwp->okey,conxwp->omode);
+  lives_pconnect_t *pconx=pconx_find(conxwp->okey,conxwp->omode);
+
+  GtkWidget *cfxcombo,*ccombo;
+  GtkWidget *pfxcombo,*pcombo;
+  GtkWidget *acheck;
+
+  weed_plant_t **ochans,**ichans;
+  weed_plant_t **iparams;
+
+  weed_plant_t *ofilter=rte_keymode_get_filter(conxwp->okey+1,conxwp->omode),*filter;
+
+  weed_plant_t *chan,*param;
+
+  int ikey,imode,icnum,error,nochans,ipnum,nichans,niparams;
+
+  int curckey=FX_KEYS_MAX+1,curcmode=0;
+  int curpkey=FX_KEYS_MAX+1,curpmode=0;
+
+  int posn=0,cidx,pidx;
+
+  register int i,j,k,l;
+
+  // ASSUME FOR NOW THAT EACH OPARAM/OCHAN is mapped to maybe multiple key/modes, but only a single param/chan witin that
+  // TODO - update gui with ---> expander to handle this
+
+
+  if (cconx==NULL) goto show_ex_params;
+
+  // find lowest key/mode which has not been done
+  for (i=0;i<cconx->nchans;i++) {
+    for (j=posn;j<posn+cconx->nconns[i];j++) {
+      ikey=cconx->ikey[j];
+      imode=cconx->imode[j];
+
+      if ((ikey<curckey||(ikey==curckey&&imode<curcmode)) && (ikey>lastckey||(ikey==lastckey&&imode>lastcmode))) {
+	curckey=ikey;
+	curcmode=imode;
+      }
+
+    }
+    posn+=cconx->nconns[i];
+  }
+
+
+  // now have curckey and curcmode - set fx and param combos
+  lastckey=curckey;
+  lastcmode=curcmode;
+  posn=0;
+
+  for (i=0;i<cconx->nchans;i++) {
+    cidx=cconx->chans[i];
+    for (j=posn;j<posn+cconx->nconns[i];j++) {
+      ikey=cconx->ikey[j];
+      imode=cconx->imode[j];
+
+      if (ikey==curckey&&imode==curcmode) {
+	      
+	// find the row
+	ochans=weed_get_plantptr_array(ofilter,"out_channel_templates",&error);
+	nochans=weed_leaf_num_elements(ofilter,"out_channel_templates");
+	      
+	l=0;
+	      
+	for (k=0;k<nochans;k++) {
+	  chan=ochans[k];
+	  if (!has_alpha_palette(chan)) continue;
+	  if (k==cidx) break;
+	  l++;
+	}
+	      
+	weed_free(ochans);
+
+	// row is l
+	cfxcombo=conxwp->cfxcombo[l];
+
+	// set it to the value which has ikey/imode
+	set_to_keymode_vals(GTK_COMBO_BOX(cfxcombo),ikey,imode);
+
+	// set channel
+	ccombo=conxwp->ccombo[l];
+	icnum=cconx->icnum[j];
+
+
+	filter=rte_keymode_get_filter(ikey+1,imode);
+	ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+	nichans=weed_leaf_num_elements(filter,"in_channel_templates");
+	
+	cidx=l;
+
+	l=0;
+	
+	for (k=0;k<nichans;k++) {
+	  chan=ichans[k];
+	  if (!has_alpha_palette(chan)) continue;
+	  if (k==icnum) break;
+	  l++;
+	}
+	      
+	weed_free(ichans);
+
+	g_signal_handler_block(ccombo,conxwp->dpc_func[cidx]);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(ccombo),l);
+	g_signal_handler_unblock(ccombo,conxwp->dpc_func[cidx]);
+	      
+	conxwp->ikeys[cidx]=ikey+1;
+	conxwp->imodes[cidx]=imode;
+	conxwp->idx[cidx]=icnum;
+
+	gtk_widget_set_sensitive(disconbutton,TRUE);
+	
+	break; // TODO ***
+      }
+      
+      
+    }
+    posn+=cconx->nconns[i];
+  }
+
+
+
+ show_ex_params:
+
+
+  if (pconx==NULL) goto show_ex_done;
+
+  // find lowest key/mode which has not been done
+  for (i=0;i<pconx->nparams;i++) {
+    for (j=posn;j<posn+pconx->nconns[i];j++) {
+      ikey=pconx->ikey[j];
+      imode=pconx->imode[j];
+
+      if ((ikey<curpkey||(ikey==curpkey&&imode<curpmode)) && (ikey>lastpkey||(ikey==lastpkey&&imode>lastpmode))) {
+	curpkey=ikey;
+	curpmode=imode;
+      }
+
+    }
+    posn+=pconx->nconns[i];
+  }
+
+
+  // now have curpkey and curpmode - set fx and param combos and autoscale
+  lastpkey=curpkey;
+  lastpmode=curpmode;
+  posn=0;
+
+  for (i=0;i<pconx->nparams;i++) {
+    pidx=pconx->params[i];
+    for (j=posn;j<posn+pconx->nconns[i];j++) {
+      ikey=pconx->ikey[j];
+      imode=pconx->imode[j];
+
+      if (ikey==curpkey&&imode==curpmode) {
+	      
+	l=pidx;
+
+	// row is l
+	pfxcombo=conxwp->pfxcombo[l];
+
+	// set it to the value which has ikey/imode
+	set_to_keymode_vals(GTK_COMBO_BOX(pfxcombo),ikey,imode);
+
+	// set channel
+	pcombo=conxwp->pcombo[l];
+	acheck=conxwp->acheck[l];
+
+	gtk_widget_set_sensitive(acheck,TRUE);
+
+	g_signal_handler_block(acheck,conxwp->acheck_func[l]);
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),pconx->autoscale[j]);
+	g_signal_handler_unblock(acheck,conxwp->acheck_func[l]);
+
+	ipnum=pconx->ipnum[j];
+
+	filter=rte_keymode_get_filter(ikey+1,imode);
+	iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+	niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+	
+	l=0;
+	
+	for (k=0;k<niparams;k++) {
+	  param=iparams[k];
+	  if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
+	  if (k==ipnum) break;
+	  l++;
+	}
+	      
+	weed_free(iparams);
+
+	g_signal_handler_block(pcombo,conxwp->dpp_func[pidx]);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(pcombo),l);
+	g_signal_handler_unblock(pcombo,conxwp->dpp_func[pidx]);
+
+	g_object_set_data(G_OBJECT(pcombo),"idx",GINT_TO_POINTER(l));
+	      
+	conxwp->ikeys[conxwp->num_alpha+pidx]=ikey+1;
+	conxwp->imodes[conxwp->num_alpha+pidx]=imode;
+	conxwp->idx[conxwp->num_alpha+pidx]=ipnum;
+
+	gtk_widget_set_sensitive(disconbutton,TRUE);
+	
+	break; // TODO ***
+      }
+      
+      
+    }
+    posn+=pconx->nconns[i];
+  }
+
+ show_ex_done:
+
+  return FALSE;
+}
+
+
+
+
+
+GtkWidget *make_datacon_window(int key, int mode) {
+  weed_plant_t *filter=rte_keymode_get_filter(key+1,mode);
+
+  static lives_conx_w conxw;
+
+  GtkWidget *cbox,*abox;
+  GtkWidget *scrolledwindow;
+
+  GtkWidget *cancelbutton;
+  GtkWidget *okbutton;
+
+  GtkAccelGroup *accel_group;
+
+  boolean needsanother=TRUE;
+
+  int scr_width,scr_height;
+
+  int winsize_h;
+  int winsize_v;
+
+  if (filter==NULL) return NULL;
+
+  acbutton=apbutton=NULL;
+
+  pconx=pconx_copy(mainw->pconx);
+  cconx=cconx_copy(mainw->cconx);
+
+  conxw.okey=key;
+  conxw.omode=mode;
+
+  conxw.num_alpha=num_alpha_channels(filter,TRUE);
+  conxw.num_params=weed_leaf_num_elements(filter,"out_parameter_templates");
+
+  conxw.ntabs=0;
+
+  if (prefs->gui_monitor==0) {
+    scr_width=mainw->scr_width;
+    scr_height=mainw->scr_height;
+  }
+  else {
+    scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
+    scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
+  }
+
+  winsize_h=scr_width-200;
+  winsize_v=scr_height-200;
+
+  conxw.conx_dialog=lives_standard_dialog_new(_("LiVES: - Parameter and Alpha Channel Connections"),FALSE);
+  gtk_widget_set_size_request (conxw.conx_dialog, winsize_h, winsize_v);
+
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (conxw.conx_dialog), accel_group);
+
+  abox = lives_dialog_get_action_area(LIVES_DIALOG(conxw.conx_dialog));
+
+  if (conxw.num_alpha>0) {
+    acbutton = gtk_button_new_with_mnemonic (_("Auto Connect Channels"));
+    gtk_box_pack_start (GTK_BOX (abox), acbutton, FALSE, FALSE, widget_opts.packing_width);
+    gtk_widget_set_sensitive(acbutton,FALSE);
+
+    g_signal_connect (GTK_OBJECT (acbutton), "clicked",
+		      G_CALLBACK (acbutton_clicked),
+		      (gpointer)&conxw);
+
+
+  }
+
+  if (conxw.num_params>0) {
+    apbutton = gtk_button_new_with_mnemonic (_("Auto Connect Parameters"));
+    gtk_box_pack_start (GTK_BOX (abox), apbutton, FALSE, FALSE, widget_opts.packing_width);
+    gtk_widget_set_sensitive(apbutton,FALSE);
+
+    g_signal_connect (GTK_OBJECT (apbutton), "clicked",
+		      G_CALLBACK (apbutton_clicked),
+		      (gpointer)&conxw);
+
+  }
+
+  disconbutton = gtk_button_new_with_mnemonic (_("Disconnect All"));
+  gtk_box_pack_start (GTK_BOX (abox), disconbutton, FALSE, FALSE, widget_opts.packing_width);
+  gtk_widget_set_sensitive(disconbutton,FALSE);
+
+  g_signal_connect (GTK_OBJECT (disconbutton), "clicked",
+		    G_CALLBACK (disconbutton_clicked),
+		    (gpointer)&conxw);
+
+  if (conxw.num_alpha>0||conxw.num_params>0) add_fill_to_box(GTK_BOX(abox));
+
+  cbox = lives_dialog_get_content_area(LIVES_DIALOG(conxw.conx_dialog));
+
+  lastckey=lastcmode=lastpkey=lastpmode=-1;
+
+  while (needsanother) {
+    scrolledwindow = conx_scroll_new(filter,&conxw);
+    needsanother=show_existing(&conxw);
+  }
+
+  gtk_box_pack_start (GTK_BOX (cbox), scrolledwindow, TRUE, TRUE, 0);
+
+
+  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_dialog_add_action_widget (GTK_DIALOG (conxw.conx_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+
+  okbutton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_dialog_add_action_widget (GTK_DIALOG (conxw.conx_dialog), okbutton, GTK_RESPONSE_OK);
+
+  lives_widget_set_can_focus_and_default (okbutton);
+  gtk_widget_grab_default(okbutton);
+
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape,  (GdkModifierType)0, (GtkAccelFlags)0);
+
+
+  g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
+		    G_CALLBACK (conxw_cancel_clicked),
+		    (gpointer)&conxw);
+
+
+  g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+		    G_CALLBACK (conxw_ok_clicked),
+		    (gpointer)&conxw);
+
+
+  gtk_widget_show_all (conxw.conx_dialog);
+
+  return conxw.conx_dialog;
+}
+
+
+static void do_chan_connected_error( lives_conx_w *conxwp) {
+
+  do_error_dialog_with_check_transient(_("Input channel is already connected"),TRUE,0,GTK_WINDOW(conxwp->conx_dialog));
+
+}
+
+
+static void do_param_connected_error( lives_conx_w *conxwp) {
+
+  do_error_dialog_with_check_transient(_("Input parameter is already connected"),TRUE,0,GTK_WINDOW(conxwp->conx_dialog));
+
+}
+
+
+static void do_param_incompatible_error( lives_conx_w *conxwp) {
+
+  do_error_dialog_with_check_transient(_("Input and output parameters are not compatible"),TRUE,0,GTK_WINDOW(conxwp->conx_dialog));
+
+}

LiVES-2.0.3.tar.bz2/src/effects-data.h Added

@@ -0,0 +1,153 @@
+// effects-data.h
+// LiVES (lives-exe)
+// (c) G. Finch 2005 - 2012 (salsaman@gmail.com)
+// Released under the GPL 3 or later
+// see file ../COPYING for licensing details
+
+
+
+// struct for connecting out params to in params
+
+typedef struct _lives_pconnect_t lives_pconnect_t;
+
+
+// when an out parameter is mapped/updated, we add it to here
+
+// when unmapped we delete it
+
+
+struct _lives_pconnect_t {
+  int okey; ///< okey is 0 based
+  int omode;
+
+  int nparams; ///< number of parameters which are linked
+
+  // index to parameters which are to be copied (|params|)
+  int *params;
+
+  // number of connections for each param
+  int *nconns;
+
+  // each param is mapped to nconns[i] of these
+  int *ikey;  ///< ikey is 0 based
+  int *imode;
+  int *ipnum;
+  boolean *autoscale;
+
+  lives_pconnect_t *next;
+  
+};
+
+
+
+/// add a new connection from out_param okey/omode/opnum to in_param ikey/imode/ipnum
+void pconx_add_connection(int okey, int omode, int opnum, int ikey, int imode, int ipnum, boolean autoscale);
+
+/// return if ikey/imode/ipnum is mapped to an out param
+weed_plant_t *pconx_get_out_param(boolean use_filter, int ikey, int imode, int ipnum, boolean *autoscale);
+
+// free all connections (and set mainw->pconx to NULL)
+void pconx_delete_all();
+
+void pconx_delete(int okey, int omode, int ocnum, int ikey, int imode, int icnum);
+
+void pconx_remap_mode(int key, int omode, int nmode);
+
+// chain any output data into fx key/mode
+boolean pconx_chain_data(int key, int mode);
+
+// return list of in keys/modes/params/autoscale
+gchar *pconx_list(int okey, int omode, int opnum);
+
+// special version for compound fx internal connections
+boolean pconx_chain_data_internal(weed_plant_t *inst);
+
+
+// alpha channels
+
+
+// struct for connecting out alphas to in alphas
+
+typedef struct _lives_cconnect_t lives_cconnect_t;
+
+
+// when an out alpha is mapped/updated, we add it to here
+
+// when unmapped we delete it
+
+
+
+struct _lives_cconnect_t {
+  int okey; ///< okey is 0 based
+  int omode;
+
+  int nchans; ///< number of alpha channels which are linked (|chans|)
+
+  // index to chans which are to be copied
+  int *chans;
+
+  // number of connections for each channel
+  int *nconns;
+
+  // each param is mapped to nconns[i] of these
+  int *ikey;  ///< ikey is 0 based
+  int *imode;
+  int *icnum;
+
+  lives_cconnect_t *next;
+  
+};
+
+
+
+/// add a new connection from out_chan okey/omode/ocnum to in_chan ikey/imode/icnum
+void cconx_add_connection(int okey, int omode, int ocnum, int ikey, int imode, int icnum);
+
+/// return if ikey/imode/ichan is mapped to an out alpha
+weed_plant_t *cconx_get_out_chan(boolean use_filter, int ikey, int imode, int ipnum);
+
+// free all connections (and set mainw->cconx to NULL)
+void cconx_delete_all();
+
+void cconx_delete(int okey, int omode, int ocnum, int ikey, int imode, int icnum);
+
+void cconx_remap_mode(int key, int omode, int nmode);
+
+// chain any output data into fx key/mode
+boolean cconx_chain_data(int key, int mode);
+
+// return list of in chaannels/modes/params
+gchar *cconx_list(int okey, int omode, int ocnum);
+
+boolean cconx_chain_data_internal(weed_plant_t *ichan);
+
+
+//////////////////////////////////////////////////////////
+
+
+typedef struct {
+  int okey;
+  int omode;
+  int num_alpha;
+  int num_params;
+  int ntabs;
+  GtkWidget *conx_dialog;
+
+  // per tab part
+  GtkWidget **cfxcombo;
+  GtkWidget **pfxcombo;
+  GtkWidget **pcombo;
+  GtkWidget **ccombo;
+  GtkWidget **acheck;
+  GtkWidget *allcheckc;
+  int *ikeys;
+  int *imodes;
+  int *idx;
+  gulong *dpc_func;
+  gulong *dpp_func;
+  gulong *acheck_func;
+} lives_conx_w;
+
+
+GtkWidget *make_datacon_window(int key, int mode);
+

LiVES-1.6.1.tar.bz2/src/effects-weed.c -> LiVES-2.0.3.tar.bz2/src/effects-weed.c Changed

@@ -1,6 +1,6 @@
 // effects-weed.c
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2012 (salsaman@xs4all.nl,salsaman@gmail.com)
+// (c) G. Finch 2005 - 2013 (salsaman@gmail.com)
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -48,10 +48,11 @@
 };
 
 
+
 #define OIL_MEMCPY_MAX_BYTES 1024 // this can be tuned to provide optimal performance
 
 #ifdef ENABLE_OIL
-LIVES_INLINE void *lives_memcpy  (void *dest, const void *src, size_t n) {
+void *lives_memcpy  (void *dest, const void *src, size_t n) {
 #ifndef __cplusplus
   if (n>=32&&n<=OIL_MEMCPY_MAX_BYTES) {
     oil_memcpy((uint8_t *)dest,(const uint8_t *)src,n);
@@ -61,7 +62,7 @@
   return memcpy(dest,src,n);
 }
 #else
-LIVES_INLINE void *lives_memcpy  (void *dest, const void *src, size_t n) {return memcpy(dest,src,n);}
+void *lives_memcpy  (void *dest, const void *src, size_t n) {return memcpy(dest,src,n);}
 #endif
 
 G_GNUC_MALLOC void * lives_malloc(size_t size) {
@@ -95,10 +96,19 @@
   (*mainw->free_fn)(ptr);
 }
 
-LIVES_INLINE void *lives_memset(void *s, int c, size_t n) {
+void *lives_memset(void *s, int c, size_t n) {
   return memset(s,c,n);
 }
 
+void *lives_calloc(size_t nmemb, size_t size) {
+  #ifdef GUI_GTK
+  #if GTK_CHECK_VERSION(2,24,0)
+  return g_try_malloc0_n(nmemb,size);
+  #endif
+  #endif
+  return calloc(nmemb,size);
+}
+
 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -154,7 +164,7 @@
 weed_leaf_element_size_f wles;
 weed_leaf_seed_type_f wlst;
 weed_leaf_get_flags_f wlgf;
-weed_leaf_set_f wls;
+weed_leaf_set_f wlsp;
 weed_malloc_f weedmalloc;
 weed_free_f weedfree;
 weed_memcpy_f weedmemcpy;
@@ -166,7 +176,6 @@
   int host_api_version;
   weed_plant_t *host_info=weed_plant_new(WEED_PLANT_HOST_INFO);
 
-
   // these functions are defined in weed-host.h and set in weed_init()
   wdg=weed_default_get;
 
@@ -178,7 +187,7 @@
   wlst=weed_leaf_seed_type;
   wlgf=weed_leaf_get_flags;
 
-  wls=weed_leaf_set_plugin; // we pass the plugin's version to the plugin - an example of overloading with Weed
+  wlsp=weed_leaf_set_plugin; // we pass the plugin's version to the plugin - an example of overloading with Weed
   weedmalloc=weed_malloc;
   weedfree=weed_free;
 
@@ -199,7 +208,7 @@
 
     // here we set (void *)&fn_ptr
     weed_set_voidptr_value(host_info,"weed_leaf_get_func",(void *)&wlg);
-    weed_set_voidptr_value(host_info,"weed_leaf_set_func",&wls);
+    weed_set_voidptr_value(host_info,"weed_leaf_set_func",&wlsp);
     weed_set_voidptr_value(host_info,"weed_plant_new_func",&wpn);
     weed_set_voidptr_value(host_info,"weed_plant_list_leaves_func",&wpll);
     weed_set_voidptr_value(host_info,"weed_leaf_num_elements_func",&wlne);
@@ -222,7 +231,21 @@
 //////////////////////////////////////////////////////////////////////////////
 // filter library functions
 
-static gboolean has_non_alpha_palette(weed_plant_t *ctmpl) {
+int num_compound_fx(weed_plant_t *plant) {
+  weed_plant_t *filter;
+
+  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_instance_get_filter(plant,TRUE);
+  else filter=plant;
+
+  if (!weed_plant_has_leaf(filter,"host_filter_list")) return 1;
+  return weed_leaf_num_elements(filter,"host_filter_list");
+
+}
+
+
+
+
+boolean has_non_alpha_palette(weed_plant_t *ctmpl) {
   int *plist;
   int error;
   int npals=0;
@@ -244,16 +267,48 @@
 }
 
 
+boolean has_alpha_palette(weed_plant_t *ctmpl) {
+  int *plist;
+  int error;
+  int npals=0;
+
+  register int i;
+
+  if (!weed_plant_has_leaf(ctmpl,"palette_list")) return TRUE; ///< most probably audio
+  npals=weed_leaf_num_elements(ctmpl,"palette_list");
+
+  plist=weed_get_int_array(ctmpl,"palette_list",&error);
+  for (i=0;i<npals;i++) {
+    if (weed_palette_is_alpha_palette(plist[i])) {
+      weed_free(plist);
+      return TRUE;
+    }
+  }
+  weed_free(plist);
+  return FALSE;
+}
+
+
+weed_plant_t *weed_instance_get_filter(weed_plant_t *inst, boolean get_compound_parent) {
+  int error;
+  if (get_compound_parent&&(weed_plant_has_leaf(inst,"host_compound_class"))) return weed_get_plantptr_value(inst,"host_compound_class",&error);
+  return weed_get_plantptr_value(inst,"filter_class",&error);
+}
 
 
 lives_fx_cat_t weed_filter_categorise (weed_plant_t *pl, int in_channels, int out_channels) {
   weed_plant_t *filt=pl;
   int filter_flags,error;
-  gboolean has_out_params=FALSE;
-  gboolean all_out_alpha=TRUE;
+  boolean has_out_params=FALSE;
+  boolean has_in_params=FALSE;
+  boolean has_mandatory_in=FALSE;
+  boolean all_out_alpha=TRUE;
+  boolean all_in_alpha=TRUE;
+  boolean has_in_alpha=FALSE;
+
   register int i;
 
-  if (WEED_PLANT_IS_FILTER_INSTANCE(pl)) filt=weed_get_plantptr_value(pl,"filter_class",&error);
+  if (WEED_PLANT_IS_FILTER_INSTANCE(pl)) filt=weed_instance_get_filter(pl,TRUE);
 
   // check mandatory output chans, see if any are non-alpha
   if (weed_plant_has_leaf(filt,"out_channel_templates")) {
@@ -272,34 +327,73 @@
     }
   }
 
+  // check mandatory input chans, see if any are non-alpha
+  if (weed_plant_has_leaf(filt,"in_channel_templates")) {
+    int nins=weed_leaf_num_elements(filt,"in_channel_templates");
+    if (nins>0) {
+      weed_plant_t **ctmpls=weed_get_plantptr_array(filt,"in_channel_templates",&error);
+      for (i=0;i<nins;i++) {
+	if (weed_plant_has_leaf(ctmpls[i],"optional")&&
+	    weed_get_boolean_value(ctmpls[i],"optional",&error)==WEED_TRUE) continue; ///< ignore optional channels
+	has_mandatory_in=TRUE;
+	if (has_non_alpha_palette(ctmpls[i])) {
+	  all_in_alpha=FALSE;
+	}
+	else has_in_alpha=TRUE;
+      }
+      if (!has_mandatory_in) {
+	for (i=0;i<nins;i++) {
+	  if (has_non_alpha_palette(ctmpls[i])) {
+	    all_in_alpha=FALSE;
+	  }
+	  else has_in_alpha=TRUE;
+	}
+      }
+      weed_free(ctmpls);
+    }
+  }
+
   filter_flags=weed_get_int_value(filt,"flags",&error);
   if (weed_plant_has_leaf(filt,"out_parameter_templates")) has_out_params=TRUE;
+  if (weed_plant_has_leaf(filt,"in_parameter_templates")) has_in_params=TRUE;
   if (filter_flags&WEED_FILTER_IS_CONVERTER) return LIVES_FX_CAT_CONVERTER;
   if (in_channels==0&&out_channels>0&&all_out_alpha) return LIVES_FX_CAT_DATA_GENERATOR;
-  if (in_channels==0&&out_channels>0) return LIVES_FX_CAT_GENERATOR;
-  if (out_channels>1&&all_out_alpha) return LIVES_FX_CAT_ANALYSER;
+  if (in_channels==0&&out_channels>0) {
+    if (!has_audio_chans_out(filt,TRUE)) return LIVES_FX_CAT_VIDEO_GENERATOR;
+    else if (has_video_chans_out(filt,TRUE)) return LIVES_FX_CAT_AV_GENERATOR;
+    else return LIVES_FX_CAT_AUDIO_GENERATOR;
+  }
+  if (out_channels>=1&&in_channels>=1&&(all_in_alpha||has_in_alpha)&&!all_out_alpha) return LIVES_FX_CAT_DATA_VISUALISER;
+  if (out_channels>=1&&all_out_alpha) return LIVES_FX_CAT_ANALYSER;
   if (out_channels>1) return LIVES_FX_CAT_SPLITTER;
-  if (in_channels>2&&out_channels==1) return LIVES_FX_CAT_COMPOSITOR;
+
+  if (in_channels>2&&out_channels==1) {
+    return LIVES_FX_CAT_COMPOSITOR;
+  }
   if (in_channels==2&&out_channels==1) return LIVES_FX_CAT_TRANSITION;
+  if (in_channels==1&&out_channels==1&&!(has_video_chans_in(filt,TRUE))&&!(has_video_chans_out(filt,TRUE))) return LIVES_FX_CAT_AUDIO_EFFECT;
   if (in_channels==1&&out_channels==1) return LIVES_FX_CAT_EFFECT;
   if (in_channels>0&&out_channels==0&&has_out_params) return LIVES_FX_CAT_ANALYSER;
   if (in_channels>0&&out_channels==0) return LIVES_FX_CAT_TAP;
+  if (in_channels==0&&out_channels==0&&has_out_params&&has_in_params) return LIVES_FX_CAT_DATA_PROCESSOR;
+  if (in_channels==0&&out_channels==0&&has_out_params) return LIVES_FX_CAT_DATA_SOURCE;
   if (in_channels==0&&out_channels==0) return LIVES_FX_CAT_UTILITY;
   return LIVES_FX_CAT_NONE;
 }
 
 
-lives_fx_cat_t weed_filter_subcategorise (weed_plant_t *pl, lives_fx_cat_t category, gboolean count_opt) {
+lives_fx_cat_t weed_filter_subcategorise (weed_plant_t *pl, lives_fx_cat_t category, boolean count_opt) {
   weed_plant_t *filt=pl;
-  gboolean has_video_chansi;
-  int error;
+  boolean has_video_chansi;
 
-  if (WEED_PLANT_IS_FILTER_INSTANCE(pl)) filt=weed_get_plantptr_value(pl,"filter_class",&error);
+  if (WEED_PLANT_IS_FILTER_INSTANCE(pl)) filt=weed_instance_get_filter(pl,TRUE);
+
+  if (category==LIVES_FX_CAT_COMPOSITOR) count_opt=TRUE;
 
   has_video_chansi=has_video_chans_in(filt,count_opt);
 
   if (category==LIVES_FX_CAT_TRANSITION) {
-    if (get_transition_param(filt)!=-1) {
+    if (get_transition_param(filt,FALSE)!=-1) {
       if (!has_video_chansi) return LIVES_FX_CAT_AUDIO_TRANSITION;
       return LIVES_FX_CAT_AV_TRANSITION;
     }
@@ -319,9 +413,56 @@
 }
 
 
+gchar* weed_seed_type_to_text(int seed_type) {
+  switch (seed_type) {
+  case WEED_SEED_INT: return g_strdup(_("integer"));
+  case WEED_SEED_INT64: return g_strdup(_("int64"));
+  case WEED_SEED_BOOLEAN: return g_strdup(_("boolean"));
+  case WEED_SEED_DOUBLE: return g_strdup(_("double"));
+  case WEED_SEED_STRING: return g_strdup(_("string"));
+  default: return g_strdup(_("pointer"));
+  }
+}
+
+int num_alpha_channels(weed_plant_t *filter, boolean out) {
+  // get number of alpha channels (in or out) for filter; including optional
+
+  weed_plant_t **ctmpls;
+
+  int count=0;
+  int nchans,error;
+
+  register int i;
+
+  if (out) {
+    if (!weed_plant_has_leaf(filter,"out_channel_templates")) return FALSE;
+    nchans=weed_leaf_num_elements(filter,"out_channel_templates");
+    if (nchans==0) return FALSE;
+    ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+    for (i=0;i<nchans;i++) {
+      if (has_non_alpha_palette(ctmpls[i])) continue;
+      count++;
+    }
+  }
+  else {
+    if (!weed_plant_has_leaf(filter,"in_channel_templates")) return FALSE;
+    nchans=weed_leaf_num_elements(filter,"in_channel_templates");
+    if (nchans==0) return FALSE;
+    ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+    for (i=0;i<nchans;i++) {
+      if (has_non_alpha_palette(ctmpls[i])) continue;
+      count++;
+    }
+  }
+  weed_free(ctmpls);
+  return count;
+
+}
+
+
+
 ////////////////////////////////////////////////////////////////////////
 
-#define MAX_WEED_FILTERS 65536
 #define MAX_WEED_INSTANCES 65536
 
 // store keys so we now eg, which rte mask entry to xor when deiniting
@@ -338,12 +479,13 @@
 static int fg_gen_to_start;
 
 // store the clip, this can sometimes get lost
-static gint fg_generator_clip;
+static int fg_generator_clip;
 
 
 //////////////////////////////////////////////////////////////////////
 
-static weed_plant_t *weed_filters[MAX_WEED_FILTERS]; // array of filter_classes
+static weed_plant_t **weed_filters; // array of filter_classes
+static weed_plant_t **dupe_weed_filters; // array of duplicate filter_classes (only used during loading)
 
 // each 'hotkey' controls n instances, selectable as 'modes' or banks
 static weed_plant_t **key_to_instance[FX_KEYS_MAX];
@@ -352,10 +494,11 @@
 static int *key_to_fx[FX_KEYS_MAX];
 static int key_modes[FX_KEYS_MAX];
 
-// count of how many filters we have loaded
-static gint num_weed_filters;
+static int num_weed_filters; ///< count of how many filters we have loaded
+static int num_weed_dupes; ///< number of duplicate filters (with multiple versions)
 
-static gchar *hashnames[MAX_WEED_FILTERS];
+static gchar **hashnames;
+static gchar **dupe_hashnames;
 
 // per key/mode parameter defaults
 weed_plant_t ***key_defaults[FX_KEYS_MAX_VIRTUAL];
@@ -366,7 +509,6 @@
 static void **pchains[FX_KEYS_MAX]; // parameter changes, used during recording (not for rendering)
 static void *filter_map[FX_KEYS_MAX+2];
 static int next_free_key;
-static int key; // for assigning loaded filters
 
 ////////////////////////////////////////////////////////////////////
 
@@ -394,18 +536,18 @@
 
 
 
-LIVES_INLINE gint step_val(gint val, gint step) {
-  gint ret=(gint)(val/step+.5)*step;
+LIVES_INLINE int step_val(int val, int step) {
+  int ret=(int)(val/step+.5)*step;
   return ret==0?step:ret;
 }
 
 
-gchar *weed_filter_get_type(weed_plant_t *filter, gboolean getsub) {
+static gchar *weed_filter_get_type(weed_plant_t *filter, boolean getsub, boolean format) {
   // return value should be g_free'd after use
   gchar *tmp1,*tmp2,*ret;
   lives_fx_cat_t cat=weed_filter_categorise(filter,
-					    enabled_in_channels(filter,FALSE),
-					    enabled_out_channels(filter,FALSE));
+					    enabled_in_channels(filter,TRUE),
+					    enabled_out_channels(filter,TRUE));
 
   lives_fx_cat_t sub=weed_filter_subcategorise(filter,cat,FALSE);
 
@@ -415,7 +557,11 @@
   tmp1=lives_fx_cat_to_text(cat,FALSE);
   tmp2=lives_fx_cat_to_text(sub,FALSE);
 
-  ret=g_strdup_printf("%s (%s)",tmp1,tmp2);
+  if (format) ret=g_strdup_printf("%s (%s)",tmp1,tmp2);
+  else {
+    if (cat==LIVES_FX_CAT_TRANSITION) ret=g_strdup_printf("%s - %s",tmp1,tmp2);
+      else ret=g_strdup_printf("%s",tmp2);
+  }
 
   g_free(tmp1);
   g_free(tmp2);
@@ -429,7 +575,7 @@
   int error;
   weed_plant_t *filter,*pinfo,*hinfo;
 
-  filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  filter=weed_instance_get_filter(inst,FALSE);
   pinfo=weed_get_plantptr_value(filter,"plugin_info",&error);
   hinfo=weed_get_plantptr_value(pinfo,"host_info",&error);
 
@@ -450,7 +596,7 @@
 }
 
 
-weed_plant_t *get_enabled_channel (weed_plant_t *inst, gint which, gboolean is_in) {
+weed_plant_t *get_enabled_channel (weed_plant_t *inst, int which, boolean is_in) {
   // plant is a filter_instance
   // "which" starts at 0
   int i=0,error,nchans=3;
@@ -487,7 +633,7 @@
 }
 
 
-weed_plant_t *get_mandatory_channel (weed_plant_t *filter, gint which, gboolean is_in) {
+weed_plant_t *get_mandatory_channel (weed_plant_t *filter, int which, boolean is_in) {
   // plant is a filter_class
   // "which" starts at 0
   int i=0,error;
@@ -510,7 +656,7 @@
 }
 
 
-gboolean weed_filter_is_resizer(weed_plant_t *filt) {
+boolean weed_filter_is_resizer(weed_plant_t *filt) {
   int error;
   int filter_flags=weed_get_int_value(filt,"flags",&error);
   if (filter_flags&WEED_FILTER_IS_CONVERTER) {
@@ -525,15 +671,14 @@
 
 
 
-gboolean weed_instance_is_resizer(weed_plant_t *inst) {
-  int error;
-  weed_plant_t *ftmpl=weed_get_plantptr_value(inst,"filter_class",&error);
+boolean weed_instance_is_resizer(weed_plant_t *inst) {
+  weed_plant_t *ftmpl=weed_instance_get_filter(inst,TRUE);
   return weed_filter_is_resizer(ftmpl);
 }
 
 
 
-gboolean is_audio_channel_in(weed_plant_t *inst, int chnum) {
+boolean is_audio_channel_in(weed_plant_t *inst, int chnum) {
   int error,nchans=weed_leaf_num_elements(inst,"in_channels");
   weed_plant_t **in_chans;
   weed_plant_t *ctmpl;
@@ -551,7 +696,7 @@
 }
 
 
-gboolean has_video_chans_in(weed_plant_t *filter, gboolean count_opt) {
+boolean has_video_chans_in(weed_plant_t *filter, boolean count_opt) {
   int error,nchans=weed_leaf_num_elements(filter,"in_channel_templates");
   weed_plant_t **in_ctmpls;
   int i;
@@ -574,7 +719,7 @@
 
 
 
-gboolean has_audio_chans_in(weed_plant_t *filter, gboolean count_opt) {
+boolean has_audio_chans_in(weed_plant_t *filter, boolean count_opt) {
   int error,nchans=weed_leaf_num_elements(filter,"in_channel_templates");
   weed_plant_t **in_ctmpls;
   int i;
@@ -596,7 +741,7 @@
 }
 
 
-gboolean is_audio_channel_out(weed_plant_t *inst, int chnum) {
+boolean is_audio_channel_out(weed_plant_t *inst, int chnum) {
   int error,nchans=weed_leaf_num_elements(inst,"out_channels");
   weed_plant_t **out_chans;
   weed_plant_t *ctmpl;
@@ -614,7 +759,7 @@
 }
 
 
-gboolean has_video_chans_out(weed_plant_t *filter, gboolean count_opt) {
+boolean has_video_chans_out(weed_plant_t *filter, boolean count_opt) {
   int error,nchans=weed_leaf_num_elements(filter,"out_channel_templates");
   weed_plant_t **out_ctmpls;
   int i;
@@ -637,7 +782,7 @@
 
 
 
-gboolean has_audio_chans_out(weed_plant_t *filter, gboolean count_opt) {
+boolean has_audio_chans_out(weed_plant_t *filter, boolean count_opt) {
   int error,nchans=weed_leaf_num_elements(filter,"out_channel_templates");
   weed_plant_t **out_ctmpls;
   int i;
@@ -659,18 +804,18 @@
 }
 
 
-gboolean is_pure_audio(weed_plant_t *plant, gboolean count_opt) {
-  int error;
+boolean is_pure_audio(weed_plant_t *plant, boolean count_opt) {
   weed_plant_t *filter=plant;
-  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_get_plantptr_value(plant,"filter_class",&error);
+  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_instance_get_filter(plant,FALSE);
+
   if ((has_audio_chans_in(filter,count_opt) || has_audio_chans_out(filter,count_opt)) &&
-      !(has_video_chans_in(filter,count_opt)) && (!has_video_chans_out(filter,count_opt))) return TRUE;
+      !has_video_chans_in(filter,count_opt) && !has_video_chans_out(filter,count_opt)) return TRUE;
   return FALSE;
 }
 
 
 
-gboolean weed_parameter_has_variable_elements_strict(weed_plant_t *inst, weed_plant_t *ptmpl) {
+boolean weed_parameter_has_variable_elements_strict(weed_plant_t *inst, weed_plant_t *ptmpl) {
   /** see if param has variable elements, using the strictest check */
   weed_plant_t **chans,*ctmpl;
   int error,i;
@@ -679,6 +824,8 @@
 
   if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS) return TRUE;
 
+  if (inst==NULL) return FALSE;
+
   if (!(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL)) return FALSE;
 
   if (!weed_plant_has_leaf(inst,"in_channels")
@@ -707,26 +854,26 @@
 
 static void create_filter_map (void) {
   /** here we create an effect map which defines the order in which effects are applied to a frame stack
-  * this is done during recording, the keymap is from mainw->rte which is a bitmap of effect keys
-  * keys are applied here from smallest (ctrl-1) to largest (virtual key ctrl-FX_KEYS_MAX_VIRTUAL)
+   * this is done during recording, the keymap is from mainw->rte which is a bitmap of effect keys
+   * keys are applied here from smallest (ctrl-1) to largest (virtual key ctrl-FX_KEYS_MAX_VIRTUAL)
 
-  * this is transformed into filter_map which holds init_events 
-  * these pointers are then stored in a filter_map event
+   * this is transformed into filter_map which holds init_events 
+   * these pointers are then stored in a filter_map event
 
-  * what we actually point to are the init_events for the effects. The init_events are stored when we 
-  * init an effect
+   * what we actually point to are the init_events for the effects. The init_events are stored when we 
+   * init an effect
 
-  * during rendering we read the filter_map event, and retrieve the new key, which is at that time 
-  * held in the 
-  * "host_tag" property of the init_event, and we apply our effects
-  * (which are then bound to virtual keys >=FX_KEYS_MAX_VIRTUAL)
-
-  * [note] that we can do cool things, like mapping the same instance multiple times (though it will always
-  * apply itself to the same in/out tracks
-
-  * we don't need to worry about free()ing init_events, since they will be free'd 
-  * when the instance is deinited
-  */
+   * during rendering we read the filter_map event, and retrieve the new key, which is at that time 
+   * held in the 
+   * "host_tag" property of the init_event, and we apply our effects
+   * (which are then bound to virtual keys >=FX_KEYS_MAX_VIRTUAL)
+
+   * [note] that we can do cool things, like mapping the same instance multiple times (though it will always
+   * apply itself to the same in/out tracks
+
+   * we don't need to worry about free()ing init_events, since they will be free'd 
+   * when the instance is deinited
+   */
 
   int count=0,i;
   weed_plant_t *inst;
@@ -742,7 +889,7 @@
   // during rendering we use the "keys" FX_KEYS_MAX_VIRTUAL -> FX_KEYS_MAX
   // here we add effect_deinit events to an event_list
   int i;
-  gboolean needs_filter_map=FALSE;
+  boolean needs_filter_map=FALSE;
   weed_timecode_t last_tc=0;
 
   if (event_list!=NULL) last_tc=get_event_timecode(get_last_event(event_list));
@@ -773,10 +920,10 @@
 
   for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
     if ((inst=key_to_instance[i][key_modes[i]])!=NULL&&enabled_in_channels (inst,FALSE)>0) {
-      event_list=append_filter_init_event (event_list,tc,(fx_idx=key_to_fx[i][key_modes[i]]),-1);
+      event_list=append_filter_init_event (event_list,tc,(fx_idx=key_to_fx[i][key_modes[i]]),-1,i,inst);
       init_events[i]=get_last_event(event_list);
       ntracks=weed_leaf_num_elements(init_events[i],"in_tracks");
-      pchains[i]=filter_init_add_pchanges(event_list,inst,init_events[i],ntracks);
+      pchains[i]=filter_init_add_pchanges(event_list,inst,init_events[i],ntracks,0);
     }
   }
   // add an empty filter_map event (in case more frames are added)
@@ -926,7 +1073,7 @@
   return best_palette;
 }
 
-static void set_channel_size (weed_plant_t *channel, gint width, gint height, int numplanes, int *rowstrides) {
+static void set_channel_size (weed_plant_t *channel, int width, int height, int numplanes, int *rowstrides) {
   int error;
   int max;
   weed_plant_t *chantmpl=weed_get_plantptr_value(channel,"template",&error);
@@ -958,7 +1105,7 @@
 }
 
 
-static gboolean rowstrides_differ(int n1, int *n1_array, int n2, int *n2_array) {
+static boolean rowstrides_differ(int n1, int *n1_array, int n2, int *n2_array) {
   // returns TRUE if the rowstrides differ
   int i;
 
@@ -968,22 +1115,22 @@
 }
 
 
-static gboolean align (void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides, 
+static boolean align (void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides, 
 		       int *contiguous) {
+#ifndef HAVE_POSIX_MEMALIGN
+  return FALSE;
+#else
+
   // returns TRUE on success
   int i;
   int memerror;
-  gboolean needs_change=FALSE;
-  void *npixel_data;
+  boolean needs_change=FALSE;
+  uint8_t *npixel_data;
   void **new_pixel_data;
   size_t size,totsize=0;
 
-#ifndef HAVE_POSIX_MEMALIGN
-  return FALSE;
-#endif
-
   for (i=0;i<numplanes;i++) {
-    if (((gulong)(pixel_data[i]))%alignment==0) continue;
+    if (((uint64_t)(pixel_data[i]))%alignment==0) continue;
     needs_change=TRUE;
   }
 
@@ -995,7 +1142,9 @@
   }
 
   // try contiguous first
-  if ((memerror=posix_memalign(&npixel_data,alignment,totsize))) return FALSE;
+
+
+  if ((memerror=posix_memalign((void **)&npixel_data,alignment,totsize))) return FALSE;
 
   new_pixel_data=(void **)g_malloc(numplanes*(sizeof(void *)));
 
@@ -1003,7 +1152,7 @@
   needs_change=FALSE;
 
   for (i=0;i<numplanes;i++) {
-    if (((gulong)(pixel_data[i]))%alignment==0) continue;
+    if (((uint64_t)(pixel_data[i]))%alignment==0) continue;
     needs_change=TRUE;
   }
 
@@ -1031,7 +1180,7 @@
 
   // non-contiguous
   for (i=0;i<numplanes;i++) {
-    if ((memerror=posix_memalign(&npixel_data,alignment,height*rowstrides[i]))) return FALSE;
+    if ((memerror=posix_memalign((void **)&npixel_data,alignment,height*rowstrides[i]))) return FALSE;
     memcpy(npixel_data,pixel_data[i],height*rowstrides[i]);
     new_pixel_data[i]=npixel_data;
   }
@@ -1046,10 +1195,11 @@
   *contiguous=FALSE;
 
   return TRUE;
+#endif
 }
 
 
-LIVES_INLINE int weed_flagset_array_count(weed_plant_t **array, gboolean set_readonly) {
+LIVES_INLINE int weed_flagset_array_count(weed_plant_t **array, boolean set_readonly) {
   int i=0;
   while (array[i]!=NULL) {
     if (set_readonly) weed_add_plant_flags(array[i],WEED_LEAF_READONLY_PLUGIN);
@@ -1137,13 +1287,26 @@
   return ret;
 }
 
-lives_filter_error_t weed_reinit_effect (weed_plant_t *inst, gboolean deinit_first) {
-  int error;
-  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+lives_filter_error_t weed_reinit_effect (weed_plant_t *inst, boolean reinit_compound) {
+  weed_plant_t *filter;
   gchar *cwd;
+  boolean is_audio=FALSE,deinit_first=FALSE;
+  lives_filter_error_t filter_error=FILTER_NO_ERROR;
+  int error,retval;
+
+ reinit:
+
+  filter=weed_instance_get_filter(inst,FALSE);
 
-  if (deinit_first) weed_call_deinit_func(inst);
+  if (weed_plant_has_leaf(inst,"host_inited")&&weed_get_boolean_value(inst,"host_inited",&error)==WEED_TRUE) deinit_first=TRUE;
 
+  if (deinit_first) {
+    if (has_audio_chans_in(filter,FALSE)||has_audio_chans_out(filter,FALSE)) {
+      pthread_mutex_lock(&mainw->afilter_mutex);
+      is_audio=TRUE;
+    }
+    weed_call_deinit_func(inst);
+  }
 
   if (weed_plant_has_leaf(filter,"init_func")) {
     weed_init_f *init_func_ptr_ptr;
@@ -1155,10 +1318,8 @@
       lives_rfx_t *rfx;
       set_param_gui_readwrite(inst);
       update_host_info(inst);
-      if ((*init_func)(inst)!=WEED_NO_ERROR) {
-	lives_chdir(cwd,FALSE);
-	return FILTER_ERROR_COULD_NOT_REINIT;
-      }
+      retval=(*init_func)(inst);
+      if (is_audio) pthread_mutex_unlock(&mainw->afilter_mutex);
       set_param_gui_readonly(inst);
       if (fx_dialog[1]!=NULL) {
 	// redraw GUI if necessary
@@ -1170,29 +1331,57 @@
 	}
       }
 
+      if (retval!=WEED_NO_ERROR) {
+	lives_chdir(cwd,FALSE);
+	g_free(cwd);
+	return FILTER_ERROR_COULD_NOT_REINIT;
+      }
+
       // redraw set defs window
 
 
     }
-    if (!deinit_first) weed_call_deinit_func(inst);
+    else if (is_audio) pthread_mutex_unlock(&mainw->afilter_mutex);
+
+    if (!deinit_first) {
+      if (is_audio) pthread_mutex_lock(&mainw->afilter_mutex);
+      weed_call_deinit_func(inst);
+      if (is_audio) pthread_mutex_unlock(&mainw->afilter_mutex);
+    }
+
     lives_chdir(cwd,FALSE);
     g_free(cwd);
-    return FILTER_INFO_REINITED;
+    filter_error=FILTER_INFO_REINITED;
   }
-  return FILTER_NO_ERROR;
+  else if (is_audio) pthread_mutex_unlock(&mainw->afilter_mutex);
+
+  if (deinit_first) weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+  else weed_set_boolean_value(inst,"host_inited",WEED_FALSE);
+
+  if (reinit_compound&&weed_plant_has_leaf(inst,"host_next_instance")) {
+    // handle compound fx
+    inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+    goto reinit;
+  }
+
+  return filter_error;
 }
 
 void weed_reinit_all(void) {
   // reinit all effects on playback start
-  int i;
-  weed_plant_t *instance;
+  int i,error;
+  weed_plant_t *instance,*last_inst;
 
   for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
     if (rte_key_valid(i+1,TRUE)) {
       if (mainw->rte&(GU641<<i)) {
 	mainw->osc_block=TRUE;
 	if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	if (enabled_in_channels(instance,FALSE)==0) continue;
+	last_inst=instance;
+
+	// ignore video generators
+	while (weed_plant_has_leaf(last_inst,"host_next_instance")) last_inst=weed_get_plantptr_value(last_inst,"host_next_instance",&error);
+	if (enabled_in_channels(instance,FALSE)==0&&enabled_out_channels(last_inst,FALSE)>0&&!is_pure_audio(last_inst,FALSE)) continue;
 	weed_reinit_effect(instance,TRUE);
       }
     }
@@ -1202,7 +1391,7 @@
 
 
 static void *thread_process_func(void *arg) {
-  int retval,error;
+  int retval;
   struct _procvals *procvals=(struct _procvals *)arg;
   weed_process_f *process_func_ptr_ptr;
   weed_process_f process_func;
@@ -1210,7 +1399,7 @@
   weed_plant_t *inst=procvals->inst;
   weed_timecode_t tc=procvals->tc;
 
-  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  weed_plant_t *filter=weed_instance_get_filter(inst,FALSE);
 
   weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
   process_func=process_func_ptr_ptr[0];
@@ -1227,13 +1416,13 @@
   int dheight,height;
   int nthreads=0;
   int error;
-  gboolean got_invalid=FALSE;
-  gboolean useme=FALSE;
+  boolean got_invalid=FALSE;
 
-  int nchannels=weed_leaf_num_elements(inst,"out_channels");
+  int nchannels=weed_leaf_num_elements(inst,"out_channels"),pal,vrt;
   int retval;
-  int minh;
+  int minh,xminh;
 
+  int slices,slices_per_thread,to_use;
 
   struct _procvals procvals[MAX_FX_THREADS];
   pthread_t dthreads[MAX_FX_THREADS];
@@ -1247,69 +1436,95 @@
   register int i,j;
 
   height=weed_get_int_value(out_channels[0],"height",&error);
+  xminh=1;
+
+  for (i=0;i<nchannels;i++) {
+    // min height for slices is 1, unless an out channel has vstep set
+    // or using a compressed yuv palette
+    ctmpl=weed_get_plantptr_value(out_channels[i],"template",&error);
+
+    pal=weed_get_int_value(out_channels[i],"current_palette",&error);
+    vrt=weed_palette_get_plane_ratio_vertical(pal,1);
+    if (vrt!=0.&&vrt<1.) if (xminh<(int)(1./vrt)) xminh=(int)(1./vrt);
+
+    if (weed_plant_has_leaf(ctmpl,"vstep")) { 
+      minh=weed_get_int_value(ctmpl,"vstep",&error);
+      if (minh>xminh) xminh=minh;
+    }
+  }
+
+  if (height%xminh!=0) return FILTER_ERROR_DONT_THREAD;
+
+  slices=height/xminh;
+  slices_per_thread=CEIL((double)slices/(double)prefs->nfx_threads,1.);
+
+  to_use=CEIL((double)slices/(double)slices_per_thread,1.);
+  if (to_use<2) return FILTER_ERROR_DONT_THREAD;
+
+  dheight=slices_per_thread*xminh;
+
+  for (i=0;i<nchannels;i++) {
+    weed_set_int_value(out_channels[i],"offset",0);
+    weed_set_int_value(out_channels[i],"host_height",height);
+    weed_set_int_value(out_channels[i],"height",dheight);
+  }
 
-  for (j=0;j<prefs->nfx_threads;j++) {
+  pthread_mutex_lock(&mainw->data_mutex);
+
+  for (j=1;j<to_use;j++) {
     // each thread needs its own copy of the output channels, so it can have its own "offset" and "height"
     // therefore it also needs its own copy of inst
     // but note that "pixel_data" always points to the same memory buffer(s)
     
-    xinst[j]=weed_plant_copy(inst);
+    xinst[j-1]=weed_plant_copy(inst);
     xchannels=(weed_plant_t **)g_malloc(nchannels*sizeof(weed_plant_t *));
     
     for (i=0;i<nchannels;i++) {
       xchannels[i]=weed_plant_copy(out_channels[i]);
-      height=weed_get_int_value(xchannels[i],"height",&error);
-
       ctmpl=weed_get_plantptr_value(out_channels[i],"template",&error);
-      if (weed_plant_has_leaf(ctmpl,"vstep")) 
-	minh=weed_get_int_value(ctmpl,"vstep",&error);
-      else minh=4;
-
-      if (minh<4) minh=4;
-
-      dheight=CEIL((double)height/(double)prefs->nfx_threads,minh);
 
       offset=dheight*j;
 
-      if ((height-offset-dheight)<minh) {
+      if ((height-offset)<dheight) {
 	dheight=height-offset;
-	useme=1;
       }
-      if ((height-offset)<minh) break;
       
       weed_set_int_value(xchannels[i],"offset",offset);
       weed_set_int_value(xchannels[i],"height",dheight);
     }
     
-    weed_set_plantptr_array(xinst[j],"out_channels",nchannels,xchannels);
+    weed_set_plantptr_array(xinst[j-1],"out_channels",nchannels,xchannels);
     g_free(xchannels);
     
-    procvals[j].inst=xinst[j];
+    procvals[j].inst=xinst[j-1];
     procvals[j].tc=tc; // use same timecode for all slices
-    
-    if (offset>=height) break;
-    
-    if (!useme) {
-      // start a thread for processing
-      pthread_create(&dthreads[j],NULL,thread_process_func,&procvals[j]);
-      nthreads++; // actual number of threads used
-    }
-    else {
-      // use main thread
-      tretval=thread_process_func(&procvals[j]);
-      retval=GPOINTER_TO_INT((gpointer)tretval);
-      if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
-    }
+
+    // start a thread for processing
+    pthread_create(&dthreads[j-1],NULL,thread_process_func,&procvals[j]);
+    nthreads++; // actual number of threads used
+  }
+
+
+  procvals[0].inst=inst;
+  procvals[0].tc=tc;
+
+  // use main thread for first slices
+  tretval=thread_process_func(&procvals[0]);
+  retval=GPOINTER_TO_INT((gpointer)tretval);
+  if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
+
+  for (i=0;i<nchannels;i++) {
+    weed_leaf_delete(out_channels[i],"offset");
+    weed_set_int_value(out_channels[i],"height",weed_get_int_value(out_channels[i],"host_height",&error));
+    weed_leaf_delete(out_channels[i],"host_height");
   }
   
   // wait for threads to finish
-  for (j=0;j<prefs->nfx_threads;j++) {
+  for (j=0;j<nthreads;j++) {
     retval=WEED_NO_ERROR;
     
-    if (j<nthreads) {
-      pthread_join(dthreads[j],&tretval);
-      retval=GPOINTER_TO_INT((gpointer)tretval);
-    }
+    pthread_join(dthreads[j],&tretval);
+    retval=GPOINTER_TO_INT((gpointer)tretval);
     
     xchannels=weed_get_plantptr_array(xinst[j],"out_channels",&error);
     for (i=0;i<nchannels;i++) {
@@ -1320,6 +1535,8 @@
     
     if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
   }
+
+  pthread_mutex_unlock(&mainw->data_mutex);
   
   if (got_invalid) return FILTER_ERROR_MUST_RELOAD;
 
@@ -1352,6 +1569,10 @@
   // if filter does not support inplace, we must create a new pixel_data; this will then replace the original layer
 
 
+  // for in/out alpha channels, there is no matching layer. These channels are passed around like data
+  // using mainw->cconx as a guide. We will simply free any in alpha channels after processing (unless inplace was used)
+
+
 
   // WARNING: output layer may need resizing, and its palette may need adjusting - should be checked by the caller
 
@@ -1360,57 +1581,114 @@
   // then the output will be smaller also and need resizing by the caller
 
   // TODO ** - handle return errors
-  int num_in_tracks,num_out_tracks;
   int *in_tracks,*out_tracks;
-  int error,i,j;
-  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  int *rowstrides;
+  int *layer_rows=NULL,*channel_rows;
+  int *mand;
+
+  void **pixel_data;
+
+  void *pdata;
+
+  weed_process_f *process_func_ptr_ptr;
+  weed_process_f process_func;
+  weed_plant_t *def_channel=NULL;
+
+  int num_in_tracks,num_out_tracks;
+  int error;
+
+  weed_plant_t *filter=weed_instance_get_filter(inst,FALSE);
   weed_plant_t *layer=NULL,*orig_layer=NULL;
-  weed_plant_t **in_channels,**out_channels,*channel,*chantmpl;
+
+  weed_plant_t **in_channels,**out_channels=NULL,*channel,*chantmpl;
+  weed_plant_t **in_ctmpls;
+
   int frame;
   int inwidth,inheight,inpalette,outpalette,channel_flags,filter_flags=0;
   int palette,cpalette;
   int outwidth,outheight;
-  gboolean needs_reinit=FALSE,inplace=FALSE;
+  boolean needs_reinit=FALSE,inplace=FALSE;
   int incwidth,incheight,numplanes=0,width,height;
-  int *rowstrides;
-  void **pixel_data;
-  weed_process_f *process_func_ptr_ptr;
-  weed_process_f process_func;
-  weed_plant_t *def_channel=NULL;
-  gboolean rowstrides_changed;
-  gboolean ignore_palette;
+
+  boolean rowstrides_changed;
+  boolean ignore_palette;
+  boolean did_thread=FALSE;
+
   int nchr;
-  int *layer_rows=NULL,*channel_rows;
+
   lives_filter_error_t retval=FILTER_NO_ERROR;
-  int *mand;
+
   int maxinwidth=4,maxinheight=4;
   int iclamping,isampling,isubspace;
   int clip;
-  int num_ctmpl,num_inc;
+  int num_ctmpl,num_inc,num_outc;
   int osubspace=-1;
   int osampling=-1;
   int oclamping=-1;
   int flags;
+  int num_in_alpha=0,num_out_alpha=0;
 
-  weed_plant_t **in_ctmpls;
+  boolean def_disabled=FALSE;
+  boolean all_outs_alpha=TRUE,all_ins_alpha=FALSE;
+
+  int lcount=0;
 
-  gboolean def_disabled=FALSE;
-  gboolean all_outs_alpha=TRUE,all_ins_alpha=TRUE;
+  register int i,j,k;
 
-  gint lcount=0;
+  if ((!weed_plant_has_leaf(inst,"out_channels")||(out_channels=weed_get_plantptr_array(inst,"out_channels",&error))==NULL)
+      &&(mainw->preview||mainw->is_rendering)&&(num_compound_fx(inst)==1)) return retval;
+
+  if (weed_plant_has_leaf(filter,"flags")) filter_flags=weed_get_int_value(filter,"flags",&error);
 
   // here, in_tracks and out_tracks map our layers to in_channels and out_channels in the filter
-  if (!weed_plant_has_leaf(inst,"in_channels")||(in_channels=weed_get_plantptr_array(inst,"in_channels",&error))==NULL) 
+  if (!weed_plant_has_leaf(inst,"in_channels")||(in_channels=weed_get_plantptr_array(inst,"in_channels",&error))==NULL) {
+    if (out_channels==NULL&&weed_plant_has_leaf(inst,"out_parameters")) {
+
+      // data processing effect; just call the process_func
+      weed_set_double_value(inst,"fps",cfile->pb_fps);
+
+      // see if we can multithread
+      if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && 
+	  filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
+	retval=process_func_threaded(inst,out_channels,tc);
+	if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
+      }
+      if (!did_thread) {
+	// normal single threaded version
+	int ret;
+	weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
+	process_func=process_func_ptr_ptr[0];
+	pthread_mutex_lock(&mainw->data_mutex);
+	ret=(*process_func)(inst,tc);
+	pthread_mutex_unlock(&mainw->data_mutex);
+	if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
+      }
+      return retval;
+    }
+
     return FILTER_ERROR_NO_IN_CHANNELS;
+  }
+
+  if (weed_plant_has_leaf(filter,"rowstride_alignment_hint")) {
+    int rowstride_alignment_hint=weed_get_int_value(filter,"rowstride_alignment_hint",&error);
+    if ((rowstride_alignment_hint==16||
+	 rowstride_alignment_hint==8||
+	 rowstride_alignment_hint==4||
+	 rowstride_alignment_hint==2)
+	 &&rowstride_alignment_hint>mainw->rowstride_alignment_hint) 
+      mainw->rowstride_alignment_hint=rowstride_alignment_hint;
+  }
 
   if (get_enabled_channel(inst,0,TRUE)==NULL) {
     // we process generators elsewhere
     weed_free(in_channels);
+    weed_free(out_channels);
     return FILTER_ERROR_NO_IN_CHANNELS;
   }
 
   if (is_pure_audio(filter,TRUE)) {
     weed_free(in_channels);
+    weed_free(out_channels);
     return FILTER_ERROR_IS_AUDIO; // we process audio effects elsewhere
   }
 
@@ -1430,26 +1708,38 @@
     out_tracks=weed_get_int_array(init_event,"out_tracks",&error);
   }
 
-  out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
-
   // handle case where in_tracks[i] > than num layers
   // either we temporarily disable the channel, or we can't apply the filter
   num_inc=weed_leaf_num_elements(inst,"in_channels");
 
-  if (num_in_tracks>num_inc) num_in_tracks=num_inc;
+  for (i=0;i<num_inc;i++) {
+    if (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))&&
+	!(weed_plant_has_leaf(in_channels[i],"disabled") && 
+	  weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE))
+      num_in_alpha++;
+  }
+
+  if (num_inc==num_in_alpha) all_ins_alpha=TRUE;
+
+  num_inc-=num_in_alpha;
+
+  if (num_in_tracks>num_inc) num_in_tracks=num_inc; // for example, compound fx
 
   if (num_inc>num_in_tracks) {
-    for (i=num_in_tracks;i<num_inc;i++) {
-      if (!weed_plant_has_leaf(in_channels[i],"disabled")||
-	  weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE) 
-	weed_set_boolean_value(in_channels[i],"temp_disabled",WEED_TRUE);
-      else weed_set_boolean_value(in_channels[i],"temp_disabled",WEED_FALSE);
+    for (i=num_in_tracks;i<num_inc+num_in_alpha;i++) {
+      if (!weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))) {
+	if (!weed_plant_has_leaf(in_channels[i],"disabled")||
+	    weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE) 
+	  weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+   	else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
+      }
     }
   }
 
   while (layers[lcount++]!=NULL);
 
-  for (i=0;i<num_in_tracks;i++) {
+
+  for (k=i=0;i<num_in_tracks;i++) {
     if (in_tracks[i]<0) {
       weed_free(in_tracks);
       weed_free(out_tracks);
@@ -1457,13 +1747,20 @@
       weed_free(out_channels);
       return FILTER_ERROR_INVALID_TRACK; // probably audio
     }
-    channel=in_channels[i];
-    weed_set_boolean_value(channel,"temp_disabled",WEED_FALSE);
+
+    while (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[k],"current_palette",&error))) k++;
+
+    channel=in_channels[k];
+    weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE);
+
     if (in_tracks[i]>=lcount) {
-      for (j=i;j<num_in_tracks;j++) {
+      for (j=k;j<num_in_tracks+num_in_alpha;j++) {
+	if (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) continue;
 	channel=in_channels[j];
 	chantmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"temp_disabled",WEED_TRUE);
+	if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+							  weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
+	  weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
 	else {
 	  weed_free(in_tracks);
 	  weed_free(out_tracks);
@@ -1479,8 +1776,12 @@
       frame=weed_get_int_value(layer,"frame",&error);
       if (frame==0) {
 	// temp disable channels if we can
+	channel=in_channels[k];
 	chantmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"temp_disabled",WEED_TRUE);
+	if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+							  weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE)) {
+	  weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+	}
 	else {
 	  weed_free(in_tracks);
 	  weed_free(out_tracks);
@@ -1490,19 +1791,22 @@
 	}
       }
     }
+    k++;
   }
 
+
   // ensure all chantmpls not marked "optional" have at least one corresponding enabled channel
   // e.g. we could have disabled all channels from a template with "max_repeats" that is not "optional"
   num_ctmpl=weed_leaf_num_elements(filter,"in_channel_templates");
   mand=(int *)g_malloc(num_ctmpl*sizint);
   for (j=0;j<num_ctmpl;j++) mand[j]=0;
   in_ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-  for (i=0;i<num_inc;i++) {
+
+  for (i=0;i<num_inc+num_in_alpha;i++) {
     if ((weed_plant_has_leaf(in_channels[i],"disabled")&&
 	 weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE)||
-	(weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	 weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE)) continue;
+	(weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	 weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)) continue;
     chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
     for (j=0;j<num_ctmpl;j++) {
       if (chantmpl==in_ctmpls[j]) {
@@ -1511,41 +1815,64 @@
       }
     }
   }
-  for (j=0;j<num_ctmpl;j++) if (mand[j]==0&&(!weed_plant_has_leaf(in_ctmpls[j],"optional")||
-					     weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
-    weed_free(in_ctmpls);
-    weed_free(in_tracks);
-    weed_free(out_tracks);
-    weed_free(in_channels);
-    weed_free(out_channels);
-    g_free(mand);
-    return FILTER_ERROR_MISSING_LAYER;
+
+  for (j=0;j<num_ctmpl;j++) {
+    if (mand[j]==0&&(!weed_plant_has_leaf(in_ctmpls[j],"optional")||
+		     weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
+      weed_free(in_ctmpls);
+      weed_free(in_tracks);
+      weed_free(out_tracks);
+      weed_free(in_channels);
+      weed_free(out_channels);
+      g_free(mand);
+      return FILTER_ERROR_MISSING_LAYER;
+    }
   }
+
   weed_free(in_ctmpls);
   g_free(mand);
+
   
+  num_outc=weed_leaf_num_elements(inst,"out_channels");
+
+  for (i=0;i<num_outc;i++) {
+    if (weed_palette_is_alpha_palette(weed_get_int_value(out_channels[i],"current_palette",&error))&&
+	!(weed_plant_has_leaf(out_channels[i],"disabled") && 
+	  weed_get_boolean_value(out_channels[i],"disabled",&error)==WEED_TRUE))
+      num_out_alpha++;
+  }
+
+  if (init_event==NULL||num_compound_fx(inst)>1) num_out_tracks-=num_out_alpha;
+
+  if (num_out_tracks<0) num_out_tracks=0;
+
   // pull frames for tracks
 
-  for (i=0;i<num_out_tracks;i++) {
+  for (i=0;i<num_out_tracks+num_out_alpha;i++) {
+    if (i>=num_outc) continue; // for compound filters, num_out_tracks may not be valid
     channel=out_channels[i];
-    if (weed_plant_has_leaf(channel,"temp_disabled")&&
-	weed_get_boolean_value(channel,"temp_disabled",&error)==WEED_TRUE) continue;
     palette=weed_get_int_value(channel,"current_palette",&error);
-    if (!weed_palette_is_alpha_palette(palette)) {
-      all_outs_alpha=FALSE;
-      break;
-    }
+    if (weed_palette_is_alpha_palette(palette)) continue;
+    if (weed_plant_has_leaf(channel,"host_temp_disabled")&&
+	weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
+    all_outs_alpha=FALSE;
   }
 
-  for (i=0;i<num_in_tracks;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) continue;
+
+  for (j=i=0;i<num_in_tracks;i++) {
+    while (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) j++;
+
+    if (weed_plant_has_leaf(in_channels[j],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[j],"host_temp_disabled",&error)==WEED_TRUE) {
+      j++;
+      continue;
+    }
     layer=layers[in_tracks[i]];
     clip=weed_get_int_value(layer,"clip",&error);
 
     if (!weed_plant_has_leaf(layer,"pixel_data")||weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) {
       // pull_frame will set pixel_data,width,height,current_palette and rowstrides
-      if (!pull_frame(layer,mainw->files[clip]->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) return FILTER_ERROR_MISSING_FRAME;
+      if (!pull_frame(layer,get_image_ext_for_type(mainw->files[clip]->img_type),tc)) return FILTER_ERROR_MISSING_FRAME;
     }
 
     // we only apply transitions and compositors to the scrap file
@@ -1556,7 +1883,7 @@
     if ((inwidth=(weed_get_int_value(layer,"width",&error)*weed_palette_get_pixels_per_macropixel(palette)))>maxinwidth) 
       maxinwidth=inwidth;
     if ((inheight=weed_get_int_value(layer,"height",&error))>maxinheight) maxinheight=inheight;
-
+    j++;
   }
 
   // pixels
@@ -1564,18 +1891,28 @@
   if (maxinheight<opheight||opheight==0) opheight=maxinheight;
 
   // first we resize if necessary; then we change the palette
-  for (i=0;i<num_in_tracks;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) continue;
+
+  for (k=i=0;k<num_inc+num_in_alpha;k++) {
+
+    channel=get_enabled_channel(inst,k,TRUE);
+    if (channel==NULL) break;
     
-    layer=layers[in_tracks[i]];
-    channel=get_enabled_channel(inst,i,TRUE);
+    if (weed_plant_has_leaf(channel,"host_temp_disabled")&&
+	weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
+
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
     
     if (def_channel==NULL) def_channel=channel;
 
-    palette=weed_get_int_value(layer,"current_palette",&error);
-    
+    if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
+      if (def_channel==channel) continue;
+      palette=weed_get_int_value(channel,"current_palette",&error);
+    }
+    else {
+      layer=layers[in_tracks[i]];
+      palette=weed_get_int_value(layer,"current_palette",&error);
+    }
+
     // values in pixels
     width=opwidth;
     height=opheight;
@@ -1587,9 +1924,15 @@
     incwidth=weed_get_int_value(channel,"width",&error);
     incheight=weed_get_int_value(channel,"height",&error);
 
-    // (layer macropixels)
-    inwidth=weed_get_int_value(layer,"width",&error);
-    inheight=weed_get_int_value(layer,"height",&error);
+    if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
+      inwidth=weed_get_int_value(def_channel,"width",&error);
+      inheight=weed_get_int_value(def_channel,"height",&error);
+    }
+    else {
+      // (layer macropixels)
+      inwidth=weed_get_int_value(layer,"width",&error);
+      inheight=weed_get_int_value(layer,"height",&error);
+    }
 
     if (channel_flags&WEED_CHANNEL_SIZE_CAN_VARY) {
       width=inwidth*weed_palette_get_pixels_per_macropixel(palette); // convert inwidth to pixels
@@ -1598,25 +1941,32 @@
 
     cpalette=weed_get_int_value(channel,"current_palette",&error);
     width/=weed_palette_get_pixels_per_macropixel(cpalette); // convert width to (channel) macropixels
-    
+
+    if (weed_plant_has_leaf(channel,"YUV_clamping")) iclamping=(weed_get_int_value(channel,"YUV_clamping",&error));
+    else iclamping=0;
 
     // try to set our target width height - the channel may have restrictions
     set_channel_size(channel,width,height,0,NULL);
+
+    if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) continue;
+
     width=weed_get_int_value(channel,"width",&error)*weed_palette_get_pixels_per_macropixel(cpalette)/
       weed_palette_get_pixels_per_macropixel(palette);
     height=weed_get_int_value(channel,"height",&error);
 
     // restore channel to original size for now
+
     set_channel_size(channel,incwidth,incheight,0,NULL);
 
+
     // check if we need to resize
     if ((inwidth!=width)||(inheight!=height)) {
-     // layer needs resizing
+      // layer needs resizing
       if (prefs->pb_quality==PB_QUALITY_HIGH||opwidth==0||opheight==0) {
-	resize_layer(layer,width,height,GDK_INTERP_HYPER);
+	if (!resize_layer(layer,width,height,GDK_INTERP_HYPER,cpalette,iclamping)) return FILTER_ERROR_UNABLE_TO_RESIZE;
       }
       else {
-	resize_layer(layer,width,height,get_interp_value(prefs->pb_quality));
+	if (!resize_layer(layer,width,height,get_interp_value(prefs->pb_quality),cpalette,iclamping)) return FILTER_ERROR_UNABLE_TO_RESIZE;
       }
 
       inwidth=weed_get_int_value(layer,"width",&error);
@@ -1631,6 +1981,9 @@
       }
     }
     
+
+    i++;
+
     // check palette again in case it changed during resize
     palette=weed_get_int_value(layer,"current_palette",&error);
     inpalette=weed_get_int_value(channel,"current_palette",&error);
@@ -1675,20 +2028,76 @@
     }
   }
 
+  // we stored original key/mode to use here
+  if (weed_plant_has_leaf(inst,"host_key")) {
+    // pull from alpha chain
+    int key=weed_get_int_value(inst,"host_key",&error),mode;
+    if (weed_plant_has_leaf(inst,"host_mode")) {
+      mode=weed_get_int_value(inst,"host_mode",&error);
+    }
+    else mode=key_modes[key];
+
+    // need to do this AFTER setting in-channel size
+    if (mainw->cconx!=NULL) {
+      // chain any alpha channels
+      if (cconx_chain_data(key,mode)) needs_reinit=TRUE;
+    }
+  }
+
+  // make sure we have pixel_data for all mandatory in alpha channels (from alpha chains)
+  // if not, if the ctmpl is optnl mark as host_temp_disabled; else return with error
+
+  for (i=0;i<num_inc+num_in_alpha;i++) {
+    if (!weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))) continue;
+
+    if (weed_plant_has_leaf(in_channels[i],"host_internal_connection")) {
+      if (cconx_chain_data_internal(in_channels[i])) needs_reinit=TRUE;
+    }
+
+    if (weed_get_voidptr_value(in_channels[i],"pixel_data",&error)==NULL) {
+      chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
+      if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+							weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
+	weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+      else {
+	return FILTER_ERROR_MISSING_CHANNEL;
+      }
+    }
+  }
+
+
   // now we do a second pass, and we change the palettes of in layers to match the channel, if necessary
 
-  for (i=0;i<num_in_tracks;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) continue;
-    
-    layer=layers[in_tracks[i]];
-    channel=get_enabled_channel(inst,i,TRUE);
-    chantmpl=weed_get_plantptr_value(channel,"template",&error);
 
-    inpalette=weed_get_int_value(channel,"current_palette",&error);
+  for (j=i=0;i<num_in_tracks;i++) {
 
-    channel_flags=0;
-    if (weed_plant_has_leaf(chantmpl,"flags")) channel_flags=weed_get_int_value(chantmpl,"flags",&error);
+
+    do {
+      channel=get_enabled_channel(inst,i,TRUE);
+      chantmpl=weed_get_plantptr_value(channel,"template",&error);
+      
+      inpalette=weed_get_int_value(channel,"current_palette",&error);
+      
+      channel_flags=0;
+      if (weed_plant_has_leaf(chantmpl,"flags")) channel_flags=weed_get_int_value(chantmpl,"flags",&error);
+
+      if (weed_palette_is_alpha_palette(inpalette)) {
+	if (!(channel_flags&WEED_CHANNEL_SIZE_CAN_VARY)) {
+	  width=weed_get_int_value(channel,"width",&error);
+	  height=weed_get_int_value(channel,"height",&error);
+	  if (width != opwidth || height != opheight) {
+	    if (!resize_layer(channel,opwidth,opheight,GDK_INTERP_HYPER,WEED_PALETTE_END,0)) return FILTER_ERROR_UNABLE_TO_RESIZE;
+
+	  }
+	}
+      }
+    } while (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error)));
+
+
+    if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) continue;
+    
+    layer=layers[in_tracks[i]];
 
     if (weed_plant_has_leaf(layer,"YUV_clamping")) iclamping=(weed_get_int_value(layer,"YUV_clamping",&error));
     else iclamping=WEED_YUV_CLAMPING_CLAMPED;
@@ -1776,8 +2185,6 @@
       weed_leaf_delete(channel,"YUV_subspace");
     }
 
-    if (!weed_palette_is_alpha_palette(inpalette)) all_ins_alpha=FALSE;
-
     incwidth=weed_get_int_value(channel,"width",&error);
     incheight=weed_get_int_value(channel,"height",&error);
     
@@ -1813,7 +2220,7 @@
     // align memory if necessary
     if (weed_plant_has_leaf(chantmpl,"alignment")) {
       int alignment=weed_get_int_value(chantmpl,"alignment",&error);
-      gboolean contiguous=FALSE;
+      boolean contiguous=FALSE;
       if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && 
 	  weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
       align(pixel_data,alignment,numplanes,height,rowstrides,&contiguous);
@@ -1835,15 +2242,18 @@
   }
 
   // we may need to disable some channels for the plugin
-  for (i=0;i<num_in_tracks;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) 
+  for (i=0;i<num_in_tracks+num_in_alpha;i++) {
+    if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) 
       weed_set_boolean_value(in_channels[i],"disabled",WEED_TRUE);
   }
 
   // set up our out channels
-  for (i=0;i<num_out_tracks;i++) {
+  for (i=0;i<num_out_tracks+num_out_alpha;i++) {
+
     channel=get_enabled_channel(inst,i,FALSE);
+    if (channel==NULL) break; // compound fx
+
     palette=weed_get_int_value(channel,"current_palette",&error);
 
     if (!weed_palette_is_alpha_palette(palette)&&out_tracks[i]<0) {
@@ -1870,55 +2280,72 @@
     nchr=weed_leaf_num_elements(channel,"rowstrides");
     channel_rows=weed_get_int_array(channel,"rowstrides",&error);
 
-    if (def_channel!=NULL&&i==0&&(in_tracks[0]==out_tracks[0])) {
+    if (def_channel!=NULL&&i==0&&(weed_palette_is_alpha_palette
+				  (weed_get_int_value(channel,"current_palette",&error)&&
+				   weed_palette_is_alpha_palette
+				   (weed_get_int_value(def_channel,"current_palette",&error)
+				    ))||
+				  (in_tracks!=NULL&&out_tracks!=NULL&&in_tracks[0]==out_tracks[0]))) {
       if (channel_flags&WEED_CHANNEL_CAN_DO_INPLACE) {
-	// ah, good, inplace
-	int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
-	int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
-	palette=weed_get_int_value(def_channel,"current_palette",&error);
-	if (check_weed_palette_list(palettes,num_palettes,palette)==palette) {
-	  weed_set_int_value(channel,"current_palette",palette);
-	  if (outpalette!=palette&&(channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE)) needs_reinit=TRUE;
-	  width=weed_get_int_value(def_channel,"width",&error);
-	  height=weed_get_int_value(def_channel,"height",&error);
-	  weed_set_int_value(channel,"width",width);
-	  weed_set_int_value(channel,"height",height);
-	  weed_set_int_value(channel,"current_palette",palette);
-	  if (weed_plant_has_leaf(def_channel,"YUV_clamping")) {
-	    oclamping=(weed_get_int_value(def_channel,"YUV_clamping",&error));
-	    weed_set_int_value(channel,"YUV_clamping",oclamping);
-	  }
-	  else weed_leaf_delete(channel,"YUV_clamping");
-	  
-	  if (weed_plant_has_leaf(def_channel,"YUV_sampling")) 
-	    weed_set_int_value(channel,"YUV_sampling",weed_get_int_value(def_channel,"YUV_sampling",&error));
-	  else weed_leaf_delete(channel,"YUV_sampling");
-	  
-	  if (weed_plant_has_leaf(def_channel,"YUV_subspace")) 
-	    weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(def_channel,"YUV_subspace",&error));
-	  else weed_leaf_delete(channel,"YUV_subspace");
+	if (!(weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error) &&
+					    weed_plant_has_leaf(channel,"host_orig_pdata") && 
+					    weed_get_boolean_value(channel,"host_orig_pdata",&error)==WEED_TRUE))) {
 
-	  numplanes=weed_leaf_num_elements(def_channel,"rowstrides");
-	  layer_rows=weed_get_int_array(def_channel,"rowstrides",&error);
-	  weed_set_int_array(channel,"rowstrides",numplanes,layer_rows);
-	  pixel_data=weed_get_voidptr_array(def_channel,"pixel_data",&error);
-	  weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
-	  weed_free(pixel_data);
-	  weed_set_boolean_value(channel,"inplace",WEED_TRUE);
-	  inplace=TRUE;
-	  if (weed_plant_has_leaf(def_channel,"host_pixel_data_contiguous")) 
-	    weed_set_boolean_value(channel,"host_pixel_data_contiguous",
-				   weed_get_boolean_value(def_channel,"host_pixel_data_contiguous",&error));
-	  else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
-	    weed_leaf_delete(channel,"host_pixel_data_contiguous");
+	  // ah, good, inplace
+	  int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
+	  int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
+	  palette=weed_get_int_value(def_channel,"current_palette",&error);
+	  if (check_weed_palette_list(palettes,num_palettes,palette)==palette) {
+	    weed_set_int_value(channel,"current_palette",palette);
+	    if (outpalette!=palette&&(channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE)) needs_reinit=TRUE;
+
+	    width=weed_get_int_value(def_channel,"width",&error);
+	    height=weed_get_int_value(def_channel,"height",&error);
+	    weed_set_int_value(channel,"width",width);
+	    weed_set_int_value(channel,"height",height);
+
+	    weed_set_int_value(channel,"current_palette",palette);
+	    if (weed_plant_has_leaf(def_channel,"YUV_clamping")) {
+	      oclamping=(weed_get_int_value(def_channel,"YUV_clamping",&error));
+	      weed_set_int_value(channel,"YUV_clamping",oclamping);
+	    }
+	    else weed_leaf_delete(channel,"YUV_clamping");
+	    
+	    if (weed_plant_has_leaf(def_channel,"YUV_sampling")) 
+	      weed_set_int_value(channel,"YUV_sampling",weed_get_int_value(def_channel,"YUV_sampling",&error));
+	    else weed_leaf_delete(channel,"YUV_sampling");
+	    
+	    if (weed_plant_has_leaf(def_channel,"YUV_subspace")) 
+	      weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(def_channel,"YUV_subspace",&error));
+	    else weed_leaf_delete(channel,"YUV_subspace");
+	    
+	    numplanes=weed_leaf_num_elements(def_channel,"rowstrides");
+	    layer_rows=weed_get_int_array(def_channel,"rowstrides",&error);
+	    weed_set_int_array(channel,"rowstrides",numplanes,layer_rows);
+	    pixel_data=weed_get_voidptr_array(def_channel,"pixel_data",&error);
+	    weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
+	    weed_free(pixel_data);
+	    weed_set_boolean_value(channel,"inplace",WEED_TRUE);
+	    inplace=TRUE;
+	    if (weed_plant_has_leaf(def_channel,"host_pixel_data_contiguous")) 
+	      weed_set_boolean_value(channel,"host_pixel_data_contiguous",
+				     weed_get_boolean_value(def_channel,"host_pixel_data_contiguous",&error));
+	    else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
+	      weed_leaf_delete(channel,"host_pixel_data_contiguous");
+
+	    if (weed_palette_is_alpha_palette(palette)) {
+	      // protect our in- channel from being freed()
+	      weed_set_boolean_value(channel,"host_orig_pdata",WEED_TRUE);
+	    }
+	  }
+	  weed_free(palettes);
 	}
-	weed_free(palettes);
       }
     }
 
     if (def_channel==NULL) def_channel=get_enabled_channel(inst,0,FALSE);
 
-    if (weed_get_boolean_value(def_channel,"temp_disabled",&error)==WEED_TRUE) def_disabled=TRUE; 
+    if (weed_get_boolean_value(def_channel,"host_temp_disabled",&error)==WEED_TRUE) def_disabled=TRUE; 
 
     ignore_palette=FALSE;
 
@@ -1973,19 +2400,34 @@
 
       palette=weed_get_int_value(channel,"current_palette",&error);
 
-      set_channel_size(channel,opwidth/weed_palette_get_pixels_per_macropixel(palette),opheight,1,NULL);
+      if (weed_plant_has_leaf(channel,"host_width")) {
+	width=opwidth=weed_get_int_value(channel,"host_width",&error);
+	height=opheight=weed_get_int_value(channel,"host_height",&error);
+      }
+      else {
+	width=weed_get_int_value(def_channel,"width",&error);
+	height=weed_get_int_value(def_channel,"height",&error);
+      }
+
+      pdata=weed_get_voidptr_value(channel,"pixel_data",&error);
 
+      if (weed_palette_is_alpha_palette(palette)&&outpalette==palette&&outwidth==width&&outheight==height&&pdata!=NULL) {
+	weed_free(channel_rows);
+	continue;
+      }
+
+      set_channel_size(channel,opwidth/weed_palette_get_pixels_per_macropixel(palette),opheight,1,NULL);
 
       // this will look at width, height, current_palette, and create an empty pixel_data and set rowstrides
-      create_empty_pixel_data(channel,FALSE,TRUE);
       // and update width and height if necessary
+      create_empty_pixel_data(channel,FALSE,TRUE);
 
       numplanes=weed_leaf_num_elements(channel,"rowstrides");
       layer_rows=weed_get_int_array(channel,"rowstrides",&error);
       // align memory if necessary
       if (weed_plant_has_leaf(chantmpl,"alignment")) {
 	int alignment=weed_get_int_value(chantmpl,"alignment",&error);
-	gboolean contiguous=FALSE;
+	boolean contiguous=FALSE;
 	if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") && 
 	    weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
 
@@ -1997,6 +2439,7 @@
 
 	weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
 	weed_free(pixel_data);
+
 	if (contiguous) weed_set_boolean_value(channel,"host_pixel_data_contiguous",WEED_TRUE);
 	else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
 	  weed_leaf_delete(channel,"host_pixel_data_contiguous");
@@ -2015,10 +2458,11 @@
     if ((rowstrides_changed&&(channel_flags&WEED_CHANNEL_REINIT_ON_ROWSTRIDES_CHANGE))||
 	(((outwidth!=width)||(outheight!=height))&&(channel_flags&WEED_CHANNEL_REINIT_ON_SIZE_CHANGE))) 
       needs_reinit=TRUE;
+
   }
   
   if (needs_reinit) {
-    if ((retval=weed_reinit_effect(inst,TRUE))==FILTER_ERROR_COULD_NOT_REINIT) {
+    if ((retval=weed_reinit_effect(inst,FALSE))==FILTER_ERROR_COULD_NOT_REINIT) {
       weed_free(in_tracks);
       weed_free(out_tracks);
       weed_free(in_channels);
@@ -2035,19 +2479,22 @@
   //...finally we are ready to apply the filter
 
   // see if we can multithread
-  if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && weed_plant_has_leaf(filter,"flags")) 
-    filter_flags=weed_get_int_value(filter,"flags",&error);
-
-  if (filter_flags&WEED_FILTER_HINT_MAY_THREAD) retval=process_func_threaded(inst,out_channels,tc);
-  else {
+  if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && 
+      filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
+    retval=process_func_threaded(inst,out_channels,tc);
+    if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
+  }
+  if (!did_thread) {
     // normal single threaded version
     int ret;
     weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
     process_func=process_func_ptr_ptr[0];
+    pthread_mutex_lock(&mainw->data_mutex);
     ret=(*process_func)(inst,tc);
+    pthread_mutex_unlock(&mainw->data_mutex);
     if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
   }
-
+  
   if (retval==FILTER_ERROR_MUST_RELOAD) {
     weed_free(in_tracks);
     weed_free(out_tracks);
@@ -2059,48 +2506,69 @@
     return retval;
   }
 
-  // now we write our out channels back to layers, leaving the palettes and sizes unchanged
-  for (i=0;i<num_out_tracks;i++) {
-    channel=get_enabled_channel(inst,i,FALSE);
-    if (weed_get_boolean_value(channel,"inplace",&error)==WEED_TRUE) continue;
-
-    numplanes=weed_leaf_num_elements(channel,"rowstrides");
-    palette=weed_get_int_value(channel,"current_palette",&error);
+  for (k=0;k<num_inc+num_in_alpha;k++) {
+    channel=get_enabled_channel(inst,k,TRUE);
+    if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
+      // free pdata for all alpha in channels, unless orig pdata was passed from a prior fx
+
+      if (!weed_plant_has_leaf(channel,"host_orig_pdata")||
+	  weed_get_boolean_value(channel,"host_orig_pdata",&error)!=WEED_TRUE) {
+	pdata=weed_get_voidptr_value(channel,"pixel_data",&error);
+	if (pdata!=NULL) g_free(pdata);
+      }
+      weed_set_voidptr_value(channel,"pixel_data",NULL);
+      if (weed_plant_has_leaf(channel,"host_orig_pdata")) 
+	weed_leaf_delete(channel,"host_orig_pdata");
+    }
+  }
 
+  // now we write our out channels back to layers, leaving the palettes and sizes unchanged
 
-    if (weed_palette_is_alpha_palette(palette)) {
-      // free this for now, but in future we will retain this
+  for (i=k=0;k<num_out_tracks+num_out_alpha;k++) {
 
-      numplanes=weed_leaf_num_elements(channel,"pixel_data");
-      pixel_data=weed_get_voidptr_array(channel,"pixel_data",&error);
+    channel=get_enabled_channel(inst,k,FALSE);
+    if (channel==NULL) break; // compound fx
 
-      if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") && 
-	  weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE)
-	numplanes=1;
+    if (weed_get_boolean_value(channel,"inplace",&error)==WEED_TRUE) continue;
 
-      for (j=0;j<numplanes;j++) g_free(pixel_data[j]);
-      weed_free(pixel_data);
+    if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
+      // out chan data for alpha is freed after all fx proc - in case we need for in chans
       continue;
     }
 
+    numplanes=weed_leaf_num_elements(channel,"rowstrides");
+    palette=weed_get_int_value(channel,"current_palette",&error);
+
     layer=layers[out_tracks[i]];
 
     rowstrides=weed_get_int_array(channel,"rowstrides",&error);
     weed_set_int_array(layer,"rowstrides",numplanes,rowstrides);
     weed_free(rowstrides);
     numplanes=weed_leaf_num_elements(layer,"pixel_data");
-
+      
     pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
-    if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && 
-	weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
-      numplanes=1;
+    if (pixel_data!=NULL) {
+      if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && 
+	  weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
+	numplanes=1;
+      
+      for (j=0;j<numplanes;j++) if (pixel_data[j]!=NULL) g_free(pixel_data[j]);
+      weed_free(pixel_data);
+    }
+
 
-    for (j=0;j<numplanes;j++) g_free(pixel_data[j]);
-    weed_free(pixel_data);
     numplanes=weed_leaf_num_elements(channel,"pixel_data");
     pixel_data=weed_get_voidptr_array(channel,"pixel_data",&error);
     weed_set_voidptr_array(layer,"pixel_data",numplanes,pixel_data);
     weed_free(pixel_data);
+    
+    // set this in case it was a resize plugin
+    width=weed_get_int_value(channel,"width",&error);
+    height=weed_get_int_value(channel,"height",&error);
+    weed_set_int_value(layer,"width",width);
+    weed_set_int_value(layer,"height",height);
+
+    i++;
 
     if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",
@@ -2113,14 +2581,7 @@
     if (weed_plant_has_leaf(chantmpl,"flags")) flags=weed_get_int_value(chantmpl,"flags",&error);
     else flags=0;
 
-    if (flags&WEED_CHANNEL_OUT_ALPHA_PREMULT) weed_set_int_value(layer,"flags",WEED_CHANNEL_ALPHA_PREMULT);
-
-
-    weed_set_int_value(layer,"current_palette",weed_get_int_value(channel,"current_palette",&error));
-    weed_set_int_value(layer,"width",weed_get_int_value(channel,"width",&error));
-    weed_set_int_value(layer,"height",weed_get_int_value(channel,"height",&error));
-
-    if (weed_plant_has_leaf(channel,"YUV_clamping")) {
+    if (weed_plant_has_leaf(channel,"YUV_clamping")) { 
       oclamping=(weed_get_int_value(channel,"YUV_clamping",&error));
       weed_set_int_value(layer,"YUV_clamping",oclamping);
     }
@@ -2136,11 +2597,11 @@
 
   }
 
-  for (i=0;i<num_inc;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) {
+  for (i=0;i<num_inc+num_in_alpha;i++) {
+    if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) {
       weed_set_boolean_value(in_channels[i],"disabled",WEED_FALSE);
-      weed_set_boolean_value(in_channels[i],"temp_disabled",WEED_FALSE);
+      weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
     }
   }
   // done...
@@ -2164,14 +2625,13 @@
   int num_in_tracks,num_out_tracks;
   int *in_tracks,*out_tracks;
   int error,i,j;
-  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  weed_plant_t *filter=weed_instance_get_filter(inst,FALSE);
   weed_plant_t *layer;
-  weed_plant_t **in_channels,**out_channels,*channel,*chantmpl;
-  //gboolean needs_reinit=FALSE;
-  gboolean inplace=FALSE;
+  weed_plant_t **in_channels,**out_channels=NULL,*channel,*chantmpl;
+
+  boolean inplace=FALSE;
   weed_process_f *process_func_ptr_ptr;
   weed_process_f process_func;
-  weed_plant_t *def_channel=NULL;
   lives_filter_error_t retval=FILTER_NO_ERROR;
   int *mand;
   int channel_flags;
@@ -2181,8 +2641,11 @@
 
   int nchans=0;
   int nsamps=0;
-  void *adata=NULL;
+  void *adata=NULL,*adata0=NULL;
 
+  // TODO - handle the following:
+  // input audio_channels are mono, but the plugin NEEDS stereo
+  
   if (!weed_plant_has_leaf(inst,"in_channels")||(in_channels=weed_get_plantptr_array(inst,"in_channels",&error))==NULL) 
     return FILTER_ERROR_NO_IN_CHANNELS;
 
@@ -2191,6 +2654,7 @@
     return FILTER_ERROR_NO_IN_CHANNELS;
   }
 
+
   if (init_event==NULL) {
     num_in_tracks=enabled_in_channels(inst,FALSE);
     in_tracks=(int *)weed_malloc(2*sizint);
@@ -2207,7 +2671,9 @@
     out_tracks=weed_get_int_array(init_event,"out_tracks",&error);
   }
 
-  out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
+  if (!weed_plant_has_leaf(inst,"out_channels")||(out_channels=weed_get_plantptr_array(inst,"out_channels",&error))==NULL) {
+    num_out_tracks=0;
+  }
 
   // handle case where in_tracks[i] > than num layers
   // either we temporarily disable the channel, or we can't apply the filter
@@ -2219,28 +2685,26 @@
     for (i=num_in_tracks;i<num_inc;i++) {
       if (!weed_plant_has_leaf(in_channels[i],"disabled")||
 	  weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE) 
-	weed_set_boolean_value(in_channels[i],"temp_disabled",WEED_TRUE);
-      else weed_set_boolean_value(in_channels[i],"temp_disabled",WEED_FALSE);
+	weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+      else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
     }
   }
 
-  // TODO - something like...
-  //if (clip==mainw->ascrap_file&&num_in_tracks==1&&num_out_tracks==1) return FILTER_ERROR_IS_ASCRAP_FILE;
 
   for (i=0;i<num_in_tracks;i++) {
     channel=in_channels[i];
-    weed_set_boolean_value(channel,"temp_disabled",WEED_FALSE);
-    layer=layers[in_tracks[i]+nbtracks];
+    weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE);
+    layer=layers[i];
     if (layer==NULL) {
       for (j=i;j<num_in_tracks;j++) {
 	channel=in_channels[j];
 	chantmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"temp_disabled",WEED_TRUE);
+	if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
 	else {
 	  weed_free(in_tracks);
 	  weed_free(out_tracks);
 	  weed_free(in_channels);
-	  weed_free(out_channels);
+	  if (out_channels!=NULL) weed_free(out_channels);
 	  return FILTER_ERROR_MISSING_LAYER;
 	}
       }
@@ -2248,7 +2712,7 @@
     }
     if (weed_get_voidptr_value(layer,"audio_data",&error)==NULL) {
       chantmpl=weed_get_plantptr_value(channel,"template",&error);
-      if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"temp_disabled",WEED_TRUE);
+      if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
     }
   }
 
@@ -2261,8 +2725,8 @@
   for (i=0;i<num_inc;i++) {
     if ((weed_plant_has_leaf(in_channels[i],"disabled")&&
 	 weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE)||
-	(weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	 weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE)) continue;
+	(weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	 weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)) continue;
     chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
     for (j=0;j<num_ctmpl;j++) {
       if (chantmpl==in_ctmpls[j]) {
@@ -2273,51 +2737,63 @@
   }
   for (j=0;j<num_ctmpl;j++) if (mand[j]==0&&(!weed_plant_has_leaf(in_ctmpls[j],"optional")||
 					     weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
-    weed_free(in_ctmpls);
-    weed_free(in_tracks);
-    weed_free(out_tracks);
-    weed_free(in_channels);
-    weed_free(out_channels);
-    g_free(mand);
-    return FILTER_ERROR_MISSING_LAYER;
-  }
+      weed_free(in_ctmpls);
+      weed_free(in_tracks);
+      weed_free(out_tracks);
+      weed_free(in_channels);
+      if (out_channels!=NULL) weed_free(out_channels);
+      g_free(mand);
+      return FILTER_ERROR_MISSING_LAYER;
+    }
   weed_free(in_ctmpls);
   g_free(mand);
 
   for (i=0;i<num_in_tracks;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) continue;
+    if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) continue;
 
-    layer=layers[in_tracks[i]+nbtracks];
+    layer=layers[i];
     channel=get_enabled_channel(inst,i,TRUE);
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
 
     weed_set_int64_value(channel,"timecode",tc);
     adata=weed_get_voidptr_value(layer,"audio_data",&error);
+    if (i==0) adata0=adata;
 
     // nchans and nsamps needed for inplace
     nchans=weed_get_int_value(channel,"audio_channels",&error);
     nsamps=weed_get_int_value(channel,"audio_data_length",&error);
+
+    if (weed_get_boolean_value(channel,"audio_interleaf",&error)==WEED_TRUE) {
+      // handle case where plugin NEEDS interleaved
+      weed_set_boolean_value(layers[i],"audio_interleaf",WEED_TRUE);
+      if (!float_interleave((float *)adata,nsamps,nchans)) {
+	weed_free(in_tracks);
+	weed_free(out_tracks);
+	weed_free(in_channels);
+	if (out_channels!=NULL) weed_free(out_channels);
+	return FILTER_ERROR_MEMORY_ERROR;
+      }
+    }
+
     weed_set_voidptr_value(channel,"audio_data",adata);
   }
 
   // we may need to disable some channels for the plugin
   for (i=0;i<num_in_tracks;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) 
+    if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) 
       weed_set_boolean_value(in_channels[i],"disabled",WEED_TRUE);
   }
 
   // set up our out channels
   for (i=0;i<num_out_tracks;i++) {
-    if (out_tracks[i]>(nbtracks>0?-1:0)) {
+    if (out_tracks[i]!=in_tracks[i]) {
       weed_free(in_tracks);
       weed_free(out_tracks);
       weed_free(in_channels);
-      weed_free(out_channels);
+      if (out_channels!=NULL) weed_free(out_channels);
       return FILTER_ERROR_INVALID_TRACK; // can't yet mix audio and video
-      // as a special exception, we allow our mixer to generate audio to layer 0, if and 
-      // only if we have no backing audio
     }
 
     channel=get_enabled_channel(inst,i,FALSE);
@@ -2326,10 +2802,9 @@
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
     channel_flags=weed_get_int_value(chantmpl,"flags",&error);
     
-    if (def_channel!=NULL&&i==0&&(in_tracks[0]==out_tracks[0])) {
+    if (i==0&&(in_tracks[0]==out_tracks[0])&&adata0!=NULL) {
       if (channel_flags&WEED_CHANNEL_CAN_DO_INPLACE) {
 	// ah, good, inplace
-	weed_set_boolean_value(channel,"inplace",WEED_TRUE);
 	inplace=TRUE;
       }
     }
@@ -2338,12 +2813,13 @@
       float *abuf=(float *)g_malloc0(nchans*nsamps*sizeof(float));
       weed_set_int_value(channel,"audio_data_length",nsamps);
       weed_set_voidptr_value(channel,"audio_data",abuf);
+      inplace=FALSE;
     }
     else {
       weed_set_int_value(channel,"audio_data_length",nsamps);
-      weed_set_voidptr_value(channel,"audio_data",adata);
+      weed_set_voidptr_value(channel,"audio_data",adata0);
+      weed_set_boolean_value(layers[i],"audio_interleaf",weed_get_boolean_value(channel,"audio_interleaf",&error));
     }
-    weed_set_boolean_value(channel,"inplace",WEED_FALSE);
   }
 
   weed_set_double_value(inst,"fps",cfile->pb_fps);
@@ -2352,24 +2828,31 @@
   pthread_mutex_lock(&mainw->interp_mutex); // stop video thread from possibly interpolating our audio effects
   weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
   process_func=process_func_ptr_ptr[0];
+  pthread_mutex_lock(&mainw->data_mutex);
 
   if ((*process_func)(inst,tc)==WEED_ERROR_PLUGIN_INVALID) {
+    pthread_mutex_unlock(&mainw->data_mutex);
     pthread_mutex_unlock(&mainw->interp_mutex);
     weed_free(in_tracks);
     weed_free(out_tracks);
     weed_free(in_channels);
-    weed_free(out_channels);
+    if (out_channels!=NULL) weed_free(out_channels);
     return FILTER_ERROR_MUST_RELOAD;
   }
+
   pthread_mutex_unlock(&mainw->interp_mutex);
+  pthread_mutex_unlock(&mainw->data_mutex);
 
   // TODO - handle process errors (WEED_ERROR_PLUGIN_INVALID)
 
-  // now we write our out channels back to layers, leaving the palettes and sizes unchanged
+  // now we write our out channels back to layers
   for (i=0;i<num_out_tracks;i++) {
+    if (i==0&&inplace) continue;
+
+    // TODO - check this...
+
     channel=get_enabled_channel(inst,i,FALSE);
-    if (weed_get_boolean_value(channel,"inplace",&error)==WEED_TRUE) continue;
-    layer=layers[out_tracks[i]+nbtracks];
+    layer=layers[i];
     if (weed_plant_has_leaf(channel,"audio_data")) {
       float *audio_data=(float *)weed_get_voidptr_value(layer,"audio_data",&error);
       if (audio_data!=NULL) weed_free(audio_data);
@@ -2378,10 +2861,10 @@
   }
 
   for (i=0;i<num_inc;i++) {
-    if (weed_plant_has_leaf(in_channels[i],"temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"temp_disabled",&error)==WEED_TRUE) {
+    if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) {
       weed_set_boolean_value(in_channels[i],"disabled",WEED_FALSE);
-      weed_set_boolean_value(in_channels[i],"temp_disabled",WEED_FALSE);
+      weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
     }
   }
   // done...
@@ -2389,7 +2872,7 @@
   weed_free(in_tracks);
   weed_free(out_tracks);
   weed_free(in_channels);
-  weed_free(out_channels);
+  if (out_channels!=NULL) weed_free(out_channels);
 
 
   return retval;
@@ -2399,246 +2882,369 @@
 
 
 lives_filter_error_t weed_apply_audio_instance (weed_plant_t *init_event, float **abuf, int nbtracks, int nchans, 
-						long nsamps, gdouble arate, weed_timecode_t tc, double *vis) {
-  void *in_abuf,*out_abuf;
-  int i,j,error;
-  weed_plant_t **layers;
-  weed_plant_t *instance,*filter;
+						int64_t nsamps, gdouble arate, weed_timecode_t tc, double *vis) {
+
+
+  float *in_abuf,*out_abuf;
+  int error;
+  weed_plant_t **layers=NULL,**in_channels=NULL,**out_channels=NULL;
+  int *in_tracks=NULL,*out_tracks=NULL;
+  weed_plant_t *instance=NULL,*filter;
   size_t nsf=nsamps*sizeof(float);
-  void **ev_pchains;
-  lives_filter_error_t retval=FILTER_NO_ERROR;
+  lives_filter_error_t retval=FILTER_NO_ERROR,retval2;
   weed_plant_t *channel=NULL;
-  int aint=WEED_FALSE;               // use non-interlaced - TODO
-  gboolean can_reinit=TRUE;
+  boolean needs_reinit=FALSE;
   weed_plant_t *ctmpl;
 
+  boolean was_init_event=FALSE;
+
   int flags=0;
+  int key=-1;
+
+  int ntracks=1;
+  int numinchans=0,numoutchans=0,xnchans,aint;
+
+  register int i,j;
+
+  // caller passes an init_event from event list, or an instance (for realtime mode)
+
+  if (WEED_PLANT_IS_FILTER_INSTANCE(init_event)) {
+    // for realtime, we pass a single instance instead of init_event
+    instance=init_event;
+    // set init_event to NULL before passing it to the inner function
+    init_event=NULL;
+
+    in_tracks=(int *)weed_malloc(sizint);
+    in_tracks[0]=0;
+
+    out_tracks=(int *)weed_malloc(sizint);
+    out_tracks[0]=0;
+
+  }
+  else {
 
-  //  int xnsamps,xnchans,xarate,xaint;
+    // when processing an event list, we pass an init_event
 
-  int ntracks=weed_leaf_num_elements(init_event,"in_tracks");
+    was_init_event=TRUE;
+    if (weed_plant_has_leaf(init_event,"host_tag")) {
+      gchar *keystr=weed_get_string_value(init_event,"host_tag",&error);
+      key=atoi(keystr);
+      weed_free(keystr);
+    }
+    else return FILTER_ERROR_INVALID_INIT_EVENT;
 
-  // check instance exists, and interpolate parameters
-  if (weed_plant_has_leaf(init_event,"host_tag")) {
+    ntracks=weed_leaf_num_elements(init_event,"in_tracks");
+    in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
+
+    if (weed_plant_has_leaf(init_event,"out_tracks")) out_tracks=weed_get_int_array(init_event,"out_tracks",&error);
+
+    // check instance exists, and interpolate parameters
 
-    gchar *keystr=weed_get_string_value(init_event,"host_tag",&error);
-    int key=atoi(keystr);
-    weed_free(keystr);
     if (rte_key_valid (key+1,FALSE)) {
-      if ((instance=key_to_instance[key][key_modes[key]])==NULL)
+      if ((instance=key_to_instance[key][key_modes[key]])==NULL) {
+	weed_free(in_tracks);
+	weed_free(out_tracks);
 	return FILTER_ERROR_INVALID_INSTANCE;
-      if (weed_plant_has_leaf(init_event,"in_parameters")) {
-	ev_pchains=weed_get_voidptr_array(init_event,"in_parameters",&error);
-	if (ev_pchains[0]!=NULL) {
-	  if (!pthread_mutex_trylock(&mainw->interp_mutex)) { // try to minimise thread locking
-	    pthread_mutex_unlock(&mainw->interp_mutex);
-	    if (!interpolate_params(instance,ev_pchains,tc)) {
-	      weed_free(ev_pchains);
-	      return FILTER_ERROR_INTERPOLATION_FAILED;
-	    }
+      }
+      if (mainw->pchains!=NULL&&mainw->pchains[key]!=NULL) {
+	if (!pthread_mutex_trylock(&mainw->interp_mutex)) { // try to minimise thread locking
+	  pthread_mutex_unlock(&mainw->interp_mutex);
+	  if (!interpolate_params(instance,mainw->pchains[key],tc)) {
+	    weed_free(in_tracks);
+	    weed_free(out_tracks);
+	    return FILTER_ERROR_INTERPOLATION_FAILED;
 	  }
 	}
-	weed_free(ev_pchains);
       }
     }
-    else return FILTER_ERROR_INVALID_FILTER;
+    else {
+      weed_free(in_tracks);
+      weed_free(out_tracks);
+      return FILTER_ERROR_INVALID_INIT_EVENT;
+    }
   }
-  else return FILTER_ERROR_INVALID_INIT_EVENT;
+
+ audinst1:
 
   if (weed_plant_has_leaf(instance,"in_channels")) channel=weed_get_plantptr_value(instance,"in_channels",&error);
-  if (channel==NULL) channel=weed_get_plantptr_value(instance,"out_channels",&error);
+  if (channel==NULL) {
+    if (weed_plant_has_leaf(instance,"out_channels")) {
+      retval=FILTER_ERROR_NO_IN_CHANNELS; // audio generators are dealt with by the audio player
+      goto audret1;
+    }
+  }
+  else {
+    in_channels=weed_get_plantptr_array(instance,"in_channels",&error);
+    numinchans=weed_leaf_num_elements(instance,"in_channels");
+  }
 
-  filter=weed_get_plantptr_value(instance,"filter_class",&error);
+  if (weed_plant_has_leaf(instance,"out_channels")) {
+    out_channels=weed_get_plantptr_array(instance,"out_channels",&error);
+    if (out_channels[0]!=NULL) numoutchans=weed_leaf_num_elements(instance,"out_channels");
+  }
 
-  if (nsamps!=weed_get_int_value(channel,"audio_data_length",&error)||
-      nchans!=weed_get_int_value(channel,"audio_channels",&error)||
-      arate!=weed_get_int_value(channel,"audio_rate",&error)||
-      weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
-    // audio mismatch with channel values - adjust channels or resample audio
+  filter=weed_instance_get_filter(instance,FALSE);
 
-    // TODO - check if we can reinit
-    weed_plant_t **in_channels,**out_channels;
-    int numchans;
+  if (!weed_plant_has_leaf(filter,"flags")) weed_set_int_value(filter,"flags",0);
+  else flags=weed_get_int_value(filter,"flags",&error);
 
-    // reset channel values
-    in_channels=weed_get_plantptr_array(instance,"in_channels",&error);
-    numchans=weed_leaf_num_elements(instance,"in_channels");
-    for (i=0;i<numchans;i++) {
-      if ((channel=in_channels[i])!=NULL) {
-	ctmpl=weed_get_plantptr_value(channel,"template",&error);
-	if ((weed_plant_has_leaf(ctmpl,"audio_data_length")&&
-	     weed_get_int_value(ctmpl,"audio_data_length",&error)!=nsamps)||
-	    (weed_plant_has_leaf(ctmpl,"audio_channels")&&weed_get_int_value(ctmpl,"audio_channels",&error)!=nchans)||
-	    (weed_plant_has_leaf(ctmpl,"audio_rate")&&weed_get_int_value(ctmpl,"audio_rate",&error)!=arate)||
-	    (weed_plant_has_leaf(ctmpl,"audio_interleaf")&&
-	     weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint)) {
-	  can_reinit=FALSE;
-	  //xnsamps=weed_get_int_value(channel,"audio_data_length",&error);
-	  //xnchans=weed_get_int_value(channel,"audio_channels",&error);
-	  //xarate=weed_get_int_value(channel,"audio_rate",&error);
-	  //xaint=weed_get_boolean_value(channel,"audio_interleaf",&error);
-	  break;
-	}
+  if (vis!=NULL&&vis[0]<0.&&in_tracks[0]<=-nbtracks) {
+    // first layer comes from ascrap file; do not apply any effects except the audio mixer
+    if (numinchans==1&&numoutchans==1&&!(flags&WEED_FILTER_IS_CONVERTER)) {
+      retval=FILTER_ERROR_IS_SCRAP_FILE;
+      goto audret1;
+    }
+  }
+
+  for (i=0;i<numinchans;i++) {
+    if ((channel=in_channels[i])==NULL) continue;
+
+    aint=WEED_FALSE; // preferred value
+    ctmpl=weed_get_plantptr_value(channel,"template",&error);
+    if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
+      aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+      if (weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
+	needs_reinit=TRUE;
+      }
+    }
+    xnchans=nchans; // preferred value
+    if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
+      xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
+      if (weed_get_int_value(channel,"audio_channels",&error)!=xnchans) {
+	needs_reinit=TRUE;
       }
     }
-    weed_free(in_channels);
+
+  
+    if ((weed_plant_has_leaf(ctmpl,"audio_data_length")&&nsamps!=weed_get_int_value(ctmpl,"audio_data_length",&error))||
+	(weed_plant_has_leaf(ctmpl,"audio_arate")&&arate!=weed_get_int_value(ctmpl,"audio_rate",&error))) {
+      weed_free(in_channels);
+      if (out_channels!=NULL) weed_free(out_channels);
+      retval=FILTER_ERROR_TEMPLATE_MISMATCH;
+      goto audret1;
+    }
+    
+    if (weed_get_int_value(channel,"audio_rate",&error)!=arate) {
+      needs_reinit=TRUE;
+    }
+    
+    weed_set_int_value(channel,"audio_data_length",nsamps);
+    
+  }
       
-    if (can_reinit) {
-      out_channels=weed_get_plantptr_array(instance,"out_channels",&error);
-      numchans=weed_leaf_num_elements(instance,"out_channels");
-      for (i=0;i<numchans;i++) {
-	if ((channel=out_channels[i])!=NULL) {
-	  ctmpl=weed_get_plantptr_value(channel,"template",&error);
-	  if ((weed_plant_has_leaf(ctmpl,"audio_data_length")&&
-	       weed_get_int_value(ctmpl,"audio_data_length",&error)!=nsamps)||
-	      (weed_plant_has_leaf(ctmpl,"audio_channels")&&weed_get_int_value(ctmpl,"audio_channels",&error)!=nchans)||
-	      (weed_plant_has_leaf(ctmpl,"audio_rate")&&weed_get_int_value(ctmpl,"audio_rate",&error)!=arate)||
-	      (weed_plant_has_leaf(ctmpl,"audio_interleaf")&&
-	       weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint)) {
-	    can_reinit=FALSE;
-	    //xnsamps=weed_get_int_value(channel,"audio_data_length",&error);
-	    //xnchans=weed_get_int_value(channel,"audio_channels",&error);
-	    //xarate=weed_get_int_value(channel,"audio_rate",&error);
-	    //xaint=weed_get_boolean_value(channel,"audio_interleaf",&error);
-	    break;
-	  }
-	}
-	weed_free(out_channels);
+  for (i=0;i<numoutchans;i++) {
+    if ((channel=out_channels[i])==NULL) continue;
+
+    aint=WEED_FALSE; // preferred value
+    ctmpl=weed_get_plantptr_value(channel,"template",&error);
+    if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
+      aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+      if (weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
+	needs_reinit=TRUE;
       }
     }
-
-    if (can_reinit) {
-      // - deinit inst
-      weed_call_deinit_func(instance);
-
-      // reset channel values
-      in_channels=weed_get_plantptr_array(instance,"in_channels",&error);
-      numchans=weed_leaf_num_elements(instance,"in_channels");
-      for (i=0;i<numchans;i++) {
-	if ((channel=in_channels[i])!=NULL) {
-	  weed_set_int_value(channel,"audio_data_length",nsamps);
-	  weed_set_int_value(channel,"audio_channels",nchans);
-	  weed_set_int_value(channel,"audio_rate",arate);
-	  weed_set_boolean_value(channel,"audio_interleaf",aint);
-	}
+    xnchans=nchans; // preferred value
+    if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
+      xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
+      if (weed_get_int_value(channel,"audio_channels",&error)!=xnchans) {
+	needs_reinit=TRUE;
       }
+    }
+
+    if ((weed_plant_has_leaf(ctmpl,"audio_data_length")&&nsamps!=weed_get_int_value(ctmpl,"audio_data_length",&error))||
+	(weed_plant_has_leaf(ctmpl,"audio_arate")&&arate!=weed_get_int_value(ctmpl,"audio_rate",&error))) {
       weed_free(in_channels);
+      if (out_channels!=NULL) weed_free(out_channels);
+      retval=FILTER_ERROR_TEMPLATE_MISMATCH;
+      goto audret1;
+    }
+
+    if (weed_get_int_value(channel,"audio_rate",&error)!=arate) {
+      needs_reinit=TRUE;
+    }
+      
+    weed_set_int_value(channel,"audio_data_length",nsamps);
       
-      out_channels=weed_get_plantptr_array(instance,"out_channels",&error);
-      numchans=weed_leaf_num_elements(instance,"out_channels");
-      for (i=0;i<numchans;i++) {
-	if ((channel=out_channels[i])!=NULL) {
-	  weed_set_int_value(channel,"audio_data_length",nsamps);
-	  weed_set_int_value(channel,"audio_channels",nchans);
-	  weed_set_int_value(channel,"audio_rate",arate);
-	  weed_set_boolean_value(channel,"audio_interleaf",aint);
+  }
+
+
+  if (needs_reinit) {
+    // - deinit inst
+    weed_call_deinit_func(instance);
+
+    for (i=0;i<numinchans;i++) {
+      if ((channel=in_channels[i])!=NULL) {
+	aint=WEED_FALSE; // preferred value
+	ctmpl=weed_get_plantptr_value(channel,"template",&error);
+	if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
+	  aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+	}
+	xnchans=nchans; // preferred value
+	if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
+	  xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
 	}
+	  
+	weed_set_boolean_value(channel,"audio_interleaf",aint);
+	weed_set_int_value(channel,"audio_channels",xnchans);
+	weed_set_int_value(channel,"audio_rate",arate);
       }
-      weed_free(out_channels);
-      
-      // - init inst
-      if (weed_plant_has_leaf(filter,"init_func")) {
-	weed_init_f *init_func_ptr_ptr;
-	weed_init_f init_func;
-	weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
-	init_func=init_func_ptr_ptr[0];
-	if (init_func!=NULL) {
-	  gchar *cwd=cd_to_plugin_dir(filter);
-	  set_param_gui_readwrite(instance);
-	  update_host_info(instance);
-	  if ((*init_func)(instance)!=WEED_NO_ERROR) {
-	    key_to_instance[key][key_modes[key]]=NULL;
-	    lives_chdir(cwd,FALSE);
-	    g_free(cwd);
-	    return FILTER_ERROR_COULD_NOT_REINIT;
-	  }
-	  set_param_gui_readonly(instance);
+    }
+
+    for (i=0;i<numoutchans;i++) {
+      if ((channel=out_channels[i])!=NULL) {
+	aint=WEED_FALSE; // preferred value
+	ctmpl=weed_get_plantptr_value(channel,"template",&error);
+	if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
+	  aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+	}
+	xnchans=nchans; // preferred value
+	if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
+	  xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
+	}
+	  
+	weed_set_boolean_value(channel,"audio_interleaf",aint);
+	weed_set_int_value(channel,"audio_channels",xnchans);
+	weed_set_int_value(channel,"audio_rate",arate);
+      }
+    }
+
+    // - init inst
+    if (weed_plant_has_leaf(filter,"init_func")) {
+      weed_init_f *init_func_ptr_ptr;
+      weed_init_f init_func;
+      weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
+      init_func=init_func_ptr_ptr[0];
+      if (init_func!=NULL) {
+	gchar *cwd=cd_to_plugin_dir(filter);
+	set_param_gui_readwrite(instance);
+	update_host_info(instance);
+	if ((*init_func)(instance)!=WEED_NO_ERROR) {
+	  key_to_instance[key][key_modes[key]]=NULL;
 	  lives_chdir(cwd,FALSE);
 	  g_free(cwd);
+	  weed_free(in_channels);
+	  if (out_channels!=NULL) weed_free(out_channels);
+	  retval=FILTER_ERROR_COULD_NOT_REINIT;
+	  goto audret1;
 	}
+	set_param_gui_readonly(instance);
+	lives_chdir(cwd,FALSE);
+	g_free(cwd);
       }
-      retval=FILTER_INFO_REINITED;
-    }
-    else {
-      // else resample if we can - TODO
     }
+    weed_set_boolean_value(instance,"host_inited",WEED_TRUE);
+    retval=FILTER_INFO_REINITED;
   }
 
-  if (!weed_plant_has_leaf(filter,"flags")) weed_set_int_value(filter,"flags",0);
-  else flags=weed_get_int_value(filter,"flags",&error);
+
+
+  if (in_channels!=NULL) weed_free(in_channels);
+  if (out_channels!=NULL) weed_free(out_channels);
 
   // apply visibility mask to volume values
   if (vis!=NULL&&(flags&WEED_FILTER_IS_CONVERTER)) {
-    int vmaster=get_master_vol_param(filter);
+    int vmaster=get_master_vol_param(filter,FALSE);
     if (vmaster!=-1) {
       weed_plant_t **in_params=weed_get_plantptr_array(instance,"in_parameters",&error);
       int nvals=weed_leaf_num_elements(in_params[vmaster],"value");
       double *fvols=weed_get_double_array(in_params[vmaster],"value",&error);
-      int *in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
       for (i=0;i<nvals;i++) {
 	fvols[i]=fvols[i]*vis[in_tracks[i]+nbtracks];
+	if (vis[in_tracks[i]+nbtracks]<0.) fvols[i]=-fvols[i];
       }
+      pthread_mutex_lock(&mainw->data_mutex);
       weed_set_double_array(in_params[vmaster],"value",nvals,fvols);
+      pthread_mutex_unlock(&mainw->data_mutex);
+      set_copy_to(instance,vmaster,TRUE);
       weed_free(fvols);
       weed_free(in_params);
-      weed_free(in_tracks);
     }
   }
 
-  layers=(weed_plant_t **)g_malloc((ntracks+1)*sizeof(weed_plant_t *));
+  if (layers==NULL&&numinchans>0) {
+    layers=(weed_plant_t **)g_malloc((ntracks+1)*sizeof(weed_plant_t *));
 
-  for (i=0;i<ntracks;i++) {
-    layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
+    for (i=0;i<ntracks;i++) {
+      // create audio layers, and copy/combine separated audio into each layer
+      
+      layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
+      
+      // copy audio into layer audio
+      in_abuf=(float *)g_malloc(nchans*nsf);
 
-    in_abuf=g_malloc(nchans*nsf);
-    for (j=0;j<nchans;j++) {
-      lives_memcpy((char *)in_abuf+(j*nsf),abuf[i*nchans+j],nsf);
+      // non-interleaved
+      for (j=0;j<nchans;j++) {
+	lives_memcpy(&in_abuf[j*nsamps],abuf[(in_tracks[i]+nbtracks)*nchans+j],nsf);
+      }
+      
+      weed_set_voidptr_value(layers[i],"audio_data",(void *)in_abuf);
+      weed_set_int_value(layers[i],"audio_data_length",nsamps);
+      weed_set_int_value(layers[i],"audio_channels",nchans);
+      weed_set_int_value(layers[i],"audio_rate",arate);
+      weed_set_boolean_value(layers[i],"audio_interleaf",WEED_FALSE);
     }
-    weed_set_voidptr_value(layers[i],"audio_data",in_abuf);
-    weed_set_int_value(layers[i],"audio_data_length",nsamps);
-    weed_set_int_value(layers[i],"audio_channels",nchans);
-    weed_set_int_value(layers[i],"audio_rate",arate);
-    weed_set_boolean_value(layers[i],"audio_interleaf",WEED_FALSE);
-  }
-
-  layers[i]=NULL;
 
-  weed_apply_audio_instance_inner(instance,init_event,layers,tc,nbtracks);
+    layers[i]=NULL;
+  }
 
-  out_abuf=weed_get_voidptr_value(layers[0],"audio_data",&error);
+  retval2=weed_apply_audio_instance_inner(instance,init_event,layers,tc,nbtracks);
+  if (retval==FILTER_NO_ERROR) retval=retval2;
 
-  if (!can_reinit) {
-    // resample back
+  if (retval2==FILTER_NO_ERROR&&was_init_event) {
+    // handle compound filters
+    if (weed_plant_has_leaf(instance,"host_next_instance")) {
+      instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+      goto audinst1;
+    }
+  }
 
+  out_abuf=(float *)weed_get_voidptr_value(layers[0],"audio_data",&error);
 
-  }
+  if (numoutchans>0) {
+    // copy processed audio
+ 
+    // inner function will set this if the plugin accepts/returns interleaved audio only
+    if (weed_get_boolean_value(layers[0],"audio_interleaf",&error)==WEED_TRUE) float_deinterleave(out_abuf,nsamps,nchans);
 
-  for (i=0;i<nchans;i++) {
-    lives_memcpy(abuf[i],(char *)out_abuf+(i*nsf),nsf);
+    // non-interleaved
+    for (i=0;i<nchans;i++) {
+      lives_memcpy(abuf[(out_tracks[0]+nbtracks)*nchans+i],&out_abuf[i*nsamps],nsf);
+    }
   }
 
-  for (i=0;i<ntracks;i++) {
-    in_abuf=weed_get_voidptr_value(layers[i],"audio_data",&error);
-    g_free(in_abuf);
+ audret1:
 
-    weed_plant_free(layers[i]);
+  if (layers!=NULL) {
+    for (i=0;i<ntracks;i++) {
+      in_abuf=(float *)weed_get_voidptr_value(layers[i],"audio_data",&error);
+      g_free(in_abuf);
+      weed_plant_free(layers[i]);
+    }
+    g_free(layers);
   }
-  g_free(layers);
+  weed_free(in_tracks);
+  weed_free(out_tracks);
 
   return retval;
 }
 
 
 static void weed_apply_filter_map (weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, void ***pchains) {
-  int i,key,num_inst,error;
   weed_plant_t *instance;
+  weed_plant_t *init_event,*deinit_event;
+
   gchar *keystr;
+
   void **init_events;
-  int filter_error;
-  weed_plant_t *init_event,*deinit_event;
 
-  // this is called during rendering - we will have previously received a filter_map event and now we apply this to layers
+  lives_filter_error_t filter_error;
+  int key,num_inst,error;
+
+  boolean needs_reinit;
+
+  register int i;
 
+  // this is called during rendering - we will have previously received a filter_map event and now we apply this to layers
 
   // layers will be a NULL terminated array of channels, each with two extra leaves: clip and frame
   // clip corresponds to a LiVES file in mainw->files. "pixel_data" will initially be NULL, we will pull this as necessary
@@ -2667,6 +3273,7 @@
 	  mainw->multitrack->init_event!=NULL) {
 	if (mainw->multitrack->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&
 	    mainw->multitrack->current_rfx->source!=NULL) {
+
 	  deinit_event=(weed_plant_t *)weed_get_voidptr_value(mainw->multitrack->init_event,"deinit_event",&error);
 	  if (tc>=get_event_timecode(mainw->multitrack->init_event)&&tc<=get_event_timecode(deinit_event)) {
 	    // we are previewing an effect in multitrack - use current unapplied values
@@ -2674,31 +3281,97 @@
 	    // TODO - if current fx 
 	    void **pchain=mt_get_pchain();
 	    instance=(weed_plant_t *)mainw->multitrack->current_rfx->source;
+
+	    if (is_pure_audio(instance,FALSE)) continue; // audio effects are applied in the audio renderer
+
 	    // interpolation can be switched of by setting mainw->no_interp
 	    if (!mainw->no_interp&&pchain!=NULL) {
 	      interpolate_params(instance,pchain,tc); // interpolate parameters for preview
 	    }
+
+
+
+
+	  apply_inst1:
+
+	    if (weed_plant_has_leaf(instance,"host_next_instance")) {
+	      // chain any internal data pipelines for compound fx
+	      pthread_mutex_lock(&mainw->data_mutex);
+	      needs_reinit=pconx_chain_data_internal(instance);
+	      pthread_mutex_unlock(&mainw->data_mutex);
+	      if (needs_reinit) {
+		weed_reinit_effect(instance,FALSE);
+	      }
+	    }
+
 	    filter_error=weed_apply_instance (instance,mainw->multitrack->init_event,layers,0,0,tc);
-	    if (!init_event_is_process_last(mainw->multitrack->init_event)&&!is_pure_audio(instance,TRUE)) break;
+
+	    if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+	      // handling for compound fx
+	      instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+
+	      goto apply_inst1;
+	    }
+
+	    if (!init_event_is_process_last(mainw->multitrack->init_event)) break;
 	    continue;
 	  }
 	}
       }
 
+      // else we are previewing or rendering from an event_list
       if (weed_plant_has_leaf(init_event,"host_tag")) {
 	keystr=weed_get_string_value(init_event,"host_tag",&error);
 	key=atoi(keystr);
 	weed_free(keystr);
 	if (rte_key_valid (key+1,FALSE)) {
 	  if ((instance=key_to_instance[key][key_modes[key]])==NULL) continue;
+
+	  if (is_pure_audio(instance,FALSE)) continue; // audio effects are applied in the audio renderer
+
 	  if (pchains!=NULL&&pchains[key]!=NULL) {
 	    interpolate_params(instance,pchains[key],tc); // interpolate parameters during playback
 	  }
+	  
+	  /*
+	  // might be needed for multitrack ???
+	  if (mainw->pconx!=NULL) {
+	  int key=i;
+	  int mode=key_modes[i];
+	  if (weed_plant_has_leaf(instance,"host_mode")) {
+	  key=weed_get_int_value(instance,"host_key",&error);
+	  mode=weed_get_int_value(instance,"host_mode",&error);
+	  }
+	  // chain any data pipelines
+	  pconx_chain_data(key,mode);
+	  }*/
+
+	apply_inst2:
+
+	  if (weed_plant_has_leaf(instance,"host_next_instance")) {
+	    // chain any internal data pipelines for compound fx
+	    pthread_mutex_lock(&mainw->data_mutex);
+	    needs_reinit=pconx_chain_data_internal(instance);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    if (needs_reinit) {
+	      weed_reinit_effect(instance,FALSE);
+	    }
+	  }
+
 	  filter_error=weed_apply_instance (instance,init_event,layers,0,0,tc);
+
+	  if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+	    // handling for compound fx
+	    instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+
+	    goto apply_inst2;
+	  }
+
 	  //if (filter_error!=FILTER_NO_ERROR) g_printerr("Render error was %d\n",filter_error);
 	}
       }
     }
+
     weed_free(init_events);
   }
 }
@@ -2718,12 +3391,18 @@
 
   // TODO - update the param window with any out_param values which changed.
 
-  int i,error;
-  weed_plant_t *instance,*layer;
-  int filter_error;
+  void *pdata;
+
+  weed_plant_t *filter,*instance,*layer;
+  lives_filter_error_t filter_error;
+
+  boolean needs_reinit;
+
+  int error;
   int output=-1;
   int clip;
-  void *pdata;
+
+  register int i;
 
   if (mainw->is_rendering&&!(cfile->proc_ptr!=NULL&&mainw->preview)) {
     // rendering from multitrack
@@ -2740,19 +3419,66 @@
 	if (mainw->rte&(GU641<<i)) {
 	  mainw->osc_block=TRUE;
 	  if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	  if (mainw->pchains!=NULL&&mainw->pchains[key]!=NULL) {
-	    interpolate_params(instance,mainw->pchains[key],tc); // interpolate parameters during preview
+	  if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
+	    interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
+	  }
+
+	  filter=weed_instance_get_filter(instance,TRUE);
+
+	  // TODO *** enable this, and apply pconx to audio gens in audio.c
+	  if (!is_pure_audio(filter,TRUE)) {
+	    if (mainw->pconx!=NULL&&!(mainw->preview||mainw->is_rendering)) {
+	      // chain any data pipelines
+	      pthread_mutex_lock(&mainw->data_mutex);
+	      needs_reinit=pconx_chain_data(i,key_modes[i]);
+	      pthread_mutex_unlock(&mainw->data_mutex);
+	      
+	      if (needs_reinit) {
+		weed_reinit_effect(instance,FALSE);
+	      }
+	    }
 	  }
+
+	apply_inst3:
+
+	  if (weed_plant_has_leaf(instance,"host_next_instance")) {
+	    // chain any internal data pipelines for compound fx
+	    pthread_mutex_lock(&mainw->data_mutex);
+	    needs_reinit=pconx_chain_data_internal(instance);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    if (needs_reinit) {
+	      weed_reinit_effect(instance,FALSE);
+	    }
+	  }
+
+	  weed_set_int_value(instance,"host_key",i);
+
 	  filter_error=weed_apply_instance (instance,NULL,layers,opwidth,opheight,tc);
+
 	  if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
+	  //#define DEBUG_RTE
 #ifdef DEBUG_RTE
 	  if (filter_error!=FILTER_NO_ERROR) g_printerr("Render error was %d\n",filter_error);
 #endif
+
+	  if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+	    // handling for compound fx
+
+	    instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+
+	    goto apply_inst3;
+	  }
+
 	}
       }
     }
   }
-  if (!mainw->is_rendering) mainw->osc_block=FALSE;
+
+  // TODO - set mainw->vpp->play_params from connected out params and out alphas
+
+  if (!mainw->is_rendering) {
+    mainw->osc_block=FALSE;
+  }
 
   // caller should free all layers, but here we will free all other pixel_data
 
@@ -2768,7 +3494,7 @@
 	void **pixel_data;
 	if (!weed_plant_has_leaf(layers[i],"pixel_data")) continue;
 	pixel_data=weed_get_voidptr_array(layers[i],"pixel_data",&error);
-	if (pixel_data!=NULL) {
+	if (pixel_data!=NULL&&pixel_data[0]!=NULL) {
 	  int j;
 	  int numplanes=weed_leaf_num_elements(layers[i],"pixel_data");
 	  if (weed_plant_has_leaf(layers[i],"host_pixel_data_contiguous") && 
@@ -2794,14 +3520,14 @@
 
   // frame is pulled uneffected here. TODO: Try to pull at target output palette
   if (!weed_plant_has_leaf(layer,"pixel_data")||weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) 
-    if (!pull_frame_at_size(layer,mainw->files[clip]->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,opwidth,opheight,
+    if (!pull_frame_at_size(layer,get_image_ext_for_type(mainw->files[clip]->img_type),tc,opwidth,opheight,
 			    WEED_PALETTE_END)) {
       weed_set_int_value(layer,"current_palette",mainw->files[clip]->img_type==IMG_TYPE_JPEG?
 			 WEED_PALETTE_RGB24:WEED_PALETTE_RGBA32);
       weed_set_int_value(layer,"width",opwidth);
       weed_set_int_value(layer,"height",opheight);
       create_empty_pixel_data(layer,TRUE,TRUE);
-      g_printerr("weed_apply_effects created empty pixel_data\n");
+      LIVES_WARN("weed_apply_effects created empty pixel_data");
     }
   
   return layer;
@@ -2810,11 +3536,11 @@
 
 
 
-void weed_apply_audio_effects (weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, long nsamps, 
+void weed_apply_audio_effects (weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, int64_t nsamps, 
 			       gdouble arate, weed_timecode_t tc, double *vis) {
   int i,num_inst,error;
   void **init_events;
-  int filter_error;
+  lives_filter_error_t filter_error;
   weed_plant_t *init_event,*filter;
   gchar *fhash;
 
@@ -2823,11 +3549,11 @@
   // abuf will be a NULL terminated array of float audio
 
   // the results of abuf[0] and abuf[1] (for stereo) will be written to fileno
-
   if (filter_map==NULL||!weed_plant_has_leaf(filter_map,"init_events")||
       (weed_get_voidptr_value(filter_map,"init_events",&error)==NULL)) {
     return;
   }
+  mainw->pchains=get_event_pchains();
   if ((num_inst=weed_leaf_num_elements(filter_map,"init_events"))>0) {
     init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
     for (i=0;i<num_inst;i++) {
@@ -2835,17 +3561,158 @@
       fhash=weed_get_string_value(init_event,"filter",&error);
       filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
       weed_free(fhash);
-      if (has_audio_chans_in(filter,FALSE)) 
+      if (has_audio_chans_in(filter,FALSE)) {
 	filter_error=weed_apply_audio_instance(init_event,abuf,nbtracks,nchans,nsamps,arate,tc,vis);
+      }
     }
     weed_free(init_events);
   }
+  mainw->pchains=NULL;
 }
 
 
 
+void weed_apply_audio_effects_rt(float **abuf, int nchans, int64_t nsamps, gdouble arate, weed_timecode_t tc, boolean analysers_only) {
 
+  weed_plant_t *instance,*filter;
 
+  lives_filter_error_t filter_error;
+
+  int error;
+
+  boolean needs_reinit;
+
+  register int i;
+
+  // free playback: apply any audio filters or analysers (but not generators)
+  // Effects are applied in key order
+
+
+  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+    if (rte_key_valid(i+1,TRUE)) {
+      if (mainw->rte&(GU641<<i)) {
+	mainw->osc_block=TRUE;
+
+	// filter must not be deinited until we have processed it
+	if (pthread_mutex_trylock(&mainw->afilter_mutex)) continue;
+
+	if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
+	  pthread_mutex_unlock(&mainw->afilter_mutex);
+	  continue;
+	}
+	filter=weed_instance_get_filter(instance,FALSE);
+
+	if (!has_audio_chans_in(filter,FALSE)) {
+	  pthread_mutex_unlock(&mainw->afilter_mutex);
+	  continue; 
+	}
+
+	if (analysers_only&&has_audio_chans_out(filter,FALSE)) {
+	  pthread_mutex_unlock(&mainw->afilter_mutex);
+	  continue;
+	}
+
+	if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
+	  interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
+	}
+
+      apply_audio_inst2:
+	
+	if (mainw->pconx!=NULL) {
+	  // chain any data pipelines
+
+	  if (!pthread_mutex_trylock(&mainw->data_mutex)) {
+	    needs_reinit=pconx_chain_data(i,key_modes[i]);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+
+	    if (needs_reinit) {
+	      pthread_mutex_unlock(&mainw->afilter_mutex);
+	      weed_reinit_effect(instance,FALSE);
+	      pthread_mutex_lock(&mainw->afilter_mutex);
+	    }
+	  }
+	}
+
+	//weed_set_int_value(instance,"host_key",i);
+
+	if (weed_plant_has_leaf(instance,"host_next_instance")) {
+	  // chain any internal data pipelines for compound fx
+	  if (!pthread_mutex_trylock(&mainw->data_mutex)) {
+	    needs_reinit=pconx_chain_data_internal(instance);
+	    pthread_mutex_unlock(&mainw->data_mutex);
+	    if (needs_reinit) {
+	      pthread_mutex_unlock(&mainw->afilter_mutex);
+	      weed_reinit_effect(instance,FALSE);
+	      pthread_mutex_lock(&mainw->afilter_mutex);
+	    }
+	  }
+	}
+
+	filter_error=weed_apply_audio_instance(instance,abuf,0,nchans,nsamps,arate,tc,NULL);
+
+	if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+	  // handling for compound fx
+	  instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+
+	  goto apply_audio_inst2;
+	}
+
+	pthread_mutex_unlock(&mainw->afilter_mutex);
+
+	if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
+#ifdef DEBUG_RTE
+	if (filter_error!=FILTER_NO_ERROR) g_printerr("Render error was %d\n",filter_error);
+#endif
+      }
+    }
+  }
+}
+
+
+
+
+boolean has_audio_filters(boolean analysers_only) {
+  // do we have any active audio filters (excluding audio generators) ?
+  weed_plant_t *instance,*filter;
+
+  register int i;
+
+  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+    if (rte_key_valid(i+1,TRUE)) {
+      if (mainw->rte&(GU641<<i)) {
+	if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+	filter=weed_instance_get_filter(instance,FALSE);
+	if (has_audio_chans_in(filter,FALSE)) {
+	  if (analysers_only&&has_audio_chans_out(filter,FALSE)) continue;
+	  return TRUE;
+	}
+      }
+    }
+  }
+  return FALSE;
+}
+
+
+boolean has_video_filters(boolean analysers_only) {
+  // do we have any active video filters (excluding generators) ?
+  weed_plant_t *instance,*filter;
+
+  register int i;
+
+  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+    if (rte_key_valid(i+1,TRUE)) {
+      if (mainw->rte&(GU641<<i)) {
+	if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+	filter=weed_instance_get_filter(instance,FALSE);
+	if (has_video_chans_in(filter,FALSE)) {
+	  if (analysers_only&&has_video_chans_out(filter,FALSE)) continue;
+	  return TRUE;
+	}
+      }
+    }
+  }
+  return FALSE;
+}
 
 
 /////////////////////////////////////////////////////////////////////////
@@ -2861,13 +3728,18 @@
 }
 
 
-gint num_in_params(weed_plant_t *plant, gboolean count_reinits, gboolean count_variable) {
+int num_in_params(weed_plant_t *plant, boolean skip_hidden, boolean skip_internal) {
   weed_plant_t **params=NULL;
-  gint counted=0;
+
+  weed_plant_t *param;
+
+  int counted=0;
   int num_params,i,error;
-  gboolean is_template=(WEED_PLANT_IS_FILTER_CLASS(plant));
-  int flags;
-  weed_plant_t *ptmpl;
+  boolean is_template=(WEED_PLANT_IS_FILTER_CLASS(plant));
+
+ nip1:
+
+  num_params=0;
 
   if (is_template) {
     if (!weed_plant_has_leaf(plant,"in_parameter_templates")||
@@ -2875,31 +3747,57 @@
     num_params=weed_leaf_num_elements(plant,"in_parameter_templates");
   }
   else {
-    if (!weed_plant_has_leaf(plant,"in_parameters")) return 0;
-    if (weed_get_plantptr_value(plant,"in_parameters",&error)==NULL) return 0;
+    if (!weed_plant_has_leaf(plant,"in_parameters")) goto nip1done;
+    if (weed_get_plantptr_value(plant,"in_parameters",&error)==NULL) goto nip1done;
     num_params=weed_leaf_num_elements(plant,"in_parameters");
   }
-  if (count_reinits&&count_variable) return num_params;
+
+  if (!skip_hidden&&!skip_internal) {
+    counted+=num_params;
+    goto nip1done;
+  }
 
   if (is_template) params=weed_get_plantptr_array(plant,"in_parameter_templates",&error);
   else params=weed_get_plantptr_array(plant,"in_parameters",&error);
 
   for (i=0;i<num_params;i++) {
-    if (is_template) ptmpl=params[i];
-    else ptmpl=weed_get_plantptr_value(params[i],"template",&error);
-    if (weed_plant_has_leaf(ptmpl,"flags")) {
-      flags=weed_get_int_value(ptmpl,"flags",&error);
-      if ((count_reinits||!(flags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE))&&
-	  (count_variable||!(flags&WEED_PARAMETER_VARIABLE_ELEMENTS))) counted++;
-    }
-    else counted++;
+    if (skip_hidden&&is_hidden_param(plant,i)) continue;
+    param=params[i];
+    if (skip_internal&&weed_plant_has_leaf(param,"host_internal_connection")) continue;
+    counted++;
   }
 
   weed_free(params);
+
+ nip1done:
+
+  if (!is_template&&skip_internal&&weed_plant_has_leaf(plant,"host_next_instance")) {
+    plant=weed_get_plantptr_value(plant,"host_next_instance",&error);
+    goto nip1;
+  }
+
   return counted;
 }
 
-gboolean has_usable_palette(weed_plant_t *chantmpl) {
+
+int num_out_params(weed_plant_t *plant) {
+  int num_params,error;
+  boolean is_template=(WEED_PLANT_IS_FILTER_CLASS(plant));
+
+  if (is_template) {
+    if (!weed_plant_has_leaf(plant,"out_parameter_templates")||
+	weed_get_plantptr_value(plant,"out_parameter_templates",&error)==NULL) return 0;
+    num_params=weed_leaf_num_elements(plant,"out_parameter_templates");
+  }
+  else {
+    if (!weed_plant_has_leaf(plant,"out_parameters")) return 0;
+    if (weed_get_plantptr_value(plant,"out_parameters",&error)==NULL) return 0;
+    num_params=weed_leaf_num_elements(plant,"out_parameters");
+  }
+  return num_params;
+}
+
+boolean has_usable_palette(weed_plant_t *chantmpl) {
   int error;
   int palette=weed_get_int_value(chantmpl,"current_palette",&error);
   // currently only integer RGB palettes are usable
@@ -2910,11 +3808,11 @@
 
 
 
-gint enabled_in_channels (weed_plant_t *plant, gboolean count_repeats) {
+int enabled_in_channels (weed_plant_t *plant, boolean count_repeats) {
   weed_plant_t **channels=NULL;
-  gint enabled=0;
+  int enabled=0;
   int num_channels,i,error;
-  gboolean is_template=WEED_PLANT_IS_FILTER_CLASS(plant);
+  boolean is_template=WEED_PLANT_IS_FILTER_CLASS(plant);
 
   if (is_template) {
     if (!weed_plant_has_leaf(plant,"in_channel_templates")) return 0;
@@ -2953,11 +3851,11 @@
 }
 
 
-gint enabled_out_channels (weed_plant_t *plant, gboolean count_repeats) {
+int enabled_out_channels (weed_plant_t *plant, boolean count_repeats) {
   weed_plant_t **channels=NULL;
-  gint enabled=0;
+  int enabled=0;
   int num_channels,i,error;
-  gboolean is_template=WEED_PLANT_IS_FILTER_CLASS(plant);
+  boolean is_template=WEED_PLANT_IS_FILTER_CLASS(plant);
 
   if (is_template) {
     num_channels=weed_leaf_num_elements(plant,"out_channel_templates");
@@ -3002,29 +3900,36 @@
 
 
 
-static gint check_for_lives(weed_plant_t *filter, int filter_idx) {
+static int check_for_lives(weed_plant_t *filter, int filter_idx) {
   // for LiVES, currently:
   // all filters must take 0, 1 or 2 mandatory/optional inputs and provide 
-  // 1 mandatory output or >1 optional outputs (for now)
+  // 1 mandatory output (audio or video) or >1 optional (video only) outputs (for now)
 
   // or 1 or more mandatory alpha outputs (analysers)
 
   // filters can also have 1 mandatory input and no outputs and out parameters
   // (video analyzer)
 
+  // they may have no outs provided they have out parameters (data sources or processors)
+
   // all channels used must support a limited range of palettes (for now)
 
-  gint chans_in_mand=0; // number of mandatory channels
-  gint chans_in_opt_max=0; // number of usable (by LiVES) optional channels
-  gint chans_out_mand=0;
-  gint chans_out_opt_max=0;
-  gint achans_in_mand=0,achans_out_mand=0;
-  gboolean is_audio=FALSE;
-  gboolean has_out_params=FALSE;
-  gboolean all_out_alpha=TRUE;
+  // filters can now have any number of mandatory in alphas, the effect will not be run unless the channels are filled 
+  // (by chaining to output of another fx)
+
+
+  int chans_in_mand=0; // number of mandatory channels
+  int chans_in_opt_max=0; // number of usable (by LiVES) optional channels
+  int chans_out_mand=0;
+  int chans_out_opt_max=0;
+  int achans_in_mand=0,achans_out_mand=0;
+  boolean is_audio=FALSE;
+  boolean has_out_params=FALSE;
+  boolean all_out_alpha=TRUE;
 
   int error,flags=0;
   int num_elements,i;
+  int naudins=0,naudouts=0;
   weed_plant_t **array=NULL;
 
   // TODO - check seed types
@@ -3048,10 +3953,19 @@
 
   for (i=0;i<num_elements;i++) {
 #ifndef HAVE_POSIX_MEMALIGN
-    if (weed_plant_has_leaf(array[i],"alignment")) return 12;
+    if (weed_plant_has_leaf(array[i],"alignment")) {
+      weed_free(array);
+      return 12;
+    }
 #endif
-    if (weed_plant_has_leaf(array[i],"is_audio")&&weed_get_boolean_value(array[i],"is_audio",&error)==WEED_TRUE) 
+    if (weed_plant_has_leaf(array[i],"is_audio")&&weed_get_boolean_value(array[i],"is_audio",&error)==WEED_TRUE) {
+      if (weed_plant_has_leaf(array[i],"audio_channels")&&(naudins=weed_get_int_value(array[i],"audio_channels",&error))>2) {
+	// currently we only handle mono and stereo audio filters
+	weed_free(array);
+	return 7;
+      }
       is_audio=TRUE;
+    }
     if (!weed_plant_has_leaf(array[i],"name")||(!weed_plant_has_leaf(array[i],"palette_list")&&!is_audio)) {
       weed_free(array);
       return 6;
@@ -3062,11 +3976,13 @@
     if (weed_plant_has_leaf(array[i],"optional")&&weed_get_boolean_value(array[i],"optional",&error)==WEED_TRUE) {
       // is optional
       chans_in_opt_max++;
-      weed_set_boolean_value(array[i],"disabled",WEED_TRUE);
+      weed_set_boolean_value(array[i],"host_disabled",WEED_TRUE);
     }
     else {
-      if (!is_audio) chans_in_mand++;
-      else achans_in_mand++;
+      if (has_non_alpha_palette(array[i])) {
+	if (!is_audio) chans_in_mand++;
+	else achans_in_mand++;
+      }
     }
   }
   if (num_elements>0) weed_free(array);
@@ -3081,10 +3997,24 @@
 
   for (i=0;i<num_elements;i++) {
 #ifndef HAVE_POSIX_MEMALIGN
-    if (weed_plant_has_leaf(array[i],"alignment")) return 12;
+    if (weed_plant_has_leaf(array[i],"alignment")) {
+      weed_free(array);
+      return 12;
+    }
 #endif
-    if (weed_plant_has_leaf(array[i],"is_audio")&&weed_get_boolean_value(array[i],"is_audio",&error)==WEED_TRUE) 
+    if (weed_plant_has_leaf(array[i],"is_audio")&&weed_get_boolean_value(array[i],"is_audio",&error)==WEED_TRUE) {
+      if (weed_plant_has_leaf(array[i],"audio_channels")&&(naudouts=weed_get_int_value(array[i],"audio_channels",&error))>2) {
+	// currently we only handle mono and stereo audio filters
+	weed_free(array);
+	return 7;
+      }
+      if (naudins==1&&naudouts==2) {
+	// converting mono to stereo cannot be done like that
+	weed_free(array);
+	return 7;
+      }
       is_audio=TRUE;
+    }
     if (!weed_plant_has_leaf(array[i],"name")||(!weed_plant_has_leaf(array[i],"palette_list")&&!is_audio)) {
       weed_free(array);
       return 9;
@@ -3095,7 +4025,7 @@
     if (weed_plant_has_leaf(array[i],"optional")&&weed_get_boolean_value(array[i],"optional",&error)==WEED_TRUE) {
       // is optional
       chans_out_opt_max++;
-      weed_set_boolean_value(array[i],"disabled",WEED_TRUE);
+      weed_set_boolean_value(array[i],"host_disabled",WEED_TRUE);
     }
     else {
       // is mandatory
@@ -3111,9 +4041,9 @@
   if (weed_plant_has_leaf(filter,"out_parameter_templates")) has_out_params=TRUE;
 
   if ((chans_out_mand>1&&!all_out_alpha)||((chans_out_mand+chans_out_opt_max+achans_out_mand<1)
-					   &&(chans_in_mand!=1||!has_out_params))) return 11;
+					   &&(!has_out_params))) return 11;
   if (achans_out_mand>1||(achans_out_mand==1&&chans_out_mand>0)) return 14;
-  if ((achans_in_mand==1&&achans_out_mand==0)||(achans_in_mand==0&&achans_out_mand==1)) return 15;
+  if (achans_in_mand>=1&&achans_out_mand==0&&!(has_out_params)) return 15;
 
   weed_add_plant_flags(filter,WEED_LEAF_READONLY_PLUGIN);
   if (weed_plant_has_leaf(filter,"gui")) {
@@ -3151,8 +4081,8 @@
 
 
 
-static gboolean set_in_channel_palettes (gint idx, gint num_channels) {
-  // set in channel palettes for filter[idx]
+static boolean set_in_channel_palettes (weed_plant_t *filter, int num_channels) {
+  // set in channel palettes for filter
   // we also enable optional channels if we have to
   // in this case we fill first the mandatory channels,
   // then if necessary the optional channels
@@ -3163,18 +4093,18 @@
 
   int num_elements,i,error;
 
-  if (!weed_plant_has_leaf(weed_filters[idx],"in_channel_templates")) {
+  if (!weed_plant_has_leaf(filter,"in_channel_templates")) {
     if (num_channels>0) return FALSE;
     return TRUE;
   }
 
-  num_elements=weed_leaf_num_elements(weed_filters[idx],"in_channel_templates");
+  num_elements=weed_leaf_num_elements(filter,"in_channel_templates");
 
   if (num_elements<num_channels) return FALSE;
 
   if (num_elements==0) return TRUE;
 
-  chantmpls=weed_get_plantptr_array(weed_filters[idx],"in_channel_templates",&error);
+  chantmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
 
   // our start state is with all optional channels disabled
 
@@ -3213,21 +4143,21 @@
 	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YVU420P);
       else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV411)==WEED_PALETTE_YUV411) 
 	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV411);
+      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT) 
+	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
+      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8) 
+	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
+      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1) 
+	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
       else if (!weed_plant_has_leaf(chantmpls[i],"optional")) {
 	if (chantmpls!=NULL) weed_free(chantmpls);
 	weed_free(palettes);
-	return FALSE; // mandatory channel; we don't yet handle alpha or float
+	return FALSE; // mandatory channel; we don't yet handle rgb float
       }
-      /*      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8) 
-	      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
-	      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1) 
-	      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
-	      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT) 
-	      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
-	      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT) 
-	      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
-	      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT) 
-	      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
+      /*else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT) 
+	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
+	else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT) 
+	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
       */
       weed_free(palettes);
     }
@@ -3238,9 +4168,9 @@
   if (num_channels>0) {
     // OK we need to use some optional channels
     for (i=0;i<num_elements&&num_channels>0;i++) if (weed_plant_has_leaf(chantmpls[i],"optional")) {
-      weed_set_boolean_value(chantmpls[i],"disabled",WEED_FALSE);
-      num_channels--;
-    }
+	weed_set_boolean_value(chantmpls[i],"host_disabled",WEED_FALSE);
+	num_channels--;
+      }
   }
   if (num_channels>0) {
     if (chantmpls!=NULL) weed_free(chantmpls);
@@ -3272,8 +4202,8 @@
 
 
 
-static gboolean set_out_channel_palettes (gint idx, gint num_channels) {
-  // set in channel palettes for filter[idx]
+static boolean set_out_channel_palettes (weed_plant_t *filter, int num_channels) {
+  // set in channel palettes for filter
   // we also enable optional channels if we have to
   // in this case we fill first the mandatory channels,
   // then if necessary the optional channels
@@ -3282,14 +4212,14 @@
   weed_plant_t **chantmpls=NULL;
   weed_plant_t **in_chantmpls=NULL;
 
-  int num_elements=weed_leaf_num_elements(weed_filters[idx],"out_channel_templates"),i,error;
-  int num_in_elements=weed_leaf_num_elements(weed_filters[idx],"in_channel_templates");
+  int num_elements=weed_leaf_num_elements(filter,"out_channel_templates"),i,error;
+  int num_in_elements=weed_leaf_num_elements(filter,"in_channel_templates");
 
   int def_palette=WEED_PALETTE_END;
 
   if (num_elements<num_channels) return FALSE;
 
-  chantmpls=weed_get_plantptr_array(weed_filters[idx],"out_channel_templates",&error);
+  chantmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
   // our start state is with all optional channels disabled
 
   // fill mandatory channels first; these palettes may change later if we get a frame in a different palette
@@ -3327,22 +4257,22 @@
 	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YVU420P);
       else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV411)==WEED_PALETTE_YUV411) 
 	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV411);
+      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT) 
+	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
       else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8) 
 	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
       else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1) 
 	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
       else if (!weed_plant_has_leaf(chantmpls[i],"optional")) {
 	if (chantmpls!=NULL) weed_free(chantmpls);
 	weed_free(palettes);
-	return FALSE; // mandatory channel; we don't yet handle alpha or float
+	return FALSE; // mandatory channel; we don't yet handle rgb float
       }
 
       /*	else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
-	else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
+		weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
+		else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT) 
+		weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
       */
       weed_free(palettes);
     }
@@ -3352,9 +4282,9 @@
   if (num_channels>0) {
     // OK we need to use some optional channels
     for (i=0;i<num_elements&&num_channels>0;i++) if (weed_plant_has_leaf(chantmpls[i],"optional")) {
-      weed_set_boolean_value(chantmpls[i],"disabled",WEED_FALSE);
-      num_channels--;
-    }
+	weed_set_boolean_value(chantmpls[i],"host_disabled",WEED_FALSE);
+	num_channels--;
+      }
   }
 
   if (num_channels>0) {
@@ -3364,7 +4294,7 @@
 
   // now we set match channels
   if (num_in_elements) {
-    in_chantmpls=weed_get_plantptr_array(weed_filters[idx],"in_channel_templates",&error);
+    in_chantmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
     if (!weed_plant_has_leaf(in_chantmpls[0],"is_audio")||
 	weed_get_boolean_value(in_chantmpls[0],"is_audio",&error)!=WEED_TRUE) {
       def_palette=weed_get_int_value(in_chantmpls[0],"current_palette",&error);
@@ -3400,20 +4330,30 @@
 
 
 static void load_weed_plugin (gchar *plugin_name, gchar *plugin_path, gchar *dir) {
-  gchar *filter_name;
   weed_setup_f setup_fn;
   weed_bootstrap_f bootstrap=(weed_bootstrap_f)&weed_bootstrap_func;
   
-  int error,reason,idx=num_weed_filters;
-
   weed_plant_t *plugin_info,**filters,*filter;
+
   void *handle;
+
+  int error,reason,oidx,idx=num_weed_filters;
+
   int filters_in_plugin;
   int mode=-1,kmode=0;
-  int i;
-  gchar *string,*filter_type;
-  GtkWidget *menuitem;
-  char cwd[PATH_MAX],*pwd;
+  int phashes;
+
+  gchar **phashnames;
+
+  char cwd[PATH_MAX];
+
+  char *pwd;
+
+  gchar *filter_name;
+
+  register int i;
+
+  static int key=-1;
 
   pwd=getcwd(cwd,PATH_MAX);
 
@@ -3462,69 +4402,117 @@
 
       filters=weed_get_plantptr_array(plugin_info,"filters",&error);
 
-      while (idx<MAX_WEED_FILTERS&&mode<filters_in_plugin-1) {
+      oidx=idx;
+      phashnames=NULL;
+      phashes=0;
+
+      while (mode<filters_in_plugin-1) {
 	mode++;
-	filter_name=weed_get_string_value(filters[mode],"name",&error);
-	if (!(reason=check_for_lives(filters[mode],idx))) {
-	  gboolean dup=FALSE;
-	  weed_filters[idx]=filters[mode];
+	filter=filters[mode];
+
+	filter_name=weed_get_string_value(filter,"name",&error);
+	if (!(reason=check_for_lives(filter,idx))) {
+	  boolean dup=FALSE,pdup=FALSE;
 
 	  num_weed_filters++;
-	  hashnames[idx]=make_weed_hashname(idx,TRUE);
+	  weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+	  weed_filters[idx]=filter;
+
+	  hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
+	  hashnames[idx]=NULL;
+	  hashnames[idx]=make_weed_hashname(idx,TRUE,FALSE);
+
+	  phashes++;
+	  phashnames=(gchar **)g_realloc(phashnames,phashes*sizeof(gchar *));
+	  phashnames[phashes-1]=make_weed_hashname(idx,FALSE,FALSE);
+
 	  for (i=0;i<idx;i++) {
+	    if (i>oidx) {
+	      if (!strcmp(phashnames[phashes-1],phashnames[i-oidx-1])) {
+		//g_print("partial dupe: %s and %s\n",phashnames[phashes-1],phashnames[i-oidx-1]);
+		// found a partial match: author and/or version differ
+		// if in the same plugin, we will use the highest version no., others become dupes
+		num_weed_dupes++;
+		dupe_weed_filters=(weed_plant_t **)g_realloc(dupe_weed_filters,num_weed_dupes*sizeof(weed_plant_t *));
+		dupe_hashnames=(gchar **)g_realloc(dupe_hashnames,num_weed_dupes*sizeof(gchar *));
+		if (weed_get_int_value(filter,"version",&error)<
+		    weed_get_int_value(weed_filters[i],"version",&error)) {
+		  // add idx to dupe list
+		  dupe_weed_filters[num_weed_dupes-1]=filter;
+		  dupe_hashnames[num_weed_dupes-1]=hashnames[idx];
+		}
+		else {
+		  // add i to dupe list
+		  dupe_weed_filters[num_weed_dupes-1]=weed_filters[i];
+		  dupe_hashnames[num_weed_dupes-1]=hashnames[i];
+		  weed_filters[i]=filter;
+		  hashnames[i]=hashnames[idx];
+		}
+		phashes--;
+		g_free(phashnames[phashes]);
+		num_weed_filters--;
+		weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+		hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
+		phashnames=(gchar **)g_realloc(phashnames,phashes*sizeof(gchar *));
+		pdup=TRUE;
+		break;
+	      }
+	    }
 	    if (!strcmp(hashnames[idx],hashnames[i])) {
 	      // skip dups
+	      char *msg=g_strdup_printf(_("Found duplicate plugin %s"),hashnames[idx]);
+	      LIVES_INFO(msg);
+	      g_free(msg);
 	      g_free(hashnames[idx]);
-	      hashnames[idx]=NULL;
-	      weed_filters[idx]=NULL;
+	      phashes--;
+	      g_free(phashnames[phashes]);
 	      num_weed_filters--;
+	      weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+	      hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
+	      phashnames=(gchar **)g_realloc(phashnames,phashes*sizeof(gchar *));
 	      dup=TRUE;
 	      break;
 	    }
 	  }
-	  if (!dup) {
-#ifdef DEBUG_WEED
-	    if (key<FX_KEYS_PHYSICAL) d_print(g_strdup_printf("Loaded filter \"%s\" in plugin \"%s\"; assigned to key ctrl-%d, mode %d.\n",filter_name,plugin_name,key+1,kmode+1));
-	    else d_print(g_strdup_printf("Loaded filter \"%s\" in plugin \"%s\", no key assigned\n",filter_name,plugin_name));
-#endif
+	  if (dup) {
+	    weed_free(filter_name);
+	    continue;
+	  }
 
-	    filter=weed_filters[idx];
-	    
-	    // we start with all optional channels disabled (unless forced to use them)
-	    set_in_channel_palettes (idx,enabled_in_channels(filter,FALSE));
-	    set_out_channel_palettes (idx,1);
-	    
-	    // skip hidden channels
-	    if (!weed_plant_has_leaf(filter,"host_menu_hide")||
-		(weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE)) {
-	      if (key<FX_KEYS_PHYSICAL) {
-		key_to_fx[key][kmode]=idx;
-	      }
-	      filter_type=weed_filter_get_type(weed_filters[idx],FALSE);
-	      string=g_strdup_printf("%s (%s)",filter_name,filter_type);
-	      menuitem=gtk_menu_item_new_with_label (string);
-	      gtk_widget_show(menuitem);
-	      g_free(string);
-	      g_free(filter_type);
-	      
-	      gtk_container_add (GTK_CONTAINER (mainw->rte_defs), menuitem);
-	      
-	      g_signal_connect (GTK_OBJECT (menuitem), "activate",
-				G_CALLBACK (rte_set_defs_activate),
-				GINT_TO_POINTER(idx));
-	    }
+	  // we start with all optional channels disabled (unless forced to use them)
+	  set_in_channel_palettes (filter,enabled_in_channels(filters[mode],FALSE));
+	  set_out_channel_palettes (filter,1);
+
+	  // skip hidden/duplicate filters
+	  if (!pdup&&key<FX_KEYS_PHYSICAL&&kmode<prefs->max_modes_per_key&&
+	      (!weed_plant_has_leaf(filter,"host_menu_hide")||
+	       (weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE))) {
+	    key_to_fx[key][kmode++]=idx;
+#ifdef DEBUG_WEED
+	    if (!pdup&&key<FX_KEYS_PHYSICAL&&kmode<prefs->max_modes_per_key) 
+	      d_print(g_strdup_printf("Loaded filter \"%s\" in plugin \"%s\"; assigned to key ctrl-%d, mode %d.\n",
+				      filter_name,plugin_name,key+1,kmode));
 
-	    kmode++;
 	  }
-	    idx++;
+	  else {
+	    d_print(g_strdup_printf("Loaded filter \"%s\" in plugin \"%s\", no key assigned\n",filter_name,plugin_name));
+#endif
+	  }
+	  if (!pdup) idx++;
+
 	}
 #ifdef DEBUG_WEED
 	else g_printerr(g_strdup_printf("Unsuitable filter \"%s\" in plugin \"%s\", reason code %d\n",filter_name,plugin_name,reason));
 #endif
 	weed_free(filter_name);
       }
+      for (i=0;i<phashes;i++) {
+	g_free(phashnames[i]);
+      }
+      g_free(phashnames);
       weed_free(filters);
     }
+
   }
   else g_printerr(_("Info: Unable to load plugin %s\nError was: %s\n"),plugin_path,dlerror());
 
@@ -3547,23 +4535,126 @@
 }
 
 
+
+static void merge_dupes(void) {
+  register int i;
+
+  weed_filters=(weed_plant_t **)g_realloc(weed_filters,(num_weed_filters+num_weed_dupes)*sizeof(weed_plant_t *));
+  hashnames=(gchar **)g_realloc(hashnames,(num_weed_filters+num_weed_dupes)*sizeof(gchar *));
+
+  for (i=num_weed_filters;i<num_weed_filters+num_weed_dupes;i++) {
+    weed_filters[i]=dupe_weed_filters[i-num_weed_filters];
+    hashnames[i]=dupe_hashnames[i-num_weed_filters];
+  }
+
+  if (dupe_weed_filters!=NULL) g_free(dupe_weed_filters);
+  if (dupe_hashnames!=NULL) g_free(dupe_hashnames);
+
+  num_weed_filters+=num_weed_dupes;
+}
+
+
+static void make_fx_defs_menu(void) {
+  weed_plant_t *filter;
+
+  GtkWidget *menuitem,*menu;
+  GtkWidget *pkg_menu;
+  GtkWidget *pkg_submenu=NULL;
+
+  gchar *string,*filter_type,*filter_name;
+  gchar *pkg=NULL,*pkgstring;
+
+  int pkg_posn=0,error;
+
+  register int i;
+
+
+  // menu entries for vj/set defs
+  for (i=0;i<num_weed_filters-num_weed_dupes;i++) {
+    filter=weed_filters[i];
+	    
+    // skip hidden filters
+    if (!weed_plant_has_leaf(filter,"host_menu_hide")||
+	(weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE)) {
+
+      if (num_in_params(filter,TRUE,TRUE)>0) {
+	filter_name=weed_get_string_value(filter,"name",&error);
+	if ((pkgstring=strstr(filter_name,": "))!=NULL) {
+	  // package effect
+	  if (pkg==NULL) {
+	    pkg=filter_name;
+	    filter_name=g_strdup(pkg);
+	    memset(pkgstring,0,1);
+	    /* TRANSLATORS: example " - LADSPA plugins -" */
+	    pkgstring=g_strdup_printf(_(" - %s plugins -"),pkg);
+	    // create new submenu
+	      
+	    pkg_menu=gtk_menu_item_new_with_label (pkgstring);
+	    gtk_container_add (GTK_CONTAINER (mainw->rte_defs), pkg_menu);
+	    gtk_menu_reorder_child(GTK_MENU(mainw->rte_defs),pkg_menu,pkg_posn++);
+	      
+	    pkg_submenu=gtk_menu_new();
+	    gtk_menu_item_set_submenu (GTK_MENU_ITEM (pkg_menu), pkg_submenu);
+	      
+	    if (palette->style&STYLE_1) {
+	      lives_widget_set_bg_color(pkg_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+	    }
+	      
+	    gtk_widget_show (pkg_menu);
+	    gtk_widget_show (pkg_submenu);
+	    g_free(pkgstring);
+	  }
+	  // add to submenu
+	  menu=pkg_submenu;
+	}
+	else {
+	  if (pkg!=NULL) g_free(pkg);
+	  pkg=NULL;
+	  menu=mainw->rte_defs;
+	}
+	  
+	filter_type=weed_filter_get_type(filter,TRUE,FALSE);
+	string=g_strdup_printf("%s (%s)",filter_name,filter_type);
+	  
+	menuitem=gtk_menu_item_new_with_label (string);
+	gtk_widget_show(menuitem);
+	g_free(string);
+	g_free(filter_type);
+	  
+	gtk_container_add (GTK_CONTAINER (menu), menuitem);
+	  
+	g_signal_connect (GTK_OBJECT (menuitem), "activate",
+			  G_CALLBACK (rte_set_defs_activate),
+			  GINT_TO_POINTER(i));
+
+	weed_free(filter_name);
+      }
+    }
+  }
+}
+
+
+
+
 void weed_load_all (void) {
-// get list of plugins from directory and create our fx
+  // get list of plugins from directory and create our fx
   int i,j,plugin_idx,subdir_idx;
 
   GList *weed_plugin_list,*weed_plugin_sublist;
 
   gchar *lives_weed_plugin_path,*weed_plugin_path,*weed_p_path;
   gchar *subdir_path,*subdir_name,*plugin_path,*plugin_name;
-  gint numdirs;
+  int numdirs;
   gchar **dirs;
   gchar *msg;
 
   gint listlen;
 
-  key=-1;
-
   num_weed_filters=0;
+  num_weed_dupes=0;
+
+  weed_filters=dupe_weed_filters=NULL;
+  hashnames=dupe_hashnames=NULL;
 
   threaded_dialog_spin();
   lives_weed_plugin_path=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL);
@@ -3572,7 +4663,6 @@
   g_printerr("In weed init\n");
 #endif
 
-  // danger Will Robinson !
   fg_gen_to_start=fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
   bg_gen_to_start=bg_generator_key=bg_generator_mode=-1;
 
@@ -3607,11 +4697,6 @@
 
   next_free_key=FX_KEYS_MAX_VIRTUAL;
 
-  for (i=0;i<MAX_WEED_FILTERS;i++) {
-    weed_filters[i]=NULL;
-    hashnames[i]=NULL;
-  }
-
 
   threaded_dialog_spin();
   weed_p_path=getenv("WEED_PLUGIN_PATH");
@@ -3622,33 +4707,43 @@
     gchar *tmp=g_strconcat(strcmp(weed_plugin_path,"")?":":"",lives_weed_plugin_path,NULL);
     g_free(weed_plugin_path);
     weed_plugin_path=tmp;
-    setenv("WEED_PLUGIN_PATH",weed_plugin_path,1);
+    lives_setenv("WEED_PLUGIN_PATH",weed_plugin_path);
   }
   g_free(lives_weed_plugin_path);
 
   // first we parse the weed_plugin_path
+#ifndef IS_MINGW
   numdirs=get_token_count(weed_plugin_path,':');
   dirs=g_strsplit(weed_plugin_path,":",-1);
+#else
+  numdirs=get_token_count(weed_plugin_path,';');
+  dirs=g_strsplit(weed_plugin_path,";",-1);
+#endif
   threaded_dialog_spin();
 
   for (i=0;i<numdirs;i++) {
     // get list of all files
     weed_plugin_list=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,dirs[i],NULL);
     listlen=g_list_length(weed_plugin_list);
-    
+
     // parse twice, first we get the plugins, then 1 level of subdirs
     for (plugin_idx=0;plugin_idx<listlen;plugin_idx++) {
       threaded_dialog_spin();
       plugin_name=(gchar *)g_list_nth_data(weed_plugin_list,plugin_idx);
-      if (!strncmp(plugin_name+strlen(plugin_name)-3,".so",3)) {
-	plugin_path=g_build_filename(dirs[i],plugin_name,NULL);
-	load_weed_plugin(plugin_name,plugin_path,dirs[i]);
-	g_free(plugin_name);
-	g_free(plugin_path);
-	weed_plugin_list=g_list_delete_link(weed_plugin_list,g_list_nth(weed_plugin_list,plugin_idx));
-	plugin_idx--;
-	listlen--;
-      }
+#ifndef IS_MINGW
+      if (!strncmp(plugin_name+strlen(plugin_name)-3,".so",3))
+#else
+	if (!strncmp(plugin_name+strlen(plugin_name)-4,".dll",4))
+#endif
+	  {
+	    plugin_path=g_build_filename(dirs[i],plugin_name,NULL);
+	    load_weed_plugin(plugin_name,plugin_path,dirs[i]);
+	    g_free(plugin_name);
+	    g_free(plugin_path);
+	    weed_plugin_list=g_list_delete_link(weed_plugin_list,g_list_nth(weed_plugin_list,plugin_idx));
+	    plugin_idx--;
+	    listlen--;
+	  }
       threaded_dialog_spin();
 
     }
@@ -3662,8 +4757,12 @@
 	g_free(subdir_path);
 	continue;
       }
+#ifndef IS_MINGW
       weed_plugin_sublist=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,subdir_path,"so");
-      
+#else
+      weed_plugin_sublist=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,subdir_path,"dll");
+#endif      
+
       for (plugin_idx=0;plugin_idx<g_list_length(weed_plugin_sublist);plugin_idx++) {
 	plugin_name=(gchar *)g_list_nth_data(weed_plugin_sublist,plugin_idx);
 	plugin_path=g_build_filename(subdir_path,plugin_name,NULL);
@@ -3690,27 +4789,89 @@
   d_print(msg);
   g_free(msg);
   threaded_dialog_spin();
+  load_compound_fx();
+  threaded_dialog_spin();
+  make_fx_defs_menu();
+  threaded_dialog_spin();
+  if (num_weed_dupes>0) merge_dupes();
+
+}
+
+
+static void weed_free_if_not_in_list(void *ptr, GList **freed_ptrs) {
+  /// avoid duplicate frees when unloading fx plugins
+  GList *list=*freed_ptrs;
+  while (list!=NULL) {
+    if (ptr==(void *)list->data) return;
+    list=list->next;
+  }
+  if (freed_ptrs!=NULL) *freed_ptrs=g_list_append(*freed_ptrs,(gpointer)ptr);
+  weed_free(ptr);
 }
 
 
-void weed_filter_free(weed_plant_t *filter) {
+static void weed_plant_free_if_not_in_list(weed_plant_t *plant, GList **freed_ptrs) {
+  /// avoid duplicate frees when unloading fx plugins
+  GList *list=*freed_ptrs;
+  while (list!=NULL) {
+    if (plant==(weed_plant_t *)list->data) return;
+    list=list->next;
+  }
+  if (freed_ptrs!=NULL) *freed_ptrs=g_list_append(*freed_ptrs,(gpointer)plant);
+  weed_plant_free(plant);
+}
+
+
+static void weed_filter_free(weed_plant_t *filter, GList **freed_ptrs) {
   int nitems,error,i;
   weed_plant_t **plants,*gui;
   void *func;
+  boolean is_compound=FALSE;
+
+  if (num_compound_fx(filter)>1) is_compound=TRUE;
+
+  // free in_param_templates
+  if (weed_plant_has_leaf(filter,"in_parameter_templates")) {
+    nitems=weed_leaf_num_elements(filter,"in_parameter_templates");
+    if (nitems>0) {
+      plants=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+      for (i=0;i<nitems;i++) {
+	if (weed_plant_has_leaf(plants[i],"gui")) {
+	  gui=(weed_get_plantptr_value(plants[i],"gui",&error));
+	  if (weed_plant_has_leaf(gui,"display_func")) {
+	    func=weed_get_voidptr_value(gui,"display_func",&error);
+	    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
+	  }
+	  weed_plant_free_if_not_in_list(gui,freed_ptrs);
+	}
+	if (weed_plant_has_leaf(filter,"interpolate_func")) {
+	  func=weed_get_voidptr_value(filter,"interpolate_func",&error);
+	  if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
+	}
+	weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
+      }
+      weed_free(plants);
+    }
+  }
+
+  if (is_compound) {
+    weed_plant_free(filter);
+    return;
+  }
 
   if (weed_plant_has_leaf(filter,"init_func")) {
     func=weed_get_voidptr_value(filter,"init_func",&error);
-    if (func!=NULL) weed_free(func);
+    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
   }
-
+  
   if (weed_plant_has_leaf(filter,"deinit_func")) {
     func=weed_get_voidptr_value(filter,"deinit_func",&error);
-    if (func!=NULL) weed_free(func);
+    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
   }
 
   if (weed_plant_has_leaf(filter,"process_func")) {
     func=weed_get_voidptr_value(filter,"process_func",&error);
-    if (func!=NULL) weed_free(func);
+    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
   }
 
 
@@ -3719,7 +4880,7 @@
     nitems=weed_leaf_num_elements(filter,"in_channel_templates");
     if (nitems>0) {
       plants=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-      for (i=0;i<nitems;i++) weed_plant_free(plants[i]);
+      for (i=0;i<nitems;i++) weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
       weed_free(plants);
     }
   }
@@ -3730,36 +4891,11 @@
     nitems=weed_leaf_num_elements(filter,"out_channel_templates");
     if (nitems>0) {
       plants=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-      for (i=0;i<nitems;i++) weed_plant_free(plants[i]);
-      weed_free(plants);
-    }
-  }
-
-  // free in_param_templates
-  if (weed_plant_has_leaf(filter,"in_parameter_templates")) {
-    nitems=weed_leaf_num_elements(filter,"in_parameter_templates");
-    if (nitems>0) {
-      plants=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-      for (i=0;i<nitems;i++) {
-	if (weed_plant_has_leaf(plants[i],"gui")) {
-	  gui=(weed_get_plantptr_value(plants[i],"gui",&error));
-	  if (weed_plant_has_leaf(gui,"display_func")) {
-	    func=weed_get_voidptr_value(gui,"display_func",&error);
-	    if (func!=NULL) weed_free(func);
-	  }
-	  weed_plant_free(gui);
-	}
-	if (weed_plant_has_leaf(filter,"interpolate_func")) {
-	  func=weed_get_voidptr_value(filter,"interpolate_func",&error);
-	  if (func!=NULL) weed_free(func);
-	}
-	weed_plant_free(plants[i]);
-      }
+      for (i=0;i<nitems;i++) weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
       weed_free(plants);
     }
   }
 
-
   // free out_param_templates
   if (weed_plant_has_leaf(filter,"out_parameter_templates")) {
     nitems=weed_leaf_num_elements(filter,"out_parameter_templates");
@@ -3768,7 +4904,7 @@
       threaded_dialog_spin();
       for (i=0;i<nitems;i++) {
 	if (weed_plant_has_leaf(plants[i],"gui")) weed_plant_free(weed_get_plantptr_value(plants[i],"gui",&error));
-	weed_plant_free(plants[i]);
+	weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
       }
       weed_free(plants);
     }
@@ -3776,7 +4912,7 @@
 
 
   // free gui
-  if (weed_plant_has_leaf(filter,"gui")) weed_plant_free(weed_get_plantptr_value(filter,"gui",&error));
+  if (weed_plant_has_leaf(filter,"gui")) weed_plant_free_if_not_in_list(weed_get_plantptr_value(filter,"gui",&error),freed_ptrs);
 
 
   // free filter
@@ -3784,12 +4920,661 @@
 }
 
 
+
+static weed_plant_t *create_compound_filter(gchar *plugin_name, int nfilts, int *filts) {
+  weed_plant_t *filter=weed_plant_new(WEED_PLANT_FILTER_CLASS),*xfilter,*gui;
+
+  weed_plant_t **in_params=NULL,**out_params=NULL,**params;
+  weed_plant_t **in_chans,**out_chans;
+
+  gchar *tmp;
+
+  double tgfps=-1.,tfps;
+
+  int count,xcount,error;
+
+  int txparam=-1,tparam,txvolm=-1,tvolm;
+
+  register int i,j,x;
+
+
+  weed_set_int_array(filter,"host_filter_list",nfilts,filts);
+
+  // create parameter templates - concatenate all sub filters
+  count=xcount=0;
+
+  for (i=0;i<nfilts;i++) {
+    xfilter=weed_filters[filts[i]];
+
+    if (weed_plant_has_leaf(xfilter,"target_fps")) {
+      tfps=weed_get_double_value(xfilter,"target_fps",&error);
+      if (tgfps==-1.) tgfps=tfps;
+      else if (tgfps!=tfps) {
+	d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - has conflicting target_fps\n"),plugin_name)));
+	LIVES_ERROR(tmp);
+	g_free(tmp);
+	return NULL;
+      }
+    }
+
+    // in_parameter templates are copy-by-value, since we may set a different default/host_default value, and a different gui
+
+    // everything else - filter classes, out_param templates and channels are copy by ref.
+
+
+    if (weed_plant_has_leaf(xfilter,"in_parameter_templates")) {
+
+      tparam=get_transition_param(xfilter,FALSE);
+
+      // TODO *** - ignore transtion params if they are connected to themselves
+
+      if (tparam!=-1) {
+	if (txparam!=-1) {
+	  d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - has multiple transition parameters\n"),plugin_name)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  return NULL;
+	}
+	txparam=tparam;
+      }
+
+      tvolm=get_master_vol_param(xfilter,FALSE);
+
+      // TODO *** - ignore master vol params if they are connected to themselves
+
+      if (tvolm!=-1) {
+	if (txvolm!=-1) {
+	  d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - has multiple master volume parameters\n"),plugin_name)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  return NULL;
+	}
+	txvolm=tvolm;
+      }
+
+      count+=weed_leaf_num_elements(xfilter,"in_parameter_templates");
+      params=weed_get_plantptr_array(xfilter,"in_parameter_templates",&error);
+
+      in_params=(weed_plant_t **)g_realloc(in_params,count*sizeof(weed_plant_t *));
+      x=0;
+
+      for (j=xcount;j<count;j++) {
+	in_params[j]=weed_plant_copy(params[x]);
+	if (weed_plant_has_leaf(params[x],"gui")) {
+	  gui=weed_get_plantptr_value(params[x],"gui",&error);
+	  weed_set_plantptr_value(in_params[j],"gui",weed_plant_copy(gui));
+	}
+
+	if (x==tparam) {
+	  weed_set_boolean_value(in_params[j],"transition",WEED_TRUE);
+	}
+	else if (weed_plant_has_leaf(in_params[j],"transition")) weed_leaf_delete(in_params[j],"transition");
+
+	if (x==tvolm) {
+	  weed_set_boolean_value(in_params[j],"is_volume_master",WEED_TRUE);
+	}
+	else if (weed_plant_has_leaf(in_params[j],"is_volume_master")) weed_leaf_delete(in_params[j],"is_volume_master");
+
+	x++;
+      }
+      weed_free(params);
+      xcount=count;
+    }
+  }
+
+  if (tgfps!=-1.) weed_set_double_value(filter,"target_fps",tgfps);
+
+  if (count>0) {
+    weed_set_plantptr_array(filter,"in_parameter_templates",count,in_params);
+    g_free(in_params);
+  }
+
+  count=xcount=0;
+
+  for (i=0;i<nfilts;i++) {
+    xfilter=weed_filters[filts[i]];
+    if (weed_plant_has_leaf(xfilter,"out_parameter_templates")) {
+      count+=weed_leaf_num_elements(xfilter,"out_parameter_templates");
+      params=weed_get_plantptr_array(xfilter,"out_parameter_templates",&error);
+
+      out_params=(weed_plant_t **)g_realloc(out_params,count*sizeof(weed_plant_t *));
+      x=0;
+
+      for (j=xcount;j<count;j++) {
+	out_params[j]=params[x++];
+      }
+      if (params!=NULL) weed_free(params);
+      xcount=count;
+    }
+  }
+
+  if (count>0) {
+    weed_set_plantptr_array(filter,"out_parameter_templates",count,out_params);
+    weed_free(out_params);
+  }
+
+  // use in channels from first filter
+
+  xfilter=weed_filters[filts[0]];
+  if (weed_plant_has_leaf(xfilter,"in_channel_templates")) {
+    count=weed_leaf_num_elements(xfilter,"in_channel_templates");
+    in_chans=weed_get_plantptr_array(xfilter,"in_channel_templates",&error);
+    weed_set_plantptr_array(filter,"in_channel_templates",count,in_chans);
+    weed_free(in_chans);
+  }
+
+  // use out channels from last filter
+
+  xfilter=weed_filters[filts[nfilts-1]];
+  if (weed_plant_has_leaf(xfilter,"out_channel_templates")) {
+    count=weed_leaf_num_elements(xfilter,"out_channel_templates");
+    out_chans=weed_get_plantptr_array(xfilter,"out_channel_templates",&error);
+    weed_set_plantptr_array(filter,"out_channel_templates",count,out_chans);
+    weed_free(out_chans);
+  }
+
+  return filter;
+}
+
+
+
+
+
+
+static void load_compound_plugin(gchar *plugin_name, gchar *plugin_path) {
+  FILE *cpdfile;
+
+  weed_plant_t *filter=NULL,*ptmpl,*iptmpl,*xfilter;
+
+  gchar buff[16384];
+
+  gchar **array,**svals;
+
+  gchar *author=NULL,*tmp,*key;
+
+  int *filters=NULL,*ivals;
+
+  double *dvals;
+
+  int xvals[4];
+
+  boolean ok=TRUE,autoscale;
+
+  int stage=0,nfilts=0,fnum,line=0,version=0;
+  int qvals=1,ntok,xfilt,xfilt2;
+
+  int xconx=0;
+
+  int nparams,nchans,pnum,pnum2,xpnum2,cnum,cnum2,ptype,phint,pcspace,pflags;
+
+  int error;
+
+  register int i;
+
+  if ((cpdfile=fopen (plugin_path,"r"))) {
+    while (fgets(buff,16384,cpdfile)) {
+      line++;
+      g_strchomp(buff);
+      if (!strlen(buff)) {
+	if (++stage==5) break;
+	if (stage==2) {
+	  if (nfilts<2) {
+	    d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - must have >1 sub filters\n"),plugin_name)));
+	    LIVES_ERROR(tmp);
+	    g_free(tmp);
+	    ok=FALSE;
+	    break;
+	  }
+	  filter=create_compound_filter(plugin_name,nfilts,filters);
+	  if (filter==NULL) break;
+	}
+	continue;
+      }
+      switch (stage) {
+      case 0:
+	if (line==1) author=g_strdup(buff);
+	if (line==2) version=atoi(buff);
+	break;
+      case 1:
+	// add filters
+	fnum=weed_get_idx_for_hashname(buff,TRUE);
+	if (fnum==-1) {
+	  d_print((tmp=g_strdup_printf(_("Invalid effect %s found in compound effect %s, line %d\n"),buff,plugin_name,line)));
+	  LIVES_INFO(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  break;
+	}
+	filters=(int *)g_realloc(filters,++nfilts*sizeof(int));
+	filters[nfilts-1]=fnum;
+	break;
+      case 2:
+	// override defaults: format is i|p|d0|d1|...|dn
+	// NOTE: for obvious reasons, | may not be used inside string defaults
+	ntok=get_token_count (buff,'|');
+
+	if (ntok<2) {
+	  d_print((tmp=g_strdup_printf(_("Invalid default found in compound effect %s, line %d\n"),plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  break;
+	}
+
+	array=g_strsplit(buff,"|",ntok);
+
+	xfilt=atoi(array[0]); // sub filter number
+	if (xfilt<0||xfilt>=nfilts) {
+	  d_print((tmp=g_strdup_printf(_("Invalid filter %d for defaults found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+	xfilter=get_weed_filter(filters[xfilt]);
+
+	nparams=num_in_params(xfilter,FALSE,FALSE);
+
+	pnum=atoi(array[1]);
+	
+	if (pnum>=nparams) {
+	  d_print((tmp=g_strdup_printf(_("Invalid param %d for defaults found in compound effect %s, line %d\n"),pnum,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	// get pnum for compound filter
+	for (i=0;i<xfilt;i++) pnum+=num_in_params(get_weed_filter(filters[i]),FALSE,FALSE);
+
+	ptmpl=weed_filter_in_paramtmpl(filter,pnum,FALSE);
+
+	ptype=weed_leaf_seed_type(ptmpl,"default");
+	pflags=weed_get_int_value(ptmpl,"flags",&error);
+	phint=weed_get_int_value(ptmpl,"hint",&error);
+
+	if (phint==WEED_HINT_COLOR) {
+	  pcspace=weed_get_int_value(ptmpl,"colorspace",&error);
+	  qvals=3;
+	  if (pcspace==WEED_COLORSPACE_RGBA) qvals=4;
+	}
+
+	ntok-=2;
+
+	if ((ntok!=weed_leaf_num_elements(ptmpl,"default")&&!(pflags&WEED_PARAMETER_VARIABLE_ELEMENTS)) ||
+	    ntok%qvals!=0) {
+	  d_print((tmp=g_strdup_printf(_("Invalid number of values for defaults found in compound effect %s, line %d\n"),plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	// TODO - for INT and DOUBLE, check if default is within min/max bounds
+
+	switch (ptype) {
+	case WEED_SEED_INT:
+	  ivals=(int *)g_malloc(ntok*sizint);
+	  for (i=0;i<ntok;i++) {
+	    ivals[i]=atoi(array[i+2]);
+	  }
+	  weed_set_int_array(ptmpl,"default",ntok,ivals);
+	  g_free(ivals);
+	  break;
+	case WEED_SEED_DOUBLE:
+	  dvals=(double *)g_malloc(ntok*sizdbl);
+	  for (i=0;i<ntok;i++) {
+	    dvals[i]=strtod(array[i+2],NULL);
+	  }
+	  weed_set_double_array(ptmpl,"default",ntok,dvals);
+	  g_free(dvals);
+	  break;
+	case WEED_SEED_BOOLEAN:
+	  ivals=(int *)g_malloc(ntok*sizint);
+	  for (i=0;i<ntok;i++) {
+	    ivals[i]=atoi(array[i+2]);
+
+	    if (ivals[i]!=WEED_TRUE&&ivals[i]!=WEED_FALSE) {
+	      g_free(ivals);
+	      d_print((tmp=g_strdup_printf(_("Invalid non-boolean value for defaults found in compound effect %s, line %d\n"),
+					   pnum,plugin_name,line)));
+	      LIVES_ERROR(tmp);
+	      g_free(tmp);
+	      ok=FALSE;
+	      g_strfreev(array);
+	      break;
+	    }
+
+	  }
+	  weed_set_boolean_array(ptmpl,"default",ntok,ivals);
+	  g_free(ivals);
+	  break;
+	default: // string
+	  svals=(gchar **)g_malloc(ntok*sizeof(gchar *));
+	  for (i=0;i<ntok;i++) {
+	    svals[i]=g_strdup(array[i+2]);
+	  }
+	  weed_set_string_array(ptmpl,"default",ntok,svals);
+	  for (i=0;i<ntok;i++) {
+	    g_free(svals[i]);
+	  }
+	  g_free(svals);
+	  break;
+	}
+	g_strfreev(array);
+	break;
+      case 3:
+	// link params: format is f0|p0|autoscale|f1|p1
+
+	ntok=get_token_count (buff,'|');
+
+	if (ntok!=5) {
+	  d_print((tmp=g_strdup_printf(_("Invalid param link found in compound effect %s, line %d\n"),plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  break;
+	}
+
+	array=g_strsplit(buff,"|",ntok);
+
+	xfilt=atoi(array[0]); // sub filter number
+	if (xfilt<-1||xfilt>=nfilts) {
+	  d_print((tmp=g_strdup_printf(_("Invalid out filter %d for link params found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	pnum=atoi(array[1]);
+
+	if (xfilt>-1) {
+	  xfilter=get_weed_filter(filters[xfilt]);
+
+	  if (weed_plant_has_leaf(xfilter,"out_parameter_templates"))
+	    nparams=weed_leaf_num_elements(xfilter,"out_parameter_templates");
+	  else nparams=0;
+
+	  if (pnum>=nparams) {
+	    d_print((tmp=g_strdup_printf(_("Invalid out param %d for link params found in compound effect %s, line %d\n"),pnum,plugin_name,line)));
+	    LIVES_ERROR(tmp);
+	    g_free(tmp);
+	    ok=FALSE;
+	    g_strfreev(array);
+	    break;
+	  }
+	}
+
+	autoscale=atoi(array[2]);
+
+	if (autoscale!=WEED_TRUE&&autoscale!=WEED_FALSE) {
+	  d_print((tmp=g_strdup_printf(_("Invalid non-boolean value for autoscale found in compound effect %s, line %d\n"),
+				       pnum,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	xfilt2=atoi(array[3]); // sub filter number
+	if (xfilt>=nfilts) {
+	  d_print((tmp=g_strdup_printf(_("Invalid in filter %d for link params found in compound effect %s, line %d\n"),xfilt2,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+	xfilter=get_weed_filter(filters[xfilt2]);
+
+	nparams=num_in_params(xfilter,FALSE,FALSE);
+
+	pnum2=atoi(array[4]);
+	
+	if (pnum2>=nparams) {
+	  d_print((tmp=g_strdup_printf(_("Invalid in param %d for link params found in compound effect %s, line %d\n"),pnum2,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	// calc xpnum2
+	xpnum2=pnum2;
+	for (i=0;i<xfilt2;i++) xpnum2+=num_in_params(get_weed_filter(filters[i]),FALSE,FALSE);
+
+	// must get paramtmpl here from filter (not xfilter)
+	iptmpl=weed_filter_in_paramtmpl(filter,xpnum2,FALSE);
+
+	xvals[0]=xfilt;
+	xvals[1]=pnum;
+
+	weed_set_int_array(iptmpl,"host_internal_connection",2,xvals);
+	if (autoscale==WEED_TRUE) weed_set_boolean_value(iptmpl,"host_internal_connection_autoscale",WEED_TRUE);
+
+	g_strfreev(array);
+	break;
+      case 4:
+	// link alpha channels: format is f0|c0|f1|c1
+	ntok=get_token_count (buff,'|');
+
+	if (ntok!=4) {
+	  d_print((tmp=g_strdup_printf(_("Invalid channel link found in compound effect %s, line %d\n"),plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  break;
+	}
+
+	array=g_strsplit(buff,"|",ntok);
+
+	xfilt=atoi(array[0]); // sub filter number
+	if (xfilt<0||xfilt>=nfilts) {
+	  d_print((tmp=g_strdup_printf(_("Invalid out filter %d for link channels found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+	xfilter=get_weed_filter(filters[xfilt]);
+
+	nchans=0;
+	if (weed_plant_has_leaf(xfilter,"out_channel_templates")) {
+	  nchans=weed_leaf_num_elements(xfilter,"out_channel_templates");
+	  if (weed_get_plantptr_value(xfilter,"out_channel_templates",&error)==NULL) nchans=0;
+	}
+
+	cnum=atoi(array[1]);
+
+	if (cnum>=nchans) {
+	  d_print((tmp=g_strdup_printf(_("Invalid out channel %d for link params found in compound effect %s, line %d\n"),cnum,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	xfilt2=atoi(array[2]); // sub filter number
+	if (xfilt2<=xfilt||xfilt>=nfilts) {
+	  d_print((tmp=g_strdup_printf(_("Invalid in filter %d for link channels found in compound effect %s, line %d\n"),xfilt2,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+	xfilter=get_weed_filter(filters[xfilt2]);
+
+	nchans=0;
+	if (weed_plant_has_leaf(xfilter,"in_channel_templates")) {
+	  nchans=weed_leaf_num_elements(xfilter,"in_channel_templates");
+	  if (weed_get_plantptr_value(xfilter,"in_channel_templates",&error)==NULL) nchans=0;
+	}
+
+	cnum2=atoi(array[3]);
+	
+	if (cnum2>=nchans) {
+	  d_print((tmp=g_strdup_printf(_("Invalid in channel %d for link params found in compound effect %s, line %d\n"),cnum2,plugin_name,line)));
+	  LIVES_ERROR(tmp);
+	  g_free(tmp);
+	  ok=FALSE;
+	  g_strfreev(array);
+	  break;
+	}
+
+	xvals[0]=xfilt;
+	xvals[1]=cnum;
+	xvals[2]=xfilt2;
+	xvals[3]=cnum2;
+
+	// unlike with in_param_templates, which are copy by value, in_channel_templates are copy by ref.
+	// so we need to add some extra leaves to the compound filter to note channel connections
+	// - we will link the actual channels when we create an instance from the filter
+	key=g_strdup_printf("host_channel_connection%d",xconx++);
+	weed_set_int_array(filter,key,4,xvals);
+	g_free(key);
+
+	g_strfreev(array);
+	break;
+      default:
+	break;
+      }
+      if (!ok) {
+	if (filter!=NULL) weed_filter_free(filter,NULL);
+	filter=NULL;
+	break;
+      }
+    }
+    fclose(cpdfile);
+  }
+
+  if (filter!=NULL) {
+    GtkWidget *menuitem;
+    int idx;
+    gchar *filter_type,*string;
+    gchar *filter_name=g_strdup_printf(_("Compound:%s"),plugin_name);
+    weed_set_string_value(filter,"name",filter_name);
+
+    weed_set_string_value(filter,"author",author);
+    weed_free(author);
+    weed_set_int_value(filter,"version",version);
+    idx=num_weed_filters++;
+
+    weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+    weed_filters[idx]=filter;
+
+    hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
+    hashnames[idx]=NULL;
+    hashnames[idx]=make_weed_hashname(idx,TRUE,FALSE);
+
+    if (num_in_params(filter,TRUE,TRUE)>0) {
+      filter_type=weed_filter_get_type(filter,TRUE,FALSE);
+      string=g_strdup_printf("%s (%s)",filter_name,filter_type);
+      
+      menuitem=gtk_menu_item_new_with_label (string);
+      gtk_widget_show(menuitem);
+      g_free(string);
+      g_free(filter_type);
+      
+      gtk_container_add (GTK_CONTAINER (mainw->rte_defs), menuitem);
+      
+      g_signal_connect (GTK_OBJECT (menuitem), "activate",
+			G_CALLBACK (rte_set_defs_activate),
+			GINT_TO_POINTER(idx));
+    }
+
+    g_free(filter_name);
+  }
+
+  if (filters!=NULL) g_free(filters);
+
+}
+
+
+
+
+
+void load_compound_fx(void) {
+  LiVESList *compound_plugin_list;
+
+  int plugin_idx,onum_filters=num_weed_filters;
+
+  gchar *lives_compound_plugin_path,*plugin_name,*plugin_path,*msg;
+
+  threaded_dialog_spin();
+
+  lives_compound_plugin_path=g_build_filename(capable->home_dir,PLUGIN_COMPOUND_EFFECTS_CUSTOM,NULL);
+  compound_plugin_list=get_plugin_list(PLUGIN_COMPOUND_EFFECTS_CUSTOM,TRUE,lives_compound_plugin_path,NULL);
+
+  for (plugin_idx=0;plugin_idx<g_list_length(compound_plugin_list);plugin_idx++) {
+    plugin_name=(gchar *)g_list_nth_data(compound_plugin_list,plugin_idx);
+    plugin_path=g_build_filename(lives_compound_plugin_path,plugin_name,NULL);
+    load_compound_plugin(plugin_name,plugin_path);
+    g_free(plugin_path);
+    threaded_dialog_spin();
+  }
+
+  if (compound_plugin_list!=NULL) {
+    g_list_free_strings(compound_plugin_list);
+    g_list_free(compound_plugin_list);
+  }
+
+  threaded_dialog_spin();
+  g_free(lives_compound_plugin_path);
+
+  lives_compound_plugin_path=g_build_filename(prefs->prefix_dir,PLUGIN_COMPOUND_DIR,PLUGIN_COMPOUND_EFFECTS_BUILTIN,NULL);
+  compound_plugin_list=get_plugin_list(PLUGIN_COMPOUND_EFFECTS_BUILTIN,TRUE,lives_compound_plugin_path,NULL);
+  
+  for (plugin_idx=0;plugin_idx<g_list_length(compound_plugin_list);plugin_idx++) {
+    plugin_name=(gchar *)g_list_nth_data(compound_plugin_list,plugin_idx);
+    plugin_path=g_build_filename(lives_compound_plugin_path,plugin_name,NULL);
+    load_compound_plugin(plugin_name,plugin_path);
+    g_free(plugin_path);
+    threaded_dialog_spin();
+  }
+
+  if (compound_plugin_list!=NULL) {
+    g_list_free_strings(compound_plugin_list);
+    g_list_free(compound_plugin_list);
+  }
+
+  if (num_weed_filters>onum_filters) {
+    msg=g_strdup_printf(_ ("Successfully loaded %d compound filters\n"),num_weed_filters-onum_filters);
+    d_print(msg);
+    g_free(msg);
+  }
+
+  g_free(lives_compound_plugin_path);
+  threaded_dialog_spin();
+
+}
+
+
+
+
+
 void weed_unload_all(void) {
-  int i,j,error;
   weed_plant_t *filter,*plugin_info,*host_info;
+
   void *handle;
+
   weed_desetup_f desetup_fn;
-  GList *pinfo=NULL,*xpinfo;
+
+  GList *pinfo=NULL,*xpinfo,*freed_ptrs=NULL;
+
+  int error;
+
+  register int i,j;
 
   mainw->num_tr_applied=0;
   weed_deinit_all(TRUE);
@@ -3806,6 +5591,12 @@
   for (i=0;i<num_weed_filters;i++) {
 
     filter=weed_filters[i];
+
+    if (num_compound_fx(filter)>1) {
+      weed_filter_free(filter,&freed_ptrs);
+      continue;
+    }
+
     plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
 
     if (pinfo==NULL||g_list_index(pinfo,plugin_info)==-1) pinfo=g_list_append(pinfo,plugin_info);
@@ -3826,9 +5617,11 @@
       handle=NULL;
       weed_set_voidptr_value(plugin_info,"handle",handle);
     }
-    weed_filter_free(filter);
+    weed_filter_free(filter,&freed_ptrs);
   }
 
+  g_list_free(freed_ptrs);
+
   xpinfo=pinfo;
 
   while (pinfo!=NULL) {
@@ -3840,8 +5633,14 @@
 
   if (xpinfo!=NULL) g_list_free(xpinfo);
 
-  for (i=0;i<MAX_WEED_FILTERS;i++) {
+  for (i=0;i<num_weed_filters;i++) {
     if (hashnames[i]!=NULL) g_free(hashnames[i]);
+  }
+
+  if (hashnames!=NULL) g_free(hashnames);
+  if (weed_filters!=NULL) g_free(weed_filters);
+
+  for (i=0;i<FX_KEYS_MAX;i++) {
     g_free(key_to_fx[i]);
     g_free(key_to_instance[i]);
     g_free(key_to_instance_copy[i]);
@@ -3867,8 +5666,12 @@
 
   num_channels=weed_leaf_num_elements(inst,"in_channels");
   channels=weed_get_plantptr_array(inst,"in_channels",&error);
-  for (i=0;i<num_channels;i++) 
-    if (channels[i]!=NULL) weed_plant_free(channels[i]);
+  for (i=0;i<num_channels;i++) {
+    if (channels[i]!=NULL) {
+      if (weed_palette_is_alpha_palette(weed_layer_get_palette(channels[i]))) weed_layer_free(channels[i]);
+      else weed_plant_free(channels[i]);
+    }
+  }
   weed_free(channels);
 
 }
@@ -3882,8 +5685,12 @@
 
   num_channels=weed_leaf_num_elements(inst,"out_channels");
   channels=weed_get_plantptr_array(inst,"out_channels",&error);
-  for (i=0;i<num_channels;i++) 
-    if (channels[i]!=NULL) weed_plant_free(channels[i]);
+  for (i=0;i<num_channels;i++) {
+    if (channels[i]!=NULL) {
+      if (weed_palette_is_alpha_palette(weed_layer_get_palette(channels[i]))) weed_layer_free(channels[i]);
+      else weed_plant_free(channels[i]);
+    }
+  }
   weed_free(channels);
 }
 
@@ -3904,16 +5711,8 @@
 }
 
 
-void weed_in_parameters_free (weed_plant_t *inst) {
-  weed_plant_t **parameters;
-  int error;
-  int num_parameters;
+void weed_in_params_free(weed_plant_t **parameters, int num_parameters) {
   register int i;
-
-  if (!weed_plant_has_leaf(inst,"in_parameters")) return;
-
-  num_parameters=weed_leaf_num_elements(inst,"in_parameters");
-  parameters=weed_get_plantptr_array(inst,"in_parameters",&error);
   for (i=0;i<num_parameters;i++) {
     if (parameters[i]!=NULL) {
       if (parameters[i]==mainw->rte_textparm) mainw->rte_textparm=NULL;
@@ -3924,6 +5723,19 @@
   weed_free(parameters);
 }
 
+
+void weed_in_parameters_free (weed_plant_t *inst) {
+  weed_plant_t **parameters;
+  int error;
+  int num_parameters;
+
+  if (!weed_plant_has_leaf(inst,"in_parameters")) return;
+
+  num_parameters=weed_leaf_num_elements(inst,"in_parameters");
+  parameters=weed_get_plantptr_array(inst,"in_parameters",&error);
+  weed_in_params_free(parameters,num_parameters);
+}
+
 static void weed_out_parameters_free (weed_plant_t *inst) {
   weed_plant_t **parameters;
   int error;
@@ -3955,15 +5767,15 @@
 
 void weed_instance_unref(weed_plant_t *inst) {
   int error;
-  int nrefs=weed_get_int_value(inst,"refs",&error)-1;
+  int nrefs=weed_get_int_value(inst,"host_refs",&error)-1;
   if (nrefs==0) weed_free_instance(inst);
-  else weed_set_int_value(inst,"refs",nrefs);
+  else weed_set_int_value(inst,"host_refs",nrefs);
 }
 
 void weed_instance_ref(weed_plant_t *inst) {
   int error;
-  int nrefs=weed_get_int_value(inst,"refs",&error)+1;
-  weed_set_int_value(inst,"refs",nrefs);
+  int nrefs=weed_get_int_value(inst,"host_refs",&error)+1;
+  weed_set_int_value(inst,"host_refs",nrefs);
 }
 
 
@@ -3971,10 +5783,12 @@
 void weed_generator_end (weed_plant_t *inst) {
   // generator has stopped for one of the following reasons:
   // efect was de-inited; clip (bg/fg) was changed; playback stopped with fg
-  gboolean is_bg=FALSE;
-  gint current_file=mainw->current_file,pre_src_file=mainw->pre_src_file;
-  gboolean clip_switched=mainw->clip_switched;
+  weed_plant_t *next_inst=NULL;
   lives_whentostop_t wts=mainw->whentostop;
+  boolean is_bg=FALSE;
+  boolean clip_switched=mainw->clip_switched;
+  int current_file=mainw->current_file,pre_src_file=mainw->pre_src_file;
+  int error;
 
   if (inst==NULL) {
     LIVES_WARN("inst was NULL !");
@@ -4001,17 +5815,10 @@
     }
   }
 
-  weed_call_deinit_func(inst);
-  weed_instance_unref(inst);
-
-  // if the param window is already open, show any reinits now
-  if (fx_dialog[1]!=NULL) {
-    if (is_bg) redraw_pwindow(bg_generator_key,bg_generator_mode);
-    else redraw_pwindow(fg_generator_key,fg_generator_mode);
-  }
-
   if (is_bg) {
+    pthread_mutex_lock(&mainw->afilter_mutex);
     key_to_instance[bg_generator_key][bg_generator_mode]=NULL;
+    pthread_mutex_unlock(&mainw->afilter_mutex);
     if (mainw->rte&(GU641<<bg_generator_key)) mainw->rte^=(GU641<<bg_generator_key);
     bg_gen_to_start=bg_generator_key=bg_generator_mode=-1;
     pre_src_file=mainw->pre_src_file;
@@ -4019,12 +5826,34 @@
     mainw->current_file=mainw->blend_file;
   }
   else {
+    pthread_mutex_lock(&mainw->afilter_mutex);
     key_to_instance[fg_generator_key][fg_generator_mode]=NULL;
+    pthread_mutex_unlock(&mainw->afilter_mutex);
     if (mainw->rte&(GU641<<fg_generator_key)) mainw->rte^=(GU641<<fg_generator_key);
     fg_gen_to_start=fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
     if (mainw->blend_file==mainw->current_file) mainw->blend_file=-1;
   }
 
+ deinit1:
+
+  if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+  else next_inst=NULL;
+
+  weed_call_deinit_func(inst);
+  weed_instance_unref(inst);
+
+  if (next_inst!=NULL) {
+    // handle compound fx
+    inst=next_inst;
+    goto deinit1;
+  }
+
+  // if the param window is already open, show any reinits now
+  if (fx_dialog[1]!=NULL) {
+    if (is_bg) redraw_pwindow(bg_generator_key,bg_generator_mode);
+    else redraw_pwindow(fg_generator_key,fg_generator_mode);
+  }
+
   if (!is_bg&&cfile->achans>0&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
     // we started playing from an audio clip
     cfile->frames=cfile->start=cfile->end=0;
@@ -4058,7 +5887,7 @@
 }
 
 
-static weed_plant_t **weed_channels_create (weed_plant_t *filter, gboolean in) {
+static weed_plant_t **weed_channels_create (weed_plant_t *filter, boolean in) {
   weed_plant_t **channels,**chantmpls;
   int num_channels;
   int i,j,error,pal;
@@ -4072,7 +5901,7 @@
   else chantmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
 
   for (i=0;i<num_channels;i++) {
-    if (weed_plant_has_leaf(chantmpls[i],"repeats")) ccount+=weed_get_int_value(chantmpls[i],"repeats",&error);
+    if (weed_plant_has_leaf(chantmpls[i],"host_repeats")) ccount+=weed_get_int_value(chantmpls[i],"host_repeats",&error);
     else ccount+=1;
   }
 
@@ -4081,12 +5910,14 @@
   ccount=0;
 
   for (i=0;i<num_channels;i++) {
-    if (weed_plant_has_leaf(chantmpls[i],"repeats")) num_repeats=weed_get_int_value(chantmpls[i],"repeats",&error);
+    if (weed_plant_has_leaf(chantmpls[i],"host_repeats")) num_repeats=weed_get_int_value(chantmpls[i],"host_repeats",&error);
     else num_repeats=1;
     for (j=0;j<num_repeats;j++) {
       channels[ccount]=weed_plant_new(WEED_PLANT_CHANNEL);
       weed_set_plantptr_value(channels[ccount],"template",chantmpls[i]);
 
+      weed_set_voidptr_value(channels[ccount],"pixel_data",NULL);
+
       if (weed_plant_has_leaf(chantmpls[i],"current_palette")) {
 	// audio only channels dont have a "current_palette" !
 	weed_set_int_value(channels[ccount],"current_palette",
@@ -4104,8 +5935,8 @@
 	}
       }
 
-      if (weed_plant_has_leaf(chantmpls[i],"disabled")) 
-	(weed_set_boolean_value(channels[ccount],"disabled", weed_get_boolean_value(chantmpls[i],"disabled",&error)));
+      if (weed_plant_has_leaf(chantmpls[i],"host_disabled")) 
+	weed_set_boolean_value(channels[ccount],"disabled", weed_get_boolean_value(chantmpls[i],"host_disabled",&error));
       weed_add_plant_flags(channels[ccount],WEED_LEAF_READONLY_PLUGIN);
       ccount++;
     }
@@ -4116,7 +5947,7 @@
 }
 
 
-weed_plant_t **weed_params_create (weed_plant_t *filter, gboolean in) {
+weed_plant_t **weed_params_create (weed_plant_t *filter, boolean in) {
   // return set of parameters with default/host_default values
   // in==TRUE create in parameters for filter
   // in==FALSE create out parameters for filter
@@ -4144,9 +5975,13 @@
       else weed_leaf_copy(params[i],"value",paramtmpls[i],"default");
       weed_add_plant_flags(params[i],WEED_LEAF_READONLY_PLUGIN);
     }
+    else {
+      weed_leaf_copy(params[i],"value",paramtmpls[i],"default");
+    }
   }
   params[num_params]=NULL;
   weed_free(paramtmpls);
+
   return params;
 }
 
@@ -4154,12 +5989,23 @@
 
 static void set_default_channel_sizes (weed_plant_t **in_channels, weed_plant_t **out_channels) {
   // set some reasonable default channel sizes when we first init the effect
-  int error,i,j;
   weed_plant_t *channel,*chantmpl;
+
   void **pixel_data;
+
+  int *rowstrides;
+
+  boolean is_gen=TRUE;
+  boolean has_aud_in_chans=FALSE;
+
+  int def_rowstride;
   int numplanes,width,height;
-  int *rowstrides,def_rowstride;
-  gboolean is_gen=TRUE;
+  int error;
+
+  register int i,j;
+
+  // ignore filters with no in/out channels (e.g. data processors)
+  if ((in_channels==NULL||in_channels[0]==NULL)&&(out_channels==NULL||out_channels[0]==NULL)) return;
 
   for (i=0;in_channels!=NULL&&in_channels[i]!=NULL&&
 	 !(weed_plant_has_leaf(in_channels[i],"disabled")&&
@@ -4189,6 +6035,7 @@
 	numplanes=1;
       for (j=0;j<numplanes;j++) g_free(pixel_data[j]);
       weed_free(pixel_data);
+      weed_set_voidptr_value(channel,"pixel_data",NULL);
     }
     else {
       if (mainw->current_file==-1) {
@@ -4202,6 +6049,8 @@
       weed_set_boolean_value(channel,"audio_interleaf",WEED_FALSE);
       weed_set_int_value(channel,"audio_data_length",0);
       weed_set_voidptr_value(channel,"audio_data",NULL);
+
+      has_aud_in_chans=TRUE;
     }
   }
 
@@ -4231,9 +6080,10 @@
 	numplanes=1;
       for (j=0;j<numplanes;j++) g_free(pixel_data[j]);
       weed_free(pixel_data);
+      weed_set_voidptr_value(channel,"pixel_data",NULL);
     }
     else {
-      if (mainw->current_file==-1) {
+      if (mainw->current_file==-1||!has_aud_in_chans) {
 	weed_set_int_value(channel,"audio_channels",DEFAULT_AUDIO_CHANS);
 	weed_set_int_value(channel,"audio_rate",DEFAULT_AUDIO_RATE);
       }
@@ -4254,13 +6104,26 @@
   // here we create a new filter_instance from the ingredients: 
   // filter_class, in_channels, out_channels, in_parameters, out_parameters
   weed_plant_t *inst=weed_plant_new(WEED_PLANT_FILTER_INSTANCE);
+
+  int n;
+  int flags=WEED_LEAF_READONLY_PLUGIN;
+
+  register int i;
+
   weed_set_plantptr_value(inst,"filter_class",filter);
   if (inc!=NULL) weed_set_plantptr_array(inst,"in_channels",weed_flagset_array_count(inc,TRUE),inc);
   if (outc!=NULL) weed_set_plantptr_array(inst,"out_channels",weed_flagset_array_count(outc,TRUE),outc);
   if (inp!=NULL) weed_set_plantptr_array(inst,"in_parameters",weed_flagset_array_count(inp,TRUE),inp);
-  if (outp!=NULL) weed_set_plantptr_array(inst,"out_parameters",weed_flagset_array_count(outp,TRUE),outp);
+  if (outp!=NULL) {
+    weed_set_plantptr_array(inst,"out_parameters",(n=weed_flagset_array_count(outp,TRUE)),outp);
+    for (i=0;i<n;i++) {
+      // allow plugins to set out_param "value"
+      weed_leaf_set_flags(outp[i],"value",(weed_leaf_get_flags(outp[i],"value")|flags)^flags);
+    }
+  }
 
-  weed_set_int_value(inst,"refs",1);
+  weed_set_int_value(inst,"host_refs",1);
+  weed_set_boolean_value(inst,"host_inited",WEED_FALSE);
 
   weed_add_plant_flags(inst,WEED_LEAF_READONLY_PLUGIN);
   return inst;
@@ -4268,45 +6131,197 @@
 
 
 
+void add_param_connections(weed_plant_t *inst) {
+  weed_plant_t **in_ptmpls,**outp;
+  weed_plant_t *iparam,*oparam,*first_inst=inst,*filter=weed_instance_get_filter(inst,TRUE);
+
+  int *xvals;
+
+  int nptmpls,error;
+
+  register int i;
+
+  if (weed_plant_has_leaf(filter,"in_parameter_templates")) nptmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
+  else return;
+
+  if (nptmpls!=0&&weed_get_plantptr_value(filter,"in_parameter_templates",&error)!=NULL) {
+    in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+    for (i=0;i<nptmpls;i++) {
+      if (weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection")) {
+	xvals=weed_get_int_array(in_ptmpls[i],"host_internal_connection",&error);
+	
+	iparam=weed_inst_in_param(first_inst,i,FALSE,FALSE);
+	
+	if (xvals[0]>-1) {
+	  inst=first_inst;
+	  while (--xvals[0]>=0) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	  
+	  outp=weed_get_plantptr_array(inst,"out_parameters",&error);
+	  oparam=outp[xvals[1]];
+	  weed_free(outp);
+	}
+	else oparam=iparam; // just hide the parameter, but don't pull a value
+	
+	weed_set_plantptr_value(iparam,"host_internal_connection",oparam);
+
+	if (weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection_autoscale")&&
+	    weed_get_boolean_value(in_ptmpls[i],"host_internal_connection_autoscale",&error)==WEED_TRUE)
+	  weed_set_boolean_value(iparam,"host_internal_connection_autoscale",WEED_TRUE);
+	
+	weed_free(xvals);
+      }
+    }
+    weed_free(in_ptmpls);
+  }
+}
+
+
+
 weed_plant_t *weed_instance_from_filter(weed_plant_t *filter) {
   // return an instance from a filter
-  weed_plant_t *new_instance;
-  weed_plant_t **inc,**outc,**inp,**outp;
+  weed_plant_t **inc,**outc,**inp,**outp,**xinp;
+
+  weed_plant_t *last_inst=NULL,*first_inst=NULL,*inst,*ofilter=filter;
+  weed_plant_t *ochan=NULL;
+
+  int *filters=NULL,*xvals;
+
+  gchar *key;
+
+  int nfilters,ninpar=0,error;
+
+  int xcnumx=0,x,poffset=0;
 
-  // create channels from channel_templates
-  inc=weed_channels_create (filter,TRUE);
-  outc=weed_channels_create (filter,FALSE);
+  register int i,j;
 
-  set_default_channel_sizes (inc,outc); // we set the initial channel sizes to some reasonable defaults
+  if ((nfilters=num_compound_fx(filter))>1) {
+    filters=weed_get_int_array(filter,"host_filter_list",&error);
+  }
 
-  // create parameters from parameter_templates
   inp=weed_params_create(filter,TRUE);
-  outp=weed_params_create(filter,FALSE);
 
-  new_instance=weed_create_instance(filter,inc,outc,inp,outp);
- 
-  if (inc!=NULL) weed_free(inc);
-  if (outc!=NULL) weed_free(outc);
+  for (i=0;i<nfilters;i++) {
+
+    if (filters!=NULL) {
+      filter=weed_filters[filters[i]];
+    }
+
+    // create channels from channel_templates
+    inc=weed_channels_create (filter,TRUE);
+    outc=weed_channels_create (filter,FALSE);
+    
+    set_default_channel_sizes (inc,outc); // we set the initial channel sizes to some reasonable defaults
+    
+    // create parameters from parameter_templates
+    outp=weed_params_create(filter,FALSE);
+    
+    if (nfilters==1) xinp=inp;
+    else {
+      // for a compound filter, assign only the params which belong to the instance
+      ninpar=num_in_params(filter,FALSE,FALSE);
+      if (ninpar==0) xinp=NULL;
+      else {
+	xinp=(weed_plant_t **)g_malloc((ninpar+1)*sizeof(weed_plant_t *));
+	x=0;
+	for (j=poffset;j<poffset+ninpar;j++) xinp[x++]=inp[j];
+	xinp[x]=NULL;
+	poffset+=ninpar;
+      }
+    }
+
+    inst=weed_create_instance(filter,inc,outc,xinp,outp);
+    if (filters!=NULL) weed_set_plantptr_value(inst,"host_compound_class",ofilter);
+
+    if (i>0) {
+      weed_set_plantptr_value(last_inst,"host_next_instance",inst);
+    }
+    else first_inst=inst;
+
+    last_inst=inst;
+
+    if (inc!=NULL) weed_free(inc);
+    if (outc!=NULL) weed_free(outc);
+    if (outp!=NULL) weed_free(outp);
+    if (xinp!=inp) weed_free(xinp);
+
+    for (j=0;j<ninpar;j++) {
+      // copy param values if that was set up
+      set_copy_to(inst,j,TRUE);
+    }
+
+  }
+
   if (inp!=NULL) weed_free(inp);
-  if (outp!=NULL) weed_free(outp);
 
-  return new_instance;
+
+  if (filters!=NULL) {
+    weed_free(filters);
+
+    // for compound fx, add param and channel connections
+    filter=ofilter;
+
+    // add param connections
+    add_param_connections(first_inst);
+
+    while (1) {
+      // add channel connections
+      key=g_strdup_printf("host_channel_connection%d",xcnumx++);
+      if (weed_plant_has_leaf(filter,key)) {
+	xvals=weed_get_int_array(filter,key,&error);
+
+	inst=first_inst;
+	while (1) {
+	  if (xvals[0]--==0) {
+	    // got the out instance
+	    outc=weed_get_plantptr_array(inst,"out_channels",&error);
+	    ochan=outc[xvals[1]];
+	    weed_free(outc);
+	  }
+	  if (xvals[2]--==0) {
+	    // got the in instance
+	    inc=weed_get_plantptr_array(inst,"in_channels",&error);
+	    weed_set_plantptr_value(inc[xvals[3]],"host_internal_connection",ochan);
+	    weed_free(inc);
+	    break;
+	  }
+
+	  inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	}
+
+	weed_free(xvals);
+	g_free(key);
+
+      }
+      else {
+	g_free(key);
+	break;
+      }
+
+    }
+
+  }
+
+  return first_inst;
 }
 
 
 
 
-gboolean weed_init_effect(int hotkey) {
+boolean weed_init_effect(int hotkey) {
   // mainw->osc_block should be set to TRUE before calling this function !
   weed_plant_t *filter;
-  weed_plant_t *new_instance;
-  gint num_tr_applied;
-  gboolean fg_modeswitch=FALSE,is_trans=FALSE,gen_start=FALSE,is_modeswitch=FALSE;
-  gint rte_keys=mainw->rte_keys;
-  gint inc_count;
+  weed_plant_t *new_instance,*inst;
   weed_plant_t *event_list;
-  gint ntracks;
+
+  boolean fg_modeswitch=FALSE,is_trans=FALSE,gen_start=FALSE,is_modeswitch=FALSE;
+  boolean is_audio_gen=FALSE;
+
+  int num_tr_applied;
+  int rte_keys=mainw->rte_keys;
+  int inc_count,outc_count;
+  int ntracks;
   int error;
+  int idx;
 
   if (hotkey<0) {
     is_modeswitch=TRUE;
@@ -4321,14 +6336,50 @@
     return FALSE;
   }
 
-  inc_count=enabled_in_channels(weed_filters[key_to_fx[hotkey][key_modes[hotkey]]],FALSE);
+  idx=key_to_fx[hotkey][key_modes[hotkey]];
+
+  inc_count=enabled_in_channels(weed_filters[idx],FALSE);
+  outc_count=enabled_out_channels(weed_filters[idx],FALSE);
+
+  // check first if it is an audio generator
+
+  if ((inc_count==0||(has_audio_chans_in(weed_filters[idx],FALSE)&&
+		      !has_video_chans_in(weed_filters[idx],TRUE)))&&
+      has_audio_chans_out(weed_filters[idx],FALSE)&&
+      !has_video_chans_out(weed_filters[idx],TRUE)) {
+
+    if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+      // audio fx only with realtime players
+      gchar *fxname=weed_filter_get_name(idx);
+      gchar *msg=g_strdup_printf(_("Effect %s cannot be used with this audio player.\n"),fxname);
+      d_print(msg);
+      return FALSE;
+    }
+
+
+    if (inc_count==0) {
+      if (mainw->agen_key!=0) {
+	// we had an existing audio gen running - stop that one first
+	int agen_key=mainw->agen_key-1;
+	weed_deinit_effect(agen_key);
+
+	if ((mainw->rte&(GU641<<agen_key))) {
+	  // need to do this in case starting another audio gen caused us to come here
+	  mainw->rte^=(GU641<<agen_key);
+	  if (rte_window!=NULL) rtew_set_keych(agen_key,FALSE);
+	}
+
+      }
+      is_audio_gen=TRUE;
+    }
+  }
 
   // TODO - block template channel changes
   // we must stop any old generators
 
-  if (inc_count==0&&hotkey!=fg_generator_key&&mainw->num_tr_applied>0&&mainw->blend_file!=-1&&
+  if (inc_count==0&&outc_count>0&&hotkey!=fg_generator_key&&mainw->num_tr_applied>0&&mainw->blend_file!=-1&&
       mainw->blend_file!=mainw->current_file&&mainw->files[mainw->blend_file]!=NULL&&
-      mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR&&inc_count==0) {
+      mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR&&inc_count==0&&!is_audio_gen) {
     if (bg_gen_to_start==-1) {
       weed_generator_end((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
     }
@@ -4337,7 +6388,7 @@
   }
 
   if (mainw->current_file>0&&cfile->clip_type==CLIP_TYPE_GENERATOR&&
-      (fg_modeswitch||(inc_count==0&&mainw->num_tr_applied==0))) {
+      (fg_modeswitch||(inc_count==0&&outc_count>0&&mainw->num_tr_applied==0))&&!is_audio_gen) {
     if (mainw->noswitch||mainw->is_processing||mainw->preview) return FALSE; // stopping fg gen will cause clip to switch
     if (mainw->playing_file>-1&&mainw->whentostop==STOP_ON_VID_END&&inc_count!=0) {
       mainw->cancelled=CANCEL_GENERATOR_END;
@@ -4360,9 +6411,9 @@
       mainw->blend_file=mainw->current_file;
     }
   }
-  else if (inc_count==0) {
+  else if (inc_count==0&&outc_count>0&&!is_audio_gen) {
     // aha - a generator
-     if (mainw->playing_file==-1) {
+    if (mainw->playing_file==-1) {
       // if we are not playing, we will postpone creating the instance
       // this is a workaround for a problem in libvisual
       fg_gen_to_start=hotkey;
@@ -4370,11 +6421,11 @@
       fg_generator_mode=key_modes[hotkey];
       gen_start=TRUE;
     }
-     else if (!fg_modeswitch&&mainw->num_tr_applied==0&&(mainw->noswitch||mainw->is_processing||mainw->preview)) 
-       return FALSE;
+    else if (!fg_modeswitch&&mainw->num_tr_applied==0&&(mainw->noswitch||mainw->is_processing||mainw->preview)) 
+      return FALSE;
   }
 
-  filter=weed_filters[key_to_fx[hotkey][key_modes[hotkey]]];
+  filter=weed_filters[idx];
 
   // TODO - unblock template channel changes
 
@@ -4383,7 +6434,15 @@
       GPOINTER_TO_INT(g_object_get_data(G_OBJECT(fx_dialog[1]),"mode"))==key_modes[hotkey]) {
     lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
     new_instance=(weed_plant_t *)rfx->source;
+
     weed_instance_ref(new_instance);
+
+    // handle compound fx
+    inst=new_instance;
+    while (weed_plant_has_leaf(inst,"host_next_instance")) {
+      inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+      weed_instance_ref(inst);
+    }
     redraw_pwindow(hotkey,key_modes[hotkey]);
   }
   else {
@@ -4391,44 +6450,93 @@
     // if it is a key effect, set key defaults
 
     if (hotkey<FX_KEYS_MAX_VIRTUAL&&key_defaults[hotkey][key_modes[hotkey]]!=NULL) {
+      // TODO - handle compound fx
       apply_key_defaults(new_instance,hotkey,key_modes[hotkey]);
     }
   }
 
-  key_to_instance[hotkey][key_modes[hotkey]]=new_instance;
-
   update_host_info(new_instance);
 
   // record the key so we know whose parameters to record later
   weed_set_int_value(new_instance,"host_hotkey",hotkey);
 
+  // handle compound fx
+  inst=new_instance;
+  while (weed_plant_has_leaf(inst,"host_next_instance")) {
+    inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+    update_host_info(inst);
+    weed_set_int_value(inst,"host_hotkey",hotkey);
+  }
+
+
   if (!gen_start) {
+    weed_plant_t *inst,*next_inst=NULL;
+
+    inst=new_instance;
+
+  start1:
+
+    filter=weed_instance_get_filter(inst,FALSE);
+
     if (weed_plant_has_leaf(filter,"init_func")) {
       weed_init_f *init_func_ptr_ptr;
       weed_init_f init_func;
       gchar *cwd=cd_to_plugin_dir(filter);
       weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
       init_func=init_func_ptr_ptr[0];
-      if (init_func!=NULL&&(error=(*init_func)(new_instance))!=WEED_NO_ERROR) {
-	gint weed_error;
-	gchar *filter_name=weed_get_string_value(filter,"name",&weed_error),*tmp;
+      set_param_gui_readwrite(inst);
+      if (init_func!=NULL&&(error=(*init_func)(inst))!=WEED_NO_ERROR) {
+	int weed_error;
+	gchar *filter_name,*tmp;
+	filter=weed_filters[idx];
+	filter_name=weed_get_string_value(filter,"name",&weed_error);
+	set_param_gui_readonly(inst);
 	d_print ((tmp=g_strdup_printf (_ ("Failed to start instance %s, error code %d\n"),filter_name,error)));
 	g_free(tmp);
 	weed_free(filter_name);
-	weed_call_deinit_func(new_instance);
-	weed_instance_unref(new_instance);
+	pthread_mutex_lock(&mainw->afilter_mutex);
 	key_to_instance[hotkey][key_modes[hotkey]]=NULL;
+	pthread_mutex_unlock(&mainw->afilter_mutex);
+
+	inst=new_instance;
+
+      deinit2:
+
+	if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	else next_inst=NULL;
+
+	weed_call_deinit_func(inst);
+	weed_instance_unref(inst);
+
+	if (next_inst!=NULL&&weed_get_boolean_value(next_inst,"host_inited",&error)==WEED_TRUE) {
+	  // handle compound fx
+	  inst=next_inst;
+	  goto deinit2;
+	}
+
 	if (is_trans) mainw->num_tr_applied--;
 	lives_chdir(cwd,FALSE);
 	g_free(cwd);
+	if (is_audio_gen) mainw->agen_needs_reinit=FALSE;
 	return FALSE;
       }
+      set_param_gui_readonly(inst);
+      lives_chdir(cwd,FALSE);
       g_free(cwd);
     }
-    set_param_gui_readonly(new_instance);
+
+    weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+
+    if (weed_plant_has_leaf(inst,"host_next_instance")) {
+      inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+      goto start1;
+    }
+
+    filter=weed_filters[idx];
+
   }
 
-  if (inc_count==0) {
+  if (inc_count==0&&outc_count>0&&!is_audio_gen) {
     // generator start
     if (mainw->num_tr_applied>0&&!fg_modeswitch&&mainw->current_file>-1&&mainw->playing_file>-1) {
       // transition is on, make into bg clip
@@ -4445,9 +6553,10 @@
     num_tr_applied=mainw->num_tr_applied;
     if (fg_modeswitch) mainw->num_tr_applied=0; // force to fg
 
-    // TODO - be more descriptive with error
-    // FIXME - new_instance can be invalidated by weed_generator_start, do not reference it after here
+    key_to_instance[hotkey][key_modes[hotkey]]=new_instance;
+
     if (!weed_generator_start(new_instance)) {
+      // TODO - be more descriptive with error
       int weed_error;
       gchar *filter_name=weed_get_string_value(filter,"name",&weed_error),*tmp;
       d_print ((tmp=g_strdup_printf (_ ("Unable to start generator %s\n"),filter_name)));
@@ -4460,9 +6569,14 @@
 	fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
       }
       if (fg_modeswitch) mainw->num_tr_applied=num_tr_applied;
+      key_to_instance[hotkey][key_modes[hotkey]]=NULL;
+
       return FALSE;
     }
 
+    // weed_generator_start can change the instance
+    new_instance=key_to_instance[hotkey][key_modes[hotkey]];
+
     // TODO - problem if modeswitch triggers playback
     // hence we do not allow mixing of generators and non-gens on the same key
     if (fg_modeswitch) mainw->num_tr_applied=num_tr_applied;
@@ -4476,23 +6590,89 @@
     }
   }
 
-
+      
   if (rte_keys==hotkey) {
     mainw->rte_keys=rte_keys;
     mainw->blend_factor=weed_get_blend_factor(rte_keys);
   }
 
-  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)&&inc_count>0) {
+  // need to do this *before* calling append_filter_map_event
+  key_to_instance[hotkey][key_modes[hotkey]]=new_instance;
+
+  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)&&(inc_count>0||outc_count==0)) {
     // place this synchronous with the preceding frame
-    event_list=append_filter_init_event (mainw->event_list,mainw->currticks,key_to_fx[hotkey][key_modes[hotkey]],-1);
+    event_list=append_filter_init_event (mainw->event_list,mainw->currticks,
+					 idx,-1,hotkey,new_instance);
     if (mainw->event_list==NULL) mainw->event_list=event_list;
     init_events[hotkey]=get_last_event(mainw->event_list);
     ntracks=weed_leaf_num_elements(init_events[hotkey],"in_tracks");
-    pchains[hotkey]=filter_init_add_pchanges(mainw->event_list,new_instance,init_events[hotkey],ntracks);
+    pchains[hotkey]=filter_init_add_pchanges(mainw->event_list,new_instance,init_events[hotkey],ntracks,0);
     create_filter_map(); // we create filter_map event_t * array with ordered effects
     mainw->event_list=append_filter_map_event (mainw->event_list,mainw->currticks,filter_map);
   }
 
+  if (is_audio_gen) {
+    mainw->agen_key=hotkey+1;
+    mainw->agen_needs_reinit=FALSE;
+
+    if (mainw->playing_file>0) {
+      if (mainw->whentostop==STOP_ON_AUD_END) mainw->whentostop=STOP_ON_VID_END;
+      if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+	if (mainw->jackd_read!=NULL&&(mainw->jackd_read->playing_file==-1||mainw->jackd_read->playing_file==mainw->ascrap_file)) {
+	  // if playing external audio, switch over to internal for an audio gen
+	  mainw->jackd->audio_ticks=mainw->currticks;
+	  mainw->jackd->frames_written=0;
+
+	  // close the reader
+	  jack_rec_audio_end(FALSE);
+	}
+	if (mainw->jackd!=NULL&&mainw->jackd_read==NULL) {
+
+	  // enable writer
+	  mainw->jackd->in_use=TRUE;
+	}
+#endif
+      }
+      if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+	if (mainw->pulsed_read!=NULL&&(mainw->pulsed_read->playing_file==-1||mainw->pulsed_read->playing_file==mainw->ascrap_file)) {
+	  // if playing external audio, switch over to internal for an audio gen
+	  mainw->pulsed->audio_ticks=mainw->currticks;
+	  mainw->pulsed->frames_written=0;
+	  pulse_rec_audio_end(FALSE);
+	}
+	if (mainw->pulsed!=NULL&&mainw->pulsed_read==NULL) {
+	  mainw->pulsed->in_use=TRUE;
+	}
+#endif
+      }
+
+      if (mainw->playing_file>0&&mainw->record&&!mainw->record_paused&&!prefs->audio_src==AUDIO_SRC_EXT&&(prefs->rec_opts&REC_AUDIO)) {
+	// if recording audio, open ascrap file and add audio event
+	mainw->record=FALSE;
+	on_record_perf_activate(NULL,NULL);
+	mainw->record_starting=FALSE;
+	mainw->record=TRUE;
+	if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+	  mainw->pulsed->audio_ticks=mainw->currticks;
+	  mainw->pulsed->frames_written=0;
+#endif
+	}
+	if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+	  mainw->jackd->audio_ticks=mainw->currticks;
+	  mainw->jackd->frames_written=0;
+#endif
+	}
+
+      }
+
+    }
+  }
+
+
   return TRUE;
 }
 
@@ -4500,30 +6680,36 @@
 
 
 
- void weed_call_init_func(weed_plant_t *inst) {
-   int error;
-   weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
-   if (weed_plant_has_leaf(filter,"init_func")) {
-     weed_init_f *init_func_ptr_ptr;
-     weed_init_f init_func;
-     weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
-     init_func=init_func_ptr_ptr[0];
-     update_host_info(inst);
-     if (init_func!=NULL) {
-       gchar *cwd=cd_to_plugin_dir(filter);
-       error=(*init_func)(inst);
-       lives_chdir(cwd,FALSE);
-       g_free(cwd);
-     }
-   }
- }
+int weed_call_init_func(weed_plant_t *inst) {
+  int error=0;
+
+  weed_plant_t *filter=weed_instance_get_filter(inst,FALSE);
+  if (weed_plant_has_leaf(filter,"init_func")) {
+    weed_init_f *init_func_ptr_ptr;
+    weed_init_f init_func;
+    weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
+    init_func=init_func_ptr_ptr[0];
+    update_host_info(inst);
+    if (init_func!=NULL) {
+      gchar *cwd=cd_to_plugin_dir(filter);
+      set_param_gui_readwrite(inst);
+      error=(*init_func)(inst);
+      set_param_gui_readonly(inst);
+      lives_chdir(cwd,FALSE);
+      g_free(cwd);
+    }
+  }
+  weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+  return error;
+}
+
 
 
 
+int weed_call_deinit_func(weed_plant_t *instance) {
+  int error=0;
 
-void weed_call_deinit_func(weed_plant_t *instance) {
-  int error;
-  weed_plant_t *filter=weed_get_plantptr_value(instance,"filter_class",&error);
+  weed_plant_t *filter=weed_instance_get_filter(instance,FALSE);
   if (weed_plant_has_leaf(filter,"deinit_func")) {
     weed_deinit_f *deinit_func_ptr_ptr;
     weed_deinit_f deinit_func;
@@ -4531,11 +6717,13 @@
     deinit_func=deinit_func_ptr_ptr[0];
     if (deinit_func!=NULL) {
       gchar *cwd=cd_to_plugin_dir(filter);
-      (*deinit_func)(instance);
+      error=(*deinit_func)(instance);
       lives_chdir(cwd,FALSE);
       g_free(cwd);
     }
   }
+  weed_set_boolean_value(instance,"host_inited",WEED_FALSE);
+  return error;
 }
 
 
@@ -4545,10 +6733,14 @@
   // mainw->osc_block should be set before calling this function !
   // caller should also handle mainw->rte
 
-  weed_plant_t *instance;
-  gboolean is_modeswitch=FALSE;
-  gboolean was_transition=FALSE;
-  gint num_in_chans;
+  weed_plant_t *instance,*inst,*last_inst,*next_inst;
+
+  boolean is_modeswitch=FALSE;
+  boolean was_transition=FALSE;
+  boolean is_audio_gen=FALSE;
+  int num_in_chans,num_out_chans;
+
+  int error;
 
   if (hotkey<0) {
     is_modeswitch=TRUE;
@@ -4561,8 +6753,15 @@
 
   num_in_chans=enabled_in_channels(instance,FALSE);
 
-  if (num_in_chans==0) {
-    // is generator
+  // handle compound fx
+  last_inst=instance;
+  while (weed_plant_has_leaf(last_inst,"host_next_instance")) last_inst=weed_get_plantptr_value(last_inst,"host_next_instance",&error);
+  num_out_chans=enabled_out_channels(last_inst,FALSE);
+
+  if (hotkey+1==mainw->agen_key) is_audio_gen=TRUE;
+
+  if (num_in_chans==0&&num_out_chans>0&&!is_audio_gen) {
+    // is (video) generator
     if (mainw->playing_file>-1&&mainw->whentostop==STOP_ON_VID_END&&(hotkey!=bg_generator_key)) {
       mainw->cancelled=CANCEL_GENERATOR_END;
     }
@@ -4571,16 +6770,78 @@
     }
     return;
   }
-  else {
-    weed_call_deinit_func(instance);
+
+  if (is_audio_gen) {
+    // is audio generator
+    // wait for current processing to finish
+    pthread_mutex_lock(&mainw->interp_mutex);
+    mainw->agen_key=0;
+    pthread_mutex_unlock(&mainw->interp_mutex);
+    mainw->agen_samps_count=0;
+
+
+    // for external audio, switch back to reading
+
+    if (mainw->playing_file>0&&prefs->audio_src==AUDIO_SRC_EXT) {
+      if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+	if (mainw->jackd_read==NULL) {
+	  mainw->jackd->in_use=FALSE; // deactivate writer
+	  jack_rec_audio_to_clip(-1,0,(lives_rec_audio_type_t)0); //activate reader
+	  mainw->jackd_read->frames_written+=mainw->jackd->frames_written; // ensure time continues monotonically
+	  if (mainw->record) mainw->jackd->playing_file=mainw->ascrap_file; // if recording, continue to write to 
+	}
+#endif
+      }
+      if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+	if (mainw->pulsed_read==NULL) {
+	  mainw->pulsed->in_use=FALSE; // deactivate writer
+	  pulse_rec_audio_to_clip(-1,0,(lives_rec_audio_type_t)0); //activate reader
+	  mainw->pulsed_read->frames_written+=mainw->pulsed->frames_written; // ensure time continues monotonically
+	  if (mainw->record) mainw->pulsed->playing_file=mainw->ascrap_file; // if recording, continue to write to 
+        }
+#endif
+      }
+    }
+    else if (mainw->playing_file>0) {
+      // for internal, continue where we should
+      if (prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE) {
+	if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS) switch_audio_clip(mainw->playing_file,TRUE);
+	else switch_audio_clip(mainw->pre_src_audio_file,TRUE);
+      }
+    }
   }
+ 
+  pthread_mutex_lock(&mainw->afilter_mutex);
+  key_to_instance[hotkey][key_modes[hotkey]]=NULL;
+  pthread_mutex_unlock(&mainw->afilter_mutex);
+
+  if (mainw->whentostop==STOP_ON_VID_END&&mainw->current_file>-1&&(cfile->frames==0
+								   ||(mainw->loop&&cfile->achans>0&&!mainw->is_rendering&&(mainw->audio_end/cfile->fps)
+								      <MAX (cfile->laudio_time,cfile->raudio_time)))) mainw->whentostop=STOP_ON_AUD_END;
 
   if (num_in_chans==2) {
     was_transition=TRUE;
     mainw->num_tr_applied--;
   }
 
-  weed_instance_unref(instance);
+  inst=instance;
+
+ deinit3:
+
+  if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+  else next_inst=NULL;
+  
+  weed_call_deinit_func(inst);
+  weed_instance_unref(inst);
+
+  if (next_inst!=NULL) {
+    // handle compound fx
+    inst=next_inst;
+    goto deinit3;
+  }
+
 
   // if the param window is already open, show any reinits now
   if (fx_dialog[1]!=NULL&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(fx_dialog[1]),"key"))==hotkey&&
@@ -4588,11 +6849,10 @@
     redraw_pwindow(hotkey,key_modes[hotkey]);
   }
 
-  key_to_instance[hotkey][key_modes[hotkey]]=NULL;
 
   if (was_transition&&!is_modeswitch) {
     if (mainw->num_tr_applied<1) {
-       if (bg_gen_to_start!=-1) bg_gen_to_start=-1;
+      if (bg_gen_to_start!=-1) bg_gen_to_start=-1;
       if (mainw->blend_file!=-1&&mainw->blend_file!=mainw->current_file&&mainw->files[mainw->blend_file]!=NULL&&
 	  mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR) {
 	// all transitions off, so end the bg generator
@@ -4627,8 +6887,8 @@
 }
 
 
-void weed_deinit_all(gboolean shutdown) {
-  // deinit all except generators *
+void weed_deinit_all(boolean shutdown) {
+  // deinit all (except generators* during playback)
   // this is called on ctrl-0 or on shutdown
 
   // * background generators will be killed because their transition will be deinited
@@ -4650,7 +6910,7 @@
     }
     if ((mainw->rte&(GU641<<i))) {
       if ((instance=key_to_instance[i][key_modes[i]])!=NULL) {
-	if (shutdown||(enabled_in_channels(instance,FALSE)>0)) {
+	if (shutdown||mainw->playing_file==-1||(enabled_in_channels(instance,FALSE)>0)) {
 	  weed_deinit_effect(i);
 	  mainw->rte^=(GU641<<i);
 	}
@@ -4672,14 +6932,19 @@
   weed_plant_t *chantmpl;
   weed_process_f *process_func_ptr_ptr;
   weed_process_f process_func;
+
+  lives_filter_error_t retval;
+
   int num_channels;
   int error;
   int flags;
   int palette;
   int filter_flags=0;
+  boolean did_thread=FALSE;
   gchar *cwd;
 
   if (inst==NULL) return NULL;
+
   if ((num_channels=weed_leaf_num_elements(inst,"out_channels"))==0) return NULL;
   out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
   if ((channel=get_enabled_channel(inst,0,FALSE))==NULL) {
@@ -4700,7 +6965,7 @@
     int numplanes=weed_leaf_num_elements(channel,"pixel_data");
     int height=weed_get_int_value(channel,"height",&error);
     int *rowstrides=weed_get_int_array(channel,"rowstrides",&error);
-    gboolean contiguous=FALSE;
+    boolean contiguous=FALSE;
     if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") && 
 	weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
     align(pixel_data,alignment,numplanes,height,rowstrides,&contiguous);
@@ -4714,19 +6979,24 @@
 
   weed_set_double_value(inst,"fps",cfile->pb_fps);
 
-  filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  filter=weed_instance_get_filter(inst,FALSE);
   cwd=cd_to_plugin_dir(filter);
 
   // see if we can multithread
   if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && weed_plant_has_leaf(filter,"flags")) 
     filter_flags=weed_get_int_value(filter,"flags",&error);
 
-  if (filter_flags&WEED_FILTER_HINT_MAY_THREAD) process_func_threaded(inst,out_channels,tc);
-  else {
+  if (filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
+    retval=process_func_threaded(inst,out_channels,tc);
+    if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
+  }
+  if (!did_thread) {
     // normal single threaded version
     weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
     process_func=process_func_ptr_ptr[0];
+    pthread_mutex_lock(&mainw->data_mutex);
     (*process_func)(inst,tc);
+    pthread_mutex_unlock(&mainw->data_mutex);
   }
 
   weed_free(out_channels);
@@ -4745,7 +7015,7 @@
 }
 
 
-gboolean weed_generator_start (weed_plant_t *inst) {
+boolean weed_generator_start (weed_plant_t *inst) {
   // make an "ephemeral clip"
 
   // cf. yuv4mpeg.c
@@ -4754,13 +7024,12 @@
   weed_plant_t **out_channels,*channel,*filter;
   gchar *filter_name;
   int error,num_channels;
-  gint old_file=mainw->current_file,blend_file=mainw->blend_file;
+  int old_file=mainw->current_file,blend_file=mainw->blend_file;
   int palette;
 
   // create a virtual clip
-  gint new_file=0;
-
-  gboolean is_bg=FALSE;
+  int new_file=0;
+  boolean is_bg=FALSE;
 
   if (mainw->current_file<1||cfile->frames>0) {
     new_file=mainw->first_free_file;
@@ -4793,7 +7062,7 @@
   // old_file can also be -1 if we are doing a fg_modeswitch
   if (old_file>-1&&mainw->playing_file>-1&&mainw->num_tr_applied>0) is_bg=TRUE;
 
-  filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  filter=weed_instance_get_filter(inst,FALSE);
 
   if (mainw->current_file>0&&cfile->frames==0) {
     // audio clip - we will init the generator as fg video in the same clip
@@ -4897,15 +7166,11 @@
       mainw->playing_sel=FALSE;
     }
 
-    if (mainw->play_window!=NULL&&old_file==-1) {
-      // usually preview or load_preview_frame would do this
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
-
     play_file();
 
-
+    if (mainw->play_window!=NULL) {
+      gtk_widget_queue_draw(mainw->play_window);
+    }
   }
   else {
     // already playing
@@ -4937,10 +7202,7 @@
     }
 
     if (mainw->cancelled==CANCEL_GENERATOR_END) mainw->cancelled=CANCEL_NONE;
-    if (old_file==-1&&mainw->play_window!=NULL) {
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
+
   }
 
   return TRUE;
@@ -4958,14 +7220,17 @@
 
 
 
-gboolean weed_playback_gen_start (void) {
+boolean weed_playback_gen_start (void) {
   // init generators on pb. We have to do this after audio startup
   weed_plant_t *inst=NULL,*filter;
+  weed_plant_t *next_inst=NULL;
+
+  gchar *filter_name;
+
   int error=WEED_NO_ERROR;
   int weed_error;
-  gchar *filter_name;
-  gint bgs=bg_gen_to_start;
-  gboolean was_started=FALSE;
+  int bgs=bg_gen_to_start;
+  boolean was_started=FALSE;
 
   if (mainw->is_rendering) return TRUE;
 
@@ -4980,10 +7245,14 @@
 
   if (fg_gen_to_start!=-1) {
     // check is still gen
+
     if (enabled_in_channels(weed_filters[key_to_fx[fg_gen_to_start][key_modes[fg_gen_to_start]]],FALSE)==0) {
       inst=key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]];
       if (inst!=NULL) {
-	filter=weed_get_plantptr_value(inst,"filter_class",&weed_error);
+
+      geninit1:
+
+	filter=weed_instance_get_filter(inst,FALSE);
 	if (weed_plant_has_leaf(filter,"init_func")) {
 	  weed_init_f *init_func_ptr_ptr;
 	  weed_init_f init_func;
@@ -4992,44 +7261,75 @@
 	  update_host_info(inst);
 	  if (init_func!=NULL) {
 	    gchar *cwd=cd_to_plugin_dir(filter);
+	    set_param_gui_readwrite(inst);
 	    error=(*init_func)(inst);
+	    set_param_gui_readonly(inst);
 	    lives_chdir(cwd,FALSE);
 	    g_free(cwd);
 	  }
 	}
-      }
-      if (error!=WEED_NO_ERROR) {
-	if (inst!=NULL) {
-	  gchar *tmp;
-	  filter=weed_get_plantptr_value(inst,"filter_class",&weed_error);
-	  filter_name=weed_get_string_value(filter,"name",&weed_error);
-	  d_print ((tmp=g_strdup_printf (_ ("Failed to start generator %s\n"),filter_name)));
-	  g_free(tmp);
-	  weed_free(filter_name);
-	  weed_call_deinit_func(inst);
-	  weed_instance_unref(inst);
+
+
+	if (error!=WEED_NO_ERROR) {
+	  inst=key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]];
+	  key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]]=NULL;
+	  if (inst!=NULL) {
+	    gchar *tmp;
+	    filter=weed_instance_get_filter(inst,TRUE);
+	    filter_name=weed_get_string_value(filter,"name",&weed_error);
+	    d_print ((tmp=g_strdup_printf (_ ("Failed to start generator %s\n"),filter_name)));
+	    g_free(tmp);
+	    weed_free(filter_name);
+	    
+	  deinit4:
+	    
+	    if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	    else next_inst=NULL;
+
+	    weed_call_deinit_func(inst);
+	    weed_instance_unref(inst);
+	    
+	    if (next_inst!=NULL) {
+	      // handle compound fx
+	      inst=next_inst;
+	      if (weed_get_boolean_value(inst,"host_inited",&error)==WEED_TRUE) goto deinit4;
+	    }
+	    
+	  }
+
+	  fg_gen_to_start=-1;
+	  cfile->ext_src=NULL;
+	  mainw->osc_block=FALSE;
+	  return FALSE;
 	}
-	key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]]=NULL;
-	fg_gen_to_start=-1;
-	cfile->ext_src=NULL;
-	mainw->osc_block=FALSE;
-	return FALSE;
-      }
-      if (weed_plant_has_leaf(inst,"target_fps")) {
-	gint current_file=mainw->current_file;
-	mainw->current_file=fg_generator_clip;
-	cfile->fps=weed_get_double_value(inst,"target_fps",&error);
-	set_main_title(cfile->file_name,0);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->fps);
-	mainw->current_file=current_file;
+
+	weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+
+	if (weed_plant_has_leaf(inst,"host_next_instance")) {
+	  inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	  goto geninit1;
+	}
+
+
+	// TODO
+	if (weed_plant_has_leaf(inst,"target_fps")) {
+	  int current_file=mainw->current_file;
+	  mainw->current_file=fg_generator_clip;
+	  cfile->fps=weed_get_double_value(inst,"target_fps",&error);
+	  set_main_title(cfile->file_name,0);
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->fps);
+	  mainw->current_file=current_file;
+	}
+
+	mainw->clip_switched=TRUE;
+	
+	cfile->ext_src=inst;
       }
-      mainw->clip_switched=TRUE;
-      cfile->ext_src=inst;
+      
+      fg_gen_to_start=-1;
     }
-    fg_gen_to_start=-1;
   }
 
-
   if (bg_gen_to_start!=-1) {
 
     if (mainw->blend_file==-1) return TRUE; // for example if transition was swapped for filter in mapper
@@ -5045,7 +7345,7 @@
       
       if (inst==NULL) {
 	// 2nd playback
-	gint playing_file=mainw->playing_file;
+	int playing_file=mainw->playing_file;
 	mainw->playing_file=-100; //kludge to stop playing a second time
 	if (!weed_init_effect (bg_gen_to_start)) {
 	  error++;
@@ -5055,20 +7355,43 @@
       }
       else {
 	if (!was_started) {
+
+	genstart2:
+
 	  weed_call_init_func(inst);
+
+	  // handle compound fx
+	  if (weed_plant_has_leaf(inst,"host_next_instance")) {
+	    inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	    goto genstart2;
+	  }
+	  inst=key_to_instance[bgs][key_modes[bgs]];
 	}
       }
       
       if (error!=WEED_NO_ERROR) {
 	if (inst!=NULL) {
 	  gchar *tmp;
-	  filter=weed_get_plantptr_value(inst,"filter_class",&weed_error);
+	  filter=weed_instance_get_filter(inst,TRUE);
 	  filter_name=weed_get_string_value(filter,"name",&weed_error);
 	  d_print ((tmp=g_strdup_printf (_ ("Failed to start generator %s, error %d\n"),filter_name,error)));
 	  g_free(tmp);
 	  weed_free(filter_name);
+
+	deinit5:
+
+	  if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	  else next_inst=NULL;
+
 	  weed_call_deinit_func(inst);
 	  weed_instance_unref(inst);
+
+	  if (next_inst!=NULL) {
+	    // handle compound fx
+	    inst=next_inst;
+	    goto deinit5;
+	  }
+
 	}
 	key_to_instance[bg_gen_to_start][key_modes[bg_gen_to_start]]=NULL;
 	bg_gen_to_start=-1;
@@ -5082,8 +7405,16 @@
     bg_gen_to_start=-1;
   }
 
+ setgui1:
+
   if (inst!=NULL) set_param_gui_readonly(inst);
 
+  // handle compound fx
+  if (inst!=NULL&&weed_plant_has_leaf(inst,"host_next_instance")) {
+    inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+    goto setgui1;
+  }
+
   mainw->osc_block=FALSE;
 
   return TRUE;
@@ -5093,16 +7424,16 @@
 // weed parameter functions
 
 
-gboolean is_hidden_param(weed_plant_t *plant, int i) {
+boolean is_hidden_param(weed_plant_t *plant, int i) {
   // find out if in_param i is visible or not for plant. Plant can be an instance or a filter
-  gboolean visible=TRUE;
+  boolean visible=TRUE;
   weed_plant_t **wtmpls;
   int error,flags=0;
   weed_plant_t *filter,*gui=NULL;
   int num_params=0;
   weed_plant_t *wtmpl;
 
-  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_get_plantptr_value(plant,"filter_class",&error);
+  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_instance_get_filter(plant,TRUE);
   else filter=plant;
 
   if (weed_plant_has_leaf(filter,"in_parameter_templates")) 
@@ -5116,6 +7447,12 @@
 
   if (weed_plant_has_leaf(wtmpl,"flags")) flags=weed_get_int_value(wtmpl,"flags",&error);
   if (weed_plant_has_leaf(wtmpl,"gui")) gui=weed_get_plantptr_value(wtmpl,"gui",&error);
+
+  if (gui!=NULL&&weed_plant_has_leaf(gui,"hidden")&&
+      weed_get_boolean_value(gui,"hidden",&error)==WEED_TRUE) {
+    weed_free(wtmpls);
+    return TRUE;
+  }
   if (!(flags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE)
       &&(gui==NULL||(!weed_plant_has_leaf(gui,"hidden")
 		     ||weed_get_boolean_value(gui,"hidden",&error)==WEED_FALSE))) {
@@ -5139,13 +7476,16 @@
 	      visible=TRUE;
 	    }}}}}}
 
+  // internally connected parameters for compound fx
+  if (weed_plant_has_leaf(wtmpl,"host_internal_connection")) visible=FALSE;
+
   weed_free(wtmpls);
   return !visible;
 }
 
 
-int get_transition_param(weed_plant_t *filter) {
-  int error,num_params,i;
+int get_transition_param(weed_plant_t *filter, boolean skip_internal) {
+  int error,num_params,i,count=0;
   weed_plant_t **in_ptmpls;
 
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return -1; // has no in_parameters
@@ -5153,19 +7493,21 @@
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
   for (i=0;i<num_params;i++) {
+    if (skip_internal&&weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection")) continue;
     if (weed_plant_has_leaf(in_ptmpls[i],"transition")&&
 	weed_get_boolean_value(in_ptmpls[i],"transition",&error)==WEED_TRUE) {
       weed_free(in_ptmpls);
-      return i;
+      return count;
     }
+    count++;
   }
   weed_free(in_ptmpls);
   return -1;
 }
 
 
-int get_master_vol_param(weed_plant_t *filter) {
-  int error,num_params,i;
+int get_master_vol_param(weed_plant_t *filter, boolean skip_internal) {
+  int error,num_params,i,count=0;
   weed_plant_t **in_ptmpls;
 
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return -1; // has no in_parameters
@@ -5173,18 +7515,22 @@
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
   for (i=0;i<num_params;i++) {
+    if (skip_internal&&weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection")) continue;
     if (weed_plant_has_leaf(in_ptmpls[i],"is_volume_master")&&
 	weed_get_boolean_value(in_ptmpls[i],"is_volume_master",&error)==WEED_TRUE) {
       weed_free(in_ptmpls);
-      return i;
+      return count;
     }
+    count++;
   }
   weed_free(in_ptmpls);
   return -1;
 }
 
 
-gboolean is_perchannel_multiw(weed_plant_t *param) {
+
+
+boolean is_perchannel_multiw(weed_plant_t *param) {
   // updated for weed spec 1.1
   int error;
   int flags=0;
@@ -5198,7 +7544,7 @@
 
 
 
-gboolean has_perchannel_multiw(weed_plant_t *filter) {
+boolean has_perchannel_multiw(weed_plant_t *filter) {
   int error,nptmpl,i;
   weed_plant_t **ptmpls;
 
@@ -5222,35 +7568,114 @@
 
 
 
-weed_plant_t *weed_inst_in_param (weed_plant_t *inst, int param_num, gboolean skip_hidden) {
-  weed_plant_t **in_params,*param=NULL;
+weed_plant_t *weed_inst_in_param (weed_plant_t *inst, int param_num, boolean skip_hidden, boolean skip_internal) {
+  weed_plant_t **in_params;
+  weed_plant_t *param;
   int error,num_params;
 
-  if (!weed_plant_has_leaf(inst,"in_parameters")) return NULL; // has no in_parameters
+  do {
 
-  num_params=weed_leaf_num_elements(inst,"in_parameters");
-  if (num_params<=param_num) return NULL; // invalid parameter number
+    if (!weed_plant_has_leaf(inst,"in_parameters")) continue; // has no in_parameters
 
-  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-  if (!skip_hidden) param=in_params[param_num];
+    num_params=weed_leaf_num_elements(inst,"in_parameters");
 
-  else {
-    gint count=0;
-    int i;
-    
-    for (i=0;i<num_params;i++) {
-	if (!is_hidden_param(inst,i)) {
+    if (!skip_hidden&&!skip_internal) {
+      if (num_params>param_num) {
+	in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+	param=in_params[param_num];
+	weed_free(in_params);
+	return param;
+      }
+      param_num-=num_params;
+    }
+
+    else {
+      int count=0;
+      register int i;
+
+      in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+      for (i=0;i<num_params;i++) {
+	param=in_params[i];
+	if ((!skip_hidden||!is_hidden_param(inst,i))&&(!skip_internal||!weed_plant_has_leaf(param,"host_internal_connection"))) {
 	  if (count==param_num) {
-	    param=in_params[count];
-	    break;
+	    weed_free(in_params);
+	    return param;
 	  }
 	  count++;
 	}
       }
+      param_num-=count;
+      weed_free(in_params);
     }
 
-  weed_free(in_params);
-  return param;
+   } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+
+  return NULL;
+}
+
+
+
+
+
+weed_plant_t *weed_inst_out_param (weed_plant_t *inst, int param_num) {
+  weed_plant_t **out_params;
+  weed_plant_t *param;
+  int error,num_params;
+
+  do {
+    if (!weed_plant_has_leaf(inst,"out_parameters")) continue; // has no out_parameters
+
+    num_params=weed_leaf_num_elements(inst,"out_parameters");
+
+    if (num_params>param_num) {
+      out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
+      param=out_params[param_num];
+      weed_free(out_params);
+      return param;
+    }
+    param_num-=num_params;
+   } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+
+  return NULL;
+}
+
+
+
+
+weed_plant_t *weed_filter_in_paramtmpl (weed_plant_t *filter, int param_num, boolean skip_internal) {
+  weed_plant_t **in_params;
+  weed_plant_t *ptmpl;
+  int error,num_params;
+
+  int count=0;
+  register int i;
+
+  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return NULL; // has no in_parameters
+  
+  num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+  if (num_params<=param_num) return NULL; // invalid parameter number
+
+  in_params=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+
+  if (!skip_internal) {
+    ptmpl=in_params[param_num];
+    weed_free(in_params);
+    return ptmpl;
+  }
+  
+  for (i=0;i<num_params;i++) {
+    ptmpl=in_params[i];
+    if (!weed_plant_has_leaf(ptmpl,"host_internal_connection")) {
+      if (count==param_num) {
+	return ptmpl;
+      }
+      count++;
+    }
+  }
+
+  return NULL;
 }
 
 
@@ -5267,7 +7692,7 @@
   weed_plant_t *tparamtmpl;
   weed_plant_t *gui;
 
-  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) plant=weed_get_plantptr_value(plant,"filter_class",&error);
+  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) plant=weed_instance_get_filter(plant,TRUE);
 
   if (!weed_plant_has_leaf(plant,"in_parameter_templates")) return -1;
 
@@ -5307,7 +7732,7 @@
   weed_plant_t **in_ptmpls;
   weed_plant_t *tparamtmpl;
 
-  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) plant=weed_get_plantptr_value(plant,"filter_class",&error);
+  if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) plant=weed_instance_get_filter(plant,TRUE);
 
   if (!weed_plant_has_leaf(plant,"in_parameter_templates")) return count;
 
@@ -5329,10 +7754,10 @@
 
 
 
-char *get_weed_display_string (weed_plant_t *inst, int pnum) {
+gchar *get_weed_display_string (weed_plant_t *inst, int pnum) {
   // TODO - for setting defaults, we will need to create params
-  char *disp_string;
-  weed_plant_t *param=weed_inst_in_param(inst,pnum,FALSE);
+  gchar *disp_string;
+  weed_plant_t *param=weed_inst_in_param(inst,pnum,FALSE,FALSE);
   weed_plant_t *ptmpl,*gui,*filter;
   int error;
   weed_display_f *display_func_ptr;
@@ -5351,7 +7776,7 @@
 
   weed_leaf_set_flags(gui,"display_value",(weed_leaf_get_flags(gui,"display_value")|
 					   WEED_LEAF_READONLY_PLUGIN)^WEED_LEAF_READONLY_PLUGIN);
-  filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  filter=weed_instance_get_filter(inst,FALSE);
   cwd=cd_to_plugin_dir(filter);
   (*display_func)(param);
   lives_chdir(cwd,FALSE);
@@ -5367,11 +7792,70 @@
 
 
 
+int set_copy_to(weed_plant_t *inst, int pnum, boolean update) {
+  // if we update a plugin in_parameter, evaluate any "copy_value_to"
+  int error;
+  boolean copy_ok=FALSE;
+  int copyto;
+
+  weed_plant_t **in_params;
+  
+  weed_plant_t *gui=NULL;
+  weed_plant_t *in_param=weed_inst_in_param(inst,pnum,FALSE,FALSE); // use this here in case of compound fx
+  weed_plant_t *paramtmpl=weed_get_plantptr_value(in_param,"template",&error);
+
+  if (weed_plant_has_leaf(paramtmpl,"gui")) gui=weed_get_plantptr_value(paramtmpl,"gui",&error);
+
+  if (gui==NULL) return -1;
+
+  if (weed_plant_has_leaf(gui,"copy_value_to")) {
+    weed_plant_t *paramtmpl2;
+    int param_hint2,flags2=0;
+    int param_hint=weed_get_int_value(paramtmpl,"hint",&error);
+    int nparams=weed_leaf_num_elements(inst,"in_parameters");
+    
+    copyto=weed_get_int_value(gui,"copy_value_to",&error);
+    if (copyto==pnum||copyto<0||copyto>=nparams) return -1;
+
+    in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+    if (weed_plant_has_leaf(in_params[copyto],"host_internal_connection")) return -1;
+
+    paramtmpl2=weed_get_plantptr_value(in_params[copyto],"template",&error);
+    if (weed_plant_has_leaf(paramtmpl2,"flags")) flags2=weed_get_int_value(paramtmpl2,"flags",&error);
+    param_hint2=weed_get_int_value(paramtmpl2,"hint",&error);
+    if (param_hint==param_hint2&&((flags2&WEED_PARAMETER_VARIABLE_ELEMENTS)||
+				  weed_leaf_num_elements(paramtmpl,"default")==
+				  weed_leaf_num_elements(paramtmpl2,"default"))) {
+      copy_ok=TRUE;
+    }
+    weed_free(in_params);
+  }
+
+  if (!copy_ok) return -1;
+
+  if (update) {
+    pthread_mutex_lock(&mainw->data_mutex);
+    weed_leaf_copy(in_params[copyto],"value",in_param,"value");
+    pthread_mutex_unlock(&mainw->data_mutex);
+  }
+  return copyto;
+}
+
+
 void rec_param_change(weed_plant_t *inst, int pnum) {
   int error;
-  weed_timecode_t tc=get_event_timecode(get_last_event(mainw->event_list));
-  int key=weed_get_int_value(inst,"host_hotkey",&error);
-  weed_plant_t *in_param=weed_inst_in_param(inst,pnum,FALSE);
+  weed_timecode_t tc;
+  weed_plant_t *in_param;
+  int key;
+
+  // do not record changes for generators - those get recorded to scrap_file or ascrap_file
+  if (enabled_in_channels(inst,FALSE)==0) return;
+
+  tc=get_event_timecode(get_last_event(mainw->event_list));
+  key=weed_get_int_value(inst,"host_hotkey",&error);
+
+  in_param=weed_inst_in_param(inst,pnum,FALSE,FALSE);
 
   mainw->event_list=append_param_change_event(mainw->event_list,tc,pnum,in_param,init_events[key],pchains[key]);
 }
@@ -5383,19 +7867,17 @@
 
 void weed_set_blend_factor(int hotkey) {
   // mainw->osc_block should be set to TRUE before calling this function !
-  weed_plant_t *inst,*in_param,*in_param2=NULL,*paramtmpl,*paramtmpl2=NULL;
+  weed_plant_t *inst,*in_param,*in_param2=NULL,*paramtmpl;
   int error;
   int vali,mini,maxi;
   double vald,mind,maxd;
   GList *list=NULL;
   int param_hint;
   int copyto=-1;
-  weed_plant_t *gui=NULL;
   weed_plant_t **in_params;
   int pnum;
-  gboolean copy_ok=FALSE;
   weed_timecode_t tc=0;
-  gint inc_count;
+  int inc_count;
 
   if (hotkey<0) return;
   inst=key_to_instance[hotkey][key_modes[hotkey]];
@@ -5408,39 +7890,15 @@
 
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   in_param=in_params[pnum];
+  weed_free(in_params);
 
   paramtmpl=weed_get_plantptr_value(in_param,"template",&error);
   param_hint=weed_get_int_value(paramtmpl,"hint",&error);
 
-  if (weed_plant_has_leaf(paramtmpl,"gui")) gui=weed_get_plantptr_value(paramtmpl,"gui",&error);
-
-  if (gui!=NULL) {
-    if (weed_plant_has_leaf(gui,"copy_value_to")) {
-      int param_hint2,flags2=0;
-      weed_plant_t *paramtmpl2;
-      copyto=weed_get_int_value(gui,"copy_value_to",&error);
-      //if (copyto==in_param||copyto<0) copyto=-1;
-      if (copyto>-1) {
-	copy_ok=FALSE;
-	paramtmpl2=weed_get_plantptr_value(in_params[copyto],"template",&error);
-	if (weed_plant_has_leaf(paramtmpl2,"flags")) flags2=weed_get_int_value(paramtmpl2,"flags",&error);
-	param_hint2=weed_get_int_value(paramtmpl2,"hint",&error);
-	if (param_hint==param_hint2&&((flags2&WEED_PARAMETER_VARIABLE_ELEMENTS)||
-				      weed_leaf_num_elements(paramtmpl,"default")==
-				      weed_leaf_num_elements(paramtmpl2,"default"))) {
-	  if (!(flags2&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE)) {
-	    copy_ok=TRUE;
-	  }}}}}
-
-  if (!copy_ok) copyto=-1;
-  else {
-    in_param2=in_params[copyto];
-    paramtmpl2=weed_get_plantptr_value(in_param2,"template",&error);
-  }
-
-  weed_free(in_params);
   inc_count=enabled_in_channels(inst,FALSE);
 
+  copyto=set_copy_to(inst,pnum,FALSE);
+
   if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)&&inc_count>0) {
     tc=get_event_timecode(get_last_event(mainw->event_list));
     mainw->event_list=append_param_change_event(mainw->event_list,tc,pnum,in_param,init_events[hotkey],pchains[hotkey]);
@@ -5456,7 +7914,9 @@
     mini=weed_get_int_value(paramtmpl,"min",&error);
     maxi=weed_get_int_value(paramtmpl,"max",&error);
 
+    pthread_mutex_lock(&mainw->data_mutex);
     weed_set_int_value (in_param,"value",(int)((gdouble)mini+(mainw->blend_factor/KEYSCALE*(gdouble)(maxi-mini))+.5));
+    pthread_mutex_unlock(&mainw->data_mutex);
     vali=weed_get_int_value (in_param,"value",&error);
 
     list=g_list_append(list,g_strdup_printf("%d",vali));
@@ -5466,30 +7926,15 @@
     g_list_free_strings(list);
     g_list_free(list);
 
-    if (copyto>-1) {
-      vali=weed_get_int_value(in_param2,"value",&error);
-      mini=weed_get_int_value(paramtmpl2,"min",&error);
-      maxi=weed_get_int_value(paramtmpl2,"max",&error);
-      
-      weed_set_int_value (in_param2,"value",(int)((gdouble)mini+(mainw->blend_factor/KEYSCALE*(gdouble)(maxi-mini))+.5));
-      vali=weed_get_int_value (in_param2,"value",&error);
-      
-      list=g_list_append(list,g_strdup_printf("%d",vali));
-      list=g_list_append(list,g_strdup_printf("%d",mini));
-      list=g_list_append(list,g_strdup_printf("%d",maxi));
-      update_pwindow(hotkey,copyto,list);
-      g_list_free_strings(list);
-      g_list_free(list);
-    }
-
-
     break;
   case WEED_HINT_FLOAT:
     vald=weed_get_double_value(in_param,"value",&error);
     mind=weed_get_double_value(paramtmpl,"min",&error);
     maxd=weed_get_double_value(paramtmpl,"max",&error);
 
+    pthread_mutex_lock(&mainw->data_mutex);
     weed_set_double_value (in_param,"value",mind+(mainw->blend_factor/KEYSCALE*(maxd-mind)));
+    pthread_mutex_unlock(&mainw->data_mutex);
     vald=weed_get_double_value (in_param,"value",&error);
 
     list=g_list_append(list,g_strdup_printf("%.4f",vald));
@@ -5499,26 +7944,12 @@
     g_list_free_strings(list);
     g_list_free(list);
 
-    if (copyto>-1) {
-      vald=weed_get_double_value(in_param2,"value",&error);
-      mind=weed_get_double_value(paramtmpl2,"min",&error);
-      maxd=weed_get_double_value(paramtmpl2,"max",&error);
-      
-      weed_set_double_value (in_param2,"value",mind+(mainw->blend_factor/KEYSCALE*(maxd-mind)));
-      vald=weed_get_double_value (in_param2,"value",&error);
-      
-      list=g_list_append(list,g_strdup_printf("%.4f",vald));
-      list=g_list_append(list,g_strdup_printf("%.4f",mind));
-      list=g_list_append(list,g_strdup_printf("%.4f",maxd));
-      update_pwindow(hotkey,copyto,list);
-      g_list_free_strings(list);
-      g_list_free(list);
-    }
-
     break;
   case WEED_HINT_SWITCH:
     vali=!!(int)mainw->blend_factor;
+    pthread_mutex_lock(&mainw->data_mutex);
     weed_set_boolean_value (in_param,"value",vali);
+    pthread_mutex_unlock(&mainw->data_mutex);
     vali=weed_get_boolean_value (in_param,"value",&error);
     mainw->blend_factor=(gdouble)vali;
 
@@ -5527,25 +7958,15 @@
     g_list_free_strings(list);
     g_list_free(list);
 
-    if (copyto>-1) {
-      vali=!!(int)mainw->blend_factor;
-      weed_set_boolean_value (in_param2,"value",vali);
-      vali=weed_get_boolean_value (in_param2,"value",&error);
-      mainw->blend_factor=(gdouble)vali;
-      
-      list=g_list_append(list,g_strdup_printf("%d",vali));
-      update_pwindow(hotkey,copyto,list);
-      g_list_free_strings(list);
-      g_list_free(list);
-    }
-
     break;
   }
 
+  set_copy_to(inst,pnum,TRUE);
+
   if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)&&inc_count>0) {
     mainw->event_list=append_param_change_event(mainw->event_list,tc,pnum,in_param,init_events[hotkey],pchains[hotkey]);
     if (copyto>-1) {
-      weed_leaf_copy(in_param2,"value",in_param,"value");
+ 
       mainw->event_list=append_param_change_event(mainw->event_list,tc,copyto,in_param2,init_events[hotkey],
 						  pchains[hotkey]);
     }
@@ -5556,7 +7977,7 @@
 
 
 
-gint weed_get_blend_factor(int hotkey) {
+int weed_get_blend_factor(int hotkey) {
   // mainw->osc_block should be set to TRUE before calling this function !
 
   weed_plant_t *inst,**in_params,*in_param,*paramtmpl;
@@ -5610,9 +8031,26 @@
 
 
 
+weed_plant_t *get_new_inst_for_keymode(int key, int mode)  {
+  // key is 0 based
 
+  weed_plant_t *inst;
 
+  int error;
 
+  register int i;
+
+  for (i=FX_KEYS_MAX_VIRTUAL;i<FX_KEYS_MAX;i++) {
+    if ((inst=key_to_instance[i][key_modes[i]])==NULL) continue;
+    if (weed_plant_has_leaf(inst,"host_mode")) {
+      if (weed_get_int_value(inst,"host_key",&error)==key && weed_get_int_value(inst,"host_mode",&error)==mode) {
+	return inst;
+      }
+    }
+  }
+
+  return NULL;
+}
 
 
 
@@ -5627,21 +8065,20 @@
 ////////////////////////////////////////////////////////////////////////
 
 
- static LIVES_INLINE gchar *weed_instance_get_type(weed_plant_t *inst, gboolean getsub) {
+static LIVES_INLINE gchar *weed_instance_get_type(weed_plant_t *inst, boolean getsub) {
   // return value should be free'd after use
-   int error;
-   weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
-   return weed_filter_get_type(filter,getsub);
+  weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
+  return weed_filter_get_type(filter,getsub,TRUE);
 }
 
 
 
 
- gchar *rte_keymode_get_type (gint key, gint mode, gboolean get_subtype) {
+gchar *rte_keymode_get_type (int key, int mode) {
   // return value should be free'd after use
   gchar *type=g_strdup ("");
   weed_plant_t *filter,*inst;
-  gint idx;
+  int idx;
 
   key--;
   if (!rte_keymode_valid(key+1,mode,TRUE)) return g_strdup("");
@@ -5654,9 +8091,9 @@
   if ((inst=key_to_instance[key][mode])!=NULL) {
     // return details for instance
     g_free(type);
-    type=weed_instance_get_type(inst,get_subtype);
+    type=weed_instance_get_type(inst,TRUE);
   }
-  else type=weed_filter_get_type(filter,get_subtype);
+  else type=weed_filter_get_type(filter,TRUE,TRUE);
 
   mainw->osc_block=FALSE;
   return type;
@@ -5664,9 +8101,9 @@
 
 
 
-lives_fx_cat_t rte_keymode_get_category (gint key, gint mode) {
+lives_fx_cat_t rte_keymode_get_category (int key, int mode) {
   weed_plant_t *filter;
-  gint idx;
+  int idx;
   lives_fx_cat_t cat;
 
   key--;
@@ -5676,8 +8113,8 @@
   if ((filter=weed_filters[idx])==NULL) return LIVES_FX_CAT_NONE;
 
   else cat=weed_filter_categorise(filter,
-				 enabled_in_channels(filter,FALSE),
-				 enabled_out_channels(filter,FALSE));
+				  enabled_in_channels(filter,FALSE),
+				  enabled_out_channels(filter,FALSE));
 
   return cat;
 }
@@ -5701,15 +8138,15 @@
 }
 
 
-gboolean weed_delete_effectkey (gint key, gint mode) {
+boolean weed_delete_effectkey (int key, int mode) {
   // delete the effect binding for key/mode and move higher numbered slots down
   // also moves the active mode if applicable
   // returns FALSE if there was no effect bound to key/mode
 
   int oldkeymode=key_modes[--key];
-  gint orig_mode=mode;
-  gboolean was_started=FALSE;
-  gint modekey=key;
+  int orig_mode=mode;
+  boolean was_started=FALSE;
+  int modekey=key;
   gchar *tmp;
   
   if (key_to_fx[key][mode]==-1) return FALSE;
@@ -5741,7 +8178,7 @@
     }
     else if (key<FX_KEYS_MAX_VIRTUAL) {
       rte_switch_keymode(key+1,mode,(tmp=make_weed_hashname
-				     (key_to_fx[key+1][mode+1],TRUE)));
+				     (key_to_fx[key+1][mode+1],TRUE,FALSE)));
       g_free(tmp);
 
       key_defaults[key][mode]=key_defaults[key][mode+1];
@@ -5766,7 +8203,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-gboolean rte_key_valid (int key, gboolean is_userkey) {
+boolean rte_key_valid (int key, boolean is_userkey) {
   key--;
 
   if (key<0||(is_userkey&&key>=FX_KEYS_MAX_VIRTUAL)||key>=FX_KEYS_MAX) return FALSE;
@@ -5774,33 +8211,38 @@
   return TRUE;
 }
 
-gboolean rte_keymode_valid (gint key, gint mode, gboolean is_userkey) {
+boolean rte_keymode_valid (int key, int mode, boolean is_userkey) {
   if (key<1||(is_userkey&&key>FX_KEYS_MAX_VIRTUAL)||key>FX_KEYS_MAX||mode<0||
       mode>=(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1)) return FALSE;
   if (key_to_fx[--key][mode]==-1) return FALSE;
   return TRUE;
 }
 
-gint rte_keymode_get_filter_idx(gint key, gint mode) {
+int rte_keymode_get_filter_idx(int key, int mode) {
+  if (key<1||key>FX_KEYS_MAX||mode<0||
+      mode>=(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1)) return -1;
   return (key_to_fx[--key][mode]);
 }
 
-int rte_key_getmode (gint key) {
+int rte_key_getmode (int key) {
+  if (key<1||key>FX_KEYS_MAX) return -1;
   return key_modes[--key];
 }
 
-int rte_key_getmaxmode (gint key) {
+int rte_key_getmaxmode (int key) {
   register int i;
 
+  if (key<1||key>FX_KEYS_MAX) return -1;
+
   key--;
 
   for (i=0;i<(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1);i++) {
-    if (key_to_fx[key][i]==-1) return i;
+    if (key_to_fx[key][i]==-1) return i-1;
   }
-  return 0;
+  return i-1;
 }
 
-weed_plant_t *rte_keymode_get_instance(gint key, gint mode) {
+weed_plant_t *rte_keymode_get_instance(int key, int mode) {
   weed_plant_t *inst;
 
   key--;
@@ -5815,14 +8257,14 @@
 }
 
 
-weed_plant_t *rte_keymode_get_filter(gint key, gint mode) {
+weed_plant_t *rte_keymode_get_filter(int key, int mode) {
   key--;
   if (!rte_keymode_valid(key+1,mode,FALSE)) return NULL;
   return weed_filters[key_to_fx[key][mode]];
 }
 
 
-gchar *weed_filter_get_name(gint idx) {
+gchar *weed_filter_get_name(int idx) {
   // return value should be g_free'd after use
   weed_plant_t *filter;
   int error;
@@ -5837,7 +8279,7 @@
 }
 
 
-gchar *rte_keymode_get_filter_name (gint key, gint mode) {
+gchar *rte_keymode_get_filter_name (int key, int mode) {
   // return value should be g_free'd after use
   key--;
   if (!rte_keymode_valid(key+1,mode,TRUE)) return g_strdup("");
@@ -5845,7 +8287,7 @@
 }
 
 
-gchar *rte_keymode_get_plugin_name(gint key, gint mode) {
+gchar *rte_keymode_get_plugin_name(int key, int mode) {
   // return value should be g_free'd after use
   weed_plant_t *filter,*plugin_info;
   gchar *name;
@@ -5871,24 +8313,27 @@
   return prefs->max_modes_per_key;
 }
 
-G_GNUC_PURE gint rte_bg_gen_key (void) {
+G_GNUC_PURE int rte_bg_gen_key (void) {
   return bg_generator_key;
 }
 
-G_GNUC_PURE gint rte_fg_gen_key (void) {
+G_GNUC_PURE int rte_fg_gen_key (void) {
   return fg_generator_key;
 }
 
-G_GNUC_PURE gint rte_bg_gen_mode (void) {
+G_GNUC_PURE int rte_bg_gen_mode (void) {
   return bg_generator_mode;
 }
 
-G_GNUC_PURE gint rte_fg_gen_mode (void) {
+G_GNUC_PURE int rte_fg_gen_mode (void) {
   return fg_generator_mode;
 }
 
 
 
+
+
+
 weed_plant_t *get_textparm() {
   // for rte textmode, get first string parameter for current key/mode instance
   // we will then forward all keystrokes to this parm "value" until the exit key (TAB)
@@ -5935,15 +8380,16 @@
 
 
 
-gboolean rte_key_setmode (gint key, gint newmode) {
+boolean rte_key_setmode (int key, int newmode) {
   // newmode has two special values, -1 = cycle forwards, -2 = cycle backwards
 
-  weed_plant_t *inst;
-  gint oldmode;
-  gint blend_file;
+  weed_plant_t *inst,*last_inst;
+  int oldmode;
+  int blend_file;
   lives_whentostop_t whentostop=mainw->whentostop;
-  gboolean was_started=FALSE;
-  gint real_key;
+  boolean was_started=FALSE;
+  int real_key;
+  int error;
 
   if (key==0) {
     if ((key=mainw->rte_keys)==-1) return FALSE;
@@ -5997,11 +8443,17 @@
   if (oldmode!=newmode) {
     blend_file=mainw->blend_file;
 
-    if (was_started&&enabled_in_channels(inst,FALSE)>0) {
-      // not a generator
+    // handle compound fx
+    last_inst=inst;
+    while (weed_plant_has_leaf(last_inst,"host_next_instance")) last_inst=weed_get_plantptr_value(last_inst,"host_next_instance",&error);
+
+    if (was_started&&(enabled_in_channels(inst,FALSE)>0||enabled_out_channels(last_inst,FALSE)==0||is_pure_audio(inst,FALSE))) {
+      // not a (video or video/audio) generator
       weed_deinit_effect (key);
     }
-    else if (enabled_in_channels(weed_filters[key_to_fx[key][newmode]],FALSE)==0) mainw->whentostop=NEVER_STOP; // when gen->gen, dont stop pb
+    else if (enabled_in_channels(weed_filters[key_to_fx[key][newmode]],FALSE)==0&&
+	     has_video_chans_out(weed_filters[key_to_fx[key][newmode]],TRUE)) 
+      mainw->whentostop=NEVER_STOP; // when gen->gen, dont stop pb
     
     key_modes[real_key]=newmode;
 
@@ -6015,7 +8467,7 @@
 	if (mainw->rte&(GU641<<key)) mainw->rte^=(GU641<<key);
 	mainw->osc_block=FALSE;
 	return FALSE;
-       }
+      }
     }
     // TODO - unblock template channel changes
     mainw->whentostop=whentostop;
@@ -6026,14 +8478,14 @@
 }
 
 
-int weed_add_effectkey_by_idx (gint key, int idx) {
+int weed_add_effectkey_by_idx (int key, int idx) {
   // we will add a filter_class at the next free slot for key, and return the slot number
   // if idx is -1 (probably meaning the filter was not found), we return -1
   // if all slots are full, we return -3
   // currently, generators and non-generators cannot be mixed on the same key (causes problems if the mode is switched)
   // in this case a -2 is returned
-  gboolean has_gen=FALSE;
-  gboolean has_non_gen=FALSE;
+  boolean has_gen=FALSE;
+  boolean has_non_gen=FALSE;
 
   int i;
 
@@ -6043,11 +8495,13 @@
 
   for (i=0;i<prefs->max_modes_per_key;i++) {
     if (key_to_fx[key][i]!=-1) {
-      if (enabled_in_channels(weed_filters[key_to_fx[key][i]],FALSE)==0) has_gen=TRUE;
+      if (enabled_in_channels(weed_filters[key_to_fx[key][i]],FALSE)==0
+	  &&has_video_chans_out(weed_filters[key_to_fx[key][i]],TRUE)) 
+	has_gen=TRUE;
       else has_non_gen=TRUE;
     }
     else {
-      if ((enabled_in_channels(weed_filters[idx],FALSE)==0&&has_non_gen)||
+      if ((enabled_in_channels(weed_filters[idx],FALSE)==0&&has_non_gen&&has_video_chans_out(weed_filters[idx],TRUE)) ||
 	  (enabled_in_channels(weed_filters[idx],FALSE)>0&&has_gen)) return -2;
       key_to_fx[key][i]=idx;
       return i;
@@ -6057,7 +8511,7 @@
 }
 
 
-int weed_add_effectkey (gint key, const gchar *hashname, gboolean fullname) {
+int weed_add_effectkey (int key, const gchar *hashname, boolean fullname) {
   // add a filter_class by hashname to an effect_key
   int idx=weed_get_idx_for_hashname(hashname,fullname);
   return weed_add_effectkey_by_idx (key,idx);
@@ -6065,29 +8519,33 @@
 
 
 
-gint rte_switch_keymode (gint key, gint mode, const gchar *hashname) {
+int rte_switch_keymode (int key, int mode, const gchar *hashname) {
   // this is called when we switch the filter_class bound to an effect_key/mode
 
   int oldkeymode=key_modes[--key];
-  int id=weed_get_idx_for_hashname (hashname,TRUE);
-  gboolean osc_block;
-  gboolean has_gen=FALSE,has_non_gen=FALSE;
+  int id=weed_get_idx_for_hashname (hashname,TRUE),tid;
+  boolean osc_block;
+  boolean has_gen=FALSE,has_non_gen=FALSE;
 
-  gint test=(mode==0?1:0);
+  int test=(mode==0?1:0);
 
   // effect not found
   if (id==-1) return -1;
 
-  if (key_to_fx[key][test]!=-1) {
-    if (enabled_in_channels(weed_filters[key_to_fx[key][test]],FALSE)==0) has_gen=TRUE;
+  if ((tid=key_to_fx[key][test])!=-1) {
+    if (enabled_in_channels(weed_filters[tid],FALSE)==0&&has_video_chans_out(weed_filters[tid],TRUE)) has_gen=TRUE;
     else has_non_gen=TRUE;
   }
 
-  if ((enabled_in_channels(weed_filters[id],FALSE)==0&&has_non_gen)||
+  if ((enabled_in_channels(weed_filters[id],FALSE)==0&&has_video_chans_out(weed_filters[id],TRUE)&&has_non_gen)||
       (enabled_in_channels(weed_filters[id],FALSE)>0&&has_gen)) return -2;
 
   osc_block=mainw->osc_block;
   mainw->osc_block=TRUE;
+
+// must be done before switching the key_to_fx, as we need to know number of in_parameter_templates
+  if (key_defaults[key][mode]!=NULL) free_key_defaults(key,mode);
+
   if (key_to_instance[key][mode]!=NULL) {
     key_modes[key]=mode;
     weed_deinit_effect(-key-1); // set is_modeswitch
@@ -6099,16 +8557,14 @@
 
   mainw->osc_block=osc_block;
 
-  if (key_defaults[key][mode]!=NULL) free_key_defaults(key,mode);
-
   return 0;
 }
 
 
 
 void rte_swap_fg_bg (void) {
-  gint key=fg_generator_key;
-  gint mode=fg_generator_mode;
+  int key=fg_generator_key;
+  int mode=fg_generator_mode;
 
   if (key!=-1) {
     fg_generator_clip=-1;
@@ -6130,7 +8586,7 @@
   int i,error;
   gchar *filter_name,*filter_type,*hashname,*string;
 
-  for (i=0;i<num_weed_filters;i++) {
+  for (i=0;i<num_weed_filters-num_weed_dupes;i++) {
     filter_name=weed_get_string_value(weed_filters[i],"name",&error);
     switch (list_type) {
     case 1:
@@ -6140,7 +8596,7 @@
       break;
     case 2:
       // name and type
-      filter_type=weed_filter_get_type(weed_filters[i],FALSE);
+      filter_type=weed_filter_get_type(weed_filters[i],TRUE,FALSE);
 
       if (weed_plant_has_leaf(weed_filters[i],"plugin_unstable")&&
 	  weed_get_boolean_value(weed_filters[i],"plugin_unstable",&error)==WEED_TRUE) {
@@ -6152,7 +8608,7 @@
       break;
     case 3:
       // hashnames
-      hashname=make_weed_hashname(i,TRUE);
+      hashname=make_weed_hashname(i,TRUE,FALSE);
       list=g_list_append(list,(gpointer)hashname);
       break;
     }
@@ -6162,7 +8618,8 @@
 }
 
 
-gint rte_get_numfilters(void) {
+int rte_get_numfilters(boolean inc_dupes) {
+  if (!inc_dupes) return num_weed_filters-num_weed_dupes;
   return num_weed_filters;
 }
 
@@ -6170,41 +8627,50 @@
 ///////////////////
 // parameter interpolation
 
-void fill_param_vals_to (weed_plant_t *paramtmpl, weed_plant_t *param, int pnum, int hint, int index) {
+void fill_param_vals_to (weed_plant_t *param, weed_plant_t *paramtmpl, int index) {
   // for a multi valued parameter or pchange, we will fill "value" up to element index with "new_default"
 
-  int i,error;
+  // paramtmpl must be supplied, since pchanges do not have one directly
+
+  int i,error,hint;
   int num_vals=weed_leaf_num_elements(param,"value");
   int new_defi,*valis,*nvalis;
   double new_defd,*valds,*nvalds;
   gchar *new_defs,**valss,**nvalss;
   int cspace;
   int *colsis,*coli;
+  int vcount;
   double *colsds,*cold;
 
+  hint=weed_get_int_value(paramtmpl,"hint",&error);
+
+  vcount=weed_leaf_num_elements(param,"value");
+  if (index>=vcount) vcount=++index;
 
   switch (hint) {
   case WEED_HINT_INTEGER:
     new_defi=weed_get_int_value(paramtmpl,"new_default",&error);
     valis=weed_get_int_array(param,"value",&error);
-    nvalis=(int *)g_malloc((index+1)*sizint);
-    for (i=0;i<=index;i++) {
-      if (i<num_vals) nvalis[i]=valis[i];
-      else nvalis[i]=new_defi;
+    nvalis=(int *)g_malloc(vcount*sizint);
+    for (i=0;i<vcount;i++) {
+      if (i<num_vals&&i<index) nvalis[i]=valis[i];
+      else if (i<=num_vals&&i>index) nvalis[i]=valis[i-1];
+      else nvalis[i]=new_defi; 
     }
-    weed_set_int_array(param,"value",index+1,nvalis);
+    weed_set_int_array(param,"value",vcount,nvalis);
     weed_free(valis);
     g_free(nvalis);
     break;
   case WEED_HINT_FLOAT:
     new_defd=weed_get_double_value(paramtmpl,"new_default",&error);
     valds=weed_get_double_array(param,"value",&error);
-    nvalds=(double *)g_malloc((index+1)*sizdbl);
-    for (i=0;i<=index;i++) {
-      if (i<num_vals) nvalds[i]=valds[i];
-      else nvalds[i]=new_defd;
+    nvalds=(double *)g_malloc(vcount*sizdbl);
+    for (i=0;i<vcount;i++) {
+      if (i<num_vals&&i<index) nvalds[i]=valds[i];
+      else if (i<=num_vals&&i>index) nvalds[i]=valds[i-1];
+      else nvalds[i]=new_defd; 
     }
-    weed_set_double_array(param,"value",index+1,nvalds);
+    weed_set_double_array(param,"value",vcount,nvalds);
 
     weed_free(valds);
     g_free(nvalds);
@@ -6212,33 +8678,31 @@
   case WEED_HINT_SWITCH:
     new_defi=weed_get_boolean_value(paramtmpl,"new_default",&error);
     valis=weed_get_boolean_array(param,"value",&error);
-    nvalis=(int *)g_malloc((index+1)*sizint);
-    for (i=0;i<=index;i++) {
-      if (i<num_vals) nvalis[i]=valis[i];
-      else nvalis[i]=new_defi;
+    nvalis=(int *)g_malloc(vcount*sizint);
+    for (i=0;i<vcount;i++) {
+      if (i<num_vals&&i<index) nvalis[i]=valis[i];
+      else if (i<=num_vals&&i>index) nvalis[i]=valis[i-1];
+      else nvalis[i]=new_defi; 
     }
-    weed_set_boolean_array(param,"value",index+1,nvalis);
+    weed_set_boolean_array(param,"value",vcount,nvalis);
     weed_free(valis);
     g_free(nvalis);
     break;
   case WEED_HINT_TEXT:
     new_defs=weed_get_string_value(paramtmpl,"new_default",&error);
     valss=weed_get_string_array(param,"value",&error);
-    nvalss=(gchar **)g_malloc((index+1)*sizeof(gchar *));
-    for (i=0;i<=index;i++) {
-      if (i<num_vals) {
-	nvalss[i]=g_strdup(valss[i]);
-	weed_free(valss[i]);
-      }
-      else nvalss[i]=g_strdup(new_defs);
+    nvalss=(gchar **)g_malloc(vcount*sizeof(gchar *));
+    for (i=0;i<vcount;i++) {
+      if (i<num_vals&&i<index) nvalss[i]=valss[i];
+      else if (i<=num_vals&&i>index) nvalss[i]=valss[i-1];
+      else nvalss[i]=new_defs; 
     }
-    weed_set_string_array(param,"value",index+1,nvalss);
+    weed_set_string_array(param,"value",vcount,nvalss);
 
     for (i=0;i<index;i++) {
-      g_free(nvalss[i]);
+      weed_free(nvalss[i]);
     }
 
-    weed_free(new_defs);
     weed_free(valss);
     g_free(nvalss);
     break;
@@ -6247,28 +8711,34 @@
     switch (cspace) {
     case WEED_COLORSPACE_RGB:
       index*=3;
+      vcount*=3;
       if (weed_leaf_seed_type(paramtmpl,"new_default")==WEED_SEED_INT) {
 	colsis=weed_get_int_array(param,"value",&error);
 	if (weed_leaf_num_elements(paramtmpl,"new_default")==1) {
-	  coli=(int *)weed_malloc(3*4);
+	  coli=(int *)weed_malloc(3*sizint);
 	  coli[0]=coli[1]=coli[2]=weed_get_int_value(paramtmpl,"new_default",&error);
 	}
 	else coli=weed_get_int_array(paramtmpl,"new_default",&error);
 	valis=weed_get_int_array(param,"value",&error);
-	nvalis=(int *)g_malloc((index+3)*4);
-	for (i=0;i<=index;i+=3) {
-	  if (i<num_vals) {
+	nvalis=(int *)g_malloc(vcount*sizint);
+	for (i=0;i<vcount;i+=3) {
+	  if (i<num_vals&&i<index) {
 	    nvalis[i]=valis[i];
 	    nvalis[i+1]=valis[i+1];
 	    nvalis[i+2]=valis[i+2];
 	  }
+	  else if (i<=num_vals&&i>index) {
+	    nvalis[i]=valis[i-3];
+	    nvalis[i+1]=valis[i-2];
+	    nvalis[i+2]=valis[i-1];
+	  }
 	  else {
-	    nvalis[i]=coli[0];
-	    nvalis[i+1]=coli[1];
-	    nvalis[i+2]=coli[2];
+	    nvalis[i]=coli[0]; 
+	    nvalis[i+1]=coli[1]; 
+	    nvalis[i+2]=coli[2]; 
 	  }
 	}
-	weed_set_int_array(param,"value",index+3,nvalis);
+	weed_set_int_array(param,"value",vcount,nvalis);
 	weed_free(valis);
 	weed_free(colsis);
 	g_free(nvalis);
@@ -6281,20 +8751,25 @@
 	}
 	else cold=weed_get_double_array(paramtmpl,"new_default",&error);
 	valds=weed_get_double_array(param,"value",&error);
-	nvalds=(double *)g_malloc((index+3)*sizdbl);
-	for (i=0;i<=index;i+=3) {
-	  if (i<num_vals) {
+	nvalds=(double *)g_malloc(vcount*sizdbl);
+	for (i=0;i<vcount;i+=3) {
+	  if (i<num_vals&&i<index) {
 	    nvalds[i]=valds[i];
 	    nvalds[i+1]=valds[i+1];
 	    nvalds[i+2]=valds[i+2];
 	  }
+	  else if (i<=num_vals&&i>index) {
+	    nvalds[i]=valds[i-3];
+	    nvalds[i+1]=valds[i-2];
+	    nvalds[i+2]=valds[i-1];
+	  }
 	  else {
-	    nvalds[i]=cold[0];
-	    nvalds[i+1]=cold[1];
-	    nvalds[i+2]=cold[2];
+	    nvalds[i]=cold[0]; 
+	    nvalds[i+1]=cold[1]; 
+	    nvalds[i+2]=cold[2]; 
 	  }
 	}
-	weed_set_double_array(param,"value",index+3,nvalds);
+	weed_set_double_array(param,"value",vcount,nvalds);
 	weed_free(valds);
 	weed_free(colsds);
 	g_free(nvalds);
@@ -6389,7 +8864,7 @@
     weed_free(valsd);
     return val;
   }
-   return weed_get_double_value(ptmpl,"new_default",&error);
+  return weed_get_double_value(ptmpl,"new_default",&error);
 }
 
 
@@ -6428,7 +8903,7 @@
     return val;
   }
   if (weed_plant_has_leaf(ptmpl,"default")&&(numvals=weed_leaf_num_elements(ptmpl,"default"))>idx) {
-    valss=weed_get_string_array(ptmpl,"host_default",&error);
+    valss=weed_get_string_array(ptmpl,"default",&error);
     val=g_strdup(valss[idx]);
     for (i=0;i<numvals;i++) weed_free(valss[i]);
     weed_free(valss);
@@ -6445,7 +8920,7 @@
 
 
 
-gboolean interpolate_param(weed_plant_t *inst, int i, void *pchain, weed_timecode_t tc) {
+boolean interpolate_param(weed_plant_t *inst, int i, void *pchain, weed_timecode_t tc) {
   // return FALSE if param has no "value" - this can happen during realtime audio processing, if the effect is inited, but no "value" has been set yet
   weed_plant_t **param_array;
   int error,j;
@@ -6492,8 +8967,8 @@
   // if plugin wants to do its own interpolation, we let it
   wtmpl=weed_get_plantptr_value(param,"template",&error);
   if (weed_plant_has_leaf(wtmpl,"interpolate_func")) {
-    gboolean needs_more;
-    gboolean more_available;
+    boolean needs_more;
+    boolean more_available;
     weed_interpolate_f *interpolate_func_ptr;
     weed_interpolate_f interpolate_func;
     weed_plant_t *calc_param=weed_plant_new(WEED_PLANT_PARAMETER),*filter;
@@ -6525,7 +9000,7 @@
     weed_add_plant_flags(calc_param,WEED_LEAF_READONLY_PLUGIN);
     interpolate_func_ptr=(weed_interpolate_f *)weed_get_voidptr_value(wtmpl,"interpolate_func",&error);
     interpolate_func=(weed_interpolate_f)*interpolate_func_ptr;
-    filter=weed_get_plantptr_value(inst,"filter_class",&error);
+    filter=weed_instance_get_filter(inst,FALSE);
     cwd=cd_to_plugin_dir(filter);
     needs_more=(*interpolate_func)(param_array,calc_param);
     lives_chdir(cwd,FALSE);
@@ -6636,7 +9111,7 @@
     switch (hint) {
     case WEED_HINT_FLOAT:
       if (lpc[j]==NULL) {
-      // before first change
+	// before first change
 	valds[j]=get_default_element_double(param,j,1,0);
 	continue;
       }
@@ -6870,7 +9345,7 @@
 	if (xnum>j) {
 	  nvalss=weed_get_string_array((weed_plant_t *)lpc[j],"value",&error);
 	  valss[j]=g_strdup(nvalss[j]);
-	  for (k=0;k<num_values;k++) weed_free(nvalss[k]);
+	  for (k=0;k<xnum;k++) weed_free(nvalss[k]);
 	  weed_free(nvalss);
 	}
 	else valss[j]=get_default_element_string(param,j);
@@ -6922,25 +9397,37 @@
 }
 
 
-gboolean interpolate_params(weed_plant_t *inst, void **pchains, weed_timecode_t tc) {
+boolean interpolate_params(weed_plant_t *inst, void **pchains, weed_timecode_t tc) {
   // interpolate all in_parameters for filter_instance inst, using void **pchain, which is an array of param_change events in temporal order
   // values are calculated for timecode tc. We skip "hidden" parameters
-  int i;
   void *pchain;
   int num_params;
+  int offset=0,error;
 
-  if (!weed_plant_has_leaf(inst,"in_parameters")||pchains==NULL) return TRUE;
+  register int i;
 
-  num_params=weed_leaf_num_elements(inst,"in_parameters");
+  do {
 
-  if (num_params==0) return TRUE; // no in_parameters ==> do nothing
+    if (!weed_plant_has_leaf(inst,"in_parameters")||pchains==NULL) continue;
 
-  for (i=0;i<num_params;i++) {
-    if (!is_hidden_param(inst,i)) {
-      pchain=pchains[i];
-      if (!interpolate_param(inst,i,pchain,tc)) return FALSE; // FALSE if param is not ready
+    num_params=weed_leaf_num_elements(inst,"in_parameters");
+
+    if (num_params==0) continue; // no in_parameters ==> do nothing
+
+    for (i=offset;i<offset+num_params;i++) {
+      if (!is_hidden_param(inst,i-offset)) {
+	pchain=pchains[i];
+	if (pchain!=NULL&&WEED_PLANT_IS_EVENT((weed_plant_t *)pchain)&&WEED_EVENT_IS_PARAM_CHANGE((weed_plant_t *)pchain))
+	  if (!interpolate_param(inst,i-offset,pchain,tc)) return FALSE; // FALSE if param is not ready
+      }
     }
-  }
+
+    offset+=num_params;
+
+  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+
+
+
   return TRUE;
 }
 
@@ -6950,7 +9437,12 @@
 ///////////////////////////////////////////////////////////
 ////// hashnames
 
- gchar *make_weed_hashname(int filter_idx, gboolean fullname) {
+gchar *make_weed_hashname(int filter_idx, boolean fullname, boolean use_extra_authors) {
+  // return value should be freed after use
+
+  // make hashname from filter_idx: if use_extra_authors is set we use "extra_authors" instead of "authors"
+  // (for reverse compatibility)
+
   weed_plant_t *filter,*plugin_info;
   gchar *plugin_name,*filter_name,*filter_author,*filter_version,*hashname;
   int error,version;
@@ -6958,44 +9450,58 @@
 
   if (filter_idx<0||filter_idx>=num_weed_filters) return g_strdup("");
 
-  if (hashnames[filter_idx]!=NULL&&fullname) return g_strdup(hashnames[filter_idx]);
-
   filter=weed_filters[filter_idx];
 
-  plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
+  if (hashnames[filter_idx]!=NULL&&fullname&&(!use_extra_authors||!weed_plant_has_leaf(filter,"extra_authors"))) 
+    return g_strdup(hashnames[filter_idx]);
 
-  plugin_name=weed_get_string_value(plugin_info,"name",&error);
+  if (weed_plant_has_leaf(filter,"plugin_info")) {
+    plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
+    plugin_name=weed_get_string_value(plugin_info,"name",&error);
 
-  g_snprintf(plugin_fname,PATH_MAX,"%s",plugin_name);
-  weed_free(plugin_name);
-  get_filename(plugin_fname,TRUE);
+    g_snprintf(plugin_fname,PATH_MAX,"%s",plugin_name);
+    weed_free(plugin_name);
+    get_filename(plugin_fname,TRUE);
+  }
+  else memset(plugin_fname,0,1);
 
   filter_name=weed_get_string_value(filter,"name",&error);
 
   if (fullname) {
-    filter_author=weed_get_string_value(filter,"author",&error);
+    if (!use_extra_authors||!weed_plant_has_leaf(filter,"extra_authors"))
+      filter_author=weed_get_string_value(filter,"author",&error);
+    else 
+      filter_author=weed_get_string_value(filter,"extra_authors",&error);
+ 
     version=weed_get_int_value(filter,"version",&error);
     filter_version=g_strdup_printf("%d",version);
 
     hashname=g_strconcat(plugin_fname,filter_name,filter_author,filter_version,NULL);
-
     weed_free(filter_author);
     g_free(filter_version);
   }
   else hashname=g_strconcat(plugin_fname,filter_name,NULL);
   weed_free(filter_name);
 
+  //g_print("added filter %s\n",hashname);
+
   return hashname;
 }
 
 
 
-int weed_get_idx_for_hashname (const gchar *hashname, gboolean fullname) {
+int weed_get_idx_for_hashname (const gchar *hashname, boolean fullname) {
   int i;
   gchar *chashname;
 
   for (i=0;i<num_weed_filters;i++) {
-    chashname=make_weed_hashname(i,fullname);
+    chashname=make_weed_hashname(i,fullname,FALSE);
+    if (!strcmp(hashname,chashname)) {
+      g_free(chashname);
+      return i;
+    }
+    g_free(chashname);
+    chashname=make_weed_hashname(i,fullname,TRUE);
     if (!strcmp(hashname,chashname)) {
       g_free(chashname);
       return i;
@@ -7005,15 +9511,16 @@
   return -1;
 }
 
- weed_plant_t *get_weed_filter(int idx) {
+weed_plant_t *get_weed_filter(int idx) {
   if (idx>-1&&idx<num_weed_filters) return weed_filters[idx];
   return NULL;
 }
 
 
 
-static void weed_leaf_serialise (int fd, weed_plant_t *plant, const char *key, gboolean write_all, unsigned char **mem) {
-  void *value;
+
+static void weed_leaf_serialise (int fd, weed_plant_t *plant, const char *key, boolean write_all, unsigned char **mem) {
+  void *value,*valuer;
   guint32 vlen;
   int st,ne;
   int j;
@@ -7022,6 +9529,7 @@
   // write errors will be checked for by the calling function
 
   if (write_all) {
+    // write byte length of key, followed by key in utf-8
     if (mem==NULL) {
       lives_write_le(fd,&i,4,TRUE);
       lives_write(fd,key,(size_t)i,TRUE);
@@ -7033,7 +9541,10 @@
       *mem+=i;
     }
   }
+
+  // write seed type and number of elements
   st=weed_leaf_seed_type(plant,key);
+
   if (mem==NULL) lives_write_le(fd,&st,4,TRUE);
   else {
     lives_memcpy(*mem,&st,4);
@@ -7048,6 +9559,8 @@
 
   // write errors will be checked for by the calling function
 
+
+  // for each element, write the data size followed by the data
   for (j=0;j<ne;j++) {
     vlen=(guint32)weed_leaf_element_size(plant,key,j);
     if (st!=WEED_SEED_STRING) {
@@ -7058,12 +9571,21 @@
       value=g_malloc((size_t)(vlen+1));
       weed_leaf_get(plant,key,j,&value);
     }
+
+    if (mem==NULL && weed_leaf_seed_type(plant,key)>=64) {
+      // save voidptr as 64 bit values (**NEW**)
+      valuer=(uint64_t *)g_malloc(sizeof(uint64_t));
+      *((uint64_t *)valuer)=(uint64_t)(*((void **)value));
+      vlen=sizeof(uint64_t);
+    }
+    else valuer=value;
+
     if (mem==NULL) {
       lives_write_le(fd,&vlen,4,TRUE);
       if (st!=WEED_SEED_STRING) {
-	lives_write_le(fd,value,(size_t)vlen,TRUE);
+	lives_write_le(fd,valuer,(size_t)vlen,TRUE);
       }
-      else lives_write(fd,value,(size_t)vlen,TRUE);
+      else lives_write(fd,valuer,(size_t)vlen,TRUE);
     }
     else {
       lives_memcpy(*mem,&vlen,4);
@@ -7072,6 +9594,7 @@
       *mem+=vlen;
     }
     g_free(value);
+    if (valuer!=value) g_free(valuer);
   }
 
   // write errors will be checked for by the calling function
@@ -7080,7 +9603,7 @@
 
 
 
-gboolean weed_plant_serialise(int fd, weed_plant_t *plant, unsigned char **mem) {
+boolean weed_plant_serialise(int fd, weed_plant_t *plant, unsigned char **mem) {
   // write errors will be checked for by the calling function
 
 
@@ -7111,11 +9634,11 @@
 
 
 
- static gint weed_leaf_deserialise(int fd, weed_plant_t *plant, const gchar *key, unsigned char **mem, 
-				   gboolean check_key) {
+static int weed_leaf_deserialise(int fd, weed_plant_t *plant, const gchar *key, unsigned char **mem, 
+				  boolean check_key) {
   // if plant is NULL, returns type
   // "host_default" sets key; otherwise NULL
-   // check_key set to TRUE - check that we read the correct key
+  // check_key set to TRUE - check that we read the correct key
 
   void **values;
 
@@ -7136,7 +9659,9 @@
 
   if (key==NULL || check_key) {
     if (mem==NULL) {
-      if (lives_read_le(fd,&len,4,TRUE)<4) return -4;
+      if (lives_read_le(fd,&len,4,TRUE)<4) {
+	return -4;
+      }
     }
     else {
       lives_memcpy(&len,*mem,4);
@@ -7187,9 +9712,9 @@
   }
 
   if (st!=WEED_SEED_INT&&st!=WEED_SEED_BOOLEAN&&st!=WEED_SEED_DOUBLE&&st!=WEED_SEED_INT64&&
-      st!=WEED_SEED_STRING&&st!=WEED_SEED_VOIDPTR&&st!=WEED_SEED_PLANTPTR)
+      st!=WEED_SEED_STRING&&st!=WEED_SEED_VOIDPTR&&st!=WEED_SEED_PLANTPTR) {
     return -6;
-
+  }
 
   if (check_key&&!strcmp(key,"type")) {
     // for the "type" leaf perform some extra checks
@@ -7211,7 +9736,6 @@
   }
 
 
-
   if (ne>0) values=(void **)g_malloc(ne*sizeof(void *));
   else values=NULL;
 
@@ -7236,7 +9760,7 @@
       lives_memcpy(&vlen,*mem,4);
       *mem+=4;
     }
-      
+
     if (st==WEED_SEED_STRING) {
       values[i]=g_malloc((size_t)vlen+1);
     }
@@ -7300,14 +9824,24 @@
 	break;
       default:
 	if (plant!=NULL) {
-	  void **voids=(void **)g_malloc(ne*sizeof(void *));
-	  for (j=0;j<ne;j++) voids[j]=*(void **)values[j];
-	  weed_leaf_set (plant, key, st, ne, (void *)voids);
-	  g_free(voids);
+	  if (mem==NULL && prefs->force64bit) {
+	    // force pointers to uint64_t
+	    uint64_t *voids=(uint64_t *)g_malloc(ne*sizeof(uint64_t));
+	    for (j=0;j<ne;j++) voids[j]=(uint64_t)(*(void **)values[j]);
+	    weed_leaf_set (plant, key, WEED_SEED_INT64, ne, (void *)voids);
+	    g_free(voids);
+	  }
+	  else {
+	    void **voids=(void **)g_malloc(ne*sizeof(void *));
+	    for (j=0;j<ne;j++) voids[j]=*(void **)values[j];
+	    weed_leaf_set (plant, key, st, ne, (void *)voids);
+	    g_free(voids);
+	  }
 	}
       }
     }
   }
+
   if (values!=NULL) {
     for (i=0;i<ne;i++) g_free(values[i]);
     g_free(values);
@@ -7367,13 +9901,13 @@
 
 
 
-gboolean write_filter_defaults (int fd, int idx) {
+boolean write_filter_defaults (int fd, int idx) {
   // return FALSE on write error
   gchar *hashname;
   weed_plant_t *filter=weed_filters[idx],**ptmpls;
   int num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   int i,error;
-  gboolean wrote_hashname=FALSE;
+  boolean wrote_hashname=FALSE;
   size_t vlen;
   int ntowrite=0;
 
@@ -7391,7 +9925,7 @@
   for (i=0;i<num_params;i++) {
     if (weed_plant_has_leaf(ptmpls[i],"host_default")) {
       if (!wrote_hashname) {
-	hashname=make_weed_hashname(idx,TRUE);
+	hashname=make_weed_hashname(idx,TRUE,FALSE);
 	vlen=strlen(hashname);
 	
 	lives_write_le(fd,&vlen,4,TRUE);
@@ -7416,7 +9950,7 @@
 
 
 
-gboolean read_filter_defaults(int fd) {
+boolean read_filter_defaults(int fd) {
   weed_plant_t *filter,**ptmpls;
   void *buf;
 
@@ -7427,6 +9961,8 @@
   int num_params=0;
   int ntoread;
 
+  boolean found=FALSE;
+
   gchar *tmp;
 
   mainw->read_failed=FALSE;
@@ -7447,7 +9983,7 @@
 
     vlen=(size_t)vleni;
 
-    if (capable->byte_order==G_BIG_ENDIAN&&prefs->bigendbug) {
+    if (capable->byte_order==LIVES_BIG_ENDIAN&&prefs->bigendbug) {
       if (vleni==0&&vlenz!=0) vlen=(size_t)vlenz;
     }
     else {
@@ -7463,12 +9999,22 @@
 
     memset((char *)buf+vlen,0,1);
     for (i=0;i<num_weed_filters;i++) {
-      if (!strcmp((gchar *)buf,(tmp=make_weed_hashname(i,TRUE)))) {
+      if (!strcmp((gchar *)buf,(tmp=make_weed_hashname(i,TRUE,FALSE)))) {
 	g_free(tmp);
+	found=TRUE;
 	break;
       }
       g_free(tmp);
     }
+    if (!found) {
+      for (i=0;i<num_weed_filters;i++) {
+	if (!strcmp((gchar *)buf,(tmp=make_weed_hashname(i,TRUE,TRUE)))) {
+	  g_free(tmp);
+	  break;
+	}
+	g_free(tmp);
+      }
+    }
 
     g_free(buf);
 
@@ -7491,7 +10037,7 @@
 	if (ptmpls!=NULL) weed_free(ptmpls);
 	break;
       }
-      
+
       if (pnum<num_params) {
 	weed_leaf_deserialise(fd,ptmpls[pnum],"host_default",NULL,FALSE);
       }
@@ -7526,7 +10072,7 @@
 
 
 
-gboolean write_generator_sizes (int fd, int idx) {
+boolean write_generator_sizes (int fd, int idx) {
   // TODO - handle optional channels
   // return FALSE on write error
   gchar *hashname;
@@ -7534,7 +10080,7 @@
   int num_channels;
   int i,error;
   size_t vlen;
-  gboolean wrote_hashname=FALSE;
+  boolean wrote_hashname=FALSE;
 
   num_channels=enabled_in_channels(weed_filters[idx],FALSE);
   if (num_channels!=0) return TRUE;
@@ -7552,7 +10098,7 @@
     if (weed_plant_has_leaf(ctmpls[i],"host_width")||weed_plant_has_leaf(ctmpls[i],"host_height")||
 	(!wrote_hashname&&weed_plant_has_leaf(filter,"host_fps"))) {
       if (!wrote_hashname) {
-	hashname=make_weed_hashname(idx,TRUE);
+	hashname=make_weed_hashname(idx,TRUE,FALSE);
 	vlen=strlen(hashname);
 	lives_write_le(fd,&vlen,4,TRUE);
 	lives_write(fd,hashname,vlen,TRUE);
@@ -7583,7 +10129,7 @@
 
 
 
-gboolean read_generator_sizes(int fd) {
+boolean read_generator_sizes(int fd) {
   weed_plant_t *filter,**ctmpls;
   ssize_t bytes;
   size_t vlen;
@@ -7591,6 +10137,8 @@
   gchar *buf;
   gchar *tmp;
 
+  boolean found=FALSE;
+
   int vleni,vlenz;
   int i,error;
   int num_chans=0;
@@ -7614,7 +10162,7 @@
 
     vlen=(size_t)vleni;
 
-    if (capable->byte_order==G_BIG_ENDIAN&&prefs->bigendbug) {
+    if (capable->byte_order==LIVES_BIG_ENDIAN&&prefs->bigendbug) {
       if (vleni==0&&vlenz!=0) vlen=(size_t)vlenz;
     }
     else {
@@ -7638,18 +10186,29 @@
     memset((char *)buf+vlen,0,1);
 
     for (i=0;i<num_weed_filters;i++) {
-      if (!strcmp(buf,(tmp=make_weed_hashname(i,TRUE)))) {
+      if (!strcmp(buf,(tmp=make_weed_hashname(i,TRUE,FALSE)))) {
 	g_free(tmp);
+	found=TRUE;
 	break;
       }
       g_free(tmp);
     }
+    if (!found) {
+      for (i=0;i<num_weed_filters;i++) {
+	if (!strcmp(buf,(tmp=make_weed_hashname(i,TRUE,TRUE)))) {
+	  g_free(tmp);
+	  break;
+	}
+	g_free(tmp);
+      }
+    }
+
 
     g_free(buf);
     ctmpls=NULL;
 
     if (i<num_weed_filters) {
-      gboolean ready=FALSE;
+      boolean ready=FALSE;
       filter=weed_filters[i];
       num_chans=weed_leaf_num_elements(filter,"out_channel_templates");
       if (num_chans>0) ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
@@ -7697,11 +10256,11 @@
 
 void reset_frame_and_clip_index(void) {
   if (mainw->clip_index==NULL) {
-    mainw->clip_index=(gint *)weed_malloc(sizint);
+    mainw->clip_index=(int *)weed_malloc(sizint);
     mainw->clip_index[0]=-1;
-    }
+  }
   if (mainw->frame_index==NULL) {
-    mainw->frame_index=(gint *)weed_malloc(sizint);
+    mainw->frame_index=(int *)weed_malloc(sizint);
     mainw->frame_index[0]=0;
   }
 }
@@ -7709,7 +10268,7 @@
 
 // key/mode parameter defaults
 
-gboolean read_key_defaults(int fd, int nparams, int key, int mode, int ver) {
+boolean read_key_defaults(int fd, int nparams, int key, int mode, int ver) {
   // read default param values for key/mode from file
 
   // if key < 0 we just read past the bytes in the file
@@ -7720,22 +10279,24 @@
   int idx;
   ssize_t bytes;
   weed_plant_t *filter;
-  int xnparams=0;
+  int xnparams=0,maxparams=nparams;
   weed_plant_t **key_defs;
   weed_timecode_t tc;
 
-  gboolean ret=FALSE;
+  boolean ret=FALSE;
 
   mainw->read_failed=FALSE;
 
   if (key>=0) {
     idx=key_to_fx[key][mode];
     filter=weed_filters[idx];
-    xnparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+    xnparams=num_in_params(filter,FALSE,FALSE);
   }
 
-  key_defs=(weed_plant_t **)g_malloc(nparams*sizeof(weed_plant_t *));
-  for (i=0;i<nparams;i++) {
+  if (xnparams>maxparams) maxparams=xnparams;
+
+  key_defs=(weed_plant_t **)g_malloc(maxparams*sizeof(weed_plant_t *));
+  for (i=0;i<maxparams;i++) {
     key_defs[i]=NULL;
   }
 
@@ -7822,30 +10383,42 @@
 
 
 
-void apply_key_defaults(weed_plant_t *inst, gint key, gint mode) {
+void apply_key_defaults(weed_plant_t *inst, int key, int mode) {
   // apply key/mode param defaults to a filter instance
-  int i=0,error;
-  int nparams=weed_leaf_num_elements(inst,"in_parameters");
+  int error;
+  int nparams;
   weed_plant_t **defs;
   weed_plant_t **params;
 
+  weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
+
+  register int i,j=0;
+
+  nparams=num_in_params(filter,FALSE,FALSE);
+
   if (nparams==0) return;
   defs=key_defaults[key][mode];
 
   if (defs==NULL) return;
 
-  params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  do {
+    params=weed_get_plantptr_array(inst,"in_parameters",&error);
+    nparams=num_in_params(inst,FALSE,FALSE);
+
+    for (i=0;i<nparams;i++) {
+      if (!is_hidden_param(inst,i))
+	weed_leaf_copy(params[i],"value",defs[j],"value");
+      j++;
+    }
+    weed_free(params);
+  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+
 
-  while (i<nparams) {
-    weed_leaf_copy(params[i],"value",defs[i],"value");
-    i++;
-  }
-  weed_free(params);
 }
 
 
 
-void write_key_defaults(int fd, gint key, gint mode) {
+void write_key_defaults(int fd, int key, int mode) {
   // save key/mode param defaults to file
   // caller should check for write errors
 
@@ -7859,7 +10432,7 @@
   }
 
   filter=weed_filters[key_to_fx[key][mode]];
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+  nparams=num_in_params(filter,FALSE,FALSE);
   lives_write_le (fd,&nparams,4,TRUE);
 
   for (i=0;i<nparams;i++) {
@@ -7871,7 +10444,7 @@
 
 
 
-void free_key_defaults(gint key, gint mode) {
+void free_key_defaults(int key, int mode) {
   // free key/mode param defaults
   weed_plant_t *filter;
   weed_plant_t **key_defs;
@@ -7885,7 +10458,7 @@
   if (key_defs==NULL) return;
 
   filter=weed_filters[key_to_fx[key][mode]];
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+  nparams=num_in_params(filter,FALSE,FALSE);
 
   while (i<nparams) {
     if (key_defs[i]!=NULL) weed_plant_free(key_defs[i]);
@@ -7897,33 +10470,45 @@
 
 
 
-void set_key_defaults(weed_plant_t *inst, gint key, gint mode) {
+void set_key_defaults(weed_plant_t *inst, int key, int mode) {
   // copy key/mode param defaults from an instance
   weed_plant_t **key_defs,**params;
+  weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
   int i=0,error;
-  int nparams=weed_leaf_num_elements(inst,"in_parameters");
+  int nparams,poffset=0;
 
   if (key_defaults[key][mode]!=NULL) free_key_defaults(key,mode);
 
+  nparams=num_in_params(filter,FALSE,FALSE);
+ 
   if (nparams==0) return;
 
-  params=weed_get_plantptr_array(inst,"in_parameters",&error);
-
   key_defs=(weed_plant_t **)g_malloc(nparams*sizeof(weed_plant_t *));
 
-  while (i<nparams) {
-    key_defs[i]=weed_plant_new(WEED_PLANT_PARAMETER);
-    weed_leaf_copy(key_defs[i],"value",params[i],"value");
-    i++;
-  }
+  do {
+    nparams=num_in_params(inst,FALSE,FALSE);
+
+    if (nparams>0) {
+      params=weed_get_plantptr_array(inst,"in_parameters",&error);
+    
+      while (i<nparams+poffset) {
+	key_defs[i]=weed_plant_new(WEED_PLANT_PARAMETER);
+	weed_leaf_copy(key_defs[i],"value",params[i-poffset],"value");
+	i++;
+      }
+      
+      weed_free(params);
+    }
+    poffset+=nparams;
+
+  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 
-  weed_free(params);
   key_defaults[key][mode]=key_defs;
 }
 
 
 
-gboolean has_key_defaults(void) {
+boolean has_key_defaults(void) {
   // check if any key/mode has default parameters set
   int i,j;
   for (i=0;i<prefs->rte_keys_virtual;i++) {

LiVES-1.6.1.tar.bz2/src/effects-weed.h -> LiVES-2.0.3.tar.bz2/src/effects-weed.h Changed

@@ -11,97 +11,131 @@
 /// filter apply errors
 typedef enum {
   FILTER_NO_ERROR=0,
-  FILTER_ERROR_MISSING_LAYER=1,
-  FILTER_ERROR_BLANK_FRAME=2,
-  FILTER_ERROR_MISSING_FRAME=3,
-  FILTER_ERROR_INVALID_PALETTE_CONVERSION=4,
-  FILTER_ERROR_UNABLE_TO_RESIZE=5,
-  FILTER_ERROR_INVALID_PALETTE_SETTINGS=6,
-  FILTER_ERROR_COULD_NOT_REINIT=7,
-  FILTER_ERROR_MUST_RELOAD=8,
-  FILTER_ERROR_NO_IN_CHANNELS=9,
-  FILTER_ERROR_INVALID_TRACK=10,
-  FILTER_ERROR_INTERPOLATION_FAILED=11,
-  FILTER_ERROR_INVALID_INSTANCE=12,
-  FILTER_ERROR_INVALID_FILTER=13,
-  FILTER_ERROR_INVALID_INIT_EVENT=14,
-  FILTER_ERROR_IS_AUDIO=15,
-  FILTER_ERROR_IS_SCRAP_FILE=16,
-
+  FILTER_ERROR_MISSING_LAYER,
+  FILTER_ERROR_BLANK_FRAME,
+  FILTER_ERROR_MISSING_FRAME,
+  FILTER_ERROR_INVALID_PALETTE_CONVERSION,
+  FILTER_ERROR_UNABLE_TO_RESIZE,
+  FILTER_ERROR_INVALID_PALETTE_SETTINGS,
+  FILTER_ERROR_COULD_NOT_REINIT,
+  FILTER_ERROR_MUST_RELOAD,
+  FILTER_ERROR_NO_IN_CHANNELS,
+  FILTER_ERROR_INVALID_TRACK,
+  FILTER_ERROR_INTERPOLATION_FAILED,
+  FILTER_ERROR_INVALID_INSTANCE,
+  FILTER_ERROR_INVALID_FILTER,
+  FILTER_ERROR_INVALID_INIT_EVENT,
+  FILTER_ERROR_IS_AUDIO,
+  FILTER_ERROR_IS_SCRAP_FILE,
+  FILTER_ERROR_MISSING_CHANNEL,
+  FILTER_ERROR_TEMPLATE_MISMATCH,
+  FILTER_ERROR_MEMORY_ERROR,
+  FILTER_ERROR_DONT_THREAD,
+
+  /// values >= 512 are info
   FILTER_INFO_REINITED=512
 } lives_filter_error_t;
 
 
+/// bootstrap function for weed plugins
+weed_plant_t *weed_bootstrap_func (weed_default_getter_f *value, int num_versions, int *plugin_versions);
 
 weed_plant_t *get_weed_filter(int filter_idx);
-gchar *weed_filter_get_name(int filter_idx);
-gchar *make_weed_hashname(int filter_idx, gboolean fullname) WARN_UNUSED;  ///< fullname includes author and version
-int weed_get_idx_for_hashname (const gchar *hashname, gboolean fullname); ///< fullname includes author and version
-gint enabled_in_channels (weed_plant_t *plant, gboolean count_repeats);
-gint enabled_out_channels (weed_plant_t *plant, gboolean count_repeats);
-weed_plant_t *get_enabled_channel (weed_plant_t *inst, gint which, gboolean is_in); ///< for FILTER_INST
-weed_plant_t *get_mandatory_channel (weed_plant_t *filter, gint which, gboolean is_in); ///< for FILTER_CLASS
-gboolean weed_filter_is_resizer(weed_plant_t *filt);
-gboolean weed_instance_is_resizer(weed_plant_t *filt);
-
-gboolean is_audio_channel_in(weed_plant_t *inst, int chnum);
-gboolean has_video_chans_in(weed_plant_t *filter, gboolean count_opt);
-gboolean has_audio_chans_in(weed_plant_t *filter, gboolean count_opt);
-gboolean is_audio_channel_out(weed_plant_t *inst, int chnum);
-gboolean has_video_chans_out(weed_plant_t *filter, gboolean count_opt);
-gboolean has_audio_chans_out(weed_plant_t *filter, gboolean count_opt);
-gboolean is_pure_audio(weed_plant_t *filter_or_instance, gboolean count_opt); ///< TRUE if audio in or out and no vid in/out
-
+gchar *weed_filter_get_name(int filter_idx) WARN_UNUSED;
+gchar *make_weed_hashname(int filter_idx, boolean fullname, boolean use_extra_authors) WARN_UNUSED;  ///< fullname includes author and version
+int weed_get_idx_for_hashname (const gchar *hashname, boolean fullname); ///< fullname includes author and version
+int enabled_in_channels (weed_plant_t *plant, boolean count_repeats);
+int enabled_out_channels (weed_plant_t *plant, boolean count_repeats);
+weed_plant_t *get_enabled_channel (weed_plant_t *inst, int which, boolean is_in); ///< for FILTER_INST
+weed_plant_t *get_mandatory_channel (weed_plant_t *filter, int which, boolean is_in); ///< for FILTER_CLASS
+boolean weed_filter_is_resizer(weed_plant_t *filt);
+boolean weed_instance_is_resizer(weed_plant_t *filt);
+weed_plant_t *weed_instance_get_filter(weed_plant_t *inst, boolean get_compound_parent);
+
+#define PLUGIN_COMPOUND_EFFECTS_BUILTIN "effects/compound/"
+#define PLUGIN_COMPOUND_EFFECTS_CUSTOM "plugins/effects/compound/"
+
+int num_compound_fx(weed_plant_t *plant); ///< return number of filters in a compound fx (1 if it is not compound) - works for filter or inst
+void load_compound_fx(void);
+
+boolean has_non_alpha_palette(weed_plant_t *ctmpl);
+boolean has_alpha_palette(weed_plant_t *ctmpl);
+
+boolean is_audio_channel_in(weed_plant_t *inst, int chnum);
+boolean has_video_chans_in(weed_plant_t *filter, boolean count_opt);
+boolean has_audio_chans_in(weed_plant_t *filter, boolean count_opt);
+boolean is_audio_channel_out(weed_plant_t *inst, int chnum);
+boolean has_video_chans_out(weed_plant_t *filter, boolean count_opt);
+boolean has_audio_chans_out(weed_plant_t *filter, boolean count_opt);
+boolean is_pure_audio(weed_plant_t *filter_or_instance, boolean count_opt); ///< TRUE if audio in or out and no vid in/out
+
+boolean has_audio_filters(boolean analysers_only);
+boolean has_video_filters(boolean analysers_only);
+
+#ifdef HAS_LIVES_EFFECTS_H
 lives_fx_cat_t weed_filter_categorise (weed_plant_t *pl, int in_channels, int out_channels);
-lives_fx_cat_t weed_filter_subcategorise (weed_plant_t *pl, lives_fx_cat_t category, gboolean count_opt);
-gboolean has_usable_palette(weed_plant_t *chantmpl);
+lives_fx_cat_t weed_filter_subcategorise (weed_plant_t *pl, lives_fx_cat_t category, boolean count_opt);
+#endif
+
+gchar* weed_seed_type_to_text(int seed_type);
 
-void weed_call_init_func(weed_plant_t *instance);
-void weed_call_deinit_func(weed_plant_t *instance);
+boolean has_usable_palette(weed_plant_t *chantmpl);
+int check_weed_palette_list (int *palette_list, int num_palettes, int palette);
+
+int weed_call_init_func(weed_plant_t *instance);
+int weed_call_deinit_func(weed_plant_t *instance);
 
 gchar *cd_to_plugin_dir(weed_plant_t *filter);
-gboolean weed_init_effect(int hotkey); ///< hotkey starts at 1
+boolean weed_init_effect(int hotkey); ///< hotkey starts at 1
 void weed_deinit_effect(int hotkey); ///< hotkey starts at 1
 weed_plant_t *weed_instance_from_filter(weed_plant_t *filter);
 void weed_instance_ref(weed_plant_t *inst);
 void weed_instance_unref(weed_plant_t *inst);
 void weed_in_parameters_free (weed_plant_t *inst);
-lives_filter_error_t weed_reinit_effect (weed_plant_t *inst, gboolean deinit_first);
+void weed_in_params_free(weed_plant_t **parameters, int num_parameters);
+void add_param_connections(weed_plant_t *inst);
+lives_filter_error_t weed_reinit_effect (weed_plant_t *inst, boolean reinit_compound);
 void weed_reinit_all(void);
 
 
-int weed_flagset_array_count(weed_plant_t **array, gboolean set_readonly);
+int weed_flagset_array_count(weed_plant_t **array, boolean set_readonly);
 
-int num_in_params(weed_plant_t *, gboolean count_reinits, gboolean count_variable);
-weed_plant_t *weed_inst_in_param (weed_plant_t *inst, int param_num, gboolean skip_hidden);
-gboolean is_hidden_param(weed_plant_t *plant, int i);
-int get_nth_simple_param(weed_plant_t *plant, int pnum);
-int count_simple_params(weed_plant_t *plant);
-weed_plant_t **weed_params_create (weed_plant_t *filter, gboolean in);
-int get_transition_param(weed_plant_t *filter);
-int get_master_vol_param(weed_plant_t *filter);
-gboolean is_perchannel_multiw(weed_plant_t *param);
-gboolean has_perchannel_multiw(weed_plant_t *filter);
-gboolean weed_parameter_has_variable_elements_strict(weed_plant_t *inst, weed_plant_t *ptmpl);
+int num_alpha_channels(weed_plant_t *filter, boolean out);
 
+int num_in_params(weed_plant_t *, boolean skip_hidden, boolean skip_internal);
+int num_out_params(weed_plant_t *);
+weed_plant_t *weed_inst_in_param (weed_plant_t *inst, int param_num, boolean skip_hidden, boolean skip_internal);
+weed_plant_t *weed_inst_out_param (weed_plant_t *inst, int param_num);
+weed_plant_t *weed_filter_in_paramtmpl (weed_plant_t *filter, int param_num, boolean skip_internal);
+boolean is_hidden_param(weed_plant_t *, int i);
+int get_nth_simple_param(weed_plant_t *, int pnum);
+int count_simple_params(weed_plant_t *);
+weed_plant_t **weed_params_create (weed_plant_t *filter, boolean in);
+int get_transition_param(weed_plant_t *filter, boolean skip_internal);
+int get_master_vol_param(weed_plant_t *filter, boolean skip_internal);
+boolean is_perchannel_multiw(weed_plant_t *param);
+boolean has_perchannel_multiw(weed_plant_t *filter);
+boolean weed_parameter_has_variable_elements_strict(weed_plant_t *inst, weed_plant_t *ptmpl);
 
-/// parameter interpolation
-gboolean interpolate_param(weed_plant_t *inst, int i, void *pchain, weed_timecode_t tc);
-gboolean interpolate_params(weed_plant_t *inst, void **pchains, weed_timecode_t tc);
 
-void update_visual_params(lives_rfx_t *rfx, gboolean update_hidden);
+/// parameter interpolation
+boolean interpolate_param(weed_plant_t *inst, int i, void *pchain, weed_timecode_t tc);
+boolean interpolate_params(weed_plant_t *inst, void **pchains, weed_timecode_t tc);
 
-gboolean weed_plant_serialise(int fd, weed_plant_t *plant, unsigned char **mem);
+boolean weed_plant_serialise(int fd, weed_plant_t *plant, unsigned char **mem);
 weed_plant_t *weed_plant_deserialise(int fd, unsigned char **mem);
 
 
 /// record a parameter value change in our event_list
 void rec_param_change(weed_plant_t *inst, int pnum);
 
+// copy values for "copy_value_to" params
+int set_copy_to(weed_plant_t *inst, int pnum, boolean update);
+
 weed_plant_t *get_textparm();
 
 void weed_set_blend_factor(int hotkey);
-gint weed_get_blend_factor(int hotkey);
+int weed_get_blend_factor(int hotkey);
 
 void weed_memory_init(void); ///< call weed_init() with mem functions
 
@@ -109,17 +143,22 @@
 void weed_unload_all(void); ///< unload all effects
 int get_next_free_key(void); ///< next free "key" for the multitrack system
 
-void weed_deinit_all(gboolean shutdown); ///< deinit all active effects
+void weed_deinit_all(boolean shutdown); ///< deinit all active effects
 
 weed_plant_t *weed_apply_effects (weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, int opwidth, int opheight, void ***pchains);
-lives_filter_error_t weed_apply_instance (weed_plant_t *inst, weed_plant_t *init_event, weed_plant_t **layers, int opwidth, int opheight, weed_timecode_t tc);
-void weed_apply_audio_effects (weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, long nsamps, gdouble arate, weed_timecode_t tc, double *vis);
-lives_filter_error_t weed_apply_audio_instance (weed_plant_t *init_event, float **abuf, int nbtracks, int nchans, long nsamps, gdouble arate, weed_timecode_t tc, double *vis);
+lives_filter_error_t weed_apply_instance (weed_plant_t *inst, weed_plant_t *init_event, weed_plant_t **layers, 
+					  int opwidth, int opheight, weed_timecode_t tc);
+void weed_apply_audio_effects (weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, int64_t nsamps, gdouble arate, 
+			       weed_timecode_t tc, double *vis);
+void weed_apply_audio_effects_rt(float **abuf, int nchans, int64_t nsamps, gdouble arate, weed_timecode_t tc, boolean analysers_only);
+
+lives_filter_error_t weed_apply_audio_instance (weed_plant_t *init_event, float **abuf, int nbtracks, int nchans, int64_t nsamps, 
+						gdouble arate, weed_timecode_t tc, double *vis);
 
-gboolean weed_generator_start (weed_plant_t *inst);
+boolean weed_generator_start (weed_plant_t *inst);
 weed_plant_t *weed_layer_new_from_generator (weed_plant_t *inst, weed_timecode_t tc);
 void weed_generator_end (weed_plant_t *inst);
-gboolean weed_playback_gen_start (void);
+boolean weed_playback_gen_start (void);
 void weed_bg_generator_end (weed_plant_t *inst);
 
 
@@ -131,28 +170,35 @@
 //////////////////////////////////////////////////////////
 // WARNING !! "key" here starts at 1, "mode" starts at 0
 
-gboolean rte_key_valid (gint key, gboolean is_userkey); ///< returns TRUE if there is a filter bound to active mode of hotkey
-gboolean rte_keymode_valid (gint key, gint mode, gboolean is_userkey); ///< returns TRUE if a filter_class is bound to key/mode
-gint rte_keymode_get_filter_idx(gint key, gint mode); ///< returns filter_class index of key/mode (or -1 if no filter bound)
-gchar *rte_keymode_get_filter_name (gint key, gint mode); ///< returns name of filter_class bound to key/mode (or "")
-gchar *rte_keymode_get_plugin_name(gint key, gint mode); ///< returns name of plugin package containing filter_class (or "")
-gchar *rte_keymode_get_type (gint key, gint mode, gboolean get_subtype); ///< returns a string filter/instance type (or "")
-lives_fx_cat_t rte_keymode_get_category (gint key, gint mode);
-weed_plant_t *rte_keymode_get_instance(gint key, gint mode); ///< returns filter_instance bound to key/mode (or NULL)
-weed_plant_t *rte_keymode_get_filter(gint key, gint mode); ///< returns filter_class bound to key/mode (or NULL)
+boolean rte_key_valid (int key, boolean is_userkey); ///< returns TRUE if there is a filter bound to active mode of hotkey
+boolean rte_keymode_valid (int key, int mode, boolean is_userkey); ///< returns TRUE if a filter_class is bound to key/mode
+int rte_keymode_get_filter_idx(int key, int mode); ///< returns filter_class index of key/mode (or -1 if no filter bound)
+gchar *rte_keymode_get_filter_name (int key, int mode) WARN_UNUSED; ///< returns name of filter_class bound to key/mode (or "")
+gchar *rte_keymode_get_plugin_name(int key, int mode) WARN_UNUSED; ///< returns name of plugin package containing filter_class (or "")
+gchar *rte_keymode_get_type (int key, int mode) WARN_UNUSED; ///< returns a string filter/instance type (or "")
+
+#ifdef HAS_LIVES_EFFECTS_H
+lives_fx_cat_t rte_keymode_get_category (int key, int mode);
+#endif
+
+weed_plant_t *rte_keymode_get_instance(int key, int mode); ///< returns filter_instance bound to key/mode (or NULL)
+weed_plant_t *rte_keymode_get_filter(int key, int mode); ///< returns filter_class bound to key/mode (or NULL)
+
+boolean weed_delete_effectkey (int key, int mode); ///< unbinds a filter_class from a key/mode
+int weed_add_effectkey (int key, const gchar *hashname, boolean fullname); ///< bind a filter_class to key/mode using its hashname
+
+int weed_add_effectkey_by_idx (int key, int idx); ///< see description
 
-gboolean weed_delete_effectkey (gint key, gint mode); ///< unbinds a filter_class from a key/mode
-int weed_add_effectkey (gint key, const gchar *hashname, gboolean fullname); ///< bind a filter_class to key/mode using its hashname
+int rte_key_getmode (int key); ///< returns current active mode for a key (or -1)
+int rte_key_getmaxmode(int key); ///< returns highest mode which is set
 
-int weed_add_effectkey_by_idx (gint key, int idx); ///< see description
+weed_plant_t *get_new_inst_for_keymode(int key, int mode); ///< get new inst (during recording playback)
 
-int rte_key_getmode (gint key); ///< returns current active mode for a key (or -1)
-int rte_key_getmaxmode(gint key); ///< returns highest mode which is set
 
-gboolean rte_key_setmode (gint key, gint newmode); ///< set mode for a given key; if key==0 then the active key is used
+boolean rte_key_setmode (int key, int newmode); ///< set mode for a given key; if key==0 then the active key is used
 
 ///< returns -1 if the filter is not found; it will match the first name found - returns -2 if you try to switch a generator/non-generator
-gint rte_switch_keymode (gint key, gint mode, const gchar *hashname);
+int rte_switch_keymode (int key, int mode, const gchar *hashname);
 
 
 
@@ -161,17 +207,17 @@
 
 int rte_getmodespk (void);
 GList *weed_get_all_names (gshort list_type);
-gint rte_get_numfilters(void);
+int rte_get_numfilters(boolean inc_dupes);
 
 /////////////////////////////////////////////////////////
 // key starts at 0
 
-void free_key_defaults(gint key, gint mode);
-void apply_key_defaults(weed_plant_t *inst, gint key, gint mode);
-void write_key_defaults(int fd, gint key, gint mode);
-gboolean read_key_defaults(int fd, int nparams, int key, int mode, int version);
-void set_key_defaults(weed_plant_t *inst, gint key, gint mode);
-gboolean has_key_defaults(void);
+void free_key_defaults(int key, int mode);
+void apply_key_defaults(weed_plant_t *inst, int key, int mode);
+void write_key_defaults(int fd, int key, int mode);
+boolean read_key_defaults(int fd, int nparams, int key, int mode, int version);
+void set_key_defaults(weed_plant_t *inst, int key, int mode);
+boolean has_key_defaults(void);
 
 
 //////////////////////////////////////////////////////
@@ -179,28 +225,28 @@
 void rte_swap_fg_bg (void);
 
 
-gint rte_bg_gen_key (void);
-gint rte_fg_gen_key (void);
+int rte_bg_gen_key (void);
+int rte_fg_gen_key (void);
 
-gint rte_bg_gen_mode (void);
-gint rte_fg_gen_mode (void);
+int rte_bg_gen_mode (void);
+int rte_fg_gen_mode (void);
 
 
 
 ////////////////////////////////////////////////////////////////////////
 
-char *get_weed_display_string (weed_plant_t *inst, int pnum);
+gchar *get_weed_display_string (weed_plant_t *inst, int pnum);
 weed_plant_t *add_filter_deinit_events (weed_plant_t *event_list);
 weed_plant_t *add_filter_init_events (weed_plant_t *event_list, weed_timecode_t tc);
 void deinit_render_effects (void);
 
-gboolean write_filter_defaults (int fd, int idx);
-gboolean read_filter_defaults(int fd);
+boolean write_filter_defaults (int fd, int idx);
+boolean read_filter_defaults(int fd);
 
-gboolean write_generator_sizes (int fd, int idx);
-gboolean read_generator_sizes(int fd);
+boolean write_generator_sizes (int fd, int idx);
+boolean read_generator_sizes(int fd);
 
-gint step_val(gint val, gint step);
+int step_val(int val, int step);
 
 void set_param_gui_readwrite (weed_plant_t *inst);
 void set_param_gui_readonly (weed_plant_t *inst);
@@ -210,7 +256,7 @@
 void update_host_info (weed_plant_t *inst);
 
 /// add default filler values to a parameter or pchange.
-void fill_param_vals_to (weed_plant_t *paramtmpl, weed_plant_t *param, int pnum, int hint, int index);
+void fill_param_vals_to (weed_plant_t *param, weed_plant_t *ptmpl, int fill_slot);
 
 
 // some general utilities

LiVES-1.6.1.tar.bz2/src/effects.c -> LiVES-2.0.3.tar.bz2/src/effects.c Changed

@@ -26,6 +26,7 @@
 #include "paramwindow.h"
 #include "support.h"
 #include "cvirtual.h"
+#include "resample.h"
 
 //////////// Effects ////////////////
 
@@ -41,23 +42,40 @@
 
 static weed_plant_t *resize_instance=NULL;
 
+static boolean apply_audio_fx;
+
 ///////////////////////////////////////////////////
 
 // generic
 
 
-gchar *lives_fx_cat_to_text(lives_fx_cat_t cat, gboolean plural) {
+gchar *lives_fx_cat_to_text(lives_fx_cat_t cat, boolean plural) {
 
   // return value should be free'd after use
   switch (cat) {
 
     // main categories
-  case LIVES_FX_CAT_GENERATOR:
+  case LIVES_FX_CAT_VIDEO_GENERATOR:
     if (!plural) return (g_strdup(_("generator")));
     else return (g_strdup(_("Generators")));
+  case LIVES_FX_CAT_AUDIO_GENERATOR:
+    if (!plural) return (g_strdup(_("audio generator")));
+    else return (g_strdup(_("Audio Generators")));
+  case LIVES_FX_CAT_AV_GENERATOR:
+    if (!plural) return (g_strdup(_("audio/video generator")));
+    else return (g_strdup(_("Audio/Video Generators")));
   case LIVES_FX_CAT_DATA_GENERATOR:
     if (!plural) return (g_strdup(_("data generator")));
     else return (g_strdup(_("Data Generators")));
+  case LIVES_FX_CAT_DATA_VISUALISER:
+    if (!plural) return (g_strdup(_("data visualiser")));
+    else return (g_strdup(_("Data Visualisers")));
+  case LIVES_FX_CAT_DATA_PROCESSOR:
+    if (!plural) return (g_strdup(_("data processor")));
+    else return (g_strdup(_("Data Processors")));
+  case LIVES_FX_CAT_DATA_SOURCE:
+    if (!plural) return (g_strdup(_("data source")));
+    else return (g_strdup(_("Data Sources")));
   case LIVES_FX_CAT_TRANSITION:
     if (!plural) return (g_strdup(_("transition")));
     else return (g_strdup(_("Transitions")));
@@ -100,6 +118,9 @@
   case LIVES_FX_CAT_AUDIO_EFFECT:
     if (!plural) return (g_strdup(_("audio")));
     else return (g_strdup(_("Audio Effects")));
+  case LIVES_FX_CAT_VIDEO_EFFECT:
+    if (!plural) return (g_strdup(_("video")));
+    else return (g_strdup(_("Video Effects")));
   case LIVES_FX_CAT_AUDIO_VOL:
     if (!plural) return (g_strdup(_("audio volume controller")));
     else return (g_strdup(_("Audio Volume Controllers")));
@@ -121,31 +142,31 @@
 // Rendered effects
 
 
-gboolean do_effect(lives_rfx_t *rfx, gboolean is_preview) {
+boolean do_effect(lives_rfx_t *rfx, boolean is_preview) {
   // returns FALSE if the user cancelled
   // leave_info_file is set if a preview turned into actual processing: ie. no params were changed after the preview
   // preview generates .pre files instead of .mgk, so needs special post-processing
 
-  gint oundo_start=cfile->undo_start;
-  gint oundo_end=cfile->undo_end;
+  int oundo_start=cfile->undo_start;
+  int oundo_end=cfile->undo_end;
   gchar effectstring[128];
-  gdouble old_pb_fps=cfile->pb_fps;
+  double old_pb_fps=cfile->pb_fps;
 
   gchar *text;
   gchar *fxcommand=NULL,*cmd;
-  gint current_file=mainw->current_file;
+  int current_file=mainw->current_file;
 
-  gint new_file=current_file;
-  gint ldfile;
+  int new_file=current_file;
+  int ldfile;
 
-  gboolean got_no_frames=FALSE;
+  boolean got_no_frames=FALSE;
   gchar *tmp;
 
   if (rfx->num_in_channels==0&&!is_preview) current_file=mainw->pre_src_file;
 
   if (is_preview) {
     // generators start at 1, even though they have no initial frames
-    cfile->progress_start=cfile->undo_start=cfile->start+(rfx->num_in_channels==0?1:0);
+    cfile->progress_start=cfile->undo_start=rfx->num_in_channels==0?1:cfile->start;
     cfile->progress_end=cfile->undo_end=cfile->end;
   }
   else if (rfx->num_in_channels!=2) {
@@ -165,12 +186,12 @@
       // transition has a few extra bits
       pdefault=g_strdup_printf ("%s %d %d %d %d %d %s %s %d \"%s/%s\"",cfile->handle,rfx->status,
 				cfile->progress_start,cfile->progress_end,cfile->hsize,cfile->vsize,
-				cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",clipboard->img_type==IMG_TYPE_JPEG?
-				"jpg":"png",clipboard->start,prefs->tmpdir,clipboard->handle);
+				get_image_ext_for_type(cfile->img_type),get_image_ext_for_type(clipboard->img_type),
+				clipboard->start,prefs->tmpdir,clipboard->handle);
     }
     else {
       pdefault=g_strdup_printf ("%s %d %d %d %d %d %s",cfile->handle,rfx->status,cfile->progress_start,
-				cfile->progress_end,cfile->hsize,cfile->vsize,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+				cfile->progress_end,cfile->hsize,cfile->vsize,get_image_ext_for_type(cfile->img_type));
     }
     // and append params
     if (is_preview) {
@@ -178,7 +199,8 @@
       mainw->show_procd=FALSE;
     }
     else cmd=g_strdup("fxrender");
-    fxcommand=g_strconcat ("smogrify ",cmd,"_",plugin_name," ", pdefault, (tmp=param_marshall (rfx, FALSE)), NULL);
+    fxcommand=g_strconcat (prefs->backend," \"",cmd,"_",plugin_name,"\" ", pdefault, 
+			   (tmp=param_marshall (rfx, FALSE)), NULL);
 
     g_free(plugin_name);
     g_free(cmd);
@@ -193,7 +215,6 @@
       g_free(cfile->frame_index_back);
       cfile->frame_index_back=NULL;
     }
-
     lives_system(fxcommand,FALSE);
     g_free (fxcommand);
   }
@@ -290,9 +311,20 @@
   }
   else cfile->fx_frame_pump=0;
 
+  if (rfx->props&RFX_PROPS_MAY_RESIZE||rfx->num_in_channels==0) {
+    if (rfx->status==RFX_STATUS_WEED) { 
+      // set out_channel dimensions for resizers / generators
+      int error;
+      weed_plant_t *first_out=get_enabled_channel((weed_plant_t *)rfx->source,0,FALSE);
+      weed_plant_t *first_ot=weed_get_plantptr_value(first_out,"template",&error);
+      weed_set_int_value(first_out,"width",weed_get_int_value(first_ot,"host_width",&error));
+      weed_set_int_value(first_out,"height",weed_get_int_value(first_ot,"host_height",&error));
+    }
+  }
+
+
   if (!do_progress_dialog(TRUE,TRUE,effectstring)||mainw->error) {
     mainw->last_dprint_file=ldfile;
-    do_rfx_cleanup(rfx);
     mainw->show_procd=TRUE;
     mainw->keep_pre=FALSE;
     if (mainw->error) {
@@ -300,20 +332,30 @@
       d_print_failed();
       mainw->last_dprint_file=ldfile;
     }
-    cfile->undo_start=oundo_start;
-    cfile->undo_end=oundo_end;
+    if (mainw->cancelled!=CANCEL_KEEP) {
+      cfile->undo_start=oundo_start;
+      cfile->undo_end=oundo_end;
+    }
     cfile->pb_fps=old_pb_fps;
     mainw->internal_messaging=FALSE;
     mainw->resizing=FALSE;
     cfile->nokeep=FALSE;
     cfile->fx_frame_pump=0;
 
+    if (cfile->start==0) {
+      cfile->start=1;
+      cfile->end=cfile->frames;
+    }
+
     if (rfx->num_in_channels==0&&mainw->current_file!=current_file) {
       mainw->suppress_dprint=TRUE;
       close_current_file(current_file);
       mainw->suppress_dprint=FALSE;
     }
-    else mainw->current_file=current_file;
+    else {
+      mainw->current_file=current_file;
+      do_rfx_cleanup(rfx);
+    }
 
     mainw->is_generating=FALSE;
     mainw->no_switch_dprint=FALSE;
@@ -325,6 +367,11 @@
     return FALSE;
   }
 
+  if (cfile->start==0) {
+    cfile->start=1;
+    cfile->end=cfile->frames;
+  }
+
   do_rfx_cleanup(rfx);
 
   mainw->resizing=FALSE;
@@ -337,7 +384,7 @@
     cfile->pb_fps=old_pb_fps;
     mainw->internal_messaging=FALSE;
     if (rfx->num_in_channels>0) gtk_widget_set_sensitive (mainw->select_last, TRUE);
-    if (rfx->num_in_channels>0) set_undoable (_ (rfx->menu_text),TRUE);
+    if (rfx->num_in_channels>0) set_undoable (rfx->menu_text,TRUE);
   }
 
   mainw->show_procd=TRUE;
@@ -345,7 +392,7 @@
   if (rfx->props&RFX_PROPS_MAY_RESIZE||rfx->num_in_channels==0) {
     // get new frame size
     if (rfx->status!=RFX_STATUS_WEED) { 
-      gint numtok=get_token_count (mainw->msg,'|');
+      int numtok=get_token_count (mainw->msg,'|');
       
       if (numtok>1) {
 	gchar **array=g_strsplit(mainw->msg,"|",numtok);
@@ -376,7 +423,7 @@
     if (rfx->num_in_channels>0) {
       if (cfile->hsize==cfile->ohsize&&cfile->vsize==cfile->ovsize) cfile->undo_action=UNDO_EFFECT;
       else {
-	gboolean bad_header=FALSE;
+	boolean bad_header=FALSE;
 	save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
 	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
 	save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
@@ -392,8 +439,8 @@
 
   if (mainw->keep_pre) {
     // this comes from a preview which then turned into processing
-    gchar *com=g_strdup_printf("smogrify mv_pre \"%s\" %d %d \"%s\"",cfile->handle,cfile->progress_start,
-			       cfile->progress_end,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+    gchar *com=g_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\"",prefs->backend_sync, cfile->handle,cfile->progress_start,
+			       cfile->progress_end,get_image_ext_for_type(cfile->img_type));
 
     unlink(cfile->info_file);
     mainw->cancelled=CANCEL_NONE;
@@ -405,7 +452,7 @@
 
     if (mainw->error) {
       if (!mainw->cancelled) {
-	do_error_dialog(_("\nNo frames were generated.\n"));
+	do_info_dialog(_("\nNo frames were generated.\n"));
 	d_print_failed();
       }
       else if (mainw->cancelled!=CANCEL_ERROR) d_print_cancelled();
@@ -436,7 +483,7 @@
     if (rfx->props&RFX_PROPS_BATCHG) {
       // batch mode generators need some extra processing
       gchar *imgdir=g_strdup_printf("%s%s",prefs->tmpdir,cfile->handle);
-      gint img_file=mainw->current_file;
+      int img_file=mainw->current_file;
       
       mainw->suppress_dprint=TRUE;
       open_file_sel(imgdir,0,0);
@@ -472,7 +519,7 @@
     if (got_no_frames||cfile->frames==0) {
       mainw->is_generating=FALSE;
       if (!mainw->cancelled) {
-	do_error_dialog(_("\nNo frames were generated.\n"));
+	do_info_dialog(_("\nNo frames were generated.\n"));
 	d_print_failed();
       }
       else d_print_cancelled();
@@ -536,7 +583,10 @@
 
   if (!mainw->gen_to_clipboard) cfile->changed=TRUE;
   if (mainw->multitrack==NULL) {
-    if (new_file!=-1) switch_to_file ((mainw->current_file=0),new_file);
+    if (new_file!=-1) {
+      lives_sync();
+      switch_to_file ((mainw->current_file=0),new_file);
+    }
   }
   else {
     mainw->current_file=mainw->multitrack->render_file;
@@ -558,7 +608,7 @@
 
   
 
-lives_render_error_t realfx_progress (gboolean reset) {
+lives_render_error_t realfx_progress (boolean reset) {
   static int i;
   GError *error=NULL;
   gchar oname[PATH_MAX];
@@ -597,70 +647,98 @@
       mainw->internal_messaging=FALSE;
       g_snprintf(mainw->msg,9,"completed");
     }
+    mainw->rowstride_alignment_hint=1;
     return LIVES_RENDER_COMPLETE;
   }
 
-  layer=weed_plant_new(WEED_PLANT_CHANNEL);
-  weed_set_int_value(layer,"clip",mainw->current_file);
-  weed_set_int_value(layer,"frame",i);
+  if (has_video_filters(FALSE)||resize_instance!=NULL) {
+    mainw->rowstride_alignment=mainw->rowstride_alignment_hint;
 
-  frameticks=(i-cfile->start+1.)/cfile->fps*U_SECL;
+    layer=weed_plant_new(WEED_PLANT_CHANNEL);
+    weed_set_int_value(layer,"clip",mainw->current_file);
+    weed_set_int_value(layer,"frame",i);
 
-  if (!pull_frame(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",frameticks)) {
-    // do_read_failed_error_s() cannot be used here as we dont know the filename
-    g_snprintf (mainw->msg,256,"error|missing image %d",i);
-    return LIVES_RENDER_WARNING_READ_FRAME;
-  }
+    frameticks=(i-cfile->start+1.)/cfile->fps*U_SECL;
 
-  layer=on_rte_apply (layer, 0, 0, (weed_timecode_t)frameticks);
-  layer_palette=weed_get_int_value(layer,"current_palette",&weed_error);
+    if (!pull_frame(layer,get_image_ext_for_type(cfile->img_type),frameticks)) {
+      // do_read_failed_error_s() cannot be used here as we dont know the filename
+      g_snprintf (mainw->msg,256,"error|missing image %d",i);
+      return LIVES_RENDER_WARNING_READ_FRAME;
+    }
 
-  if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32) 
-    convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
-  else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) 
-    convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
+    layer=on_rte_apply (layer, 0, 0, (weed_timecode_t)frameticks);
 
-  if (resize_instance==NULL) resize_layer(layer,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST);
-  pixbuf=layer_to_pixbuf(layer);
-  weed_plant_free(layer);
+    if (!has_video_filters(TRUE)||resize_instance!=NULL) {
+      layer_palette=weed_get_int_value(layer,"current_palette",&weed_error);
 
-  g_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,i);
+      if (resize_instance==NULL) resize_layer(layer,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST,layer_palette,0);
 
-  do {
-    retval=0;
-    lives_pixbuf_save (pixbuf, oname, cfile->img_type, 100, TRUE, &error);
+      if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32) {
+	convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+	layer_palette=WEED_PALETTE_RGB24;
+      }
+      else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) {
+	convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
+	layer_palette=WEED_PALETTE_RGBA32;
+      }
+      
+      pixbuf=layer_to_pixbuf(layer);
+      weed_plant_free(layer);
+      
+      g_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,i);
+      
+      do {
+	retval=0;
+	lives_pixbuf_save (pixbuf, oname, cfile->img_type, 100, TRUE, &error);
+
+	if (error!=NULL) {
+	  retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
+	  g_error_free(error);
+	  error=NULL;
+	  if (retval!=LIVES_RETRY) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
+	}
+      } while (retval==LIVES_RETRY);
+    
+      
+      lives_object_unref (pixbuf);
 
-    if (error!=NULL) {
-      retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
-      g_error_free(error);
-      error=NULL;
-      if (retval!=LIVES_RETRY) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
+      if (cfile->clip_type==CLIP_TYPE_FILE) {
+	cfile->frame_index[i-1]=-1;
+      }
+    }
+    else weed_plant_free(layer);
+  }
+  if (apply_audio_fx) {
+    if (!apply_rte_audio((double)cfile->arate/(double)cfile->fps+(double)rand()/.5/(double)(RAND_MAX))) {
+      return LIVES_RENDER_ERROR_WRITE_AUDIO;
     }
-  } while (retval==LIVES_RETRY);
-  
-  gdk_pixbuf_unref (pixbuf);
-
-  if (cfile->clip_type==CLIP_TYPE_FILE) {
-    cfile->frame_index[i-1]=-1;
   }
-  
-  if (++i>cfile->end) {
-    mainw->error=FALSE;
-    mainw->cancelled=CANCEL_NONE;
-    com=g_strdup_printf ("smogrify mv_mgk \"%s\" %d %d \"%s\"",cfile->handle,cfile->start,
-			 cfile->end,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
-    lives_system (com,FALSE);
-    g_free (com);
-    mainw->internal_messaging=FALSE;
-
-    check_backend_return(cfile);
 
-    if (mainw->error) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
-    //cfile->may_be_damaged=TRUE;
-    else {
-      if (cfile->clip_type==CLIP_TYPE_FILE) {
-	if (!check_if_non_virtual(mainw->current_file,1,cfile->frames)) save_frame_index(mainw->current_file);
+  if (++i>cfile->end) {
+    if (resize_instance!=NULL||(has_video_filters(FALSE)&&!has_video_filters(TRUE))) {
+      mainw->error=FALSE;
+      mainw->cancelled=CANCEL_NONE;
+      com=g_strdup_printf ("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->start,
+			   cfile->end,get_image_ext_for_type(cfile->img_type));
+      lives_system (com,FALSE);
+      g_free (com);
+      mainw->internal_messaging=FALSE;
+      
+      check_backend_return(cfile);
+      
+      if (mainw->error) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
+      //cfile->may_be_damaged=TRUE;
+      else {
+	if (cfile->clip_type==CLIP_TYPE_FILE) {
+	  if (!check_if_non_virtual(mainw->current_file,1,cfile->frames)) save_frame_index(mainw->current_file);
+	}
+	mainw->rowstride_alignment_hint=1;
+	return LIVES_RENDER_COMPLETE;
       }
+    }
+    else {
+      sprintf(mainw->msg,"%s","completed");
+      mainw->rowstride_alignment_hint=1;
       return LIVES_RENDER_COMPLETE;
     }
   }
@@ -671,21 +749,75 @@
 
 
 
-gboolean on_realfx_activate_inner(gint type, lives_rfx_t *rfx) {
+boolean on_realfx_activate_inner(int type, lives_rfx_t *rfx) {
   // type can be 0 - apply current realtime effects
   // 1 - resize (using weed filter)
-  gboolean retval;
+  boolean retval;
+
+  boolean has_new_audio=FALSE;
+
+  apply_audio_fx=FALSE;
+
+  if (type==0&&((cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(FALSE))||mainw->agen_key!=0)) {
+    if (mainw->agen_key!=0&&cfile->achans==0) {
+      // apply audio gen to clip with no audio - prompt for audio settings
+      resaudw=create_resaudw(2,NULL,NULL);
+      lives_widget_context_update();
+      gdk_window_raise(lives_widget_get_xwindow(resaudw->dialog));
+
+      if (gtk_dialog_run(GTK_DIALOG(resaudw->dialog))!=GTK_RESPONSE_OK) return FALSE;
+      if (mainw->error) {
+	mainw->error=FALSE;
+	return FALSE;
+      }
+      has_new_audio=TRUE;
+    }
+    apply_audio_fx=TRUE;
+    if (!apply_rte_audio_init()) return FALSE;
+
+  }
 
   if (type==1) resize_instance=(weed_plant_t *)rfx->source;
   else resize_instance=NULL;
 
   mainw->internal_messaging=TRUE;
   framecount=0;
+
+  mainw->rowstride_alignment_hint=1;
+
   mainw->progress_fn=&realfx_progress;
   mainw->progress_fn (TRUE);
 
+  weed_reinit_all();
+
   retval=do_effect (rfx,FALSE);
 
+  if (apply_audio_fx) {
+    apply_rte_audio_end(!retval);
+
+    if (retval) {
+      if (!has_video_filters(FALSE)||!has_video_filters(TRUE)) cfile->undo_action=UNDO_NEW_AUDIO;
+      
+      cfile->undo_achans=cfile->achans;
+      cfile->undo_arate=cfile->arate;
+      cfile->undo_arps=cfile->arps;
+      cfile->undo_asampsize=cfile->asampsize;
+      cfile->undo_signed_endian=cfile->signed_endian;
+      
+    }
+    else {
+      if (has_new_audio) cfile->achans=cfile->asampsize=cfile->arate=cfile->arps=0;
+      else {
+      	gchar *com=g_strdup_printf("%s undo_audio %s",prefs->backend_sync,cfile->handle);
+	mainw->com_failed=FALSE;
+	unlink (cfile->info_file);
+	lives_system(com,FALSE);
+	g_free(com);
+      }
+    }
+    reget_afilesize(mainw->current_file);
+  }
+
   resize_instance=NULL;
   return retval;
 
@@ -695,12 +827,55 @@
 
 
 void on_realfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  gint type;
+  int type=1;
+
+  boolean has_lmap_error=FALSE;
+
+  // type can be 0 - apply current realtime effects
+  // 1 - resize (using weed filter)
+
+  if (menuitem!=NULL) {
+    type=0;
+
+    if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=
+							       layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+      if (!do_layout_alter_frames_warning()) {
+	g_list_free_strings(mainw->xlays);
+	g_list_free(mainw->xlays);
+	mainw->xlays=NULL;
+	return;
+      }
+      add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
+		     cfile->stored_layout_frame>0);
+      g_list_free_strings(mainw->xlays);
+      g_list_free(mainw->xlays);
+      mainw->xlays=NULL;
+      has_lmap_error=TRUE;
+    }
+
+    
+    if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
+	(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+      if (!do_layout_alter_audio_warning()) {
+	g_list_free_strings(mainw->xlays);
+	g_list_free(mainw->xlays);
+	mainw->xlays=NULL;
+	return;
+      }
+      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
+		     cfile->stored_layout_audio>0.);
+      has_lmap_error=TRUE;
+      g_list_free_strings(mainw->xlays);
+      g_list_free(mainw->xlays);
+      mainw->xlays=NULL;
+    }
+  }
+
+  if (!on_realfx_activate_inner(type,(lives_rfx_t *)user_data)) return;
+
+  if (has_lmap_error) popup_lmap_errors(NULL,NULL);
 
-  if (menuitem!=NULL) type=0;
-  else type=1;
 
-  on_realfx_activate_inner(type,(lives_rfx_t *)user_data);
 }
 
 
@@ -735,13 +910,13 @@
   else layers[1]=NULL;
 
   if (resize_instance!=NULL) {
+    lives_filter_error_t filter_error;
     weed_plant_t *init_event=weed_plant_new(WEED_PLANT_EVENT);
     weed_set_int_value(init_event,"in_tracks",0);
     weed_set_int_value(init_event,"out_tracks",0);
 
-    weed_apply_instance(resize_instance,init_event,layers,0,0,tc);
+    filter_error=weed_apply_instance(resize_instance,init_event,layers,0,0,tc);
     retlayer=layers[0];
-
     weed_plant_free(init_event);
   }
   else {
@@ -762,10 +937,12 @@
 
 
 void deinterlace_frame(weed_plant_t *layer, weed_timecode_t tc) {
-  int deint_idx;
-  weed_plant_t *deint_filter,*deint_instance,*init_event;
   weed_plant_t **layers;
 
+  weed_plant_t *deint_filter,*deint_instance,*next_inst,*init_event;
+
+  int deint_idx,error;
+
   if (mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].delegate==-1) return;
 
   deint_idx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list,
@@ -780,17 +957,28 @@
   layers[1]=NULL;
 
   layers[0]=layer;
-  
+ 
   init_event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_int_value(init_event,"in_tracks",0);
   weed_set_int_value(init_event,"out_tracks",0);
-  
+ 
+ deint1:
+ 
   weed_apply_instance(deint_instance,init_event,layers,0,0,tc);
   
-  weed_plant_free(init_event);
+  if (weed_plant_has_leaf(deint_instance,"host_next_instance")) next_inst=weed_get_plantptr_value(deint_instance,"host_next_instance",&error);
+  else next_inst=NULL;
+
   weed_call_deinit_func(deint_instance);
   weed_instance_unref(deint_instance);
 
+  if (next_inst!=NULL) {
+    deint_instance=next_inst;
+    goto deint1;
+  }
+
+  weed_plant_free(init_event);
+
   g_free(layers);
 }
 
@@ -820,14 +1008,14 @@
   
   blend_file->last_frameno=blend_file->frameno;
 
-  blend_file->frameno=calc_new_playback_position(mainw->blend_file,blend_tc,&ntc);
+  blend_file->frameno=calc_new_playback_position(mainw->blend_file,blend_tc,(uint64_t *)&ntc);
 
   blend_tc=ntc;
 
   layer=weed_plant_new(WEED_PLANT_CHANNEL);
   weed_set_int_value(layer,"clip",mainw->blend_file);
   weed_set_int_value(layer,"frame",blend_file->frameno);
-  if (!pull_frame(layer,blend_file->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) {
+  if (!pull_frame(layer,get_image_ext_for_type(blend_file->img_type),tc)) {
     weed_plant_free(layer);
     layer=NULL;
   }
@@ -842,12 +1030,13 @@
 
 
 
-gboolean rte_on_off_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data)
-{
+boolean rte_on_off_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
 // this is the callback which happens when a rte is keyed
   gint key=GPOINTER_TO_INT(user_data);
   guint new_rte=GU641<<(key-1);
 
+  mainw->osc_block=TRUE;
+
   if (key==EFFECT_NONE) {
     // switch up/down keys to default (fps change)
     weed_deinit_all(FALSE);
@@ -856,43 +1045,54 @@
     mainw->rte^=new_rte;
     if (mainw->rte&new_rte) {
       // switch is ON
-      // WARNING - if we start playing because a generator was started, we block here
-      mainw->osc_block=TRUE;
       mainw->last_grabable_effect=key-1;
 
       if (rte_window!=NULL) rtew_set_keych(key-1,TRUE);
+
+      // WARNING - if we start playing because a generator was started, we block here
       if (!(weed_init_effect(key-1))) {
 	// ran out of instance slots, no effect assigned, or some other error
 	mainw->rte^=new_rte;
 	if (rte_window!=NULL&&group!=NULL) rtew_set_keych(key-1,FALSE);
+	mainw->osc_block=FALSE;
+	return TRUE;
       }
-      mainw->osc_block=FALSE;
-      return TRUE;
     }
     else {
       // effect is OFF
-      mainw->osc_block=TRUE;
       weed_deinit_effect(key-1);
       if (mainw->rte&(GU641<<(key-1))) mainw->rte^=(GU641<<(key-1));
       if (rte_window!=NULL&&group!=NULL) rtew_set_keych(key-1,FALSE);
-      mainw->osc_block=FALSE;
     }
   }
+
+  mainw->osc_block=FALSE;
+
   if (mainw->current_file>0&&cfile->play_paused&&!mainw->noswitch) {
     load_frame_image (cfile->frameno);
   }
+
+  if (mainw->playing_file==-1&&mainw->current_file>0&&((has_video_filters(FALSE)&&!has_video_filters(TRUE))||
+						       (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(FALSE))||
+						       mainw->agen_key!=0)) {
+
+    gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
+  }
+  else gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+
+
   return TRUE;
 }
 
 
 
-gboolean rte_on_off_callback_hook (GtkToggleButton *button, gpointer user_data) {
+boolean rte_on_off_callback_hook (GtkToggleButton *button, gpointer user_data) {
   rte_on_off_callback (NULL, NULL, 0, (GdkModifierType)0, user_data);
   return TRUE;
 }
 
 
-gboolean grabkeys_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean grabkeys_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   // assign the keys to the last key-grabable effect 
   mainw->rte_keys=mainw->last_grabable_effect;
   mainw->osc_block=TRUE;
@@ -906,7 +1106,7 @@
 
 
 
-gboolean textparm_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean textparm_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   // keyboard linked to first string parameter, until TAB is pressed
   mainw->rte_textparm=get_textparm();
   return TRUE;
@@ -914,15 +1114,15 @@
 
 
 
-gboolean grabkeys_callback_hook (GtkToggleButton *button, gpointer user_data) {
-  if (!gtk_toggle_button_get_active(button)) return TRUE;
+boolean grabkeys_callback_hook (GtkToggleButton *button, gpointer user_data) {
+  if (!lives_toggle_button_get_active(button)) return TRUE;
   mainw->last_grabable_effect=GPOINTER_TO_INT(user_data);
   grabkeys_callback (NULL, NULL, 0, (GdkModifierType)0, user_data);
   return TRUE;
 }
 
 
-gboolean rtemode_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean rtemode_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   if (mainw->rte_keys==-1) return TRUE;
   rte_key_setmode(0,-1);
   mainw->blend_factor=weed_get_blend_factor(mainw->rte_keys);
@@ -930,21 +1130,21 @@
 }
 
 
-gboolean rtemode_callback_hook (GtkToggleButton *button, gpointer user_data) {
+boolean rtemode_callback_hook (GtkToggleButton *button, gpointer user_data) {
   gint key_mode=GPOINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
-  gint key=(gint)(key_mode/modes);
-  gint mode=key_mode-key*modes;
+  int key=(int)(key_mode/modes);
+  int mode=key_mode-key*modes;
 
-  if (!gtk_toggle_button_get_active(button)) return TRUE;
+  if (!lives_toggle_button_get_active(button)) return TRUE;
 
   rte_key_setmode(key+1,mode);
   return TRUE;
 }
 
 
-gboolean swap_fg_bg_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
-  gint old_file=mainw->current_file;
+boolean swap_fg_bg_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+  int old_file=mainw->current_file;
 
   if (mainw->playing_file<1||mainw->num_tr_applied==0||mainw->noswitch||mainw->blend_file==-1||
       mainw->blend_file==mainw->current_file||mainw->files[mainw->blend_file]==NULL||mainw->preview||

LiVES-1.6.1.tar.bz2/src/effects.h -> LiVES-2.0.3.tar.bz2/src/effects.h Changed

@@ -16,13 +16,19 @@
 // general effects
 typedef enum {
   LIVES_FX_CAT_NONE=0,
-  LIVES_FX_CAT_GENERATOR,
+  LIVES_FX_CAT_VIDEO_GENERATOR,
+  LIVES_FX_CAT_AV_GENERATOR,
+  LIVES_FX_CAT_AUDIO_GENERATOR,
   LIVES_FX_CAT_DATA_GENERATOR,
+  LIVES_FX_CAT_DATA_VISUALISER,
+  LIVES_FX_CAT_DATA_PROCESSOR,
+  LIVES_FX_CAT_DATA_SOURCE,
   LIVES_FX_CAT_TRANSITION,
   LIVES_FX_CAT_AV_TRANSITION,
   LIVES_FX_CAT_VIDEO_TRANSITION,
   LIVES_FX_CAT_AUDIO_TRANSITION,
   LIVES_FX_CAT_EFFECT,
+  LIVES_FX_CAT_VIDEO_EFFECT,
   LIVES_FX_CAT_AUDIO_EFFECT,
   LIVES_FX_CAT_UTILITY,
   LIVES_FX_CAT_COMPOSITOR,
@@ -37,12 +43,12 @@
 } lives_fx_cat_t;
 
 
-gchar *lives_fx_cat_to_text(lives_fx_cat_t cat, gboolean plural);
+gchar *lives_fx_cat_to_text(lives_fx_cat_t cat, boolean plural) WARN_UNUSED;
 
 
 #include "effects-weed.h"
 
-gboolean do_effect(lives_rfx_t *rfx, gboolean is_preview); ///< defined as extern in paramwindow.c
+boolean do_effect(lives_rfx_t *rfx, boolean is_preview); ///< defined as extern in paramwindow.c
 
 void on_render_fx_activate (GtkMenuItem *menuitem, lives_rfx_t *rfx);
 
@@ -50,24 +56,24 @@
 
 // render
 void on_realfx_activate (GtkMenuItem *, gpointer rfx);
-gboolean on_realfx_activate_inner(gint type, lives_rfx_t *rfx);
+boolean on_realfx_activate_inner(gint type, lives_rfx_t *rfx);
 
-lives_render_error_t realfx_progress (gboolean reset);
+lives_render_error_t realfx_progress (boolean reset);
 
 // key callbacks
 
-gboolean textparm_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
+boolean textparm_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
 
-gboolean grabkeys_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data); ///< for accel groups
-gboolean grabkeys_callback_hook (GtkToggleButton *button, gpointer user_data); ///< for widgets
+boolean grabkeys_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data); ///< for accel groups
+boolean grabkeys_callback_hook (GtkToggleButton *button, gpointer user_data); ///< for widgets
 
-gboolean rte_on_off_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data); ///< for accel groups
-gboolean rte_on_off_callback_hook (GtkToggleButton *, gpointer user_data); ///< for widgets
+boolean rte_on_off_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data); ///< for accel groups
+boolean rte_on_off_callback_hook (GtkToggleButton *, gpointer user_data); ///< for widgets
 
-gboolean rtemode_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data); ///< for accel groups
-gboolean rtemode_callback_hook (GtkToggleButton *, gpointer user_data); ///< for widgets
+boolean rtemode_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data); ///< for accel groups
+boolean rtemode_callback_hook (GtkToggleButton *, gpointer user_data); ///< for widgets
 
-gboolean swap_fg_bg_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
+boolean swap_fg_bg_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
 
 weed_plant_t *get_blend_layer(weed_timecode_t tc);

LiVES-1.6.1.tar.bz2/src/events.c -> LiVES-2.0.3.tar.bz2/src/events.c Changed

@@ -1,6 +1,6 @@
 // events.c
 // LiVES
-// (c) G. Finch 2005 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2005 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -32,7 +32,7 @@
 //#define DEBUG_EVENTS
 
 
-static gint render_choice;
+static int render_choice;
 
 static void **pchains[FX_KEYS_MAX]; // each pchain is an array of void *, these are parameter changes used for rendering
 ///////////////////////////////////////////////////////
@@ -59,30 +59,34 @@
 
 LIVES_INLINE weed_plant_t *get_prev_event(weed_plant_t *event) {
   int error;
+  if (event==NULL) return NULL;
   if (!weed_plant_has_leaf(event,"previous")) return NULL;
   return (weed_plant_t *)weed_get_voidptr_value(event,"previous",&error);
 }
 
 LIVES_INLINE weed_plant_t *get_next_event(weed_plant_t *event) {
   int error;
+  if (event==NULL) return NULL;
   if (!weed_plant_has_leaf(event,"next")) return NULL;
   return (weed_plant_t *)weed_get_voidptr_value(event,"next",&error);
 }
 
 LIVES_INLINE weed_plant_t *get_first_event(weed_plant_t *event_list) {
   int error;
+  if (event_list==NULL) return NULL;
   if (!weed_plant_has_leaf(event_list,"first")) return NULL;
   return (weed_plant_t *)weed_get_voidptr_value(event_list,"first",&error);
 }
 
 LIVES_INLINE weed_plant_t *get_last_event(weed_plant_t *event_list) {
   int error;
+  if (event_list==NULL) return NULL;
   if (!weed_plant_has_leaf(event_list,"last")) return NULL;
   return (weed_plant_t *)weed_get_voidptr_value(event_list,"last",&error);
 }
 
 
-gboolean has_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut) {
+boolean has_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut) {
   weed_plant_t *event;
   weed_timecode_t ev_tc;
 
@@ -207,26 +211,28 @@
 }
 
 
-gboolean insert_event_before(weed_plant_t *at_event,weed_plant_t *event) {
+boolean insert_event_before(weed_plant_t *at_event,weed_plant_t *event) {
   // insert event before at_event : returns FALSE if event is new start of event list
   weed_plant_t *xevent=get_prev_event(at_event);
   if (xevent!=NULL) weed_set_voidptr_value(xevent,"next",event);
   weed_set_voidptr_value(event,"next",at_event);
   weed_set_voidptr_value(event,"previous",xevent);
   weed_set_voidptr_value(at_event,"previous",event);
-  if (get_event_timecode(event)>get_event_timecode(at_event)) g_printerr("Warning ! Inserted out of order event type %d before %d\n",get_event_hint(event),get_event_hint(at_event));
+  if (get_event_timecode(event)>get_event_timecode(at_event)) 
+    g_printerr("Warning ! Inserted out of order event type %d before %d\n",get_event_hint(event),get_event_hint(at_event));
   return (xevent!=NULL);
 }
 
 
-gboolean insert_event_after(weed_plant_t *at_event,weed_plant_t *event) {
+boolean insert_event_after(weed_plant_t *at_event,weed_plant_t *event) {
   // insert event after at_event : returns FALSE if event is new end of event list
   weed_plant_t *xevent=get_next_event(at_event);
   if (xevent!=NULL) weed_set_voidptr_value(xevent,"previous",event);
   weed_set_voidptr_value(event,"previous",at_event);
   weed_set_voidptr_value(event,"next",xevent);
   weed_set_voidptr_value(at_event,"next",event);
-  if (get_event_timecode(event)<get_event_timecode(at_event)) g_printerr("Warning ! Inserted out of order event type %d after %d\n",get_event_hint(event),get_event_hint(at_event));
+  if (get_event_timecode(event)<get_event_timecode(at_event)) 
+    g_printerr("Warning ! Inserted out of order event type %d after %d\n",get_event_hint(event),get_event_hint(at_event));
   return (xevent!=NULL);
 }
 
@@ -307,7 +313,7 @@
 }
 
 
-void remove_frame_from_event (weed_plant_t *event_list, weed_plant_t *event, gint track) {
+void remove_frame_from_event (weed_plant_t *event_list, weed_plant_t *event, int track) {
   // TODO - memcheck
   int *clips;
   int *frames;
@@ -342,7 +348,7 @@
 
 
 
-gboolean is_blank_frame (weed_plant_t *event, gboolean count_audio) {
+boolean is_blank_frame (weed_plant_t *event, boolean count_audio) {
   int clip,frame,numframes,error;
   if (!WEED_EVENT_IS_FRAME(event)) return FALSE;
   if (count_audio&&weed_plant_has_leaf(event,"audio_clips")) {
@@ -403,7 +409,7 @@
 }
 
 
-gboolean is_init_pchange(weed_plant_t *init_event, weed_plant_t *pchange_event) {
+boolean is_init_pchange(weed_plant_t *init_event, weed_plant_t *pchange_event) {
   // a PARAM_CHANGE is an init_pchange iff both events have the same tc, and there is no frame event between the two events
   weed_plant_t *event=init_event;
   weed_timecode_t tc=get_event_timecode(event);
@@ -424,9 +430,11 @@
   // this is called during quantisation
 
   // copy an event and insert it in event_list
-  // events must be copied in time order, since filter_deinit, filter_map and param_change events MUST refer to prior filter_init events
+  // events must be copied in time order, since filter_deinit, 
+  // filter_map and param_change events MUST refer to prior filter_init events
 
-  // when we copy a filter_init, we add a new field to the copy "event_id". This contains the value of the pointer to original event
+  // when we copy a filter_init, we add a new field to the copy "event_id". 
+  // This contains the value of the pointer to original event
   // we use this to locate the effect_init event in the new event_list
 
   // for effect_deinit, effect_map, param_change, we change the "init_event(s)" property to point to our copy effect_init
@@ -467,12 +475,15 @@
     weed_timecode_t in_tc=get_event_timecode(in_event);
     event_before=get_last_event(event_list);
     while (event_before!=NULL) {
-      if (get_event_timecode(event_before)<in_tc||(get_event_timecode(event_before)==in_tc&&(!WEED_EVENT_IS_FRAME(event_before)||WEED_EVENT_IS_FILTER_DEINIT(in_event)))) break;
+      if (get_event_timecode(event_before)<in_tc||(get_event_timecode(event_before)==in_tc
+						   &&(!WEED_EVENT_IS_FRAME(event_before)||
+						      WEED_EVENT_IS_FILTER_DEINIT(in_event)))) break;
       event_before=get_prev_event(event_before);
     }
   }
 
   event=weed_plant_copy(in_event);
+  //if (mainw->multitrack!=NULL) mt_fixup_events(mainw->multitrack,in_event,event);
   if (event==NULL) return NULL;
 
   if (event_before==NULL) {
@@ -504,7 +515,7 @@
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
       filter=get_weed_filter(idx);
-      if ((num_params=num_in_params(filter,TRUE,TRUE))>0) {
+      if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
 	in_pchanges=(void **)g_try_malloc(num_params*sizeof(void *));
 	if (in_pchanges==NULL) return NULL;
 	for (i=0;i<num_params;i++) in_pchanges[i]=NULL;
@@ -551,7 +562,7 @@
 
 
 
-gboolean frame_event_has_frame_for_track (weed_plant_t *event, gint track) {
+boolean frame_event_has_frame_for_track (weed_plant_t *event, int track) {
   int *clips,*frames,numclips;
   int error;
 
@@ -574,7 +585,7 @@
 
 
 
-weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, gboolean exact) {
+weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, boolean exact) {
   // if exact is FALSE, we can get a frame event just after tc
   weed_plant_t *event,*next_event;
   weed_timecode_t xtc,next_tc=0;
@@ -594,7 +605,7 @@
 
 
 
-gboolean filter_map_after_frame(weed_plant_t *fmap) {
+boolean filter_map_after_frame(weed_plant_t *fmap) {
   // return TRUE if filter_map follows frame at same timecode
   weed_plant_t *frame=get_prev_frame_event(fmap);
 
@@ -617,7 +628,7 @@
 
 
 
-weed_plant_t *get_filter_map_after(weed_plant_t *event, gint ctrack) {
+weed_plant_t *get_filter_map_after(weed_plant_t *event, int ctrack) {
   // get filter_map following event; if ctrack!=-1000000 then we ignore filter maps with no in_track/out_track == ctrack
   void **init_events;
   int error,num_init_events,i;
@@ -657,7 +668,7 @@
 
 
 
-gboolean init_event_is_relevant(weed_plant_t *init_event, gint ctrack) {
+boolean init_event_is_relevant(weed_plant_t *init_event, int ctrack) {
   // see if init_event mentions ctrack as an in_track or an out_track
   // ignore any process_last filters
 
@@ -698,7 +709,7 @@
 
 
 
-weed_plant_t *get_filter_map_before(weed_plant_t *event, gint ctrack, weed_plant_t *stop_event) {
+weed_plant_t *get_filter_map_before(weed_plant_t *event, int ctrack, weed_plant_t *stop_event) {
   // get filter_map preceding event; if ctrack!=-1000000 then we ignore 
   // filter maps with no in_track/out_track == ctrack
 
@@ -739,7 +750,7 @@
 }
 
 
-void **get_init_events_before(weed_plant_t *event, weed_plant_t *init_event, gboolean add) {
+void **get_init_events_before(weed_plant_t *event, weed_plant_t *init_event, boolean add) {
   // find previous FILTER_MAP event, and append or delete new init_event
   void **init_events=NULL,**new_init_events;
   int error,num_init_events=0,i,j=0;
@@ -875,7 +886,8 @@
 
 
 
-gboolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event, gboolean before_frames) {
+boolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, 
+				    weed_plant_t *event, boolean before_frames) {
   // insert event as last event at same timecode as (FRAME_EVENT) at_event
   weed_timecode_t tc=get_event_timecode(at_event);
   weed_set_int64_value(event,"timecode",tc);
@@ -958,7 +970,8 @@
 
  
 
-weed_plant_t *insert_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames, weed_plant_t **shortcut) {
+weed_plant_t *insert_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, 
+				     int *frames, weed_plant_t **shortcut) {
   // we will insert a FRAME event at timecode tc, after any other events (except for deinit events) at timecode tc
   // if there is an existing FRAME event at tc, we replace it with the new frame
 
@@ -1010,6 +1023,10 @@
       }
       event=get_next_event(event);
     }
+
+    // we passed all events in event_list; there was one or more at tc, but none were deinits or frames
+    if (event==NULL) event=get_last_event(event_list);
+
   }
   else {
     // event is after last event, append it
@@ -1019,8 +1036,7 @@
     return event_list;
   }
 
-
-  // add frame before first frame event
+  // add frame before "event"
   
   if ((new_event_list=append_frame_event(NULL,tc,numframes,clips,frames))==NULL) return NULL;
   // new_event_list is now an event_list with one frame event. We will steal its event and prepend it !
@@ -1054,15 +1070,15 @@
 
 
 
-void insert_audio_event_at(weed_plant_t *event_list, weed_plant_t *event, gint track, gint clipnum, double seek, double vel) {
+void insert_audio_event_at(weed_plant_t *event_list, weed_plant_t *event, int track, int clipnum, 
+			   double seek, double vel) {
   // insert/update audio event at (existing) frame event
   int error,i;
   int *new_aclips;
   double *new_aseeks;
   double arv; // vel needs rounding to four dp (i don't know why, but otherwise we get some weird rounding errors)
 
-  if (vel>=0.) arv=(double)(gint)(vel*10000.+.5)/10000.;
-  else arv=(double)(gint)(vel*10000.-.5)/10000.;
+  arv=(double)(myround(vel*10000.))/10000.;
 
   if (weed_plant_has_leaf(event,"audio_clips")) {
     int num_aclips=weed_leaf_num_elements(event,"audio_clips");
@@ -1305,7 +1321,8 @@
       else weed_set_voidptr_array(event,"init_events",i,new_init_events);
       g_free(new_init_events);
 
-      if ((filter_map==NULL&&i==0)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) delete_event(event_list,event);
+      if ((filter_map==NULL&&i==0)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) 
+	delete_event(event_list,event);
       else filter_map=event;
     }
     event=event_next;
@@ -1333,7 +1350,7 @@
 
 
 
-static gboolean remove_event_from_filter_map(weed_plant_t *fmap, weed_plant_t *event) {
+static boolean remove_event_from_filter_map(weed_plant_t *fmap, weed_plant_t *event) {
   // return FALSE if result is NULL filter_map
   int error;
   void **init_events=weed_get_voidptr_array(fmap,"init_events",&error);
@@ -1355,7 +1372,7 @@
   return (!(j==0||(j==1&&event==NULL)));
 }
 
-LIVES_INLINE gboolean init_event_in_list(void **init_events, int num_inits, weed_plant_t *event) {
+LIVES_INLINE boolean init_event_in_list(void **init_events, int num_inits, weed_plant_t *event) {
   int i;
   if (init_events==NULL||init_events[0]==NULL) return FALSE;
   for (i=0;i<num_inits;i++) {
@@ -1365,11 +1382,11 @@
 }
 
 
-gboolean filter_map_has_event(weed_plant_t *fmap, weed_plant_t *event) {
+boolean filter_map_has_event(weed_plant_t *fmap, weed_plant_t *event) {
   int error;
   void **init_events=weed_get_voidptr_array(fmap,"init_events",&error);
   int num_inits=weed_leaf_num_elements(fmap,"init_events");
-  gboolean ret=init_event_in_list(init_events,num_inits,event);
+  boolean ret=init_event_in_list(init_events,num_inits,event);
 
   weed_free(init_events);
   return ret;
@@ -1377,7 +1394,7 @@
 }
 
 
-gboolean filter_init_has_owner(weed_plant_t *init_event, int track) {
+boolean filter_init_has_owner(weed_plant_t *init_event, int track) {
   int i,error,num_owners;
   int *owners;
   if (!weed_plant_has_leaf(init_event,"in_tracks")) return FALSE;
@@ -1465,7 +1482,7 @@
 
 
 static void rescale_param_changes(weed_plant_t *event_list, weed_plant_t *init_event, weed_timecode_t new_init_tc, 
-				  weed_plant_t *deinit_event, weed_timecode_t new_deinit_tc, gdouble fps) {
+				  weed_plant_t *deinit_event, weed_timecode_t new_deinit_tc, double fps) {
   // rescale parameter value changes along the time axis
   // this can be called when a FILTER_INIT or FILTER_DEINIT is moved
 
@@ -1486,12 +1503,14 @@
   num_inits=weed_leaf_num_elements(init_event,"in_parameters");
   init_events=weed_get_voidptr_array(init_event,"in_parameters",&error);
 
+  if (init_events==NULL) num_inits=0;
+
   for (i=0;i<num_inits;i++) {
     pchain=init_events[i];
     while (pchain!=NULL) {
       pchain_tc=get_event_timecode((weed_plant_t *)pchain);
-      new_tc=(weed_timecode_t)((gdouble)(pchain_tc-old_init_tc)/(gdouble)(old_deinit_tc-old_init_tc)*
-			       (gdouble)(new_deinit_tc-new_init_tc))+new_init_tc;
+      new_tc=(weed_timecode_t)((double)(pchain_tc-old_init_tc)/(double)(old_deinit_tc-old_init_tc)*
+			       (double)(new_deinit_tc-new_init_tc))+new_init_tc;
       new_tc=q_gint64(new_tc,fps);
       if (new_tc==pchain_tc) {
 	if (!weed_plant_has_leaf((weed_plant_t *)pchain,"next_change")) pchain=NULL;
@@ -1516,11 +1535,11 @@
     }
   }
 
-  weed_free(init_events);
+  if (init_events!=NULL) weed_free(init_events);
 }
 
 
-static gboolean is_in_hints(weed_plant_t *event,void **hints) {
+static boolean is_in_hints(weed_plant_t *event,void **hints) {
   int i;
   if (hints==NULL) return FALSE;
   for (i=0;hints[i]!=NULL;i++) {
@@ -1532,9 +1551,9 @@
 
 
 
-gboolean init_event_is_process_last(weed_plant_t *event) {
+boolean init_event_is_process_last(weed_plant_t *event) {
   int error;
-  gboolean res=FALSE;
+  boolean res=FALSE;
   gchar *hashname;
   weed_plant_t *filter;
 
@@ -1569,7 +1588,7 @@
   void **init_events;
   int num_inits;
   void **new_init_events;
-  gboolean added=FALSE,plast=FALSE,mustadd=FALSE;
+  boolean added=FALSE,plast=FALSE,mustadd=FALSE;
 
   remove_event_from_filter_map(fmap,event);
 
@@ -1607,7 +1626,7 @@
 
 
 
-void move_filter_init_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *init_event, gdouble fps) {
+void move_filter_init_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *init_event, double fps) {
   int error,i,j=0;
   weed_timecode_t tc=get_event_timecode(init_event);
   weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value(init_event,"deinit_event",&error);
@@ -1617,7 +1636,7 @@
   void **init_events;
   int num_inits;
   void **event_hints=NULL;
-  gboolean is_null_filter_map;
+  boolean is_null_filter_map;
 
   rescale_param_changes(event_list,init_event,new_tc,deinit_event,deinit_tc,fps);
 
@@ -1628,7 +1647,8 @@
       event_next=get_next_event(event);
       if (WEED_EVENT_IS_FILTER_MAP(event)) {
 	is_null_filter_map=!remove_event_from_filter_map(event,init_event);
-	if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) delete_event(event_list,event);
+	if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) 
+	  delete_event(event_list,event);
 	else filter_map=event;
       }
       event=event_next;
@@ -1649,8 +1669,8 @@
   else {
     // moving left
     // see if event is switched on at start
-    gboolean is_on=FALSE;
-    gboolean adding=FALSE;
+    boolean is_on=FALSE;
+    boolean adding=FALSE;
     while (event!=deinit_event) {
       if (get_event_timecode(event)>tc) break;
       if (WEED_EVENT_IS_FILTER_MAP(event)&&filter_map_has_event(event,init_event)) {
@@ -1719,8 +1739,9 @@
 
 
 void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event, 
-			      gdouble fps, gboolean rescale_pchanges) {
-  // move a filter_deinit from old pos to new pos, remove mention of it from filter maps, possibly add/update filter map before frame at new_tc, remove duplicate filter_maps, update param_change events
+			      double fps, boolean rescale_pchanges) {
+  // move a filter_deinit from old pos to new pos, remove mention of it from filter maps, 
+  // possibly add/update filter map before frame at new_tc, remove duplicate filter_maps, update param_change events
   int error,i,j=0;
   weed_timecode_t tc=get_event_timecode(deinit_event);
   weed_plant_t *init_event=(weed_plant_t *)weed_get_voidptr_value(deinit_event,"init_event",&error);
@@ -1731,7 +1752,7 @@
   void **init_events;
   int num_inits;
   void **event_hints=NULL;
-  gboolean is_null_filter_map;
+  boolean is_null_filter_map;
 
   if (new_tc==tc) return;
 
@@ -1754,7 +1775,8 @@
       }
       else copy_filter_map=filter_map;
       remove_event_from_filter_map(copy_filter_map,init_event);
-      if (filter_map!=copy_filter_map&&compare_filter_maps(filter_map,copy_filter_map,-1000000)) delete_event(event_list,copy_filter_map);
+      if (filter_map!=copy_filter_map&&compare_filter_maps(filter_map,copy_filter_map,-1000000)) 
+	delete_event(event_list,copy_filter_map);
       else filter_map=copy_filter_map;
     }
 
@@ -1769,7 +1791,8 @@
       if (WEED_EVENT_IS_FILTER_MAP(event)) {
 	// found a filter map, so remove the event from it
 	is_null_filter_map=!remove_event_from_filter_map(event,init_event);
-	if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) delete_event(event_list,event);
+	if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) 
+	  delete_event(event_list,event);
 	else filter_map=event;
       }
       event=event_next;
@@ -1781,8 +1804,8 @@
   else {
     // moving right
     // see if event is switched on at end
-    gboolean is_on=FALSE;
-    gboolean adding=FALSE;
+    boolean is_on=FALSE;
+    boolean adding=FALSE;
 
     xevent=get_prev_event(deinit_event);
 
@@ -1805,9 +1828,12 @@
     
     // move deinit event
     event=deinit_event;
-    while (get_event_timecode(event)<new_tc) event=get_next_event(event);
+    while (event!=NULL&&get_event_timecode(event)<new_tc) event=get_next_event(event);
 
     unlink_event(event_list,deinit_event);
+
+    if (event==NULL) return;
+
     insert_filter_deinit_event_at(event_list,event,deinit_event);
 
     if (is_on) {
@@ -1832,7 +1858,8 @@
       filter_map=get_filter_map_before(event,-1000000,NULL);
 
       if (filter_map!=NULL&&filter_map_has_event(filter_map,init_event)) {
-	// if last FILTER_MAP before deinit_event mentions init_event, remove init_event, insert FILTER_MAP after deinit_event
+	// if last FILTER_MAP before deinit_event mentions init_event, remove init_event, 
+	// insert FILTER_MAP after deinit_event
 	copy_filter_map=weed_plant_copy(filter_map);
 
 	remove_event_from_filter_map(copy_filter_map,init_event);
@@ -1855,7 +1882,7 @@
 
 
 
-gboolean move_event_right(weed_plant_t *event_list, weed_plant_t *event, gboolean can_stay, gdouble fps) {
+boolean move_event_right(weed_plant_t *event_list, weed_plant_t *event, boolean can_stay, double fps) {
   // move a filter_init or param_change to the right
   // this can happen for two reasons: - we are rectifying an event_list, or a block was deleted or moved
 
@@ -1864,7 +1891,7 @@
   int num_owners=0,num_clips;
   weed_timecode_t tc=get_event_timecode(event),new_tc=tc;
   weed_plant_t *xevent=event;
-  gboolean all_ok=FALSE;
+  boolean all_ok=FALSE;
   int i;
   
   if (WEED_EVENT_IS_FILTER_INIT(event)) {
@@ -1930,7 +1957,7 @@
 
 
 
-gboolean move_event_left(weed_plant_t *event_list, weed_plant_t *event, gboolean can_stay, gdouble fps) {
+boolean move_event_left(weed_plant_t *event_list, weed_plant_t *event, boolean can_stay, double fps) {
   // move a filter_deinit to the left
   // this can happen for two reasons: - we are rectifying an event_list, or a block was deleted or moved
 
@@ -1940,7 +1967,7 @@
   weed_timecode_t tc=get_event_timecode(event),new_tc=tc;
   weed_plant_t *xevent=event;
   weed_plant_t *init_event;
-  gboolean all_ok=FALSE;
+  boolean all_ok=FALSE;
   int i;
 
   if (WEED_EVENT_IS_FILTER_DEINIT(event)) init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
@@ -2001,7 +2028,7 @@
 
 void
 set_render_choice (GtkToggleButton *togglebutton, gpointer choice) {
-  if (gtk_toggle_button_get_active(togglebutton)) render_choice=GPOINTER_TO_INT (choice);
+  if (lives_toggle_button_get_active(togglebutton)) render_choice=GPOINTER_TO_INT (choice);
 }
 
 void
@@ -2010,19 +2037,18 @@
 }
 
 
-gint get_render_choice (void) {
+int get_render_choice (void) {
   return render_choice;
 }
 
 
 
 
-GtkWidget *events_rec_dialog (gboolean allow_mt) {
+GtkWidget *events_rec_dialog (boolean allow_mt) {
   GtkWidget *e_rec_dialog;
   GtkWidget *dialog_vbox;
   GtkWidget *vbox;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
   GtkWidget *label;
   GtkWidget *radiobutton;
   GtkWidget *okbutton;
@@ -2032,154 +2058,63 @@
 
   render_choice=RENDER_CHOICE_PREVIEW;
 
-  e_rec_dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (e_rec_dialog), _("LiVES: - Events recorded"));
-  gtk_window_set_position (GTK_WINDOW (e_rec_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (e_rec_dialog), TRUE);
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(e_rec_dialog),FALSE);
-    gtk_widget_modify_bg (e_rec_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  e_rec_dialog = lives_standard_dialog_new (_("LiVES: - Events recorded"),FALSE);
 
   if (prefs->show_gui) gtk_window_set_transient_for(GTK_WINDOW(e_rec_dialog),GTK_WINDOW(mainw->LiVES));
-  gtk_window_set_modal (GTK_WINDOW (e_rec_dialog), TRUE);
 
-  dialog_vbox = GTK_DIALOG (e_rec_dialog)->vbox;
-  gtk_widget_show (dialog_vbox);
+  dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(e_rec_dialog));
 
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox);
+  vbox = lives_vbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  label = gtk_label_new (_("   Events were recorded. What would you like to do with them ?    "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label = lives_standard_label_new (_("Events were recorded. What would you like to do with them ?"));
 
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 20);
-  gtk_widget_show (label);
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, widget_opts.packing_height*2);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = gtk_radio_button_new (NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
+  radiobutton = lives_standard_radio_button_new (_ ("_Preview events"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton),TRUE);
 
-  label=gtk_label_new_with_mnemonic (_ ("_Preview events"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton),TRUE);
-
-  GTK_WIDGET_SET_FLAGS (radiobutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
   g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
 		    G_CALLBACK (set_render_choice),
 		    GINT_TO_POINTER (RENDER_CHOICE_PREVIEW));
 
   if (!mainw->clip_switched&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-    radiobutton = gtk_radio_button_new (NULL);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group);
-    radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
-    
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
-    
-    label=gtk_label_new_with_mnemonic (_ ("Render events to _same clip"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-    
-    eventbox=gtk_event_box_new();
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      radiobutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    radiobutton = lives_standard_radio_button_new (_ ("Render events to _same clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
-    GTK_WIDGET_SET_FLAGS (radiobutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
     g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
                       G_CALLBACK (set_render_choice),
                       GINT_TO_POINTER (RENDER_CHOICE_SAME_CLIP));
   }
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = gtk_radio_button_new (NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
-    
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
-    
-  label=gtk_label_new_with_mnemonic (_ ("Render events to _new clip"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
+  radiobutton = lives_standard_radio_button_new (_ ("Render events to _new clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
     
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  
-  GTK_WIDGET_SET_FLAGS (radiobutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
   g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
 		    G_CALLBACK (set_render_choice),
 		    GINT_TO_POINTER (RENDER_CHOICE_NEW_CLIP));
   
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = gtk_radio_button_new (NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
-    
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
-    
-  label=gtk_label_new_with_mnemonic (_("View/edit events in _multitrack window (test)"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-    
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _multitrack window (test)"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-  GTK_WIDGET_SET_FLAGS (radiobutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
   g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
 		    G_CALLBACK (set_render_choice),
 		    GINT_TO_POINTER (RENDER_CHOICE_MULTITRACK));
@@ -2188,39 +2123,21 @@
 
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = gtk_radio_button_new (NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
-    
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
+  radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _event window"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
   if (mainw->stored_event_list!=NULL) gtk_widget_set_sensitive(radiobutton,FALSE);
     
-  label=gtk_label_new_with_mnemonic (_("View/edit events in _event window"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-    
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-  GTK_WIDGET_SET_FLAGS (radiobutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
   g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
 		    G_CALLBACK (set_render_choice),
 		    GINT_TO_POINTER (RENDER_CHOICE_EVENT_LIST));
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus (cancelbutton,TRUE);
+
   gtk_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
@@ -2229,14 +2146,14 @@
 
   accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
   gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   gtk_window_add_accel_group (GTK_WINDOW (e_rec_dialog), accel_group);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (e_rec_dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
   gtk_widget_show_all (e_rec_dialog);
 
@@ -2274,7 +2191,7 @@
 
 
 
-gboolean event_list_to_block (weed_plant_t *event_list, gint num_events) {
+boolean event_list_to_block (weed_plant_t *event_list, int num_events) {
   // translate our new event_list to older event blocks
   // by now we should have eliminated clip switches and param settings
 
@@ -2337,11 +2254,80 @@
 
 
 
-void event_list_add_track (weed_plant_t *event_list, gint layer) {
+void add_track_to_avol_init(weed_plant_t *filter, weed_plant_t *event, int nbtracks, boolean behind) {
+  // added a new video track - now we need to update our audio volume and pan effect
+  weed_plant_t **in_ptmpls;
+
+  int *new_in_tracks;
+  int *igns,*nigns;
+
+  int num_in_tracks,x=-nbtracks;
+  int error,nparams,numigns;
+
+  int bval;
+
+  void **pchainx,*pchange;
+
+  register int i,j;
+
+  // add a new value to in_tracks
+  num_in_tracks=weed_leaf_num_elements(event,"in_tracks")+1;
+  new_in_tracks=(int *)g_malloc(num_in_tracks*sizint);
+  for (i=0;i<num_in_tracks;i++) {
+    new_in_tracks[i]=x++;
+  }
+  weed_set_int_array(event,"in_tracks",num_in_tracks,new_in_tracks);
+  g_free(new_in_tracks);
+
+  weed_set_int_value(event,"in_count",weed_get_int_value(event,"in_count",&error)+1);
+
+  // update all param_changes
+
+  nparams=weed_leaf_num_elements(event,"in_parameters");
+  pchainx=weed_get_voidptr_array(event,"in_parameters",&error);
+
+  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+
+  for (i=0;i<nparams;i++) {
+    pchange=(weed_plant_t *)pchainx[i];
+    bval=WEED_FALSE;
+    while (pchange!=NULL) {
+      fill_param_vals_to((weed_plant_t *)pchange,in_ptmpls[i],behind?num_in_tracks-1:1);
+      if (weed_plant_has_leaf((weed_plant_t *)pchange,"ignore")) {
+	numigns=weed_leaf_num_elements((weed_plant_t *)pchange,"ignore")+1;
+	igns=weed_get_boolean_array((weed_plant_t *)pchange,"ignore",&error);
+	nigns=(int *)g_malloc(numigns*sizint);
+
+	for (j=0;j<numigns;j++) {
+	  if (behind) {
+	    if (j<numigns-1) nigns[j]=igns[j];
+	    else nigns[j]=bval;
+	  }
+	  else {
+	    if (j==0) nigns[j]=igns[j];
+	    else if (j==1) nigns[j]=bval;
+	    else nigns[j]=igns[j-1];
+	  }
+	}
+	weed_set_boolean_array((weed_plant_t *)pchange,"ignore",numigns,nigns);
+	weed_free(igns);
+	g_free(nigns);
+      }
+      pchange=weed_get_voidptr_value((weed_plant_t *)pchange,"next_change",&error);
+      bval=WEED_TRUE;
+    }
+  }
+
+  weed_free(in_ptmpls);
+}
+
+
+
+void event_list_add_track (weed_plant_t *event_list, int layer) {
   // in this function we insert a new track before existing tracks
   // TODO - memcheck
   weed_plant_t *event;
-  gint numframes;
+  int numframes;
   int *clips,*frames,*newclips,*newframes,i,error;
   int num_in_tracks,num_out_tracks;
   int *in_tracks,*out_tracks;
@@ -2411,29 +2397,16 @@
 }
 
 
-weed_plant_t *append_frame_event (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames) {
-  // append a frame event to an event_list
-  weed_plant_t *event,*prev;
+static weed_plant_t *create_frame_event(weed_timecode_t tc, int numframes, int *clips, int *frames) {
   int error;
-  // returns NULL on memory error
-
-  ///////////// TODO - to func //////////////
-  if (event_list==NULL) {
-    event_list=weed_plant_new(WEED_PLANT_EVENT_LIST);
-    if (event_list==NULL) return NULL;
-    error=weed_set_int_value(event_list,"weed_event_list_api",WEED_EVENT_API_VERSION);
-    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-    error=weed_set_voidptr_value(event_list,"first",NULL);
-    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-    error=weed_set_voidptr_value(event_list,"last",NULL);
-    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-    weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
-  }
+  weed_plant_t *event;
 
   event=weed_plant_new (WEED_PLANT_EVENT);
   if (event==NULL) return NULL;
   error=weed_set_voidptr_value(event,"next",NULL);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+  error=weed_set_voidptr_value(event,"previous",NULL);
+  if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
 
 
 
@@ -2449,6 +2422,33 @@
   error=weed_set_int_array (event,"frames",numframes,frames);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
 
+  return event;
+}
+
+
+
+weed_plant_t *append_frame_event (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames) {
+  // append a frame event to an event_list
+  weed_plant_t *event,*prev;
+  int error;
+  // returns NULL on memory error
+
+  ///////////// TODO - to func //////////////
+  if (event_list==NULL) {
+    event_list=weed_plant_new(WEED_PLANT_EVENT_LIST);
+    if (event_list==NULL) return NULL;
+    error=weed_set_int_value(event_list,"weed_event_list_api",WEED_EVENT_API_VERSION);
+    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    error=weed_set_voidptr_value(event_list,"first",NULL);
+    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    error=weed_set_voidptr_value(event_list,"last",NULL);
+    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
+  }
+
+  event=create_frame_event(tc,numframes,clips,frames);
+  if (event==NULL) return NULL;
+
   if (get_first_event(event_list)==NULL) {
     error=weed_set_voidptr_value(event_list,"first",event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
@@ -2473,19 +2473,25 @@
 }
 
 
-void **filter_init_add_pchanges (weed_plant_t *event_list, weed_plant_t *plant, weed_plant_t *init_event, int ntracks) {
-  int i,error;
-  weed_plant_t **in_params;
-  int num_params;
+void **filter_init_add_pchanges (weed_plant_t *event_list, weed_plant_t *plant, weed_plant_t *init_event, int ntracks, int leave) {
+  weed_plant_t **in_params=NULL,**in_ptmpls;
+
   void **pchain=NULL;
+  void **in_pchanges=NULL;
 
-  weed_plant_t *filter=plant;
-  gboolean is_inst=FALSE;
+  weed_plant_t *filter=plant,*in_param;
 
   weed_timecode_t tc=get_event_timecode(init_event);
 
+  boolean is_inst=FALSE;
+
+  int num_params;
+  int error;
+
+  register int i;
+
   if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) {
-    filter=weed_get_plantptr_value(plant,"filter_class",&error);
+    filter=weed_instance_get_filter(plant,TRUE);
     is_inst=TRUE;
   }
 
@@ -2493,26 +2499,35 @@
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")||weed_get_plantptr_value(filter,"in_parameter_templates",&error)==NULL) return NULL;
 
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
+  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
 
   pchain=(void **)g_malloc(num_params*sizeof(void *));
 
   if (!is_inst) in_params=weed_params_create(filter,TRUE);
-  else in_params=weed_get_plantptr_array(plant,"in_parameters",&error);
+
+  if (leave>0) in_pchanges=weed_get_voidptr_array(init_event,"in_parameters",&error);
 
   for (i=num_params-1;i>=0;i--) {
     
+    if (i<leave&&in_pchanges[i]!=NULL) {
+      // maintain existing values
+      pchain[i]=in_pchanges[i];
+      continue;
+    }
+
     pchain[i]=weed_plant_new(WEED_PLANT_EVENT);
     weed_set_int_value((weed_plant_t *)pchain[i],"hint",WEED_EVENT_HINT_PARAM_CHANGE);
     weed_set_int64_value((weed_plant_t *)pchain[i],"timecode",tc);
 
-    if (is_perchannel_multiw(in_params[i])) {
+    if (!is_inst) in_param=in_params[i];
+    else in_param=weed_inst_in_param(plant,i,FALSE,FALSE);
+
+    if (is_perchannel_multiw(in_param)) {
       // if the parameter is element-per-channel, fill up to number of channels
-      weed_plant_t *ptmpl=weed_get_plantptr_value(in_params[i],"template",&error);
-      int phint=weed_get_int_value(ptmpl,"hint",&error);
-      fill_param_vals_to(ptmpl,in_params[i],i,phint,ntracks-1);
+      fill_param_vals_to(in_param,in_ptmpls[i],ntracks-1);
     }
 
-    weed_leaf_copy((weed_plant_t *)pchain[i],"value",in_params[i],"value");
+    weed_leaf_copy((weed_plant_t *)pchain[i],"value",in_param,"value");
 
     weed_set_int_value((weed_plant_t *)pchain[i],"index",i);
     weed_set_voidptr_value((weed_plant_t *)pchain[i],"init_event",init_event);
@@ -2524,18 +2539,26 @@
 
   }
 
-  weed_free(in_params);
+  if (!is_inst) {
+    weed_in_params_free(in_params,num_params);
+  }
+  else {
+    weed_free(in_params);
+  }
+  weed_free(in_ptmpls);
 
   weed_set_voidptr_array(init_event,"in_parameters",num_params,pchain);
+
   return pchain;
 }
 
 
-weed_plant_t *append_filter_init_event (weed_plant_t *event_list, weed_timecode_t tc, int filter_idx, int num_in_tracks) {
-  weed_plant_t *event,*prev,*filter;
-  gint e_in_channels;
-  gint total_in_channels=0;
-  gint total_out_channels=0;
+weed_plant_t *append_filter_init_event (weed_plant_t *event_list, weed_timecode_t tc, int filter_idx, 
+					int num_in_tracks, int key, weed_plant_t *inst) {
+  weed_plant_t *event,*prev,*filter,*chan;
+  int e_in_channels,e_out_channels,e_ins,e_outs;
+  int total_in_channels=0;
+  int total_out_channels=0;
   int i,error;
   weed_plant_t **ctmpl;
   int my_in_tracks=0;
@@ -2543,36 +2566,38 @@
 
   if (event_list==NULL) {
     event_list=weed_plant_new(WEED_PLANT_EVENT_LIST);
-    weed_set_int_value(event_list,"weed_event_list_api",WEED_EVENT_API_VERSION);
-    weed_set_voidptr_value(event_list,"first",NULL);
-    weed_set_voidptr_value(event_list,"last",NULL);
+    if (event_list==NULL) return NULL;
+    error=weed_set_int_value(event_list,"weed_event_list_api",WEED_EVENT_API_VERSION);
+    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    error=weed_set_voidptr_value(event_list,"first",NULL);
+    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+    error=weed_set_voidptr_value(event_list,"last",NULL);
+    if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
   }
 
   event=weed_plant_new (WEED_PLANT_EVENT);
   weed_set_voidptr_value(event,"next",NULL);
 
-  // TODO - error check
   weed_set_int64_value (event,"timecode",tc);
   weed_set_int_value (event,"hint",WEED_EVENT_HINT_FILTER_INIT);
-  weed_set_string_value (event,"filter",(tmp=make_weed_hashname (filter_idx,TRUE)));
+  weed_set_string_value (event,"filter",(tmp=make_weed_hashname (filter_idx,TRUE,FALSE)));
   g_free(tmp);
 
-  //////////////////////////////////////////////////////////////////////////////////
-
-  e_in_channels=enabled_in_channels (get_weed_filter(filter_idx),FALSE);
-
   filter=get_weed_filter(filter_idx);
 
-  if (weed_plant_has_leaf(filter,"in_channel_templates")) total_in_channels=weed_leaf_num_elements(filter,"in_channel_templates");
+  // TODO *** - should use inst values here and not filter values
+
+  if (weed_plant_has_leaf(filter,"in_channel_templates")) 
+    total_in_channels=weed_leaf_num_elements(filter,"in_channel_templates");
   if (total_in_channels>0) {
     int count[total_in_channels];
     ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
     for (i=0;i<total_in_channels;i++) {
-      if (!weed_plant_has_leaf(ctmpl[i],"disabled")||weed_get_boolean_value(ctmpl[i],"disabled",&error)!=WEED_TRUE) {
+      if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) {
 	count[i]=1;
 	my_in_tracks++;
-	weed_set_int_value(ctmpl[i],"repeats",1);
+	weed_set_int_value(ctmpl[i],"host_repeats",1);
       }
       else count[i]=0;
     }
@@ -2585,13 +2610,13 @@
 	  repeats=weed_get_int_value(ctmpl[i],"max_repeats",&error);
 	  if (repeats==0) {
 	    count[i]+=num_in_tracks-my_in_tracks;
-	    weed_set_int_value(ctmpl[i],"repeats",count[i]);
-	    weed_set_boolean_value(ctmpl[i],"disabled",WEED_FALSE);
+	    weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
+	    weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
 	    break;
 	  }
 	  count[i]+=num_in_tracks-my_in_tracks>=repeats-1?repeats-1:num_in_tracks-my_in_tracks;
-	  weed_set_int_value(ctmpl[i],"repeats",count[i]);
-	  weed_set_boolean_value(ctmpl[i],"disabled",WEED_FALSE);
+	  weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
+	  weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
 	  my_in_tracks+=count[i]-1;
 	  if (my_in_tracks==num_in_tracks) break;
 	}
@@ -2601,31 +2626,62 @@
     weed_free(ctmpl);
   }
 
-  if (weed_plant_has_leaf(filter,"out_channel_templates")) total_out_channels=weed_leaf_num_elements(filter,"out_channel_templates");
+  if (weed_plant_has_leaf(filter,"out_channel_templates")) 
+    total_out_channels=weed_leaf_num_elements(filter,"out_channel_templates");
   if (total_out_channels>0) {
     int count[total_out_channels];
     ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&error);
     for (i=0;i<total_out_channels;i++) {
-      if (!weed_plant_has_leaf(ctmpl[i],"disabled")||weed_get_boolean_value(ctmpl[i],"disabled",&error)!=WEED_TRUE) count[i]=1;
+      if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) count[i]=1;
       else count[i]=0;
     }
     weed_set_int_array(event,"out_count",total_out_channels,count);
     weed_free(ctmpl);
   }
 
+
+  e_ins=e_in_channels=enabled_in_channels (get_weed_filter(filter_idx),FALSE);
+  e_outs=e_out_channels=enabled_out_channels (get_weed_filter(filter_idx),FALSE);
+
+  // discount alpha_channels (in and out)
+  if (inst!=NULL) {
+    for (i=0;i<e_ins;i++) {
+      chan=get_enabled_channel(inst,i,TRUE);
+      if (weed_palette_is_alpha_palette(weed_layer_get_palette(chan))) e_in_channels--;
+    }
+    
+    // handling for compound fx
+    while (weed_plant_has_leaf(inst,"host_next_instance")) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+
+    for (i=0;i<e_outs;i++) {
+      chan=get_enabled_channel(inst,i,FALSE);
+      if (weed_palette_is_alpha_palette(weed_layer_get_palette(chan))) e_out_channels--;
+    }
+  }
+
   // here we map our tracks to channels
-  if (e_in_channels==1) {
-    weed_set_int_value (event,"in_tracks",0);
+  if (e_in_channels!=0) {
+    if (e_in_channels==1) {
+      weed_set_int_value (event,"in_tracks",0);
+    }
+    else {
+      int *tracks=(int *)g_malloc (2*sizint);
+      tracks[0]=0;
+      tracks[1]=1;
+      weed_set_int_array (event,"in_tracks",2,tracks);
+      g_free (tracks);
+    }
   }
-  else {
-    int *tracks=(int *)g_malloc (2*sizint);
-    tracks[0]=0;
-    tracks[1]=1;
-    weed_set_int_array (event,"in_tracks",2,tracks);
-    g_free (tracks);
+
+  if (e_out_channels>0) {
+    weed_set_int_value (event,"out_tracks",0);
+  }
+
+  if (key>-1) {
+    weed_set_int_value(event,"host_key",key);
+    weed_set_int_value(event,"host_mode",rte_key_getmode(key));
   }
 
-  weed_set_int_value (event,"out_tracks",0);
 
   ///////////////////////////////////////////////////////////////////////////////////
 #ifdef DEBUG_EVENTS
@@ -2673,7 +2729,7 @@
     gchar *filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
     int idx=weed_get_idx_for_hashname(filter_hash,TRUE);
     weed_plant_t *filter=get_weed_filter(idx);
-    int num_params=num_in_params(filter,TRUE,TRUE);
+    int num_params=num_in_params(filter,FALSE,FALSE);
     weed_set_voidptr_array(event,"in_parameters",num_params,pchain);
     weed_free(filter_hash);
   }
@@ -2695,7 +2751,8 @@
 
 
 
-weed_plant_t *append_param_change_event (weed_plant_t *event_list, weed_timecode_t tc, gint pnum, weed_plant_t *param, void *init_event, void **pchain) {
+weed_plant_t *append_param_change_event (weed_plant_t *event_list, weed_timecode_t tc, int pnum, 
+					 weed_plant_t *param, void *init_event, void **pchain) {
   weed_plant_t *event,*prev,*xevent;
   weed_plant_t *last_pchange_event;
   int error;
@@ -2789,34 +2846,41 @@
 
 
 
-
-
-weed_plant_t *process_events (weed_plant_t *next_event, weed_timecode_t curr_tc) {
+weed_plant_t *process_events (weed_plant_t *next_event, boolean process_audio, weed_timecode_t curr_tc) {
   // here we play back (preview) with an event_list
   // we process all events, but drop frames (unless mainw->nodrop is set)
 
   static weed_timecode_t aseek_tc=0;
+  weed_timecode_t tc,next_tc;
+
   static double stored_avel=0.;
 
-  weed_timecode_t tc,next_tc;
-  int hint;
-  int key,idx;
-  char *key_string;
+  int *in_count=NULL;
+
   void *init_event;
+
   weed_plant_t *next_frame_event,*return_event;
-  int i;
-  char *filter_name;
-  int new_file;
-  gint current_file;
-  int error;
   weed_plant_t *filter;
-  int num_channels;
-  int *in_count=NULL;
-  weed_plant_t **ctmpl;
-  int num_params;
   weed_plant_t *inst;
+
+  weed_plant_t **ctmpl;
   weed_plant_t **source_params,**in_params;
+
+  char *filter_name;
+  char *key_string;
+
+  int current_file;
+
+  int error;
+  int num_params,offset=0;
   int num_in_count=0;
+  int num_channels;
+  int new_file;
+  int hint;
+  int key,idx;
+
+
+  register int i;
 
   if (next_event==NULL) return NULL;
 
@@ -2846,7 +2910,7 @@
     return next_event;
   }
 
-  aseek_tc+=(weed_timecode_t)((gdouble)(tc-mainw->cevent_tc)*stored_avel);
+  aseek_tc+=(weed_timecode_t)((double)(tc-mainw->cevent_tc)*stored_avel);
   mainw->cevent_tc=tc;
 
   return_event=get_next_event(next_event);
@@ -2946,11 +3010,11 @@
 	mainw->files[new_file]->vsize=cfile->vsize;
 	current_file=mainw->current_file;
 	mainw->current_file=new_file;
-	mainw->aframeno=(gdouble)(aseek_tc/U_SEC)*cfile->fps;
+	mainw->aframeno=(double)(aseek_tc/U_SEC)*cfile->fps;
 	mainw->pchains=pchains;
 	load_frame_image (cfile->frameno);
 	mainw->pchains=NULL;
-	if (mainw->playing_file>-1) while (g_main_context_iteration (NULL,FALSE));
+	if (mainw->playing_file>-1) lives_widget_context_update();
 	mainw->current_file=current_file;
       }
       //weed_free(mainw->clip_index);
@@ -2963,7 +3027,7 @@
 	cfile->frameno=0; // will force blank frame creation
       }
       else cfile->frameno=mainw->frame_index[i-1];
-      mainw->aframeno=(gdouble)(aseek_tc/U_SEC)*cfile->fps;
+      mainw->aframeno=(double)(aseek_tc/U_SEC)*cfile->fps;
       mainw->pchains=pchains;
       load_frame_image (cfile->frameno);
       mainw->pchains=NULL;
@@ -2972,19 +3036,27 @@
   //weed_free(mainw->clip_index);
   //weed_free(mainw->frame_index);
   //mainw->clip_index=mainw->frame_index=NULL;
-  if (mainw->playing_file>-1) while (g_main_context_iteration(NULL,FALSE));
+  if (mainw->playing_file>-1) lives_widget_context_update();
   cfile->next_event=get_next_event(next_event);
   break;
   case WEED_EVENT_HINT_FILTER_INIT:
     // effect init
     //  bind the weed_fx to next free key/0
-    key=get_next_free_key();
     filter_name=weed_get_string_value (next_event,"filter",&error);
-      
-    // for now, assume we can locate the hashname
     idx=weed_get_idx_for_hashname (filter_name,TRUE);
     weed_free (filter_name);
+
     if (idx!=-1) {
+      filter=get_weed_filter(idx);
+
+      if (!process_audio&&is_pure_audio(filter,FALSE)) {
+	if (weed_plant_has_leaf(next_event,"host_tag")) weed_leaf_delete(next_event,"host_tag");
+	break; // audio effects are processed in the audio renderer
+      }
+
+      if (process_audio&&!is_pure_audio(filter,FALSE)) break;
+
+      key=get_next_free_key();
       weed_add_effectkey_by_idx (key+1,idx);
       key_string=g_strdup_printf ("%d",key);
       weed_set_string_value (next_event,"host_tag",key_string);
@@ -2994,8 +3066,6 @@
       g_print ("event: init effect on key %d at tc %"PRId64" curr_tc=%"PRId64"\n",key,tc,curr_tc);
 #endif
     
-      filter=get_weed_filter(idx);
-	
       if (weed_plant_has_leaf(next_event,"in_count")) {
 	num_in_count=weed_leaf_num_elements(next_event,"in_count");
 	in_count=weed_get_int_array(next_event,"in_count",&error);
@@ -3004,13 +3074,13 @@
       if (weed_plant_has_leaf(filter,"in_channel_templates")) {
 	if ((num_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
 	  ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-	  if (num_channels!=num_in_count) g_printerr("num_in_count != num_in_channels !!\n");
+	  if (num_channels!=num_in_count) LIVES_ERROR("num_in_count != num_in_channels");
 	  for (i=0;i<num_channels;i++) {
 	    if (in_count[i]>0) {
-	      weed_set_boolean_value(ctmpl[i],"disabled",WEED_FALSE);
-	      weed_set_int_value(ctmpl[i],"repeats",in_count[i]);
+	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+	      weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
 	    }
-	    else weed_set_boolean_value(ctmpl[i],"disabled",WEED_TRUE);
+	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
 	  }
 	  weed_free(ctmpl);
 	}
@@ -3022,8 +3092,9 @@
 	if ((num_channels=weed_leaf_num_elements(filter,"out_channel_templates"))>0) {
 	  ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&error);
 	  for (i=0;i<num_channels;i++) {
-	    if (!weed_plant_has_leaf(ctmpl[i],"disabled")||weed_get_boolean_value(ctmpl[i],"disabled",&error)!=WEED_TRUE) weed_set_boolean_value(ctmpl[i],"disabled",WEED_FALSE);
-	    else weed_set_boolean_value(ctmpl[i],"disabled",WEED_TRUE);
+	    if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) 
+	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
 	  }
 	  weed_free(ctmpl);
 	}
@@ -3033,21 +3104,32 @@
 
       // reinit effect with saved parameters
       inst=rte_keymode_get_instance(key+1,0);
-      num_params=num_in_params(inst,TRUE,TRUE);
+
+      if (weed_plant_has_leaf(next_event,"in_parameters")) {
+	pchains[key]=weed_get_voidptr_array(next_event,"in_parameters",&error);
+      }
+      else pchains[key]=NULL;
+
+    filterinit1:
+
+      num_params=num_in_params(inst,FALSE,FALSE);
+ 
       if (num_params>0) {
 	weed_call_deinit_func(inst);
 	if (weed_plant_has_leaf(next_event,"in_parameters")) {
-	  source_params=(weed_plant_t **)weed_get_voidptr_array(next_event,"in_parameters",&error);
+	  source_params=(weed_plant_t **)pchains[key];
 	  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
 
-	  pchains[key]=weed_get_voidptr_array(next_event,"in_parameters",&error);
 	  for (i=0;i<num_params;i++) {
-	    if (source_params[i]!=NULL&&is_init_pchange(next_event,source_params[i])) weed_leaf_copy(in_params[i],"value",source_params[i],"value");
+	    if (source_params!=NULL&&source_params[i+offset]!=NULL&&is_init_pchange(next_event,source_params[i+offset])) 
+	      weed_leaf_copy(in_params[i],"value",source_params[i+offset],"value");
 	  }
-	  weed_free(source_params);
 	  weed_free(in_params);
 	}
-	else pchains[key]=NULL;
+
+	offset+=num_params;
+
+	filter=weed_instance_get_filter(inst,FALSE);
 
 	if (weed_plant_has_leaf(filter,"init_func")) {
 	  weed_deinit_f *init_func_ptr_ptr;
@@ -3063,9 +3145,32 @@
 	    g_free(cwd);
 	  }
 	  set_param_gui_readonly(inst);
+	  
 	}
+	
+	weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
       }
-      else pchains[key]=NULL;
+
+      if (weed_plant_has_leaf(next_event,"host_key")) {
+	// mt events will not have this;
+	// it is used to connect params and alpha channels during rendering
+	// holds our original key/mode values
+	
+	int hostkey=weed_get_int_value(next_event,"host_key",&error);
+	int hostmode=weed_get_int_value(next_event,"host_mode",&error);
+	
+	weed_set_int_value(inst,"host_key",hostkey);
+	weed_set_int_value(inst,"host_mode",hostmode);
+	
+      }
+
+      if (weed_plant_has_leaf(inst,"host_next_instance")) {
+	// handle compound fx
+	inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+	goto filterinit1;
+      }
+
+
     }
     break;
       
@@ -3075,6 +3180,19 @@
       key_string=weed_get_string_value ((weed_plant_t *)init_event,"host_tag",&error);
       key=atoi (key_string);
       weed_free (key_string);
+
+      filter_name=weed_get_string_value ((weed_plant_t *)init_event,"filter",&error);
+      idx=weed_get_idx_for_hashname (filter_name,TRUE);
+      weed_free (filter_name);
+      
+      filter=get_weed_filter(idx);
+
+      if (!process_audio) {
+	if (is_pure_audio(filter,FALSE)) break; // audio effects are processed in the audio renderer
+      }
+      
+      if (process_audio&&!is_pure_audio(filter,FALSE)) break;
+
       if (rte_keymode_get_instance(key+1,0)!=NULL) {
 	weed_deinit_effect (key);
 	weed_delete_effectkey (key+1,0);
@@ -3087,7 +3205,7 @@
   case WEED_EVENT_HINT_FILTER_MAP:
     mainw->filter_map=next_event;
 #ifdef DEBUG_EVENTS
-    g_print ("got new effect map with %d keys\n",num_elems);
+    g_print ("got new effect map\n");
 #endif
     break;
   case WEED_EVENT_HINT_PARAM_CHANGE:
@@ -3098,60 +3216,71 @@
 }
 
 
-lives_render_error_t render_events (gboolean reset) {
+lives_render_error_t render_events (boolean reset) {
   // this is called repeatedly when we are rendering effect changes and/or clip switches
   // if we have clip switches we will resize and build a new clip
   
-  static gint progress;
-  static weed_plant_t *event,*eventnext;
-  gint blend_file=mainw->blend_file;
-  static gint frame;
-  int hint;
   gchar oname[PATH_MAX];
   GError *error=NULL;
+
   weed_timecode_t tc;
-  int key,idx;
-  gchar *key_string,*com;
-  gchar *filter_name;
-  void *init_event;
-  weed_plant_t *next_frame_event;
   weed_timecode_t next_tc=0,next_out_tc;
-  static gint out_frame;
+
+  void *init_event;
+
   GdkPixbuf *pixbuf=NULL;
-  int num_tracks;
-  int i;
+
+  weed_plant_t *filter;
+  weed_plant_t **ctmpl;
+  weed_plant_t *inst;
+  weed_plant_t *next_frame_event;
+  static weed_plant_t *event,*eventnext;
+
+  int *in_count=NULL;
   int *clip_index,*frame_index;
-  int weed_error;
+
+  weed_plant_t **source_params,**in_params;
   weed_plant_t **layers,*layer;
+
+  register int i;
+
+  int key,idx;
+  int hint;
   int layer_palette;
-  weed_plant_t *filter;
+  int weed_error;
+  int num_tracks;
   int num_channels;
-  weed_plant_t **ctmpl;
-  int *in_count=NULL;
-  int num_params;
+  int num_params,offset=0;
   int retval;
-  weed_plant_t *inst;
-  weed_plant_t **source_params,**in_params;
   int num_in_count=0;
-  gboolean is_blank=TRUE;
-  gboolean firstframe=TRUE;
-  gboolean completed=FALSE;
-  gdouble chvols[65536];
-
-  static gint xaclips[65536];
-  static gdouble xaseek[65536],xavel[65536],atime; // TODO **
-  static gboolean has_audio;
-  static lives_render_error_t read_write_error;
-
   int track,mytrack;
 
+  static int progress;
+  static int xaclips[MAX_AUDIO_TRACKS];
+  static int out_frame;
+  static int frame;
+
+  int blend_file=mainw->blend_file;
+
+  boolean is_blank=TRUE;
+  boolean firstframe=TRUE;
+  boolean completed=FALSE;
+  static boolean has_audio;
+
+  double chvols[MAX_AUDIO_TRACKS];
+  static double xaseek[MAX_AUDIO_TRACKS],xavel[MAX_AUDIO_TRACKS],atime; // TODO **
+
+  static lives_render_error_t read_write_error;
+
   gchar *blabel=NULL;
   gchar *nlabel;
+  gchar *key_string,*com;
+  gchar *filter_name;
 
   if (reset) {
     progress=frame=1;
     event=cfile->next_event;
-    out_frame=(gint)((gdouble)(get_event_timecode (event)/U_SECL)*cfile->fps+mainw->play_start);
+    out_frame=(int)((double)(get_event_timecode (event)/U_SECL)*cfile->fps+mainw->play_start);
     if (cfile->frames<out_frame) out_frame=cfile->frames+1;
     cfile->undo_start=out_frame;
     // store this, because if the user previews and there is no audio file yet, achans will get reset
@@ -3162,11 +3291,14 @@
 
     clear_mainw_msg();
     mainw->filter_map=NULL;
-    for (i=0;i<65536;i++) {
+    mainw->afilter_map=NULL;
+    mainw->audio_event=event;
+
+    for (i=0;i<MAX_AUDIO_TRACKS;i++) {
       xaclips[i]=-1;
       xaseek[i]=xavel[i]=0;
     }
-    atime=(gdouble)(out_frame-1.)/cfile->fps;
+    atime=(double)(out_frame-1.)/cfile->fps;
     has_audio=FALSE;
     read_write_error=LIVES_RENDER_ERROR_NONE;
     return LIVES_RENDER_READY;
@@ -3176,6 +3308,9 @@
 
   nlabel=g_strdup(_("Rendering audio..."));
 
+  mainw->rowstride_alignment=mainw->rowstride_alignment_hint;
+  mainw->rowstride_alignment_hint=1;
+
   if (event!=NULL) {
     eventnext=get_next_event(event);
 
@@ -3186,7 +3321,7 @@
 
       if ((mainw->multitrack==NULL||(mainw->multitrack->render_vidp&&!mainw->multitrack->pr_audio))&&
 	  !(!mainw->clip_switched&&cfile->hsize*cfile->vsize==0)) {
-	gint scrap_track=-1;
+	int scrap_track=-1;
 	  
 	num_tracks=weed_leaf_num_elements (event,"clips");
 	clip_index=weed_get_int_array (event,"clips",&weed_error);
@@ -3215,7 +3350,7 @@
 	else {
 	  layers=(weed_plant_t **)g_malloc((num_tracks+1)*sizeof(weed_plant_t *));
 	  for (i=0;i<num_tracks;i++) {
-	    if (clip_index[i]>0&&frame_index[i]>0) is_blank=FALSE;
+	    if (clip_index[i]>0&&frame_index[i]>0&&mainw->multitrack!=NULL) is_blank=FALSE;
 	    layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
 	    weed_set_int_value(layers[i],"clip",clip_index[i]);
 	    weed_set_int_value(layers[i],"frame",frame_index[i]);
@@ -3234,10 +3369,14 @@
 
 	if (layer!=NULL) {
 	  layer_palette=weed_layer_get_palette(layer);
-	  if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32) convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
-	  else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
+	  if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32) 
+	    layer_palette=WEED_PALETTE_RGB24;
+
+	  else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) 
+	    layer_palette=WEED_PALETTE_RGBA32;
 
-	  resize_layer(layer,cfile->hsize,cfile->vsize,GDK_INTERP_HYPER);
+	  resize_layer(layer,cfile->hsize,cfile->vsize,GDK_INTERP_HYPER,layer_palette,0);
+	  convert_layer_palette(layer,layer_palette,0);
 	  pixbuf=layer_to_pixbuf(layer);
 	  weed_plant_free(layer);
 	}
@@ -3260,7 +3399,7 @@
 	    blabel=g_strdup(gtk_label_get_text(GTK_LABEL(cfile->proc_ptr->label)));
 	    gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),nlabel);
 	    gtk_widget_queue_draw(cfile->proc_ptr->processing);
-	    while (g_main_context_iteration(NULL,FALSE));
+	    lives_widget_context_update();
 	  }
 
 	  mainw->read_failed=mainw->write_failed=FALSE;
@@ -3268,7 +3407,7 @@
 	  mainw->read_failed_file=NULL;
 
 	  render_audio_segment(0, NULL, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file,
-			       NULL, NULL, atime*U_SEC, q_gint64(tc,cfile->fps)+(U_SEC/cfile->fps*!is_blank), 
+			       NULL, NULL, atime*U_SEC, q_gint64(tc+(U_SEC/cfile->fps*!is_blank),cfile->fps), 
 			       chvols, 1., 1., NULL);
 	  
 	  if (mainw->write_failed) {
@@ -3287,7 +3426,7 @@
 	    gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),blabel);
 	    g_free(blabel);
 	    gtk_widget_queue_draw(cfile->proc_ptr->processing);
-	    while (g_main_context_iteration(NULL,FALSE));
+	    lives_widget_context_update();
 	  }
 	}
       }
@@ -3300,7 +3439,7 @@
 	      int num_aclips=weed_leaf_num_elements(event,"audio_clips");
 	      int *aclips=weed_get_int_array(event,"audio_clips",&weed_error);
 	      double *aseeks=weed_get_double_array(event,"audio_seeks",&weed_error);
-	      gint natracks=1,nbtracks=0;
+	      int natracks=1,nbtracks=0;
 
 	      if (mainw->multitrack!=NULL) {
 		natracks=weed_leaf_num_elements(mainw->multitrack->avol_init_event,"in_tracks");
@@ -3317,7 +3456,7 @@
 		for (track=0;track<natracks;track++) {
 		  // insert audio up to tc
 		  if (mainw->multitrack->audio_vols!=NULL) {
-		    chvols[track]=(gdouble)GPOINTER_TO_INT(g_list_nth_data(mainw->multitrack->audio_vols,track))/1000000.;
+		    chvols[track]=(double)GPOINTER_TO_INT(g_list_nth_data(mainw->multitrack->audio_vols,track))/1000000.;
 		  }
 		}
 	      }
@@ -3335,7 +3474,7 @@
 		  blabel=g_strdup(gtk_label_get_text(GTK_LABEL(cfile->proc_ptr->label)));
 		  gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),nlabel);
 		  gtk_widget_queue_draw(cfile->proc_ptr->processing);
-		  while (g_main_context_iteration(NULL,FALSE));
+		  lives_widget_context_update();
 		}
 
 		mainw->read_failed=mainw->write_failed=FALSE;
@@ -3344,7 +3483,7 @@
 
 		render_audio_segment(natracks, xaclips, mainw->multitrack!=NULL?mainw->multitrack->render_file:
 				     mainw->current_file, xavel, xaseek, (atime*U_SEC+.5), 
-				     q_gint64(tc,cfile->fps)+(U_SEC/cfile->fps*!is_blank), chvols, 1., 1., NULL);
+				     q_gint64(tc+(U_SEC/cfile->fps*!is_blank),cfile->fps), chvols, 1., 1., NULL);
 
 
 		if (mainw->write_failed) {
@@ -3363,7 +3502,7 @@
 		  gtk_label_set_text(GTK_LABEL(cfile->proc_ptr->label),blabel);
 		  g_free(blabel);
 		  gtk_widget_queue_draw(cfile->proc_ptr->processing);
-		  while (g_main_context_iteration(NULL,FALSE));
+		  lives_widget_context_update();
 		}
 
 		for (i=0;i<natracks;i++) {
@@ -3407,12 +3546,7 @@
 
 	if (prefs->ocp==-1) prefs->ocp=get_int_pref ("open_compression_percent");
 
-	if (cfile->img_type==IMG_TYPE_JPEG) {
-	  if (cfile->old_frames==0) g_snprintf(oname,PATH_MAX,"%s/%s/%08d.jpg",prefs->tmpdir,cfile->handle,out_frame);
-	}
-	else if (cfile->img_type==IMG_TYPE_PNG) {
-	  if (cfile->old_frames==0) g_snprintf(oname,PATH_MAX,"%s/%s/%08d.png",prefs->tmpdir,cfile->handle,out_frame);
-	}
+	if (cfile->old_frames==0) g_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,out_frame,get_image_ext_for_type(cfile->img_type));
 
 	do {
 	  retval=0;
@@ -3432,24 +3566,30 @@
 	if (cfile->start==0) cfile->start=1;
 	out_frame++;
       }
-      if (pixbuf!=NULL) gdk_pixbuf_unref (pixbuf);
+      if (pixbuf!=NULL) lives_object_unref (pixbuf);
 
       break;
     case WEED_EVENT_HINT_FILTER_INIT:
       // effect init
       //  bind the weed_fx to next free key/0
-      key=get_next_free_key();
+
       filter_name=weed_get_string_value (event,"filter",&weed_error);
-    
       // for now, assume we can find hashname
       idx=weed_get_idx_for_hashname (filter_name,TRUE);
       weed_free (filter_name);
+
+      filter=get_weed_filter(idx);
+      if (is_pure_audio(filter,FALSE)) {
+	if (weed_plant_has_leaf(event,"host_tag")) weed_leaf_delete(event,"host_tag");
+	break; // audio effects are processed in the audio renderer
+      }
+
+      key=get_next_free_key();
       weed_add_effectkey_by_idx (key+1,idx);
       key_string=g_strdup_printf ("%d",key);
       weed_set_string_value (event,"host_tag",key_string);
       g_free (key_string);
 
-      filter=get_weed_filter(idx);
 
       if (weed_plant_has_leaf(event,"in_count")) {
 	num_in_count=weed_leaf_num_elements(event,"in_count");
@@ -3462,10 +3602,10 @@
 	  if (num_channels!=num_in_count) g_printerr("num_in_count != num_in_channels !!\n");
 	  for (i=0;i<num_channels;i++) {
 	    if (in_count[i]>0) {
-	      weed_set_boolean_value(ctmpl[i],"disabled",WEED_FALSE);
-	      weed_set_int_value(ctmpl[i],"repeats",in_count[i]);
+	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+	      weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
 	    }
-	    else weed_set_boolean_value(ctmpl[i],"disabled",WEED_TRUE);
+	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
 	  }
 	  weed_free(ctmpl);
 	}
@@ -3477,10 +3617,10 @@
 	if ((num_channels=weed_leaf_num_elements(filter,"out_channel_templates"))>0) {
 	  ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&weed_error);
 	  for (i=0;i<num_channels;i++) {
-	    if (!weed_plant_has_leaf(ctmpl[i],"disabled")||
-		weed_get_boolean_value(ctmpl[i],"disabled",&weed_error)!=WEED_TRUE) 
-	      weed_set_boolean_value(ctmpl[i],"disabled",WEED_FALSE);
-	    else weed_set_boolean_value(ctmpl[i],"disabled",WEED_TRUE);
+	    if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||
+		weed_get_boolean_value(ctmpl[i],"host_disabled",&weed_error)!=WEED_TRUE) 
+	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
 	  }
 	  weed_free(ctmpl);
 	}
@@ -3490,18 +3630,35 @@
 
       // reinit effect with saved parameters
       inst=rte_keymode_get_instance(key+1,0);
-      num_params=num_in_params(inst,TRUE,TRUE);
+
+      if (weed_plant_has_leaf(event,"in_parameters")) {
+	pchains[key]=weed_get_voidptr_array(event,"in_parameters",&weed_error);
+      }
+      else pchains[key]=NULL;
+
+    filterinit2:
+
+      num_params=num_in_params(inst,FALSE,FALSE);
+ 
       if (num_params>0) {
 	weed_call_deinit_func(inst);
-	source_params=(weed_plant_t **)weed_get_voidptr_array(event,"in_parameters",&weed_error);
-	in_params=weed_get_plantptr_array(inst,"in_parameters",&weed_error);
-	for (i=0;i<num_params;i++) {
-	  if (source_params[i]!=NULL&&is_init_pchange(event,source_params[i])) 
-	    weed_leaf_copy(in_params[i],"value",source_params[i],"value");
+	if (weed_plant_has_leaf(event,"in_parameters")) {
+	  source_params=(weed_plant_t **)pchains[key];
+	  in_params=weed_get_plantptr_array(inst,"in_parameters",&weed_error);
+
+	  for (i=0;i<num_params;i++) {
+	    if (source_params!=NULL&&source_params[i+offset]!=NULL&&is_init_pchange(event,source_params[i+offset])) 
+	      weed_leaf_copy(in_params[i],"value",source_params[i+offset],"value");
+	  }
+	  weed_free(in_params);
 	}
-	
+
+	offset+=num_params;
+
+	filter=weed_instance_get_filter(inst,FALSE);
+
 	if (weed_plant_has_leaf(filter,"init_func")) {
-	  weed_init_f *init_func_ptr_ptr;
+	  weed_deinit_f *init_func_ptr_ptr;
 	  weed_init_f init_func;
 	  weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
 	  init_func=init_func_ptr_ptr[0];
@@ -3514,19 +3671,43 @@
 	    g_free(cwd);
 	  }
 	  set_param_gui_readonly(inst);
+	  
 	}
-	if (weed_plant_has_leaf(event,"in_parameters")) {
-	  pchains[key]=weed_get_voidptr_array(event,"in_parameters",&weed_error);
-	}
-	else pchains[key]=NULL;
+	
+	weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+      }
+
+      if (weed_plant_has_leaf(event,"host_key")) {
+	// mt events will not have this;
+	// it is used to connect params and alpha channels during rendering
+	// holds our original key/mode values
+	
+	int hostkey=weed_get_int_value(event,"host_key",&weed_error);
+	int hostmode=weed_get_int_value(event,"host_mode",&weed_error);
+	
+	weed_set_int_value(inst,"host_key",hostkey);
+	weed_set_int_value(inst,"host_mode",hostmode);
+	
+      }
 
-	weed_free(source_params);
-	weed_free(in_params);
+      if (weed_plant_has_leaf(inst,"host_next_instance")) {
+	// handle compound fx
+	inst=weed_get_plantptr_value(inst,"host_next_instance",&weed_error);
+	goto filterinit2;
       }
-      else pchains[key]=NULL;
+
       break;
     case WEED_EVENT_HINT_FILTER_DEINIT:
       init_event=weed_get_voidptr_value (event,"init_event",&weed_error);
+
+      filter_name=weed_get_string_value ((weed_plant_t *)init_event,"filter",&weed_error);
+      // for now, assume we can find hashname
+      idx=weed_get_idx_for_hashname (filter_name,TRUE);
+      weed_free (filter_name);
+
+      filter=get_weed_filter(idx);
+      if (is_pure_audio(filter,FALSE)) break; // audio effects are processed in the audio renderer
+
       key_string=weed_get_string_value ((weed_plant_t *)init_event,"host_tag",&weed_error);
       key=atoi (key_string);
       weed_free (key_string);
@@ -3553,8 +3734,8 @@
 
     if (cfile->old_frames==0) cfile->undo_start=cfile->undo_end=0;
     if (mainw->multitrack==NULL||!mainw->multitrack->pr_audio) {
-      com=g_strdup_printf ("smogrify mv_mgk \"%s\" %d %d \"%s\"",cfile->handle,cfile->undo_start,
-			   cfile->undo_end,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+      com=g_strdup_printf ("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,
+			   cfile->undo_end,get_image_ext_for_type(cfile->img_type));
       unlink(cfile->info_file);
       mainw->error=FALSE;
       mainw->com_failed=FALSE;
@@ -3576,6 +3757,7 @@
     reget_afilesize(mainw->current_file);
     mainw->multitrack=multi;
     mainw->filter_map=NULL;
+    mainw->afilter_map=NULL;
     completed=TRUE;
   }
 
@@ -3588,15 +3770,15 @@
 
 
 
-gboolean start_render_effect_events (weed_plant_t *event_list) {
+boolean start_render_effect_events (weed_plant_t *event_list) {
   // this is called to begin rendering effect events from an event_list into cfile
   // it will do a reorder/resample/resize/effect apply all in one pass
 
   // return FALSE in case of serious error
 
-  gdouble old_pb_fps=cfile->pb_fps;
-  gint oundo_start=cfile->undo_start;
-  gint oundo_end=cfile->undo_end;
+  double old_pb_fps=cfile->pb_fps;
+  int oundo_start=cfile->undo_start;
+  int oundo_end=cfile->undo_end;
 
   if (event_list==NULL) return TRUE; //oh, that was easy !
 
@@ -3607,7 +3789,7 @@
   mainw->progress_fn (TRUE);
 
   cfile->progress_start=1;
-  cfile->progress_end=count_events (event_list,FALSE,0,0);
+  cfile->progress_end=count_resampled_events (event_list, cfile->fps);
 
   cfile->pb_fps=1000000.;
 
@@ -3628,7 +3810,7 @@
       d_print_failed();
     }
     else if (mainw->render_error>=LIVES_RENDER_ERROR) d_print_failed();
-    else d_print_cancelled();
+    //else d_print_cancelled();
     cfile->undo_start=oundo_start;
     cfile->undo_end=oundo_end;
     cfile->pb_fps=old_pb_fps;
@@ -3661,29 +3843,74 @@
 
 
 
-gint count_events (weed_plant_t *event_list, gboolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc) {
+int count_events (weed_plant_t *event_list, boolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc) {
   weed_plant_t *event;
   weed_timecode_t tc;
-  gint i=0;
+  int i=0;
 
   if (event_list==NULL) return 0;
   event=get_first_event(event_list);
 
   while (event!=NULL) {
     tc=get_event_timecode(event);
-    if ((all_events||(get_event_hint(event)==WEED_EVENT_HINT_FRAME&&!weed_plant_has_leaf(event,"audio_clips")))&&(end_tc==0||(tc>=start_tc&&tc<end_tc))) i++;
+    if ((all_events||(get_event_hint(event)==WEED_EVENT_HINT_FRAME&&
+		      !weed_plant_has_leaf(event,"audio_clips")))&&
+	(end_tc==0||(tc>=start_tc&&tc<end_tc))) i++;
     event=get_next_event(event);
   }
   return i;
 }
 
 
+
+int count_resampled_events (weed_plant_t *event_list, double fps) {
+  weed_plant_t *event;
+  weed_timecode_t tc,seg_start_tc=0,seg_end_tc=0;
+
+  int rframes=0,hint,marker_type,error;
+  
+  boolean seg_start=FALSE;
+
+  if (event_list==NULL) return 0;
+  event=get_first_event(event_list);
+
+  while (event!=NULL) {
+    hint=get_event_hint(event);
+    if (hint==WEED_EVENT_HINT_FRAME) {
+      tc=get_event_timecode(event);
+      if (!seg_start) {
+	seg_start_tc=seg_end_tc=tc;
+	seg_start=TRUE;
+      }
+      else {
+	seg_end_tc=tc;
+      }
+    }
+    else {
+      if (hint==WEED_EVENT_HINT_MARKER) {
+	marker_type=weed_get_int_value(event,"lives_type",&error);
+	if (marker_type==EVENT_MARKER_RECORD_END) {
+	  // add (resampled) frames for one recording stretch
+	  if (seg_start) rframes+=1+((double)(seg_end_tc-seg_start_tc))/U_SEC*fps;
+	  seg_start=FALSE;
+	}
+      }
+    }
+    event=get_next_event(event);
+  }
+
+  if (seg_start) rframes+=1+((double)(seg_end_tc-seg_start_tc))/U_SEC*fps;
+
+  return rframes;
+}
+
+
 weed_timecode_t event_list_get_end_tc (weed_plant_t *event_list) {
   if (event_list==NULL||get_last_event(event_list)==NULL) return 0.;
   return get_event_timecode (get_last_event(event_list));
 }
 
-gdouble event_list_get_end_secs (weed_plant_t *event_list) {
+double event_list_get_end_secs (weed_plant_t *event_list) {
   return (event_list_get_end_tc(event_list)/U_SEC);
 }
 
@@ -3693,13 +3920,13 @@
   return get_event_timecode (get_first_event(event_list));
 }
 
-gdouble event_list_get_start_secs (weed_plant_t *event_list) {
+double event_list_get_start_secs (weed_plant_t *event_list) {
   return (event_list_get_start_tc(event_list)/U_SEC);
 }
 
 
 
-gboolean has_audio_frame(weed_plant_t *event_list) {
+boolean has_audio_frame(weed_plant_t *event_list) {
   weed_plant_t *event=get_first_frame_event(event_list);
   while (event!=NULL) {
     if (weed_plant_has_leaf(event,"audio_clips")) return TRUE;
@@ -3712,13 +3939,13 @@
 ///////////////////////////////////////////////////////////////////
 
 
-gboolean render_to_clip (gboolean new_clip) {
+boolean render_to_clip (boolean new_clip) {
   // this function is called to actually start rendering mainw->event_list to a new/current clip
-  gboolean retval=TRUE;
-  gint current_file=mainw->current_file;
-  gboolean response;
-  gint xachans=0,xarate=0,xasamps=0,xse=0;
-  gboolean rendaud=TRUE;
+  boolean retval=TRUE;
+  int current_file=mainw->current_file;
+  boolean response;
+  int xachans=0,xarate=0,xasamps=0,xse=0;
+  boolean rendaud=TRUE;
   gchar *com;
 
   if (mainw->multitrack!=NULL&&mainw->multitrack->pr_audio) d_print(_("Pre-rendering audio..."));
@@ -3731,7 +3958,7 @@
       rdet=create_render_details(2);
 
       if (!has_audio_frame(mainw->event_list)) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->aud_checkbutton), FALSE);
+	lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), FALSE);
 	gtk_widget_set_sensitive(resaudw->aud_checkbutton,FALSE);
       }
       rdet->enc_changed=FALSE;
@@ -3742,17 +3969,17 @@
 	}
       } while (rdet->suggestion_followed);
 
-      xarate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-      xachans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-      xasamps=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+      xarate=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+      xachans=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+      xasamps=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
 
-      rendaud=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton));
+      rendaud=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton));
 
-      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+      if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
 	xse=AFORM_UNSIGNED;;
       }
       else xse=AFORM_SIGNED;
-      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+      if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
 	xse|=AFORM_BIG_ENDIAN;
       }
       else xse|=AFORM_LITTLE_ENDIAN;
@@ -3826,7 +4053,7 @@
     // back up audio to audio.back (in case we overwrite it)
     if (prefs->rec_opts&REC_AUDIO) {
       do_threaded_dialog(_("Backing up audio..."),FALSE);
-      com=g_strdup_printf("smogrify backup_audio \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
       mainw->com_failed=FALSE;
       mainw->error=FALSE;
       mainw->cancelled=CANCEL_NONE;
@@ -3838,7 +4065,7 @@
     }
     else {
       do_threaded_dialog(_("Clearing up clip..."),FALSE);
-      com=g_strdup_printf("smogrify clear_tmp_files \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,FALSE);
       g_free(com);
     }
@@ -3865,7 +4092,7 @@
     mainw->event_list=NULL;
     if (new_clip) {
       gchar *tmp;
-      gint old_file=current_file;
+      int old_file=current_file;
       cfile->start=1;
       cfile->end=cfile->frames;
       set_undoable (NULL,FALSE);
@@ -3939,7 +4166,7 @@
 }
 
 
-gboolean deal_with_render_choice (gboolean add_deinit) {
+boolean deal_with_render_choice (boolean add_deinit) {
   // this is called from saveplay.c after record/playback ends
   // here we deal with the user's wishes as to how to deal with the recorded events
 
@@ -3951,12 +4178,12 @@
   GtkWidget *e_rec_dialog;
   GtkWidget *elist_dialog;
 
-  gint dh,dw,dar,das,dac,dse;
-  gint oplay_start;
-  gdouble df;
+  int dh,dw,dar,das,dac,dse;
+  int oplay_start;
+  double df;
 
-  gboolean new_clip=FALSE;
-  gboolean was_paused=mainw->record_paused;
+  boolean new_clip=FALSE;
+  boolean was_paused=mainw->record_paused;
 
   // record end
   mainw->record=FALSE;
@@ -3985,11 +4212,12 @@
   oplay_start=mainw->play_start;
 
   do {
-    e_rec_dialog=events_rec_dialog(!was_paused);
+    //e_rec_dialog=events_rec_dialog(!was_paused);
+    e_rec_dialog=events_rec_dialog(TRUE);
     gtk_widget_show (e_rec_dialog);
     gtk_dialog_run (GTK_DIALOG (e_rec_dialog));
     gtk_widget_destroy (e_rec_dialog);
-    while (g_main_context_iteration (NULL,FALSE));
+    lives_widget_context_update();
     switch (render_choice) {
     case RENDER_CHOICE_DISCARD:
       if (mainw->current_file>-1) cfile->redoable=FALSE;
@@ -4097,7 +4325,8 @@
 
 
 
-gdouble *get_track_visibility_at_tc(weed_plant_t *event_list, gint ntracks, gint nbtracks, weed_timecode_t tc, weed_plant_t **shortcut, gboolean bleedthru) {
+double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int nbtracks, 
+				    weed_timecode_t tc, weed_plant_t **shortcut, boolean bleedthru) {
   // calculate the "visibility" of each track at timecode tc
   // that is to say, only the front track is visible, except if we have a transition and "host_audio_transition" is set
   // - in which case the track visibilty is proportional to the transition parameter
@@ -4107,18 +4336,20 @@
   // if bleedthru is TRUE, all values are set to 1.0
 
   static weed_plant_t *stored_fmap;
+
   weed_plant_t *frame_event,*fmap;
-  gdouble *vis;
-  gint nxtracks;
-  gint got=-1;
+
+  double *vis;
+  double *matrix[ntracks+nbtracks];
 
   int *clips=NULL,*frames=NULL;
 
+  int nxtracks;
+  int got=-1;
+
   int error;
   register int i,j;
 
-  double *matrix[ntracks+nbtracks];
-
   ntracks+=nbtracks;
 
   if (shortcut==NULL||*shortcut==NULL) stored_fmap=NULL;
@@ -4128,7 +4359,7 @@
 
   nxtracks=weed_leaf_num_elements(frame_event,"clips");
 
-  vis=(gdouble *)g_malloc(ntracks*sizeof(gdouble));
+  vis=(double *)g_malloc(ntracks*sizeof(double));
 
   if (bleedthru) {
     for (i=0;i<ntracks;i++) {
@@ -4166,7 +4397,7 @@
     // thus each row in the matrix represents the contribution from each layer (track)
     if (weed_plant_has_leaf(fmap,"init_events")) {
       weed_plant_t **iev=(weed_plant_t **)weed_get_voidptr_array(fmap,"init_events",&error);
-      gint nins=weed_leaf_num_elements(fmap,"init_events");
+      int nins=weed_leaf_num_elements(fmap,"init_events");
       for (i=0;i<nins;i++) {
 	weed_plant_t *ievent=iev[i];
 	if (weed_plant_has_leaf(ievent,"host_audio_transition")&&
@@ -4177,14 +4408,17 @@
 	  int idx;
 	  if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
 	    weed_plant_t *filter=get_weed_filter(idx);
-	    int tparam=get_transition_param(filter);
+	    int tparam=get_transition_param(filter,FALSE);
 	    weed_plant_t *inst=weed_instance_from_filter(filter);
 	    weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
 	    weed_plant_t *ttmpl=weed_get_plantptr_value(in_params[tparam],"template",&error);
 	    double trans;
-	    void **pchains=weed_get_voidptr_array(ievent,"in_parameters",&error);
 
-	    interpolate_param(inst,tparam,pchains[tparam],tc);
+	    if (weed_plant_has_leaf(ievent,"in_parameters")&&tparam<weed_leaf_num_elements(ievent,"in_parameters")) {
+	      void **pchains=weed_get_voidptr_array(ievent,"in_parameters",&error);
+	      interpolate_param(inst,tparam,pchains[tparam],tc);
+	      weed_free(pchains);
+	    }
 
 	    if (weed_leaf_seed_type(in_params[tparam],"value")==WEED_SEED_DOUBLE) {
 	      double transd=weed_get_double_value(in_params[tparam],"value",&error);
@@ -4269,375 +4503,363 @@
 
 GtkWidget *create_event_list_dialog (weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc) {
   // TODO - some event properties should be editable, e.g. parameter values
+  weed_timecode_t tc,tc_secs;
 
- GtkTreeStore *gtkstore;
- GtkTreeIter iter1,iter2,iter3;
+  GtkTreeStore *gtkstore;
+  GtkTreeIter iter1,iter2,iter3;
 
- gchar **string=NULL;
- int *intval=NULL;
- void **voidval=NULL;
- double *doubval=NULL;
- gint64 *int64val=NULL;
- weed_plant_t *event;
-
- GtkWidget *event_dialog;
- GtkWidget *tree;
- GtkWidget *table;
- GtkWidget *top_vbox;
- GtkWidget *label;
- GtkWidget *ok_button;
- GtkWidget *hbuttonbox;
- GtkWidget *scrolledwindow;
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
-
- gint winsize_h,scr_width=mainw->scr_width;
- gint winsize_v,scr_height=mainw->scr_height;
-
- int i,j,num_elems,seed_type,hint,error;
- weed_timecode_t tc,tc_secs;
- gchar *strval=NULL;
- gchar *text;
-
- char **propnames;
- gchar *oldval=NULL,*final=NULL;
-
- gint rows,currow=0;
-
- if (prefs->event_window_show_frame_events) rows=count_events(event_list,TRUE,start_tc,end_tc);
- else rows=count_events(event_list,TRUE,start_tc,end_tc)-count_events(event_list,FALSE,start_tc,end_tc);
-
- event=get_first_event(event_list);
-
- if (prefs->gui_monitor!=0) {
-   scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
-   scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
- }
+  gchar **string=NULL;
+  int *intval=NULL;
+  void **voidval=NULL;
+  double *doubval=NULL;
+  int64_t *int64val=NULL;
 
- winsize_h=scr_width-100;
- winsize_v=scr_height-100;
- 
- event_dialog = gtk_dialog_new ();
+  weed_plant_t *event;
+
+  GtkWidget *event_dialog;
+  GtkWidget *tree;
+  GtkWidget *table;
+  GtkWidget *top_vbox;
+  GtkWidget *label;
+  GtkWidget *ok_button;
+  GtkWidget *hbuttonbox;
+  GtkWidget *scrolledwindow;
+
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
+
+  GtkAccelGroup *accel_group;
+
+  char **propnames;
+
+  gchar *strval=NULL;
+  gchar *text;
+  gchar *oldval=NULL,*final=NULL;
+
+  int winsize_h,scr_width=mainw->scr_width;
+  int winsize_v,scr_height=mainw->scr_height;
 
- gtk_widget_modify_bg(event_dialog, GTK_STATE_NORMAL, &palette->menu_and_bars);
- gtk_window_set_title (GTK_WINDOW (event_dialog), _("LiVES: Event list"));
- gtk_window_add_accel_group (GTK_WINDOW (event_dialog), mainw->accel_group);
+  int num_elems,seed_type,hint,error;
+  int rows,currow=0;
+
+  register int i,j;
+
+  if (prefs->event_window_show_frame_events) rows=count_events(event_list,TRUE,start_tc,end_tc);
+  else rows=count_events(event_list,TRUE,start_tc,end_tc)-count_events(event_list,FALSE,start_tc,end_tc);
+
+  event=get_first_event(event_list);
+
+  if (prefs->gui_monitor!=0) {
+    scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
+    scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
+  }
+
+  winsize_h=scr_width-100;
+  winsize_v=scr_height-180;
  
- top_vbox=GTK_DIALOG(event_dialog)->vbox;
+  event_dialog = lives_standard_dialog_new (_("LiVES: Event list"),FALSE);
 
- table = gtk_table_new (rows, 6, TRUE);
- gtk_widget_show (table);
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (event_dialog), accel_group);
 
- while (event!=NULL) {
-   tc=get_event_timecode (event);
+  top_vbox=lives_dialog_get_content_area(LIVES_DIALOG(event_dialog));
+
+  table = gtk_table_new (rows, 6, TRUE);
+  gtk_widget_show (table);
+
+  while (event!=NULL) {
+    tc=get_event_timecode (event);
+
+    if (end_tc>0) {
+      if (tc<start_tc) {
+	event=get_next_event(event);
+	continue;
+      }
+      if (tc>=end_tc) break;
+    }
 
-   if (end_tc>0) {
-     if (tc<start_tc) {
-       event=get_next_event(event);
-       continue;
-     }
-     if (tc>=end_tc) break;
-   }
-
-   if ((prefs->event_window_show_frame_events||!WEED_EVENT_IS_FRAME(event))||weed_plant_has_leaf(event,"audio_clips")) {
-     if (!prefs->event_window_show_frame_events&&WEED_EVENT_IS_FRAME(event)) {
-       // TODO - opts should be all frames, only audio frames, no frames
-       // or even better, filter for any event types
-       rows++;
-       gtk_table_resize(GTK_TABLE(table),rows,6);
-     }
+    if ((prefs->event_window_show_frame_events||!WEED_EVENT_IS_FRAME(event))||weed_plant_has_leaf(event,"audio_clips")) {
+      if (!prefs->event_window_show_frame_events&&WEED_EVENT_IS_FRAME(event)) {
+	// TODO - opts should be all frames, only audio frames, no frames
+	// or even better, filter for any event types
+	rows++;
+	gtk_table_resize(GTK_TABLE(table),rows,6);
+      }
 			
-     gtkstore = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+      gtkstore = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
-     gtk_tree_store_append (gtkstore, &iter1, NULL);  /* Acquire an iterator */
-     gtk_tree_store_set (gtkstore, &iter1, TITLE_COLUMN, "Properties", -1);
+      gtk_tree_store_append (gtkstore, &iter1, NULL);  /* Acquire an iterator */
+      gtk_tree_store_set (gtkstore, &iter1, TITLE_COLUMN, "Properties", -1);
 
-     propnames=weed_plant_list_leaves (event);
+      propnames=weed_plant_list_leaves (event);
    
-     for (i=0;propnames[i]!=NULL;i++) {
-       if (!strcmp(propnames[i],"type")||!strcmp(propnames[i],"hint")||!strcmp(propnames[i],"timecode")) {
-	 weed_free(propnames[i]);
-	 continue;
-       }
-       gtk_tree_store_append (gtkstore, &iter2, &iter1);  /* Acquire a child iterator */
+      for (i=0;propnames[i]!=NULL;i++) {
+	if (!strcmp(propnames[i],"type")||!strcmp(propnames[i],"hint")||!strcmp(propnames[i],"timecode")) {
+	  weed_free(propnames[i]);
+	  continue;
+	}
+	gtk_tree_store_append (gtkstore, &iter2, &iter1);  /* Acquire a child iterator */
        
-       if (oldval!=NULL) {
-	 g_free(oldval);
-	 oldval=NULL;
-       }
+	if (oldval!=NULL) {
+	  g_free(oldval);
+	  oldval=NULL;
+	}
        
-       if (final!=NULL) {
-	 g_free(final);
-	 final=NULL;
-       }
+	if (final!=NULL) {
+	  g_free(final);
+	  final=NULL;
+	}
        
-       num_elems=weed_leaf_num_elements (event,propnames[i]);
-       seed_type=weed_leaf_seed_type (event,propnames[i]);
+	num_elems=weed_leaf_num_elements (event,propnames[i]);
+	seed_type=weed_leaf_seed_type (event,propnames[i]);
        
-       switch (seed_type) {
-       case WEED_SEED_INT:
-	 intval=weed_get_int_array (event,propnames[i],&error);
-	 break;
-       case WEED_SEED_INT64:
-	 int64val=weed_get_int64_array (event,propnames[i],&error);
-	 break;
-       case WEED_SEED_BOOLEAN:
-	 intval=weed_get_boolean_array (event,propnames[i],&error);
-	 break;
-       case WEED_SEED_STRING:
-	 string=weed_get_string_array (event,propnames[i],&error);
-	 break;
-       case WEED_SEED_DOUBLE:
-	 doubval=weed_get_double_array (event,propnames[i],&error);
-	 break;
-       case WEED_SEED_VOIDPTR:
-	 voidval=weed_get_voidptr_array (event,propnames[i],&error);
-	 break;
-       case WEED_SEED_PLANTPTR:
-	 voidval=(void **)weed_get_plantptr_array (event,propnames[i],&error);
-	 break;
-       }
+	switch (seed_type) {
+	case WEED_SEED_INT:
+	  intval=weed_get_int_array (event,propnames[i],&error);
+	  break;
+	case WEED_SEED_INT64:
+	  int64val=weed_get_int64_array (event,propnames[i],&error);
+	  break;
+	case WEED_SEED_BOOLEAN:
+	  intval=weed_get_boolean_array (event,propnames[i],&error);
+	  break;
+	case WEED_SEED_STRING:
+	  string=weed_get_string_array (event,propnames[i],&error);
+	  break;
+	case WEED_SEED_DOUBLE:
+	  doubval=weed_get_double_array (event,propnames[i],&error);
+	  break;
+	case WEED_SEED_VOIDPTR:
+	  voidval=weed_get_voidptr_array (event,propnames[i],&error);
+	  break;
+	case WEED_SEED_PLANTPTR:
+	  voidval=(void **)weed_get_plantptr_array (event,propnames[i],&error);
+	  break;
+	}
        
        
-       for (j=0;j<num_elems;j++) {
-	 switch (seed_type) {
-	 case WEED_SEED_INT:
-	   strval=g_strdup_printf("%d",intval[j]);
-	   break;
-	 case WEED_SEED_INT64:
-	   strval=g_strdup_printf("%"PRId64,int64val[j]);
-	   break;
-	 case WEED_SEED_DOUBLE:
-	   strval=g_strdup_printf("%.4f",doubval[j]);
-	   break;
-	 case WEED_SEED_BOOLEAN:
-	   if (intval[j]==WEED_TRUE) strval=g_strdup(_("TRUE"));
-	   else strval=g_strdup(_("FALSE"));
-	   break;
-	 case WEED_SEED_STRING:
-	   strval=g_strdup(string[j]);
-	   weed_free(string[j]);
-	   break;
-	 case WEED_SEED_VOIDPTR:
-	   if (!(strncmp(propnames[i],"init_event",10))) {
-	     weed_plant_t *ievent=(weed_plant_t *)voidval[j];
-	     if (ievent!=NULL) {
-	       gchar *iname=weed_get_string_value(ievent,"filter",&error);
-	       if (iname!=NULL) {
-		 gchar *fname=weed_filter_get_name(weed_get_idx_for_hashname(iname,TRUE));
-		 strval=g_strdup_printf("%p (%s)",voidval[j],fname);
-		 weed_free(fname);
-	       }
-	       weed_free(iname);
-	     }
-	   }
-	   if (strval==NULL) strval=g_strdup_printf("%p",voidval[j]);
-	   break;
-	 case WEED_SEED_PLANTPTR:
-	   strval=g_strdup_printf("-->%p",voidval[j]);
-	   break;
-	 default:
-	   strval=g_strdup("???");
-	   break;
-	 }
-	 if (j==0) {
-	   if (num_elems==1) {
-	     gtk_tree_store_set (gtkstore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, strval, -1);
-	   }
-	   else {
-	     gtk_tree_store_set (gtkstore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, "", -1);
-	     gtk_tree_store_append (gtkstore, &iter3, &iter2);
-	     gtk_tree_store_set (gtkstore, &iter3, VALUE_COLUMN, strval, -1);
-	   }
-       }
-	 else {
-	   gtk_tree_store_append (gtkstore, &iter3, &iter2);
-	   gtk_tree_store_set (gtkstore, &iter3, VALUE_COLUMN, strval, -1);
-	 }
-	 if (strval!=NULL) g_free (strval);
-	 strval=NULL;
-       }
-
-       switch (seed_type) {
-       case WEED_SEED_INT:
-       case WEED_SEED_BOOLEAN:
-	 weed_free(intval);
-	 break;
-       case WEED_SEED_INT64:
-	 weed_free(int64val);
-	 break;
-       case WEED_SEED_DOUBLE:
-	 weed_free(doubval);
-	 break;
-       case WEED_SEED_STRING:
-	 weed_free(string);
-	 break;
-       case WEED_SEED_VOIDPTR:
-       case WEED_SEED_PLANTPTR:
-	 weed_free(voidval);
-	 break;
-       default:
-	 break;
-       }
-       weed_free(propnames[i]);
-     }
+	for (j=0;j<num_elems;j++) {
+	  switch (seed_type) {
+	  case WEED_SEED_INT:
+	    strval=g_strdup_printf("%d",intval[j]);
+	    break;
+	  case WEED_SEED_INT64:
+	    strval=g_strdup_printf("%"PRId64,int64val[j]);
+	    break;
+	  case WEED_SEED_DOUBLE:
+	    strval=g_strdup_printf("%.4f",doubval[j]);
+	    break;
+	  case WEED_SEED_BOOLEAN:
+	    if (intval[j]==WEED_TRUE) strval=g_strdup(_("TRUE"));
+	    else strval=g_strdup(_("FALSE"));
+	    break;
+	  case WEED_SEED_STRING:
+	    strval=g_strdup(string[j]);
+	    weed_free(string[j]);
+	    break;
+	  case WEED_SEED_VOIDPTR:
+	    if (!(strncmp(propnames[i],"init_event",10))) {
+	      weed_plant_t *ievent=(weed_plant_t *)voidval[j];
+	      if (ievent!=NULL) {
+		gchar *iname=weed_get_string_value(ievent,"filter",&error);
+		if (iname!=NULL) {
+		  gchar *fname=weed_filter_get_name(weed_get_idx_for_hashname(iname,TRUE));
+		  strval=g_strdup_printf("%p (%s)",voidval[j],fname);
+		  weed_free(fname);
+		}
+		weed_free(iname);
+	      }
+	    }
+	    if (strval==NULL) strval=g_strdup_printf("%p",voidval[j]);
+	    break;
+	  case WEED_SEED_PLANTPTR:
+	    strval=g_strdup_printf("-->%p",voidval[j]);
+	    break;
+	  default:
+	    strval=g_strdup("???");
+	    break;
+	  }
+	  if (j==0) {
+	    if (num_elems==1) {
+	      gtk_tree_store_set (gtkstore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, strval, -1);
+	    }
+	    else {
+	      gtk_tree_store_set (gtkstore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, "", -1);
+	      gtk_tree_store_append (gtkstore, &iter3, &iter2);
+	      gtk_tree_store_set (gtkstore, &iter3, VALUE_COLUMN, strval, -1);
+	    }
+	  }
+	  else {
+	    gtk_tree_store_append (gtkstore, &iter3, &iter2);
+	    gtk_tree_store_set (gtkstore, &iter3, VALUE_COLUMN, strval, -1);
+	  }
+	  if (strval!=NULL) g_free (strval);
+	  strval=NULL;
+	}
 
-     weed_free (propnames);
+	switch (seed_type) {
+	case WEED_SEED_INT:
+	case WEED_SEED_BOOLEAN:
+	  weed_free(intval);
+	  break;
+	case WEED_SEED_INT64:
+	  weed_free(int64val);
+	  break;
+	case WEED_SEED_DOUBLE:
+	  weed_free(doubval);
+	  break;
+	case WEED_SEED_STRING:
+	  weed_free(string);
+	  break;
+	case WEED_SEED_VOIDPTR:
+	case WEED_SEED_PLANTPTR:
+	  weed_free(voidval);
+	  break;
+	default:
+	  break;
+	}
+	weed_free(propnames[i]);
+      }
 
-     // now add the new treeview
-     
-     g_free(final);
+      weed_free (propnames);
 
-     // timecode
-     tc_secs=tc/U_SECL;
-     tc-=tc_secs*U_SECL;
-     text=g_strdup_printf(_("Timecode=%"PRId64".%"PRId64),tc_secs,tc);
-     label = gtk_label_new (text);
-     g_free(text);
+      // now add the new treeview
      
-     gtk_widget_show (label);
+      g_free(final);
 
-     if (palette->style&STYLE_1) {
-       gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-     }
-
-     
-     gtk_table_attach (GTK_TABLE (table), label, 0, 1, currow, currow+1,
-		       (GtkAttachOptions) (GTK_EXPAND),
-		       (GtkAttachOptions) (0), 0, 0);
+      // timecode
+      tc_secs=tc/U_SECL;
+      tc-=tc_secs*U_SECL;
+      text=g_strdup_printf(_("Timecode=%"PRId64".%"PRId64),tc_secs,tc);
+      label = lives_standard_label_new (text);
+      g_free(text);
      
-     // event type
-     hint=get_event_hint (event);
-     switch (hint) {
-     case WEED_EVENT_HINT_FRAME:
-       label = gtk_label_new ("Frame");
-       break;
-     case WEED_EVENT_HINT_FILTER_INIT:
-       label = gtk_label_new ("Filter on");
-       break;
-     case WEED_EVENT_HINT_FILTER_DEINIT:
-       label = gtk_label_new ("Filter off");
-       break;
-     case WEED_EVENT_HINT_PARAM_CHANGE:
-       label = gtk_label_new ("Parameter change");
-       break;
-     case WEED_EVENT_HINT_FILTER_MAP:
-       label = gtk_label_new ("Filter map");
-       break;
-     case WEED_EVENT_HINT_MARKER:
-       label = gtk_label_new ("Marker");
-       break;
-     default:
-       text=g_strdup_printf("unknown event hint %d",hint);
-       label = gtk_label_new (text);
-       g_free(text);
-     }
+      gtk_table_attach (GTK_TABLE (table), label, 0, 1, currow, currow+1,
+			(GtkAttachOptions) (GTK_EXPAND),
+			(GtkAttachOptions) (0), 0, 0);
      
-     if (palette->style&STYLE_1) {
-       gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-     }
-
-     gtk_widget_show (label);
-     gtk_table_attach (GTK_TABLE (table), label, 1, 2, currow, currow+1,
-		     (GtkAttachOptions) (GTK_EXPAND),
-		     (GtkAttachOptions) (0), 0, 0);
+      // event type
+      hint=get_event_hint (event);
+      switch (hint) {
+      case WEED_EVENT_HINT_FRAME:
+	label = lives_standard_label_new ("Frame");
+	break;
+      case WEED_EVENT_HINT_FILTER_INIT:
+	label = lives_standard_label_new ("Filter on");
+	break;
+      case WEED_EVENT_HINT_FILTER_DEINIT:
+	label = lives_standard_label_new ("Filter off");
+	break;
+      case WEED_EVENT_HINT_PARAM_CHANGE:
+	label = lives_standard_label_new ("Parameter change");
+	break;
+      case WEED_EVENT_HINT_FILTER_MAP:
+	label = lives_standard_label_new ("Filter map");
+	break;
+      case WEED_EVENT_HINT_MARKER:
+	label = lives_standard_label_new ("Marker");
+	break;
+      default:
+	text=g_strdup_printf("unknown event hint %d",hint);
+	label = lives_standard_label_new (text);
+	g_free(text);
+      }
+
+      gtk_table_attach (GTK_TABLE (table), label, 1, 2, currow, currow+1,
+			(GtkAttachOptions) (GTK_EXPAND),
+			(GtkAttachOptions) (0), 0, 0);
      
-     // event id
-     text=g_strdup_printf(("Event id=%p"),(void *)event);
-     label = gtk_label_new (text);
-     g_free(text);
-     gtk_widget_show (label);
-     if (palette->style&STYLE_1) {
-       gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-     }
-     gtk_table_attach (GTK_TABLE (table), label, 2, 3, currow, currow+1,
-		       (GtkAttachOptions) (GTK_EXPAND),
-		       (GtkAttachOptions) (0), 0, 0);
+      // event id
+      text=g_strdup_printf(("Event id=%p"),(void *)event);
+      label = lives_standard_label_new (text);
+      g_free(text);
+
+      gtk_table_attach (GTK_TABLE (table), label, 2, 3, currow, currow+1,
+			(GtkAttachOptions) (GTK_EXPAND),
+			(GtkAttachOptions) (0), 0, 0);
      
-     // properties
-     tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (gtkstore));
-     gtk_widget_modify_base(tree, GTK_STATE_NORMAL, &palette->menu_and_bars);
+      // properties
+      tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (gtkstore));
+      lives_widget_set_base_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
      
-     renderer = gtk_cell_renderer_text_new ();
-     column = gtk_tree_view_column_new_with_attributes (NULL,
-							renderer,
-							"text", TITLE_COLUMN,
-							NULL);
+      renderer = gtk_cell_renderer_text_new ();
+      column = gtk_tree_view_column_new_with_attributes (NULL,
+							 renderer,
+							 "text", TITLE_COLUMN,
+							 NULL);
 
-     gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+      gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
      
-     renderer = gtk_cell_renderer_text_new ();
-     column = gtk_tree_view_column_new_with_attributes ("Keys",
-							renderer,
-							"text", KEY_COLUMN,
-							NULL);
-     gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+      renderer = gtk_cell_renderer_text_new ();
+      column = gtk_tree_view_column_new_with_attributes ("Keys",
+							 renderer,
+							 "text", KEY_COLUMN,
+							 NULL);
+      gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
      
      
-     renderer = gtk_cell_renderer_text_new ();
-     column = gtk_tree_view_column_new_with_attributes ("Values",
-							renderer,
-							"text", VALUE_COLUMN,
-							NULL);
-     gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-     gtk_widget_show (tree);
+      renderer = gtk_cell_renderer_text_new ();
+      column = gtk_tree_view_column_new_with_attributes ("Values",
+							 renderer,
+							 "text", VALUE_COLUMN,
+							 NULL);
+      gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
      
-     gtk_table_attach (GTK_TABLE (table), tree, 3, 6, currow, currow+1,
-		       (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
-		       (GtkAttachOptions) (0), 0, 0);
+      gtk_table_attach (GTK_TABLE (table), tree, 3, 6, currow, currow+1,
+			(GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+			(GtkAttachOptions) (0), 0, 0);
      
-     currow++;
-   }
-   event=get_next_event(event);
- }
-
- scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (scrolledwindow);
- gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), table);
- gtk_widget_set_size_request (scrolledwindow, winsize_h, winsize_v);
- 
- if (palette->style&STYLE_1) {
-   gtk_widget_modify_bg(gtk_bin_get_child (GTK_BIN (scrolledwindow)), GTK_STATE_NORMAL, &palette->normal_back);
- }
- 
- gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolledwindow))),GTK_SHADOW_IN);
+      currow++;
+    }
+    event=get_next_event(event);
+  }
 
- hbuttonbox = gtk_hbutton_box_new ();
- gtk_widget_show (hbuttonbox);
+  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, table);
+  gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
 
- gtk_box_pack_start (GTK_BOX (top_vbox), hbuttonbox, TRUE, TRUE, 0);
+  hbuttonbox = lives_hbutton_box_new ();
+  gtk_widget_show (hbuttonbox);
 
- gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
+  gtk_box_pack_start (GTK_BOX (top_vbox), hbuttonbox, TRUE, TRUE, 0);
 
- ok_button = gtk_button_new_with_mnemonic (_("Close _window"));
- gtk_widget_show (ok_button);
- gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
 
- GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
- gtk_widget_grab_default (ok_button);
+  ok_button = gtk_button_new_with_mnemonic (_("Close _window"));
+  gtk_widget_show (ok_button);
+  gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
+#else
+  gtk_widget_set_size_request(ok_button,DEF_BUTTON_WIDTH*4,-1);
+#endif
+
+  lives_widget_set_can_focus_and_default (ok_button);
+  gtk_widget_grab_default (ok_button);
  
- g_signal_connect (GTK_OBJECT (ok_button), "clicked",
-		   G_CALLBACK (response_ok),
-		   NULL);
-
- if (prefs->gui_monitor!=0) {
-   gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+
-     (mainw->mgeom[prefs->gui_monitor-1].width-event_dialog->allocation.width)/2;
-   gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+
-     (mainw->mgeom[prefs->gui_monitor-1].height-event_dialog->allocation.height)/2;
-   gtk_window_set_screen(GTK_WINDOW(event_dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
-   gtk_window_move(GTK_WINDOW(event_dialog),xcen,ycen);
- }
+  g_signal_connect (GTK_OBJECT (ok_button), "clicked",
+		    G_CALLBACK (response_ok),
+		    NULL);
+
+  gtk_widget_add_accelerator (ok_button, "activate", accel_group,
+			      LIVES_KEY_Escape,  (GdkModifierType)0, (GtkAccelFlags)0);
+
+  if (prefs->gui_monitor!=0) {
+    int xcen=mainw->mgeom[prefs->gui_monitor-1].x+
+      (mainw->mgeom[prefs->gui_monitor-1].width-lives_widget_get_allocation_width(event_dialog))/2;
+    int ycen=mainw->mgeom[prefs->gui_monitor-1].y+
+      (mainw->mgeom[prefs->gui_monitor-1].height-lives_widget_get_allocation_height(event_dialog))/2;
+    gtk_window_set_screen(GTK_WINDOW(event_dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
+    gtk_window_move(GTK_WINDOW(event_dialog),xcen,ycen);
+  }
 
   if (prefs->open_maximised) {
     gtk_window_maximize (GTK_WINDOW(event_dialog));
   }
 
- return event_dialog;
+  gtk_widget_show_all(event_dialog);
+
+  return event_dialog;
 }
 
 
@@ -4661,32 +4883,45 @@
 
 
 
-render_details *create_render_details (gint type) {
+render_details *create_render_details (int type) {
 
   // type == 1 :: pre-save (specified)
   // type == 2 :: render to new clip (!specified)
   // type == 3 :: enter multitrack (!specified)
   // type == 4 :: change during multitrack (!specified)
 
+  static lives_param_t aspect_width,aspect_height;
+
   GtkWidget *label;
   GtkWidget *top_vbox;
+  GtkWidget *dialog_vbox;
+  GtkWidget *scrollw;
   GtkWidget *hbox;
   GtkWidget *vbox;
-  GtkWidget *eventbox;
   GtkWidget *frame;
-  GObject *spinbutton_adj;
   GtkWidget *cancelbutton;
   GtkWidget *alabel;
-  GtkWidget *hsep;
+  GtkWidget *daa;
+
   GtkAccelGroup *rdet_accel_group;
-  GList *encoders=NULL;
-  gboolean specified=FALSE;
+
   GList *ofmt_all=NULL;
   GList *ofmt=NULL;
-  int i;
+  GList *encoders=NULL;
+
+  boolean specified=FALSE;
+  boolean needs_new_encoder=FALSE;
+
+  register int i;
+
+  int scrw,scrh;
+  int dbw;
+
   gchar **array;
 
-  gboolean needs_new_encoder=FALSE;
+  gchar *tmp,*tmp2;
+
+  gchar *title;
 
   if (type==1) specified=TRUE;
 
@@ -4718,117 +4953,97 @@
   }
 
   rdet->enc_changed=FALSE;
-  rdet->dialog = gtk_dialog_new ();
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(rdet->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    if (type==1) gtk_dialog_set_has_separator(GTK_DIALOG(rdet->dialog),FALSE);
-  }
 
-  if (type==3||type==4) gtk_window_set_title (GTK_WINDOW (rdet->dialog), _("LiVES: Multitrack details"));
-  else if (type==1) gtk_window_set_title (GTK_WINDOW (rdet->dialog), _("LiVES: Encoding details"));
-  else gtk_window_set_title (GTK_WINDOW (rdet->dialog), _("LiVES: New clip details"));
+  if (type==3||type==4) title=g_strdup(_("LiVES: Multitrack details"));
+  else if (type==1) title=g_strdup(_("LiVES: Encoding details"));
+  else title=g_strdup(_("LiVES: New clip details"));
+
+  rdet->dialog = lives_standard_dialog_new (title,FALSE);
+
+  g_free(title);
 
-  gtk_container_set_border_width (GTK_CONTAINER (rdet->dialog), 10);
-  gtk_window_set_default_size (GTK_WINDOW (rdet->dialog), 300, 200);
   if (prefs->show_gui&&mainw->is_ready) gtk_window_set_transient_for(GTK_WINDOW(rdet->dialog),GTK_WINDOW(mainw->LiVES));
-  gtk_window_set_modal (GTK_WINDOW (rdet->dialog), TRUE);
+
   rdet_accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (rdet->dialog), rdet_accel_group);
 
-  top_vbox = GTK_DIALOG(rdet->dialog)->vbox;
+  dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(rdet->dialog));
 
+  if (prefs->gui_monitor!=0) {
+    scrw=mainw->mgeom[prefs->gui_monitor-1].width;
+    scrh=mainw->mgeom[prefs->gui_monitor-1].height;
+  }
+  else {
+    scrw=mainw->scr_width;
+    scrh=mainw->scr_height;
+  }
+
+  top_vbox = lives_vbox_new (FALSE, 0);
 
 
+  if (!specified) {
+    dbw=widget_opts.border_width;
+    widget_opts.border_width=0;
+    scrollw = lives_standard_scrolled_window_new (scrw*.8, scrh*.75, top_vbox);
+    widget_opts.border_width=dbw;
+  }
+  else 
+    scrollw = lives_standard_scrolled_window_new (scrw*.35, scrh*.4, top_vbox);
 
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), scrollw, TRUE, TRUE, 0);
 
+  gtk_container_set_border_width (GTK_CONTAINER (top_vbox), 0);
 
   frame = gtk_frame_new (NULL);
-  gtk_widget_show (frame);
 
   if (type!=1) gtk_box_pack_start (GTK_BOX (top_vbox), frame, TRUE, TRUE, 0);
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = lives_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg (frame, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
   
-  label = gtk_label_new (_("Video"));
+  label = lives_standard_label_new (_("Video"));
   gtk_frame_set_label_widget (GTK_FRAME (frame), label);
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  hbox = gtk_hbox_new (FALSE, 50);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-  
-  label = gtk_label_new_with_mnemonic (_ ("_Width"));
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
   
-  spinbutton_adj = (GObject *)gtk_adjustment_new (rdet->width, 2., 100000., 1, 16, 0);
-  
-  rdet->spinbutton_width = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (rdet->spinbutton_width),TRUE);
-  gtk_entry_set_activates_default (GTK_ENTRY (rdet->spinbutton_width), TRUE);
+  rdet->spinbutton_width = lives_standard_spin_button_new 
+    (_("_Width"),TRUE,rdet->width,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL);
   
   g_signal_connect_after (GTK_OBJECT (rdet->spinbutton_width), "value_changed",
 			  G_CALLBACK (rdetw_spinw_changed),
 			  rdet);
   
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), rdet->spinbutton_width, FALSE, FALSE, 10);
-  
-  label = gtk_label_new_with_mnemonic (_ ("_Height"));
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  spinbutton_adj = (GObject *)gtk_adjustment_new (rdet->height, 2., 10000., 1, 16, 0);
-  
-  rdet->spinbutton_height = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (rdet->spinbutton_height),TRUE);
-  gtk_entry_set_activates_default (GTK_ENTRY (rdet->spinbutton_height), TRUE);
+  rdet->spinbutton_height = lives_standard_spin_button_new 
+    (_("_Height"),TRUE,rdet->height,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL);
   
   g_signal_connect_after (GTK_OBJECT (rdet->spinbutton_height), "value_changed",
 			  G_CALLBACK (rdetw_spinh_changed),
 			  rdet);
-  
-
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), rdet->spinbutton_height, FALSE, FALSE, 10);
 
   // add aspect button
   if (type==1) {
-    lives_param_t param;
     // add "aspectratio" widget
     init_special();
-    add_to_special("aspect|-100|-101|",NULL);
-    param.widgets[0]=rdet->spinbutton_width;
-    check_for_special (&param,-100,GTK_BOX(vbox),NULL);
-    param.widgets[0]=rdet->spinbutton_height;
-    check_for_special (&param,-101,GTK_BOX(vbox),NULL);
-  }
 
+    aspect_width.widgets[0]=rdet->spinbutton_width;
+    aspect_height.widgets[0]=rdet->spinbutton_height;
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-  
-  label = gtk_label_new_with_mnemonic (_ ("_Frames per second"));
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+    set_aspect_ratio_widgets(&aspect_width,&aspect_height);
+    check_for_special (NULL,&aspect_width,LIVES_BOX(vbox));
+    check_for_special (NULL,&aspect_height,LIVES_BOX(vbox));
   }
-  
-  spinbutton_adj = (GObject *)gtk_adjustment_new (rdet->fps, 1., FPS_MAX, 1, 10, 0);
-  
-  rdet->spinbutton_fps = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 3);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (rdet->spinbutton_fps),TRUE);
-  gtk_entry_set_activates_default (GTK_ENTRY (rdet->spinbutton_fps), TRUE);
+
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  rdet->spinbutton_fps = lives_standard_spin_button_new 
+    (_("_Frames per second"),TRUE,rdet->fps,1.,FPS_MAX,1.,10.,0,LIVES_BOX(hbox),NULL);
   
   if (type==4&&mainw->multitrack->event_list!=NULL) gtk_widget_set_sensitive(rdet->spinbutton_fps,FALSE);
   
@@ -4836,83 +5051,53 @@
 			  G_CALLBACK (rdetw_spinf_changed),
 			  rdet);
   
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), rdet->spinbutton_fps, FALSE, FALSE, 10);
-  
+  // TODO
   rdet->pertrack_checkbutton = gtk_check_button_new ();
   rdet->backaudio_checkbutton = gtk_check_button_new ();
   
-  if (type==3) resaudw=create_resaudw(3,rdet,NULL);
-  else if (type!=1) resaudw=create_resaudw(10,rdet,NULL);
+  if (type==3) resaudw=create_resaudw(3,rdet,top_vbox);
+  else if (type!=1) resaudw=create_resaudw(10,rdet,top_vbox);
 
   if (type==3) {
     // extra opts
     
-    label= gtk_label_new (_("Options"));
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    
-    gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, 10);
+    label= lives_standard_label_new (_("Options"));
     
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new_with_mnemonic (_("Enable _backing audio track"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),rdet->backaudio_checkbutton);
+    gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
     
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      rdet->backaudio_checkbutton);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, 10);
-    
-    gtk_box_pack_start (GTK_BOX (hbox), rdet->backaudio_checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (rdet->backaudio_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-    
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rdet->backaudio_checkbutton), prefs->mt_backaudio>0);
-    
-    gtk_widget_set_sensitive(rdet->backaudio_checkbutton,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new_with_mnemonic (_("Audio track _per video track"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),rdet->pertrack_checkbutton);
-    
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      rdet->pertrack_checkbutton);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    
-    gtk_box_pack_end (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    gtk_box_pack_end (GTK_BOX (hbox), rdet->pertrack_checkbutton, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (rdet->pertrack_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    rdet->backaudio_checkbutton=lives_standard_check_button_new
+      (_("Enable _backing audio track"),TRUE,LIVES_BOX(hbox),NULL);
+
+    add_fill_to_box(LIVES_BOX(hbox));
+
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rdet->backaudio_checkbutton), prefs->mt_backaudio>0);
     
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rdet->pertrack_checkbutton), prefs->mt_pertrack_audio);
+    gtk_widget_set_sensitive(rdet->backaudio_checkbutton, 
+			     lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+
+    rdet->pertrack_checkbutton=lives_standard_check_button_new 
+      (_("Audio track _per video track"),TRUE,LIVES_BOX(hbox),NULL);
 
-    gtk_widget_set_sensitive(rdet->pertrack_checkbutton,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rdet->pertrack_checkbutton), prefs->mt_pertrack_audio);
+
+    gtk_widget_set_sensitive(rdet->pertrack_checkbutton, 
+			     lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
 
   }
   
   
+#ifndef IS_MINGW
   if (capable->has_encoder_plugins) encoders=get_plugin_list (PLUGIN_ENCODERS,FALSE,NULL,NULL);
+#else
+  if (capable->has_encoder_plugins) encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL);
+#endif
   
   if (!specified) encoders=filter_encoders_by_img_ext(encoders,prefs->image_ext);
   else {
-    GList *encs=encoders=filter_encoders_by_img_ext(encoders,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+    GList *encs=encoders=filter_encoders_by_img_ext(encoders,get_image_ext_for_type(cfile->img_type));
     needs_new_encoder=TRUE;
     while (encs!=NULL) {
       if (!strcmp((char *)encs->data,prefs->encoder.name)) {
@@ -4924,41 +5109,34 @@
 
   }
 
-  hsep = gtk_hseparator_new ();
-  label= gtk_label_new ("");
   if (!specified) {
-    gtk_box_pack_start (GTK_BOX (top_vbox), hsep, TRUE, TRUE, 0);
-    if (type!=3) gtk_label_set_text(GTK_LABEL(label),_ ("Options"));
-  }
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+    add_hsep_to_box (LIVES_BOX (top_vbox));
+    if (type!=3) {
+      label=lives_standard_label_new(_("Options"));
+      gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+    }
   }
 
-  gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, 10);
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
 
-  label = gtk_label_new (_("      Target Encoder           "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label = lives_standard_label_new (_("Target Encoder"));
   gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, 0);
-  rdet->encoder_combo = gtk_combo_box_new_text();
 
   if (!specified) {
-    rdet->encoder_name=g_strdup(mainw->any_string);
+    rdet->encoder_name=g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
     encoders=g_list_prepend(encoders,g_strdup(rdet->encoder_name));
   }
   else {
     rdet->encoder_name=g_strdup(prefs->encoder.name);
   }
 
-  gtk_box_pack_start (GTK_BOX (top_vbox), rdet->encoder_combo, FALSE, FALSE, 10);
+  rdet->encoder_combo = lives_standard_combo_new(NULL,FALSE,encoders,LIVES_BOX(top_vbox),NULL);
 
-  populate_combo_box(GTK_COMBO_BOX(rdet->encoder_combo), encoders);
+  rdet->encoder_name_fn = g_signal_connect_after(GTK_COMBO_BOX(rdet->encoder_combo), "changed",
+						 G_CALLBACK(on_encoder_entry_changed), rdet);
 
-  rdet->encoder_name_fn = g_signal_connect_after(GTK_COMBO_BOX(rdet->encoder_combo), "changed", G_CALLBACK(on_encoder_entry_changed), rdet);
   g_signal_handler_block(rdet->encoder_combo, rdet->encoder_name_fn);
-  set_combo_box_active_string(GTK_COMBO_BOX(rdet->encoder_combo), rdet->encoder_name);
+  lives_combo_set_active_string(LIVES_COMBO(rdet->encoder_combo), rdet->encoder_name);
   g_signal_handler_unblock(rdet->encoder_combo, rdet->encoder_name_fn);
 
   if (encoders!=NULL) {
@@ -4969,9 +5147,10 @@
   encoders=NULL;
   
   if (!specified) {
-    ofmt=g_list_append(ofmt,g_strdup(mainw->any_string));
+    ofmt=g_list_append(ofmt,g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
   }
   else {
+    add_fill_to_box(LIVES_BOX(top_vbox));
     if (capable->has_encoder_plugins) {
       // reqest formats from the encoder plugin
       if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
@@ -4994,30 +5173,23 @@
     }
   }
 
-  label = gtk_label_new (_("    Output format           "));
-  rdet->ofmt_combo = gtk_combo_box_new_text();
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label = lives_standard_label_new (_("Output format"));
+  gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, 0);
 
-  populate_combo_box(GTK_COMBO_BOX(rdet->ofmt_combo), ofmt);
-  gtk_combo_box_set_active(GTK_COMBO_BOX(rdet->ofmt_combo), 0);
+  rdet->ofmt_combo = lives_standard_combo_new(NULL,FALSE,ofmt,LIVES_BOX(top_vbox),NULL);
+
+  lives_combo_populate(LIVES_COMBO(rdet->ofmt_combo), ofmt);
 
   g_list_free_strings(ofmt);
   g_list_free(ofmt);
   
-  rdet->encoder_ofmt_fn=g_signal_connect_after (GTK_COMBO_BOX(rdet->ofmt_combo), "changed", G_CALLBACK (on_encoder_ofmt_changed), rdet);
-  gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), rdet->ofmt_combo, FALSE, FALSE, 10);
-  
-  rdet->acodec_combo = gtk_combo_box_new_text ();
-  alabel = gtk_label_new (_("    Audio format           "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(alabel, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (top_vbox), alabel, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), rdet->acodec_combo, FALSE, FALSE, 10);
-  
+  rdet->encoder_ofmt_fn=g_signal_connect_after (GTK_COMBO_BOX(rdet->ofmt_combo), "changed", 
+						G_CALLBACK (on_encoder_ofmt_changed), rdet);
+
+
+  alabel = lives_standard_label_new (_("Audio format"));
+
+
   if (!specified) {
     // add "Any" string
     if (prefs->acodec_list!=NULL) {
@@ -5025,69 +5197,74 @@
       g_list_free (prefs->acodec_list);
       prefs->acodec_list=NULL;
     }
-    prefs->acodec_list=g_list_append(prefs->acodec_list,g_strdup(mainw->any_string));
-    populate_combo_box(GTK_COMBO_BOX(rdet->acodec_combo), prefs->acodec_list);
-    gtk_combo_box_set_active(GTK_COMBO_BOX(rdet->acodec_combo), 0);
+    prefs->acodec_list=g_list_append(prefs->acodec_list,g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
+    gtk_box_pack_start (GTK_BOX (top_vbox), alabel, FALSE, FALSE, 0);
+    rdet->acodec_combo = lives_standard_combo_new (NULL,FALSE,prefs->acodec_list,LIVES_BOX(top_vbox),NULL);
   }
   else {
+    add_fill_to_box(LIVES_BOX(top_vbox));
+    gtk_box_pack_start (GTK_BOX (top_vbox), alabel, FALSE, FALSE, 0);
     g_signal_handler_block(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
-    set_combo_box_active_string(GTK_COMBO_BOX(rdet->ofmt_combo), prefs->encoder.of_desc);
+    lives_combo_set_active_string(LIVES_COMBO(rdet->ofmt_combo), prefs->encoder.of_desc);
     g_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
 
+    rdet->acodec_combo = lives_standard_combo_new (NULL,FALSE,NULL,LIVES_BOX(top_vbox),NULL);
+
     check_encoder_restrictions(TRUE,FALSE,TRUE);
     future_prefs->encoder.of_allowed_acodecs=prefs->encoder.of_allowed_acodecs;
     set_acodec_list_from_allowed(NULL,rdet);
-    
-    gtk_window_set_default_size (GTK_WINDOW (rdet->dialog), 300, 400);
-    
   }
 
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  rdet->always_checkbutton = gtk_check_button_new ();
-  
-  rdet->always_hbox = gtk_hbox_new (FALSE, 0);
+  rdet->always_hbox = lives_hbox_new (TRUE, widget_opts.packing_width*2);
 
-  eventbox=gtk_event_box_new();
+  rdet->always_checkbutton=lives_standard_check_button_new ((tmp=g_strdup(_("_Always use these values"))),TRUE,
+							    LIVES_BOX(rdet->always_hbox),
+							    (tmp2=g_strdup( _("Check this button to always use these values when entering multitrack mode. Choice can be re-enabled from Preferences."))));
 
-  label=gtk_label_new_with_mnemonic (_("_Always use these values"));
-  gtk_widget_set_tooltip_text( rdet->always_checkbutton, _("Check this button to always use these values when entering multitrack mode. Choice can be re-enabled from Preferences."));
-  gtk_tooltips_copy(eventbox,rdet->always_checkbutton);
-  
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),rdet->always_checkbutton);
-  
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    rdet->always_checkbutton);
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  gtk_box_pack_start (GTK_BOX (rdet->always_hbox), rdet->always_checkbutton, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (rdet->always_hbox), eventbox, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(rdet->dialog)->action_area), rdet->always_hbox, FALSE, FALSE, 0);
+  g_free(tmp);
+  g_free(tmp2);
+
+  add_fill_to_box(LIVES_BOX(rdet->always_hbox));
 
+  daa=lives_dialog_get_action_area(LIVES_DIALOG(rdet->dialog));
+
+  gtk_box_pack_start (GTK_BOX (daa), rdet->always_hbox, FALSE, FALSE, widget_opts.packing_width*2);
+
+  add_fill_to_box(GTK_BOX (daa));
+
+  if (!specified) {
+  }
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   if (!(prefs->startup_interface==STARTUP_MT&&!mainw->is_ready)) {
     gtk_dialog_add_action_widget (GTK_DIALOG (rdet->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
   }
-  else add_fill_to_box(GTK_BOX (GTK_DIALOG(rdet->dialog)->action_area));
+  else add_fill_to_box(GTK_BOX (daa));
+
+  lives_widget_set_can_focus (cancelbutton,TRUE);
 
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_FOCUS);
 
+  if (!specified) {
+    rdet->okbutton = gtk_button_new_from_stock ("gtk-ok");
+
+#if !GTK_CHECK_VERSION(3,0,0)
+    gtk_button_box_set_child_size (GTK_BUTTON_BOX (daa), DEF_BUTTON_WIDTH, -1);
+#endif
+  }
+  else  {
+    rdet->okbutton = gtk_button_new_from_stock ("gtk-go-forward");
+    gtk_button_set_label(GTK_BUTTON(rdet->okbutton),_("_Next"));
+  }
 
-  rdet->okbutton = gtk_button_new_from_stock ("gtk-ok");
   gtk_dialog_add_action_widget (GTK_DIALOG (rdet->dialog), rdet->okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (rdet->okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (rdet->okbutton);
   gtk_widget_grab_default (rdet->okbutton);
 
-
   gtk_widget_add_accelerator (cancelbutton, "activate", rdet_accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
 
   gtk_widget_show_all (rdet->dialog);
@@ -5097,7 +5274,7 @@
   
   if (needs_new_encoder) {
     gtk_widget_set_sensitive(rdet->okbutton,FALSE);
-    while (g_main_context_iteration(NULL,FALSE)); // force showing of transient window
+    lives_widget_context_update(); // force showing of transient window
     do_encoder_img_ftm_error(rdet);
   }

LiVES-1.6.1.tar.bz2/src/events.h -> LiVES-2.0.3.tar.bz2/src/events.h Changed

@@ -1,6 +1,6 @@
 // events.h
 // LiVES
-// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2005 - 2010 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -10,34 +10,50 @@
 #ifndef HAS_LIVES_EVENTS_H
 #define HAS_LIVES_EVENTS_H
 
-weed_plant_t *append_frame_event (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames) WARN_UNUSED;
-weed_plant_t *append_filter_init_event (weed_plant_t *event_list, weed_timecode_t tc, int filter_idx, int num_in_tracks) WARN_UNUSED;
-weed_plant_t *append_filter_deinit_event (weed_plant_t *event_list, weed_timecode_t tc, void *init_event, void **pchain) WARN_UNUSED;
+weed_plant_t *append_frame_event (weed_plant_t *event_list, weed_timecode_t tc, int numframes, 
+				  int *clips, int *frames) WARN_UNUSED;
+weed_plant_t *append_filter_init_event (weed_plant_t *event_list, weed_timecode_t tc, 
+					int filter_idx, int num_in_tracks, int key, weed_plant_t *inst) WARN_UNUSED;
+weed_plant_t *append_filter_deinit_event (weed_plant_t *event_list, weed_timecode_t tc, 
+					  void *init_event, void **pchain) WARN_UNUSED;
 weed_plant_t *append_filter_map_event (weed_plant_t *event_list, weed_timecode_t tc, void **init_events) WARN_UNUSED;
-weed_plant_t *append_param_change_event (weed_plant_t *event_list, weed_timecode_t tc, gint pnum, weed_plant_t *param, void *init_event, void **pchain) WARN_UNUSED;
+weed_plant_t *append_param_change_event (weed_plant_t *event_list, weed_timecode_t tc, int pnum, 
+					 weed_plant_t *param, void *init_event, void **pchain) WARN_UNUSED;
 weed_plant_t *append_marker_event (weed_plant_t *event_list, weed_timecode_t tc, int marker_type) WARN_UNUSED;
 
 /** will either insert or replace */
-weed_plant_t *insert_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames, weed_plant_t **shortcut) WARN_UNUSED;
-void insert_audio_event_at(weed_plant_t *event_list,weed_plant_t *event, gint track, gint clipnum, gdouble time, gdouble vel);
+weed_plant_t *insert_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, int numframes, 
+				     int *clips, int *frames, weed_plant_t **shortcut) WARN_UNUSED;
+void insert_audio_event_at(weed_plant_t *event_list,weed_plant_t *event, int track, int clipnum, 
+			   double time, double vel);
 void remove_audio_for_track (weed_plant_t *event, int track);
-weed_plant_t *insert_blank_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut) WARN_UNUSED;
+weed_plant_t *insert_blank_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, 
+					   weed_plant_t **shortcut) WARN_UNUSED;
 
-void remove_frame_from_event (weed_plant_t *event_list, weed_plant_t *event, gint track);
+void remove_frame_from_event (weed_plant_t *event_list, weed_plant_t *event, int track);
 void remove_end_blank_frames (weed_plant_t *event_list);
 void remove_filter_from_event_list(weed_plant_t *event_list, weed_plant_t *init_event);
 
-weed_plant_t *process_events (weed_plant_t *next_event, weed_timecode_t curr_tc); ///< RT playback
+weed_plant_t *process_events (weed_plant_t *next_event, boolean process_audio, weed_timecode_t curr_tc); ///< RT playback
 void event_list_close_start_gap (weed_plant_t *event_list);
-void event_list_add_track (weed_plant_t *event_list, gint layer);
+void event_list_add_track (weed_plant_t *event_list, int layer);
+void add_track_to_avol_init(weed_plant_t *filter, weed_plant_t *event, int nbtracks, boolean behind);
 void event_list_free (weed_plant_t *event_list);
-void event_list_replace_events (weed_plant_t *event_list, weed_plant_t *new_event_list); ///<replace events in event_list with events in new_event_list
-weed_plant_t *event_copy_and_insert (weed_plant_t *in_event, weed_plant_t *event_list); ///< called during quantisation 
-gint count_events (weed_plant_t *event_list, gboolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc); ///< if all_events is FALSE we only count FRAME events
 
-gboolean event_list_to_block (weed_plant_t *event_list, gint num_events);
-gdouble event_list_get_end_secs (weed_plant_t *event_list);
-gdouble event_list_get_start_secs (weed_plant_t *event_list);
+/// replace events in event_list with events in new_event_list
+void event_list_replace_events (weed_plant_t *event_list, weed_plant_t *new_event_list);
+
+/// called during quantisation 
+weed_plant_t *event_copy_and_insert (weed_plant_t *in_event, weed_plant_t *event_list);
+
+/// if all_events is FALSE we only count FRAME events
+int count_events (weed_plant_t *event_list, gboolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc);
+
+int count_resampled_events (weed_plant_t *event_list, double fps);
+
+gboolean event_list_to_block (weed_plant_t *event_list, int num_events);
+double event_list_get_end_secs (weed_plant_t *event_list);
+double event_list_get_start_secs (weed_plant_t *event_list);
 weed_timecode_t event_list_get_end_tc (weed_plant_t *event_list);
 weed_timecode_t event_list_get_start_tc (weed_plant_t *event_list);
 
@@ -50,7 +66,7 @@
 weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, gboolean exact);
 weed_plant_t *get_frame_event_at_or_before (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut);
 gboolean filter_map_after_frame(weed_plant_t *fmap);
-gboolean init_event_is_relevant(weed_plant_t *init_event, gint ctrack);
+gboolean init_event_is_relevant(weed_plant_t *init_event, int ctrack);
 
 
 // definitions in events.c
@@ -75,16 +91,17 @@
 gboolean has_audio_frame(weed_plant_t *event_list);
 int get_frame_event_clip (weed_plant_t *, int layer);
 int get_frame_event_frame (weed_plant_t *, int layer);
-gboolean frame_event_has_frame_for_track (weed_plant_t *event, gint track);
-gdouble *get_track_visibility_at_tc(weed_plant_t *event_list, gint ntracks, gint n_back_tracks, weed_timecode_t tc, weed_plant_t **shortcut, gboolean bleedthru);
+gboolean frame_event_has_frame_for_track (weed_plant_t *event, int track);
+double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int n_back_tracks, 
+				    weed_timecode_t tc, weed_plant_t **shortcut, gboolean bleedthru);
 
 //////////////////////////////////////////////////////////
 ///// render details //////////
 
 typedef struct {
-  gint width;
-  gint height;
-  gdouble fps;
+  int width;
+  int height;
+  double fps;
   gboolean ratio_fps;
   GtkWidget *dialog;
   GtkWidget *okbutton;
@@ -107,10 +124,10 @@
 
   gboolean is_encoding;
 
-  gint arate;
-  gint achans;
-  gint asamps;
-  gint aendian;
+  int arate;
+  int achans;
+  int asamps;
+  int aendian;
 
 } render_details;
 
@@ -122,7 +139,7 @@
 
 
 GtkWidget *events_rec_dialog (gboolean allow_mt);
-gint get_render_choice (void);
+int get_render_choice (void);
 gboolean deal_with_render_choice (gboolean add_deinit);
 
 #define RENDER_CHOICE_DISCARD 0
@@ -133,38 +150,40 @@
 #define RENDER_CHOICE_EVENT_LIST 5
 
 GtkWidget *create_event_list_dialog (weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc);
-render_details *create_render_details (gint type);
+render_details *create_render_details (int type);
 
 ////////////////////////////////////////////////////////////////
 /// rendering
 
-gboolean render_to_clip (gboolean new_clip); ///< render to clip
-gboolean start_render_effect_events (weed_plant_t *event_list); ///< render to clip
+boolean render_to_clip (boolean new_clip); ///< render to clip
+boolean start_render_effect_events (weed_plant_t *event_list); ///< render to clip
 
 
 // effect insertion/updating
 void insert_filter_init_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event);
-void **filter_init_add_pchanges (weed_plant_t *event_list, weed_plant_t *filter, weed_plant_t *init_event, int ntracks);
+void **filter_init_add_pchanges (weed_plant_t *event_list, weed_plant_t *filter, weed_plant_t *init_event, int ntracks, int leave);
 void insert_filter_deinit_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event);
-gboolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event, gboolean before_frames);
-weed_plant_t *get_filter_map_before(weed_plant_t *event, gint ctrack, weed_plant_t *stop_event);
-weed_plant_t *get_filter_map_after(weed_plant_t *event, gint ctrack);
-void **get_init_events_before(weed_plant_t *event, weed_plant_t *init_event, gboolean add);
+boolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event, 
+				    boolean before_frames);
+weed_plant_t *get_filter_map_before(weed_plant_t *event, int ctrack, weed_plant_t *stop_event);
+weed_plant_t *get_filter_map_after(weed_plant_t *event, int ctrack);
+void **get_init_events_before(weed_plant_t *event, weed_plant_t *init_event, boolean add);
 void update_filter_maps (weed_plant_t *event, weed_plant_t *end_event, weed_plant_t *init_event);
 void insert_param_change_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event);
 void insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, gpointer data);
 
 void add_init_event_to_filter_map(weed_plant_t *fmap, weed_plant_t *event, void **hints);
-gboolean init_event_in_list(void **init_events, int num_inits, weed_plant_t *event);
-gboolean filter_init_has_owner(weed_plant_t *init_event, int track);
-gboolean init_event_is_process_last(weed_plant_t *event);
+boolean init_event_in_list(void **init_events, int num_inits, weed_plant_t *event);
+boolean filter_init_has_owner(weed_plant_t *init_event, int track);
+boolean init_event_is_process_last(weed_plant_t *event);
 
 // effect deletion/moving
-gboolean move_event_right(weed_plant_t *event_list, weed_plant_t *event, gboolean can_stay, gdouble fps);
-gboolean move_event_left(weed_plant_t *event_list, weed_plant_t *event, gboolean can_stay, gdouble fps);
+boolean move_event_right(weed_plant_t *event_list, weed_plant_t *event, boolean can_stay, double fps);
+boolean move_event_left(weed_plant_t *event_list, weed_plant_t *event, boolean can_stay, double fps);
 
-void move_filter_init_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *init_event, gdouble fps);
-void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event, gdouble fps, gboolean rescale_pchanges);
+void move_filter_init_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *init_event, double fps);
+void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event, 
+			      double fps, boolean rescale_pchanges);
 
 // event deletion
 void unlink_event(weed_plant_t *event_list, weed_plant_t *event);
@@ -174,20 +193,25 @@
 void replace_event(weed_plant_t *event_list, weed_plant_t *at_event,weed_plant_t *event);
 
 // event insertion
-gboolean insert_event_before(weed_plant_t *at_event,weed_plant_t *event);
-gboolean insert_event_after(weed_plant_t *at_event,weed_plant_t *event);
+boolean insert_event_before(weed_plant_t *at_event,weed_plant_t *event);
+boolean insert_event_after(weed_plant_t *at_event,weed_plant_t *event);
 
 // param changes
 void ***get_event_pchains(void);
 weed_timecode_t get_next_paramchange(void **pchange_next,weed_timecode_t end_tc);
 weed_timecode_t get_prev_paramchange(void **pchange_next,weed_timecode_t start_tc);
-gboolean is_init_pchange(weed_plant_t *init_event, weed_plant_t *pchange_event);
-void free_pchains(gint key);
+boolean is_init_pchange(weed_plant_t *init_event, weed_plant_t *pchange_event);
+void free_pchains(int key);
 
 // audio
-int get_audio_frame_clip (weed_plant_t *event, int layer); ///< returns clip number for track layer (layer==-1 is backing audio)
-double get_audio_frame_vel (weed_plant_t *event, int layer); ///< returns velocity for track layer (layer==-1 is backing audio)
-double get_audio_frame_seek (weed_plant_t *event, int layer); ///< returns velocity for track layer (layer==-1 is backing audio)
+/// returns clip number for track layer (layer==-1 is backing audio)
+int get_audio_frame_clip (weed_plant_t *event, int layer);
+ 
+/// returns velocity for track layer (layer==-1 is backing audio)
+double get_audio_frame_vel (weed_plant_t *event, int layer);
+
+/// returns velocity for track layer (layer==-1 is backing audio)
+double get_audio_frame_seek (weed_plant_t *event, int layer);
 
 
 // playback
@@ -195,7 +219,7 @@
 void backup_host_tags(weed_plant_t *event_list, weed_timecode_t curr_tc);
 void restore_host_tags(weed_plant_t *event_list, weed_timecode_t curr_tc);
 
-gboolean has_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut);
+boolean has_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut);
 
 
 #define EVENT_MARKER_BLOCK_START 1

LiVES-1.6.1.tar.bz2/src/framedraw.c -> LiVES-2.0.3.tar.bz2/src/framedraw.c Changed

@@ -1,6 +1,6 @@
 // framedraw.c
 // LiVES
-// (c) G. Finch (salsaman@xs4all.nl,salsaman@gmail.com) 2002 - 2012
+// (c) G. Finch (salsaman@gmail.com) 2002 - 2013
 // see file COPYING for licensing details : released under the GNU GPL 3 or later
 
 // functions for the 'framedraw' widget - lets users draw on frames :-)
@@ -17,15 +17,20 @@
 #include "interface.h"
 #include "effects.h"
 #include "cvirtual.h"
+#include "framedraw.h"
 
 // set by mouse button press
-static gint xstart,ystart;
-static gboolean b1_held;
+static double xstart,ystart;
+static double xcurrent,ycurrent;
+static volatile boolean b1_held;
 
-static gint fdwidth,fdheight;
+static volatile boolean noupdate=FALSE;
 
-static gdouble calc_fd_scale(gint width, gint height) {
-  gdouble scale=1.;
+static GtkWidget *fbord_eventbox;
+
+
+static double calc_fd_scale(int width, int height) {
+  double scale=1.;
 
  if (width<MIN_PRE_X) {
     width=MIN_PRE_X;
@@ -34,27 +39,53 @@
     height=MIN_PRE_Y;
   }
 
-  if (width>MAX_PRE_X) scale=(gdouble)width/(gdouble)MAX_PRE_X;
-  if (height>MAX_PRE_Y&&(height/MAX_PRE_Y>scale)) scale=(gdouble)height/(gdouble)MAX_PRE_Y;
+  if (width>MAX_PRE_X) scale=(double)width/(double)MAX_PRE_X;
+  if (height>MAX_PRE_Y&&(height/MAX_PRE_Y>scale)) scale=(double)height/(double)MAX_PRE_Y;
   return scale;
 
 }
 
 static void start_preview (GtkButton *button, lives_rfx_t *rfx) {
   int i;
-  gchar *com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+  gchar *com;
 
   gtk_widget_set_sensitive(mainw->framedraw_preview,FALSE);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   if (mainw->did_rfx_preview) {
+#ifndef IS_MINGW
+    com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
     lives_system(com,TRUE); // try to stop any in-progress preview
+#else
+    // get pid from backend
+    FILE *rfile;
+    ssize_t rlen;
+    char val[16];
+    int pid;
+    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    rfile=popen(com,"r");
+    rlen=fread(val,1,16,rfile);
+    pclose(rfile);
+    memset(val+rlen,0,1);
+    pid=atoi(val);
+    
+    lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+    g_free(com);
+
+    if (cfile->start==0) {
+      cfile->start=1;
+      cfile->end=cfile->frames;
+    }
+
     do_rfx_cleanup(rfx);
   }
 
-  g_free(com);
-
-  com=g_strdup_printf("smogrify clear_pre_files \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+  com=g_strdup_printf("%s clear_pre_files \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+#else
+  com=g_strdup_printf("%s clear_pre_files \"%s\" 2>NUL",prefs->backend_sync,cfile->handle);
+#endif
   lives_system(com,TRUE); // clear any .pre files from before
 
   for (i=0;i<rfx->num_params;i++) {
@@ -93,16 +124,8 @@
 
 
 
-void framedraw_connect(lives_special_framedraw_rect_t *framedraw, gint width, gint height, lives_rfx_t *rfx) {
-  mainw->framedraw_bitmap = gdk_pixmap_new (NULL, width, height, 1);
-  if (mainw->framedraw_bitmap!=NULL) mainw->framedraw_bitmapgc=gdk_gc_new (mainw->framedraw_bitmap);
+void framedraw_connect(lives_special_framedraw_rect_t *framedraw, int width, int height, lives_rfx_t *rfx) {
 
-  gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		      mainw->framedraw_bitmapgc,
-		      TRUE,
-		      0, 0,
-		      width, height
-		      );
 
   // add mouse fn's so we can draw on frames
   g_signal_connect (GTK_OBJECT (mainw->framedraw), "motion_notify_event",
@@ -119,7 +142,9 @@
 
   framedraw_connect_spinbutton(framedraw,rfx);
 
-  gtk_widget_modify_bg (mainw->fd_frame, GTK_STATE_NORMAL, &palette->light_red);
+  lives_widget_set_bg_color (mainw->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
+  lives_widget_set_bg_color (fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
+
   framedraw_redraw(framedraw, TRUE, NULL);
 }
 
@@ -128,10 +153,7 @@
   GtkWidget *label;
 
   // TRANSLATORS - Preview refers to preview window; keep this phrase short
-  label=gtk_label_new(_("You can click in Preview to change these values"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label=lives_standard_label_new(_("You can click in Preview to change these values"));
   gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
 }
 
@@ -142,7 +164,7 @@
   framedraw_add_label(box);
 
   mainw->framedraw_reset = gtk_button_new_from_stock ("gtk-refresh");
-  hbox_rst = gtk_hbox_new (FALSE, 0);
+  hbox_rst = lives_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (box), hbox_rst, FALSE, FALSE, 0);
   
   gtk_button_set_label (GTK_BUTTON (mainw->framedraw_reset),_ ("_Reset Values"));
@@ -154,10 +176,12 @@
 }
 
 
+static boolean expose_fd_event (GtkWidget *widget, GdkEventExpose ev) {
+  redraw_framedraw_image();
+  return TRUE;
+}
 
-
-void
-widget_add_framedraw (GtkVBox *box, gint start, gint end, gboolean add_preview_button, gint width, gint height) {
+void widget_add_framedraw (GtkVBox *box, int start, int end, boolean add_preview_button, int width, int height) {
   // adds the frame draw widget to box
   // the redraw button should be connected to an appropriate redraw function
   // after calling this function
@@ -168,97 +192,86 @@
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *label;
-  GObject *spinbutton_adj;
-  GtkWidget *label2;
+  GtkAdjustment *spinbutton_adj;
   GtkWidget *frame;
  
   lives_rfx_t *rfx;
 
+  double fd_scale;
+
   b1_held=FALSE;
 
   mainw->framedraw_reset=NULL;
 
-  vseparator = gtk_vseparator_new ();
-  gtk_box_pack_start (GTK_BOX (GTK_WIDGET (box)->parent), vseparator, FALSE, FALSE, 0);
+  vseparator = lives_vseparator_new ();
+  gtk_box_pack_start (GTK_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vseparator, FALSE, FALSE, 0);
   gtk_widget_show (vseparator);
 
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (GTK_WIDGET (box)->parent), vbox, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-
-  mainw->fd_scale=calc_fd_scale(width,height);
-  width/=mainw->fd_scale;
-  height/=mainw->fd_scale;
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vbox, FALSE, FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  fd_scale=calc_fd_scale(width,height);
+  width/=fd_scale;
+  height/=fd_scale;
+ 
+  hbox = lives_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   add_fill_to_box(GTK_BOX(hbox));
+
+  fbord_eventbox=gtk_event_box_new();
+  gtk_container_set_border_width(GTK_CONTAINER(fbord_eventbox),widget_opts.border_width);
+
   frame = gtk_frame_new (NULL);
-  gtk_widget_set_size_request (frame, width, height);
+
   add_fill_to_box(GTK_BOX(hbox));
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
-  gtk_widget_modify_bg (frame, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_fg (frame, GTK_STATE_NORMAL, &palette->normal_fore);
-  mainw->fd_frame=frame;
-  fdwidth=width;
-  fdheight=height;
 
-  label = gtk_label_new (_("Preview"));
-  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color (fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
+  mainw->fd_frame=frame;
+
+  label = lives_standard_label_new (_("Preview"));
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+
+  gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_NONE);
+
   mainw->framedraw=gtk_event_box_new();
   gtk_widget_set_size_request (mainw->framedraw, width, height);
-  gtk_widget_modify_bg (mainw->framedraw, GTK_STATE_NORMAL, &palette->normal_back);
+  gtk_container_set_border_width(GTK_CONTAINER(mainw->framedraw),1);
+
   gtk_widget_set_events (mainw->framedraw, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | 
 			 GDK_BUTTON_PRESS_MASK| GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
 
   mainw->framedraw_frame=start;
 
-  // create a blank bitmap mask
-  if (mainw->framedraw_bitmap!=NULL) {
-    gdk_pixmap_unref (mainw->framedraw_bitmap);
-  }
+  gtk_container_add (GTK_CONTAINER (frame), fbord_eventbox);
+  gtk_container_add (GTK_CONTAINER (fbord_eventbox), mainw->framedraw);
 
-  mainw->framedraw_bitmap=NULL;
-  if (mainw->framedraw_bitmapgc!=NULL) {
-    g_object_unref (mainw->framedraw_bitmapgc);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color (mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  mainw->framedraw_bitmapgc=NULL;
 
-  mainw->framedraw_image = gtk_image_new_from_pixmap (NULL, NULL);
+  g_signal_connect_after (GTK_OBJECT (mainw->framedraw), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+			  G_CALLBACK (expose_fd_event), NULL);
 
-  gtk_container_add (GTK_CONTAINER (frame), mainw->framedraw);
-  gtk_container_add (GTK_CONTAINER (mainw->framedraw), mainw->framedraw_image);
 
-  // load the start frame and show it
-  load_framedraw_image(NULL);
-
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = lives_hbox_new (FALSE, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new (start, start, end, 1., 10., 0.);
-  mainw->framedraw_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), mainw->framedraw_spinbutton, FALSE, FALSE, 0);
+  mainw->framedraw_spinbutton = lives_standard_spin_button_new (_("_Frame"),
+								TRUE,start,start,end,1.,10.,0,LIVES_BOX(hbox),NULL);
 
-  label2 = gtk_label_new_with_mnemonic (_("    _Frame"));
-  gtk_box_pack_start (GTK_BOX (hbox), label2, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
+  spinbutton_adj=gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(mainw->framedraw_spinbutton));
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label2, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  mainw->framedraw_scale=gtk_hscale_new_with_range(0,1,1);
+  mainw->framedraw_scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
   gtk_box_pack_start (GTK_BOX (hbox), mainw->framedraw_scale, TRUE, TRUE, 0);
-  gtk_range_set_adjustment(GTK_RANGE(mainw->framedraw_scale),GTK_ADJUSTMENT(spinbutton_adj));
   gtk_scale_set_draw_value(GTK_SCALE(mainw->framedraw_scale),FALSE);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label2),mainw->framedraw_scale);
 
   rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(gtk_widget_get_toplevel(GTK_WIDGET(box))),"rfx");
   mainw->framedraw_preview = gtk_button_new_from_stock ("gtk-refresh");
@@ -269,167 +282,208 @@
   gtk_widget_set_sensitive(mainw->framedraw_scale,FALSE);
   g_signal_connect (mainw->framedraw_preview, "clicked",G_CALLBACK (start_preview),rfx);
   
-  if (mainw->framedraw_colourgc!=NULL) {
-    g_object_unref (mainw->framedraw_colourgc);
-    mainw->framedraw_colourgc=NULL;
-  }
-
   gtk_widget_show_all (vbox);
 
   if (!add_preview_button) {
     gtk_widget_hide(mainw->framedraw_preview);
   }
+
 }
 
 
-void
-framedraw_redraw (lives_special_framedraw_rect_t * framedraw, gboolean reload, GdkPixbuf *pixbuf)
-{
+
+void framedraw_redraw (lives_special_framedraw_rect_t * framedraw, boolean reload, GdkPixbuf *pixbuf) {
   // this will draw the mask (framedraw_bitmap) and optionally reload the image
   // and then combine them
 
-  gint xstart;
-  gint ystart;
-  gint xend;
-  gint yend;
+  int fd_height;
+  int fd_width;
+  int width,height;
 
-  gint inwidth,inheight,outwidth,outheight;
+  double xstartf,ystartf,xendf,yendf;
 
-  if (mainw->framedraw_bitmap==NULL||!GDK_IS_DRAWABLE (mainw->framedraw_bitmap)) return;
+  lives_painter_t *cr;
 
-  // update framedraw_bitmap
-  gdk_gc_set_foreground (mainw->framedraw_bitmapgc, &palette->bm_trans);
-  gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		      mainw->framedraw_bitmapgc,
-		      TRUE,
-		      0, 0,
-		      cfile->hsize, cfile->vsize
-		      );
+  if (mainw->current_file<1||cfile==NULL) return;
+  
+  if (framedraw->rfx->source_type==LIVES_RFX_SOURCE_RFX) 
+    if (noupdate) return;
+
+  fd_width=lives_widget_get_allocation_width(mainw->framedraw);
+  fd_height=lives_widget_get_allocation_height(mainw->framedraw);
+    
+  width=cfile->hsize;
+  height=cfile->vsize;
+  
+  calc_maxspect(fd_width,fd_height,&width,&height);
+
+  // copy from orig, resize
+  // copy orig layer to layer
+  if (mainw->fd_layer!=NULL) {
+    weed_layer_free(mainw->fd_layer);
+    mainw->fd_layer=NULL;
+  }
+  
+  if (reload||mainw->fd_layer_orig==NULL) load_framedraw_image(pixbuf);
+  
+  mainw->fd_layer=weed_layer_copy(NULL,mainw->fd_layer_orig);
+  // resize to correct size
+  resize_layer(mainw->fd_layer, width, height, LIVES_INTERP_BEST, WEED_PALETTE_END, 0);
+  
+  cr=layer_to_lives_painter(mainw->fd_layer);
 
-  gdk_gc_set_foreground (mainw->framedraw_bitmapgc, &palette->bm_opaque);
+
+  // draw on the lives_painter
+
+  // her we dont offset because we are drawing in the pixbuf, not the widget
 
   switch (framedraw->type) {
-  case FD_RECT_DEMASK:
-    xstart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_widget))*
-		  fdwidth/(gdouble)cfile->hsize+.4999);
-    ystart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_widget))*
-		  fdheight/(gdouble)cfile->vsize+.4999);
-    xend=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xend_widget))*fdwidth/(gdouble)cfile->hsize+.4999);
-    yend=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->yend_widget))*fdheight/(gdouble)cfile->vsize+.4999);
-
-    // above
-    gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_bitmap),
-			mainw->framedraw_bitmapgc,
-			TRUE,
-			0, 0,
-			(gdouble)fdwidth, (gdouble)ystart
-			);
-
-    // right
-    gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_bitmap),
-			mainw->framedraw_bitmapgc,
-			TRUE,
-			(gdouble)xend+1, (gdouble)ystart,
-			(gdouble)(fdwidth-xend)-1, (gdouble)(fdheight-ystart)
-			);
-
-    // below
-    gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_bitmap),
-			mainw->framedraw_bitmapgc,
-			TRUE,
-			0, (gdouble)yend+1,
-			(gdouble)fdwidth, (gdouble)(fdheight-yend)-1
-			);
-
-    // left
-    gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_bitmap),
-			mainw->framedraw_bitmapgc,
-			TRUE,
-			0, (gdouble)ystart,
-			(gdouble)xstart, (gdouble)(yend-ystart)+1
-			);
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT: // deprecated
+    // scale values
+    if (framedraw->xstart_param->dp==0) {
+      xstartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=xstartf/(double)cfile->hsize*(double)width;
+    }
+    else {
+      xstartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=xstartf*(double)width;
+    }
+
+    if (framedraw->xend_param->dp==0) {
+      xendf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=xendf/(double)cfile->hsize*(double)width;
+    }
+    else {
+      xendf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=xendf*(double)width;
+    }
+
+    if (framedraw->ystart_param->dp==0) {
+      ystartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=ystartf/(double)cfile->vsize*(double)height;
+    }
+    else {
+      ystartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=ystartf*(double)height;
+    }
+
+    if (framedraw->yend_param->dp==0) {
+      yendf=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=yendf/(double)cfile->vsize*(double)height;
+    }
+    else {
+      yendf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=yendf*(double)height;
+    }
+
+    lives_painter_set_source_rgb(cr, 1., 0., 0.);
+    lives_painter_rectangle(cr,xstartf-1.,ystartf-1.,xendf+2.,yendf+2.);
+    lives_painter_stroke (cr);
+
     break;
-  case FD_RECT_MULTRECT:
-    if (mainw->multitrack!=NULL) {
-      inwidth=mainw->multitrack->inwidth;
-      inheight=mainw->multitrack->inheight;
-      outwidth=mainw->multitrack->outwidth;
-      outheight=mainw->multitrack->outheight;
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
+
+    if (framedraw->xstart_param->dp==0) {
+      xstartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=xstartf/(double)cfile->hsize*(double)width;
     }
     else {
-      inwidth=cfile->hsize;
-      inheight=cfile->vsize;
-      outwidth=cfile->hsize;
-      outheight=cfile->vsize;
-    }
-
-    xstart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_widget))*outwidth+.4999);
-    ystart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_widget))*outheight+.4999);
-    xend=xstart+(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xend_widget))*outwidth+.4999);
-    yend=ystart+(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->yend_widget))*outheight+.4999);
-
-    gdk_draw_line (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		   mainw->framedraw_bitmapgc,
-		   xstart-1, ystart-1,
-		   xend+1, ystart-1
-		   );
-
-    gdk_draw_line (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		   mainw->framedraw_bitmapgc,
-		   xend+1, ystart-1,
-		   xend+1, yend+1
-		   );
-
-    gdk_draw_line (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		   mainw->framedraw_bitmapgc,
-		   xend+1, yend+1,
-		   xstart-1, yend+1
-		   );
-
-    gdk_draw_line (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		   mainw->framedraw_bitmapgc,
-		   xstart-1, yend+1,
-		   xstart-1, ystart-1
-		   );
+      xstartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=xstartf*(double)width;
+    }
+
+    if (framedraw->xend_param->dp==0) {
+      xendf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=xendf/(double)cfile->hsize*(double)width;
+    }
+    else {
+      xendf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=xendf*(double)width;
+    }
+
+    if (framedraw->ystart_param->dp==0) {
+      ystartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=ystartf/(double)cfile->vsize*(double)height;
+    }
+    else {
+      ystartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=ystartf*(double)height;
+    }
+
+    if (framedraw->yend_param->dp==0) {
+      yendf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=yendf/(double)cfile->vsize*(double)height;
+    }
+    else {
+      yendf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=yendf*(double)height;
+    }
+
+    if (b1_held||framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT) {
+      lives_painter_set_source_rgb(cr, 1., 0., 0.);
+      lives_painter_rectangle(cr,xstartf-1.,ystartf-1.,xendf-xstartf+2.,yendf-ystartf+2.);
+      lives_painter_stroke (cr);
+    }
+    else {
+      if (!b1_held) {
+	// create a mask which is only opaque within the clipping area
+
+	lives_painter_rectangle(cr,0,0,width,height);
+	lives_painter_rectangle(cr,xstartf,ystartf,xendf-xstartf+1.,yendf-ystartf+1.);
+	lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DEST_OUT);
+	lives_painter_set_source_rgba(cr, .0, .0, .0, .5);
+	lives_painter_set_fill_rule(cr, LIVES_PAINTER_FILL_RULE_EVEN_ODD);
+	lives_painter_fill (cr);
+      }
+    }
+
     break;
-  case FD_SINGLEPOINT:
+  case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT:
+
+    if (framedraw->xstart_param->dp==0) {
+      xstartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=xstartf/(double)cfile->hsize*(double)width;
+    }
+    else {
+      xstartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=xstartf*(double)width;
+    }
 
-    if (mainw->multitrack!=NULL) {
-      outwidth=mainw->multitrack->outwidth;
-      outheight=mainw->multitrack->outheight;
-      xstart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_widget))*outwidth+.4999);
-      ystart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_widget))*outheight+.4999);
+    if (framedraw->ystart_param->dp==0) {
+      ystartf=(double)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=ystartf/(double)cfile->vsize*(double)height;
     }
     else {
-      inwidth=cfile->hsize;
-      inheight=cfile->vsize;
-      xstart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->xstart_widget))*inwidth/mainw->fd_scale+.4999);
-      ystart=(gint)(gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_widget))*inheight/mainw->fd_scale+.4999);
+      ystartf=gtk_spin_button_get_value (GTK_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=ystartf*(double)height;
     }
 
-    // draw a small cross
-    gdk_draw_line (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		   mainw->framedraw_bitmapgc,
-		   xstart, ystart-3,
-		   xstart, ystart+3
-		   );
+    lives_painter_set_source_rgb(cr, 1., 0., 0.);
+
+    lives_painter_move_to(cr,xstartf,ystartf-3);
+    lives_painter_line_to(cr,xstartf,ystartf+3);
+
+    lives_painter_stroke (cr);
 
-    gdk_draw_line (GDK_DRAWABLE (mainw->framedraw_bitmap),
-		   mainw->framedraw_bitmapgc,
-		   xstart-3, ystart,
-		   xstart+3, ystart
-		   );
+    lives_painter_move_to(cr,xstartf-3,ystartf);
+    lives_painter_line_to(cr,xstartf+3,ystartf);
+
+    lives_painter_stroke (cr);
+
+    break;
+
+  default:
 
     break;
-  }
 
-  // and call (re)load_framedraw_image to composite it onto
-  if (reload) {
-    load_framedraw_image(pixbuf);
-  }
-  else {
-    redraw_framedraw_image ();
   }
+
+  lives_painter_to_layer(cr, mainw->fd_layer);
+
+  lives_painter_destroy(cr);
+
+  redraw_framedraw_image ();
 }
 
 
@@ -466,7 +520,7 @@
     // pull some frames for 10 seconds
     alarm_handle=lives_alarm_set(LIVES_RFX_TIMER);
     do {
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       if (is_virtual_frame(mainw->current_file,vend)) {
 	retb=virtual_to_images(mainw->current_file,vend,vend,FALSE);
 	if (!retb) return;
@@ -485,7 +539,7 @@
   // get message from back end processor
   while (!(infofile=fopen(cfile->info_file,"r"))&&!mainw->cancelled) {
     // wait until we get at least 1 frame
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     if (cfile->clip_type==CLIP_TYPE_FILE&&vend<=cfile->end) {
       // if we have a virtual clip (frames inside a video file)
       // pull some more frames to images to get us started
@@ -528,14 +582,12 @@
       max_frame=atoi(mainw->msg);
     }
     else {
-      gint numtok=get_token_count (mainw->msg,'|');
+      int numtok=get_token_count (mainw->msg,'|');
       if (numtok>4) {
 	gchar **array=g_strsplit(mainw->msg,"|",numtok);
 	max_frame=atoi(array[0]);
 	cfile->hsize=atoi(array[1]);
 	cfile->vsize=atoi(array[2]);
-	// TODO - ** small generated frames may not work with framedrawing - may need to calc offset between frame and image
-	mainw->fd_scale=calc_fd_scale(cfile->hsize,cfile->vsize);
 	cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
 	if (cfile->fps==0) cfile->fps=cfile->pb_fps=prefs->default_fps;
 	tot_frames=atoi(array[4]);
@@ -551,7 +603,11 @@
 
   if (max_frame>0) {
     if (rfx->num_in_channels==0) {
+      int maxlen=calc_spin_button_width(1.,(double)tot_frames,0);
       gtk_spin_button_set_range (GTK_SPIN_BUTTON (mainw->framedraw_spinbutton),1,tot_frames);
+      gtk_entry_set_width_chars (GTK_ENTRY (mainw->framedraw_spinbutton),maxlen);
+      gtk_widget_queue_draw(mainw->framedraw_spinbutton);
+      gtk_widget_queue_draw(mainw->framedraw_scale);
     }
     
     if (mainw->framedraw_frame>max_frame) {
@@ -565,32 +621,30 @@
     img_ext="pre";
   }
   else {
-    img_ext=cfile->img_type==IMG_TYPE_JPEG?"jpg":"png";
+    img_ext=get_image_ext_for_type(cfile->img_type);
   }
 
   tc=((mainw->framedraw_frame-1.))/cfile->fps*U_SECL;
   pixbuf=pull_lives_pixbuf_at_size(mainw->current_file,mainw->framedraw_frame,(gchar *)img_ext,
-				   tc,(gdouble)cfile->hsize/mainw->fd_scale,
-				   (gdouble)cfile->vsize/mainw->fd_scale,LIVES_INTERP_BEST);
+				   tc,(double)cfile->hsize,
+				   (double)cfile->vsize,LIVES_INTERP_BEST);
 
-  gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->framedraw_image), pixbuf);
-  gtk_widget_queue_draw (mainw->framedraw_image);
-  mainw->current_file=current_file;
-  if (pixbuf!=NULL) gdk_pixbuf_unref(pixbuf);
 
+  load_framedraw_image(pixbuf);
+  redraw_framedraw_image ();
+
+  mainw->current_file=current_file;
 }
 
 
 
-void
-after_framedraw_frame_spinbutton_changed (GtkSpinButton *spinbutton, lives_special_framedraw_rect_t *framedraw)
-{
+void after_framedraw_frame_spinbutton_changed (GtkSpinButton *spinbutton, lives_special_framedraw_rect_t *framedraw) {
   // update the single frame/framedraw preview
   // after the "frame number" spinbutton has changed
   mainw->framedraw_frame=gtk_spin_button_get_value_as_int(spinbutton);
-  if (GTK_WIDGET_VISIBLE(mainw->framedraw_preview)) {
+  if (lives_widget_is_visible(mainw->framedraw_preview)) {
     if (mainw->framedraw_preview!=NULL) gtk_widget_set_sensitive(mainw->framedraw_preview,FALSE);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     load_rfx_preview(framedraw->rfx);
   }
   else framedraw_redraw(framedraw, TRUE, NULL);
@@ -603,293 +657,440 @@
   // this is for the single frame framedraw widget
   // it should be called whenever mainw->framedraw_bitmap changes
 
-  // it will load mainw->framedraw_frame into mainw->framedraw_pixmap
-  // and combine this with mainw->framedraw_bitmap to create
-  // mainw->framedraw_image
-
-  // see for example framedraw_redraw for how to combine with a mask
-
-  GdkBitmap *dummy_bitmap;
   weed_timecode_t tc;
-  gboolean needs_free=FALSE;
 
   if (mainw->framedraw_frame>cfile->frames) mainw->framedraw_frame=cfile->frames;
 
-  // can happen if we preview for rendered generators
-  if ((mainw->multitrack==NULL||mainw->current_file!=mainw->multitrack->render_file)&&mainw->framedraw_frame==0) return;
-
   if (pixbuf==NULL) {
-    const gchar *img_ext=cfile->img_type==IMG_TYPE_JPEG?"jpg":"png";
+    const gchar *img_ext=get_image_ext_for_type(cfile->img_type);
+
+    // can happen if we preview for rendered generators
+    if ((mainw->multitrack==NULL||mainw->current_file!=mainw->multitrack->render_file)&&mainw->framedraw_frame==0) return;
+
     tc=((mainw->framedraw_frame-1.))/cfile->fps*U_SECL;
     pixbuf=pull_lives_pixbuf_at_size(mainw->current_file,mainw->framedraw_frame,img_ext,tc,
-				     (gdouble)cfile->hsize/mainw->fd_scale,(gdouble)cfile->vsize/mainw->fd_scale,
+				     (double)cfile->hsize,(double)cfile->vsize,
 				     LIVES_INTERP_BEST);
-    needs_free=TRUE;
   }
 
-  if (mainw->framedraw_orig_pixmap!=NULL) {
-    gdk_pixmap_unref (mainw->framedraw_orig_pixmap);
-  }
+  if (pixbuf!=NULL) {
+    if (mainw->fd_layer_orig!=NULL) {
+      weed_layer_free(mainw->fd_layer_orig);
+    }
 
-  // we just want the pixmap
+    mainw->fd_layer_orig=weed_layer_new(0,0,NULL,WEED_PALETTE_END);
 
-  gdk_pixbuf_render_pixmap_and_mask (pixbuf, &mainw->framedraw_orig_pixmap, &dummy_bitmap, 128);
-  if (needs_free&&pixbuf!=NULL) gdk_pixbuf_unref(pixbuf);
+    if (pixbuf_to_layer(mainw->fd_layer_orig,pixbuf)) {
+      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+      mainw->free_fn=lives_free_with_check;
+    }
+    g_object_unref(pixbuf);
+    mainw->do_not_free=NULL;
+    mainw->free_fn=lives_free_normal;
 
-  if (dummy_bitmap!=NULL) {
-    gdk_pixmap_unref (dummy_bitmap);
   }
 
-  if (mainw->framedraw_colourgc==NULL) {
-    mainw->framedraw_colourgc=gdk_gc_new (mainw->framedraw_orig_pixmap);
-  }
+  if (mainw->fd_layer!=NULL) weed_layer_free(mainw->fd_layer);
+  mainw->fd_layer=NULL;
 
-  redraw_framedraw_image();
 }
 
 
 
 
 
-void 
-redraw_framedraw_image(void) {
-  // redraw existing image and mask
+void redraw_framedraw_image(void) {
+  lives_painter_t *cr;
+  LiVESPixbuf *pixbuf;
+
+  int fd_width=lives_widget_get_allocation_width(mainw->framedraw);
+  int fd_height=lives_widget_get_allocation_height(mainw->framedraw);
+
+  int width,height;
+
+
+  if (mainw->fd_layer_orig==NULL) return;
+
+  if (mainw->current_file<1||cfile==NULL) return;
 
-  if (!(mainw->framedraw_copy_pixmap==NULL)) {
-    gdk_pixmap_unref (mainw->framedraw_copy_pixmap);
+  width=cfile->hsize;
+  height=cfile->vsize;
+
+  calc_maxspect(fd_width,fd_height,&width,&height);
+
+  // copy orig layer to layer
+  if (mainw->fd_layer==NULL) mainw->fd_layer=weed_layer_copy(NULL,mainw->fd_layer_orig);
+
+  // resize to correct size
+  resize_layer(mainw->fd_layer, width, height, LIVES_INTERP_BEST, WEED_PALETTE_RGBA32, 0);
+
+  // force to RGBA32
+  convert_layer_palette(mainw->fd_layer,WEED_PALETTE_RGBA32,0);
+
+  // layer to pixbuf
+  pixbuf=layer_to_pixbuf(mainw->fd_layer);
+
+  // get lives_painter for window
+  cr = lives_painter_create_from_widget (mainw->framedraw);
+
+  if (cr!=NULL) {
+    // set source pixbuf for lives_painter
+    lives_painter_set_source_pixbuf (cr, pixbuf, (fd_width-width)>>1, (fd_height-height)>>1);
+    lives_painter_paint (cr);
+    lives_painter_destroy(cr);
   }
 
-  mainw->framedraw_copy_pixmap=gdk_pixmap_copy (mainw->framedraw_orig_pixmap);
-  // do any drawing on the copy_pixmap here
-  gtk_image_set_from_pixmap(GTK_IMAGE(mainw->framedraw_image), mainw->framedraw_copy_pixmap, mainw->framedraw_bitmap);
-  gtk_widget_queue_draw (mainw->framedraw_image);
+  // convert pixbuf back to layer (layer_to_pixbuf destroys it)
+  if (pixbuf_to_layer(mainw->fd_layer,pixbuf)) {
+    mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+    mainw->free_fn=lives_free_with_check;
+  }
+
+  g_object_unref(pixbuf);
+  mainw->do_not_free=NULL;
+  mainw->free_fn=lives_free_normal;
+
+
 }
 
 
 // change cursor maybe when we enter or leave the framedraw window
 
-gboolean
-on_framedraw_enter (GtkWidget *widget, GdkEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
-  GdkCursor *cursor;
+boolean on_framedraw_enter (GtkWidget *widget, GdkEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
 
   if (framedraw==NULL&&mainw->multitrack!=NULL) {
     framedraw=mainw->multitrack->framedraw;
-    if (framedraw==NULL&&mainw->multitrack->cursor_style==0) gdk_window_set_cursor 
-							       (mainw->multitrack->play_box->window, NULL);
+    if (framedraw==NULL&&mainw->multitrack->cursor_style==LIVES_CURSOR_NORMAL) 
+      lives_set_cursor_style (LIVES_CURSOR_NORMAL,mainw->multitrack->play_box);
   }
 
   if (framedraw==NULL) return FALSE;
-  if (mainw->multitrack!=NULL&&(mainw->multitrack->track_index==-1||mainw->multitrack->cursor_style!=0)) return FALSE;
+  if (mainw->multitrack!=NULL&&(mainw->multitrack->track_index==-1||mainw->multitrack->cursor_style!=LIVES_CURSOR_NORMAL)) return FALSE;
 
   switch (framedraw->type) {
-  case FD_RECT_DEMASK:
-  case FD_RECT_MULTRECT:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
     if (mainw->multitrack==NULL) {
-      cursor=gdk_cursor_new_for_display (gdk_display_get_default(), GDK_TOP_LEFT_CORNER);
-      gdk_window_set_cursor (mainw->framedraw->window, cursor);
+      lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,mainw->framedraw);
     }
     else {
-      cursor=gdk_cursor_new_for_display (mainw->multitrack->display, GDK_TOP_LEFT_CORNER);
-      gdk_window_set_cursor (mainw->multitrack->play_box->window, cursor);
+      lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,mainw->multitrack->play_box);
     }
     break;
-  case FD_SINGLEPOINT:
+  case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT:
     if (mainw->multitrack==NULL) {
-      cursor=gdk_cursor_new_for_display (gdk_display_get_default(), GDK_CROSSHAIR);
-      gdk_window_set_cursor (mainw->framedraw->window, cursor);
+      lives_set_cursor_style(LIVES_CURSOR_CROSSHAIR,mainw->framedraw);
     }
     else {
-      cursor=gdk_cursor_new_for_display (mainw->multitrack->display, GDK_CROSSHAIR);
-      gdk_window_set_cursor (mainw->multitrack->play_box->window, cursor);
+      lives_set_cursor_style(LIVES_CURSOR_CROSSHAIR,mainw->multitrack->play_box);
     }
     break;
+
+  default:
+    break;
+
   }
   return FALSE;
 }
 
-gboolean
-on_framedraw_leave (GtkWidget *widget, GdkEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
+
+boolean on_framedraw_leave (GtkWidget *widget, GdkEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
   if (framedraw==NULL) return FALSE;
-  gdk_window_set_cursor (mainw->framedraw->window, NULL);
+  lives_set_cursor_style (LIVES_CURSOR_NORMAL,mainw->framedraw);
   return FALSE;
 }
 
 
 // using these 3 functions, the user can draw on frames
 
-gboolean
-on_framedraw_mouse_start (GtkWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw)
-{
+boolean on_framedraw_mouse_start (GtkWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw) {
   // user clicked in the framedraw widget (or multitrack playback widget)
 
+  int fd_height;
+  int fd_width;
+
+  int width=cfile->hsize;
+  int height=cfile->vsize;
+
+  int xstarti,ystarti;
+
   if (framedraw==NULL&&mainw->multitrack!=NULL) framedraw=mainw->multitrack->framedraw;
 
+  if (framedraw==NULL) return FALSE;
+  if (mainw->multitrack!=NULL&&mainw->multitrack->track_index==-1) return FALSE;
+
   if (framedraw==NULL&&mainw->multitrack!=NULL&&event->button==3) {
     // right click brings up context menu
     frame_context(widget,event,GINT_TO_POINTER(0));
   }
 
-  if (framedraw==NULL) return FALSE;
-  if (mainw->multitrack!=NULL&&mainw->multitrack->track_index==-1) return FALSE;
+  if (event->button!=1) return FALSE;
 
-  if (event->button==1) {
-    gdk_window_get_pointer(GDK_WINDOW (widget->window), &xstart, &ystart, NULL);
+  b1_held=TRUE;
 
-    if (framedraw->type==FD_RECT_DEMASK) {
-      xstart*=(gdouble)cfile->hsize/(gdouble)widget->allocation.width;
-      ystart*=(gdouble)cfile->vsize/(gdouble)widget->allocation.height;
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   widget, &xstarti, &ystarti);
+
+  if ((framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT||
+       framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT||
+       framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)&&
+      (mainw->multitrack==NULL||mainw->multitrack->cursor_style==0)) {
+    if (mainw->multitrack==NULL) {
+      lives_set_cursor_style(LIVES_CURSOR_BOTTOM_RIGHT_CORNER,widget);
     }
+    else {
+      lives_set_cursor_style(LIVES_CURSOR_BOTTOM_RIGHT_CORNER,mainw->multitrack->play_box);
+    }
+  }
 
-    b1_held=TRUE;
 
-    if ((framedraw->type==FD_RECT_MULTRECT||framedraw->type==FD_RECT_DEMASK)&&
-	(mainw->multitrack==NULL||mainw->multitrack->cursor_style==0)) {
-      GdkCursor *cursor;
-      if (mainw->multitrack==NULL) {
-	cursor=gdk_cursor_new_for_display (gdk_display_get_default(), GDK_BOTTOM_RIGHT_CORNER);
-	gdk_window_set_cursor (mainw->framedraw->window, cursor);
-      }
-      else {
-	cursor=gdk_cursor_new_for_display (mainw->multitrack->display, GDK_BOTTOM_RIGHT_CORNER);
-	gdk_window_set_cursor (mainw->multitrack->play_box->window, cursor);
-      }
-    }
+  fd_width=lives_widget_get_allocation_width(widget);
+  fd_height=lives_widget_get_allocation_height(widget);
+    
+  calc_maxspect(fd_width,fd_height,&width,&height);
 
-    if (framedraw->type==FD_RECT_MULTRECT) {
-      gdouble offsx=(gdouble)xstart/(gdouble)widget->allocation.width;
-      gdouble offsy=(gdouble)ystart/(gdouble)widget->allocation.height;
+  xstart=(double)xstarti-(double)(fd_width-width)/2.;
+  ystart=(double)ystarti-(double)(fd_height-height)/2.;
 
-      if (mainw->multitrack!=NULL) {
-	if (mainw->multitrack->play_width<mainw->multitrack->play_window_width) 
-	  offsx=((gdouble)xstart-(gdouble)(mainw->multitrack->play_window_width-
-					   mainw->multitrack->play_width)/2.)/(gdouble)mainw->multitrack->play_width;
-	if (mainw->multitrack->play_height<mainw->multitrack->play_window_height) 
-	  offsy=((gdouble)ystart-(gdouble)(mainw->multitrack->play_window_height-
-					   mainw->multitrack->play_height)/2.)/(gdouble)mainw->multitrack->play_height;
-      }
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_widget),offsx);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_widget),offsy);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_widget),0.);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_widget),0.);
+  xstart/=(double)width;
+  ystart/=(double)height;
+
+  xcurrent=xstart;
+  ycurrent=ystart;
+
+  noupdate=TRUE;
+
+  switch (framedraw->type) {
+  case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT: 
+
+    if (framedraw->xstart_param->dp>0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xstart);
+    else
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
+    if (framedraw->xstart_param->dp>0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ystart);
+    else
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
+
+    break;
+
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT: 
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT: 
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK: 
+
+    if (framedraw->xstart_param->dp>0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xstart);
+    else
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
+    if (framedraw->xstart_param->dp>0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ystart);
+    else
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
+
+    if (framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT) {
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),0.);
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),0.);
+    }
+    else {
+      if (framedraw->xend_param->dp>0)
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xstart);
+      else
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
+      if (framedraw->xend_param->dp>0)
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ystart);
+      else
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
     }
+
+
+    break;
+  default:
+    break;
   }
+
+
+  if (mainw->framedraw_reset!=NULL) {
+    gtk_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+  }
+  if (mainw->framedraw_preview!=NULL) {
+    gtk_widget_set_sensitive (mainw->framedraw_preview,TRUE);
+  }
+
+  noupdate=FALSE;
+
+  framedraw_redraw (framedraw, FALSE, NULL);
+
   return FALSE;
 }
 
-gboolean
-on_framedraw_mouse_update (GtkWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw)
-{
+boolean on_framedraw_mouse_update (GtkWidget *widget, GdkEventMotion *event, lives_special_framedraw_rect_t *framedraw) {
   // pointer moved in the framedraw widget
-  gint xcurrent,ycurrent;
+  int xcurrenti,ycurrenti;
+
+  int fd_width,fd_height,width,height;
+
+  if (noupdate) return FALSE;
+
+  if (!b1_held) return FALSE;
 
   if (framedraw==NULL&&mainw->multitrack!=NULL) framedraw=mainw->multitrack->framedraw;
   if (framedraw==NULL) return FALSE;
   if (mainw->multitrack!=NULL&&mainw->multitrack->track_index==-1) return FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (widget->window), &xcurrent, &ycurrent, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   widget, &xcurrenti, &ycurrenti);
+
+
+  width=cfile->hsize;
+  height=cfile->vsize;
+
+  fd_width=lives_widget_get_allocation_width(widget);
+  fd_height=lives_widget_get_allocation_height(widget);
+      
+  calc_maxspect(fd_width,fd_height,&width,&height);
+
+  xcurrent=(double)xcurrenti-(fd_width-width)/2.;
+  ycurrent=(double)ycurrenti-(fd_height-height)/2.;
+
+  xcurrent/=(double)width;
+  ycurrent/=(double)height;
+
+  noupdate=TRUE;
+
 
   switch (framedraw->type) {
-  case FD_RECT_DEMASK:
-    if (b1_held) {
-      // TODO - update all widgets, re-read values
-      redraw_framedraw_image();
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT:
+    {
+      double xscale,yscale;
+
+      xscale=xcurrent-xstart;
+      yscale=ycurrent-ystart;
+      
+      if (xscale>0.) {
+	if (framedraw->xend_param->dp>0)
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xscale);
+	else
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xscale*(double)cfile->hsize+.5));
+      }
+      else {
+	if (framedraw->xstart_param->dp>0) {
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),-xscale);
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xcurrent);
+	}
+	else {
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(-xscale*(double)cfile->hsize-.5));
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
+	}
+      }
 
-      // TODO - allow user selectable line colour
-      draw_rect_demask (&palette->light_yellow,xstart*fdwidth/cfile->hsize,
-			ystart*fdheight/cfile->vsize,xcurrent,ycurrent,FALSE);
-      gtk_image_set_from_pixmap(GTK_IMAGE(mainw->framedraw_image), mainw->framedraw_copy_pixmap, 
-				mainw->framedraw_bitmap);
-    }
-    break;
-  case FD_RECT_MULTRECT:
-    if (b1_held) {
-      gdouble scalex;
-      gdouble scaley;
-      if (mainw->multitrack!=NULL) {
-	// scale is rel. to out channel size (outwidth, outheight)
-	scalex=(gdouble)(xcurrent-xstart)/(gdouble)mainw->multitrack->outwidth;
-	scaley=(gdouble)(ycurrent-ystart)/(gdouble)mainw->multitrack->outheight;
-	if (mainw->multitrack->outwidth<mainw->multitrack->play_window_width) {
-	  scalex=(gdouble)(xcurrent-xstart)/(gdouble)mainw->multitrack->outwidth;
+      if (yscale>0.) {
+	if (framedraw->yend_param->dp>0)
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),yscale);
+	else 
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(yscale*(double)cfile->vsize+.5));
+      }
+      else {
+	if (framedraw->xstart_param->dp>0) {
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),-yscale);
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ycurrent);
 	}
-	if (mainw->multitrack->outheight<mainw->multitrack->play_window_height) {
-	  scaley=(gdouble)(ycurrent-ystart)/(gdouble)mainw->multitrack->outheight;
+	else {
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(-yscale*(double)cfile->vsize-.5));
+	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
 	}
       }
+
+    }
+    break;
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
+
+    if (xcurrent>xstart) {
+      if (framedraw->xend_param->dp>0)
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xcurrent);
+      else
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
+    }
+    else {
+      if (framedraw->xstart_param->dp>0) {
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xstart);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xcurrent);
+      }
       else {
-	scalex=(gdouble)(xcurrent-xstart)/(gdouble)cfile->hsize;
-	scaley=(gdouble)(xcurrent-xstart)/(gdouble)cfile->vsize;
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
       }
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_widget),scalex);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_widget),scaley);
     }
+
+    if (ycurrent>ystart) {
+      if (framedraw->yend_param->dp>0)
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ycurrent);
+      else 
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
+    }
+    else {
+      if (framedraw->xstart_param->dp>0) {
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ystart);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ycurrent);
+      }
+      else {
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
+      }
+    }
+
+
+    break;
+
+  default:
     break;
+
+  }
+
+  if (mainw->framedraw_reset!=NULL) {
+    gtk_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+  }
+  if (mainw->framedraw_preview!=NULL) {
+    gtk_widget_set_sensitive (mainw->framedraw_preview,TRUE);
   }
 
+  noupdate=FALSE;
+  framedraw_redraw (framedraw, FALSE, NULL);
+
   return FALSE;
 }
 
 
-gboolean
-on_framedraw_mouse_reset (GtkWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw)
-{
-  gint xend,yend;
-  gdouble offsx,offsy;
+boolean on_framedraw_mouse_reset (GtkWidget *widget, GdkEventButton *event, lives_special_framedraw_rect_t *framedraw) {
+  // user released the mouse button in framedraw widget
+  if (event->button!=1||!b1_held) return FALSE;
+
+  b1_held=FALSE;
 
   if (framedraw==NULL&&mainw->multitrack!=NULL) framedraw=mainw->multitrack->framedraw;
   if (framedraw==NULL) return FALSE;
   if (mainw->multitrack!=NULL&&mainw->multitrack->track_index==-1) return FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (widget->window), &xend, &yend, NULL);
-  // user released the mouse button in framedraw widget
-  if (event->button==1) {
-    b1_held=FALSE;
-  }
-
-  switch (framedraw->type) {
-  case FD_RECT_DEMASK:
-
-    xend*=(gdouble)cfile->hsize/(gdouble)fdwidth;
-    yend*=(gdouble)cfile->vsize/(gdouble)fdheight;
-
-    if (xend>=cfile->hsize) xend=cfile->hsize-1;
-    if (yend>=cfile->vsize) yend=cfile->vsize-1;
-    
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_widget),MIN (xstart,xend));
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_widget),MIN (ystart,yend));
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_widget),MAX (xstart,xend));
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_widget),MAX (ystart,yend));
-    break;
-  case FD_RECT_MULTRECT:
-    //if (mainw->multitrack!=NULL) on_frame_preview_clicked(NULL,mainw->multitrack);
-    break;
-  case FD_SINGLEPOINT:
-    offsx=(gdouble)xend/(gdouble)widget->allocation.width;
-    offsy=(gdouble)yend/(gdouble)widget->allocation.height;
-
-    if (mainw->multitrack!=NULL) {
-      if (mainw->multitrack->play_width<mainw->multitrack->play_window_width) 
-	offsx=(gint)(((gdouble)xend-(gdouble)(mainw->multitrack->play_window_width-
-					      mainw->multitrack->play_width)/2.)/
-		     (gdouble)mainw->multitrack->play_width+.4999);
-      if (mainw->multitrack->play_height<mainw->multitrack->play_window_height) 
-	offsy=(gint)(((gdouble)yend-(gdouble)(mainw->multitrack->play_window_height-
-					      mainw->multitrack->play_height)/2.)/
-		     (gdouble)mainw->multitrack->play_height+.4999);
-    }
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_widget),offsx);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_widget),offsy);
-    break;
+  if ((framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT||
+       framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT||
+       framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)&&
+      (mainw->multitrack==NULL||mainw->multitrack->cursor_style==0)) {
+    if (mainw->multitrack==NULL) {
+      lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,widget);
+    }
+    else {
+      lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,mainw->multitrack->play_box);
+    }
   }
 
+  framedraw_redraw(framedraw, FALSE, NULL);
   return FALSE;
 }
 
 
-void
-after_framedraw_widget_changed (GtkWidget *widget, lives_special_framedraw_rect_t *framedraw)
-{
-  if (mainw->block_param_updates) return;
+void after_framedraw_widget_changed (GtkWidget *widget, lives_special_framedraw_rect_t *framedraw) {
+  if (mainw->block_param_updates||noupdate) return;
 
   // redraw mask when spin values change
   framedraw_redraw (framedraw, FALSE, NULL);
@@ -903,34 +1104,47 @@
 
 
 
+void on_framedraw_reset_clicked (GtkButton *button, lives_special_framedraw_rect_t *framedraw) {
+  // reset to defaults
 
-// various drawing functions
-
-void draw_rect_demask (GdkColor *col, gint x1, gint y1, gint x2, gint y2, gboolean filled)
-{
-  gdk_gc_set_rgb_fg_color (GDK_GC (mainw->framedraw_colourgc),col);
-  gdk_draw_rectangle (GDK_DRAWABLE (mainw->framedraw_copy_pixmap),GDK_GC (mainw->framedraw_colourgc), filled, 
-		      MIN (x1,x2), MIN (y1,y2), ABS (x2-x1), ABS (y2-y1));
-}
-
+  noupdate=TRUE;
+  if (framedraw->xend_param!=NULL) {
+    if (framedraw->xend_param->dp==0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(double)get_int_param(framedraw->xend_param->def));
+    else 
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_param->widgets[0]),get_double_param(framedraw->xend_param->def));
+  }
+  if (framedraw->yend_param!=NULL) {
+    if (framedraw->yend_param->dp==0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(double)get_int_param(framedraw->yend_param->def));
+    else 
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_param->widgets[0]),get_double_param(framedraw->yend_param->def));
+  }
+  if (framedraw->xstart_param!=NULL) {
+    if (framedraw->xstart_param->dp==0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(double)get_int_param(framedraw->xstart_param->def));
+    else 
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),get_double_param(framedraw->xstart_param->def));
+  }
+  if (framedraw->ystart_param!=NULL) {
+    if (framedraw->ystart_param->dp==0)
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(double)get_int_param(framedraw->ystart_param->def));
+    else 
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),get_double_param(framedraw->ystart_param->def));
+  }
 
+  if (mainw->framedraw_reset!=NULL) {
+    gtk_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+  }
+  if (mainw->framedraw_preview!=NULL) {
+    gtk_widget_set_sensitive (mainw->framedraw_preview,TRUE);
+  }
 
-void on_framedraw_reset_clicked (GtkButton *button, lives_special_framedraw_rect_t *framedraw)
-{
-  gdouble x_min,x_max,y_min,y_max;
-  // TODO ** - set to defaults
+  // update widgets now
+  lives_widget_context_update();
 
-  gtk_spin_button_get_range (GTK_SPIN_BUTTON (framedraw->xstart_widget),&x_min,NULL);
-  gtk_spin_button_get_range (GTK_SPIN_BUTTON (framedraw->ystart_widget),&y_min,NULL);
-  gtk_spin_button_get_range (GTK_SPIN_BUTTON (framedraw->xend_widget),NULL,&x_max);
-  gtk_spin_button_get_range (GTK_SPIN_BUTTON (framedraw->yend_widget),NULL,&y_max);
+  noupdate=FALSE;
 
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xend_widget),x_max);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->yend_widget),y_max);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->xstart_widget),x_min);
-  gtk_spin_button_set_value(GTK_SPIN_BUTTON(framedraw->ystart_widget),y_min);
+  framedraw_redraw (framedraw, FALSE, NULL);
 
-  if (mainw->framedraw_reset!=NULL) {
-    gtk_widget_set_sensitive (mainw->framedraw_reset,FALSE);
-  }
 }

LiVES-1.6.1.tar.bz2/src/framedraw.h -> LiVES-2.0.3.tar.bz2/src/framedraw.h Changed

@@ -1,6 +1,6 @@
 // LiVES
 // framedraw.h
-// (c) G. Finch (salsaman@xs4all.nl,salsaman@gmail.com)
+// (c) G. Finch (salsaman@gmail.com) 2002 - 2012
 // see file COPYING for licensing details : released under the GNU GPL 3 or later
 
 #ifndef HAS_LIVES_FRAMEDRAW_H
@@ -13,20 +13,23 @@
 #define MAX_PRE_X 320
 #define MAX_PRE_Y 240
 
+// internal padding in pixels for GtkFrame
+#define FD_HT_ADJ 12
+
 
 /// call this to add framedraw widget to an hbox
-void
-widget_add_framedraw (GtkVBox *box, gint start, gint end, gboolean add_preview_button, gint width, gint height);
+void widget_add_framedraw (GtkVBox *, int start, int end, boolean add_preview_button, int width, int height);
 
 /// redraw when exposed/frame number changes
-void framedraw_redraw (lives_special_framedraw_rect_t *, gboolean reload_image, GdkPixbuf *);
+void framedraw_redraw (lives_special_framedraw_rect_t *, boolean reload_image, GdkPixbuf *);
 
 /// callback for widgets
 void after_framedraw_widget_changed (GtkWidget *, lives_special_framedraw_rect_t *);
 
 
 /// activate the image for clicks and draws
-void framedraw_connect(lives_special_framedraw_rect_t *, gint width, gint height, lives_rfx_t *);
+void framedraw_connect(lives_special_framedraw_rect_t *, int width, int height, lives_rfx_t *);
+
 /// connect spinbutton to preview
 void framedraw_connect_spinbutton(lives_special_framedraw_rect_t *, lives_rfx_t *);
 
@@ -51,17 +54,17 @@
 void on_framedraw_reset_clicked (GtkButton *, lives_special_framedraw_rect_t *);
 
 
-gboolean on_framedraw_mouse_start (GtkWidget *, GdkEventButton *, lives_special_framedraw_rect_t *);
-gboolean on_framedraw_mouse_update (GtkWidget *, GdkEventButton *, lives_special_framedraw_rect_t *);
-gboolean on_framedraw_mouse_reset (GtkWidget *, GdkEventButton *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_mouse_start (GtkWidget *, GdkEventButton *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_mouse_update (GtkWidget *, GdkEventMotion *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_mouse_reset (GtkWidget *, GdkEventButton *, lives_special_framedraw_rect_t *);
 
 
-gboolean on_framedraw_leave (GtkWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
-gboolean on_framedraw_enter (GtkWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_leave (GtkWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_enter (GtkWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
 
 // graphics routines
 
-void draw_rect_demask (GdkColor *col, gint x1, gint y1, gint x2, gint y2, gboolean filled);
+void draw_rect_demask (lives_colRGBA32_t *col, int x1, int y1, int x2, int y2, boolean filled);
 
 
 #endif

LiVES-1.6.1.tar.bz2/src/giw/giwknob.c -> LiVES-2.0.3.tar.bz2/src/giw/giwknob.c Changed

@@ -20,7 +20,7 @@
 James Scott Jr <skoona@users.sourceforge.net>
 */
 
-// additional code G. Finch (salsaman@gmail.com) 2010 - 2012
+// additional code G. Finch (salsaman@gmail.com) 2010 - 2013
 
 
 #include <math.h>
@@ -28,21 +28,37 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "main.h"
+
 #include "giw/giwknob.h"
 
+
 #define KNOB_DEFAULT_SIZE 150
 
 /* Forward declarations */
 static void giw_knob_class_init               (GiwKnobClass    *klass);
 static void giw_knob_init                     (GiwKnob         *knob);
-static void giw_knob_destroy                  (GtkObject        *object);
 static void giw_knob_realize                  (GtkWidget        *widget);
 static void giw_knob_size_request             (GtkWidget      *widget,
 					       GtkRequisition *requisition);
-static void giw_knob_size_allocate            (GtkWidget     *widget,
-					       GtkAllocation *allocation);
+#if GTK_CHECK_VERSION(3,0,0)
+static void giw_knob_dispose (GObject *object);
+static void giw_knob_get_preferred_width (GtkWidget *widget,
+					  gint      *minimal_width,
+					  gint      *natural_width);
+static void giw_knob_get_preferred_height (GtkWidget *widget,
+					   gint      *minimal_height,
+					   gint      *natural_height);
+static gboolean giw_knob_draw                (GtkWidget *widget, cairo_t *cairo);
+static void giw_knob_style_updated             (GtkWidget *widget);
+#else
+static void giw_knob_destroy (GtkObject *object);
 static gint giw_knob_expose                   (GtkWidget        *widget,
 						GdkEventExpose   *event);
+#endif
+
+static void giw_knob_size_allocate            (GtkWidget     *widget,
+					       GtkAllocation *allocation);
 static gint giw_knob_button_press             (GtkWidget        *widget,
 						GdkEventButton   *event);
 static gint giw_knob_button_release           (GtkWidget        *widget,
@@ -51,10 +67,6 @@
 						GdkEventMotion   *event);
 static void giw_knob_style_set	              (GtkWidget      *widget,
 			                        GtkStyle       *previous_style);
-/* Local data */
-
-static GtkWidgetClass *parent_class = NULL;
-
 // Changes the value, by mouse position
 void knob_update_mouse                             (GiwKnob *knob, gint x, gint y);
 
@@ -96,51 +108,75 @@
 // A function that calculates width and height of the title's the layout
 void knob_calculate_title_sizes(GiwKnob *knob);  
 
+
+#if GTK_CHECK_VERSION(3,0,0)
+G_DEFINE_TYPE (GiwKnob, giw_knob, GTK_TYPE_WIDGET)
+#define parent_class giw_knob_parent_class
+
+#else
+static GtkWidgetClass *parent_class = NULL;
+
+
 /*********************
 * Widget's Functions * 
 *********************/
-
-GtkType
+GType
 giw_knob_get_type ()
 {
-  static GtkType knob_type = 0;
+  static GType knob_type = 0;
 
   if (!knob_type)
     {
       static const GtkTypeInfo knob_info =
-      {
-	"GiwKnob",
-	sizeof (GiwKnob),
-	sizeof (GiwKnobClass),
-	(GtkClassInitFunc) giw_knob_class_init,
-	(GtkObjectInitFunc) giw_knob_init,
-	/*(GtkArgSetFunc)*/ NULL,
-	/*(GtkArgGetFunc)*/ NULL,
-	(GtkClassInitFunc) NULL,
-      };
-
+	{
+	  "GiwKnob",
+	    sizeof (GiwKnob),
+	  sizeof (GiwKnobClass),
+	  (GtkClassInitFunc) giw_knob_class_init,
+	  (GtkObjectInitFunc) giw_knob_init,
+	    /*(GtkArgSetFunc)*/ NULL,
+	    /*(GtkArgGetFunc)*/ NULL,
+	    (GtkClassInitFunc) NULL,
+	};
+      
       knob_type = gtk_type_unique (gtk_widget_get_type (), &knob_info);
     }
 
   return knob_type;
 }
 
+#endif
+
 static void
 giw_knob_class_init (GiwKnobClass *xclass)
 {
-  GtkObjectClass *object_class;
+#if GTK_CHECK_VERSION(3,0,0)
+  GObjectClass *object_class = G_OBJECT_CLASS(xclass);
+#else
+  GtkObjectClass *object_class = (GtkObjectClass*) xclass;
+#endif
   GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) xclass;
   widget_class = (GtkWidgetClass*) xclass;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  object_class->dispose = giw_knob_dispose;
+#else
   parent_class = (GtkWidgetClass *)gtk_type_class (gtk_widget_get_type ());
-
   object_class->destroy = giw_knob_destroy;
+#endif
 
   widget_class->realize = giw_knob_realize;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  widget_class->get_preferred_width = giw_knob_get_preferred_width;
+  widget_class->get_preferred_height = giw_knob_get_preferred_height;
+  widget_class->draw = giw_knob_draw;
+  widget_class->style_updated = giw_knob_style_updated;
+#else
   widget_class->expose_event = giw_knob_expose;
   widget_class->size_request = giw_knob_size_request;
+#endif
   widget_class->size_allocate = giw_knob_size_allocate;
   widget_class->button_press_event = giw_knob_button_press;
   widget_class->button_release_event = giw_knob_button_release;
@@ -162,6 +198,11 @@
   knob->minor_ticks_size=3;
   knob->legends_digits=3;
   knob->title=NULL;
+
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_has_window(GTK_WIDGET(knob),TRUE);
+#endif
+
 }
 
 GtkWidget*
@@ -171,11 +212,15 @@
   
   g_return_val_if_fail (adjustment != NULL, NULL);
 
+#if GTK_CHECK_VERSION(3,0,0)
+  knob = (GiwKnob *)g_object_new (GIW_TYPE_KNOB, NULL);
+#else
   knob = (GiwKnob *)gtk_type_new (giw_knob_get_type ());
+#endif
   giw_knob_set_adjustment(knob, adjustment);
   
   // Without this, in the first draw, the pointer wouldn't be in the right value
-  knob_set_angle(knob, knob_calculate_angle_with_value(knob, knob->adjustment->value));
+  knob_set_angle(knob, knob_calculate_angle_with_value(knob, gtk_adjustment_get_value(adjustment)));
     
   return GTK_WIDGET (knob);
 }
@@ -187,18 +232,24 @@
 {
   GiwKnob *knob;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  knob = (GiwKnob *)g_object_new (GIW_TYPE_KNOB, NULL);
+#else
   knob = (GiwKnob *)gtk_type_new (giw_knob_get_type ());
+#endif
   giw_knob_set_adjustment(knob, (GtkAdjustment*) gtk_adjustment_new (value, lower, upper, 1.0, 1.0, 1.0));
   
   // Without this, in the first draw, the pointer wouldn't be in the right value
-  knob_set_angle(knob, knob_calculate_angle_with_value(knob, knob->adjustment->value));
+  knob_set_angle(knob, knob_calculate_angle_with_value(knob, gtk_adjustment_get_value(knob->adjustment)));
   
   return GTK_WIDGET (knob);
 }
 
-static void
-giw_knob_destroy (GtkObject *object)
-{
+#if GTK_CHECK_VERSION(3,0,0)
+static void giw_knob_dispose (GObject *object) {
+#else
+static void giw_knob_destroy (GtkObject *object) {
+#endif
   GiwKnob *knob;
   gint loop;
 
@@ -219,12 +270,16 @@
     knob->legends=NULL;
   }
   if (knob->title_str)
-    g_free(knob->title_str);  
+    g_free(knob->title_str);
   if (knob->title)
     g_object_unref(G_OBJECT(knob->title));
 
+#if GTK_CHECK_VERSION(3,0,0)
+  G_OBJECT_CLASS (giw_knob_parent_class)->dispose (object);
+#else
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+#endif
 }
 
 static void
@@ -233,39 +288,67 @@
   GiwKnob *knob;
   GdkWindowAttr attributes;
   gint attributes_mask;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkStyleContext *stylecon;
+#endif
   
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GIW_IS_KNOB (widget));
 
+#if GTK_CHECK_VERSION(2,20,0)
+  gtk_widget_set_realized(widget,TRUE);
+#else
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+#endif
+
   knob = GIW_KNOB (widget);
 
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
+  attributes.x = lives_widget_get_allocation_x(widget);
+  attributes.y = lives_widget_get_allocation_y(widget);
+  attributes.width = lives_widget_get_allocation_width(widget);
+  attributes.height = lives_widget_get_allocation_height(widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget) | 
     GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
     GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
     GDK_POINTER_MOTION_HINT_MASK;
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+  
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  attributes_mask |= GDK_WA_COLORMAP | GDK_WA_VISUAL;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
+#endif
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_window(widget,gdk_window_new (lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
+#else
   widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
-
-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gdk_window_set_user_data (widget->window, widget);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
+#endif
+
+#if GTK_CHECK_VERSION(3,0,0)
+  stylecon=gtk_style_context_new();
+  gtk_style_context_set_path(stylecon,gtk_widget_get_path(widget));
+  gtk_style_context_set_state(stylecon,GTK_STATE_FLAG_ACTIVE);
+  gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(lives_widget_get_parent(widget)));
+#else
+  widget->style = gtk_style_attach (widget->style, lives_widget_get_xwindow(widget));
+  gtk_style_set_background (widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
+#endif
+
+  gdk_window_set_user_data (lives_widget_get_xwindow(widget), widget);
     
   // Create the initial legends
   knob_build_legends(knob);
 }
 
+
+
+
 static void 
 giw_knob_size_request (GtkWidget      *widget,
 		       GtkRequisition *requisition)
@@ -274,6 +357,34 @@
   requisition->height = KNOB_DEFAULT_SIZE;
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+
+static void
+giw_knob_get_preferred_width (GtkWidget *widget,
+    gint      *minimal_width,
+    gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  giw_knob_size_request (widget, &requisition);
+
+  *minimal_width = *natural_width = requisition.width/4.;
+}
+
+static void
+giw_knob_get_preferred_height (GtkWidget *widget,
+    gint      *minimal_height,
+    gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  giw_knob_size_request (widget, &requisition);
+
+  *minimal_height = *natural_height = requisition.height/4.;
+}
+
+#endif
+
 static void
 giw_knob_size_allocate (GtkWidget     *widget,
 			GtkAllocation *allocation)
@@ -284,24 +395,35 @@
   g_return_if_fail (GIW_IS_KNOB (widget));
   g_return_if_fail (allocation != NULL);
 
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_allocation(widget,allocation);
+#else
   widget->allocation = *allocation;
+#endif
+
   knob = GIW_KNOB (widget);
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (lives_widget_is_realized (widget))
     {
-
-      gdk_window_move_resize (widget->window,
+      gdk_window_move_resize (lives_widget_get_xwindow(widget),
 			      allocation->x, allocation->y,
 			      allocation->width, allocation->height);
-
+      
     }
   knob_calculate_sizes(knob);
 }
 
+
+#if GTK_CHECK_VERSION(3,0,0)
+ static gboolean giw_knob_draw (GtkWidget *widget, cairo_t *cairo) {
+   //GdkRGBA color;
+#else
+
 static gint
 giw_knob_expose (GtkWidget      *widget,
 		 GdkEventExpose *event)
 {
+#endif
   GiwKnob *knob;
   gdouble s,c;
   gint xc, yc;
@@ -309,19 +431,159 @@
   guint dx1, dy1, dx2, dy2;
   gint counter=0;
   GdkRectangle rect;
-  
+
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GIW_IS_KNOB (widget), FALSE);
+#if !GTK_CHECK_VERSION(3,0,0)
   g_return_val_if_fail (event != NULL, FALSE);
-
   if (event->count > 0)
     return FALSE;
+#endif
       
   knob=GIW_KNOB(widget);
 
-  rect.x=0;rect.y=0;rect.width=widget->allocation.width;rect.height=widget->allocation.height;
-      
-  // Drawing backgorund
+  rect.x=0;rect.y=0;
+  rect.width=lives_widget_get_allocation_width(widget);
+  rect.height=lives_widget_get_allocation_height(widget);
+
+  // The center
+  xc = lives_widget_get_allocation_width(widget)/2;
+  yc = lives_widget_get_allocation_height(widget)/2;
+    
+  s = sin(knob->angle);
+  c = cos(knob->angle);
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_render_background(gtk_widget_get_style_context(widget),
+			cairo,
+			0,
+			0,
+			rect.width,
+			rect.height);
+
+  cairo_set_source_rgb (cairo, 0., 0., 0.);
+
+  cairo_arc(cairo,
+	    knob->x+((knob->size/2)),
+	    knob->y+((knob->size/2)),
+	    knob->radius,
+	    0,
+	    2.*M_PI);
+
+  cairo_fill(cairo);
+
+  // not working
+  /*
+  gtk_style_context_get_color (gtk_widget_get_style_context (widget), gtk_widget_get_state(widget), &color);
+  cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+
+  cairo_arc(cairo,
+	    knob->x+((knob->size/2)),
+	    knob->y+((knob->size/2)),
+	    knob->radius/4.*3.,
+	    0,
+	    2.*M_PI);
+
+	    cairo_fill(cairo);*/
+
+
+  cairo_set_source_rgb (cairo, 1., 1., 1.);
+
+  cairo_move_to(cairo,
+		xc+c*((float)knob->radius*0.6),
+		yc-s*((float)knob->radius*0.6));
+
+  cairo_line_to(cairo,
+		xc+c*knob->radius,
+		yc-s*knob->radius);
+
+  cairo_stroke(cairo);
+
+  cairo_arc(cairo,
+	    xc+c*((float)knob->radius*0.8),
+	    yc-s*((float)knob->radius*0.8),
+	    knob->radius/2*0.1,
+	    0,
+	    2.*M_PI);
+
+  cairo_fill(cairo);
+
+  if ((knob->mouse_policy==GIW_KNOB_MOUSE_DELAYED) & (knob->button!=0)) {
+    s = sin(knob->false_angle);
+    c = cos(knob->false_angle);
+
+    //lives_widget_get_fg_state_color (widget, GTK_STATE_FLAG_PRELIGHT, &color);
+
+    cairo_move_to(cairo,
+		  xc+c*((float)knob->radius*0.8),
+		  yc-s*((float)knob->radius*0.8));
+    cairo_line_to(cairo,
+		  xc+c*knob->radius,
+		  yc-s*knob->radius);
+
+
+  }
+
+  // Now, draw the ticks
+  // The major ticks (and legends)
+  if (knob->major_ticks!=0)
+    for (loop1=(3.0*M_PI/2.0); loop1>=-0.0001; loop1-=knob->d_major_ticks){ // -0.0001 (and not 0) to avoid rounding errors
+      s=sin(loop1-M_PI/4.0);
+      c=cos(loop1-M_PI/4.0);
+      dx1=c*knob->radius;
+      dy1=s*knob->radius;
+      dx2=c*(knob->radius+knob->major_ticks_size);
+      dy2=s*(knob->radius+knob->major_ticks_size);
+      cairo_move_to (cairo,
+		     xc+dx1,
+		     yc-dy1);
+
+      cairo_line_to(cairo,
+		    xc+dx2,
+		    yc-dy2);
+
+      cairo_stroke(cairo);
+
+      // Drawing the legends
+      if (knob->legends_digits!=0)
+        gtk_render_layout (gtk_widget_get_style_context(widget),
+			   cairo,
+			   xc+(c*knob->legend_radius)-(knob->legend_width/2),
+			   yc-(s*knob->legend_radius)-(knob->legend_height/2),
+			   knob->legends[counter]);
+      counter++;
+    }
+
+
+  // The minor ticks
+  if (knob->minor_ticks!=0)
+    for (loop1=(3.0*M_PI/2.0); loop1>=0.0; loop1-=knob->d_minor_ticks){
+      s=sin(loop1-M_PI/4.0);
+      c=cos(loop1-M_PI/4.0);
+      dx1=c*knob->radius;
+      dy1=s*knob->radius;
+      dx2=c*(knob->radius+knob->minor_ticks_size);
+      dy2=s*(knob->radius+knob->minor_ticks_size);
+      cairo_move_to (cairo,
+		     xc+dx1,
+		     yc-dy1);
+      cairo_line_to (cairo,
+		     xc+dx2,
+		     yc-dy2); 
+      cairo_stroke(cairo);
+    }
+
+  // Draw the title
+  if (knob->title_str!=NULL) // font_str==NULL means no title
+    gtk_render_layout (gtk_widget_get_style_context(widget),
+		       cairo,
+		       xc-knob->title_width/2,
+		       knob->size-knob->title_height-5, // 5 pixels to separate from the borders
+		       knob->title);
+
+#else
+  // Drawing background
   gtk_paint_flat_box (widget->style,
 			widget->window,
 			GTK_STATE_NORMAL,
@@ -347,14 +609,6 @@
  
 
  
-  // The center
-  xc = widget->allocation.width/2;
-  yc = widget->allocation.height/2;
-    
-  // Draw the knob
-  s = sin(knob->angle);
-  c = cos(knob->angle);
-
   gdk_draw_line (widget->window,
 			widget->style->white_gc,
 			xc+c*((float)knob->radius*0.6),
@@ -413,15 +667,15 @@
       // Drawing the legends
       if (knob->legends_digits!=0)
         gtk_paint_layout (widget->style,
-			widget->window,
-			GTK_STATE_NORMAL,
-			TRUE,
-			&rect,
-			widget,
-			NULL,
-                        xc+(c*knob->legend_radius)-(knob->legend_width/2),
-			yc-(s*knob->legend_radius)-(knob->legend_height/2),
-			knob->legends[counter]);
+			  widget->window,
+			  GTK_STATE_NORMAL,
+			  TRUE,
+			  &rect,
+			  widget,
+			  NULL,
+			  xc+(c*knob->legend_radius)-(knob->legend_width/2),
+			  yc-(s*knob->legend_radius)-(knob->legend_height/2),
+			  knob->legends[counter]);
       counter++;
     }
   // The minor ticks
@@ -444,19 +698,22 @@
   // Draw the title
   if (knob->title_str!=NULL) // font_str==NULL means no title
     gtk_paint_layout (widget->style,
-			widget->window,
-			GTK_STATE_NORMAL,
-			TRUE,
-			&rect,
-			widget,
-			NULL,
-                        xc-knob->title_width/2,
-			knob->size-knob->title_height-5, // 5 pixels to separate from the borders
-			knob->title);
+		      widget->window,
+		      GTK_STATE_NORMAL,
+		      TRUE,
+		      &rect,
+		      widget,
+		      NULL,
+		      xc-knob->title_width/2,
+		      knob->size-knob->title_height-5, // 5 pixels to separate from the borders
+		      knob->title);
+
+#endif
     
   return FALSE;
 }
 
+
 static gint
 giw_knob_button_press (GtkWidget      *widget,
 		       GdkEventButton *event)
@@ -476,8 +733,8 @@
   /* To verify if the pointer is in the knob, the distance between the pointer and the center
   of the circle is calculated, if it's less the the radius of the circle , it's in!!*/
    
-  xc = widget->allocation.width/2;
-  yc = widget->allocation.height/2;
+  xc = lives_widget_get_allocation_width(widget)/2;
+  yc = lives_widget_get_allocation_height(widget)/2;
   
   dx = abs((int)event->x - xc);
   dy = abs((int)event->y - yc);
@@ -501,6 +758,8 @@
 
   knob = GIW_KNOB (widget);
   
+  g_return_val_if_fail (knob->adjustment != NULL,TRUE);
+
   if (knob->mouse_policy==GIW_KNOB_MOUSE_DISABLED) return TRUE;
 	  
      // If the policy is delayed, now that the button was released (if it is), it's time to update the value
@@ -527,10 +786,13 @@
   gint x, y;
 
   g_return_val_if_fail (widget != NULL,TRUE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget),TRUE);
   g_return_val_if_fail (GIW_IS_KNOB (widget),TRUE);
   g_return_val_if_fail (event != NULL,TRUE);
 
   knob = GIW_KNOB (widget);
+
+  g_return_val_if_fail (knob->adjustment != NULL,TRUE);
   
   if (knob->mouse_policy==GIW_KNOB_MOUSE_DISABLED) return TRUE;
 	  
@@ -539,9 +801,16 @@
     x = event->x;
     y = event->y;
 
-    if (event->is_hint || (event->window != widget->window))
-      gdk_window_get_pointer (widget->window, &x, &y, NULL);
-
+    if (event->is_hint || (event->window != lives_widget_get_xwindow(widget))) 
+#if GTK_CHECK_VERSION(3,0,0)
+      gdk_window_get_device_position (lives_widget_get_xwindow(widget),
+				      gdk_event_get_device ((GdkEvent *)(event)),
+				      &x,
+				      &y,
+				      NULL);
+#else
+    gdk_window_get_pointer (lives_widget_get_xwindow(widget), &x, &y, NULL);
+#endif
     knob_update_mouse (knob, x, y);
   }
   
@@ -550,8 +819,16 @@
     x = event->x;
     y = event->y;
 
-    if (event->is_hint || (event->window != widget->window))
-      gdk_window_get_pointer (widget->window, &x, &y, NULL);
+    if (event->is_hint || (event->window != lives_widget_get_xwindow(widget)))
+#if GTK_CHECK_VERSION(3,0,0)
+      gdk_window_get_device_position (lives_widget_get_xwindow(widget),
+				      gdk_event_get_device ((GdkEvent *)(event)),
+				      &x,
+				      &y,
+				      NULL);
+#else
+    gdk_window_get_pointer (lives_widget_get_xwindow(widget), &x, &y, NULL);
+#endif
 
     knob_update_false_mouse (knob, x, y);
   }
@@ -586,6 +863,15 @@
   knob_calculate_title_sizes(knob);
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+giw_knob_style_updated (GtkWidget *widget)
+{
+
+}
+
+#endif
+
 /******************
 * Users Functions * 
 ******************/
@@ -596,7 +882,7 @@
   g_return_val_if_fail (knob != NULL, 0.0);
   g_return_val_if_fail (GIW_IS_KNOB (knob), 0.0);
 
-  return(knob->adjustment->value);
+  return (gtk_adjustment_get_value(knob->adjustment));
 }
 
 void 
@@ -607,8 +893,9 @@
   g_return_if_fail (GIW_IS_KNOB (knob));
   
   
-  if (value!=knob->adjustment->value){
+  if (value!=gtk_adjustment_get_value(knob->adjustment)) {
     knob_set_value(knob, value);  
+    g_return_if_fail (knob->adjustment != NULL);
     gtk_adjustment_value_changed(knob->adjustment);
   }
 }
@@ -623,19 +910,24 @@
 
   // Freeing the last one
   if (knob->adjustment){
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handler_disconnect((gpointer)(knob->adjustment),knob->chsig);
+    g_signal_handler_disconnect((gpointer)(knob->adjustment),knob->vchsig);
+#else
     gtk_signal_disconnect_by_data (GTK_OBJECT (knob->adjustment), (gpointer) knob);
+#endif
     g_object_unref (GTK_OBJECT (knob->adjustment));
   }
    
   knob->adjustment = adjustment;
-  gtk_object_ref (GTK_OBJECT (knob->adjustment));
+  g_object_ref (GTK_OBJECT (knob->adjustment));
   
-  gtk_signal_connect (GTK_OBJECT (adjustment), "changed",
-		      (GtkSignalFunc) giw_knob_adjustment_changed,
-		      (gpointer) knob);
-  gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		      (GtkSignalFunc) giw_knob_adjustment_value_changed,
-		      (gpointer) knob);
+  knob->chsig = g_signal_connect (GTK_OBJECT (adjustment), "changed",
+				  (GCallback) giw_knob_adjustment_changed,
+				  (gpointer) knob);
+  knob->vchsig = g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
+				   (GCallback) giw_knob_adjustment_value_changed,
+				   (gpointer) knob);
 
   gtk_adjustment_value_changed(knob->adjustment);
     
@@ -731,7 +1023,7 @@
 
   knob = GIW_KNOB (data);
    
-  knob_set_angle(knob, knob_calculate_angle_with_value(knob, adjustment->value));
+  knob_set_angle(knob, knob_calculate_angle_with_value(knob, gtk_adjustment_get_value(adjustment)));
     
   gtk_widget_queue_draw(GTK_WIDGET(knob));
 }
@@ -761,12 +1053,15 @@
   g_return_if_fail (knob != NULL);
   g_return_if_fail (GIW_IS_KNOB (knob));
 
-  xc = GTK_WIDGET(knob)->allocation.width / 2;
-  yc = GTK_WIDGET(knob)->allocation.height / 2;
+  gtk_widget_queue_draw(GTK_WIDGET(knob));
+
+  xc = lives_widget_get_allocation_width(LIVES_WIDGET(knob))/2;
+  yc = lives_widget_get_allocation_height(LIVES_WIDGET(knob))/2;
 
   // Calculating the new angle
   if (knob->angle != atan2(yc-y, x-xc)){
     knob_set_value(knob, knob_calculate_value_with_angle(knob, atan2(yc-y, x-xc)));
+    g_return_if_fail (knob->adjustment != NULL);
     gtk_adjustment_value_changed(knob->adjustment);
   }
 }
@@ -779,8 +1074,8 @@
   g_return_if_fail (knob != NULL);
   g_return_if_fail (GIW_IS_KNOB (knob));
 
-  xc = GTK_WIDGET(knob)->allocation.width / 2;
-  yc = GTK_WIDGET(knob)->allocation.height / 2;
+  xc = lives_widget_get_allocation_width(LIVES_WIDGET(knob))/2;
+  yc = lives_widget_get_allocation_height(LIVES_WIDGET(knob))/2;
 
   // Calculating the new angle
   knob->false_angle = atan2(yc-y, x-xc);
@@ -811,15 +1106,15 @@
   widget=GTK_WIDGET(knob);
   
   // Getting the radius and size
-  if (widget->allocation.width < widget->allocation.height){
-    knob->size=widget->allocation.width;
+  if (lives_widget_get_allocation_width(widget) < lives_widget_get_allocation_height(widget)){
+    knob->size=lives_widget_get_allocation_width(widget);
     knob->x=0;
-    knob->y=widget->allocation.height/2-knob->size/2;
+    knob->y=lives_widget_get_allocation_height(widget)/2-knob->size/2;
   }
   else{
-    knob->size=widget->allocation.height;
+    knob->size=lives_widget_get_allocation_height(widget);
     knob->y=0;
-    knob->x=widget->allocation.width/2-knob->size/2;
+    knob->x=lives_widget_get_allocation_width(widget)/2-knob->size/2;
   }
     
   // The distance between the radius and the widget limits is the bigger dimension of the legends plus the major_ticks_size, so it's the half of size, less the bigger dimension of the legends less the major_ticks size (wich depends of the radius), them, with some algebra, it results in this equation:
@@ -855,7 +1150,8 @@
   if (angle<=(5.0*M_PI/4.0)) d_angle=(5.0*M_PI/4.0)-angle;
   if (angle>=(7.0*M_PI/4.0)) d_angle=(13.0*M_PI/4.0)-angle;
 
-  return(knob->adjustment->lower+fabs(knob->adjustment->upper-knob->adjustment->lower)*d_angle/(3.0*M_PI/2.0));
+  return(lives_adjustment_get_lower(knob->adjustment)+
+	 fabs(lives_adjustment_get_upper(knob->adjustment)-lives_adjustment_get_lower(knob->adjustment))*d_angle/(3.0*M_PI/2.0));
 }
 
 gdouble 
@@ -865,8 +1161,10 @@
   
   g_return_val_if_fail (knob != NULL, 0.0);
   g_return_val_if_fail (GIW_IS_KNOB (knob), 0.0);
-  
-  angle=(value-knob->adjustment->lower)*(3.0*M_PI/2.0)/fabs(knob->adjustment->upper-knob->adjustment->lower);
+  g_return_val_if_fail (knob->adjustment!=NULL, 0.0);
+
+  angle=(value-lives_adjustment_get_lower(knob->adjustment))*
+    (3.0*M_PI/2.0)/fabs(lives_adjustment_get_upper(knob->adjustment)-lives_adjustment_get_lower(knob->adjustment));
     
     // Now, the angle is relative to the 3 o'clock position, and need to be changed in order to be ralative to the initial angle ((5.0*M_PI/4.0)
   angle=(5.0*M_PI/4.0)-angle; 
@@ -904,8 +1202,9 @@
 {
   g_return_if_fail (knob != NULL);
   g_return_if_fail (GIW_IS_KNOB (knob));
-  
-  knob->adjustment->value=value;
+  g_return_if_fail (knob->adjustment != NULL);
+
+  gtk_adjustment_set_value(knob->adjustment,value);
 }
 
 void
@@ -927,7 +1226,11 @@
     knob->legends=g_new(PangoLayout*, knob->major_ticks);
     str=g_new(gchar, knob->legends_digits+1); // +1 for the '/0'
     for (loop=0; loop<knob->major_ticks; loop++){
-      snprintf(str,knob->legends_digits+1,"%f",knob->adjustment->lower+loop*(knob->adjustment->upper-knob->adjustment->lower)/(knob->major_ticks-1)); // Creating the legends string
+      snprintf(str,knob->legends_digits+1,"%f",
+	       lives_adjustment_get_lower(knob->adjustment)+
+	       loop*(lives_adjustment_get_upper(knob->adjustment)-
+		     lives_adjustment_get_lower(knob->adjustment))/
+	       (knob->major_ticks-1)); // Creating the legends string
       knob->legends[loop]=gtk_widget_create_pango_layout (widget, str); 
     }
     g_free(str);
@@ -987,7 +1290,13 @@
   widget=GTK_WIDGET(knob);
   
   if (knob->legends!=NULL){
+
+#if GTK_CHECK_VERSION(3,0,0)
+    pango_layout_set_font_description (knob->legends[0], 
+				       gtk_style_context_get_font(gtk_widget_get_style_context(widget),gtk_widget_get_state_flags(widget)));
+#else
     pango_layout_set_font_description (knob->legends[0], widget->style->font_desc);  
+#endif
     pango_layout_get_size(knob->legends[0], &(knob->legend_width), &(knob->legend_height));
     knob->legend_width/=PANGO_SCALE;
     knob->legend_height/=PANGO_SCALE;
@@ -998,14 +1307,19 @@
 knob_calculate_title_sizes(GiwKnob *knob) 
 {
   GtkWidget *widget;
-    
+
   g_return_if_fail (knob != NULL);
   
   if (knob->title == NULL) return;
 
   widget=GTK_WIDGET(knob);
 
-  pango_layout_set_font_description (knob->title, widget->style->font_desc);  
+#if GTK_CHECK_VERSION(3,0,0)
+  pango_layout_set_font_description (knob->legends[0], 
+				     gtk_style_context_get_font(gtk_widget_get_style_context(widget),gtk_widget_get_state_flags(widget)));
+#else
+  pango_layout_set_font_description (knob->legends[0], widget->style->font_desc);  
+#endif
   pango_layout_get_size(knob->title, &(knob->title_width), &(knob->title_height));
   knob->title_width/=PANGO_SCALE;
   knob->title_height/=PANGO_SCALE;

LiVES-1.6.1.tar.bz2/src/giw/giwknob.h -> LiVES-2.0.3.tar.bz2/src/giw/giwknob.h Changed

LiVES-1.6.1.tar.bz2/src/giw/giwled.c -> LiVES-2.0.3.tar.bz2/src/giw/giwled.c Changed

@@ -20,10 +20,14 @@
 James Scott Jr <skoona@users.sourceforge.net>
 */
 
+// additional code G. Finch (salsaman@gmail.com) 2010 - 2013
+
 #include <math.h>
 #include <stdio.h>
 
-#include <giw/giwled.h>
+#include "main.h"
+
+#include "giw/giwled.h"
 
 #define LED_DEFAULT_SIZE 14
 
@@ -36,68 +40,99 @@
 
 static void giw_led_class_init               (GiwLedClass    *klass);
 static void giw_led_init                     (GiwLed         *led);
-static void giw_led_destroy                  (GtkObject        *object);
 static void giw_led_realize                  (GtkWidget        *widget);
-static void giw_led_size_request             (GtkWidget      *widget,
-					       GtkRequisition *requisition);
 static void giw_led_size_allocate            (GtkWidget     *widget,
 					       GtkAllocation *allocation);
-static gint giw_led_expose                   (GtkWidget        *widget,
-						GdkEventExpose   *event);
 static gint giw_led_button_press             (GtkWidget        *widget,
-						GdkEventButton   *event);
+					      GdkEventButton   *event);
+static void giw_led_size_request             (GtkWidget      *widget,
+					      GtkRequisition *requisition);
+#if GTK_CHECK_VERSION(3,0,0)
+static void giw_led_dispose                  (GObject        *object);
+static void giw_led_get_preferred_width (GtkWidget *widget,
+					 gint      *minimal_width,
+					 gint      *natural_width);
+static void giw_led_get_preferred_height (GtkWidget *widget,
+					  gint      *minimal_height,
+					  gint      *natural_height);
+static gboolean giw_led_draw                (GtkWidget *widget, cairo_t *cairo);
+#else
+static gint giw_led_expose                   (GtkWidget        *widget,
+					      GdkEventExpose   *event);
+static void giw_led_destroy                  (GtkObject        *object);
+#endif
 
 /* Local data */
 
+static guint giw_led_signals[LAST_SIGNAL] = { 0 };
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+G_DEFINE_TYPE (GiwLed, giw_led, GTK_TYPE_WIDGET)
+#define parent_class giw_led_parent_class
+#else
 static GtkWidgetClass *parent_class = NULL;
 
-static guint giw_led_signals[LAST_SIGNAL] = { 0 };
 
 /*********************
 * Widget's Functions *
 *********************/
 
-GtkType
-giw_led_get_type ()
+GType giw_led_get_type ()
 {
-  static GtkType led_type = 0;
+  static GType led_type = 0;
 
   if (!led_type)
     {
       static const GtkTypeInfo led_info =
-      {
+	{
 	"GiwLed",
-	sizeof (GiwLed),
-	sizeof (GiwLedClass),
-	(GtkClassInitFunc) giw_led_class_init,
-	(GtkObjectInitFunc) giw_led_init,
-	/*(GtkArgSetFunc)*/ NULL,
-	/*(GtkArgGetFunc)*/ NULL,
-	(GtkClassInitFunc) NULL,
-      };
-
+	  sizeof (GiwLed),
+	  sizeof (GiwLedClass),
+	  (GtkClassInitFunc) giw_led_class_init,
+	  (GtkObjectInitFunc) giw_led_init,
+	  /*(GtkArgSetFunc)*/ NULL,
+	  /*(GtkArgGetFunc)*/ NULL,
+	  (GtkClassInitFunc) NULL,
+	  };
+      
       led_type = gtk_type_unique (gtk_widget_get_type() , &led_info);
     }
 
   return led_type;
 }
 
+
+#endif
+
 static void
 giw_led_class_init (GiwLedClass *xclass)
 {
-  GtkObjectClass *object_class;
+#if GTK_CHECK_VERSION(3,0,0)
+  GObjectClass *object_class = G_OBJECT_CLASS(xclass);
+#else
+  GtkObjectClass *object_class = (GtkObjectClass*) xclass;
+#endif
   GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) xclass;
   widget_class = (GtkWidgetClass*) xclass;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  object_class->dispose = giw_led_dispose;
+#else
   parent_class = (GtkWidgetClass *)gtk_type_class (gtk_widget_get_type ());
-
   object_class->destroy = giw_led_destroy;
+#endif
 
   widget_class->realize = giw_led_realize;
+#if GTK_CHECK_VERSION(3,0,0)
+  widget_class->get_preferred_width = giw_led_get_preferred_width;
+  widget_class->get_preferred_height = giw_led_get_preferred_height;
+  widget_class->draw = giw_led_draw;
+#else
   widget_class->expose_event = giw_led_expose;
   widget_class->size_request = giw_led_size_request;
+#endif
   widget_class->size_allocate = giw_led_size_allocate;
   widget_class->button_press_event = giw_led_button_press;
   
@@ -129,6 +164,10 @@
   led->color_off.green=65535;
   led->color_off.red=65535;
   led->color_off.blue=65535;
+
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_has_window(GTK_WIDGET(led),TRUE);
+#endif
 }
 
 GtkWidget*
@@ -136,55 +175,97 @@
 {
   GiwLed *led;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  led = (GiwLed *)g_object_new (GIW_TYPE_LED, NULL);
+#else
   led = (GiwLed *)gtk_type_new (giw_led_get_type ());
+#endif
   
   return GTK_WIDGET (led);
 }
 
-static void
-giw_led_destroy (GtkObject *object)
-{
+#if GTK_CHECK_VERSION(3,0,0)
+static void giw_led_dispose (GObject *object) {
+#else
+static void giw_led_destroy (GtkObject *object) {
+#endif
   g_return_if_fail (object != NULL);
   g_return_if_fail (GIW_IS_LED (object));
     
+#if GTK_CHECK_VERSION(3,0,0)
+  G_OBJECT_CLASS (giw_led_parent_class)->dispose (object);
+#else
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+#endif
 }
 
+
 static void
 giw_led_realize (GtkWidget *widget)
 {
   GdkWindowAttr attributes;
   gint attributes_mask;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkStyleContext *stylecon;
+#endif
+
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GIW_IS_LED (widget));
 
+#if GTK_CHECK_VERSION(2,20,0)
+  gtk_widget_set_realized(widget,TRUE);
+#else
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+#endif
 
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
+
+  attributes.x = lives_widget_get_allocation_x(widget);
+  attributes.y = lives_widget_get_allocation_y(widget);
+  attributes.width = lives_widget_get_allocation_width(widget);
+  attributes.height = lives_widget_get_allocation_height(widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget) | 
     GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
-    GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
-    GDK_POINTER_MOTION_HINT_MASK;
+    GDK_BUTTON_RELEASE_MASK;
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+#if !GTK_CHECK_VERSION(3,0,0)
   attributes.visual = gtk_widget_get_visual (widget);
+  attributes_mask |= GDK_WA_COLORMAP | GDK_WA_VISUAL;
   attributes.colormap = gtk_widget_get_colormap (widget);
+#endif
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_window(widget,gdk_window_new (lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
+#else
   widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+#endif
 
-  widget->style = gtk_style_attach (widget->style, widget->window);
+#if GTK_CHECK_VERSION(3,0,0)
+  stylecon=gtk_widget_get_style_context(widget);
+  if (!stylecon) {
+    stylecon=gtk_style_context_new();
+    gtk_style_context_set_path(stylecon,gtk_widget_get_path(widget));
+  }
+  gtk_style_context_add_class(stylecon,"giwled");
+  gtk_style_context_set_state(stylecon,GTK_STATE_FLAG_ACTIVE);
+  gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(widget));
+#else
+  widget->style = gtk_style_attach (widget->style, lives_widget_get_xwindow(widget));
+  gtk_style_set_background (widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
+#endif
 
-  gdk_window_set_user_data (widget->window, widget);
+  gdk_window_set_user_data (lives_widget_get_xwindow(widget), widget);
 
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
 }
 
+
+
+
 static void 
 giw_led_size_request (GtkWidget      *widget,
 		       GtkRequisition *requisition)
@@ -197,6 +278,35 @@
   requisition->height = LED_DEFAULT_SIZE;
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+
+static void
+giw_led_get_preferred_width (GtkWidget *widget,
+    gint      *minimal_width,
+    gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  giw_led_size_request (widget, &requisition);
+
+  *minimal_width = *natural_width = requisition.width;
+}
+
+static void
+giw_led_get_preferred_height (GtkWidget *widget,
+    gint      *minimal_height,
+    gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  giw_led_size_request (widget, &requisition);
+
+  *minimal_height = *natural_height = requisition.height;
+}
+
+#endif
+
+
 static void
 giw_led_size_allocate (GtkWidget     *widget,
 			GtkAllocation *allocation)
@@ -207,53 +317,138 @@
   g_return_if_fail (GIW_IS_LED (widget));
   g_return_if_fail (allocation != NULL);
 
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_allocation(widget,allocation);
+#else
   widget->allocation = *allocation;
+#endif
+
   led = GIW_LED (widget);
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (lives_widget_is_realized (widget))
     {
-
-      gdk_window_move_resize (widget->window,
+      gdk_window_move_resize (lives_widget_get_xwindow(widget),
 			      allocation->x, allocation->y,
 			      allocation->width, allocation->height);
-
+      
     }
   
   // The size of the led will be the lower dimension of the widget  
-  if (widget->allocation.width > widget->allocation.height){
-    led->size=widget->allocation.height;
+  if (lives_widget_get_allocation_width(widget) > lives_widget_get_allocation_height(widget)){
+    led->size=lives_widget_get_allocation_height(widget);
     led->radius=led->size-4;
-    led->x=(widget->allocation.width/2)-(led->size/2);
+    led->x=(lives_widget_get_allocation_width(widget)/2)-(led->size/2);
     led->y=0;
   }
   else{
-    led->size=widget->allocation.width;
+    led->size=lives_widget_get_allocation_width(widget);
     led->radius=led->size-4;
     led->x=0;
-    led->y=(widget->allocation.height/2)-(led->size/2);
+    led->y=(lives_widget_get_allocation_height(widget)/2)-(led->size/2);
   }
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+ static gboolean giw_led_draw (GtkWidget *widget, cairo_t *cairo) {
+
+#else
+
 static gint
 giw_led_expose (GtkWidget      *widget,
 		 GdkEventExpose *event)
 {  
+#endif
   GiwLed *led;
   GdkRectangle rect;
+
+#if !GTK_CHECK_VERSION(3,0,0)
   GdkGC *gc; // To put the on and off colors
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_LED (widget), FALSE);
+
   g_return_val_if_fail (event != NULL, FALSE);
 
   if (event->count > 0)
     return FALSE;
+#endif
+
+  g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GIW_IS_LED (widget), FALSE);
     
   led=GIW_LED(widget);
 
-  rect.x=0;rect.y=0;rect.width=widget->allocation.width;rect.height=widget->allocation.height;
+  rect.x=0;rect.y=0;
+  rect.width=lives_widget_get_allocation_width(widget);
+  rect.height=lives_widget_get_allocation_height(widget);
       
-  // Drawing backgorund
+  // Drawing background
+#if GTK_CHECK_VERSION(3,0,0)
+  cairo_set_line_width(cairo,1.);
+
+  gtk_render_background(gtk_widget_get_style_context(widget),
+			cairo,
+			0,
+			0,
+			rect.width,
+			rect.height);
+
+  if (led->on)
+    cairo_set_source_rgb (cairo, 1., 1., 1.);
+  else
+    cairo_set_source_rgba (cairo, 
+			   led->color_off.red,
+			   led->color_off.green,
+			   led->color_off.blue,
+			   led->color_off.alpha
+			   );
+  
+  cairo_arc(cairo,
+	    rect.width/2+2,
+	    rect.height/2+2,
+	    led->radius/2,
+	    0.,
+	    2.*M_PI);
+  
+  if (led->on) cairo_set_source_rgb (cairo, 0., 0., 0.);
+
+  cairo_arc(cairo,
+	    rect.width/2+1,
+	    rect.height/2+1,
+	    led->radius/2+1,
+	    -45./M_PI,
+	    57.5/M_PI);
+
+  cairo_arc(cairo,
+	    rect.width/2,
+	    rect.height/2,
+	    led->radius/2+1.5,
+	    -32/M_PI,
+	    37.5/M_PI);
+
+  if (led->on) 
+    cairo_set_source_rgba (cairo, 
+			   (double)(led->color_on.red),
+			   (double)(led->color_on.green),
+			   (double)(led->color_on.blue),
+			   (double)(led->color_on.alpha)
+			  );
+  else 
+    cairo_set_source_rgba (cairo, 
+			   (double)(led->color_off.red),
+			   (double)(led->color_off.green),
+			   (double)(led->color_off.blue),
+			   (double)(led->color_off.alpha)
+			   );
+
+
+  cairo_arc(cairo,
+	    rect.width/2+2,
+	    rect.height/2+2,
+	    (led->size-4)/2,
+	    0,
+	    2.*M_PI);
+
+  cairo_fill(cairo);
+
+#else
   gtk_paint_flat_box (widget->style,
 		      widget->window,
 		      (GtkStateType)(widget->parent==NULL?GTK_STATE_NORMAL:widget->parent->state),
@@ -266,7 +461,6 @@
 		      -1,
 		      -1);
   
-  
   gc=gdk_gc_new(widget->window); // Allocating memory
   gdk_gc_copy(gc, widget->style->fg_gc[widget->state]); 
   
@@ -318,10 +512,12 @@
                 64*360);
 
   g_object_unref(gc);
+#endif
   
   return FALSE;
 }
 
+
 static gint
 giw_led_button_press (GtkWidget      *widget,
 		       GdkEventButton *event)
@@ -337,8 +533,8 @@
     
   if (led->enable_mouse==0) return(FALSE);
   
-  dx = event->x - widget->allocation.width/2;
-  dy = widget->allocation.height/2 - event->y;
+  dx = event->x - lives_widget_get_allocation_width(widget)/2;
+  dy = lives_widget_get_allocation_height(widget)/2 - event->y;
   
   d=sqrt(dx*dx+dy*dy); // Distance between the pointer and the center
   
@@ -384,16 +580,41 @@
   return (led->on);
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+void
+giw_led_set_rgba (GiwLed *led,
+		  GdkRGBA on_color,
+		  GdkRGBA off_color) {
+  g_return_if_fail (led != NULL);
+  g_return_if_fail (GIW_IS_LED (led));
+
+  led->color_on=on_color;
+  led->color_off=off_color;
+
+  gtk_widget_queue_draw(GTK_WIDGET(led));
+}
+#endif
 void
 giw_led_set_colors (GiwLed *led,
-			GdkColor on_color,
-			GdkColor off_color)
+		    GdkColor on_color,
+		    GdkColor off_color)
 {
   g_return_if_fail (led != NULL);
   g_return_if_fail (GIW_IS_LED (led));
 
+#if GTK_CHECK_VERSION(3,0,0)
+  led->color_on.red=(gdouble)on_color.red/65535.;
+  led->color_on.green=(gdouble)on_color.green/65535.;
+  led->color_on.blue=(gdouble)on_color.blue/65535.;
+  led->color_on.alpha=1.;
+  led->color_off.red=(gdouble)off_color.red/65535.;
+  led->color_off.green=(gdouble)off_color.green/65535.;
+  led->color_off.blue=(gdouble)off_color.blue/65535.;
+  led->color_off.alpha=1.;
+#else
   led->color_on=on_color;
   led->color_off=off_color;
+#endif
   gtk_widget_queue_draw(GTK_WIDGET(led));
 }

LiVES-1.6.1.tar.bz2/src/giw/giwled.h -> LiVES-2.0.3.tar.bz2/src/giw/giwled.h Changed

@@ -42,11 +42,18 @@
 
 struct _GiwLed
 {
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkWidget parent_instance;
+#endif
   GtkWidget widget;
 
   gboolean on; //0 for false
+#if GTK_CHECK_VERSION(3,0,0)
+  GdkRGBA color_on, color_off;
+#else
   GdkColor color_on, color_off;
-  
+#endif
+
   guint size; // Size of the led
   guint x, y; // Position inside the widget's window
   
@@ -58,15 +65,18 @@
 struct _GiwLedClass
 {
   GtkWidgetClass parent_class;
-  
+
   void (* mode_changed) (GiwLed *led); //Signal emited when the mode is chaged (on to off, or off to on)
 };
 
 
 GtkWidget*     giw_led_new                    (void);
-GtkType        giw_led_get_type               (void);
+GType          giw_led_get_type               (void) G_GNUC_CONST;
 void           giw_led_set_mode               (GiwLed *led, guint8 mode);    
 guint8         giw_led_get_mode               (GiwLed *led);    
+#if GTK_CHECK_VERSION(3,0,0)
+void           giw_led_set_rgba               (GiwLed *led, GdkRGBA on_color, GdkRGBA off_color);
+#endif
 void           giw_led_set_colors             (GiwLed *led, GdkColor on_color, GdkColor off_color);
 void           giw_led_enable_mouse           (GiwLed *led, gboolean option);

LiVES-2.0.3.tar.bz2/src/giw/giwtimeline.c Added

@@ -0,0 +1,1127 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(3,0,0)
+
+#ifndef ROUND
+#define ROUND(a) ((int)(a<0.?a-.5:a+.5))
+#endif
+
+#include <math.h>
+#include <string.h>
+
+#include "giwtimeline.h"
+
+
+/**
+ * SECTION: giwtimeline
+ * @title: GiwTimeline
+ * @short_description: A timeline widget with configurable unit and orientation.
+ *
+ * A timeline widget with configurable unit and orientation.
+ **/
+
+
+#define DEFAULT_TIMELINE_FONT_SCALE  PANGO_SCALE_SMALL
+#define MINIMUM_INCR              5
+#define DEFAULT_MAX_SIZE 100000000.
+
+enum
+{
+  PROP_0,
+  PROP_ORIENTATION,
+  PROP_UNIT,
+  PROP_MAX_SIZE
+};
+
+
+/* All distances below are in 1/72nd's of an inch. (According to
+ * Adobe that's a point, but points are really 1/72.27 in.)
+ */
+typedef struct
+{
+  GtkOrientation   orientation;
+  GiwTimeUnit      unit;
+  gdouble          max_size;
+
+  GdkWindow       *input_window;
+  cairo_surface_t *backing_store;
+  PangoLayout     *layout;
+  gdouble          font_scale;
+
+  gint             xsrc;
+  gint             ysrc;
+
+  GList           *track_widgets;
+} GiwTimelinePrivate;
+
+#define GIW_TIMELINE_GET_PRIVATE(timeline) \
+  G_TYPE_INSTANCE_GET_PRIVATE (timeline, GIW_TYPE_TIMELINE, GiwTimelinePrivate)
+
+
+static const struct
+{
+  const gdouble  timeline_scale[16];
+  const gint     subdivide[5];
+} timeline_metric =
+{
+  { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 25000, 50000, 100000 },
+  { 1, 5, 10, 50, 100 }
+};
+
+
+static void          giw_timeline_dispose              (GObject        *object);
+static void          giw_timeline_set_property         (GObject        *object,
+                                                      guint            prop_id,
+                                                      const GValue   *value,
+                                                      GParamSpec     *pspec);
+static void          giw_timeline_get_property         (GObject        *object,
+                                                      guint           prop_id,
+                                                      GValue         *value,
+                                                      GParamSpec     *pspec);
+
+static void          giw_timeline_realize              (GtkWidget      *widget);
+static void          giw_timeline_unrealize            (GtkWidget      *widget);
+static void          giw_timeline_map                  (GtkWidget      *widget);
+static void          giw_timeline_unmap                (GtkWidget      *widget);
+static void          giw_timeline_size_allocate        (GtkWidget      *widget,
+                                                      GtkAllocation  *allocation);
+static void          giw_timeline_get_preferred_width  (GtkWidget      *widget,
+                                                      gint           *minimum_width,
+                                                      gint           *natural_width);
+static void          giw_timeline_get_preferred_height (GtkWidget      *widget,
+                                                      gint           *minimum_height,
+                                                      gint           *natural_height);
+static void          giw_timeline_style_updated        (GtkWidget      *widget);
+static gboolean      giw_timeline_draw                 (GtkWidget      *widget,
+                                                      cairo_t        *cr);
+
+static void          giw_timeline_draw_ticks           (GiwTimeline      *timeline);
+static void          giw_timeline_draw_pos             (GiwTimeline      *timeline);
+static void          giw_timeline_make_pixmap          (GiwTimeline      *timeline);
+
+static PangoLayout * giw_timeline_get_layout           (GtkWidget      *widget,
+                                                      const gchar    *text);
+
+
+//G_DEFINE_TYPE (GiwTimeline, giw_timeline, GTK_TYPE_WIDGET)
+
+G_DEFINE_TYPE (GiwTimeline, giw_timeline, GTK_TYPE_SCALE);
+
+#define parent_class giw_timeline_parent_class
+
+
+
+static void
+giw_timeline_class_init (GiwTimelineClass *klass)
+{
+  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+  object_class->dispose              = giw_timeline_dispose;
+  object_class->set_property         = giw_timeline_set_property;
+  object_class->get_property         = giw_timeline_get_property;
+
+  widget_class->realize              = giw_timeline_realize;
+  widget_class->unrealize            = giw_timeline_unrealize;
+  widget_class->map                  = giw_timeline_map;
+  widget_class->unmap                = giw_timeline_unmap;
+  widget_class->get_preferred_width  = giw_timeline_get_preferred_width;
+  widget_class->get_preferred_height = giw_timeline_get_preferred_height;
+  widget_class->size_allocate        = giw_timeline_size_allocate;
+  widget_class->style_updated        = giw_timeline_style_updated;
+  widget_class->draw                 = giw_timeline_draw;
+
+  g_type_class_add_private (object_class, sizeof (GiwTimelinePrivate));
+
+#ifndef GTK_PARAM_READABLE
+#define GTK_PARAM_READABLE (GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)
+#define GTK_PARAM_WRITABLE (GParamFlags)(G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)
+#define GTK_PARAM_READWRITE (GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)
+#endif
+
+
+  g_object_class_install_property (object_class,
+                                   PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation",
+                                                      "Orientation",
+                                                      "The orientation of the timeline",
+                                                      GTK_TYPE_ORIENTATION,
+                                                      GTK_ORIENTATION_HORIZONTAL,
+                                                      GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (object_class,
+                                   PROP_MAX_SIZE,
+                                   g_param_spec_double ("max-size",
+                                                        "Max Size",
+                                                        "Maximum size of the timeline",
+                                                        -G_MAXDOUBLE,
+                                                        G_MAXDOUBLE,
+                                                        0.0,
+                                                        GTK_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_double ("font-scale",
+                                                                NULL, NULL,
+                                                                0.0,
+                                                                G_MAXDOUBLE,
+                                                                DEFAULT_TIMELINE_FONT_SCALE,
+                                                                GTK_PARAM_READABLE));
+}
+
+static void
+giw_timeline_init (GiwTimeline *timeline)
+{
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  gtk_widget_set_has_window (GTK_WIDGET (timeline), FALSE);
+
+  priv->orientation   = GTK_ORIENTATION_HORIZONTAL;
+  priv->unit          = GIW_TIME_UNIT_SECONDS;
+  priv->max_size      = DEFAULT_MAX_SIZE;
+  priv->backing_store = NULL;
+  priv->font_scale    = DEFAULT_TIMELINE_FONT_SCALE;
+}
+
+static void
+giw_timeline_dispose (GObject *object)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (object);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  while (priv->track_widgets)
+    giw_timeline_remove_track_widget (timeline, (GtkWidget *)priv->track_widgets->data);
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+giw_timeline_set_property (GObject      *object,
+			   guint         prop_id,
+			   const GValue *value,
+			   GParamSpec   *pspec)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (object);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  switch (prop_id)
+    {
+    case PROP_ORIENTATION:
+      priv->orientation = (GtkOrientation)g_value_get_enum (value);
+      gtk_widget_queue_resize (GTK_WIDGET (timeline));
+      break;
+
+    case PROP_UNIT:
+      giw_timeline_set_unit (timeline, (GiwTimeUnit)g_value_get_int (value));
+      break;
+
+    case PROP_MAX_SIZE:
+      giw_timeline_set_max_size (timeline,
+				 g_value_get_double (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+giw_timeline_get_property (GObject    *object,
+			   guint       prop_id,
+			   GValue     *value,
+			   GParamSpec *pspec)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (object);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  switch (prop_id)
+    {
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, priv->orientation);
+      break;
+
+    case PROP_UNIT:
+      g_value_set_int (value, priv->unit);
+      break;
+
+    case PROP_MAX_SIZE:
+      g_value_set_double (value, priv->max_size);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+/**
+ * giw_timeline_new:
+ * @orientation: the timeline's orientation.
+ *
+ * Creates a new timeline.
+ *
+ * Return value: a new #GiwTimeline widget.
+ *
+ **/
+GtkWidget *
+giw_timeline_new (GtkOrientation orientation)
+{
+  GiwTimeline *timeline;
+
+  timeline = (GiwTimeline *)g_object_new (GIW_TYPE_TIMELINE,
+					  "orientation", orientation,
+					  NULL);
+  return GTK_WIDGET (timeline);
+}
+
+
+/**
+ * giw_timeline_add_track_widget:
+ * @timeline: a #GiwTimeline
+ * @widget: the track widget to add
+ *
+ * Adds a "track widget" to the timeline. The timeline will connect to
+ * GtkWidget:motion-notify-event: on the track widget and update its
+ * position marker accordingly. The marker is correctly updated also
+ * for the track widget's children, regardless of whether they are
+ * ordinary children of off-screen children.
+ *
+ */
+void
+giw_timeline_add_track_widget (GiwTimeline *timeline,
+                             GtkWidget *widget)
+{
+  GiwTimelinePrivate *priv;
+
+  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+  g_return_if_fail (GTK_IS_WIDGET (timeline));
+
+  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  g_return_if_fail (g_list_find (priv->track_widgets, widget) == NULL);
+
+  priv->track_widgets = g_list_prepend (priv->track_widgets, widget);
+
+  g_signal_connect_swapped (widget, "destroy",
+                            G_CALLBACK (giw_timeline_remove_track_widget),
+                            timeline);
+}
+
+/**
+ * giw_timeline_remove_track_widget:
+ * @timeline: a #GiwTimeline
+ * @widget: the track widget to remove
+ *
+ * Removes a previously added track widget from the timeline. See
+ * giw_timeline_add_track_widget().
+ *
+ */
+void
+giw_timeline_remove_track_widget (GiwTimeline *timeline,
+                                GtkWidget *widget)
+{
+  GiwTimelinePrivate *priv;
+
+  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+  g_return_if_fail (GTK_IS_WIDGET (timeline));
+
+  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  g_return_if_fail (g_list_find (priv->track_widgets, widget) != NULL);
+
+  priv->track_widgets = g_list_remove (priv->track_widgets, widget);
+
+  g_signal_handlers_disconnect_by_func (widget,
+                                        (gpointer)giw_timeline_remove_track_widget,
+                                        timeline);
+}
+
+/**
+ * giw_timeline_set_unit:
+ * @timeline: a #GiwTimeline
+ * @unit:  the #GiwTimeUnit to set the timeline to
+ *
+ * This sets the unit of the timeline.
+ *
+ */
+
+
+void
+giw_timeline_set_unit (GiwTimeline *timeline,
+		       GiwTimeUnit   unit)
+{
+  GiwTimelinePrivate *priv;
+
+  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+
+  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  if (priv->unit != unit)
+    {
+      priv->unit = unit;
+      g_object_notify (G_OBJECT (timeline), "unit");
+
+      gtk_widget_queue_draw (GTK_WIDGET (timeline));
+    }
+}
+
+/**
+ * giw_timeline_get_unit:
+ * @timeline: a #GiwTimeline
+ *
+ * Return value: the unit currently used in the @timeline widget.
+ *
+ **/
+
+GiwTimeUnit
+giw_timeline_get_unit (GiwTimeline *timeline)
+{
+  g_return_val_if_fail (GIW_IS_TIMELINE (timeline), (GiwTimeUnit)0);
+
+  return GIW_TIMELINE_GET_PRIVATE(timeline)->unit;
+}
+
+
+
+/**
+ * giw_timeline_get_position:
+ * @timeline: a #GiwTimeline
+ *
+ * Return value: the current position of the @timeline widget.
+ *
+ * Since: GIW 2.8
+ **/
+static gdouble
+giw_timeline_get_position (GiwTimeline *timeline)
+{
+  GtkWidget *widget;
+  GtkRange *range;
+  g_return_val_if_fail (GIW_IS_TIMELINE (timeline), 0.0);
+
+  widget=GTK_WIDGET(timeline);
+  range=GTK_RANGE(widget);
+
+  //return GIW_TIMELINE_GET_PRIVATE (timeline)->position;
+
+  return gtk_range_get_value(range);
+}
+
+/**
+ * giw_timeline_set_max_size:
+ * @timeline: a #GiwTimeline
+ * @max_size: the maximum size of the timeline used when calculating the space to
+ * leave for the text
+ *
+ * This sets the max_size of the timeline.
+ *
+ */
+void
+giw_timeline_set_max_size (GiwTimeline *timeline,
+			   gdouble    max_size)
+{
+  GiwTimelinePrivate *priv;
+
+  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+
+  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  g_object_freeze_notify (G_OBJECT (timeline));
+  if (priv->max_size != max_size)
+    {
+      priv->max_size = max_size;
+      g_object_notify (G_OBJECT (timeline), "max-size");
+    }
+  g_object_thaw_notify (G_OBJECT (timeline));
+
+  gtk_widget_queue_draw (GTK_WIDGET (timeline));
+}
+
+
+
+gdouble 
+giw_timeline_get_max_size (GiwTimeline *timeline)
+{
+  GiwTimelinePrivate *priv;
+
+  g_return_val_if_fail (GIW_IS_TIMELINE (timeline), 0.0);
+
+  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  return priv->max_size;
+}
+
+
+
+
+
+
+/**
+ * giw_timeline_get_range:
+ * @timeline: a #GiwTimeline
+ * @lower: location to store lower limit of the timeline, or %NULL
+ * @upper: location to store upper limit of the timeline, or %NULL
+ * @max_size: location to store the maximum size of the timeline used when
+ *            calculating the space to leave for the text, or %NULL.
+ *
+ * Retrieves values indicating the range and current position of a #GiwTimeline.
+ * See giw_timeline_set_range().
+ *
+ **/
+static void
+giw_timeline_get_range (GiwTimeline *timeline,
+			gdouble   *lower,
+			gdouble   *upper,
+			gdouble   *max_size)
+{
+  GiwTimelinePrivate *priv;
+  GtkWidget *widget;
+  GtkRange *range;
+  GtkAdjustment *adj;
+
+  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+
+  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  widget=GTK_WIDGET(timeline);
+  range=GTK_RANGE(widget);
+
+  adj=gtk_range_get_adjustment(range);
+  if (lower)
+    *lower=gtk_adjustment_get_lower(adj);
+  if (upper)
+    *upper=gtk_adjustment_get_upper(adj);
+  if (max_size)
+    *max_size=priv->max_size;
+
+}
+
+static void
+giw_timeline_realize (GtkWidget *widget)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+  GtkAllocation     allocation;
+  GdkWindowAttr     attributes;
+  gint              attributes_mask;
+
+  GTK_WIDGET_CLASS (giw_timeline_parent_class)->realize (widget);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x           = allocation.x;
+  attributes.y           = allocation.y;
+  attributes.width       = allocation.width;
+  attributes.height      = allocation.height;
+  attributes.wclass      = GDK_INPUT_ONLY;
+  attributes.event_mask  = (gtk_widget_get_events (widget) |
+                            GDK_EXPOSURE_MASK              |
+                            GDK_POINTER_MOTION_MASK);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  priv->input_window = gdk_window_new (gtk_widget_get_window (widget),
+                                       &attributes, attributes_mask);
+  gdk_window_set_user_data (priv->input_window, timeline);
+
+  giw_timeline_make_pixmap (timeline);
+}
+
+static void
+giw_timeline_unrealize (GtkWidget *widget)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  if (priv->backing_store)
+    {
+      cairo_surface_destroy (priv->backing_store);
+      priv->backing_store = NULL;
+    }
+
+  if (priv->layout)
+    {
+      g_object_unref (priv->layout);
+      priv->layout = NULL;
+    }
+
+  if (priv->input_window)
+    {
+      gdk_window_destroy (priv->input_window);
+      priv->input_window = NULL;
+    }
+
+  GTK_WIDGET_CLASS (giw_timeline_parent_class)->unrealize (widget);
+}
+
+static void
+giw_timeline_map (GtkWidget *widget)
+{
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+
+  GTK_WIDGET_CLASS (parent_class)->map (widget);
+
+  if (priv->input_window)
+    gdk_window_show (priv->input_window);
+}
+
+static void
+giw_timeline_unmap (GtkWidget *widget)
+{
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+
+  if (priv->input_window)
+    gdk_window_hide (priv->input_window);
+
+  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+}
+
+static void
+giw_timeline_size_allocate (GtkWidget     *widget,
+                          GtkAllocation *allocation)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+  GtkAllocation     widget_allocation;
+  gboolean          resized;
+
+  gtk_widget_get_allocation (widget, &widget_allocation);
+
+  resized = (widget_allocation.width  != allocation->width ||
+             widget_allocation.height != allocation->height);
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    {
+      gdk_window_move_resize (priv->input_window,
+                              allocation->x, allocation->y,
+                              allocation->width, allocation->height);
+
+      if (resized)
+        giw_timeline_make_pixmap (timeline);
+    }
+}
+
+static void
+giw_timeline_size_request (GtkWidget      *widget,
+                         GtkRequisition *requisition)
+{
+  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE (widget);
+  GtkStyleContext  *context = gtk_widget_get_style_context (widget);
+  PangoLayout      *layout;
+  PangoRectangle    ink_rect;
+  GtkBorder         border;
+  gint              size;
+
+  layout = giw_timeline_get_layout (widget, "0123456789");
+  pango_layout_get_pixel_extents (layout, &ink_rect, NULL);
+
+  size = 2 + ink_rect.height * 1.7;
+
+  gtk_style_context_get_border (context, gtk_widget_get_state_flags(widget), &border);
+
+  requisition->width  = border.left + border.right;
+  requisition->height = border.top + border.bottom;
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      requisition->width  += 1;
+      requisition->height += size;
+    }
+  else
+    {
+      requisition->width  += size;
+      requisition->height += 1;
+    }
+}
+
+static void
+giw_timeline_get_preferred_width (GtkWidget *widget,
+                                gint      *minimum_width,
+                                gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  giw_timeline_size_request (widget, &requisition);
+
+  *minimum_width = *natural_width = requisition.width;
+}
+
+static void
+giw_timeline_get_preferred_height (GtkWidget *widget,
+                                 gint      *minimum_height,
+                                 gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  giw_timeline_size_request (widget, &requisition);
+
+  *minimum_height = *natural_height = requisition.height;
+}
+
+static void
+giw_timeline_style_updated (GtkWidget *widget)
+{
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+
+  GTK_WIDGET_CLASS (giw_timeline_parent_class)->style_updated (widget);
+
+  gtk_widget_style_get (widget,
+                        "font-scale", &priv->font_scale,
+                        NULL);
+
+  if (priv->layout)
+    {
+      g_object_unref (priv->layout);
+      priv->layout = NULL;
+    }
+}
+
+
+static gboolean
+giw_timeline_draw (GtkWidget *widget,
+		   cairo_t   *cr)
+{
+  GiwTimeline        *timeline = GIW_TIMELINE (widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+
+  giw_timeline_draw_ticks (timeline);
+
+  cairo_set_source_surface (cr, priv->backing_store, 0, 0);
+  cairo_paint (cr);
+
+  giw_timeline_draw_pos (timeline);
+
+  return FALSE;
+}
+
+static void
+giw_timeline_draw_ticks (GiwTimeline *timeline)
+{
+  GtkWidget        *widget  = GTK_WIDGET (timeline);
+  GtkStyleContext  *context = gtk_widget_get_style_context (widget);
+  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE (timeline);
+  GtkAllocation     allocation;
+  GtkBorder         border;
+  GdkRGBA           color;
+  cairo_t          *cr;
+  gint              i;
+  gint              width, height;
+  gint              length, ideal_length;
+  gdouble           lower, upper;  /* Upper and lower limits, in timeline units */
+  gdouble           increment;     /* Number of pixels per unit */
+  gint              scale;         /* Number of units per major unit */
+
+  gint scaleh,scalem,scales;
+
+  gint curi,curh,curm,curs;
+  gdouble           start, end, cur;
+  gchar             unit_str[32];
+  gint              digit_height;
+  gint              digit_offset;
+  gint              text_size;
+  gint              pos;
+  gdouble           max_size;
+  //GiwTimeUnit       unit;
+  PangoLayout      *layout;
+  PangoRectangle    logical_rect, ink_rect;
+
+  if (! gtk_widget_is_drawable (widget))
+    return;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gtk_style_context_get_border (context, gtk_widget_get_state_flags(widget), &border);
+
+  layout = giw_timeline_get_layout (widget, "0123456789");
+  pango_layout_get_extents (layout, &ink_rect, &logical_rect);
+
+  digit_height = PANGO_PIXELS (ink_rect.height) + 2;
+  digit_offset = ink_rect.y;
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      width  = allocation.width;
+      height = allocation.height - (border.top + border.bottom);
+    }
+  else
+    {
+      width  = allocation.height;
+      height = allocation.width - (border.top + border.bottom);
+    }
+
+  cr = cairo_create (priv->backing_store);
+
+  gtk_render_background (context, cr, 0, 0, allocation.width, allocation.height);
+  gtk_render_frame (context, cr, 0, 0, allocation.width, allocation.height);
+
+  gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget),
+                               &color);
+  gdk_cairo_set_source_rgba (cr, &color);
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      cairo_rectangle (cr,
+                       border.left,
+                       height - border.bottom,
+                       allocation.width - (border.left + border.right),
+                       1);
+    }
+  else
+    {
+      cairo_rectangle (cr,
+                       border.left,
+                       border.top,
+                       1,
+                       allocation.height - (border.top + border.bottom));
+    }
+  cairo_stroke(cr);
+
+  giw_timeline_get_range (timeline, &lower, &upper, &max_size);
+
+  if ((upper - lower) == 0)
+    goto out;
+
+  increment = (gdouble) width / (upper - lower);
+
+  /* determine the scale
+   *   use the maximum extents of the timeline to determine the largest
+   *   possible number to be displayed.  Calculate the height in pixels
+   *   of this displayed text. Use this height to find a scale which
+   *   leaves sufficient room for drawing the timeline.
+   *
+   *   We calculate the text size as for the vtimeline instead of
+   *   actually measuring the text width, so that the result for the
+   *   scale looks consistent with an accompanying vtimeline.
+   */
+  scale = ceil (max_size);
+
+  if (priv->unit==GIW_TIME_UNIT_SECONDS) {
+    g_snprintf (unit_str, sizeof (unit_str), "%d", scale);
+  }
+  else {
+    scaleh=(int)((double)scale/3600.);
+    scalem=(int)((double)(scale-scaleh*3600)/60.);
+    scales=scale-scaleh*3600-scalem*60;
+
+    if (scale<0) {
+      scalem=-scalem;
+      scales=-scales;
+    }
+
+    g_snprintf (unit_str, sizeof (unit_str), "%02d:%02d:%02d", scaleh,scalem,scales);
+  }
+
+    
+  text_size = strlen (unit_str) * digit_height + 1;
+
+  for (scale = 0; scale < G_N_ELEMENTS (timeline_metric.timeline_scale); scale++)
+    if (timeline_metric.timeline_scale[scale] * fabs (increment) > 2 * text_size)
+      break;
+
+  if (scale == G_N_ELEMENTS (timeline_metric.timeline_scale))
+    scale = G_N_ELEMENTS (timeline_metric.timeline_scale) - 1;
+
+  //unit = giw_timeline_get_unit (timeline);
+  //unit=GIW_TIME_UNIT_SECONDS;
+
+  /* drawing starts here */
+  length = 0;
+  for (i = G_N_ELEMENTS (timeline_metric.subdivide) - 1; i >= 0; i--)
+    {
+      gdouble subd_incr;
+
+      /* hack to get proper subdivisions at full pixels */
+      if (scale == 1 && i == 1)
+        subd_incr = 1.0;
+      else
+        subd_incr = ((gdouble) timeline_metric.timeline_scale[scale] /
+                     (gdouble) timeline_metric.subdivide[i]);
+
+      if (subd_incr * fabs (increment) <= MINIMUM_INCR)
+        continue;
+
+      /* don't subdivide pixels */
+      if (subd_incr < 1.0)
+        continue;
+
+      /* Calculate the length of the tickmarks. Make sure that
+       * this length increases for each set of ticks
+       */
+      ideal_length = height / (i + 1) - 1;
+      if (ideal_length > ++length)
+        length = ideal_length;
+
+      if (lower < upper)
+        {
+          start = floor (lower / subd_incr) * subd_incr;
+          end   = ceil  (upper / subd_incr) * subd_incr;
+        }
+      else
+        {
+          start = floor (upper / subd_incr) * subd_incr;
+          end   = ceil  (lower / subd_incr) * subd_incr;
+        }
+
+      cairo_set_line_width(cr, 1.);
+
+      for (cur = start; cur <= end; cur += subd_incr)
+        {
+          pos = ROUND ((cur - lower) * increment);
+
+          if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+            {
+              cairo_rectangle (cr,
+                               pos, height + border.top - length,
+                               1,   length);
+            }
+          else
+            {
+              cairo_rectangle (cr,
+                               height + border.left - length, pos,
+                               length,                        1);
+            }
+	  cairo_stroke(cr);
+
+          /* draw label */
+          if (i == 0)
+            {
+	      curi=(int)cur;
+	      if (priv->unit==GIW_TIME_UNIT_SECONDS) {
+		g_snprintf (unit_str, sizeof (unit_str), "%d", curi);
+	      }
+	      else {
+		curh=(int)(cur/3600.);
+		curm=(int)((double)(curi-curh*3600)/60.);
+		curs=curi-curh*3600-curm*60;
+
+		if (curi<0) {
+		  curm=-curm;
+		  curs=-curs;
+		}
+	      
+		g_snprintf (unit_str, sizeof (unit_str), "%02d:%02d:%02d", curh,curm,curs);
+	      }
+
+              if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+                {
+                  pango_layout_set_text (layout, unit_str, -1);
+                  pango_layout_get_extents (layout, &logical_rect, NULL);
+
+                  cairo_move_to (cr,
+                                 pos + 2,
+                                 border.top + PANGO_PIXELS (logical_rect.y - digit_offset));
+                  pango_cairo_show_layout (cr, layout);
+                }
+              else
+                {
+                  gint j;
+
+                  for (j = 0; j < (int) strlen (unit_str); j++)
+                    {
+                      pango_layout_set_text (layout, unit_str + j, 1);
+                      pango_layout_get_extents (layout, NULL, &logical_rect);
+
+                      cairo_move_to (cr,
+                                     border.left + 1,
+                                     pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset));
+                      pango_cairo_show_layout (cr, layout);
+                    }
+                }
+            }
+        }
+    }
+
+  cairo_fill (cr);
+out:
+  cairo_destroy (cr);
+}
+
+static void
+giw_timeline_draw_pos (GiwTimeline *timeline)
+{
+  GtkWidget        *widget  = GTK_WIDGET (timeline);
+  GtkStyleContext  *context = gtk_widget_get_style_context (widget);
+  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE (timeline);
+  GtkAllocation     allocation;
+  GtkBorder         border;
+  GdkRGBA           color;
+  gint              x, y;
+  gint              width, height;
+  gint              bs_width, bs_height;
+
+  if (! gtk_widget_is_drawable (widget))
+    return;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gtk_style_context_get_border (context, gtk_widget_get_state_flags(widget), &border);
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      width  = allocation.width;
+      height = allocation.height - (border.top + border.bottom);
+
+      bs_width = height / 2 + 2;
+      bs_width |= 1;  /* make sure it's odd */
+      bs_height = bs_width / 2 + 1;
+    }
+  else
+    {
+      width  = allocation.width - (border.left + border.right);
+      height = allocation.height;
+
+      bs_height = width / 2 + 2;
+      bs_height |= 1;  /* make sure it's odd */
+      bs_width = bs_height / 2 + 1;
+    }
+
+  if ((bs_width > 0) && (bs_height > 0))
+    {
+      cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+      gdouble  lower;
+      gdouble  upper;
+      gdouble  position;
+      gdouble  increment;
+
+      cairo_rectangle (cr,
+                       allocation.x, allocation.y,
+                       allocation.width, allocation.height);
+      cairo_clip (cr);
+
+      cairo_translate (cr, allocation.x, allocation.y);
+
+      /*  If a backing store exists, restore the timeline  */
+      if (priv->backing_store)
+        {
+          cairo_set_source_surface (cr, priv->backing_store, 0, 0);
+          cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
+          cairo_fill (cr);
+        }
+
+      position = giw_timeline_get_position (timeline);
+
+      giw_timeline_get_range (timeline, &lower, &upper, NULL);
+
+      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+        {
+          increment = (gdouble) width / (upper - lower);
+
+          x = ROUND ((position - lower) * increment) + (border.left - bs_width) / 2 - 1;
+          y = (height + bs_height) / 2 + border.top;
+        }
+      else
+        {
+          increment = (gdouble) height / (upper - lower);
+
+          x = (width + bs_width) / 2 + border.left;
+          y = ROUND ((position - lower) * increment) + (border.top - bs_height) / 2 - 1;
+        }
+
+      gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget),
+                                   &color);
+      gdk_cairo_set_source_rgba (cr, &color);
+
+      cairo_move_to (cr, x, y);
+
+      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+        {
+          cairo_line_to (cr, x + bs_width / 2.0, y + bs_height);
+          cairo_line_to (cr, x + bs_width,       y);
+        }
+      else
+        {
+          cairo_line_to (cr, x + bs_width, y + bs_height / 2.0);
+          cairo_line_to (cr, x,            y + bs_height);
+        }
+
+      cairo_fill (cr);
+
+      cairo_destroy (cr);
+
+      priv->xsrc = x;
+      priv->ysrc = y;
+    }
+}
+
+static void
+giw_timeline_make_pixmap (GiwTimeline *timeline)
+{
+  GtkWidget        *widget = GTK_WIDGET (timeline);
+  GiwTimelinePrivate *priv   = GIW_TIMELINE_GET_PRIVATE (timeline);
+  GtkAllocation     allocation;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  if (priv->backing_store)
+    cairo_surface_destroy (priv->backing_store);
+
+  priv->backing_store =
+    gdk_window_create_similar_surface (gtk_widget_get_window (widget),
+                                       CAIRO_CONTENT_COLOR,
+                                       allocation.width,
+                                       allocation.height);
+}
+
+static PangoLayout *
+giw_timeline_create_layout (GtkWidget   *widget,
+                          const gchar *text)
+{
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+  PangoLayout      *layout;
+  PangoAttrList    *attrs;
+  PangoAttribute   *attr;
+
+  layout = gtk_widget_create_pango_layout (widget, text);
+
+  attrs = pango_attr_list_new ();
+
+  attr = pango_attr_scale_new (priv->font_scale);
+  attr->start_index = 0;
+  attr->end_index   = -1;
+  pango_attr_list_insert (attrs, attr);
+
+  pango_layout_set_attributes (layout, attrs);
+  pango_attr_list_unref (attrs);
+
+  return layout;
+}
+
+static PangoLayout *
+giw_timeline_get_layout (GtkWidget   *widget,
+                       const gchar *text)
+{
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+
+  if (priv->layout)
+    {
+      pango_layout_set_text (priv->layout, text, -1);
+      return priv->layout;
+    }
+
+  priv->layout = giw_timeline_create_layout (widget, text);
+
+  return priv->layout;
+}
+
+
+
+#endif // #if GTK_CHECK_VERSION(3,0,0)

LiVES-2.0.3.tar.bz2/src/giw/giwtimeline.h Added

@@ -0,0 +1,73 @@
+/* LIBGIW - The GIW Library
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIW_TIMELINE_H__
+#define __GIW_TIMELINE_H__
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+typedef enum {
+  GIW_TIME_UNIT_SECONDS,
+  GIW_TIME_UNIT_SMH
+} GiwTimeUnit;
+
+
+
+
+#define GIW_TYPE_TIMELINE            (giw_timeline_get_type ())
+#define GIW_TIMELINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIW_TYPE_TIMELINE, GiwTimeline))
+#define GIW_TIMELINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIW_TYPE_TIMELINE, GiwTimelineClass))
+#define GIW_IS_TIMELINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIW_TYPE_TIMELINE))
+#define GIW_IS_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIW_TYPE_TIMELINE))
+#define GIW_TIMELINE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIW_TYPE_TIMELINE, GiwTimelineClass))
+
+typedef struct _GiwTimeline   GiwTimeline;
+typedef struct _GiwTimelineClass   GiwTimelineClass;
+
+struct _GiwTimeline
+{
+  GtkScale  scale;
+};
+
+struct _GiwTimelineClass
+{
+  GtkScaleClass  parent_class;
+
+};
+
+
+GType       giw_timeline_get_type            (void) G_GNUC_CONST;
+GtkWidget * giw_timeline_new                 (GtkOrientation  orientation);
+void        giw_timeline_add_track_widget    (GiwTimeline      *timeline,
+					      GtkWidget      *widget);
+void        giw_timeline_remove_track_widget (GiwTimeline      *timeline,
+					      GtkWidget      *widget);
+void        giw_timeline_set_max_size        (GiwTimeline      *timeline,
+					      gdouble         max_size);
+gdouble     giw_timeline_get_max_size        (GiwTimeline    *timeline);
+void        giw_timeline_set_unit            (GiwTimeline    *timeline, 
+					      GiwTimeUnit    unit);
+GiwTimeUnit giw_timeline_get_unit            (GiwTimeline    *timeline);
+
+
+G_END_DECLS
+
+#endif /* __GIW_TIMELINE_H__ */

LiVES-1.6.1.tar.bz2/src/giw/giwvslider.c -> LiVES-2.0.3.tar.bz2/src/giw/giwvslider.c Changed

@@ -20,12 +20,14 @@
 James Scott Jr <skoona@users.sourceforge.net>
 */
 
-// additional code G. Finch (salsaman@gmail.com) 2010 - 2012
+// additional code G. Finch (salsaman@gmail.com) 2010 - 2013
 
 
 #include <stdio.h>
 #include <string.h>
 
+#include "main.h"
+
 #include "giw/giwvslider.h" 
 
 
@@ -37,31 +39,41 @@
 /* Forward declarations */
 static void giw_vslider_class_init               (GiwVSliderClass    *klass);
 static void giw_vslider_init                     (GiwVSlider         *vslider);
-static void giw_vslider_destroy                  (GtkObject        *object);
 static void giw_vslider_realize                  (GtkWidget        *widget);
 static void giw_vslider_size_request             (GtkWidget      *widget,
 					       GtkRequisition *requisition);
-static void giw_vslider_size_allocate            (GtkWidget     *widget,
-					       GtkAllocation *allocation);
+#if GTK_CHECK_VERSION(3,0,0)
+static void giw_vslider_get_preferred_width (GtkWidget *widget,
+					     gint      *minimal_width,
+					     gint      *natural_width);
+static void giw_vslider_get_preferred_height (GtkWidget *widget,
+					      gint      *minimal_height,
+					      gint      *natural_height);
+static void giw_vslider_dispose                  (GObject        *object);
+static gboolean giw_vslider_draw                (GtkWidget *widget, cairo_t *cairo);
+static void giw_vslider_style_updated             (GtkWidget *widget);
+#else
+static void giw_vslider_destroy                  (GtkObject        *object);
 static gint giw_vslider_expose                   (GtkWidget        *widget,
 						GdkEventExpose   *event);
-static gint giw_vslider_button_press             (GtkWidget        *widget,
+#endif
+static void giw_vslider_size_allocate            (GtkWidget     *widget,
+					       GtkAllocation *allocation);
+static gboolean giw_vslider_button_press             (GtkWidget        *widget,
 						GdkEventButton   *event);
-static gint giw_vslider_button_release           (GtkWidget        *widget,
+static gboolean giw_vslider_button_release           (GtkWidget        *widget,
 						GdkEventButton   *event);
-static gint giw_vslider_motion_notify            (GtkWidget        *widget,
-						GdkEventMotion   *event);
+static gboolean giw_vslider_motion_notify            (GtkWidget        *widget,
+						      GdkEventMotion   *event);
 static void giw_vslider_adjustment_changed       (GtkAdjustment    *adjustment,
 						gpointer          data);
 static void giw_vslider_adjustment_value_changed (GtkAdjustment    *adjustment,
 						gpointer          data);
 static void giw_vslider_style_set	              (GtkWidget      *widget,
-			                        GtkStyle       *previous_style);
+						       GtkStyle       *previous_style);
 
 /* Local data and functions */
 
-static GtkWidgetClass *parent_class = NULL;
-
 // A function that calculates distances and sizes for a later drawing..
 void vslider_calculate_sizes(GiwVSlider *vslider); 
 
@@ -80,47 +92,71 @@
 // A function that calculates width and height of the legend's the layout
 void vslider_calculate_legends_sizes(GiwVSlider *vslider); 
 
-GtkType
+
+#if GTK_CHECK_VERSION(3,0,0)
+G_DEFINE_TYPE (GiwVSlider, giw_vslider, GTK_TYPE_WIDGET)
+#define parent_class giw_vslider_parent_class
+#else
+static GtkWidgetClass *parent_class = NULL;
+
+
+GType
 giw_vslider_get_type ()
 {
-  static GtkType vslider_type = 0;
+  static GType vslider_type = 0;
 
   if (!vslider_type)
     {
       static const GtkTypeInfo vslider_info =
-      {
-	"GiwVSlider",
-	sizeof (GiwVSlider),
-	sizeof (GiwVSliderClass),
-	(GtkClassInitFunc) giw_vslider_class_init,
-	(GtkObjectInitFunc) giw_vslider_init,
-	/*(GtkArgSetFunc)*/ NULL,
-	/*(GtkArgGetFunc)*/ NULL,
-	(GtkClassInitFunc) NULL,
-      };
-
+	{
+	  "GiwVSlider",
+	  sizeof (GiwVSlider),
+	  sizeof (GiwVSliderClass),
+	  (GtkClassInitFunc) giw_vslider_class_init,
+	  (GtkObjectInitFunc) giw_vslider_init,
+	  /*(GtkArgSetFunc)*/ NULL,
+	  /*(GtkArgGetFunc)*/ NULL,
+	  (GtkClassInitFunc) NULL,
+	};
+      
       vslider_type = gtk_type_unique (gtk_widget_get_type (), &vslider_info);
     }
 
   return vslider_type;
 }
 
+#endif
+
 static void
 giw_vslider_class_init (GiwVSliderClass *xclass)
 {
-  GtkObjectClass *object_class;
+#if GTK_CHECK_VERSION(3,0,0)
+  GObjectClass *object_class = G_OBJECT_CLASS(xclass);
+#else
+  GtkObjectClass *object_class = (GtkObjectClass*) xclass;
+#endif
   GtkWidgetClass *widget_class;
 
-  object_class = (GtkObjectClass*) xclass;
   widget_class = (GtkWidgetClass*) xclass;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  object_class->dispose = giw_vslider_dispose;
+#else
   parent_class = (GtkWidgetClass *)gtk_type_class (gtk_widget_get_type ());
-
   object_class->destroy = giw_vslider_destroy;
+#endif
+
 
   widget_class->realize = giw_vslider_realize;
+#if GTK_CHECK_VERSION(3,0,0)
+  widget_class->get_preferred_width = giw_vslider_get_preferred_width;
+  widget_class->get_preferred_height = giw_vslider_get_preferred_height;
+  widget_class->draw = giw_vslider_draw;
+  widget_class->style_updated = giw_vslider_style_updated;
+#else
   widget_class->expose_event = giw_vslider_expose;
   widget_class->size_request = giw_vslider_size_request;
+#endif
   widget_class->size_allocate = giw_vslider_size_allocate;
   widget_class->button_press_event = giw_vslider_button_press;
   widget_class->button_release_event = giw_vslider_button_release;
@@ -144,6 +180,11 @@
   // Conditions for a unpressed button
   vslider->button_state=GTK_STATE_NORMAL;
   vslider->button_shadow=GTK_SHADOW_OUT;
+
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_has_window(GTK_WIDGET(vslider),TRUE);
+#endif
+
 }
 
 GtkWidget*
@@ -153,7 +194,11 @@
 
   g_return_val_if_fail (adjustment != NULL, NULL);
   
+#if GTK_CHECK_VERSION(3,0,0)
+  vslider = (GiwVSlider *)g_object_new (GIW_TYPE_VSLIDER, NULL);
+#else
   vslider = (GiwVSlider *)gtk_type_new (giw_vslider_get_type ());
+#endif
   
   giw_vslider_set_adjustment(vslider, adjustment);
   
@@ -167,16 +212,22 @@
 {
   GiwVSlider *vslider;
   
+#if GTK_CHECK_VERSION(3,0,0)
+  vslider = (GiwVSlider *)g_object_new (GIW_TYPE_VSLIDER, NULL);
+#else
   vslider = (GiwVSlider *)gtk_type_new (giw_vslider_get_type ());
+#endif
   
   giw_vslider_set_adjustment(vslider, (GtkAdjustment*) gtk_adjustment_new (value, lower, upper, 1.0, 1.0, 1.0));
   
   return GTK_WIDGET (vslider);
 }
 
-static void
-giw_vslider_destroy (GtkObject *object)
-{
+#if GTK_CHECK_VERSION(3,0,0)
+static void giw_vslider_dispose (GObject *object) {
+#else
+static void giw_vslider_destroy (GtkObject *object) {
+#endif
   GiwVSlider *vslider;
   gint loop;
 
@@ -197,8 +248,12 @@
     vslider->legends=NULL;
   }
     
+#if GTK_CHECK_VERSION(3,0,0)
+  G_OBJECT_CLASS (giw_vslider_parent_class)->dispose (object);
+#else
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+#endif
 }
 
 static void
@@ -207,40 +262,67 @@
   GiwVSlider *vslider;
   GdkWindowAttr attributes;
   gint attributes_mask;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkStyleContext *stylecon;
+#endif
  
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GIW_IS_VSLIDER (widget));
 
+#if GTK_CHECK_VERSION(2,20,0)
+  gtk_widget_set_realized(widget,TRUE);
+#else
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+#endif
+
   vslider = GIW_VSLIDER (widget);
 
-  // Creating the widget->window
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->allocation.height;
+
+  attributes.x = lives_widget_get_allocation_x(widget);
+  attributes.y = lives_widget_get_allocation_y(widget);
+  attributes.width = lives_widget_get_allocation_width(widget);
+  attributes.height = lives_widget_get_allocation_height(widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget) | 
-      GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
-      GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
+    GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
+    GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
+
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  attributes_mask |= GDK_WA_COLORMAP | GDK_WA_VISUAL;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
+#endif
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_window(widget,gdk_window_new (lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
+#else
   widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+#endif
 
-  // Creating the widget->style
-  widget->style = gtk_style_attach (widget->style, widget->window);
+#if GTK_CHECK_VERSION(3,0,0)
+  stylecon=gtk_style_context_new();
+  gtk_style_context_set_path(stylecon,gtk_widget_get_path(widget));
+  gtk_style_context_set_state(stylecon,GTK_STATE_FLAG_ACTIVE);
+  gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(lives_widget_get_parent(widget)));
+#else
+  widget->style = gtk_style_attach (widget->style, lives_widget_get_xwindow(widget));
+  gtk_style_set_background (widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
+#endif
 
-  gdk_window_set_user_data (widget->window, widget);
+  gdk_window_set_user_data (lives_widget_get_xwindow(widget), widget);
 
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
   
   // Creating the legends
   vslider_build_legends(vslider);
 }
 
+
+
 static void 
 giw_vslider_size_request (GtkWidget      *widget,
 		       GtkRequisition *requisition)
@@ -249,6 +331,35 @@
   requisition->height = VSLIDER_DEFAULT_HEIGHT;
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+
+static void
+giw_vslider_get_preferred_width (GtkWidget *widget,
+    gint      *minimal_width,
+    gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  giw_vslider_size_request (widget, &requisition);
+
+  *minimal_width = *natural_width = requisition.width;
+}
+
+static void
+giw_vslider_get_preferred_height (GtkWidget *widget,
+    gint      *minimal_height,
+    gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  giw_vslider_size_request (widget, &requisition);
+
+  *minimal_height = *natural_height = requisition.height;
+}
+
+#endif
+
+
 static void
 giw_vslider_size_allocate (GtkWidget     *widget,
 			GtkAllocation *allocation)
@@ -259,13 +370,17 @@
   g_return_if_fail (GIW_IS_VSLIDER (widget));
   g_return_if_fail (allocation != NULL);
 
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_allocation(widget,allocation);
+#else
   widget->allocation = *allocation;
+#endif
+
   vslider = GIW_VSLIDER (widget);
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (lives_widget_is_realized (widget))
     {
-
-      gdk_window_move_resize (widget->window,
+      gdk_window_move_resize (lives_widget_get_xwindow(widget),
 			      allocation->x, allocation->y,
 			      allocation->width, allocation->height);
 
@@ -275,26 +390,135 @@
   vslider_calculate_sizes(vslider);
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+ static gboolean giw_vslider_draw (GtkWidget *widget, cairo_t *cairo) {
+   GdkRGBA color;
+#else
 static gint
 giw_vslider_expose (GtkWidget      *widget,
 		 GdkEventExpose *event)
 {
+#endif
+
   GiwVSlider *vslider;
   gint loop, loop2;
   GdkRectangle rect;
-      
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+
   g_return_val_if_fail (event != NULL, FALSE);
 
   if (event->count > 0)
     return FALSE;
+#endif
+      
+  g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
   
   vslider = GIW_VSLIDER (widget);
 
-  rect.x=0;rect.y=0;rect.width=widget->allocation.width;rect.height=widget->allocation.height;
+  rect.x=0;rect.y=0;
+  rect.width=lives_widget_get_allocation_width(widget);
+  rect.height=lives_widget_get_allocation_height(widget);
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_render_background(gtk_widget_get_style_context(widget),
+			cairo,
+			0,
+			0,
+			rect.width,
+			rect.height);
   
-  // Drawing backgorund
+  cairo_set_line_width(cairo,1.);
+
+  // Drawing all the ticks and legends
+  for (loop=0; loop<vslider->major_ticks; loop++){
+    // Legends
+    if (vslider->legend_digits!=0)
+      gtk_render_layout (gtk_widget_get_style_context(widget),
+			 cairo,
+			 0,
+			 vslider->y+(gint)(vslider->major_dy*(gdouble)loop)-(vslider->legend_height/2),
+			 vslider->legends[loop]);
+
+    gtk_style_context_get_color (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags(widget), &color);
+    cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+
+    // Major ticks
+    cairo_move_to(cairo,
+		  vslider->legend_width-5, 
+		  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
+
+
+    cairo_line_to(cairo,
+		  vslider->legend_width,
+		  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
+
+    cairo_stroke(cairo);
+
+    // Minor ticks
+    for (loop2=1; loop2<vslider->minor_ticks+1; loop2++)
+      if (loop!=vslider->major_ticks-1) { // If it's not the last one
+        cairo_move_to(cairo,
+		      vslider->legend_width-3, 
+		      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
+    
+	cairo_line_to(cairo,
+		      vslider->legend_width,
+		      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
+
+	cairo_stroke(cairo);
+      }
+  }
+
+  //Drawing the back hole
+  cairo_set_source_rgba (cairo, 0.,0.,0.,1.);
+  cairo_rectangle (cairo,
+		   vslider->x+vslider->width/2-2,
+		   vslider->y,
+		   4,
+		   vslider->height);
+
+  cairo_fill(cairo);
+
+  gtk_style_context_get_background_color (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags(widget), &color);
+  cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+
+  cairo_rectangle (cairo,
+		   vslider->x+vslider->width/2-2,
+		   vslider->y,
+		   4,
+		   vslider->height);
+
+  cairo_stroke(cairo);
+
+  gtk_style_context_get_color (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags(widget), &color);
+  cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+
+  cairo_rectangle (cairo,
+		   vslider->button_x,
+		   vslider->button_y,
+		   vslider->button_w,
+		   vslider->button_h);
+
+  cairo_fill(cairo);
+
+
+  // The phanton button
+  if ((vslider->mouse_policy == GIW_VSLIDER_MOUSE_DELAYED) && (vslider->button !=0 ))
+    gtk_render_slider (gtk_widget_get_style_context(widget),
+		       cairo,
+		       vslider->pbutton_x,
+		       vslider->pbutton_y,
+		       vslider->pbutton_w,
+		       vslider->pbutton_h,
+		       GTK_ORIENTATION_VERTICAL);
+
+#else
+
+
+  // Drawing background
   gtk_paint_flat_box (widget->style,
 			widget->window,
 			GTK_STATE_NORMAL,
@@ -391,13 +615,15 @@
 			vslider->pbutton_w,
 			vslider->pbutton_h,
 			GTK_ORIENTATION_VERTICAL);
+#endif
  
   return(0);
 }
 
-static gint 
+
+static gboolean
 giw_vslider_button_press (GtkWidget        *widget,
-			GdkEventButton   *event)
+			  GdkEventButton   *event)
 {
   GiwVSlider *vslider;
  
@@ -410,7 +636,8 @@
   if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return(FALSE);
   
   // Checking if the pointer is inside the button
-  if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > vslider->button_y && event->y < vslider->button_y+vslider->button_h){
+  if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > 
+      vslider->button_y && event->y < vslider->button_y+vslider->button_h){
     if (vslider->button==0){
       vslider->button=event->button;
       vslider->button_state=GTK_STATE_ACTIVE;
@@ -423,9 +650,9 @@
   return(TRUE);
 }
 
-static gint 
+static gboolean 
 giw_vslider_button_release (GtkWidget        *widget,
-			GdkEventButton   *event)
+			    GdkEventButton   *event)
 {
   GiwVSlider *vslider;
   
@@ -449,7 +676,8 @@
     vslider->button=FALSE;
     
     // If the mouse stills inside the button, state is prelight, else state is normal
-    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y >     vslider->button_y && event->y < vslider->button_y+vslider->button_h)
+    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > 
+	vslider->button_y && event->y < vslider->button_y+vslider->button_h)
       vslider->button_state=GTK_STATE_PRELIGHT;
     else
       vslider->button_state=GTK_STATE_NORMAL;
@@ -462,9 +690,9 @@
   return(TRUE);
 }
 
-static gint 
+static gboolean 
 giw_vslider_motion_notify (GtkWidget        *widget,
-			GdkEventMotion   *event)
+			   GdkEventMotion   *event)
 {
   GiwVSlider *vslider;
   gint y;
@@ -484,20 +712,23 @@
   
   // If the mouse policy is to update automatically, change the value now if it's valid
   if (vslider->button!=0 && vslider->mouse_policy==GIW_VSLIDER_MOUSE_AUTOMATICALLY){
-    new_value=vslider->adjustment->lower+((gdouble)(vslider->height-y))/((gdouble)vslider->height)*(vslider->adjustment->upper-vslider->adjustment->lower);
+    new_value=lives_adjustment_get_lower(vslider->adjustment)+((gdouble)(vslider->height-y))/
+      ((gdouble)vslider->height)*(lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment));
+
     // If it's a valid value, update it!
-    if ( (new_value <= vslider->adjustment->upper) && 
-         (new_value >= vslider->adjustment->lower) )
+    if ( (new_value <= lives_adjustment_get_upper(vslider->adjustment)) && 
+         (new_value >= lives_adjustment_get_lower(vslider->adjustment)) )
       giw_vslider_set_value(vslider, new_value);
   }
   
   // If the mouse policy is to update delayed, calculate the false value
   if (vslider->button!=0 && vslider->mouse_policy==GIW_VSLIDER_MOUSE_DELAYED){
-    new_value=vslider->adjustment->lower+((gdouble)(vslider->height-y))/((gdouble)vslider->height)*(vslider->adjustment->upper-vslider->adjustment->lower);
+    new_value=lives_adjustment_get_lower(vslider->adjustment)+((gdouble)(vslider->height-y))/
+      ((gdouble)vslider->height)*(lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment));
   
     // If it's a valid value, update the false value
-    if ( (new_value <= vslider->adjustment->upper) && 
-         (new_value >= vslider->adjustment->lower) ){
+    if ( (new_value <= lives_adjustment_get_upper(vslider->adjustment)) && 
+         (new_value >= lives_adjustment_get_lower(vslider->adjustment)) ) {
       vslider->phanton_value=new_value;
       vslider_calculate_phanton_button(vslider);
       gtk_widget_queue_draw(GTK_WIDGET(vslider));
@@ -506,7 +737,8 @@
   
   // If the button is not pressed and the pointer is inside the button, set prelight, if the pointer is out  of the button, set normal
   if (vslider->button==0){
-    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > vslider->button_y && event->y < vslider->button_y+vslider->button_h)
+    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > 
+	vslider->button_y && event->y < vslider->button_y+vslider->button_h)
       vslider->button_state=GTK_STATE_PRELIGHT;
     else
       vslider->button_state=GTK_STATE_NORMAL;
@@ -532,6 +764,15 @@
   vslider_calculate_legends_sizes(vslider);
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+giw_vslider_style_updated (GtkWidget *widget)
+{
+
+}
+
+#endif
+
 void
 giw_vslider_set_value (GiwVSlider *vslider,
 			gdouble value)
@@ -539,8 +780,8 @@
   g_return_if_fail (vslider != NULL); 
   g_return_if_fail (GIW_IS_VSLIDER (vslider));
   
-  if (vslider->adjustment->value!=value){
-    vslider->adjustment->value=value;
+  if (gtk_adjustment_get_value(vslider->adjustment)!=value){
+    gtk_adjustment_set_value(vslider->adjustment,value);
     
     gtk_adjustment_value_changed(vslider->adjustment);
   }
@@ -553,7 +794,7 @@
    g_return_val_if_fail (GIW_IS_VSLIDER (vslider), 0.0);
    g_return_val_if_fail (vslider->adjustment != NULL, 0.0);
  
-   return(vslider->adjustment->value);
+   return (gtk_adjustment_get_value(vslider->adjustment));
 }
 
 GtkAdjustment*
@@ -575,7 +816,12 @@
 
   // Freeing the last one
   if (vslider->adjustment){
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handler_disconnect((gpointer)(vslider->adjustment),vslider->chsig);
+    g_signal_handler_disconnect((gpointer)(vslider->adjustment),vslider->vchsig);
+#else
     gtk_signal_disconnect_by_data (GTK_OBJECT (vslider->adjustment), (gpointer) vslider);
+#endif
     g_object_unref (G_OBJECT (vslider->adjustment));
     vslider->adjustment=NULL;
   }
@@ -583,12 +829,12 @@
   vslider->adjustment = adjustment;
   g_object_ref (GTK_OBJECT (vslider->adjustment));
   
-  g_signal_connect (GTK_OBJECT (adjustment), "changed",
-		      (GtkSignalFunc) giw_vslider_adjustment_changed,
-		      (gpointer) vslider);
-  g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
-		      (GtkSignalFunc) giw_vslider_adjustment_value_changed,
-		      (gpointer) vslider);
+  vslider->chsig = g_signal_connect (GTK_OBJECT (adjustment), "changed",
+				     (GCallback) giw_vslider_adjustment_changed,
+				     (gpointer) vslider);
+  vslider->vchsig = g_signal_connect (GTK_OBJECT (adjustment), "value_changed",
+				      (GCallback) giw_vslider_adjustment_value_changed,
+				      (gpointer) vslider);
 
   gtk_adjustment_value_changed(vslider->adjustment);
     
@@ -704,14 +950,14 @@
   widget=GTK_WIDGET(vslider);
           
   // Calculating the sizes and distances...
-  vslider->width=widget->allocation.width-vslider->legend_width;
-  vslider->height=widget->allocation.height-vslider->legend_height;
+  vslider->width=lives_widget_get_allocation_width(widget)-vslider->legend_width;
+  vslider->height=lives_widget_get_allocation_height(widget)-vslider->legend_height;
   vslider->x=vslider->legend_width;
   vslider->y=vslider->legend_height/2;
 
   // If the legends are too small, or inexistant, it has to be some space left fot the button (when it's on he edge)
   if (vslider->y < vslider->button_h/2){
-    vslider->height = widget->allocation.height-vslider->button_h;
+    vslider->height = lives_widget_get_allocation_height(widget)-vslider->button_h;
     vslider->y = vslider->button_h/2;
   }
 
@@ -732,7 +978,9 @@
 
   // Getting button's positon and dimensions
   vslider->button_x=vslider->x+5;
-  vslider->button_y=vslider->y+vslider->height-vslider->height*((vslider->adjustment->value-vslider->adjustment->lower)/(vslider->adjustment->upper-vslider->adjustment->lower))-5;
+  vslider->button_y=vslider->y+vslider->height-vslider->height*
+    ((gtk_adjustment_get_value(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment))/
+     (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment)))-5;
   vslider->button_w=vslider->width-10;
   vslider->button_h=10;
 } 
@@ -744,7 +992,9 @@
 
   // Getting phanton button's positon and dimensions
   vslider->pbutton_x=vslider->x+5;
-  vslider->pbutton_y=vslider->y+vslider->height-vslider->height*((vslider->phanton_value-vslider->adjustment->lower)/(vslider->adjustment->upper-vslider->adjustment->lower))-5;
+  vslider->pbutton_y=vslider->y+vslider->height-vslider->height*
+    ((vslider->phanton_value-lives_adjustment_get_lower(vslider->adjustment))/
+     (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment)))-5;
   vslider->pbutton_w=vslider->width-10;
   vslider->pbutton_h=10;
 }
@@ -768,9 +1018,19 @@
     vslider->legends=g_new(PangoLayout*, vslider->major_ticks);
     str=g_new(gchar, vslider->legend_digits+1); // +1 for the '/0'
     for (loop=0; loop<vslider->major_ticks; loop++){
-      snprintf(str,vslider->legend_digits+1,"%f",vslider->adjustment->lower+(vslider->major_ticks-1-loop)*(vslider->adjustment->upper-vslider->adjustment->lower)/(vslider->major_ticks-1)); // Creating the legends string
+      snprintf(str,vslider->legend_digits+1,"%f",lives_adjustment_get_lower(vslider->adjustment)+
+	       (vslider->major_ticks-1-loop)*
+	       (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment))/
+	       (vslider->major_ticks-1)); // Creating the legends string
       vslider->legends[loop]=gtk_widget_create_pango_layout (widget, str); 
+
+#if GTK_CHECK_VERSION(3,0,0)
+      pango_layout_set_font_description (vslider->legends[loop], 
+					 gtk_style_context_get_font(gtk_widget_get_style_context(widget),
+								    gtk_widget_get_state_flags(widget)));
+#else
       pango_layout_set_font_description(vslider->legends[loop], widget->style->font_desc); // Setting te correct font  
+#endif
     }
     g_free(str);
   
@@ -810,7 +1070,13 @@
   widget=GTK_WIDGET(vslider);
 
   if (vslider->legends!=NULL){
+#if GTK_CHECK_VERSION(3,0,0)
+    pango_layout_set_font_description (vslider->legends[0], 
+				       gtk_style_context_get_font(gtk_widget_get_style_context(widget),
+								  gtk_widget_get_state_flags(widget)));
+#else
     pango_layout_set_font_description (vslider->legends[0], widget->style->font_desc);  
+#endif
     pango_layout_get_size(vslider->legends[0], &(vslider->legend_width), &(vslider->legend_height));
     vslider->legend_width/=PANGO_SCALE;
     vslider->legend_height/=PANGO_SCALE;

LiVES-1.6.1.tar.bz2/src/giw/giwvslider.h -> LiVES-2.0.3.tar.bz2/src/giw/giwvslider.h Changed

@@ -49,6 +49,9 @@
 
 struct _GiwVSlider
 {
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkWidget parent_instance;
+#endif
   GtkWidget widget;
 
   GtkAdjustment *adjustment;
@@ -79,6 +82,9 @@
   // Types for drawing the button (they change when the button in pressed, or the pointer is over it)
   GtkStateType button_state;
   GtkShadowType button_shadow;
+
+  gulong chsig;
+  gulong vchsig;
 };
 
 struct _GiwVSliderClass
@@ -86,9 +92,12 @@
   GtkWidgetClass parent_class;
 };
 
+
+
+
 GtkWidget*     giw_vslider_new                    (GtkAdjustment *adjustment);
 GtkWidget*     giw_vslider_new_with_adjustment    (gdouble value, gdouble lower, gdouble upper);
-GtkType        giw_vslider_get_type               (void);
+GType          giw_vslider_get_type               (void) G_GNUC_CONST;
 void           giw_vslider_set_value              (GiwVSlider *vslider, gdouble value);   
 gdouble        giw_vslider_get_value              (GiwVSlider *vslider);   
 GtkAdjustment *giw_vslider_get_adjustment         (GiwVSlider *vslider);

LiVES-1.6.1.tar.bz2/src/gui.c -> LiVES-2.0.3.tar.bz2/src/gui.c Changed

@@ -1,6 +1,6 @@
 // gui.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // Released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -18,6 +18,9 @@
 #include "stream.h"
 #include "startup.h"
 
+#ifdef ENABLE_GIW_3
+#include "giw/giwtimeline.h"
+#endif
 
 #ifdef ENABLE_OSC
 #include "omc-learn.h"
@@ -94,6 +97,7 @@
   mainw->scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(mainw->scrolledwindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS);
   gtk_widget_show (mainw->scrolledwindow);
+  lives_widget_set_vexpand(mainw->scrolledwindow,TRUE);
 
   gtk_container_add (GTK_CONTAINER(conter), mainw->scrolledwindow);
 
@@ -103,18 +107,24 @@
 
   tbuff=gtk_text_view_get_buffer(GTK_TEXT_VIEW(mainw->textview1));
   if (tbuff!=NULL && all_text!=NULL) {
+    GtkTextIter end_iter;
+    GtkTextMark *mark;
     gtk_text_buffer_set_text(tbuff,all_text,-1);
     g_free(all_text);
+    gtk_text_buffer_get_end_iter(tbuff,&end_iter);
+    mark=gtk_text_buffer_create_mark(tbuff,NULL,&end_iter,FALSE);
+    gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW (mainw->textview1),mark);
+    gtk_text_buffer_delete_mark (tbuff,mark);
   }
 
-  gtk_widget_set_size_request (mainw->textview1, -1, 50);
+  gtk_widget_set_size_request (mainw->textview1, -1, MSG_AREA_HEIGHT);
   gtk_text_view_set_editable (GTK_TEXT_VIEW (mainw->textview1), FALSE);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (mainw->textview1), GTK_WRAP_WORD);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (mainw->textview1), FALSE);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_base(mainw->textview1, GTK_STATE_NORMAL, &palette->info_base);
-    gtk_widget_modify_text(mainw->textview1, GTK_STATE_NORMAL, &palette->info_text);
+    lives_widget_set_base_color(mainw->textview1, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
+    lives_widget_set_text_color(mainw->textview1, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
   }
 }
 
@@ -123,54 +133,48 @@
   mainw->custom_gens_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Generators"));
   mainw->custom_effects_submenu = gtk_menu_item_new_with_mnemonic (_ ("_Custom Effects"));
   mainw->custom_utilities_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Utilities"));
+
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_sim (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  if (mainw->current_file>0) {
+    load_start_image(cfile->start);
+  }
+  else load_start_image(0);
+  return TRUE;
+}
 
-void 
-create_LiVES (void)
-{
+boolean expose_eim (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  if (mainw->current_file>0) {
+    load_end_image(cfile->end);
+  }
+  else load_end_image(0);
+  return TRUE;
+}
+
+boolean expose_pim (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  if (!mainw->draw_blocked) {
+    load_preview_image(FALSE);
+  }
+  return TRUE;
+}
+#endif
+
+void create_LiVES (void) {
   GtkWidget *hbox1;
   GtkWidget *vbox2;
-  GtkWidget *menuitem11;
-  GtkWidget *menuitem11_menu;
-  GtkWidget *separatormenuitem2;
-  GtkWidget *separatormenuitem3;
-  GtkWidget *separatormenuitem11;
-  GtkWidget *separatormenuitem110;
-  GtkWidget *separatormenuitem99;
-  GtkWidget *menuitem12;
-  GtkWidget *menuitem12_menu;
+  GtkWidget *menuitem;
+  GtkWidget *menuitem_menu;
+  GtkWidget *separatormenuitem;
   GtkWidget *select_submenu_menu;
   GtkWidget *submenu_menu;
   GtkWidget *export_submenu_menu;
   GtkWidget *trimaudio_submenu_menu;
   GtkWidget *delaudio_submenu_menu;
   GtkWidget *menuitemsep;
-  GtkWidget *image333;
-  GtkWidget *image380;
-  GtkWidget *separator3;
-  GtkWidget *image334;
-  GtkWidget *image1334;
-  GtkWidget *separator5;
-  GtkWidget *separator27;
-  GtkWidget *separator55;
-  GtkWidget *separator88;
-  GtkWidget *menuitem13;
-  GtkWidget *menuitem13_menu;
-  GtkWidget *image335;
-  GtkWidget *image336;
-  GtkWidget *image337;
-  GtkWidget *image1337;
-  GtkWidget *image355;
-  GtkWidget *separator8;
+  GtkWidget *image;
   GtkWidget *effects;
-  GtkWidget *separator9;
-  GtkWidget *separator19;
-  GtkWidget *separator49;
-  GtkWidget *separator10;
-  GtkWidget *separator6;
-  GtkWidget *separator26;
-  GtkWidget *image346;
   GtkWidget *tools;
   GtkWidget *audio;
   GtkWidget *audio_menu;
@@ -188,11 +192,6 @@
   GtkWidget *vj_menu;
   GtkWidget *toys_menu;
   GtkWidget *win;
-  GtkWidget *image347;
-  GtkWidget *menuitem14;
-  GtkWidget *menuitem14_menu;
-  GObject *spinbutton_start_adj;
-  GObject *spinbutton_end_adj;
   GtkWidget *about;
   GtkWidget *show_manual;
   GtkWidget *email_author;
@@ -202,40 +201,36 @@
   GtkWidget *help_translate;
   GtkWidget *vbox4;
   GtkWidget *pf_label;
-  GtkWidget *label15;
-  GtkWidget *label16;
+  GtkWidget *label;
   GtkWidget *hbox3;
   GtkWidget *t_label;
-  GtkWidget *label;
 
 #if defined (HAVE_YUV4MPEG) || defined (HAVE_UNICAP)
   GtkWidget *submenu;
-  GtkWidget *menuitem;
 #endif 
 
-  GObject *spinbutton_pb_fps_adj;
-
   GtkWidget *new_test_rfx;
-  GtkWidget *edit_test_rfx;
-  GtkWidget *rename_test_rfx;
-  GtkWidget *delete_test_rfx;
-  GtkWidget *promote_test_rfx;
   GtkWidget *copy_rfx;
   GtkWidget *import_custom_rfx;
-  GtkWidget *export_custom_rfx;
-  GtkWidget *delete_custom_rfx;
   GtkWidget *rebuild_rfx;
   GtkWidget *assign_rte_keys;
 
   GtkWidget *tmp_toolbar_icon;
-  GdkColor *normal;
-  gchar buff[32768];
 
-  GdkPixbuf *pixbuf;
+  LiVESAdjustment *adj;
+
+  LiVESWidgetColor normal;
+
+  LiVESPixbuf *pixbuf;
+
+  gchar buff[32768];
 
   gchar *tmp;
   gchar *fnamex;
 
+  int dpw;
+  boolean woat;
+
   stop_closure=NULL;
   fullscreen_closure=NULL;
   dblsize_closure=NULL;
@@ -263,25 +258,45 @@
   mainw->image273 = gtk_image_new_from_pixbuf (NULL);
   mainw->imframe=mainw->imsep=NULL;
 
+  gtk_widget_show(mainw->image272);
+  gtk_widget_show(mainw->image273);
+
   if (palette->style&STYLE_1) {
     load_theme();
   }
 
+
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_set_app_paintable(mainw->image272,TRUE);
+  g_signal_connect (GTK_OBJECT (mainw->image272), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (expose_sim),
+		    NULL);
+
+  gtk_widget_set_app_paintable(mainw->image273,TRUE);
+  g_signal_connect (GTK_OBJECT (mainw->image273), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (expose_eim),
+		    NULL);
+#else
+
   if (mainw->imframe!=NULL) {
     gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->imframe);
     gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->imframe);
   }
 
+#endif
+
   mainw->accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
-  
+
   mainw->layout_textbuffer=gtk_text_buffer_new(NULL);
   g_object_ref(mainw->layout_textbuffer);
   mainw->affected_layouts_map=NULL;
 
   mainw->LiVES = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  //gtk_window_present(GTK_WINDOW(mainw->LiVES));
+  if (prefs->present) 
+    gtk_window_present(GTK_WINDOW(mainw->LiVES));
 
+  // TODO - can we use just DEFAULT_DROP ?
   gtk_drag_dest_set(mainw->LiVES,GTK_DEST_DEFAULT_ALL,mainw->target_table,2,
 		    (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK));
 
@@ -294,24 +309,26 @@
 
   if (palette->style==STYLE_PLAIN) {
     // if gtk_widget_ensure_style is used, we can't grab external frames...
+#if !GTK_CHECK_VERSION(3,0,0)
     if (!mainw->foreign) {
       gtk_widget_ensure_style(mainw->LiVES);
     }
-    normal=&gtk_widget_get_style(mainw->LiVES)->bg[GTK_STATE_NORMAL];
-    colour_equal((GdkColor *)(&palette->normal_back),normal);
+#endif
+    lives_widget_get_bg_color(mainw->LiVES,&normal);
+    lives_widget_color_copy((LiVESWidgetColor *)(&palette->normal_back),&normal);
 
-    normal=&gtk_widget_get_style(mainw->LiVES)->fg[GTK_STATE_NORMAL];
-    colour_equal((GdkColor *)(&palette->normal_fore),normal);
+    lives_widget_get_fg_color(mainw->LiVES,&normal);
+    lives_widget_color_copy((LiVESWidgetColor *)(&palette->normal_fore),&normal);
   }
 
  
   gtk_window_set_title (GTK_WINDOW (mainw->LiVES), "LiVES");
 
-  mainw->vbox1 = gtk_vbox_new (FALSE, 0);
+  mainw->vbox1 = lives_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (mainw->LiVES), mainw->vbox1);
   gtk_widget_show (mainw->vbox1);
 
-  mainw->menu_hbox = gtk_hbox_new (FALSE, 0);
+  mainw->menu_hbox = lives_hbox_new (FALSE, 0);
   gtk_widget_show (mainw->menu_hbox);
   gtk_box_pack_start (GTK_BOX (mainw->vbox1), mainw->menu_hbox, FALSE, FALSE, 0);
 
@@ -320,29 +337,29 @@
   gtk_box_pack_start (GTK_BOX (mainw->menu_hbox), mainw->menubar, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->menubar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  menuitem11 = gtk_menu_item_new_with_mnemonic (_("_File"));
-  gtk_widget_show (menuitem11);
-  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem11);
+  menuitem = gtk_menu_item_new_with_mnemonic (_("_File"));
+  gtk_widget_show (menuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem);
 
-  menuitem11_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem11), menuitem11_menu);
+  menuitem_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem11_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->open = gtk_menu_item_new_with_mnemonic (_("_Open File/Directory"));
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open);
   gtk_widget_add_accelerator (mainw->open, "activate", mainw->accel_group,
-                              GDK_o, GDK_CONTROL_MASK,
+                              LIVES_KEY_o, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->open_sel = gtk_menu_item_new_with_mnemonic (_("O_pen Part of File..."));
 
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_sel);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_sel);
 
 
 
@@ -351,12 +368,12 @@
 #ifdef HAVE_WEBM
 
   mainw->open_loc_menu = gtk_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_loc_menu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_loc_menu);
 
   mainw->open_loc_submenu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_loc_menu), mainw->open_loc_submenu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->open_loc_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->open_utube = gtk_menu_item_new_with_mnemonic (_("Open _Youtube Clip..."));
@@ -366,16 +383,16 @@
 
 #else
 
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_loc);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_loc);
 
 #endif
 
   mainw->open_vcd_menu = gtk_menu_item_new_with_mnemonic (_("Import from _dvd/vcd..."));
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_vcd_menu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_vcd_menu);
   mainw->open_vcd_submenu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_vcd_menu), mainw->open_vcd_submenu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->open_vcd_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->open_vcd_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->open_dvd = gtk_menu_item_new_with_mnemonic (_("Import from _dvd"));
@@ -385,11 +402,11 @@
   gtk_container_add (GTK_CONTAINER (mainw->open_vcd_submenu), mainw->open_vcd);
 
   mainw->open_device_menu = gtk_menu_item_new_with_mnemonic (_("_Import from Firewire"));
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->open_device_menu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->open_device_menu);
   mainw->open_device_submenu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->open_device_menu), mainw->open_device_submenu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->open_device_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->open_device_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->open_firewire = gtk_menu_item_new_with_mnemonic (_("Import from _Firewire Device (dv)"));
@@ -424,7 +441,7 @@
   mainw->add_live_menu = gtk_menu_item_new_with_mnemonic (_("_Add Webcam/TV card..."));
 
 #if defined(HAVE_UNICAP) || defined(HAVE_YUV4MPEG)
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->add_live_menu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->add_live_menu);
   gtk_widget_show (mainw->add_live_menu);
 
 #ifndef HAVE_UNICAP
@@ -434,7 +451,7 @@
     submenu=gtk_menu_new();
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->add_live_menu), submenu);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+      lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     }
     gtk_widget_show (submenu);
 
@@ -474,7 +491,7 @@
 #endif // defined HAVE_UNICAP || defined HAVE_YUV4MPEG
 
   mainw->recent_menu = gtk_menu_item_new_with_mnemonic (_("_Recent Files..."));
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->recent_menu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->recent_menu);
   mainw->recent_submenu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->recent_menu), mainw->recent_submenu);
 
@@ -510,7 +527,7 @@
   gtk_container_add (GTK_CONTAINER (mainw->recent_submenu), mainw->recent4);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->recent_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->recent_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   
   gtk_widget_show (mainw->recent_submenu);
@@ -519,32 +536,32 @@
     gtk_widget_show (mainw->recent_menu);
   }
 
-  separatormenuitem11 = gtk_menu_item_new ();
-  gtk_widget_show (separatormenuitem11);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), separatormenuitem11);
-  gtk_widget_set_sensitive (separatormenuitem11, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->vj_load_set = gtk_menu_item_new_with_mnemonic (_("_Reload Clip Set..."));
   gtk_widget_show (mainw->vj_load_set);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->vj_load_set);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->vj_load_set);
 
   mainw->vj_save_set = gtk_menu_item_new_with_mnemonic (_("Close/Sa_ve All Clips"));
   gtk_widget_show (mainw->vj_save_set);
   gtk_widget_set_sensitive (mainw->vj_save_set, FALSE);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->vj_save_set);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->vj_save_set);
 
-  separator88 = gtk_menu_item_new ();
-  gtk_widget_show (separator88);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), separator88);
-  gtk_widget_set_sensitive (separator88, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->save_as = gtk_image_menu_item_new_from_stock ("gtk-save", mainw->accel_group);
-  gtk_container_add (GTK_CONTAINER(menuitem11_menu), mainw->save_as);
+  gtk_container_add (GTK_CONTAINER(menuitem_menu), mainw->save_as);
   gtk_widget_set_sensitive (mainw->save_as, FALSE);
   set_menu_text(mainw->save_as,_("_Encode Clip As..."),TRUE);
 
   mainw->save_selection = gtk_menu_item_new_with_mnemonic (_("Encode _Selection As..."));
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->save_selection);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->save_selection);
   gtk_widget_set_sensitive (mainw->save_selection, FALSE);
 
   gtk_widget_show (mainw->save_as);
@@ -552,195 +569,195 @@
 
   mainw->close = gtk_menu_item_new_with_mnemonic (_("_Close This Clip"));
   gtk_widget_add_accelerator (mainw->close, "activate", mainw->accel_group,
-                              GDK_w, GDK_CONTROL_MASK,
+                              LIVES_KEY_w, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_show (mainw->close);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->close);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->close);
   gtk_widget_set_sensitive (mainw->close, FALSE);
 
-  separatormenuitem99 = gtk_menu_item_new ();
-  gtk_widget_show (separatormenuitem99);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), separatormenuitem99);
-  gtk_widget_set_sensitive (separatormenuitem99, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->backup = gtk_menu_item_new_with_mnemonic (_("_Backup Clip as .lv1..."));
   gtk_widget_show (mainw->backup);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->backup);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->backup);
   gtk_widget_set_sensitive (mainw->backup, FALSE);
 
   gtk_widget_add_accelerator (mainw->backup, "activate", mainw->accel_group,
-                              GDK_b, GDK_CONTROL_MASK,
+                              LIVES_KEY_b, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->restore = gtk_menu_item_new_with_mnemonic (_("_Restore Clip from .lv1..."));
   gtk_widget_show (mainw->restore);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->restore);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->restore);
 
   gtk_widget_add_accelerator (mainw->restore, "activate", mainw->accel_group,
-                              GDK_r, GDK_CONTROL_MASK,
+                              LIVES_KEY_r, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  separatormenuitem2 = gtk_menu_item_new ();
-  gtk_widget_show (separatormenuitem2);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), separatormenuitem2);
-  gtk_widget_set_sensitive (separatormenuitem2, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->sw_sound = gtk_check_menu_item_new_with_mnemonic (_("Encode/Load/Backup _with Sound"));
   gtk_widget_show (mainw->sw_sound);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->sw_sound);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->sw_sound);
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->sw_sound),TRUE);
 
   mainw->aload_subs = gtk_check_menu_item_new_with_mnemonic (_("Auto load subtitles"));
   gtk_widget_show (mainw->aload_subs);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->aload_subs);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->aload_subs);
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->aload_subs),prefs->autoload_subs);
 
-  separatormenuitem3 = gtk_menu_item_new ();
-  gtk_widget_show (separatormenuitem3);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), separatormenuitem3);
-  gtk_widget_set_sensitive (separatormenuitem3, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->clear_ds = gtk_menu_item_new_with_mnemonic (_("Clean _up Diskspace"));
   gtk_widget_show (mainw->clear_ds);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->clear_ds);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->clear_ds);
 
   mainw->quit = gtk_image_menu_item_new_from_stock ("gtk-quit", mainw->accel_group);
   gtk_widget_show (mainw->quit);
-  gtk_container_add (GTK_CONTAINER (menuitem11_menu), mainw->quit);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->quit);
 
-  menuitem12 = gtk_menu_item_new_with_mnemonic (_("_Edit"));
-  gtk_widget_show (menuitem12);
-  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem12);
+  menuitem = gtk_menu_item_new_with_mnemonic (_("_Edit"));
+  gtk_widget_show (menuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem);
 
-  menuitem12_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem12), menuitem12_menu);
+  menuitem_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem12_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->undo = gtk_image_menu_item_new_with_mnemonic (_("_Undo"));
   gtk_widget_show (mainw->undo);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->undo);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->undo);
   gtk_widget_set_sensitive (mainw->undo, FALSE);
 
   gtk_widget_add_accelerator (mainw->undo, "activate", mainw->accel_group,
-                              GDK_u, GDK_CONTROL_MASK,
+                              LIVES_KEY_u, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image333 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image333);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->undo), image333);
+  image = lives_image_new_from_stock ("gtk-undo", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->undo), image);
 
   mainw->redo = gtk_image_menu_item_new_with_mnemonic (_("_Redo"));
   gtk_widget_hide (mainw->redo);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->redo);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->redo);
   gtk_widget_set_sensitive (mainw->redo, FALSE);
 
   gtk_widget_add_accelerator (mainw->redo, "activate", mainw->accel_group,
-                              GDK_z, GDK_CONTROL_MASK,
+                              LIVES_KEY_z, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image380 = gtk_image_new_from_stock ("gtk-redo", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image380);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->redo), image380);
-
-  separator3 = gtk_menu_item_new ();
-  gtk_widget_show (separator3);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), separator3);
-  gtk_widget_set_sensitive (separator3, FALSE);
+  image = lives_image_new_from_stock ("gtk-redo", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->redo), image);
+
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->mt_menu = gtk_image_menu_item_new_with_mnemonic (_("_MULTITRACK mode"));
   gtk_widget_show (mainw->mt_menu);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->mt_menu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->mt_menu);
 
-  separator3 = gtk_menu_item_new ();
-  gtk_widget_show (separator3);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), separator3);
-  gtk_widget_set_sensitive (separator3, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   gtk_widget_add_accelerator (mainw->mt_menu, "activate", mainw->accel_group,
-                              GDK_m, GDK_CONTROL_MASK,
+                              LIVES_KEY_m, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->copy = gtk_image_menu_item_new_with_mnemonic (_("_Copy Selection"));
   gtk_widget_show (mainw->copy);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->copy);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->copy);
   gtk_widget_set_sensitive (mainw->copy, FALSE);
 
   gtk_widget_add_accelerator (mainw->copy, "activate", mainw->accel_group,
-                              GDK_c, GDK_CONTROL_MASK,
+                              LIVES_KEY_c, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->cut = gtk_image_menu_item_new_with_mnemonic (_("Cu_t Selection"));
   gtk_widget_show (mainw->cut);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->cut);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->cut);
   gtk_widget_set_sensitive (mainw->cut, FALSE);
 
   gtk_widget_add_accelerator (mainw->cut, "activate", mainw->accel_group,
-                              GDK_t, GDK_CONTROL_MASK,
+                              LIVES_KEY_t, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->insert = gtk_image_menu_item_new_with_mnemonic (_("_Insert from Clipboard..."));
   gtk_widget_show (mainw->insert);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->insert);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->insert);
   gtk_widget_set_sensitive (mainw->insert, FALSE);
 
   gtk_widget_add_accelerator (mainw->insert, "activate", mainw->accel_group,
-                              GDK_i, GDK_CONTROL_MASK,
+                              LIVES_KEY_i, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image334 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image334);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->insert), image334);
+  image = lives_image_new_from_stock ("gtk-add", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->insert), image);
 
   mainw->paste_as_new = gtk_image_menu_item_new_with_mnemonic (_("Paste as _New"));
   gtk_widget_show (mainw->paste_as_new);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->paste_as_new);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->paste_as_new);
   gtk_widget_set_sensitive (mainw->paste_as_new, FALSE);
 
   gtk_widget_add_accelerator (mainw->paste_as_new, "activate", mainw->accel_group,
-                              GDK_n, GDK_CONTROL_MASK,
+                              LIVES_KEY_n, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->merge = gtk_menu_item_new_with_mnemonic (_("_Merge Clipboard with Selection..."));
   if (capable->has_composite&&capable->has_convert) {
     gtk_widget_show (mainw->merge);
   }
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->merge);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->merge);
   gtk_widget_set_sensitive (mainw->merge, FALSE);
 
   mainw->xdelete = gtk_image_menu_item_new_with_mnemonic(_("_Delete Selection"));
   gtk_widget_show (mainw->xdelete);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->xdelete);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->xdelete);
   gtk_widget_set_sensitive (mainw->xdelete, FALSE);
 
-  image1334 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image1334);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->xdelete), image1334);
+  image = lives_image_new_from_stock ("gtk-delete", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->xdelete), image);
 
   gtk_widget_add_accelerator (mainw->xdelete, "activate", mainw->accel_group,
-                              GDK_d, GDK_CONTROL_MASK,
+                              LIVES_KEY_d, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  separator5 = gtk_menu_item_new ();
-  gtk_widget_show (separator5);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), separator5);
-  gtk_widget_set_sensitive (separator5, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->ccpd_sound = gtk_check_menu_item_new_with_mnemonic (_("Decouple _Video from Audio"));
   gtk_widget_show (mainw->ccpd_sound);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->ccpd_sound);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->ccpd_sound);
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->ccpd_sound),!mainw->ccpd_with_sound);
 
-  separator55 = gtk_menu_item_new ();
-  gtk_widget_show (separator55);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), separator55);
-  gtk_widget_set_sensitive (separator55, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->select_submenu = gtk_menu_item_new_with_mnemonic (_("_Select..."));
   gtk_widget_show (mainw->select_submenu);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->select_submenu);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->select_submenu);
   gtk_widget_set_sensitive(mainw->select_submenu,FALSE);
 
   select_submenu_menu=gtk_menu_new();
@@ -748,7 +765,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->select_submenu), select_submenu_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(select_submenu_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(select_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->select_all = gtk_menu_item_new_with_mnemonic (_("Select _All Frames"));
@@ -756,7 +773,7 @@
   gtk_container_add (GTK_CONTAINER (select_submenu_menu), mainw->select_all);
 
   gtk_widget_add_accelerator (mainw->select_all, "activate", mainw->accel_group,
-                              GDK_a, GDK_CONTROL_MASK,
+                              LIVES_KEY_a, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->select_start_only = gtk_image_menu_item_new_with_mnemonic (_("_Start Frame Only"));
@@ -764,21 +781,21 @@
   gtk_container_add (GTK_CONTAINER (select_submenu_menu), mainw->select_start_only);
 
   gtk_widget_add_accelerator (mainw->select_start_only, "activate", mainw->accel_group,
-			      GDK_Home, GDK_CONTROL_MASK,
+			      LIVES_KEY_Home, LIVES_CONTROL_MASK,
 			      GTK_ACCEL_VISIBLE);
 
   mainw->select_end_only = gtk_image_menu_item_new_with_mnemonic (_("_End Frame Only"));
   gtk_widget_show (mainw->select_end_only);
   gtk_container_add (GTK_CONTAINER (select_submenu_menu), mainw->select_end_only);
   gtk_widget_add_accelerator (mainw->select_end_only, "activate", mainw->accel_group,
-			      GDK_End, GDK_CONTROL_MASK,
+			      LIVES_KEY_End, LIVES_CONTROL_MASK,
 			      GTK_ACCEL_VISIBLE);
 
 
-  separatormenuitem110 = gtk_menu_item_new ();
-  gtk_widget_show (separatormenuitem110);
-  gtk_container_add (GTK_CONTAINER (select_submenu_menu), separatormenuitem110);
-  gtk_widget_set_sensitive (separatormenuitem110,FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (select_submenu_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem,FALSE);
     
   mainw->select_from_start = gtk_image_menu_item_new_with_mnemonic (_("Select from _First Frame"));
   gtk_widget_show (mainw->select_from_start);
@@ -801,210 +818,234 @@
   gtk_container_add (GTK_CONTAINER (select_submenu_menu), mainw->select_invert);
 
   gtk_widget_add_accelerator (mainw->select_invert, "activate", mainw->accel_group,
-                              GDK_slash, GDK_CONTROL_MASK,
+                              LIVES_KEY_Slash, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->lock_selwidth = gtk_check_menu_item_new_with_mnemonic (_("_Lock Selection Width"));
   gtk_widget_show (mainw->lock_selwidth);
-  gtk_container_add (GTK_CONTAINER (menuitem12_menu), mainw->lock_selwidth);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->lock_selwidth);
   gtk_widget_set_sensitive(mainw->lock_selwidth,FALSE);
 
-  menuitem13 = gtk_menu_item_new_with_mnemonic (_ ("_Play"));
-  gtk_widget_show (menuitem13);
-  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem13);
+  menuitem = gtk_menu_item_new_with_mnemonic (_ ("_Play"));
+  gtk_widget_show (menuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem);
   
-  menuitem13_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem13), menuitem13_menu);
+  menuitem_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem13_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->playall = gtk_image_menu_item_new_with_mnemonic (_("_Play All"));
   gtk_widget_add_accelerator (mainw->playall, "activate", mainw->accel_group,
-                              GDK_p, (GdkModifierType)0,
+                              LIVES_KEY_p, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_show (mainw->playall);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->playall);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->playall);
   gtk_widget_set_sensitive (mainw->playall, FALSE);
 
-  image335 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image335);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->playall), image335);
+  image = lives_image_new_from_stock ("gtk-refresh", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->playall), image);
 
   mainw->playsel = gtk_image_menu_item_new_with_mnemonic (_("Pla_y Selection"));
   gtk_widget_add_accelerator (mainw->playsel, "activate", mainw->accel_group,
-                              GDK_y, (GdkModifierType)0,
+                              LIVES_KEY_y, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_show (mainw->playsel);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->playsel);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->playsel);
   gtk_widget_set_sensitive (mainw->playsel, FALSE);
 
   mainw->playclip = gtk_image_menu_item_new_with_mnemonic (_("Play _Clipboard"));
   gtk_widget_show (mainw->playclip);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->playclip);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->playclip);
   gtk_widget_set_sensitive (mainw->playclip, FALSE);
 
   gtk_widget_add_accelerator (mainw->playclip, "activate", mainw->accel_group,
-                              GDK_c, (GdkModifierType)0,
+                              LIVES_KEY_c, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
+#if GTK_CHECK_VERSION(2,6,0)
+  image = lives_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, LIVES_ICON_SIZE_MENU);
+#else
+  image = lives_image_new_from_stock (GTK_STOCK_GO_FORWARD, LIVES_ICON_SIZE_MENU);
+#endif
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->playsel), image);
 
-  image336 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image336);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->playsel), image336);
-  image355 = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image355);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->playclip), image355);
+#if GTK_CHECK_VERSION(2,6,0)
+  image = lives_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, LIVES_ICON_SIZE_MENU);
+#else
+  image = lives_image_new_from_stock (GTK_STOCK_GO_FORWARD, LIVES_ICON_SIZE_MENU);
+#endif
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->playclip), image);
 
   mainw->stop = gtk_image_menu_item_new_with_mnemonic (_("_Stop"));
   gtk_widget_show (mainw->stop);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->stop);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->stop);
   gtk_widget_set_sensitive (mainw->stop, FALSE);
   gtk_widget_add_accelerator (mainw->stop, "activate", mainw->accel_group,
-                              GDK_q, (GdkModifierType)0,
+                              LIVES_KEY_q, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
 
-  image337 = gtk_image_new_from_stock ("gtk-stop", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image337);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->stop), image337);
+#if GTK_CHECK_VERSION(2,6,0)
+  image = lives_image_new_from_stock (GTK_STOCK_MEDIA_STOP, LIVES_ICON_SIZE_MENU);
+#else
+  image = lives_image_new_from_stock (GTK_STOCK_STOP, LIVES_ICON_SIZE_MENU);
+#endif
+
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->stop), image);
 
   mainw->rewind = gtk_image_menu_item_new_with_mnemonic (_("Re_wind"));
   gtk_widget_show (mainw->rewind);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->rewind);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->rewind);
   gtk_widget_set_sensitive (mainw->rewind, FALSE);
 
-  image1337 = gtk_image_new_from_stock ("gtk-back", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image1337);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->rewind), image1337);
+#if GTK_CHECK_VERSION(2,6,0)
+  image = lives_image_new_from_stock (GTK_STOCK_MEDIA_REWIND, LIVES_ICON_SIZE_MENU);
+#else
+  image = lives_image_new_from_stock (GTK_STOCK_GO_BACK, LIVES_ICON_SIZE_MENU);
+#endif
+
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->rewind), image);
 
   gtk_widget_add_accelerator (mainw->rewind, "activate", mainw->accel_group,
-                              GDK_w, (GdkModifierType)0,
+                              LIVES_KEY_w, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mainw->record_perf = gtk_check_menu_item_new_with_mnemonic("");
 
   disable_record();
 
+#if GTK_CHECK_VERSION(2,6,0)
+  image = lives_image_new_from_stock (GTK_STOCK_MEDIA_RECORD, LIVES_ICON_SIZE_MENU);
+#else
+  image = lives_image_new_from_stock (GTK_STOCK_NO, LIVES_ICON_SIZE_MENU);
+#endif
+
   gtk_widget_add_accelerator (mainw->record_perf, "activate", mainw->accel_group,
-			      GDK_r, (GdkModifierType)0,
+			      LIVES_KEY_r, (GdkModifierType)0,
 			      GTK_ACCEL_VISIBLE);
 
   gtk_widget_show (mainw->record_perf);
 
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->record_perf);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->record_perf);
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),FALSE);
 
-  separator8 = gtk_menu_item_new ();
-  gtk_widget_show (separator8);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), separator8);
-  gtk_widget_set_sensitive (separator8, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->full_screen = gtk_check_menu_item_new_with_mnemonic (_("_Full Screen"));
   gtk_widget_show (mainw->full_screen);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->full_screen);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->full_screen);
   
 
   gtk_widget_add_accelerator (mainw->full_screen, "activate", mainw->accel_group,
-                              GDK_f, (GdkModifierType)0,
+                              LIVES_KEY_f, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mainw->dsize = gtk_check_menu_item_new_with_mnemonic (_("_Double Size"));
   gtk_widget_show (mainw->dsize);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->dsize);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->dsize);
 
   gtk_widget_add_accelerator (mainw->dsize, "activate", mainw->accel_group,
-                              GDK_d, (GdkModifierType)0,
+                              LIVES_KEY_d, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mainw->sepwin = gtk_check_menu_item_new_with_mnemonic (_("Play in _Separate Window"));
   gtk_widget_show (mainw->sepwin);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->sepwin);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->sepwin);
 
   gtk_widget_add_accelerator (mainw->sepwin, "activate", mainw->accel_group,
-                              GDK_s, (GdkModifierType)0,
+                              LIVES_KEY_s, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
 
   mainw->fade = gtk_check_menu_item_new_with_mnemonic (_("_Blank Background"));
   gtk_widget_add_accelerator (mainw->fade, "activate", mainw->accel_group,
-                              GDK_b, (GdkModifierType)0,
+                              LIVES_KEY_b, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_show (mainw->fade);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->fade);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->fade);
 
   mainw->loop_video = gtk_check_menu_item_new_with_mnemonic (_("(Auto)_loop Video (to fit audio track)"));
   gtk_widget_show (mainw->loop_video);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->loop_video);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->loop_video);
   gtk_widget_set_sensitive (mainw->loop_video, FALSE);
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->loop_video),mainw->loop);
   gtk_widget_add_accelerator (mainw->loop_video, "activate", mainw->accel_group,
-                              GDK_l, (GdkModifierType)0,
+                              LIVES_KEY_l, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mainw->loop_continue = gtk_check_menu_item_new_with_mnemonic (_("L_oop Continuously"));
   gtk_widget_show (mainw->loop_continue);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->loop_continue);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->loop_continue);
   gtk_widget_set_sensitive (mainw->loop_continue, FALSE);
 
   gtk_widget_add_accelerator (mainw->loop_continue, "activate", mainw->accel_group,
-                              GDK_o, (GdkModifierType)0,
+                              LIVES_KEY_o, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mainw->loop_ping_pong = gtk_check_menu_item_new_with_mnemonic (_("Pin_g Pong Loops"));
   gtk_widget_show (mainw->loop_ping_pong);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->loop_ping_pong);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->loop_ping_pong);
 
   gtk_widget_add_accelerator (mainw->loop_ping_pong, "activate", mainw->accel_group,
-                              GDK_g, (GdkModifierType)0,
+                              LIVES_KEY_g, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mainw->mute_audio = gtk_check_menu_item_new_with_mnemonic (_("_Mute"));
   gtk_widget_show (mainw->mute_audio);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->mute_audio);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->mute_audio);
   gtk_widget_set_sensitive (mainw->mute_audio, FALSE);
 
   gtk_widget_add_accelerator (mainw->mute_audio, "activate", mainw->accel_group,
-                              GDK_z, (GdkModifierType)0,
+                              LIVES_KEY_z, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
-  separator49 = gtk_menu_item_new ();
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), separator49);
-  gtk_widget_set_sensitive (separator49, FALSE);
-  gtk_widget_show (separator49);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
+  gtk_widget_show (separatormenuitem);
 
   mainw->sticky = gtk_check_menu_item_new_with_mnemonic (_("Separate Window 'S_ticky' Mode"));
   gtk_widget_show (mainw->sticky);
 
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->sticky);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->sticky);
   if (capable->smog_version_correct&&prefs->sepwin_type==1) {
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->sticky),TRUE);
   }
 
   mainw->showfct = gtk_check_menu_item_new_with_mnemonic (_("S_how Frame Counter"));
   gtk_widget_show (mainw->showfct);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->showfct);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->showfct);
 
   gtk_widget_add_accelerator (mainw->showfct, "activate", mainw->accel_group,
-                              GDK_h, (GdkModifierType)0,
+                              LIVES_KEY_h, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showfct),capable->smog_version_correct&&prefs->show_framecount);
 
   mainw->showsubs = gtk_check_menu_item_new_with_mnemonic (_("Show Subtitles"));
   gtk_widget_show (mainw->showsubs);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->showsubs);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->showsubs);
 
   gtk_widget_add_accelerator (mainw->showsubs, "activate", mainw->accel_group,
-                              GDK_v, (GdkModifierType)0,
+                              LIVES_KEY_v, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->showsubs),prefs->show_subtitles);
 
   mainw->letter = gtk_check_menu_item_new_with_mnemonic (_("Letterbox mode"));
   gtk_widget_show (mainw->letter);
-  gtk_container_add (GTK_CONTAINER (menuitem13_menu), mainw->letter);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->letter);
 
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->letter),prefs->letterbox);
 
@@ -1018,7 +1059,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (effects), mainw->effects_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->effects_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->effects_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->custom_effects_menu=NULL;
@@ -1037,7 +1078,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (tools), mainw->tools_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->tools_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->tools_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->rev_clipboard = gtk_menu_item_new_with_mnemonic (_("_Reverse Clipboard"));
@@ -1046,7 +1087,7 @@
   gtk_widget_set_sensitive (mainw->rev_clipboard, FALSE);
 
   gtk_widget_add_accelerator (mainw->rev_clipboard, "activate", mainw->accel_group,
-                              GDK_x, GDK_CONTROL_MASK,
+                              LIVES_KEY_x, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mainw->change_speed = gtk_menu_item_new_with_mnemonic (_("_Change Playback/Save Speed..."));
@@ -1063,10 +1104,10 @@
   mainw->utilities_submenu = gtk_menu_item_new_with_mnemonic (_("_Utilities"));
   gtk_widget_show (mainw->utilities_submenu);
 
-  mainw->custom_tools_menu=NULL;
-
   mainw->custom_utilities_menu=NULL;
 
+  mainw->custom_tools_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Tools"));
+
   mainw->custom_tools_separator = gtk_menu_item_new ();
   gtk_widget_set_sensitive (mainw->custom_tools_separator, FALSE);
 
@@ -1074,14 +1115,11 @@
   mainw->gens_submenu = gtk_menu_item_new_with_mnemonic (_("_Generate"));
   gtk_widget_show (mainw->gens_submenu);
 
-  mainw->custom_gens_menu=NULL;
-
   // add RFX plugins
   mainw->rte_separator=NULL;
   mainw->custom_gens_menu=NULL;
   mainw->rendered_fx=NULL;
-
-  mainw->custom_tools_submenu = gtk_menu_item_new_with_mnemonic (_("Custom _Tools"));
+  mainw->custom_tools_menu=NULL;
 
   if (!mainw->foreign&&capable->smog_version_correct) {
     splash_msg(_("Loading rendered effect plugins..."),.2);
@@ -1094,10 +1132,10 @@
   gtk_container_add (GTK_CONTAINER (mainw->tools_menu), mainw->custom_tools_submenu);
   gtk_container_add (GTK_CONTAINER (mainw->tools_menu), mainw->gens_submenu);
 
-  separator26 = gtk_menu_item_new ();
-  gtk_widget_show (separator26);
-  gtk_container_add (GTK_CONTAINER (mainw->tools_menu), separator26);
-  gtk_widget_set_sensitive (separator26, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->tools_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->load_subs = gtk_menu_item_new_with_mnemonic (_("Load _Subtitles from File..."));
   gtk_widget_show (mainw->load_subs);
@@ -1109,30 +1147,30 @@
   gtk_container_add (GTK_CONTAINER (mainw->tools_menu), mainw->erase_subs);
   gtk_widget_set_sensitive (mainw->erase_subs, FALSE);
 
-  separator26 = gtk_menu_item_new ();
-  gtk_widget_show (separator26);
-  gtk_container_add (GTK_CONTAINER (mainw->tools_menu), separator26);
-  gtk_widget_set_sensitive (separator26, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->tools_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->capture = gtk_menu_item_new_with_mnemonic (_("Capture _External Window... "));
   gtk_widget_show (mainw->capture);
   gtk_container_add (GTK_CONTAINER (mainw->tools_menu), mainw->capture);
 
-  separator6 = gtk_menu_item_new ();
-  gtk_widget_show (separator6);
-  gtk_container_add (GTK_CONTAINER (mainw->tools_menu), separator6);
-  gtk_widget_set_sensitive (separator6, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->tools_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->preferences = gtk_image_menu_item_new_with_mnemonic (_("_Preferences..."));
   gtk_widget_show (mainw->preferences);
   gtk_container_add (GTK_CONTAINER (mainw->tools_menu), mainw->preferences);
   gtk_widget_add_accelerator (mainw->preferences, "activate", mainw->accel_group,
-                              GDK_p, GDK_CONTROL_MASK,
+                              LIVES_KEY_p, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image346 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image346);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->preferences), image346);
+  image = lives_image_new_from_stock ("gtk-preferences", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->preferences), image);
 
   audio = gtk_menu_item_new_with_mnemonic (_("_Audio"));
   gtk_widget_show (audio);
@@ -1142,7 +1180,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (audio), audio_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(audio_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(audio_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->load_audio = gtk_menu_item_new_with_mnemonic (_("Load _New Audio for Clip..."));
@@ -1167,13 +1205,14 @@
   gtk_widget_show (mainw->load_cdtrack);
 
   mainw->recaudio_submenu = gtk_menu_item_new_with_mnemonic (_("Record E_xternal Audio..."));
-  if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio)) gtk_widget_show (mainw->recaudio_submenu);
+  if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio)) 
+    gtk_widget_show (mainw->recaudio_submenu);
   gtk_container_add (GTK_CONTAINER (audio_menu), mainw->recaudio_submenu);
 
   submenu_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->recaudio_submenu), submenu_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show (mainw->recaudio_submenu);
 
@@ -1186,10 +1225,10 @@
   gtk_container_add (GTK_CONTAINER (submenu_menu), mainw->recaudio_sel);
   gtk_widget_set_sensitive(mainw->recaudio_sel,FALSE);
 
-  separator9 = gtk_menu_item_new ();
-  gtk_container_add (GTK_CONTAINER (audio_menu), separator9);
-  gtk_widget_set_sensitive (separator9, FALSE);
-  gtk_widget_show (separator9);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (audio_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
+  gtk_widget_show (separatormenuitem);
   
   mainw->fade_aud_in = gtk_menu_item_new_with_mnemonic (_("Fade Audio _In..."));
   gtk_container_add (GTK_CONTAINER (audio_menu), mainw->fade_aud_in);
@@ -1202,10 +1241,10 @@
   gtk_widget_set_sensitive (mainw->fade_aud_in, FALSE);
   gtk_widget_set_sensitive (mainw->fade_aud_out, FALSE);
 
-  separator9 = gtk_menu_item_new ();
-  gtk_container_add (GTK_CONTAINER (audio_menu), separator9);
-  gtk_widget_set_sensitive (separator9, FALSE);
-  gtk_widget_show (separator9);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (audio_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
+  gtk_widget_show (separatormenuitem);
 
   mainw->export_submenu = gtk_menu_item_new_with_mnemonic (_("_Export Audio..."));
   gtk_widget_show (mainw->export_submenu);
@@ -1215,7 +1254,7 @@
   export_submenu_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->export_submenu), export_submenu_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(export_submenu_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(export_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show (mainw->export_submenu);
 
@@ -1240,7 +1279,7 @@
   trimaudio_submenu_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->trim_submenu), trimaudio_submenu_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(trimaudio_submenu_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(trimaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_widget_show (mainw->trim_submenu);
@@ -1262,7 +1301,7 @@
   delaudio_submenu_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->delaudio_submenu), delaudio_submenu_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(delaudio_submenu_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(delaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show (mainw->delaudio_submenu);
 
@@ -1284,33 +1323,10 @@
   gtk_container_add (GTK_CONTAINER (audio_menu), mainw->resample_audio);
   gtk_widget_set_sensitive (mainw->resample_audio, FALSE);
 
-  separator19 = gtk_menu_item_new ();
-  gtk_container_add (GTK_CONTAINER (audio_menu), separator19);
-  gtk_widget_set_sensitive (separator19, FALSE);
-  gtk_widget_show (separator19);
-
-  mainw->xmms_play_audio = gtk_menu_item_new_with_mnemonic (_("Play _Music Using xmms..."));
-  gtk_container_add (GTK_CONTAINER (audio_menu), mainw->xmms_play_audio);
-  gtk_widget_set_sensitive (mainw->xmms_play_audio, TRUE);
-
-  mainw->xmms_random_audio = gtk_menu_item_new_with_mnemonic (_("Random Music _Using xmms..."));
-  gtk_container_add (GTK_CONTAINER (audio_menu), mainw->xmms_random_audio);
-  gtk_widget_set_sensitive (mainw->xmms_random_audio, TRUE);
-
-  mainw->xmms_stop_audio = gtk_menu_item_new_with_mnemonic (_("Stop xmms _Playing"));
-  gtk_container_add (GTK_CONTAINER (audio_menu), mainw->xmms_stop_audio);
-  gtk_widget_set_sensitive (mainw->xmms_stop_audio, TRUE);
-  
-  gtk_widget_show (mainw->xmms_stop_audio);
-  gtk_widget_show (mainw->xmms_play_audio);
-  gtk_widget_show (mainw->xmms_random_audio);
-  gtk_widget_show (separator9);
-  
-  if (!capable->has_xmms) {
-    gtk_widget_set_sensitive (mainw->xmms_stop_audio,FALSE);
-    gtk_widget_set_sensitive (mainw->xmms_play_audio,FALSE);
-    gtk_widget_set_sensitive (mainw->xmms_random_audio,FALSE);
-  }
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (audio_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
+  gtk_widget_show (separatormenuitem);
 
   info = gtk_menu_item_new_with_mnemonic (_("_Info"));
   gtk_widget_show (info);
@@ -1320,12 +1336,12 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (info), info_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(info_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(info_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->show_file_info = gtk_image_menu_item_new_with_mnemonic (_("Show Clip _Info"));
   gtk_widget_add_accelerator (mainw->show_file_info, "activate", mainw->accel_group,
-                              GDK_i, (GdkModifierType)0,
+                              LIVES_KEY_i, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_show (mainw->show_file_info);
   gtk_container_add (GTK_CONTAINER (info_menu), mainw->show_file_info);
@@ -1341,9 +1357,9 @@
   gtk_container_add (GTK_CONTAINER (info_menu), mainw->show_clipboard_info);
   gtk_widget_set_sensitive (mainw->show_clipboard_info, FALSE);
 
-  image347 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image347);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->show_file_info), image347);
+  image = lives_image_new_from_stock ("gtk-dialog-info", LIVES_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->show_file_info), image);
 
   mainw->show_messages = gtk_image_menu_item_new_with_mnemonic (_("Show _Messages"));
   gtk_widget_show (mainw->show_messages);
@@ -1362,7 +1378,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (win), mainw->winmenu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->winmenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->winmenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->rename = gtk_image_menu_item_new_with_mnemonic (_("_Rename Current Clip in Menu..."));
@@ -1370,10 +1386,10 @@
   gtk_container_add (GTK_CONTAINER (mainw->winmenu), mainw->rename);
   gtk_widget_set_sensitive (mainw->rename, FALSE);
 
-  separator10 = gtk_menu_item_new ();
-  gtk_widget_show (separator10);
-  gtk_container_add (GTK_CONTAINER (mainw->winmenu), separator10);
-  gtk_widget_set_sensitive (separator10, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->winmenu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   menuitemsep = gtk_menu_item_new_with_label ("|");
   gtk_widget_show (menuitemsep);
@@ -1388,7 +1404,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (advanced), advanced_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(advanced_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(advanced_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show(advanced_menu);
 
@@ -1399,7 +1415,7 @@
   rfx_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (rfx_submenu), rfx_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(rfx_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(rfx_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show(rfx_menu);
 
@@ -1411,63 +1427,87 @@
   gtk_widget_show(copy_rfx);
   gtk_container_add (GTK_CONTAINER (rfx_menu), copy_rfx);
 
-  edit_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Edit Test RFX Script..."));
-  gtk_widget_show(edit_test_rfx);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), edit_test_rfx);
-
-  rename_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("Rena_me Test RFX Script..."));
-  gtk_widget_show(rename_test_rfx);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), rename_test_rfx);
-
-  delete_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Delete Test RFX Script..."));
-  gtk_widget_show(delete_test_rfx);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), delete_test_rfx);
-
-  separator6 = gtk_menu_item_new ();
-  gtk_widget_show (separator6);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), separator6);
-  gtk_widget_set_sensitive (separator6, FALSE);
+  mainw->edit_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Edit Test RFX Script..."));
+  gtk_widget_show(mainw->edit_test_rfx);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->edit_test_rfx);
+
+  mainw->rename_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("Rena_me Test RFX Script..."));
+  gtk_widget_show(mainw->rename_test_rfx);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->rename_test_rfx);
+
+  mainw->delete_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Delete Test RFX Script..."));
+  gtk_widget_show(mainw->delete_test_rfx);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->delete_test_rfx);
+
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   gtk_widget_show(mainw->run_test_rfx_submenu);
   gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->run_test_rfx_submenu);
   
-  promote_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Promote Test Rendered Effect/Tool/Generator..."));
-  gtk_widget_show(promote_test_rfx);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), promote_test_rfx);
-
-  separator6 = gtk_menu_item_new ();
-  gtk_widget_show (separator6);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), separator6);
-  gtk_widget_set_sensitive (separator6, FALSE);
+  mainw->promote_test_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Promote Test Rendered Effect/Tool/Generator..."));
+  gtk_widget_show(mainw->promote_test_rfx);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->promote_test_rfx);
+
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   import_custom_rfx=gtk_menu_item_new_with_mnemonic (_ ("_Import Custom RFX script..."));
   gtk_widget_show(import_custom_rfx);
   gtk_container_add (GTK_CONTAINER (rfx_menu), import_custom_rfx);
 
-  export_custom_rfx=gtk_menu_item_new_with_mnemonic (_ ("E_xport Custom RFX script..."));
-  gtk_widget_show(export_custom_rfx);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), export_custom_rfx);
-
-  delete_custom_rfx=gtk_menu_item_new_with_mnemonic (_ ("De_lete Custom RFX Script..."));
-  gtk_widget_show(delete_custom_rfx);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), delete_custom_rfx);
-
-  separator6 = gtk_menu_item_new ();
-  gtk_widget_show (separator6);
-  gtk_container_add (GTK_CONTAINER (rfx_menu), separator6);
-  gtk_widget_set_sensitive (separator6, FALSE);
+  mainw->export_custom_rfx=gtk_menu_item_new_with_mnemonic (_ ("E_xport Custom RFX script..."));
+  gtk_widget_show(mainw->export_custom_rfx);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->export_custom_rfx);
+
+  mainw->delete_custom_rfx=gtk_menu_item_new_with_mnemonic (_ ("De_lete Custom RFX Script..."));
+  gtk_widget_show(mainw->delete_custom_rfx);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), mainw->delete_custom_rfx);
+
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (rfx_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   rebuild_rfx=gtk_menu_item_new_with_mnemonic (_ ("Re_build all RFX plugins"));
   gtk_widget_show(rebuild_rfx);
   gtk_container_add (GTK_CONTAINER (rfx_menu), rebuild_rfx);
 
 
+  if (mainw->num_rendered_effects_custom>0) {
+    gtk_widget_set_sensitive(mainw->delete_custom_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->export_custom_rfx,TRUE);
+  }
+  else {
+    gtk_widget_set_sensitive(mainw->delete_custom_rfx,FALSE);
+    gtk_widget_set_sensitive(mainw->export_custom_rfx,FALSE);
+  }
+  
+  if (mainw->num_rendered_effects_test>0) {
+    gtk_widget_set_sensitive(mainw->run_test_rfx_submenu,TRUE);
+    gtk_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->delete_test_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->rename_test_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->edit_test_rfx,TRUE);
+  }
+  else {
+    gtk_widget_set_sensitive(mainw->run_test_rfx_submenu,FALSE);
+    gtk_widget_set_sensitive(mainw->promote_test_rfx,FALSE);
+    gtk_widget_set_sensitive(mainw->delete_test_rfx,FALSE);
+    gtk_widget_set_sensitive(mainw->rename_test_rfx,FALSE);
+    gtk_widget_set_sensitive(mainw->edit_test_rfx,FALSE);
+  }
+  
   mainw->open_lives2lives = gtk_menu_item_new_with_mnemonic (_("Receive _LiVES stream from..."));
 
-  separator19 = gtk_menu_item_new ();
-  gtk_container_add (GTK_CONTAINER (advanced_menu), separator19);
-  gtk_widget_set_sensitive (separator19, FALSE);
-  gtk_widget_show (separator19);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (advanced_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
+  gtk_widget_show (separatormenuitem);
   gtk_widget_show (mainw->open_lives2lives);
 
   mainw->send_lives2lives = gtk_menu_item_new_with_mnemonic (_("_Send LiVES stream to..."));
@@ -1480,10 +1520,10 @@
     mainw->open_yuv4m = gtk_menu_item_new_with_mnemonic ((tmp=g_strdup_printf (_("Open _yuv4mpeg stream on %sstream.yuv..."),prefs->tmpdir)));
     g_free(tmp);
 #ifdef HAVE_YUV4MPEG
-    separator19 = gtk_menu_item_new ();
-    gtk_container_add (GTK_CONTAINER (advanced_menu), separator19);
-    gtk_widget_set_sensitive (separator19, FALSE);
-    gtk_widget_show (separator19);
+    separatormenuitem = gtk_menu_item_new ();
+    gtk_container_add (GTK_CONTAINER (advanced_menu), separatormenuitem);
+    gtk_widget_set_sensitive (separatormenuitem, FALSE);
+    gtk_widget_show (separatormenuitem);
     gtk_widget_show (mainw->open_yuv4m);
     gtk_container_add (GTK_CONTAINER (advanced_menu), mainw->open_yuv4m);
 
@@ -1496,10 +1536,10 @@
   }
 
 
-  separatormenuitem99 = gtk_menu_item_new ();
-  gtk_widget_show (separatormenuitem99);
-  gtk_container_add (GTK_CONTAINER (advanced_menu), separatormenuitem99);
-  gtk_widget_set_sensitive (separatormenuitem99, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (advanced_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->import_proj = gtk_menu_item_new_with_mnemonic (_("_Import Project (.lv2)..."));
   gtk_container_add (GTK_CONTAINER (advanced_menu), mainw->import_proj);
@@ -1518,14 +1558,14 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->vj_menu), vj_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(vj_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(vj_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   assign_rte_keys = gtk_menu_item_new_with_mnemonic (_("Real Time _Effect Mapping"));
   gtk_widget_show (assign_rte_keys);
   gtk_container_add (GTK_CONTAINER (vj_menu), assign_rte_keys);
   gtk_widget_add_accelerator (assign_rte_keys, "activate", mainw->accel_group,
-                              GDK_v, GDK_CONTROL_MASK,
+                              LIVES_KEY_v, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_set_tooltip_text( assign_rte_keys,(_ ("Bind real time effects to ctrl-number keys.")));
 
@@ -1537,7 +1577,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->rte_defs_menu), mainw->rte_defs);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->rte_defs, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->rte_defs, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_widget_show (mainw->rte_defs_menu);
@@ -1548,10 +1588,10 @@
   gtk_widget_show (mainw->save_rte_defs);
   gtk_widget_set_tooltip_text( mainw->save_rte_defs,(_ ("Save real time effect defaults so they will be restored each time you use LiVES.")));
 
-  separator88 = gtk_menu_item_new ();
-  gtk_widget_show (separator88);
-  gtk_container_add (GTK_CONTAINER (vj_menu), separator88);
-  gtk_widget_set_sensitive (separator88, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (vj_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->vj_reset=gtk_menu_item_new_with_mnemonic (_("_Reset all playback speeds and positions"));
   gtk_container_add (GTK_CONTAINER (vj_menu), mainw->vj_reset);
@@ -1568,7 +1608,7 @@
   midi_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (midi_submenu), midi_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(midi_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(midi_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show(midi_menu);
 
@@ -1589,10 +1629,10 @@
   gtk_container_add (GTK_CONTAINER (midi_menu), midi_load);
 
 
-  separator88 = gtk_menu_item_new ();
-  gtk_widget_show (separator88);
-  gtk_container_add (GTK_CONTAINER (vj_menu), separator88);
-  gtk_widget_set_sensitive (separator88, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (vj_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->vj_show_keys = gtk_menu_item_new_with_mnemonic (_("Show VJ _Keys"));
   gtk_widget_show (mainw->vj_show_keys);
@@ -1606,7 +1646,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->toys), toys_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(toys_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(toys_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->toy_none = gtk_check_menu_item_new_with_mnemonic (_("_None"));
@@ -1614,10 +1654,10 @@
   gtk_container_add (GTK_CONTAINER (toys_menu), mainw->toy_none);
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->toy_none),TRUE);
 
-  separator27 = gtk_menu_item_new ();
-  gtk_widget_show (separator27);
-  gtk_container_add (GTK_CONTAINER (toys_menu), separator27);
-  gtk_widget_set_sensitive (separator27, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (toys_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->toy_autolives = gtk_check_menu_item_new_with_mnemonic (_("_Autolives"));
   gtk_widget_show (mainw->toy_autolives);
@@ -1639,69 +1679,69 @@
   gtk_widget_hide (mainw->toy_tv);
 # endif
 
-  menuitem14 = gtk_menu_item_new_with_mnemonic (_("_Help"));
-  gtk_widget_show (menuitem14);
-  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem14);
+  menuitem = gtk_menu_item_new_with_mnemonic (_("_Help"));
+  gtk_widget_show (menuitem);
+  gtk_container_add (GTK_CONTAINER (mainw->menubar), menuitem);
 
-  menuitem14_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem14), menuitem14_menu);
+  menuitem_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem14_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   show_manual = gtk_menu_item_new_with_mnemonic (_("_Manual (opens in browser)"));
   gtk_widget_show (show_manual);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), show_manual);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), show_manual);
 
-  separator27 = gtk_menu_item_new ();
-  gtk_widget_show (separator27);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), separator27);
-  gtk_widget_set_sensitive (separator27, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   donate = gtk_menu_item_new_with_mnemonic (_("_Donate to the project !"));
   gtk_widget_show (donate);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), donate);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), donate);
 
   email_author = gtk_menu_item_new_with_mnemonic (_("_Email the author"));
   gtk_widget_show (email_author);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), email_author);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), email_author);
 
   report_bug = gtk_menu_item_new_with_mnemonic (_("Report a _bug"));
   gtk_widget_show (report_bug);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), report_bug);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), report_bug);
 
   suggest_feature = gtk_menu_item_new_with_mnemonic (_("Suggest a _feature"));
   gtk_widget_show (suggest_feature);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), suggest_feature);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), suggest_feature);
 
   help_translate = gtk_menu_item_new_with_mnemonic (_("Assist with _translating"));
   gtk_widget_show (help_translate);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), help_translate);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), help_translate);
 
-  separator27 = gtk_menu_item_new ();
-  gtk_widget_show (separator27);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), separator27);
-  gtk_widget_set_sensitive (separator27, FALSE);
+  separatormenuitem = gtk_menu_item_new ();
+  gtk_widget_show (separatormenuitem);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separatormenuitem);
+  gtk_widget_set_sensitive (separatormenuitem, FALSE);
 
   mainw->troubleshoot=gtk_menu_item_new_with_mnemonic (_("_Troubleshoot"));
   gtk_widget_show (mainw->troubleshoot);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), mainw->troubleshoot);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mainw->troubleshoot);
 
   about = gtk_menu_item_new_with_mnemonic (_("_About"));
   gtk_widget_show (about);
-  gtk_container_add (GTK_CONTAINER (menuitem14_menu), about);
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), about);
 
   mainw->btoolbar=gtk_toolbar_new();
   gtk_toolbar_set_show_arrow(GTK_TOOLBAR(mainw->btoolbar),TRUE);
   gtk_box_pack_start (GTK_BOX (mainw->menu_hbox), mainw->btoolbar, TRUE, TRUE, 0);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->btoolbar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_toolbar_set_style (GTK_TOOLBAR (mainw->btoolbar), GTK_TOOLBAR_ICONS);
-  gtk_toolbar_set_icon_size (GTK_TOOLBAR(mainw->btoolbar),GTK_ICON_SIZE_MENU);
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR(mainw->btoolbar),LIVES_ICON_SIZE_MENU);
   
   if (capable->smog_version_correct) {
     fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
@@ -1717,7 +1757,7 @@
     gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_sepwinbutton),0);
     gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->m_sepwinbutton),_("Show the play window (s)"));
     
-    tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-media-rewind", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+    tmp_toolbar_icon = lives_image_new_from_stock ("gtk-media-rewind", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
     
     mainw->m_rewindbutton=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
     gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_rewindbutton),-1);
@@ -1725,17 +1765,17 @@
     
     gtk_widget_set_sensitive(mainw->m_rewindbutton,FALSE);
     
-    tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-media-play", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+    tmp_toolbar_icon = lives_image_new_from_stock ("gtk-media-play", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
     
     mainw->m_playbutton=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
     gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_playbutton),-1);
     gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->m_playbutton),_("Play all (p)"));
-    gtk_widget_modify_base (mainw->m_playbutton, GTK_STATE_PRELIGHT, &palette->menu_and_bars);
+    lives_widget_set_base_color (mainw->m_playbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
     
     gtk_widget_set_sensitive(mainw->m_playbutton,FALSE);
 
 
-    tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-media-stop", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+    tmp_toolbar_icon = lives_image_new_from_stock ("gtk-media-stop", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
     
     mainw->m_stopbutton=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
     gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_stopbutton),-1);
@@ -1794,30 +1834,32 @@
     mainw->m_mutebutton = gtk_menu_item_new ();
   }
 
-  mainw->vol_label=GTK_WIDGET(gtk_tool_item_new());
-  label=gtk_label_new(_("Volume"));
-  gtk_container_add(GTK_CONTAINER(mainw->vol_label),label);
-
-#if GTK_CHECK_VERSION(2,16,0) 
-  mainw->volume_scale=gtk_volume_button_new();
-  gtk_scale_button_set_value(GTK_SCALE_BUTTON(mainw->volume_scale),mainw->volume);
-  gtk_scale_button_set_orientation (GTK_SCALE_BUTTON(mainw->volume_scale),GTK_ORIENTATION_HORIZONTAL);
-#else
-  mainw->volume_scale=gtk_hscale_new(GTK_ADJUSTMENT(spinbutton_adj));
-  gtk_scale_set_draw_value(GTK_SCALE(mainw->volume_scale),FALSE);
-  if (capable->smog_version_correct) {
-    gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->vol_label),-1);
+  adj=lives_adjustment_new(mainw->volume,0.,1.,0.01,0.1,0.);
+
+  mainw->volume_scale=lives_volume_button_new(LIVES_ORIENTATION_HORIZONTAL,adj,mainw->volume);
+
+  mainw->vol_label=NULL;
+
+  if (GTK_IS_RANGE(mainw->volume_scale)) {
+    if (capable->smog_version_correct) {
+      mainw->vol_label=GTK_WIDGET(gtk_tool_item_new());
+      label=gtk_label_new(_("Volume"));
+      gtk_container_add(GTK_CONTAINER(mainw->vol_label),label);
+      gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->vol_label),-1);
+      gtk_widget_show(mainw->vol_label);
+    }
   }
-#endif
+  else g_object_unref(adj);
 
   gtk_widget_show(mainw->volume_scale);
-  gtk_widget_show(mainw->vol_label);
 
   mainw->vol_toolitem=GTK_WIDGET(gtk_tool_item_new());
   gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(mainw->vol_toolitem),FALSE);
   gtk_tool_item_set_expand(GTK_TOOL_ITEM(mainw->vol_toolitem),TRUE);
 
-  if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio)) gtk_widget_show(mainw->vol_toolitem);
+  if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||
+      (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio)) 
+    gtk_widget_show(mainw->vol_toolitem);
 
   gtk_container_add(GTK_CONTAINER(mainw->vol_toolitem),mainw->volume_scale);
   if (capable->smog_version_correct) {
@@ -1831,24 +1873,24 @@
 
   mainw->play_window=NULL;
 
-  mainw->tb_hbox=gtk_hbox_new (FALSE, 0);
+  mainw->tb_hbox=lives_hbox_new (FALSE, 0);
   mainw->toolbar = gtk_toolbar_new ();
-  gtk_widget_modify_bg (mainw->tb_hbox, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->toolbar, GTK_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->tb_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->toolbar, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
   gtk_toolbar_set_show_arrow(GTK_TOOLBAR(mainw->toolbar),FALSE);
 
   gtk_box_pack_start (GTK_BOX (mainw->vbox1), mainw->tb_hbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (mainw->tb_hbox), mainw->toolbar, TRUE, TRUE, 0);
 
   gtk_toolbar_set_style (GTK_TOOLBAR (mainw->toolbar), GTK_TOOLBAR_ICONS);
-  gtk_toolbar_set_icon_size (GTK_TOOLBAR(mainw->toolbar),GTK_ICON_SIZE_SMALL_TOOLBAR);
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-stop", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR(mainw->toolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-stop", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
   
   mainw->t_stopbutton=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_stopbutton),0);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_stopbutton),_("Stop playback (q)"));
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-undo", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-undo", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
   mainw->t_bckground=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_bckground),1);
@@ -1893,59 +1935,64 @@
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_fullscreen),4);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_fullscreen),_("Fullscreen playback (f)"));
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-remove", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-remove", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
 
   mainw->t_slower=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_slower),5);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_slower),_("Play slower (ctrl-down)"));
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-add", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-add", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
   mainw->t_faster=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_faster),6);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_faster),_("Play faster (ctrl-up)"));
 
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-go-back", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-go-back", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
   mainw->t_back=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_back),7);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_back),_("Skip back (ctrl-left)"));
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-go-forward", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-go-forward", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
   mainw->t_forward=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_forward),8);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_forward),_("Skip forward (ctrl-right)"));
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-dialog-info", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-dialog-info", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
   mainw->t_infobutton=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_infobutton),9);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_infobutton),_("Show clip info (i)"));
 
-  tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-cancel", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock ("gtk-cancel", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->toolbar)));
 
   mainw->t_hide=GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(tmp_toolbar_icon),""));
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->toolbar),GTK_TOOL_ITEM(mainw->t_hide),10);
   gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->t_hide),_("Hide this toolbar"));
 
   t_label=gtk_label_new(_ ("Press \"s\" to toggle separate play window for improved performance, \"q\" to stop."));
-  gtk_widget_modify_fg(t_label, GTK_STATE_NORMAL, &palette->white);
+  lives_widget_set_fg_color(t_label, LIVES_WIDGET_STATE_NORMAL, &palette->white);
   gtk_box_pack_start (GTK_BOX (mainw->tb_hbox), t_label, FALSE, FALSE, 0);
 
   gtk_widget_show_all (mainw->tb_hbox);
   gtk_widget_hide (mainw->tb_hbox);
 
-  vbox4 = gtk_vbox_new (FALSE, 0);
+  vbox4 = lives_vbox_new (FALSE, 0);
   gtk_widget_show (vbox4);
 
   mainw->eventbox = gtk_event_box_new ();
   gtk_widget_show (mainw->eventbox);
   gtk_box_pack_start (GTK_BOX (mainw->vbox1), mainw->eventbox, TRUE, TRUE, 0);
   gtk_container_add (GTK_CONTAINER (mainw->eventbox), vbox4);
-  gtk_widget_modify_bg (mainw->eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (vbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
 
   gtk_widget_set_events (mainw->eventbox, GDK_SCROLL_MASK);
 
@@ -1953,35 +2000,29 @@
                       G_CALLBACK (on_mouse_scroll),
                       NULL);
 
-  mainw->framebar = gtk_hbox_new (FALSE, 0);
+  mainw->framebar = lives_hbox_new (FALSE, 0);
   gtk_widget_show (mainw->framebar);
   gtk_box_pack_start (GTK_BOX (vbox4), mainw->framebar, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (mainw->framebar), 2);
+  gtk_container_set_border_width (GTK_CONTAINER (mainw->framebar), 2*widget_opts.scale);
 
   /* TRANSLATORS: please keep the translated string the same length */
-  mainw->vps_label = gtk_label_new (_("     Video playback speed (frames per second)        "));
+  mainw->vps_label = lives_standard_label_new (_("     Video playback speed (frames per second)        "));
   tmp=g_strdup(gtk_label_get_text(GTK_LABEL(mainw->vps_label)));
   if (strlen(tmp)>55) memset(tmp+55,0,1);
   gtk_label_set_text(GTK_LABEL(mainw->vps_label),tmp);
   g_free(tmp);
 
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
 
   gtk_widget_show (mainw->vps_label);
   gtk_box_pack_start (GTK_BOX (mainw->framebar), mainw->vps_label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (mainw->vps_label), GTK_JUSTIFY_LEFT);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mainw->vps_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  mainw->spinbutton_pb_fps = lives_standard_spin_button_new (NULL,FALSE,1, -FPS_MAX, FPS_MAX, 0.1, 0.01, 3,
+							     LIVES_BOX(mainw->framebar),_ ("Vary the video speed"));
 
-  spinbutton_pb_fps_adj = (GObject *)gtk_adjustment_new (1, -FPS_MAX, FPS_MAX, 0.1, 0.01, 0.);
-  mainw->spinbutton_pb_fps = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_pb_fps_adj), (GdkModifierType)0, 3);
   gtk_widget_show (mainw->spinbutton_pb_fps);
-  gtk_box_pack_start (GTK_BOX (mainw->framebar), mainw->spinbutton_pb_fps, FALSE, TRUE, 0);
-  gtk_widget_set_tooltip_text( mainw->spinbutton_pb_fps,_ ("Vary the video speed"));
-
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mainw->spinbutton_pb_fps), TRUE);
-
 
   if (palette->style==STYLE_PLAIN) {
     mainw->banner = gtk_label_new ("             = <  L i V E S > =                ");
@@ -1997,72 +2038,94 @@
   mainw->framecounter = gtk_entry_new ();
   gtk_widget_show (mainw->framecounter);
   gtk_box_pack_start (GTK_BOX (mainw->framebar), mainw->framecounter, FALSE, TRUE, 0);
-  gtk_entry_set_editable (GTK_ENTRY (mainw->framecounter), FALSE);
+  lives_entry_set_editable (LIVES_ENTRY (mainw->framecounter), FALSE);
   gtk_entry_set_has_frame (GTK_ENTRY (mainw->framecounter), FALSE);
   gtk_entry_set_width_chars (GTK_ENTRY (mainw->framecounter), 18);
-  GTK_WIDGET_UNSET_FLAGS (mainw->framecounter, GTK_CAN_FOCUS);
 
-  mainw->curf_label = gtk_label_new (_("                                                            "));
+  lives_widget_set_can_focus (mainw->framecounter, FALSE);
+
+  mainw->curf_label = lives_standard_label_new (_("                                                            "));
   gtk_widget_show (mainw->curf_label);
   gtk_box_pack_start (GTK_BOX (mainw->framebar), mainw->curf_label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (mainw->curf_label), GTK_JUSTIFY_LEFT);
+
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mainw->curf_label, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   gtk_widget_hide(mainw->framebar);
 
-  hbox1 = gtk_hbox_new (FALSE, 0);
+  hbox1 = lives_hbox_new (FALSE, 0);
   gtk_widget_show(hbox1);
   gtk_box_pack_start (GTK_BOX (vbox4), hbox1, FALSE, FALSE, 0);
-  gtk_widget_modify_bg (hbox1, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (hbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+  lives_widget_set_vexpand(hbox1,FALSE);
 
   mainw->eventbox3 = gtk_event_box_new ();
   gtk_widget_show (mainw->eventbox3);
   gtk_box_pack_start (GTK_BOX (hbox1), mainw->eventbox3, TRUE, FALSE, 0);
-  gtk_widget_modify_bg (mainw->eventbox3, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
   mainw->frame1 = gtk_frame_new (NULL);
   gtk_widget_show (mainw->frame1);
+  gtk_container_set_border_width (GTK_CONTAINER (mainw->frame1), widget_opts.border_width);
   gtk_container_add (GTK_CONTAINER (mainw->eventbox3), mainw->frame1);
-  gtk_widget_modify_bg (mainw->frame1, GTK_STATE_NORMAL, &palette->normal_back);
 
-  gtk_container_set_border_width (GTK_CONTAINER(mainw->eventbox3), 10);
-  gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame1), GTK_SHADOW_IN);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+  lives_widget_set_vexpand(mainw->frame1,FALSE);
+  lives_widget_set_hexpand(mainw->frame1,FALSE);
+
+  gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame1), GTK_SHADOW_NONE);
+
+  mainw->freventbox0=gtk_event_box_new();
+  gtk_widget_show(mainw->freventbox0);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+  lives_widget_set_vexpand(mainw->freventbox0,FALSE);
+  lives_widget_set_hexpand(mainw->freventbox0,FALSE);
+  gtk_container_add (GTK_CONTAINER (mainw->frame1), mainw->freventbox0);
 
   gtk_widget_show (mainw->image272);
-  gtk_container_add (GTK_CONTAINER (mainw->frame1), mainw->image272);
+  gtk_container_add (GTK_CONTAINER (mainw->freventbox0), mainw->image272);
+  lives_widget_set_vexpand(mainw->image272,FALSE);
+  lives_widget_set_hexpand(mainw->image272,FALSE);
 
-  label15 = gtk_label_new (_("First Frame"));
-  gtk_widget_show (label15);
-  gtk_frame_set_label_widget (GTK_FRAME (mainw->frame1), label15);
-  gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_LEFT);
+  label = lives_standard_label_new (_("First Frame"));
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label15, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
+  gtk_widget_show (label);
+  gtk_frame_set_label_widget (GTK_FRAME (mainw->frame1), label);
 
   mainw->playframe = gtk_frame_new (NULL);
   gtk_widget_hide (mainw->playframe);
   gtk_box_pack_start (GTK_BOX (hbox1), mainw->playframe, TRUE, FALSE, 0);
   gtk_widget_set_size_request (mainw->playframe, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
-  gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), 10);
-  gtk_frame_set_shadow_type (GTK_FRAME(mainw->playframe), GTK_SHADOW_IN);
-  gtk_widget_modify_bg (mainw->playframe, GTK_STATE_NORMAL, &palette->normal_back);
+  gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), widget_opts.border_width);
 
-  pf_label = gtk_label_new (_("Play"));
-  gtk_widget_show (pf_label);
-  gtk_frame_set_label_widget (GTK_FRAME (mainw->playframe), pf_label);
-  gtk_label_set_justify (GTK_LABEL (pf_label), GTK_JUSTIFY_LEFT);
+  gtk_frame_set_shadow_type (GTK_FRAME(mainw->playframe), GTK_SHADOW_NONE);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+
+  pf_label = lives_standard_label_new (_("Play"));
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(pf_label, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(pf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
+  gtk_widget_show (pf_label);
+  gtk_frame_set_label_widget (GTK_FRAME (mainw->playframe), pf_label);
 
   mainw->pl_eventbox = gtk_event_box_new ();
-  gtk_widget_modify_bg (mainw->pl_eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   gtk_container_add (GTK_CONTAINER (mainw->playframe), mainw->pl_eventbox);
   gtk_widget_show(mainw->pl_eventbox);
 
-  mainw->playarea = gtk_hbox_new (FALSE,0);
+  mainw->playarea = lives_hbox_new (FALSE,0);
 
   gtk_container_add (GTK_CONTAINER (mainw->pl_eventbox), mainw->playarea);
 
@@ -2070,19 +2133,37 @@
 
   mainw->eventbox4 = gtk_event_box_new ();
   gtk_box_pack_start (GTK_BOX (hbox1), mainw->eventbox4, TRUE, FALSE, 0);
-  gtk_widget_modify_bg (mainw->eventbox4, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_vexpand(mainw->eventbox4,FALSE);
+  lives_widget_set_hexpand(mainw->eventbox4,FALSE);
   gtk_widget_show (mainw->eventbox4);
 
   mainw->frame2 = gtk_frame_new (NULL);
   gtk_widget_show (mainw->frame2);
+  gtk_container_set_border_width (GTK_CONTAINER (mainw->frame2), widget_opts.border_width);
   gtk_container_add (GTK_CONTAINER (mainw->eventbox4), mainw->frame2);
-  gtk_widget_modify_bg (mainw->frame2, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+  lives_widget_set_vexpand(mainw->frame2,FALSE);
+  lives_widget_set_hexpand(mainw->frame2,FALSE);
 
-  gtk_container_set_border_width (GTK_CONTAINER(mainw->eventbox4), 10);
-  gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame2), GTK_SHADOW_IN);
+  gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame2), GTK_SHADOW_NONE);
+
+  mainw->freventbox1=gtk_event_box_new();
+  gtk_widget_show(mainw->freventbox1);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+  lives_widget_set_vexpand(mainw->freventbox1,FALSE);
+  lives_widget_set_hexpand(mainw->freventbox1,FALSE);
+
+  gtk_container_add (GTK_CONTAINER (mainw->frame2), mainw->freventbox1);
   
   gtk_widget_show (mainw->image273);
-  gtk_container_add (GTK_CONTAINER (mainw->frame2), mainw->image273);
+  gtk_container_add (GTK_CONTAINER (mainw->freventbox1), mainw->image273);
+  lives_widget_set_vexpand(mainw->image273,FALSE);
+  lives_widget_set_hexpand(mainw->image273,FALSE);
 
   // default frame sizes
   mainw->def_width=DEFAULT_FRAME_HSIZE;
@@ -2097,86 +2178,108 @@
     }
   }
 
-  gtk_widget_set_size_request (mainw->eventbox3, mainw->def_width, mainw->def_height);
-  gtk_widget_set_size_request (mainw->frame1, mainw->def_width, mainw->def_height);
-  gtk_widget_set_size_request (mainw->frame2, mainw->def_width, mainw->def_height);
-  gtk_widget_set_size_request (mainw->eventbox4, mainw->def_width, mainw->def_height);
-  
   // the actual playback image for the internal player
   mainw->image274 = gtk_image_new_from_pixbuf (NULL);
+  gtk_widget_set_app_paintable(mainw->image274,TRUE);
   gtk_widget_show (mainw->image274);
-  gtk_widget_ref(mainw->image274);
+  g_object_ref(mainw->image274);
+
+  lives_widget_set_hexpand(mainw->image274,TRUE);
+  lives_widget_set_vexpand(mainw->image274,TRUE);
+
+#if GTK_CHECK_VERSION(3,0,0)
+  g_object_ref_sink (G_OBJECT (mainw->image274));
+#else
   gtk_object_sink (GTK_OBJECT (mainw->image274));
+#endif
 
-  label16 = gtk_label_new (_("Last Frame"));
-  gtk_widget_show (label16);
-  gtk_frame_set_label_widget (GTK_FRAME (mainw->frame2), label16);
-  gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_RIGHT);
+  label = lives_standard_label_new (_("Last Frame"));
+  gtk_widget_show (label);
+  gtk_frame_set_label_widget (GTK_FRAME (mainw->frame2), label);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label16, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  hbox3 = gtk_hbox_new (FALSE, 0);
+
+  hbox3 = lives_hbox_new (FALSE, 0);
   gtk_widget_show (hbox3);
   gtk_box_pack_start (GTK_BOX (vbox4), hbox3, FALSE, TRUE, 0);
 
-  spinbutton_start_adj = (GObject *)gtk_adjustment_new (0., 0., 0., 1., 100., 0.);
-  mainw->spinbutton_start = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_start_adj), 1, 0);
+  dpw=widget_opts.packing_width;
+  woat=widget_opts.apply_theme;
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
+  widget_opts.apply_theme=FALSE;
+  widget_opts.packing_width=MAIN_SPIN_SPACER;
+  mainw->spinbutton_start = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1., 100.,0,
+							    LIVES_BOX(hbox3),_("The first selected frame in this clip"));
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
+  widget_opts.packing_width=dpw;
+  widget_opts.apply_theme=woat;
 
   gtk_widget_show (mainw->spinbutton_start);
-  gtk_box_pack_start (GTK_BOX (hbox3), mainw->spinbutton_start, TRUE, FALSE, 0);
-  GTK_WIDGET_SET_FLAGS (mainw->spinbutton_start, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mainw->spinbutton_start), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mainw->spinbutton_start),GTK_UPDATE_ALWAYS);
-  gtk_widget_set_tooltip_text( mainw->spinbutton_start, _("The first selected frame in this clip"));
 
   mainw->arrow1 = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_OUT);
   gtk_widget_show (mainw->arrow1);
   gtk_box_pack_start (GTK_BOX (hbox3), mainw->arrow1, FALSE, FALSE, 0);
-  gtk_widget_modify_fg(mainw->arrow1, GTK_STATE_NORMAL, &palette->normal_fore);
 
-  gtk_entry_set_width_chars (GTK_ENTRY (mainw->spinbutton_start),10);
-  mainw->sel_label = gtk_label_new(NULL);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->arrow1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+
+  gtk_entry_set_width_chars (GTK_ENTRY (mainw->spinbutton_start),12);
+  mainw->sel_label = lives_standard_label_new(NULL);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->sel_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
 
   set_sel_label(mainw->sel_label);
   gtk_widget_show (mainw->sel_label);
   gtk_box_pack_start (GTK_BOX (hbox3), mainw->sel_label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (mainw->sel_label), GTK_JUSTIFY_LEFT);
-  gtk_widget_modify_fg(mainw->sel_label, GTK_STATE_NORMAL, &palette->normal_fore);
 
   mainw->arrow2 = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
   gtk_widget_show (mainw->arrow2);
   gtk_box_pack_start (GTK_BOX (hbox3), mainw->arrow2, FALSE, FALSE, 0);
-  gtk_widget_modify_fg(mainw->arrow2, GTK_STATE_NORMAL, &palette->normal_fore);
 
-  spinbutton_end_adj = (GObject *)gtk_adjustment_new (0., 0., 0., 1., 100., 0.);
-  mainw->spinbutton_end = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_end_adj), 1, 0);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->arrow2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
+  widget_opts.packing_width=MAIN_SPIN_SPACER;
+  widget_opts.apply_theme=FALSE;
+  mainw->spinbutton_end = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1., 100.,0,
+							  LIVES_BOX(hbox3),_("The last selected frame in this clip"));
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
+  widget_opts.packing_width=dpw;
+  widget_opts.apply_theme=woat;
+
   gtk_widget_show (mainw->spinbutton_end);
-  gtk_box_pack_start (GTK_BOX (hbox3), mainw->spinbutton_end, TRUE, FALSE, 0);
-  gtk_entry_set_width_chars (GTK_ENTRY (mainw->spinbutton_end),10);
-  GTK_WIDGET_SET_FLAGS (mainw->spinbutton_end, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mainw->spinbutton_end), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mainw->spinbutton_end),GTK_UPDATE_ALWAYS);
-  gtk_widget_set_tooltip_text( mainw->spinbutton_end, _("The last selected frame in this clip"));
+
+
+  gtk_entry_set_width_chars (GTK_ENTRY (mainw->spinbutton_end),12);
 
   if (palette->style&STYLE_1&&palette->style&STYLE_2) {
-    gtk_widget_modify_base(mainw->spinbutton_start, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_base(mainw->spinbutton_start, GTK_STATE_INSENSITIVE, &palette->normal_back);
-    gtk_widget_modify_base(mainw->spinbutton_end, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_base(mainw->spinbutton_end, GTK_STATE_INSENSITIVE, &palette->normal_back);
-    gtk_widget_modify_text(mainw->spinbutton_start, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_text(mainw->spinbutton_start, GTK_STATE_INSENSITIVE, &palette->normal_fore);
-    gtk_widget_modify_text(mainw->spinbutton_end, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_text(mainw->spinbutton_end, GTK_STATE_INSENSITIVE, &palette->normal_fore);
-    gtk_widget_modify_fg(mainw->sel_label, GTK_STATE_NORMAL, &palette->normal_fore);
+#if !GTK_CHECK_VERSION(3,0,0)
+    // background colour seems to be broken in gtk+3 !!!
+    lives_widget_set_base_color(mainw->spinbutton_start, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_base_color(mainw->spinbutton_start, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+    lives_widget_set_base_color(mainw->spinbutton_end, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_base_color(mainw->spinbutton_end, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+    lives_widget_set_text_color(mainw->spinbutton_start, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_text_color(mainw->spinbutton_start, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+    lives_widget_set_text_color(mainw->spinbutton_end, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_text_color(mainw->spinbutton_end, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+#endif
+    lives_widget_set_fg_color(mainw->sel_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   gtk_widget_set_sensitive(mainw->spinbutton_start,FALSE);
   gtk_widget_set_sensitive(mainw->spinbutton_end,FALSE);
 
-  mainw->hseparator = gtk_hseparator_new ();
+  mainw->hseparator = lives_hseparator_new ();
 
   if (palette->style&STYLE_1) {
-    gtk_box_pack_start (GTK_BOX (vbox4), mainw->sep_image, FALSE, TRUE, 20);
+    gtk_box_pack_start (GTK_BOX (vbox4), mainw->sep_image, FALSE, TRUE, widget_opts.packing_height*2);
     gtk_widget_show (mainw->sep_image);
   }
 
@@ -2188,88 +2291,112 @@
   mainw->eventbox5 = gtk_event_box_new ();
   gtk_box_pack_start (GTK_BOX (vbox4), mainw->eventbox5, FALSE, FALSE, 0);
 
-  gtk_widget_modify_bg (mainw->eventbox5, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->eventbox5, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
 
-  mainw->hruler = gtk_hruler_new();
-  gtk_ruler_set_range (GTK_RULER (mainw->hruler), 0., 1000000., 0., 1000000.);
+#ifdef ENABLE_GIW_3
+  mainw->hruler=giw_timeline_new(GTK_ORIENTATION_HORIZONTAL);
+#else
+  mainw->hruler = lives_standard_hruler_new();
+#endif
+  lives_ruler_set_range (LIVES_RULER (mainw->hruler), 0., 1000000., 0., 1000000.);
 
-  gtk_widget_set_size_request (mainw->hruler, -1, 20);
+  gtk_widget_set_size_request (mainw->hruler, -1, CE_HRULE_HEIGHT);
   gtk_container_add (GTK_CONTAINER (mainw->eventbox5), mainw->hruler);
 
-  gtk_widget_modify_bg (mainw->hruler, GTK_STATE_NORMAL, &palette->normal_back);
   gtk_widget_add_events (mainw->eventbox5, GDK_POINTER_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | 
 			 GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (mainw->hruler, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
   mainw->eventbox2 = gtk_event_box_new ();
   gtk_widget_show (mainw->eventbox2);
   gtk_box_pack_start (GTK_BOX (vbox4), mainw->eventbox2, TRUE, TRUE, 0);
   gtk_widget_add_events (mainw->eventbox2, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK);
-  gtk_widget_modify_bg (mainw->eventbox2, GTK_STATE_NORMAL, &palette->normal_back);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->eventbox2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (mainw->hruler, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color (mainw->hruler, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+
+  vbox2 = lives_vbox_new (FALSE, 0);
   gtk_widget_show (vbox2);
   gtk_container_add (GTK_CONTAINER (mainw->eventbox2), vbox2);
 
-  mainw->vidbar = gtk_label_new (_("Video"));
+  mainw->vidbar = lives_standard_label_new (_("Video"));
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->vidbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
 
   if (palette->style==STYLE_PLAIN) {
     gtk_widget_show (mainw->vidbar);
   }
   else {
-    gtk_widget_modify_fg (mainw->vidbar, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color (vbox2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     gtk_widget_hide (mainw->vidbar);
   }
 
-  gtk_label_set_justify (GTK_LABEL (mainw->vidbar), GTK_JUSTIFY_LEFT);
   gtk_box_pack_start (GTK_BOX (vbox2), mainw->vidbar, TRUE, TRUE, 0);
 
   mainw->video_draw = gtk_drawing_area_new ();
-  gtk_drawing_area_size(GTK_DRAWING_AREA(mainw->video_draw),mainw->LiVES->allocation.width,10);
+  gtk_widget_set_app_paintable(mainw->video_draw,TRUE);
+  gtk_widget_set_size_request(mainw->video_draw,lives_widget_get_allocation_width(mainw->LiVES),CE_VIDBAR_HEIGHT);
   gtk_widget_show (mainw->video_draw);
   gtk_box_pack_start (GTK_BOX (vbox2), mainw->video_draw, TRUE, TRUE, 0);
-  gtk_widget_modify_bg (mainw->video_draw, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->video_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+
+  mainw->laudbar = lives_standard_label_new (_("Left Audio"));
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->laudbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
 
-  mainw->laudbar = gtk_label_new (_("Left Audio"));
   gtk_box_pack_start (GTK_BOX (vbox2), mainw->laudbar, TRUE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (mainw->laudbar), GTK_JUSTIFY_LEFT);
 
   if (palette->style==STYLE_PLAIN) {
     gtk_widget_show (mainw->laudbar);
   }
   else {
-    gtk_widget_modify_fg (mainw->laudbar, GTK_STATE_NORMAL, &palette->normal_fore);
     gtk_widget_hide (mainw->laudbar);
   }
 
   mainw->laudio_draw = gtk_drawing_area_new ();
-  gtk_drawing_area_size(GTK_DRAWING_AREA(mainw->laudio_draw),mainw->LiVES->allocation.width,10);
+  gtk_widget_set_app_paintable(mainw->laudio_draw,TRUE);
+  gtk_widget_set_size_request(mainw->laudio_draw,lives_widget_get_allocation_width(mainw->LiVES),CE_VIDBAR_HEIGHT);
   gtk_widget_show (mainw->laudio_draw);
   gtk_box_pack_start (GTK_BOX (vbox2), mainw->laudio_draw, TRUE, TRUE, 0);
-  gtk_widget_modify_bg (mainw->laudio_draw, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->laudio_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+
+  mainw->raudbar = lives_standard_label_new (_("Right Audio"));
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color(mainw->raudbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
 
-  mainw->raudbar = gtk_label_new (_("Right Audio"));
   gtk_box_pack_start (GTK_BOX (vbox2), mainw->raudbar, TRUE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (mainw->raudbar), GTK_JUSTIFY_LEFT);
 
   if (palette->style==STYLE_PLAIN) {
     gtk_widget_show (mainw->raudbar);
   }
   else {
-    gtk_widget_modify_fg (mainw->raudbar, GTK_STATE_NORMAL, &palette->normal_fore);
     gtk_widget_hide (mainw->raudbar);
   }
 
   mainw->raudio_draw = gtk_drawing_area_new ();
-  gtk_drawing_area_size(GTK_DRAWING_AREA(mainw->raudio_draw),mainw->LiVES->allocation.width,10);
+  gtk_widget_set_app_paintable(mainw->raudio_draw,TRUE);
+  gtk_widget_set_size_request(mainw->raudio_draw,lives_widget_get_allocation_width(mainw->LiVES),CE_VIDBAR_HEIGHT);
   gtk_widget_show (mainw->raudio_draw);
   gtk_box_pack_start (GTK_BOX (vbox2), mainw->raudio_draw, TRUE, TRUE, 0);
-  gtk_widget_modify_bg (mainw->raudio_draw, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->raudio_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
 
-  mainw->message_box=gtk_vbox_new(FALSE, 0);
+  mainw->message_box=lives_vbox_new(FALSE, 0);
   gtk_widget_show (mainw->message_box);
   gtk_box_pack_start (GTK_BOX (vbox4), mainw->message_box, TRUE, TRUE, 0);
 
@@ -2278,123 +2405,123 @@
   add_message_scroller(mainw->message_box);
 
   // accel keys
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Page_Up, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Page_Up, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (prevclip_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Page_Down, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Page_Down, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (nextclip_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Down, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Down, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (slower_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Up, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Up, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (faster_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Left, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Left, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (skip_back_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Right, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Right, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (skip_forward_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_space, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Space, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (dirchange_callback),GINT_TO_POINTER(TRUE),NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_Return, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Return, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (fps_reset_callback),GINT_TO_POINTER(TRUE),NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_k, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_k, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (grabkeys_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_t, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_t, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (textparm_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_m, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_m, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (rtemode_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_x, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_x, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (swap_fg_bg_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_n, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_n, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (nervous_callback),NULL,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_w, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_w, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (show_sync_callback),NULL,NULL));
 
   if (FN_KEYS>0) {
-    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F1, (GdkModifierType)0, (GtkAccelFlags)0, 
+    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F1, (GdkModifierType)0, (GtkAccelFlags)0, 
 			     g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (1),NULL));
     if (FN_KEYS>1) {
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F2, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F2, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (2),NULL));
       if (FN_KEYS>2) {
-	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F3, (GdkModifierType)0, (GtkAccelFlags)0, 
+	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F3, (GdkModifierType)0, (GtkAccelFlags)0, 
 				 g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (3),NULL));
 	if (FN_KEYS>3) {
-	  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F4, (GdkModifierType)0, (GtkAccelFlags)0, 
+	  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F4, (GdkModifierType)0, (GtkAccelFlags)0, 
 				   g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (4),NULL));
 	  if (FN_KEYS>4) {
-	    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F5, (GdkModifierType)0, (GtkAccelFlags)0, 
+	    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F5, (GdkModifierType)0, (GtkAccelFlags)0, 
 				     g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (5),NULL));
 	    if (FN_KEYS>5) {
-	      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F6, (GdkModifierType)0, (GtkAccelFlags)0, 
+	      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F6, (GdkModifierType)0, (GtkAccelFlags)0, 
 				       g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (6),NULL));
 	      if (FN_KEYS>6) {
-		gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F7, (GdkModifierType)0, (GtkAccelFlags)0, 
+		gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F7, (GdkModifierType)0, (GtkAccelFlags)0, 
 					 g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (7),NULL));
 		if (FN_KEYS>7) {
-		  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F8, (GdkModifierType)0, (GtkAccelFlags)0, 
+		  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F8, (GdkModifierType)0, (GtkAccelFlags)0, 
 					   g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (8),NULL));
 		  if (FN_KEYS>8) {
-		    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F9, (GdkModifierType)0, (GtkAccelFlags)0, 
+		    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F9, (GdkModifierType)0, (GtkAccelFlags)0, 
 					     g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (9),NULL));
 		    if (FN_KEYS>9) {
-		      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F10, (GdkModifierType)0, (GtkAccelFlags)0, 
+		      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F10, (GdkModifierType)0, (GtkAccelFlags)0, 
 					       g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (10),NULL));
 		      if (FN_KEYS>10) {
-		      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F11, (GdkModifierType)0, (GtkAccelFlags)0, 
+		      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F11, (GdkModifierType)0, (GtkAccelFlags)0, 
 					       g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (11),NULL));
 		      if (FN_KEYS>11) {
-		      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F12, (GdkModifierType)0, (GtkAccelFlags)0, 
+		      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F12, (GdkModifierType)0, (GtkAccelFlags)0, 
 					       g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (12),NULL));
 		      // ad nauseum...
 		      }}}}}}}}}}}}
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_0, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_0, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (0),NULL));
   if (FX_KEYS_PHYSICAL>0) {
-    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_1, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_1, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			     g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (1),NULL));
     if (FX_KEYS_PHYSICAL>1) {
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_2, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_2, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			       g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (2),NULL));
       if (FX_KEYS_PHYSICAL>2) {
-	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_3, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_3, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 				 g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (3),NULL));
 	if (FX_KEYS_PHYSICAL>3) {
-	  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_4, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+	  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_4, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 				   g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (4),NULL));
 	  if (FX_KEYS_PHYSICAL>4) {
-	    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_5, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+	    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_5, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 				     g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (5),NULL));
 	    if (FX_KEYS_PHYSICAL>5) {
-	      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_6, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+	      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_6, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 				       g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (6),NULL));
 	      if (FX_KEYS_PHYSICAL>6) {
-		gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_7, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+		gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_7, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 					 g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (7),NULL));
 		if (FX_KEYS_PHYSICAL>7) {
-		  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_8, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+		  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_8, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 					   g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (8),NULL));
 		  if (FX_KEYS_PHYSICAL>8) {
-		    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_9, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+		    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_9, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 					     g_cclosure_new (G_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (9),NULL));
 		  }}}}}}}}}
 
 
 
 
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (mainw->textview1)),
-	_("Starting...\n"), -1);
+  text_view_set_text (LIVES_TEXT_VIEW (mainw->textview1),
+		      _("Starting...\n"), -1);
   
   g_signal_connect (GTK_OBJECT (mainw->LiVES), "delete_event",
 		    G_CALLBACK (on_LiVES_delete_event),
@@ -2403,13 +2530,13 @@
   mainw->config_func=g_signal_connect_after (GTK_OBJECT (mainw->video_draw), "configure_event",
 					     G_CALLBACK (config_event),
 					     NULL);
-  mainw->vidbar_func=g_signal_connect_after (GTK_OBJECT (mainw->video_draw), "expose_event",
+  mainw->vidbar_func=g_signal_connect_after (GTK_OBJECT (mainw->video_draw), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
 		    G_CALLBACK (expose_vid_event),
 		    NULL);
-  mainw->laudbar_func=g_signal_connect_after (GTK_OBJECT (mainw->laudio_draw), "expose_event",
+  mainw->laudbar_func=g_signal_connect_after (GTK_OBJECT (mainw->laudio_draw), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
 		    G_CALLBACK (expose_laud_event),
 		    NULL);
-  mainw->raudbar_func=g_signal_connect_after (GTK_OBJECT (mainw->raudio_draw), "expose_event",
+  mainw->raudbar_func=g_signal_connect_after (GTK_OBJECT (mainw->raudio_draw), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
 		    G_CALLBACK (expose_raud_event),
 		    NULL);
   mainw->pb_fps_func=g_signal_connect_after (GTK_OBJECT (mainw->spinbutton_pb_fps), "value_changed",
@@ -2690,18 +2817,6 @@
                       NULL);
   }
 
-  if (capable->has_xmms) {
-    g_signal_connect (GTK_OBJECT (mainw->xmms_play_audio), "activate",
-                      G_CALLBACK (on_xmms_play_audio_activate),
-                      NULL);
-    g_signal_connect (GTK_OBJECT (mainw->xmms_random_audio), "activate",
-                      G_CALLBACK (on_xmms_random_audio_activate),
-                      NULL); 
-    g_signal_connect (GTK_OBJECT (mainw->xmms_stop_audio), "activate",
-                      G_CALLBACK (on_xmms_stop_audio_activate),
-                      NULL);
-  }
-
   g_signal_connect (GTK_OBJECT (mainw->show_file_info), "activate",
 		    G_CALLBACK (on_show_file_info_activate),
 		    NULL);
@@ -2727,28 +2842,28 @@
   g_signal_connect (GTK_OBJECT (copy_rfx), "activate",
 		    G_CALLBACK (on_copy_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  g_signal_connect (GTK_OBJECT (edit_test_rfx), "activate",
+  g_signal_connect (GTK_OBJECT (mainw->edit_test_rfx), "activate",
 		    G_CALLBACK (on_edit_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  g_signal_connect (GTK_OBJECT (rename_test_rfx), "activate",
+  g_signal_connect (GTK_OBJECT (mainw->rename_test_rfx), "activate",
 		    G_CALLBACK (on_rename_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_TEST));
   g_signal_connect (GTK_OBJECT (rebuild_rfx), "activate",
 		    G_CALLBACK (on_rebuild_rfx_activate),
 		    NULL);
-  g_signal_connect (GTK_OBJECT (delete_test_rfx), "activate",
+  g_signal_connect (GTK_OBJECT (mainw->delete_test_rfx), "activate",
 		    G_CALLBACK (on_delete_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  g_signal_connect (GTK_OBJECT (delete_custom_rfx), "activate",
+  g_signal_connect (GTK_OBJECT (mainw->delete_custom_rfx), "activate",
 		    G_CALLBACK (on_delete_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_CUSTOM));
   g_signal_connect (GTK_OBJECT (import_custom_rfx), "activate",
 		    G_CALLBACK (on_import_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_CUSTOM));
-  g_signal_connect (GTK_OBJECT (export_custom_rfx), "activate",
+  g_signal_connect (GTK_OBJECT (mainw->export_custom_rfx), "activate",
 		    G_CALLBACK (on_export_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_CUSTOM));
-  g_signal_connect (GTK_OBJECT (promote_test_rfx), "activate",
+  g_signal_connect (GTK_OBJECT (mainw->promote_test_rfx), "activate",
 		    G_CALLBACK (on_promote_rfx_activate),
 		    GINT_TO_POINTER (RFX_STATUS_TEST));
 
@@ -2912,6 +3027,7 @@
 					NULL);
     g_signal_handler_block (mainw->eventbox5,mainw->hrule_func);
     g_signal_connect (GTK_OBJECT(mainw->eventbox5), "enter-notify-event",G_CALLBACK (on_hrule_enter),NULL);
+
   }
 
   mainw->hrule_blocked=TRUE;
@@ -2934,26 +3050,25 @@
   mainw->video_drawable=NULL;
   mainw->plug=NULL;
 
-  GTK_WIDGET_SET_FLAGS (mainw->LiVES, GTK_CAN_FOCUS);
+  lives_widget_set_can_focus (mainw->LiVES, TRUE);
   gtk_widget_grab_focus(mainw->textview1);
 
 }
 
 
 
-void
-fade_background(void) {
+void fade_background(void) {
 
   if (palette->style==STYLE_PLAIN) {
     gtk_label_set_text(GTK_LABEL(mainw->banner),"            = <  L i V E S > =              ");
   }
   if (mainw->foreign) {
     gtk_label_set_text(GTK_LABEL(mainw->banner),_("    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "));
-    gtk_widget_modify_fg(mainw->banner, GTK_STATE_NORMAL, &palette->banner_fade_text);
+    lives_widget_set_fg_color(mainw->banner, LIVES_WIDGET_STATE_NORMAL, &palette->banner_fade_text);
     gtk_label_set_text(GTK_LABEL(mainw->vps_label),("                      "));
   }
   else {
-    gtk_widget_modify_bg (mainw->playframe, GTK_STATE_NORMAL, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
     if (mainw->sep_win) {
       gtk_widget_hide (mainw->playframe);
     }
@@ -2962,18 +3077,20 @@
 
   gtk_frame_set_label(GTK_FRAME(mainw->playframe), "");
 
-  gtk_widget_modify_fg (mainw->curf_label, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_fg (mainw->vps_label, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->vbox1, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->LiVES, GTK_STATE_NORMAL, &palette->fade_colour);
-
-  gtk_widget_modify_bg (mainw->eventbox3, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->eventbox4, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->eventbox, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->pl_eventbox, GTK_STATE_NORMAL, &palette->fade_colour);
-
-  gtk_widget_modify_bg (mainw->frame1, GTK_STATE_NORMAL, &palette->fade_colour);
-  gtk_widget_modify_bg (mainw->frame2, GTK_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_fg_color (mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_fg_color (mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+
+  lives_widget_set_bg_color (mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+
+  lives_widget_set_bg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color (mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
   gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame1), GTK_SHADOW_NONE);
   gtk_frame_set_label (GTK_FRAME(mainw->frame1), "");
   gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame2), GTK_SHADOW_NONE);
@@ -3015,54 +3132,54 @@
   // we need to remove the accelerators and add accelerator keys instead
 
   if (stop_closure==NULL) {
-    gtk_widget_remove_accelerator (mainw->stop, mainw->accel_group, GDK_q, (GdkModifierType)0);
-    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_q, (GdkModifierType)0, (GtkAccelFlags)0, 
+    gtk_widget_remove_accelerator (mainw->stop, mainw->accel_group, LIVES_KEY_q, (GdkModifierType)0);
+    gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_q, (GdkModifierType)0, (GtkAccelFlags)0, 
 			     (stop_closure=g_cclosure_new (G_CALLBACK (stop_callback),NULL,NULL)));
 
     if (!mainw->foreign) {
       // TODO - do these checks in the end functions
-      gtk_widget_remove_accelerator (mainw->record_perf, mainw->accel_group, GDK_r, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_r, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->record_perf, mainw->accel_group, LIVES_KEY_r, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_r, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (rec_closure=g_cclosure_new (G_CALLBACK (rec_callback),NULL,NULL)));
       
-      gtk_widget_remove_accelerator (mainw->full_screen, mainw->accel_group, GDK_f, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_f, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->full_screen, mainw->accel_group, LIVES_KEY_f, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_f, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (fullscreen_closure=g_cclosure_new (G_CALLBACK (fullscreen_callback),NULL,NULL)));
       
-      gtk_widget_remove_accelerator (mainw->showfct, mainw->accel_group, GDK_h, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_h, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->showfct, mainw->accel_group, LIVES_KEY_h, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_h, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (showfct_closure=g_cclosure_new (G_CALLBACK (showfct_callback),NULL,NULL)));
       
-      gtk_widget_remove_accelerator (mainw->showsubs, mainw->accel_group, GDK_v, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_v, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->showsubs, mainw->accel_group, LIVES_KEY_v, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_v, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (showsubs_closure=g_cclosure_new (G_CALLBACK (showsubs_callback),NULL,NULL)));
       
-      gtk_widget_remove_accelerator (mainw->sepwin, mainw->accel_group, GDK_s, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_s, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->sepwin, mainw->accel_group, LIVES_KEY_s, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_s, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (sepwin_closure=g_cclosure_new (G_CALLBACK (sepwin_callback),NULL,NULL)));
 
       if (!cfile->achans||mainw->mute||mainw->loop_cont||prefs->audio_player==AUD_PLAYER_JACK||
 	  prefs->audio_player==AUD_PLAYER_PULSE) {
-	gtk_widget_remove_accelerator (mainw->loop_video, mainw->accel_group, GDK_l, (GdkModifierType)0);
-	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_l, (GdkModifierType)0, (GtkAccelFlags)0, 
+	gtk_widget_remove_accelerator (mainw->loop_video, mainw->accel_group, LIVES_KEY_l, (GdkModifierType)0);
+	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_l, (GdkModifierType)0, (GtkAccelFlags)0, 
 				 (loop_closure=g_cclosure_new (G_CALLBACK (loop_callback),NULL,NULL)));
 	
-	gtk_widget_remove_accelerator (mainw->loop_continue, mainw->accel_group, GDK_o, (GdkModifierType)0);
-	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_o, (GdkModifierType)0, (GtkAccelFlags)0, 
+	gtk_widget_remove_accelerator (mainw->loop_continue, mainw->accel_group, LIVES_KEY_o, (GdkModifierType)0);
+	gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_o, (GdkModifierType)0, (GtkAccelFlags)0, 
 				 (loop_cont_closure=g_cclosure_new (G_CALLBACK (loop_cont_callback),NULL,NULL)));
 	
       }
-      gtk_widget_remove_accelerator (mainw->loop_ping_pong, mainw->accel_group, GDK_g, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_g, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->loop_ping_pong, mainw->accel_group, LIVES_KEY_g, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_g, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (ping_pong_closure=g_cclosure_new (G_CALLBACK (ping_pong_callback),NULL,NULL)));
-      gtk_widget_remove_accelerator (mainw->mute_audio, mainw->accel_group, GDK_z, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_z, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->mute_audio, mainw->accel_group, LIVES_KEY_z, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_z, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (mute_audio_closure=g_cclosure_new (G_CALLBACK (mute_audio_callback),NULL,NULL)));
-      gtk_widget_remove_accelerator (mainw->dsize, mainw->accel_group, GDK_d, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_d, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->dsize, mainw->accel_group, LIVES_KEY_d, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_d, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (dblsize_closure=g_cclosure_new (G_CALLBACK (dblsize_callback),NULL,NULL)));
-      gtk_widget_remove_accelerator (mainw->fade, mainw->accel_group, GDK_b, (GdkModifierType)0);
-      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_b, (GdkModifierType)0, (GtkAccelFlags)0, 
+      gtk_widget_remove_accelerator (mainw->fade, mainw->accel_group, LIVES_KEY_b, (GdkModifierType)0);
+      gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_b, (GdkModifierType)0, (GtkAccelFlags)0, 
 			       (fade_closure=g_cclosure_new (G_CALLBACK (fade_callback),NULL,NULL)));
     }
   }
@@ -3073,8 +3190,7 @@
 
 
 
-void
-unfade_background(void) {
+void unfade_background(void) {
   if (prefs->open_maximised&&prefs->show_gui) {
     gtk_window_maximize (GTK_WINDOW(mainw->LiVES));
   }
@@ -3085,10 +3201,10 @@
   else {
     gtk_label_set_text(GTK_LABEL(mainw->banner),"                                                ");
   }
-  gtk_widget_modify_fg(mainw->banner, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_widget_modify_bg (mainw->eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_bg (mainw->vbox1, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_bg (mainw->eventbox3, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_fg_color(mainw->banner, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_bg_color (mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   gtk_frame_set_label (GTK_FRAME(mainw->frame1), _("First Frame"));
   if (!mainw->preview) {
     gtk_frame_set_label(GTK_FRAME(mainw->playframe),_("Play"));
@@ -3097,27 +3213,26 @@
     gtk_frame_set_label(GTK_FRAME(mainw->playframe),_("Preview"));
   }
 
-  gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame1), GTK_SHADOW_IN);
   gtk_frame_set_label (GTK_FRAME(mainw->frame2), _("Last Frame"));
-  gtk_widget_modify_fg (mainw->curf_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_widget_modify_fg (mainw->vps_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_widget_modify_bg (mainw->LiVES, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_fg_color (mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color (mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_bg_color (mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-  gtk_widget_modify_bg (mainw->pl_eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(gtk_frame_get_label_widget(GTK_FRAME(mainw->playframe)), GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(gtk_frame_get_label_widget(GTK_FRAME(mainw->frame1)), GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(gtk_frame_get_label_widget(GTK_FRAME(mainw->frame2)), GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(gtk_frame_get_label_widget(GTK_FRAME(mainw->playframe)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(gtk_frame_get_label_widget(GTK_FRAME(mainw->frame1)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(gtk_frame_get_label_widget(GTK_FRAME(mainw->frame2)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  gtk_widget_modify_bg (mainw->eventbox4, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_bg (mainw->frame1, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_bg (mainw->frame2, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-  gtk_frame_set_shadow_type (GTK_FRAME(mainw->frame2), GTK_SHADOW_IN);
-  gtk_widget_modify_bg (mainw->playframe, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_frame_set_shadow_type (GTK_FRAME(mainw->playframe), GTK_SHADOW_IN);
+  lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   gtk_widget_show(mainw->menu_hbox);
   gtk_widget_hide(mainw->tb_hbox);
   gtk_widget_show(mainw->hseparator);
@@ -3143,73 +3258,73 @@
   gtk_widget_show(mainw->arrow1);
   gtk_widget_show(mainw->arrow2);
   gtk_widget_show(mainw->spinbutton_pb_fps);
-  gtk_widget_modify_fg (mainw->vps_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_widget_modify_fg (mainw->curf_label, GTK_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color (mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color (mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
   if (stop_closure!=NULL) {
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), stop_closure);
     gtk_widget_add_accelerator (mainw->stop, "activate", mainw->accel_group,
-				GDK_q, (GdkModifierType)0,
+				LIVES_KEY_q, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
     
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), rec_closure);
     gtk_widget_add_accelerator (mainw->record_perf, "activate", mainw->accel_group,
-				GDK_r, (GdkModifierType)0,
+				LIVES_KEY_r, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
     
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), fullscreen_closure);
     gtk_widget_add_accelerator (mainw->full_screen, "activate", mainw->accel_group,
-				  GDK_f, (GdkModifierType)0,
+				  LIVES_KEY_f, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), sepwin_closure);
     gtk_widget_add_accelerator (mainw->sepwin, "activate", mainw->accel_group,
-				GDK_s, (GdkModifierType)0,
+				LIVES_KEY_s, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), mute_audio_closure);
     gtk_widget_add_accelerator (mainw->mute_audio, "activate", mainw->accel_group,
-				GDK_z, (GdkModifierType)0,
+				LIVES_KEY_z, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), ping_pong_closure);
     gtk_widget_add_accelerator (mainw->loop_ping_pong, "activate", mainw->accel_group,
-				GDK_g, (GdkModifierType)0,
+				LIVES_KEY_g, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     if (!cfile->achans||mainw->mute||mainw->loop_cont||prefs->audio_player==AUD_PLAYER_JACK||
 	prefs->audio_player==AUD_PLAYER_PULSE) {
       gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), loop_closure);
       gtk_widget_add_accelerator (mainw->loop_video, "activate", mainw->accel_group,
-				  GDK_l, (GdkModifierType)0,
+				  LIVES_KEY_l, (GdkModifierType)0,
 				  GTK_ACCEL_VISIBLE);
       gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), loop_cont_closure);
       gtk_widget_add_accelerator (mainw->loop_continue, "activate", mainw->accel_group,
-				  GDK_o, (GdkModifierType)0,
+				  LIVES_KEY_o, (GdkModifierType)0,
 				  GTK_ACCEL_VISIBLE);
       gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), showfct_closure);
     }
     gtk_widget_add_accelerator (mainw->showfct, "activate", mainw->accel_group,
-				GDK_h, (GdkModifierType)0,
+				LIVES_KEY_h, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), showsubs_closure);
     gtk_widget_add_accelerator (mainw->showsubs, "activate", mainw->accel_group,
-				GDK_v, (GdkModifierType)0,
+				LIVES_KEY_v, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), sepwin_closure);
     gtk_widget_add_accelerator (mainw->sepwin, "activate", mainw->accel_group,
-				GDK_s, (GdkModifierType)0,
+				LIVES_KEY_s, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), dblsize_closure);
     gtk_widget_add_accelerator (mainw->dsize, "activate", mainw->accel_group,
-				GDK_d, (GdkModifierType)0,
+				LIVES_KEY_d, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), fade_closure);
     gtk_widget_add_accelerator (mainw->fade, "activate", mainw->accel_group,
-				GDK_b, (GdkModifierType)0,
+				LIVES_KEY_b, (GdkModifierType)0,
 				GTK_ACCEL_VISIBLE);
 
     stop_closure=NULL;
@@ -3224,8 +3339,7 @@
 }
 
 
-void
-fullscreen_internal(void) {
+void fullscreen_internal(void) {
   int bx,by;
 
   // resize for full screen, internal player, no separate window
@@ -3251,13 +3365,13 @@
       gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),NULL);
     }
 
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     get_border_size(mainw->LiVES, &bx, &by);
 
 
-    gtk_widget_set_size_request (mainw->playframe, mainw->LiVES->allocation.width-bx, 
-				 mainw->LiVES->allocation.height);
+    gtk_widget_set_size_request (mainw->playframe, lives_widget_get_allocation_width(mainw->LiVES)-bx, 
+				 lives_widget_get_allocation_height(mainw->LiVES));
 
   }
   else {
@@ -3268,60 +3382,71 @@
 
 
 
-void 
-block_expose (void) {
+void block_expose (void) {
   // block expose/config events
   // sometimes we need to do this before showing/re-showing the play window
   // otherwise we get into a loop of expose events
   // symptoms - strace shows the app looping on poll() and it is otherwise
   // unresponsive
+  mainw->draw_blocked=TRUE;
+#if !GTK_CHECK_VERSION(3,0,0)
   g_signal_handler_block(mainw->video_draw,mainw->config_func);
   g_signal_handler_block(mainw->video_draw,mainw->vidbar_func);
   g_signal_handler_block(mainw->laudio_draw,mainw->laudbar_func);
   g_signal_handler_block(mainw->raudio_draw,mainw->raudbar_func);
+#endif
 }
 
-void 
-unblock_expose (void) {
+void unblock_expose (void) {
   // unblock expose/config events
+  mainw->draw_blocked=FALSE;
+#if !GTK_CHECK_VERSION(3,0,0)
   g_signal_handler_unblock(mainw->video_draw,mainw->config_func);
   g_signal_handler_unblock(mainw->video_draw,mainw->vidbar_func);
   g_signal_handler_unblock(mainw->laudio_draw,mainw->laudbar_func);
   g_signal_handler_unblock(mainw->raudio_draw,mainw->raudbar_func);
+#endif
 }
 
 
 
 
-void 
-make_preview_box (void) {
+void make_preview_box (void) {
   // create a box to show frames in, this will go in the sepwin when we are not playing
   GtkWidget *hbox;
-  GtkWidget *hbox_rb;
   GtkWidget *hbox_buttons;
-  GObject *spinbutton_adj;
   GtkWidget *radiobutton_free;
   GtkWidget *radiobutton_start;
   GtkWidget *radiobutton_end;
   GtkWidget *radiobutton_ptr;
-  GSList *radiobutton_group = NULL;
-  GtkWidget *hseparator;
   GtkWidget *rewind_img;
   GtkWidget *playsel_img;
   GtkWidget *play_img;
   GtkWidget *loop_img;
   GtkWidget *eventbox;
-  GtkWidget *label;
+
+  GSList *radiobutton_group = NULL;
 
   gchar buff[PATH_MAX];
   gchar *fnamex;
+  gchar *tmp,*tmp2;
 
-  mainw->preview_box = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (mainw->preview_box);
-  gtk_widget_ref(mainw->preview_box);
+  mainw->preview_box = lives_vbox_new (FALSE, 0);
+  g_object_ref(mainw->preview_box);
 
   eventbox=gtk_event_box_new();
-  gtk_widget_show (eventbox);
+  gtk_widget_set_events (eventbox, GDK_SCROLL_MASK);
+
+  g_signal_connect (GTK_OBJECT (eventbox), "scroll_event",
+		    G_CALLBACK (on_mouse_scroll),
+		    NULL);
+
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_connect (GTK_OBJECT (eventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (expose_pim),
+		    NULL);
+#endif
+
   gtk_box_pack_start (GTK_BOX (mainw->preview_box), eventbox, TRUE, TRUE, 0);
 
   g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
@@ -3330,180 +3455,103 @@
 
 
   mainw->preview_image = gtk_image_new_from_pixbuf (NULL);
+  gtk_widget_set_app_paintable(mainw->preview_image,TRUE);
   gtk_widget_show (mainw->preview_image);
   gtk_container_add (GTK_CONTAINER (eventbox), mainw->preview_image);
 
-  hbox = gtk_hbox_new (FALSE, 10);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (mainw->preview_box), hbox, FALSE, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (1., 1., cfile->frames, 1., 10., 0.);
-  mainw->preview_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_entry_set_width_chars (GTK_ENTRY (mainw->preview_spinbutton),8);
-  gtk_widget_show (mainw->preview_spinbutton);
-  gtk_box_pack_start (GTK_BOX (hbox), mainw->preview_spinbutton, FALSE, FALSE, 0);
-
-  gtk_widget_modify_text(mainw->preview_spinbutton, GTK_STATE_INSENSITIVE, &palette->black);
-
-  // damn thing crashes if max<min
-  mainw->preview_scale=gtk_hscale_new_with_range(0,cfile->frames?cfile->frames>0:1,1);
-  gtk_widget_show(mainw->preview_scale);
-
-  gtk_box_pack_start (GTK_BOX (hbox), mainw->preview_scale, TRUE, TRUE, 0);
-  gtk_range_set_adjustment(GTK_RANGE(mainw->preview_scale),GTK_ADJUSTMENT(spinbutton_adj));
-  gtk_scale_set_draw_value(GTK_SCALE(mainw->preview_scale),FALSE);
+  if (mainw->play_window!=NULL) {
+    if (mainw->current_file<0||cfile->frames==0) {
+      if (mainw->imframe!=NULL) {
+	gtk_widget_set_size_request(mainw->preview_image,lives_pixbuf_get_width(mainw->imframe),lives_pixbuf_get_height(mainw->imframe));
+	
+      }
+    }
+    else
+      gtk_widget_set_size_request(mainw->preview_image,MAX(mainw->pwidth,mainw->sepwin_minwidth),mainw->pheight);
+  }
 
-  gtk_widget_set_tooltip_text( mainw->preview_spinbutton, _("Frame number to preview"));
-  gtk_tooltips_copy(mainw->preview_scale,mainw->preview_spinbutton);
+  lives_widget_set_hexpand(mainw->preview_box,TRUE);
+  lives_widget_set_vexpand(mainw->preview_box,TRUE);
 
-  hbox_rb = gtk_hbox_new (FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (mainw->preview_box), hbox_rb, FALSE, FALSE, 0);
-  gtk_widget_show (hbox_rb);
+  mainw->preview_controls=lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (mainw->preview_box), mainw->preview_controls, FALSE, FALSE, 0);
+  lives_widget_set_vexpand(mainw->preview_controls,FALSE);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox_rb), hbox, TRUE, FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  lives_widget_set_vexpand(hbox,FALSE);
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
-  radiobutton_free=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_free), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_free));
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton_free, FALSE, FALSE, 4);
+  mainw->preview_spinbutton = lives_standard_spin_button_new (NULL,FALSE,(mainw->current_file>-1&&cfile->frames>0.)?1.:0.,
+							      (mainw->current_file>-1&&cfile->frames>0.)?1.:0.,
+							      (mainw->current_file>-1&&cfile->frames>0.)?cfile->frames:0.,
+							      1., 10., 0,
+							      LIVES_BOX(hbox),_("Frame number to preview"));
 
-  label=gtk_label_new_with_mnemonic (_ ("_Free"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton_free);
+  mainw->preview_scale=lives_hscale_new(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(mainw->preview_spinbutton)));
+  gtk_scale_set_draw_value(GTK_SCALE(mainw->preview_scale),FALSE);
 
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Free choice of frame number"));
-  gtk_tooltips_copy(radiobutton_free,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton_free);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->preview_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    //lives_widget_set_bg_color(mainw->preview_scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(mainw->preview_scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 4);
-
-  gtk_widget_show_all (hbox);
 
+  gtk_box_pack_start (GTK_BOX (mainw->preview_controls), mainw->preview_scale,FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (mainw->preview_controls), hbox, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox_rb), hbox, TRUE, FALSE, 0);
+  gtk_entry_set_width_chars (GTK_ENTRY (mainw->preview_spinbutton),8);
 
-  radiobutton_start=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_start), radiobutton_group);
+  radiobutton_free=lives_standard_radio_button_new((tmp=g_strdup(_ ("_Free"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+						   (tmp2=g_strdup(_("Free choice of frame number"))));
+  g_free(tmp); g_free(tmp2);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_free));
+
+  radiobutton_start=lives_standard_radio_button_new((tmp=g_strdup(_ ("_Start"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+						    (tmp2=g_strdup(_("Frame number is linked to start frame"))));
+  g_free(tmp); g_free(tmp2);
   radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_start));
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton_start, FALSE, FALSE, 4);
-
-  label=gtk_label_new_with_mnemonic (_ ("_Start"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton_start);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Frame number is linked to start frame"));
-  gtk_tooltips_copy(radiobutton_start,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton_start);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 4);
-
-  gtk_widget_show_all (hbox);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton_start), mainw->prv_link==PRV_START);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_start), mainw->prv_link==PRV_START);
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox_rb), hbox, TRUE, FALSE, 0);
-
-  radiobutton_end=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_end), radiobutton_group);
+  radiobutton_end=lives_standard_radio_button_new((tmp=g_strdup(_ ("_End"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+						    (tmp2=g_strdup(_("Frame number is linked to end frame"))));
+  g_free(tmp); g_free(tmp2);
   radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_end));
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton_end, FALSE, FALSE, 4);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_end), mainw->prv_link==PRV_END);
 
-  label=gtk_label_new_with_mnemonic (_ ("_End"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton_end);
 
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Frame number is linked to end frame"));
-  gtk_tooltips_copy(radiobutton_end,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton_end);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 4);
-
-  gtk_widget_show_all (hbox);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton_end), mainw->prv_link==PRV_END);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox_rb), hbox, TRUE, FALSE, 0);
-
-  radiobutton_ptr=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_ptr), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_ptr));
+  radiobutton_ptr=lives_standard_radio_button_new((tmp=g_strdup(_ ("_Pointer"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+						  (tmp2=g_strdup(_("Frame number is linked to playback pointer"))));
+  g_free(tmp); g_free(tmp2);
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton_ptr, FALSE, FALSE, 4);
-
-  label=gtk_label_new_with_mnemonic (_ ("_Pointer"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton_ptr);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Frame number is linked to playback pointer"));
-  gtk_tooltips_copy(radiobutton_ptr,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton_ptr);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 4);
 
-  gtk_widget_show_all (hbox);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_end), mainw->prv_link==PRV_PTR);
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton_ptr), mainw->prv_link==PRV_PTR);
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (mainw->preview_box), hseparator, TRUE, TRUE, 0);
+  add_hsep_to_box (LIVES_BOX (mainw->preview_controls));
 
   // buttons
-  hbox_buttons = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox_buttons);
-  gtk_box_pack_start (GTK_BOX (mainw->preview_box), hbox_buttons, TRUE, TRUE, 0);
+  hbox_buttons = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (mainw->preview_controls), hbox_buttons, TRUE, TRUE, 0);
 
-  rewind_img=gtk_image_new_from_stock ("gtk-media-rewind", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+  rewind_img=lives_image_new_from_stock ("gtk-media-rewind", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
   mainw->p_rewindbutton=gtk_button_new();
-  gtk_widget_modify_bg (mainw->p_rewindbutton, GTK_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_widget_set_bg_color (mainw->p_rewindbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
   gtk_button_set_relief (GTK_BUTTON (mainw->p_rewindbutton), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER(mainw->p_rewindbutton), rewind_img);
   gtk_box_pack_start (GTK_BOX (hbox_buttons), mainw->p_rewindbutton, TRUE, TRUE, 0);
   gtk_widget_show (mainw->p_rewindbutton);
   gtk_widget_show (rewind_img);
   gtk_widget_set_tooltip_text( mainw->p_rewindbutton,_ ("Rewind"));
-  gtk_widget_set_sensitive (mainw->p_rewindbutton, cfile->pointer_time>0.);
+  gtk_widget_set_sensitive (mainw->p_rewindbutton, mainw->current_file>-1&&cfile->pointer_time>0.);
 
-  play_img=gtk_image_new_from_stock ("gtk-media-play", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+  play_img=lives_image_new_from_stock ("gtk-media-play", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
   mainw->p_playbutton=gtk_button_new();
-  gtk_widget_modify_bg (mainw->p_playbutton, GTK_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_widget_set_bg_color (mainw->p_playbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
   gtk_button_set_relief (GTK_BUTTON (mainw->p_playbutton), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER(mainw->p_playbutton), play_img);
   gtk_box_pack_start (GTK_BOX (hbox_buttons), mainw->p_playbutton, TRUE, TRUE, 0);
@@ -3516,21 +3564,21 @@
   g_free(fnamex);
   playsel_img=gtk_image_new_from_file (buff);
   mainw->p_playselbutton=gtk_button_new();
-  gtk_widget_modify_bg (mainw->p_playselbutton, GTK_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_widget_set_bg_color (mainw->p_playselbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
   gtk_button_set_relief (GTK_BUTTON (mainw->p_playselbutton), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER(mainw->p_playselbutton), playsel_img);
   gtk_box_pack_start (GTK_BOX (hbox_buttons), mainw->p_playselbutton, TRUE, TRUE, 0);
   gtk_widget_show (mainw->p_playselbutton);
   gtk_widget_show (playsel_img);
   gtk_widget_set_tooltip_text( mainw->p_playselbutton,_ ("Play Selection"));
-  gtk_widget_set_sensitive (mainw->p_playselbutton, cfile->frames>0);
+  gtk_widget_set_sensitive (mainw->p_playselbutton, mainw->current_file>-1&&cfile->frames>0);
 
   fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
   g_snprintf (buff,PATH_MAX,"%s",fnamex);
   g_free(fnamex);
   loop_img=gtk_image_new_from_file (buff);
   mainw->p_loopbutton=gtk_button_new();
-  gtk_widget_modify_bg (mainw->p_loopbutton, GTK_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_widget_set_bg_color (mainw->p_loopbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
   gtk_button_set_relief (GTK_BUTTON (mainw->p_loopbutton), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER(mainw->p_loopbutton), loop_img);
   gtk_box_pack_start (GTK_BOX (hbox_buttons), mainw->p_loopbutton, TRUE, TRUE, 0);
@@ -3549,7 +3597,7 @@
   }
 
   mainw->p_mutebutton=gtk_button_new();
-  gtk_widget_modify_bg (mainw->p_mutebutton, GTK_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_widget_set_bg_color (mainw->p_mutebutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
   gtk_button_set_relief (GTK_BUTTON (mainw->p_mutebutton), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER(mainw->p_mutebutton), mainw->p_mute_img);
   gtk_box_pack_start (GTK_BOX (hbox_buttons), mainw->p_mutebutton, TRUE, TRUE, 0);
@@ -3592,35 +3640,114 @@
 						   G_CALLBACK (on_preview_spinbutton_changed),
 						   NULL);
 
+  gtk_widget_show_all(mainw->preview_box);
+
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
 
-void 
-enable_record (void) {
+void calibrate_sepwin_size(void) {
+  // get size of preview box in sepwin
+  GtkRequisition req;
+  make_preview_box();
+  gtk_widget_get_preferred_size(mainw->preview_controls,NULL,&req);
+  mainw->sepwin_minwidth=req.width;
+  mainw->sepwin_minheight=req.height;
+}
+
+#endif
+
+void enable_record (void) {
   set_menu_text (mainw->record_perf, _("Start _recording"),TRUE);
   gtk_widget_set_sensitive (mainw->record_perf, TRUE);
 }
 
-void 
-toggle_record (void) {
+void toggle_record (void) {
   set_menu_text (mainw->record_perf, _("Stop _recording"),TRUE);
 }
 
 
-void 
-disable_record (void) {
+void disable_record (void) {
   set_menu_text (mainw->record_perf, _("_Record Performance"),TRUE);
 }
 
 
-void make_play_window(void) {
-  //  separate window
 
+void play_window_set_title(void) {
   gchar *xtrabit;
   gchar *title;
 
+  if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+  else xtrabit=g_strdup("");
+
+  if (mainw->playing_file>-1) {
+    title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+    gtk_window_set_title (GTK_WINDOW (mainw->play_window), title);
+  }
+  else {
+    title=g_strdup_printf("%s%s",gtk_window_get_title(GTK_WINDOW
+						      (mainw->multitrack==NULL?mainw->LiVES:
+						       mainw->multitrack->window)),xtrabit);
+    gtk_window_set_title(GTK_WINDOW(mainw->play_window),title);
+  }
+  g_free(title);
+  g_free(xtrabit);
+}
+
+
+void resize_widgets_for_monitor(boolean get_play_times) {
+  // resize widgets if we are aware that monitor resolution has changed
+
+  mainw->scr_width=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].width;
+  mainw->scr_height=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].height;
+  
+  if (mainw->multitrack==NULL) {
+    if (prefs->gui_monitor!=0) {
+      int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
+						      lives_widget_get_allocation_width(mainw->LiVES))/2;
+      int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
+						      lives_widget_get_allocation_height(mainw->LiVES))/2;
+      gtk_window_move(GTK_WINDOW(mainw->LiVES),xcen,ycen);
+      
+    }
+    if (prefs->open_maximised&&prefs->show_gui) {
+      gtk_window_maximize (GTK_WINDOW(mainw->LiVES));
+    }
+  }
+  else {
+    if (prefs->gui_monitor!=0) {
+      int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
+						      lives_widget_get_allocation_width(mainw->multitrack->window))/2;
+      int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
+						      lives_widget_get_allocation_height(mainw->multitrack->window))/2;
+      gtk_window_move(GTK_WINDOW(mainw->multitrack->window),xcen,ycen);
+    }
+	
+	
+    if ((prefs->gui_monitor!=0||capable->nmonitors<=1)&&prefs->open_maximised) {
+      gtk_window_maximize (GTK_WINDOW(mainw->multitrack->window));
+    }
+  }
+
+  if (mainw->play_window!=NULL) {
+    resize_play_window();
+  }
+
+  /*  if (mainw->multitrack==NULL&&get_play_times) {
+    if (mainw->current_file>-1&&!mainw->recoverable_layout) {
+      get_play_times();
+    }
+    }*/
+
+
+}
+
+
+void make_play_window(void) {
+  //  separate window
+
   if (mainw->playing_file>-1) {
-      unhide_cursor(mainw->playarea->window);
+    unhide_cursor(lives_widget_get_xwindow(mainw->playarea));
   }
 
   gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),NULL);
@@ -3632,12 +3759,16 @@
   
   mainw->play_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
+  gtk_widget_set_events (mainw->play_window, GDK_SCROLL_MASK);
+
   gtk_window_set_position(GTK_WINDOW(mainw->play_window),GTK_WIN_POS_CENTER_ALWAYS);
 
   if (mainw->multitrack==NULL) gtk_window_add_accel_group (GTK_WINDOW (mainw->play_window), mainw->accel_group);
   else gtk_window_add_accel_group (GTK_WINDOW (mainw->play_window), mainw->multitrack->accel_group);
 
-  gtk_widget_modify_bg (mainw->play_window, GTK_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (mainw->play_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
 
   // show the window (so we can hide its cursor !), and get its xwin
   if (!(mainw->fs&&mainw->playing_file>-1&&mainw->vpp!=NULL)) {
@@ -3647,118 +3778,70 @@
   resize_play_window();
   if (mainw->play_window==NULL) return;
 
-  if (mainw->playing_file==-1&&mainw->current_file>0&&cfile->frames>0&&mainw->multitrack==NULL) {
+  //if (mainw->playing_file==-1&&mainw->current_file>0&&cfile->frames>0&&mainw->multitrack==NULL) {
+  if (mainw->multitrack==NULL&&mainw->playing_file==-1) {
+
     if (mainw->preview_box==NULL) {
       // create the preview box that shows frames
       make_preview_box();
+      load_preview_image(FALSE);
     }
-    if (cfile->is_loaded) {
-      //and add it the play window
-      gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
-      gtk_widget_set_size_request(mainw->preview_box,-1,PREVIEW_BOX_HT);
 
-      if (mainw->is_processing&&!cfile->nopreview) gtk_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview")); 
-      gtk_widget_grab_focus (mainw->preview_scale);
+    //if (cfile->is_loaded) {
+    //and add it the play window
+    gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
+
+    if (mainw->is_processing&&mainw->current_file>-1&&!cfile->nopreview) 
+      gtk_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview")); 
+
+    if (mainw->current_file>-1&&cfile->is_loaded) {
+      gtk_widget_grab_focus (mainw->preview_spinbutton);
+    }
+    else {
+      gtk_widget_hide(mainw->preview_controls);
+    }
 
+    if (mainw->playing_file>-1) {
+      gtk_widget_hide(mainw->preview_box);
+    }
+    else {
       if (mainw->is_processing&&(mainw->prv_link==PRV_START||mainw->prv_link==PRV_END)) {
 	// block spinbutton in play window
 	gtk_widget_set_sensitive(mainw->preview_spinbutton,FALSE);
       }
-
-      // load whatever frame and show it
-      if (mainw->prv_link!=PRV_FREE) mainw->preview_frame=0;
-      load_preview_image(FALSE);
-      // force a redraw
-      gtk_widget_queue_resize(mainw->preview_box);
-      // be careful, the user could switch out of sepwin here !
-      mainw->noswitch=TRUE;
-      while (g_main_context_iteration(NULL,FALSE));
-      mainw->noswitch=FALSE;
-      if (mainw->play_window==NULL) return;
-   }
+    }
   }
 
-
-  if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-  else xtrabit=g_strdup("");
-
-  if (mainw->playing_file>-1) {
-    title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-    gtk_window_set_title (GTK_WINDOW (mainw->play_window), title);
-  }
-  else {
-    title=g_strdup_printf("%s%s",gtk_window_get_title(GTK_WINDOW
-						      (mainw->multitrack==NULL?mainw->LiVES:
-						       mainw->multitrack->window)),xtrabit);
-    gtk_window_set_title(GTK_WINDOW(mainw->play_window),title);
-  }
-  g_free(title);
-  g_free(xtrabit);
+  play_window_set_title();
 
   if ((mainw->current_file==-1||(!cfile->is_loaded&&!mainw->preview)||
        (cfile->frames==0&&(mainw->multitrack==NULL||mainw->playing_file==-1)))&&mainw->imframe!=NULL) {
-    cairo_t *cr = gdk_cairo_create (mainw->play_window->window);
-    gdk_cairo_set_source_pixbuf (cr, mainw->imframe, (GdkModifierType)0, 0);
-    cairo_paint (cr);
-    cairo_destroy (cr);
+    lives_painter_t *cr = lives_painter_create_from_widget (mainw->play_window);
+    lives_painter_set_source_pixbuf (cr, mainw->imframe, (GdkModifierType)0, 0);
+    lives_painter_paint (cr);
+    lives_painter_destroy (cr);
   }
 
   gtk_widget_set_tooltip_text( mainw->m_sepwinbutton,_ ("Hide Play Window"));
 
-    mainw->pw_exp_func=g_signal_connect_after (GTK_OBJECT (mainw->play_window), "expose_event",
-					     G_CALLBACK (expose_play_window),
-					     NULL);
-
-    g_signal_connect (GTK_OBJECT (mainw->play_window), "delete_event",
-		      G_CALLBACK (on_stop_activate_by_del),
-		      NULL);
-
-
-  if (((mainw->current_file>-1&&(cfile->is_loaded||(cfile->clip_type!=CLIP_TYPE_DISK&&
-						    cfile->clip_type!=CLIP_TYPE_FILE)))||
-       (mainw->preview&&cfile->frames>0))&&(mainw->multitrack!=NULL||mainw->playing_file>-1)) {
-    g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=TRUE;
-  }
-  else mainw->pw_exp_is_blocked=FALSE;
-
-
-  if (!mainw->ext_playback) {
-    // be careful, the user could switch out of sepwin here !
-    if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) g_source_remove(mainw->multitrack->idlefunc);
-    mainw->noswitch=TRUE;
-
-    if (mainw->current_file>-1) {
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
-
-    while (g_main_context_iteration(NULL,FALSE));
-    if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) {
-      mainw->multitrack->idlefunc=0;
-      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-    }
-    mainw->noswitch=FALSE;
-    if (mainw->play_window==NULL) return;
-  }
-
-  g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event",
-		    G_CALLBACK (on_mouse_scroll),
+  g_signal_connect (GTK_OBJECT (mainw->play_window), "delete_event",
+		    G_CALLBACK (on_stop_activate_by_del),
 		    NULL);
+  
 
 }
 
 
 
 void resize_play_window (void) {
-  gint opwx,opwy,pmonitor=prefs->play_monitor;
+  int opwx,opwy,pmonitor=prefs->play_monitor;
 
-  gboolean fullscreen=TRUE;
-  gboolean size_ok;
+  boolean fullscreen=TRUE;
+  boolean size_ok;
 
-  int xht;
+  int width=-1,height=-1,nwidth,nheight=0;
 
-  unsigned long xwinid=0;
+  uint64_t xwinid=0;
 
   mainw->sepwin_scale=100.;
 
@@ -3768,6 +3851,11 @@
 
   if (mainw->play_window==NULL) return;
 
+  if (lives_widget_is_visible(mainw->play_window)) {
+    width=lives_widget_get_allocation_width(mainw->play_window);
+    height=lives_widget_get_allocation_height(mainw->play_window);
+  }
+
   if ((mainw->current_file==-1||(cfile->frames==0&&mainw->multitrack==NULL)||
        (!cfile->is_loaded&&!mainw->preview&&cfile->clip_type!=CLIP_TYPE_GENERATOR))||
       (mainw->multitrack!=NULL&&mainw->playing_file<1&&!mainw->preview)) {
@@ -3797,8 +3885,8 @@
 
     do {
       if (pmonitor==0) {
-	if (mainw->pwidth>mainw->scr_width-DSIZE_SAFETY_H||
-	    mainw->pheight>mainw->scr_height-DSIZE_SAFETY_V) { 
+	if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
+	    mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) { 
 	  mainw->pheight=(mainw->pheight>>2)<<1;
 	  mainw->pwidth=(mainw->pwidth>>2)<<1;
 	  mainw->sepwin_scale/=2.;
@@ -3806,8 +3894,8 @@
 	else size_ok=TRUE;
       }
       else {
-	if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-DSIZE_SAFETY_H||
-	    mainw->pheight>mainw->mgeom[pmonitor-1].height-DSIZE_SAFETY_V) {
+	if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+	    mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
 	  mainw->pheight=(mainw->pheight>>2)<<1;
 	  mainw->pwidth=(mainw->pwidth>>2)<<1;
 	  mainw->sepwin_scale/=2.;
@@ -3822,15 +3910,15 @@
       mainw->pheight*=2;
       mainw->pwidth*=2;
       if (pmonitor==0) {
-	if (mainw->pwidth>mainw->scr_width-DSIZE_SAFETY_H||mainw->pheight>mainw->scr_height-DSIZE_SAFETY_V) {
-	  calc_maxspect(mainw->scr_width-DSIZE_SAFETY_H,mainw->scr_height-DSIZE_SAFETY_V,&mainw->pwidth,&mainw->pheight);
+	if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) {
+	  calc_maxspect(mainw->scr_width-SCR_WIDTH_SAFETY,mainw->scr_height-SCR_HEIGHT_SAFETY,&mainw->pwidth,&mainw->pheight);
 	  mainw->sepwin_scale=(float)mainw->pwidth/(float)cfile->hsize*100.;
 	}
       }
       else {
-	if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-DSIZE_SAFETY_H||
-	    mainw->pheight>mainw->mgeom[pmonitor-1].height-DSIZE_SAFETY_V) { 
-	  calc_maxspect(mainw->mgeom[pmonitor-1].width-DSIZE_SAFETY_H,mainw->mgeom[pmonitor-1].height-DSIZE_SAFETY_V,
+	if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+	    mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) { 
+	  calc_maxspect(mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY,mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY,
 			&mainw->pwidth,&mainw->pheight);
 	  mainw->sepwin_scale=(float)mainw->pwidth/(float)cfile->hsize*100.;
 	}
@@ -3838,11 +3926,11 @@
     }
 
     if (mainw->fs) {
-      if (!GTK_WIDGET_VISIBLE (mainw->play_window)) {
+      if (!lives_widget_is_visible (mainw->play_window)) {
 	gtk_widget_show (mainw->play_window);
 	// be careful, the user could switch out of sepwin here !
 	mainw->noswitch=TRUE;
-	while (g_main_context_iteration (NULL,FALSE));
+	lives_widget_context_update();
 	mainw->noswitch=FALSE;
 	if (mainw->play_window==NULL) return;
 	if (!mainw->fs||mainw->playing_file<0) goto point1;
@@ -3868,7 +3956,7 @@
 	mainw->pheight=mainw->mgeom[pmonitor-1].height;
       }
 
-      if (GTK_WIDGET_VISIBLE (mainw->play_window)) {
+      if (lives_widget_is_visible (mainw->play_window)) {
 	// store old postion of window
 	gtk_window_get_position (GTK_WINDOW (mainw->play_window),&opwx,&opwy);
 	if (opwx*opwy) {
@@ -3882,7 +3970,7 @@
 	  gtk_window_move (GTK_WINDOW (mainw->play_window), (mainw->scr_width-mainw->vpp->fwidth)/2,
 			   (mainw->scr_height-mainw->vpp->fheight)/2);
 	}
-	else gtk_window_move (GTK_WINDOW (mainw->play_window), (GdkModifierType)0, 0);
+	else gtk_window_move (GTK_WINDOW (mainw->play_window), 0, 0);
       }
       else {
 	gtk_window_set_screen(GTK_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
@@ -3905,8 +3993,22 @@
       if (mainw->vpp!=NULL&&(!mainw->preview||mainw->multitrack!=NULL)) {
 	gboolean fixed_size=FALSE;
 
-	gdk_window_get_pointer (gdk_get_default_root_window (), &mainw->ptr_x, &mainw->ptr_y, NULL);
-	if (pmonitor==0) mainw->ptr_x=mainw->ptr_y=-1;
+	mainw->ptr_x=mainw->ptr_y=-1;
+	if (pmonitor==0) {
+	  // fullscreen playback on all screens (of first display)
+	  // get mouse position to warp it back after playback ends
+	  // in future we will handle multiple displays, so we will get the mouse device for the first screen of that display
+	  LiVESXDevice *device=mainw->mgeom[0].mouse_device;
+#if GTK_CHECK_VERSION(3,0,0)
+	  if (device!=NULL) {
+#endif
+	    LiVESXScreen *screen;
+	    LiVESXDisplay *display=mainw->mgeom[0].disp;
+	    lives_display_get_pointer(device,display,&screen,&mainw->ptr_x,&mainw->ptr_y,NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+	  }
+#endif
+	}
 	if (mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {	  
 	  // fixed o/p size for stream
 	  if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
@@ -3932,12 +4034,10 @@
 
 	if (pmonitor!=0) {
 	  fullscreen=FALSE;
-#ifdef USE_X11
-	  if (mainw->play_window!=NULL)
-	    xwinid=(unsigned long)GDK_WINDOW_XWINDOW(mainw->play_window->window);
-#else
-	  LIVES_WARN("Tried to get XID for non X11 Window !");
-#endif
+	  if (mainw->play_window!=NULL) {
+	    xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
+	    if (xwinid==-1) return;
+	  }
 	}
 	if (mainw->ext_playback) {
 	  mainw->ext_keyboard=FALSE;
@@ -3987,16 +4087,16 @@
 	
 	do {
 	  if (pmonitor==0) {
-	    if (mainw->pwidth>mainw->scr_width-DSIZE_SAFETY_H||
-		mainw->pheight>mainw->scr_height-DSIZE_SAFETY_V) { 
+	    if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
+		mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) { 
 	      mainw->pheight=(mainw->pheight>>2)<<1;
 	      mainw->pwidth=(mainw->pwidth>>2)<<1;
 	    }
 	    else size_ok=TRUE;
 	  }
 	  else {
-	    if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-DSIZE_SAFETY_H||
-		mainw->pheight>mainw->mgeom[pmonitor-1].height-DSIZE_SAFETY_V) {
+	    if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+		mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
 	      mainw->pheight=(mainw->pheight>>2)<<1;
 	      mainw->pwidth=(mainw->pwidth>>2)<<1;
 	    }
@@ -4013,7 +4113,7 @@
       }
     }
     gtk_window_present (GTK_WINDOW (mainw->play_window));
-    gdk_window_raise(mainw->play_window->window);
+    gdk_window_raise(lives_widget_get_xwindow(mainw->play_window));
   }
   else {
     // not playing
@@ -4025,47 +4125,52 @@
       }
       else {
 	if (pmonitor==0) gtk_window_move (GTK_WINDOW (mainw->play_window), (mainw->scr_width-mainw->pwidth)/2, 
-					  (mainw->scr_height-mainw->pheight-PREVIEW_BOX_HT*2)/2);
+					  (mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
 	else {
 	  gint xcen=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
 	  gtk_window_set_screen(GTK_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
-	  gtk_window_move (GTK_WINDOW (mainw->play_window), xcen, (mainw->scr_height-mainw->pheight-PREVIEW_BOX_HT*2)/2);
+	  gtk_window_move (GTK_WINDOW (mainw->play_window), xcen, (mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
 	}
       }
     }
     else {
       if (pmonitor==0) gtk_window_move (GTK_WINDOW (mainw->play_window), (mainw->scr_width-mainw->pwidth)/2, 
-					(mainw->scr_height-mainw->pheight-PREVIEW_BOX_HT*2)/2);
+					(mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
       else {
 	gint xcen=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
 	gtk_window_set_screen(GTK_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
-	gtk_window_move (GTK_WINDOW (mainw->play_window), xcen, (mainw->scr_height-mainw->pheight-PREVIEW_BOX_HT*2)/2);
+	gtk_window_move (GTK_WINDOW (mainw->play_window), xcen, (mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
       }
     }
     mainw->opwx=mainw->opwy=-1;
   }
+  if (mainw->playing_file<0&&(mainw->current_file>-1&&!cfile->opening)) nheight=mainw->sepwin_minheight;
 
-  gtk_window_resize (GTK_WINDOW (mainw->play_window), mainw->pwidth, mainw->pheight);
+  if (mainw->pheight<MIN_SEPWIN_HEIGHT) nheight+=MIN_SEPWIN_HEIGHT-mainw->pheight;
 
-  // workaround for gtk+ lameness
-  if (mainw->playing_file<0&&(mainw->current_file>-1&&!cfile->opening)) xht=PREVIEW_BOX_HT;
-  else xht=0;
-  
-  gtk_widget_set_size_request (mainw->play_window, mainw->pwidth, mainw->pheight+xht);
-  
+  nheight+=mainw->pheight;
+
+  if (mainw->playing_file==-1&&mainw->current_file>-1&&cfile->frames>0&&
+      (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) 
+    nwidth=MAX(mainw->pwidth,mainw->sepwin_minwidth);
+  else nwidth=mainw->pwidth;
+
+  gtk_window_resize (GTK_WINDOW (mainw->play_window), nwidth, nheight);
+  gtk_widget_set_size_request (mainw->play_window, nwidth, nheight);
 
+  if (width!=-1&&(width!=nwidth||height!=nheight)&&mainw->preview_spinbutton!=NULL)
+    if (mainw->playing_file==-1) {
+      load_preview_image(FALSE);
+    }
 }
 
 
 
-void
-kill_play_window (void) {
+void kill_play_window (void) {
   // plug our player back into internal window
 
   if (mainw->play_window!=NULL) {
-    if (!mainw->pw_exp_is_blocked)
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-    if (mainw->preview_box!=NULL&&mainw->preview_box->parent!=NULL) {
+    if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
       // preview_box is refed, so it will survive
       gtk_container_remove (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
     }
@@ -4086,9 +4191,9 @@
   ///////////////////////////////////////////////////
   if (mainw->plug==NULL) {
     if (!mainw->foreign&&(!mainw->sep_win||prefs->sepwin_type==0)) {
-      mainw->plug = gtk_hbox_new (FALSE,0);
+      mainw->plug = lives_hbox_new (FALSE,0);
       gtk_container_add(GTK_CONTAINER(mainw->playarea),mainw->plug);
-      gtk_widget_modify_bg (mainw->plug, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color (mainw->plug, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       gtk_widget_show (mainw->plug);
       gtk_container_add (GTK_CONTAINER (mainw->plug), mainw->image274);
     }
@@ -4124,74 +4229,76 @@
 
   mainw->splash_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  if (prefs->gui_monitor!=0) {
-    gtk_window_set_screen(GTK_WINDOW(mainw->splash_window),mainw->mgeom[prefs->gui_monitor-1].screen);
-  }
-
-  gtk_window_set_position(GTK_WINDOW(mainw->splash_window),GTK_WIN_POS_CENTER_ALWAYS);
-
-  gtk_window_set_type_hint(GTK_WINDOW(mainw->splash_window),GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->splash_window, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  
-  vbox = gtk_vbox_new (FALSE, 10);
-  gtk_container_add (GTK_CONTAINER (mainw->splash_window), vbox);
-
-  splash_pix=gdk_pixbuf_new_from_file(tmp,&error);
-  g_free(tmp);
+  if (gtk_widget_get_direction(GTK_WIDGET(mainw->splash_window))==GTK_TEXT_DIR_LTR) 
+    widget_opts.default_justify=LIVES_JUSTIFY_LEFT;
+  else 
+    widget_opts.default_justify=LIVES_JUSTIFY_RIGHT;
 
-  splash_img = gtk_image_new_from_pixbuf (splash_pix);
+  if (prefs->show_splash) {
 
-  gtk_box_pack_start (GTK_BOX (vbox), splash_img, TRUE, TRUE, 0);
+    if (prefs->gui_monitor!=0) {
+      gtk_window_set_screen(GTK_WINDOW(mainw->splash_window),mainw->mgeom[prefs->gui_monitor-1].screen);
+    }
 
-  if (splash_pix!=NULL) gdk_pixbuf_unref(splash_pix);
+    gtk_window_set_position(GTK_WINDOW(mainw->splash_window),GTK_WIN_POS_CENTER_ALWAYS);
 
+    gtk_window_set_type_hint(GTK_WINDOW(mainw->splash_window),GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+  
+    if (palette->style&STYLE_1) {
+      lives_widget_set_bg_color(mainw->splash_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    }
 
-  mainw->splash_label=gtk_label_new("");
+  
+    vbox = lives_vbox_new (FALSE, widget_opts.packing_height);
+    gtk_container_add (GTK_CONTAINER (mainw->splash_window), vbox);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mainw->splash_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+    splash_pix=gdk_pixbuf_new_from_file(tmp,&error);
+    g_free(tmp);
 
-  gtk_box_pack_start (GTK_BOX (vbox), mainw->splash_label, TRUE, TRUE, 0);
+    splash_img = gtk_image_new_from_pixbuf (splash_pix);
 
-  mainw->splash_progress = gtk_progress_bar_new ();
-  gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(mainw->splash_progress),.01);
+    gtk_box_pack_start (GTK_BOX (vbox), splash_img, TRUE, TRUE, 0);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mainw->splash_progress, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+    if (splash_pix!=NULL) lives_object_unref(splash_pix);
 
-  hbox = gtk_hbox_new (FALSE, 10);
 
-  gtk_box_pack_start (GTK_BOX (hbox), mainw->splash_progress, TRUE, TRUE, 20);
-
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+    mainw->splash_label=lives_standard_label_new("");
 
+    gtk_box_pack_start (GTK_BOX (vbox), mainw->splash_label, TRUE, TRUE, 0);
 
+    mainw->splash_progress = gtk_progress_bar_new ();
+    gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(mainw->splash_progress),.01);
+    
+    if (palette->style&STYLE_1) {
+      lives_widget_set_fg_color(mainw->splash_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_fg_color(mainw->splash_progress, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    }
 
-  gtk_widget_show_all(mainw->splash_window);
+    hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
 
-  gtk_window_present(GTK_WINDOW(mainw->splash_window));
+    gtk_box_pack_start (GTK_BOX (hbox), mainw->splash_progress, TRUE, TRUE, widget_opts.packing_width*2);
 
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  while (g_main_context_iteration(NULL,FALSE));
+    gtk_widget_show_all(mainw->splash_window);
+    gtk_window_present(GTK_WINDOW(mainw->splash_window));
 
-  lives_set_cursor_style(LIVES_CURSOR_BUSY,GDK_WINDOW(mainw->splash_window->window));
+    lives_widget_context_update();
+    lives_set_cursor_style(LIVES_CURSOR_BUSY,mainw->splash_window);
+  }
+  else {
+    gtk_widget_destroy(mainw->splash_window);
+    mainw->splash_window=NULL;
+  }
 
   gtk_window_set_auto_startup_notification(TRUE);
 
-
-
 }
 
 
 
 
-void splash_msg(const gchar *msg, gdouble pct) {
+void splash_msg(const gchar *msg, double pct) {
 
   if (mainw->foreign||mainw->splash_window==NULL) return;
 
@@ -4201,7 +4308,7 @@
 
   gtk_widget_queue_draw(mainw->splash_window);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
 }
 
@@ -4222,7 +4329,8 @@
     mainw->splash_window=NULL;
   }
 
-  if (prefs->startup_interface==STARTUP_MT&&mainw->multitrack==NULL) on_multitrack_activate(NULL,NULL);
+  if (prefs->startup_interface==STARTUP_MT&&prefs->startup_phase==0&&mainw->multitrack==NULL) 
+    on_multitrack_activate(NULL,NULL);
 
 }

LiVES-1.6.1.tar.bz2/src/htmsocket.c -> LiVES-2.0.3.tar.bz2/src/htmsocket.c Changed

@@ -1,27 +1,29 @@
 // htmsocket.c
 // LiVES
-// (c) G. Finch 2008 - 2012  <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2008 - 2012  <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
 
 #include <stdio.h>
 #include <unistd.h>
-#include <netdb.h>
 #include <errno.h>
 
+#ifndef IS_MINGW
+#include <netdb.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#else
+#include <ws2tcpip.h>
+#endif
 
-#if defined(__sun)
+#if IS_SOLARIS
 #include <sys/filio.h>
 #endif
 
 #include "main.h"
 #include "support.h"
 
-#define UNIXDG_PATH "/tmp/lives"
-#define UNIXDG_TMP "/tmp/lives.XXXXXX"
 #include "htmsocket.h"                          
 
 typedef struct {
@@ -54,7 +56,6 @@
     hostsEntry = gethostbyname(host);
     
     if (hostsEntry == NULL) {
-      herror(NULL);
       return NULL;
     }
     
@@ -120,7 +121,7 @@
 static ssize_t getudp(struct sockaddr *sp, int sockfd, int length, size_t count, void  *b, int bfsize) {
   int flags=0;
   ssize_t res;
-  int len;
+  unsigned long len;
 
   if (bfsize>0) {
     int xbfsize;
@@ -130,7 +131,12 @@
     if (xbfsize<bfsize) return -2;
   }
 
+#ifdef IS_MINGW
+  ioctlsocket(sockfd,FIONREAD,&len);
+#else
   ioctl(sockfd,FIONREAD,&len);
+#endif
+
   if (len==0) return -1;
 
   do {

LiVES-1.6.1.tar.bz2/src/interface.c -> LiVES-2.0.3.tar.bz2/src/interface.c Changed

@@ -1,6 +1,6 @@
 // interface.c
 // LiVES
-// (c) G. Finch 2003 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2003 - 2013 <salsaman@gmail.com>
 // Released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -8,9 +8,6 @@
 // and don't forget gtk_box_pack_end (doh)
 // and just use label instead of labelnn, etc.
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -28,167 +25,75 @@
 extern void multitrack_preview_clicked  (GtkButton *, gpointer user_data);
 extern void mt_change_disp_tracks_ok (GtkButton *, gpointer user_data);
 
-static gulong arrow_id; // works around a known bug in gobject
-
 
 void add_suffix_check(GtkBox *box, const gchar *ext) {
+  gchar *ltext;
 
-  GtkWidget *hbox;
-  GtkWidget *checkbutton = gtk_check_button_new ();
-  GtkWidget *eventbox=gtk_event_box_new();
-  GtkWidget *label;
-  if (ext==NULL) label=gtk_label_new_with_mnemonic (_ ("Let LiVES set the _file extension"));
-  else {
-    gchar *txt=g_strdup_printf(_ ("Let LiVES set the _file extension (.%s)"),ext);
-    label=gtk_label_new_with_mnemonic (txt);
-    g_free(txt);
-  }
-
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
+  GtkWidget *checkbutton;
 
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    checkbutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
-  gtk_container_set_border_width (GTK_CONTAINER(hbox), 10);
-
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), mainw->fx1_bool);
+  if (ext==NULL) ltext=g_strdup (_ ("Let LiVES set the _file extension"));
+  else ltext=g_strdup_printf(_ ("Let LiVES set the _file extension (.%s)"),ext);
+  checkbutton=lives_standard_check_button_new(ltext,TRUE,box,NULL);
+  g_free(ltext);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->fx1_bool);
   g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			  G_CALLBACK (on_boolean_toggled),
 			  &mainw->fx1_bool);
   
 }
 
-static gboolean
-call_cancel                  (GtkWidget       *widget,
-			      GdkEvent        *event,
-		      	      gpointer         user_data)
-{
-  on_cancel_button1_clicked(NULL,user_data);
-  return FALSE;
-}
-
-
-
 
-GtkWidget*
-create_fileselection (const gchar *title, gint preview_type, gpointer free_on_cancel)
-{
-  // 1 - video and audio open
-  // preview type 2 is export audio
-  // preview_type 3 was save_file, no longer used (deprecated)
 
+static GtkWidget *add_deinterlace_checkbox(GtkBox *for_deint) {
+  GtkWidget *hbox=lives_hbox_new (FALSE, 0);
+  GtkWidget *checkbutton = lives_standard_check_button_new (_ ("Apply _Deinterlace"),TRUE,LIVES_BOX(hbox),NULL);
 
-  GtkWidget *fileselection;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-
-  gchar titles[256];
-  g_snprintf(titles,256,"LiVES: - %s",title);
-
-  fileselection = gtk_file_selection_new (titles);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(fileselection, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (fileselection), 10);
-  gtk_window_set_position (GTK_WINDOW (fileselection), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (fileselection), TRUE);
-
-  if (prefs->show_gui) {
-    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(fileselection),GTK_WINDOW(mainw->LiVES));
-    else gtk_window_set_transient_for(GTK_WINDOW(fileselection),GTK_WINDOW(mainw->multitrack->window));
-  }
-
-  if (prefs->gui_monitor!=0) {
-   gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-fileselection->allocation.width)/2;
-   gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-fileselection->allocation.height)/2;
-   gtk_window_move(GTK_WINDOW(fileselection),xcen,ycen);
-  }
-
-  if (prefs->fileselmax) {
-    gtk_window_maximize (GTK_WINDOW(fileselection));
+  if (LIVES_IS_HBOX(for_deint)) {
+    GtkWidget *filler;
+    gtk_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_width);
+    gtk_box_reorder_child(for_deint, hbox, 0);
+    filler=add_fill_to_box(LIVES_BOX(for_deint));
+    if (filler!=NULL) gtk_box_reorder_child(for_deint, filler, 1);
   }
+  else gtk_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  ok_button = GTK_FILE_SELECTION (fileselection)->ok_button;
-  GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT);
-
-  cancel_button = GTK_FILE_SELECTION (fileselection)->cancel_button;
-  GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT);
-
-  gtk_widget_grab_focus (fileselection);
-  
-  if (preview_type==1||preview_type==2) {
-    widget_add_preview(GTK_BOX (GTK_FILE_SELECTION(fileselection)->main_vbox),
-		       GTK_BOX (GTK_FILE_SELECTION (fileselection)->action_area),
-		       GTK_BOX(GTK_FILE_SELECTION(fileselection)->main_vbox),preview_type);
-
-    g_signal_connect (GTK_OBJECT (fileselection), "delete_event",
-                      G_CALLBACK (call_cancel),
-                      free_on_cancel);
-  }
+  lives_widget_set_can_focus_and_default (checkbutton);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->open_deint);
+  g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
+			  G_CALLBACK (on_boolean_toggled),
+			  &mainw->open_deint);
+  gtk_widget_set_tooltip_text( checkbutton,_("If this is set, frames will be deinterlaced as they are imported."));
 
-  g_signal_connect (cancel_button, "clicked",G_CALLBACK (on_cancel_button1_clicked),free_on_cancel);
+  gtk_widget_show_all(GTK_WIDGET(for_deint));
 
-  gtk_widget_show_all (fileselection);
-  return fileselection;
+  return hbox;
 }
 
 
+static void pv_sel_changed(GtkFileChooser *chooser, gpointer user_data) {
+  GSList *slist=gtk_file_chooser_get_filenames (chooser);
+  GtkWidget *pbutton=(GtkWidget *)user_data;
 
-static GtkWidget *add_deinterlace_checkbox(GtkBox *for_deint) {
-  GtkWidget *hbox=gtk_hbox_new (FALSE, 0);
-  GtkWidget *checkbutton = gtk_check_button_new ();
-  GtkWidget *eventbox=gtk_event_box_new();
-  GtkWidget *label=gtk_label_new_with_mnemonic (_ ("Apply Deinterlace"));
-
-  mainw->open_deint=FALSE;
-
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    checkbutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  if (slist==NULL||slist->data==NULL||g_slist_length(slist)>1||!(g_file_test((gchar *)slist->data,G_FILE_TEST_IS_REGULAR))) {
+    gtk_widget_set_sensitive(pbutton,FALSE);
   }
+  else gtk_widget_set_sensitive(pbutton,TRUE);
   
-  gtk_box_pack_start (for_deint, hbox, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), mainw->open_deint);
-  g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
-			  G_CALLBACK (on_boolean_toggled),
-			  &mainw->open_deint);
-  gtk_widget_set_tooltip_text( checkbutton,_("If this is set, frames will be deinterlaced as they are imported."));
+  if (slist!=NULL) {
+    g_list_free_strings((GList *)slist);
+    g_slist_free(slist);
+  }
+}
 
-  gtk_widget_show_all(hbox);
 
-  return hbox;
-}
 
 
 
-void widget_add_preview(GtkBox *for_preview, GtkBox *for_button, GtkBox *for_deint, gint preview_type) {
+void widget_add_preview(GtkWidget *widget, LiVESBox *for_preview, LiVESBox *for_button, LiVESBox *for_deint, int preview_type) {
   // preview type 1 - video and audio, fileselector
   // preview type 2 - audio only, fileselector
   // preview type 3 - range preview
 
-
   GtkWidget *preview_button=NULL;
   GtkWidget *fs_label;
 
@@ -201,26 +106,23 @@
     gtk_widget_show (mainw->fs_playframe);
     gtk_widget_show (mainw->fs_playalign);
 
-    gtk_container_set_border_width (GTK_CONTAINER(mainw->fs_playframe), 10);
+    gtk_container_set_border_width (GTK_CONTAINER(mainw->fs_playframe), widget_opts.border_width);
 
-    fs_label = gtk_label_new (_ ("Preview"));
+    widget_opts.justify=LIVES_JUSTIFY_RIGHT;
+    fs_label = lives_standard_label_new (_ ("Preview"));
+    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
     gtk_widget_show (fs_label);
     gtk_frame_set_label_widget (GTK_FRAME (mainw->fs_playframe), fs_label);
-    gtk_label_set_justify (GTK_LABEL (fs_label), GTK_JUSTIFY_RIGHT);
 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(fs_label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    
     gtk_box_pack_start (for_preview, mainw->fs_playframe, FALSE, FALSE, 0);
     gtk_widget_set_size_request (mainw->fs_playarea, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
 
     gtk_container_add (GTK_CONTAINER (mainw->fs_playframe), mainw->fs_playalign);
     gtk_container_add (GTK_CONTAINER (mainw->fs_playalign), mainw->fs_playarea);
 
-    gtk_widget_modify_bg (mainw->fs_playarea, GTK_STATE_NORMAL, &palette->black);
-    gtk_widget_modify_bg (mainw->fs_playframe, GTK_STATE_NORMAL, &palette->black);
-    gtk_widget_modify_bg (mainw->fs_playalign, GTK_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color (mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color (mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color (mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
 
     gtk_widget_show(mainw->fs_playarea);
    }
@@ -234,194 +136,119 @@
   else if (preview_type==3) {
     preview_button = gtk_button_new_with_mnemonic (_ ("Click here to _Preview the video"));
   }
-  gtk_widget_show (preview_button);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(preview_button, GTK_STATE_NORMAL, &palette->menu_and_bars);
-  }
+  gtk_widget_show (preview_button);
 
-  gtk_box_pack_start (for_button, preview_button, TRUE, TRUE, 0);
 
+  gtk_box_pack_start (for_button, preview_button, FALSE, FALSE, widget_opts.packing_width);
 
   if (preview_type==1||preview_type==3) {
     add_deinterlace_checkbox(for_deint);
   }
 
+
   g_signal_connect (GTK_OBJECT (preview_button), "clicked",
 		    G_CALLBACK (on_fs_preview_clicked),
 		    GINT_TO_POINTER (preview_type));
 
-}
-
-
-
-static gboolean procdets_pressed (GtkWidget *ahbox, GdkEventButton *event, gpointer user_data) {
-  GtkWidget *arrow=(GtkWidget *)user_data;
-  gboolean expanded=!(g_object_get_data(G_OBJECT(arrow),"expanded"));
-  GtkWidget *hbox=gtk_widget_get_parent(GTK_WIDGET(arrow));
-
-  gtk_widget_destroy(arrow);
-
-  // remove this signal because its user_data is invalid
-  if (g_signal_handler_is_connected (ahbox, arrow_id)) {
-    g_signal_handler_disconnect (ahbox, arrow_id);
-  }
-
-  arrow = gtk_arrow_new (expanded?GTK_ARROW_DOWN:GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(arrow, GTK_STATE_NORMAL, &palette->normal_fore);
+  if (GTK_IS_FILE_CHOOSER(widget)) {
+    gtk_widget_set_sensitive(preview_button,FALSE);
+    
+    g_signal_connect (GTK_OBJECT (widget), "selection_changed",
+		      G_CALLBACK (pv_sel_changed),
+		      (gpointer)preview_button);
   }
 
-  arrow_id=g_signal_connect (GTK_OBJECT (ahbox), "button_press_event",
-			     G_CALLBACK (procdets_pressed),
-			     arrow);
-
-  gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 10);
-  gtk_widget_show(arrow);
-
-  g_object_set_data(G_OBJECT(arrow),"expanded",GINT_TO_POINTER(expanded));
-
-  if (expanded) gtk_widget_show(cfile->proc_ptr->scrolledwindow);
-  else gtk_widget_hide(cfile->proc_ptr->scrolledwindow);
-
-  return FALSE;
 }
 
 
-
 xprocess * create_processing (const gchar *text) {
 
-  GtkWidget *dialog_vbox1;
+  GtkWidget *dialog_vbox;
   GtkWidget *vbox2;
   GtkWidget *vbox3;
-  GtkWidget *dialog_action_area1;
-  xprocess *procw=(xprocess*)(g_malloc(sizeof(xprocess)));
-  gchar tmp_label[256];
-
-  GtkWidget *hbox;
-  GtkWidget *ahbox;
-  GtkWidget *label;
+  GtkWidget *dialog_action_area;
   GtkWidget *details_arrow;
 
-  procw->processing = gtk_dialog_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (procw->processing), 10);
-  gtk_window_add_accel_group (GTK_WINDOW (procw->processing), mainw->accel_group);
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
-  gtk_window_set_resizable (GTK_WINDOW (procw->processing), FALSE);
+  xprocess *procw=(xprocess*)(g_malloc(sizeof(xprocess)));
 
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(procw->processing, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_window_set_title (GTK_WINDOW (procw->processing), _("LiVES: - Processing..."));
-  if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->LiVES));
-  else gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->multitrack->window));
-  gtk_window_set_position (GTK_WINDOW (procw->processing), GTK_WIN_POS_CENTER_ALWAYS);
+  gchar tmp_label[256];
 
-  dialog_vbox1 = lives_dialog_get_content_area(GTK_DIALOG(procw->processing));
-  gtk_widget_show (dialog_vbox1);
+  widget_opts.non_modal=TRUE;
+  procw->processing = lives_standard_dialog_new (_("LiVES: - Processing..."),FALSE);
+  widget_opts.non_modal=FALSE;
 
+  gtk_window_add_accel_group (GTK_WINDOW (procw->processing), accel_group);
 
-  gtk_dialog_set_has_separator(GTK_DIALOG(procw->processing),FALSE);
+  if (prefs->show_gui) {
+    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->LiVES));
+    else gtk_window_set_transient_for(GTK_WINDOW(procw->processing),GTK_WINDOW(mainw->multitrack->window));
+  }
+
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(procw->processing));
+  gtk_widget_show (dialog_vbox);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = lives_vbox_new (FALSE, 0);
   gtk_widget_show (vbox2);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox2, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox2, TRUE, TRUE, 0);
 
-  vbox3 = gtk_vbox_new (FALSE, 0);
+  vbox3 = lives_vbox_new (FALSE, 0);
   gtk_widget_show (vbox3);
   gtk_box_pack_start (GTK_BOX (vbox2), vbox3, TRUE, TRUE, 0);
 
   g_snprintf(tmp_label,256,"%s...\n",text);
-  procw->label = gtk_label_new (tmp_label);
+  procw->label = lives_standard_label_new (tmp_label);
   gtk_widget_show (procw->label);
 
-  //gtk_widget_set_size_request (procw->label, PROG_LABEL_WIDTH, -1);
-
   gtk_box_pack_start (GTK_BOX (vbox3), procw->label, TRUE, TRUE, 0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(procw->label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_justify (GTK_LABEL (procw->label), GTK_JUSTIFY_LEFT);
 
   procw->progressbar = gtk_progress_bar_new ();
   gtk_widget_show (procw->progressbar);
   gtk_box_pack_start (GTK_BOX (vbox3), procw->progressbar, FALSE, FALSE, 0);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(procw->progressbar, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(procw->progressbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
   if (mainw->internal_messaging&&mainw->rte!=0) {
-    procw->label2 = gtk_label_new (_("\n\nPlease Wait\n\nRemember to switch off effects (ctrl-0) afterwards !"));
+    procw->label2 = lives_standard_label_new (_("\n\nPlease Wait\n\nRemember to switch off effects (ctrl-0) afterwards !"));
   }
 #ifdef RT_AUDIO
   else if (mainw->jackd_read!=NULL||mainw->pulsed_read!=NULL) procw->label2 = gtk_label_new ("");
 #endif
-  else procw->label2=gtk_label_new (_("\nPlease Wait"));
+  else procw->label2=lives_standard_label_new (_("\nPlease Wait"));
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
   gtk_widget_show (procw->label2);
-  //gtk_widget_set_size_request (procw->label2, PROG_LABEL_WIDTH, -1);
 
   gtk_box_pack_start (GTK_BOX (vbox3), procw->label2, FALSE, FALSE, 0);
 
-  gtk_label_set_justify (GTK_LABEL (procw->label2), GTK_JUSTIFY_CENTER);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(procw->label2, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  procw->label3 = gtk_label_new (PROCW_STRETCHER);
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  procw->label3 = lives_standard_label_new (PROCW_STRETCHER);
   gtk_widget_show (procw->label3);
   gtk_box_pack_start (GTK_BOX (vbox3), procw->label3, FALSE, FALSE, 0);
-  //gtk_widget_set_size_request (procw->label3, PROG_LABEL_WIDTH, -1);
-
-  gtk_label_set_justify (GTK_LABEL (procw->label3), GTK_JUSTIFY_CENTER);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(procw->label3, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
   if (mainw->iochan!=NULL) {
     // add "show details" arrow
+    boolean woat=widget_opts.apply_theme;
+    widget_opts.apply_theme=FALSE;
+    procw->scrolledwindow = lives_standard_scrolled_window_new (ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V, LIVES_WIDGET(mainw->optextview));
+    widget_opts.apply_theme=woat;
 
-    ahbox=gtk_event_box_new();
-    gtk_box_pack_start (GTK_BOX (vbox3), ahbox, FALSE, FALSE, 10);
-
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (ahbox), hbox);
+    details_arrow=lives_standard_expander_new(_("Show Details"),FALSE,LIVES_BOX(vbox3),procw->scrolledwindow);
 
-    label=gtk_label_new("");
-    gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 10);
+    gtk_widget_show_all(details_arrow);
 
-    details_arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
-
-    arrow_id=g_signal_connect (GTK_OBJECT (ahbox), "button_press_event",
-			       G_CALLBACK (procdets_pressed),
-			       details_arrow);
-
-    g_object_set_data(G_OBJECT(details_arrow),"expanded",GINT_TO_POINTER(FALSE));
-
-    label=gtk_label_new (_ ("Show details"));
-    gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, FALSE, 10);
-    gtk_box_pack_end (GTK_BOX (hbox), details_arrow, TRUE, FALSE, 10);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(details_arrow, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg(ahbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-    gtk_widget_show_all(ahbox);
-
-    procw->scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-    gtk_widget_set_size_request (procw->scrolledwindow, ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V);
-    gtk_box_pack_start (GTK_BOX (vbox3), procw->scrolledwindow, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (procw->scrolledwindow), (GtkWidget *)mainw->optextview);
   }
 
 
-  dialog_action_area1 = GTK_DIALOG (procw->processing)->action_area;
-  gtk_widget_show (dialog_action_area1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
+  gtk_widget_show_all(vbox3);
+
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (procw->processing));
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   procw->stop_button = gtk_button_new_with_mnemonic (_ ("_Enough"));
   procw->preview_button = gtk_button_new_with_mnemonic (_ ("_Preview"));
@@ -431,11 +258,11 @@
 
   gtk_dialog_add_action_widget (GTK_DIALOG (procw->processing), procw->preview_button, 1);
   gtk_widget_hide(procw->preview_button);
-  GTK_WIDGET_SET_FLAGS (procw->preview_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (procw->preview_button);
     
   gtk_dialog_add_action_widget (GTK_DIALOG (procw->processing), procw->pause_button, 0);
   gtk_widget_hide(procw->pause_button);
-  GTK_WIDGET_SET_FLAGS (procw->pause_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (procw->pause_button);
 
 
   if (mainw->current_file>-1) {
@@ -450,16 +277,16 @@
       // the "enough" button for opening
       gtk_dialog_add_action_widget (GTK_DIALOG (procw->processing), procw->stop_button, 0);
       gtk_widget_show(procw->stop_button);
-      GTK_WIDGET_SET_FLAGS (procw->stop_button, GTK_CAN_DEFAULT);
+      lives_widget_set_can_focus_and_default (procw->stop_button);
     }
   }
   
   procw->cancel_button = gtk_button_new_with_mnemonic (_ ("_Cancel"));
   gtk_dialog_add_action_widget (GTK_DIALOG (procw->processing), procw->cancel_button, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (procw->cancel_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (procw->cancel_button);
 
-  gtk_widget_add_accelerator (procw->cancel_button, "activate", mainw->accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+  gtk_widget_add_accelerator (procw->cancel_button, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   g_signal_connect (GTK_OBJECT (procw->stop_button), "clicked",
 		    G_CALLBACK (on_stop_clicked),
@@ -484,19 +311,20 @@
                       G_CALLBACK (on_cancel_keep_button_clicked),
                       NULL);
 
-  g_signal_connect (GTK_OBJECT (procw->processing), "delete_event",
-                      G_CALLBACK (return_true),
-                      NULL);
-
 
   return procw;
 }
 
 
+#define TB_WIDTH 200
+#define TB_HEIGHT_VID 80
+#define TB_HEIGHT_A 50
+
+lives_clipinfo_t *create_clip_info_window (int audio_channels, boolean is_mt) {
+  // TODO : rewrite this horrible code
 
-fileinfo*
-create_info_window (gint audio_channels, gboolean is_mt) {
-  GtkWidget *vbox5;
+  GtkWidget *dialog_vbox;
+  GtkWidget *dialog_action_area;
   GtkWidget *frame4;
   GtkWidget *fixed3;
   GtkWidget *fixed5;
@@ -516,332 +344,270 @@
   GtkWidget *left;
   GtkWidget *frame6;
   GtkWidget *right;
-  GtkWidget *button8;
+  GtkWidget *okbutton;
 
   GtkAccelGroup *accel_group;
 
-  fileinfo *filew=(fileinfo*)(g_malloc(sizeof(fileinfo)));
+  lives_clipinfo_t *filew=(lives_clipinfo_t *)(g_malloc(sizeof(lives_clipinfo_t)));
 
-  filew->info_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_position (GTK_WINDOW (filew->info_window), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (filew->info_window), TRUE);
+  gchar *title;
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(filew->info_window, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  if (mainw->multitrack==NULL)
+    title=g_strdup_printf(_("LiVES: - %s"),cfile->name);
+  else 
+    title=g_strdup(_("LiVES: - Multitrack details"));
+
+  filew->dialog = lives_standard_dialog_new(title,FALSE);
+  g_free(title);
 
-  vbox5 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox5);
-  gtk_container_add (GTK_CONTAINER (filew->info_window), vbox5);
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (filew->dialog), accel_group);
 
   if (prefs->show_gui) {
-    if (mainw->fs&&mainw->sep_win&&mainw->playing_file>-1) {
-      gtk_window_set_transient_for(GTK_WINDOW(filew->info_window),GTK_WINDOW(mainw->play_window));
-    }
-    else {
-      gtk_window_set_transient_for(GTK_WINDOW(filew->info_window),GTK_WINDOW(mainw->LiVES));
-    }
+    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(filew->dialog),GTK_WINDOW(mainw->LiVES));
+    else gtk_window_set_transient_for(GTK_WINDOW(filew->dialog),GTK_WINDOW(mainw->multitrack->window));
   }
 
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(filew->dialog));
+
   if (cfile->frames>0||is_mt) {
     frame4 = gtk_frame_new (NULL);
     gtk_widget_set_size_request (frame4, 800, 340);
-    gtk_widget_show (frame4);
-    gtk_box_pack_start (GTK_BOX (vbox5), frame4, TRUE, TRUE, 0);
+
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), frame4, TRUE, TRUE, 0);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(frame4, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(frame4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
     fixed3 = gtk_fixed_new ();
-    gtk_widget_show (fixed3);
     gtk_container_add (GTK_CONTAINER (frame4), fixed3);
     
     filew->textview24 = gtk_text_view_new ();
-    gtk_widget_show (filew->textview24);
-    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview24, 180, 48);
-    gtk_widget_set_size_request (filew->textview24, 180, 80);
+
+    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview24, TB_WIDTH, 48);
+    gtk_widget_set_size_request (filew->textview24, TB_WIDTH, TB_HEIGHT_VID);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview24), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview24), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview24), FALSE);
     
     filew->textview25 = gtk_text_view_new ();
-    gtk_widget_show (filew->textview25);
-    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview25, 580, 48);
-    gtk_widget_set_size_request (filew->textview25, 180, 80);
+
+    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview25, TB_WIDTH+400, 48);
+    gtk_widget_set_size_request (filew->textview25, TB_WIDTH, TB_HEIGHT_VID);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview25), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview25), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview25), FALSE);
     
     filew->textview26 = gtk_text_view_new ();
-    gtk_widget_show (filew->textview26);
-    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview26, 180, 136);
-    gtk_widget_set_size_request (filew->textview26, 180, 80);
+
+    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview26, TB_WIDTH, 136);
+    gtk_widget_set_size_request (filew->textview26, TB_WIDTH, TB_HEIGHT_VID);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview26), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview26), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview26), FALSE);
     
     filew->textview27 = gtk_text_view_new ();
-    gtk_widget_show (filew->textview27);
-    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview27, 580, 136);
-    gtk_widget_set_size_request (filew->textview27, 180, 80);
+
+    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview27, TB_WIDTH+400, 136);
+    gtk_widget_set_size_request (filew->textview27, TB_WIDTH, TB_HEIGHT_VID);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview27), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview27), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview27), FALSE);
     
     filew->textview28 = gtk_text_view_new ();
-    gtk_widget_show (filew->textview28);
-    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview28, 580, 224);
-    gtk_widget_set_size_request (filew->textview28, 180, 80);
+
+    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview28, TB_WIDTH+400, 224);
+    gtk_widget_set_size_request (filew->textview28, TB_WIDTH, TB_HEIGHT_VID);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview28), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview28), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview28), FALSE);
     
     filew->textview29 = gtk_text_view_new ();
-    gtk_widget_show (filew->textview29);
-    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview29, 180, 224);
-    gtk_widget_set_size_request (filew->textview29, 180, 80);
+
+    gtk_fixed_put (GTK_FIXED (fixed3), filew->textview29, TB_WIDTH, 224);
+    gtk_widget_set_size_request (filew->textview29, TB_WIDTH, TB_HEIGHT_VID);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview29), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview29), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview29), FALSE);
     
-    label45 = gtk_label_new (_("Format"));
-    gtk_widget_show (label45);
+    label45 = lives_standard_label_new (_("Format"));
+
     gtk_fixed_put (GTK_FIXED (fixed3), label45, 44, 64);
     gtk_widget_set_size_request (label45, 125, 20);
-    gtk_label_set_justify (GTK_LABEL (label45), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label45, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    label46 = gtk_label_new (_("Frame size"));
-    gtk_widget_show (label46);
+    label46 = lives_standard_label_new (_("Frame size"));
+
     gtk_fixed_put (GTK_FIXED (fixed3), label46, 18, 152);
     gtk_widget_set_size_request (label46, 145, 20);
-    gtk_label_set_justify (GTK_LABEL (label46), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label46, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    if (!is_mt) label47 = gtk_label_new (_("File size"));
-    else label47 = gtk_label_new (_("Byte size"));
-    gtk_widget_show (label47);
+    if (!is_mt) label47 = lives_standard_label_new (_("File size"));
+    else label47 = lives_standard_label_new (_("Byte size"));
+
     gtk_fixed_put (GTK_FIXED (fixed3), label47, 18, 240);
     gtk_widget_set_size_request (label47, 145, 20);
-    gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label47, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    label48 = gtk_label_new (_("Total time"));
-    gtk_widget_show (label48);
+    label48 = lives_standard_label_new (_("Total time"));
+
     gtk_fixed_put (GTK_FIXED (fixed3), label48, 450, 240);
     gtk_widget_set_size_request (label48, 145, 20);
-    gtk_label_set_justify (GTK_LABEL (label48), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label48, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    label44 = gtk_label_new (_("FPS"));
-    gtk_widget_show (label44);
+    label44 = lives_standard_label_new (_("FPS"));
+
     gtk_fixed_put (GTK_FIXED (fixed3), label44, 476, 64);
     gtk_widget_set_size_request (label44, 120, 20);
-    gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label44, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    if (!is_mt) label43 = gtk_label_new (_("Frames"));
-    else label43 = gtk_label_new (_("Events"));
-    gtk_widget_show (label43);
+    if (!is_mt) label43 = lives_standard_label_new (_("Frames"));
+    else label43 = lives_standard_label_new (_("Events"));
+
     gtk_fixed_put (GTK_FIXED (fixed3), label43, 476, 152);
     gtk_widget_set_size_request (label43, 125, 20);
-    gtk_label_set_justify (GTK_LABEL (label43), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label43, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    label40 = gtk_label_new (_("Video"));
-    gtk_widget_show (label40);
+    label40 = lives_standard_label_new (_("Video"));
+
     gtk_frame_set_label_widget (GTK_FRAME (frame4), label40);
-    gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label40, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
   }
 
   if (audio_channels>0) {
     frame5 = gtk_frame_new (NULL);
     gtk_widget_set_size_request (frame5, 700, 140);
-    gtk_widget_show (frame5);
-    gtk_box_pack_start (GTK_BOX (vbox5), frame5, TRUE, TRUE, 0);
+
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), frame5, TRUE, TRUE, 0);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(frame5, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(frame5, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
     if (audio_channels>1) {
-      left = gtk_label_new (_("Left Audio"));
+      left = lives_standard_label_new (_("Left Audio"));
     }
     else {
-      left = gtk_label_new (_("Audio"));
+      left = lives_standard_label_new (_("Audio"));
     }
 
-    gtk_widget_show (left);
     gtk_frame_set_label_widget (GTK_FRAME (frame5), left);
-    gtk_label_set_justify (GTK_LABEL (left), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(left, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
     fixed5 = gtk_fixed_new ();
-    gtk_widget_show (fixed5);
+
     gtk_container_add (GTK_CONTAINER (frame5), fixed5);
 
     if (!is_mt) {
       filew->textview_ltime = gtk_text_view_new ();
-      gtk_widget_show (filew->textview_ltime);
-      gtk_fixed_put (GTK_FIXED (fixed5), filew->textview_ltime, 580, 16);
-      gtk_widget_set_size_request (filew->textview_ltime, 180, 50);
+
+      gtk_fixed_put (GTK_FIXED (fixed5), filew->textview_ltime, TB_WIDTH+400, 16);
+      gtk_widget_set_size_request (filew->textview_ltime, TB_WIDTH, TB_HEIGHT_A);
       gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview_ltime), FALSE);
       gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview_ltime), GTK_JUSTIFY_CENTER);
       gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview_ltime), FALSE);
       
-      label50 = gtk_label_new (_("Total time"));
-      gtk_widget_show (label50);
+      label50 = lives_standard_label_new (_("Total time"));
+
       gtk_fixed_put (GTK_FIXED (fixed5), label50, 450, 32);
       gtk_widget_set_size_request (label50, 145, 16);
-      gtk_label_set_justify (GTK_LABEL (label50), GTK_JUSTIFY_LEFT);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label50, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
     }
 
     filew->textview_lrate = gtk_text_view_new ();
-    gtk_widget_show (filew->textview_lrate);
-    gtk_fixed_put (GTK_FIXED (fixed5), filew->textview_lrate, 180, 16);
-    gtk_widget_set_size_request (filew->textview_lrate, 180, 50);
+
+    gtk_fixed_put (GTK_FIXED (fixed5), filew->textview_lrate, TB_WIDTH, 16);
+    gtk_widget_set_size_request (filew->textview_lrate, TB_WIDTH, TB_HEIGHT_A);
     gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview_lrate), FALSE);
     gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview_lrate), GTK_JUSTIFY_CENTER);
     gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview_lrate), FALSE);
     
-    label52 = gtk_label_new (_("Rate/size"));
-    gtk_widget_show (label52);
+    label52 = lives_standard_label_new (_("Rate/size"));
+
     gtk_fixed_put (GTK_FIXED (fixed5), label52, 30, 32);
     gtk_widget_set_size_request (label52, 130, 16);
-    gtk_label_set_justify (GTK_LABEL (label52), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label52, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
 
     if (audio_channels>1) {
       frame6 = gtk_frame_new (NULL);
       gtk_widget_set_size_request (frame6, 600, 100);
-      gtk_widget_show (frame6);
-      gtk_box_pack_start (GTK_BOX (vbox5), frame6, TRUE, TRUE, 0);
+
+      gtk_box_pack_start (GTK_BOX (dialog_vbox), frame6, TRUE, TRUE, 0);
       if (palette->style&STYLE_1) {
-	gtk_widget_modify_bg(frame6, GTK_STATE_NORMAL, &palette->normal_back);
+	lives_widget_set_bg_color(frame6, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       }
 
       fixed6 = gtk_fixed_new ();
-      gtk_widget_show (fixed6);
+
       gtk_container_add (GTK_CONTAINER (frame6), fixed6);
       
       if (!is_mt) {
 	filew->textview_rtime = gtk_text_view_new ();
-	gtk_widget_show (filew->textview_rtime);
-	gtk_fixed_put (GTK_FIXED (fixed6), filew->textview_rtime, 580, 16);
-	gtk_widget_set_size_request (filew->textview_rtime, 180, 50);
+
+	gtk_fixed_put (GTK_FIXED (fixed6), filew->textview_rtime, TB_WIDTH+400, 16);
+	gtk_widget_set_size_request (filew->textview_rtime, TB_WIDTH, TB_HEIGHT_A);
 	gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview_rtime), FALSE);
 	gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview_rtime), GTK_JUSTIFY_CENTER);
 	gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview_rtime), FALSE);
 	
-	label51 = gtk_label_new (_("Total time"));
-	gtk_widget_show (label51);
+	label51 = lives_standard_label_new (_("Total time"));
+
 	gtk_fixed_put (GTK_FIXED (fixed6), label51, 450, 32);
 	gtk_widget_set_size_request (label51, 145, 16);
-	gtk_label_set_justify (GTK_LABEL (label51), GTK_JUSTIFY_LEFT);
-	if (palette->style&STYLE_1) {
-	  gtk_widget_modify_fg(label51, GTK_STATE_NORMAL, &palette->normal_fore);
-	}
       }
 
       filew->textview_rrate = gtk_text_view_new ();
-      gtk_widget_show (filew->textview_rrate);
-      gtk_fixed_put (GTK_FIXED (fixed6), filew->textview_rrate, 180, 16);
-      gtk_widget_set_size_request (filew->textview_rrate, 180, 50);
+
+      gtk_fixed_put (GTK_FIXED (fixed6), filew->textview_rrate, TB_WIDTH, 16);
+      gtk_widget_set_size_request (filew->textview_rrate, TB_WIDTH, TB_HEIGHT_A);
       gtk_text_view_set_editable (GTK_TEXT_VIEW (filew->textview_rrate), FALSE);
       gtk_text_view_set_justification (GTK_TEXT_VIEW (filew->textview_rrate), GTK_JUSTIFY_CENTER);
       gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (filew->textview_rrate), FALSE);
       
-      label53 = gtk_label_new (_("Rate/size"));
-      gtk_widget_show (label53);
+      label53 = lives_standard_label_new (_("Rate/size"));
+
       gtk_fixed_put (GTK_FIXED (fixed6), label53, 30, 32);
       gtk_widget_set_size_request (label53, 130, 16);
-      gtk_label_set_justify (GTK_LABEL (label53), GTK_JUSTIFY_LEFT);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label53, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
       
-      right = gtk_label_new (_("Right audio"));
-      gtk_widget_show (right);
+      right = lives_standard_label_new (_("Right audio"));
+
       gtk_frame_set_label_widget (GTK_FRAME (frame6), right);
-      gtk_label_set_justify (GTK_LABEL (right), GTK_JUSTIFY_LEFT);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(right, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
     }
   }
 
-  button8 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (button8);
-  gtk_box_pack_end (GTK_BOX (vbox5), button8, FALSE, FALSE, 0);
-  gtk_widget_set_size_request (button8, -1, 78);
-  gtk_container_set_border_width (GTK_CONTAINER (button8), 12);
-  gtk_button_set_relief (GTK_BUTTON (button8), GTK_RELIEF_NONE);
-  GTK_WIDGET_SET_FLAGS (button8, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default (button8);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (filew->dialog));
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_SPREAD);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(button8, (GtkStateType)(GTK_STATE_SELECTED|GTK_STATE_ACTIVE), &palette->white);
-  }
+  okbutton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_dialog_add_action_widget (GTK_DIALOG (filew->dialog), okbutton, GTK_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default (okbutton);
+  gtk_widget_grab_default (okbutton);
 
-  g_signal_connect (GTK_OBJECT (button8), "clicked",
-                      G_CALLBACK (on_cancel_button1_clicked),
-                      filew);
+  gtk_widget_set_size_request(okbutton,DEF_BUTTON_WIDTH*4,-1);
 
-  g_signal_connect (GTK_OBJECT (filew->info_window), "delete_event",
-                      G_CALLBACK (on_cancel_button1_clicked_del),
+  g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+                      G_CALLBACK (lives_general_button_clicked),
                       filew);
 
   accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
-  gtk_window_add_accel_group (GTK_WINDOW (filew->info_window), accel_group);
+  gtk_window_add_accel_group (GTK_WINDOW (filew->dialog), accel_group);
+
+  gtk_widget_add_accelerator (okbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
-  gtk_widget_add_accelerator (button8, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
+  gtk_widget_show_all(filew->dialog);
 
   return filew;
 }
 
+
 static void on_resizecb_toggled (GtkToggleButton *t, gpointer user_data) {
   GtkWidget *cb=(GtkWidget *)user_data;
 
-  if (!gtk_toggle_button_get_active(t)) {
+  if (!lives_toggle_button_get_active(t)) {
     gtk_widget_set_sensitive(cb,FALSE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb),FALSE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cb),FALSE);
   }
   else {
     gtk_widget_set_sensitive(cb,TRUE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cb),prefs->enc_letterbox);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cb),prefs->enc_letterbox);
   }
 }
 
 
 
 
-GtkWidget*
-create_encoder_prep_dialog (const gchar *text1, const gchar *text2, gboolean opt_resize)
-{
+GtkWidget* create_encoder_prep_dialog (const gchar *text1, const gchar *text2, boolean opt_resize) {
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
   GtkWidget *dialog_action_area;
@@ -851,55 +617,32 @@
   GtkWidget *checkbutton2;
   GtkWidget *label;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
 
-  dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Encoding options"));
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  gchar *labeltext,*tmp,*tmp2;
+
+  dialog = lives_standard_dialog_new (_("LiVES: - Encoding options"),FALSE);
 
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
 
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 450, 300);
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
 
-  label = gtk_label_new (text1);
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  label = lives_standard_label_new (text1);
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
   gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 0);
 
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-  gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
   if (opt_resize) {      
-    checkbutton = gtk_check_button_new ();
-    if (text2!=NULL) label=gtk_label_new_with_mnemonic (_ ("<------------- (Check the box to re_size as suggested)"));
-    else label=gtk_label_new_with_mnemonic (_ ("<------------- (Check the box to use the _size recommendation)"));
-    eventbox=gtk_event_box_new();
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
+    if (text2!=NULL) labeltext=g_strdup (_("<------------- (Check the box to re_size as suggested)"));
+    else labeltext=g_strdup (_("<------------- (Check the box to use the _size recommendation)"));
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    gtk_widget_show_all (hbox);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
+
+    checkbutton = lives_standard_check_button_new (labeltext,TRUE,LIVES_BOX(hbox),NULL);
+
+    g_free(labeltext);
     
     g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			    G_CALLBACK (on_boolean_toggled),
@@ -908,67 +651,43 @@
   }
   else if (text2==NULL) mainw->fx1_bool=TRUE;
 
-
-
   if (text2!=NULL&&(mainw->fx1_bool||opt_resize)) {
-    checkbutton2 = gtk_check_button_new ();
 
-    gtk_widget_set_tooltip_text( checkbutton2, _("Draw black rectangles either above or to the sides of the image, to prevent it from stretching."));
-    eventbox=gtk_event_box_new();
-    gtk_tooltips_copy(eventbox,checkbutton2);
-    label=gtk_label_new_with_mnemonic (_("Use _letterboxing to maintain aspect ratio (optional)"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton2);
-    
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton2);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+    hbox = lives_hbox_new (FALSE, 0);
+    if (capable->has_composite&&capable->has_convert) {
+      // only offer this if we have "composite" and "convert" - for now... TODO ****
+      gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     }
 
+    checkbutton2 = lives_standard_check_button_new 
+      ((tmp=g_strdup(_("Use _letterboxing to maintain aspect ratio (optional)"))),TRUE,LIVES_BOX(hbox),
+       (tmp2=g_strdup(_("Draw black rectangles either above or to the sides of the image, to prevent it from stretching."))));
+
+    g_free(tmp); g_free(tmp2);
+
     if (opt_resize) {
       gtk_widget_set_sensitive(checkbutton2,FALSE);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton2),FALSE);
-    }
-    else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton2),prefs->enc_letterbox);
-
-    hbox = gtk_hbox_new (FALSE, 0);
-    if (capable->has_composite&&capable->has_convert) {
-      // only offer this if we have "composite" and "convert" - for now... TODO ****
-      gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton2),FALSE);
     }
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton2, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    gtk_widget_show_all (hbox);
+    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton2),prefs->enc_letterbox);
     
     g_signal_connect_after (GTK_OBJECT (checkbutton2), "toggled",
 			    G_CALLBACK (on_boolean_toggled),
 			    &prefs->enc_letterbox);
 
-
     if (opt_resize) 
       g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			      G_CALLBACK (on_resizecb_toggled),
 			      checkbutton2);
 
-
   }
 
-
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   if (text2!=NULL) {
-    label = gtk_label_new (text2);
+    label = lives_standard_label_new (text2);
     gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-    gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
     cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
     okbutton = gtk_button_new_from_stock ("gtk-ok");
   }
@@ -978,11 +697,11 @@
   }
 
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (cancelbutton);
 
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
 
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
 
   gtk_widget_show_all (dialog);
@@ -991,114 +710,114 @@
 
 
 // Information/error dialog
-GtkWidget*
-create_dialog3 (const gchar *text, gboolean is_blocking, gint mask) {
-  GtkWidget *dialog3;
-  GtkWidget *dialog_vbox3;
+GtkWidget* create_info_error_dialog (const gchar *text, boolean is_blocking, int mask, lives_info_t info_type) {
+  GtkWidget *dialog;
+  GtkWidget *dialog_vbox;
   GtkWidget *info_text;
-  GtkWidget *dialog_action_area3;
+  GtkWidget *dialog_action_area;
   GtkWidget *info_ok_button;
   GtkWidget *details_button;
   GtkWidget *checkbutton;
-  GtkWidget *label;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
   gchar *form_text;
   gchar *textx;
 
-  dialog3 = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog3), "LiVES");
-  if (is_blocking) gtk_window_set_modal (GTK_WINDOW (dialog3), TRUE);
-  gtk_window_set_position (GTK_WINDOW (dialog3), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (dialog3), 350, 200);
-  if (mainw!=NULL) {
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(dialog3, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_dialog_set_has_separator(GTK_DIALOG(dialog3),FALSE);
-    }
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+
+  if (info_type==LIVES_INFO_TYPE_WARNING)
+    dialog = gtk_message_dialog_new (NULL,(GtkDialogFlags)0,
+				     GTK_MESSAGE_WARNING,GTK_BUTTONS_NONE,"%s","");
+  else if (info_type==LIVES_INFO_TYPE_ERROR)
+    dialog = gtk_message_dialog_new (NULL,(GtkDialogFlags)0,
+				     GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,"%s","");
+  else // INFO
+    dialog = gtk_message_dialog_new (NULL,(GtkDialogFlags)0,
+				     GTK_MESSAGE_INFO,GTK_BUTTONS_NONE,"%s","");
+
+  gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES"));
+  
+  gtk_window_set_deletable(GTK_WINDOW(dialog), FALSE);
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  gtk_container_set_border_width (GTK_CONTAINER (dialog), widget_opts.border_width*2);
+
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
+
+  if (mainw!=NULL&&widget_opts.apply_theme&&palette->style&STYLE_1) {
+    lives_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
+    lives_widget_set_bg_color(dialog, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  dialog_vbox3 = lives_dialog_get_content_area(GTK_DIALOG(dialog3));
-  gtk_widget_show (dialog_vbox3);
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
 
   textx=insert_newlines(text,MAX_MSG_WIDTH_CHARS);
 
   form_text=g_strdup_printf("\n\n%s",textx);
 
-  info_text = gtk_label_new (form_text);
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  info_text = lives_standard_label_new (form_text);
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
   g_free(form_text);
   g_free(textx);
 
-  if (mainw!=NULL&&palette->style&STYLE_1) {
-    gtk_widget_modify_fg(info_text, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
   gtk_label_set_selectable (GTK_LABEL (info_text), TRUE);
 
-  gtk_widget_show (info_text);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox3), hbox, FALSE, FALSE, 10);
-
-  gtk_box_pack_start (GTK_BOX (hbox), info_text, FALSE, FALSE, 20);
-  gtk_label_set_justify (GTK_LABEL (info_text), GTK_JUSTIFY_CENTER);
-  gtk_label_set_line_wrap (GTK_LABEL (info_text), FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), info_text, FALSE, FALSE, widget_opts.packing_width*2);
   
   if (mask>0) {
-    checkbutton = gtk_check_button_new ();
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new_with_mnemonic (_("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"));
-    gtk_container_add (GTK_CONTAINER (eventbox), label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-    if (palette->style&STYLE_1&&mainw!=NULL) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox3), hbox, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    gtk_widget_show_all (hbox);
-    GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    checkbutton = lives_standard_check_button_new (
+						   _("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"),
+						   TRUE,LIVES_BOX(hbox),NULL);
+    lives_widget_set_can_focus_and_default (checkbutton);
     g_signal_connect (GTK_OBJECT (checkbutton), "toggled",
                       G_CALLBACK (on_warn_mask_toggled),
                       GINT_TO_POINTER(mask));
   }
 
-  dialog_action_area3 = GTK_DIALOG (dialog3)->action_area;
-  gtk_widget_show (dialog_action_area3);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area3), GTK_BUTTONBOX_END);
-
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   if (mainw->iochan!=NULL) {
     details_button = gtk_button_new_with_mnemonic(_("Show _Details"));
-    gtk_widget_show (details_button);
-    gtk_dialog_add_action_widget (GTK_DIALOG (dialog3), details_button, GTK_RESPONSE_YES);
+    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), details_button, GTK_RESPONSE_YES);
     g_signal_connect (GTK_OBJECT (details_button), "clicked",
 		      G_CALLBACK (on_details_button_clicked),
 		      NULL);
   }
   
   info_ok_button = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (info_ok_button);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog3), info_ok_button, GTK_RESPONSE_OK);
+  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), info_ok_button, GTK_RESPONSE_OK);
 
 
   if (mainw->iochan==NULL) {
-    GTK_WIDGET_SET_FLAGS (info_ok_button, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    lives_widget_set_can_focus_and_default (info_ok_button);
     gtk_widget_grab_focus (info_ok_button);
     gtk_widget_grab_default (info_ok_button);
   }
 
   g_signal_connect (GTK_OBJECT (info_ok_button), "clicked",
-		    G_CALLBACK (on_general_button_clicked),
+		    G_CALLBACK (lives_general_button_clicked),
 		    NULL);
 
-  return dialog3;
+  gtk_widget_add_accelerator (info_ok_button, "activate", accel_group,
+			      LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
+
+
+
+  gtk_widget_show_all(dialog);
+  if (is_blocking) gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  if (prefs->present) {
+    gtk_window_present (GTK_WINDOW (dialog));
+    gdk_window_raise (lives_widget_get_xwindow(dialog));
+  }
+
+  return dialog;
 }
 
 
@@ -1109,37 +828,28 @@
   GtkWidget *scrolledwindow;
   GtkWidget *dialog_action_area;
   GtkWidget *okbutton;
+
   gchar *mytitle=g_strdup(title);
   gchar *mytext=NULL;
   gchar *tmp;
 
+  boolean woat;
+
   if (text!=NULL) mytext=g_strdup(text);
 
   textwindow=(text_window *)g_malloc(sizeof(text_window));
 
-  textwindow->dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (textwindow->dialog), (tmp=g_strconcat ("LiVES: - ",mytitle,NULL)));
+  textwindow->dialog = lives_standard_dialog_new ((tmp=g_strconcat ("LiVES: - ",mytitle,NULL)),FALSE);
   g_free(tmp);
-  gtk_window_set_position (GTK_WINDOW (textwindow->dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (textwindow->dialog), TRUE);
-  gtk_window_set_default_size (GTK_WINDOW (textwindow->dialog), 600, 400);
 
   if (prefs->show_gui) {
-    gtk_window_set_transient_for(GTK_WINDOW(textwindow->dialog),mainw->multitrack==NULL?GTK_WINDOW(mainw->LiVES):GTK_WINDOW(mainw->multitrack->window));
-  }
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(textwindow->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(textwindow->dialog),FALSE);
+    gtk_window_set_transient_for(GTK_WINDOW(textwindow->dialog),mainw->multitrack==NULL?
+				 GTK_WINDOW(mainw->LiVES):GTK_WINDOW(mainw->multitrack->window));
   }
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(textwindow->dialog));
-  gtk_widget_show (dialog_vbox);
 
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
-  
+
   if (mainw->iochan!=NULL) {
     textwindow->textview=GTK_WIDGET(mainw->optextview);
   }
@@ -1149,51 +859,41 @@
     gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textwindow->textview), GTK_WRAP_WORD);
   }
 
-  gtk_widget_show (textwindow->textview);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), textwindow->textview);
+  woat=widget_opts.apply_theme;
+  widget_opts.apply_theme=FALSE;
+  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V, textwindow->textview);
+  widget_opts.apply_theme=woat;
+
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
   gtk_text_view_set_editable (GTK_TEXT_VIEW (textwindow->textview), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textwindow->textview), FALSE);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_base(textwindow->textview, GTK_STATE_NORMAL, &palette->info_base);
-    gtk_widget_modify_text(textwindow->textview, GTK_STATE_NORMAL, &palette->info_text);
+    lives_widget_set_base_color(textwindow->textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
+    lives_widget_set_text_color(textwindow->textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
   }
 
   if (mytext!=NULL) {
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (textwindow->textview)), mytext, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (textwindow->textview), mytext, -1);
   }
 
   if (mytext!=NULL||mainw->iochan!=NULL) {
-    dialog_action_area = GTK_DIALOG (textwindow->dialog)->action_area;
-    gtk_widget_show (dialog_action_area);
+    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (textwindow->dialog));
     gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
     okbutton = gtk_button_new_with_mnemonic (_("_Close Window"));
-    gtk_widget_show (okbutton);
-
-    if (mainw->iochan!=NULL) {
-      GtkWidget *savebutton = gtk_button_new_with_mnemonic (_("_Save to file"));
-      gtk_widget_show (savebutton);
-      gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), savebutton, GTK_RESPONSE_YES);
-      gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), okbutton, GTK_RESPONSE_OK);
-    
-      g_signal_connect (GTK_OBJECT (savebutton), "clicked",
-			G_CALLBACK (on_save_textview_clicked),
-			textwindow->textview);
-    }
-    else {
-      gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), okbutton, GTK_RESPONSE_OK);
-      gtk_widget_set_size_request (okbutton, 586, 78);
-      GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
-      gtk_widget_grab_default (okbutton);
-      gtk_widget_grab_focus (okbutton);
-      gtk_container_set_border_width (GTK_CONTAINER (okbutton), 12);
-    }
 
+    GtkWidget *savebutton = gtk_button_new_with_mnemonic (_("_Save to file"));
+    gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), savebutton, GTK_RESPONSE_YES);
+    gtk_dialog_add_action_widget (GTK_DIALOG (textwindow->dialog), okbutton, GTK_RESPONSE_OK);
+    
+    g_signal_connect (GTK_OBJECT (savebutton), "clicked",
+		      G_CALLBACK (on_save_textview_clicked),
+		      textwindow->textview);
     
     g_signal_connect (GTK_OBJECT (okbutton), "clicked",
-		      G_CALLBACK (on_cancel_button1_clicked),
+		      G_CALLBACK (lives_general_button_clicked),
 		      textwindow);
     
   }
@@ -1201,6 +901,9 @@
   if (mytitle!=NULL) g_free(mytitle);
   if (mytext!=NULL) g_free(mytext);
 
+  if (prefs->show_gui)
+    gtk_widget_show_all(textwindow->dialog);
+
   return textwindow;
 }
 
@@ -1212,11 +915,13 @@
   GtkWidget *active_image;
   gchar *tmp;
 
-  cfile->menuentry = gtk_image_menu_item_new_with_label(cfile->clip_type!=CLIP_TYPE_VIDEODEV?(tmp=g_path_get_basename(cfile->name)):(tmp=g_strdup(cfile->name)));
+  cfile->menuentry = gtk_image_menu_item_new_with_label(cfile->clip_type!=CLIP_TYPE_VIDEODEV?
+							(tmp=g_path_get_basename(cfile->name)):
+							(tmp=g_strdup(cfile->name)));
   g_free(tmp);
-#ifdef HAVE_GTK_VERSION216
-  gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(cfile->menuentry),TRUE);
-#endif
+
+  lives_image_menu_item_set_always_show_image(LIVES_IMAGE_MENU_ITEM(cfile->menuentry),TRUE);
+
   gtk_widget_show (cfile->menuentry);
   gtk_container_add (GTK_CONTAINER (mainw->winmenu), cfile->menuentry);
 
@@ -1226,10 +931,10 @@
                       NULL);
 
   if (!cfile->opening&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
-    active_image = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_MENU);
+    active_image = lives_image_new_from_stock ("gtk-cancel", LIVES_ICON_SIZE_MENU);
   }
   else {
-    active_image = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
+    active_image = lives_image_new_from_stock ("gtk-yes", LIVES_ICON_SIZE_MENU);
   }
   gtk_widget_show (active_image);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cfile->menuentry), active_image);
@@ -1242,10 +947,10 @@
 
 
 
-void
-remove_from_winmenu(void) {
+void remove_from_winmenu(void) {
   gtk_container_remove(GTK_CONTAINER(mainw->winmenu), cfile->menuentry);
-  gtk_widget_destroy(cfile->menuentry);
+  if (LIVES_IS_WIDGET(cfile->menuentry))
+    gtk_widget_destroy(cfile->menuentry);
   mainw->cliplist=g_list_remove (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
   if (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE) {
     mainw->clips_available--;
@@ -1255,305 +960,172 @@
 }
 
 
-_insertw*
-create_insert_dialog (void)
-{
-  GtkWidget *dialog_vbox3;
-  GtkWidget *hbox15;
+_insertw* create_insert_dialog (void) {
+  GtkWidget *dialog_vbox;
+  GtkWidget *hbox1;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
-  GtkWidget *label;
-  GObject *spinbutton_times_adj;
-  GtkWidget *table2;
-  GtkWidget *radiobutton1;
+  GtkWidget *table;
+  GtkWidget *radiobutton;
+  GtkWidget *vseparator;
+  GtkWidget *dialog_action_area;
+  GtkWidget *cancelbutton;
+  GtkWidget *okbutton;
+
   GSList *radiobutton1_group = NULL;
   GSList *radiobutton2_group = NULL;
-  GtkWidget *radiobutton4;
-  GtkWidget *vseparator1;
-  GtkWidget *vseparator2;
-  GtkWidget *hseparator1;
-  GtkWidget *dialog_action_area3;
-  GtkWidget *cancelbutton1;
-  GtkWidget *okbutton1;
+
   GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
+  gchar *tmp,*tmp2;
+
   _insertw *insertw=(_insertw*)(g_malloc(sizeof(_insertw)));
 
-  insertw->insert_dialog = gtk_dialog_new ();
+  insertw->insert_dialog = lives_standard_dialog_new (_("LiVES: - Insert"),FALSE);
+
   gtk_window_add_accel_group (GTK_WINDOW (insertw->insert_dialog), accel_group);
-  gtk_window_set_title (GTK_WINDOW (insertw->insert_dialog), _("LiVES: - Insert"));
-  gtk_window_set_position (GTK_WINDOW (insertw->insert_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (insertw->insert_dialog), TRUE);
-  gtk_window_set_default_size (GTK_WINDOW (insertw->insert_dialog), 300, 200);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg (insertw->insert_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
 
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(insertw->insert_dialog),GTK_WINDOW(mainw->LiVES));
   }
 
-  dialog_vbox3 = lives_dialog_get_content_area(GTK_DIALOG(insertw->insert_dialog));
-  gtk_widget_show (dialog_vbox3);
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(insertw->insert_dialog));
 
-  hbox15 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox15);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox3), hbox15, TRUE, TRUE, 0);
+  hbox1 = lives_hbox_new (FALSE, 0);
 
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox1, TRUE, TRUE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox15), hbox, FALSE, FALSE, 10);
-  label=gtk_label_new_with_mnemonic(_("_Number of times to insert"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-
-  spinbutton_times_adj = (GObject *)gtk_adjustment_new (1, 1, 10000, 1, 10, 0);
-  insertw->spinbutton_times = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_times_adj), 1, 0);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (insertw->spinbutton_times),GTK_UPDATE_IF_VALID);
-  gtk_widget_show (insertw->spinbutton_times);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),insertw->spinbutton_times);
-  gtk_box_pack_start (GTK_BOX (hbox), insertw->spinbutton_times, TRUE, FALSE, 0);
-  gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (insertw->spinbutton_times)->entry)), TRUE);
-
-  gtk_widget_show_all(hbox);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox1), hbox, FALSE, FALSE, widget_opts.packing_width);
 
+  insertw->spinbutton_times = lives_standard_spin_button_new(_("_Number of times to insert"),
+							     TRUE,1.,1.,10000.,1.,10.,0.,LIVES_BOX(hbox),NULL);
 
-  add_fill_to_box(GTK_BOX(hbox15));
+  add_fill_to_box(GTK_BOX(hbox1));
 
-  insertw->fit_checkbutton = gtk_check_button_new ();
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic (_("_Insert to fit audio"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),insertw->fit_checkbutton);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    insertw->fit_checkbutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  hbox = lives_hbox_new (FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox15), hbox, FALSE, FALSE, 10);
+  gtk_box_pack_start (GTK_BOX (hbox1), hbox, FALSE, FALSE, widget_opts.packing_width);
 
-  gtk_box_pack_start (GTK_BOX (hbox), insertw->fit_checkbutton, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 5);
-  GTK_WIDGET_SET_FLAGS (insertw->fit_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  insertw->fit_checkbutton = lives_standard_check_button_new (_("_Insert to fit audio"),TRUE,LIVES_BOX(hbox),NULL);
 
   gtk_widget_set_sensitive(GTK_WIDGET(insertw->fit_checkbutton),cfile->achans>0&&clipboard->achans==0);
 
-  gtk_widget_show_all(hbox);
+  add_hsep_to_box (LIVES_BOX (dialog_vbox));
 
+  table = gtk_table_new (2, 3, FALSE);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), table, TRUE, TRUE, widget_opts.packing_height);
+  gtk_table_set_col_spacings (GTK_TABLE (table), widget_opts.packing_width*4);
+  gtk_table_set_row_spacings (GTK_TABLE (table), widget_opts.packing_height);
 
-  hseparator1 = gtk_hseparator_new ();
-  gtk_widget_show (hseparator1);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox3), hseparator1, TRUE, TRUE, 0);
 
-  table2 = gtk_table_new (2, 3, FALSE);
-  gtk_widget_show (table2);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox3), table2, TRUE, TRUE, 0);
-  gtk_table_set_col_spacings (GTK_TABLE (table2), 42);
-  gtk_table_set_row_spacings (GTK_TABLE (table2), 10);
+  hbox = lives_hbox_new (FALSE, 0);
 
+  radiobutton=lives_standard_radio_button_new((tmp=g_strdup(_ ("Insert _before selection"))),
+					      TRUE,radiobutton1_group,LIVES_BOX(hbox),
+					      (tmp2=g_strdup(_("Insert clipboard before selected frames"))));
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  g_free(tmp); g_free(tmp2);
 
-  radiobutton1=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton1), radiobutton1_group);
-  radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
+  radiobutton1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton1, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Insert _before selection"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton1);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Insert clipboard before selected frames"));
-  gtk_tooltips_copy(radiobutton1,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton1);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-  gtk_widget_show_all (hbox);
-
-  gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 0, 1,
+  gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
   if (cfile->frames==0) {
-    gtk_widget_set_sensitive (radiobutton1, FALSE);
+    gtk_widget_set_sensitive (radiobutton, FALSE);
   }
 
+  hbox = lives_hbox_new (FALSE, 0);
 
+  radiobutton=lives_standard_radio_button_new((tmp=g_strdup(_("Insert _after selection"))),
+					      TRUE,radiobutton1_group,LIVES_BOX(hbox),
+					      (tmp2=g_strdup(_("Insert clipboard after selected frames"))));
 
-  hbox = gtk_hbox_new (FALSE, 0);
-
-  radiobutton4=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton4), radiobutton1_group);
-  radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton4));
-
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton4, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Insert _after selection"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton4);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Insert clipboard after selected frames"));
-  gtk_tooltips_copy(radiobutton4,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton4);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-  gtk_widget_show_all (hbox);
-
-  gtk_table_attach (GTK_TABLE (table2), hbox, 0, 1, 1, 2,
+  gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(radiobutton4),mainw->insert_after);
-
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton),mainw->insert_after);
 
 
+  hbox = lives_hbox_new (FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  insertw->with_sound=lives_standard_radio_button_new(_("Insert _with sound"),
+						      TRUE,radiobutton2_group,LIVES_BOX(hbox),NULL);
+  radiobutton2_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (insertw->with_sound));
 
-  insertw->with_sound=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (insertw->with_sound), radiobutton2_group);
-  radiobutton2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (insertw->with_sound));
 
-  gtk_box_pack_start (GTK_BOX (hbox), insertw->with_sound, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Insert _with sound"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),insertw->with_sound);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton1);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-  gtk_widget_show_all (hbox);
-
-  gtk_table_attach (GTK_TABLE (table2), hbox, 2, 3, 0, 1,
+  gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-
-
   if (cfile->achans==0&&clipboard->achans==0) gtk_widget_set_sensitive(insertw->with_sound,FALSE);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-
-  insertw->without_sound=gtk_radio_button_new(NULL);
-
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (insertw->without_sound), radiobutton2_group);
-  radiobutton2_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (insertw->without_sound));
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(insertw->without_sound),!((cfile->achans>0||clipboard->achans>0)&&mainw->ccpd_with_sound));
-
+  hbox = lives_hbox_new (FALSE, 0);
 
-  gtk_box_pack_start (GTK_BOX (hbox), insertw->without_sound, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Insert with_out sound"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),insertw->without_sound);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    insertw->without_sound);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  insertw->without_sound=lives_standard_radio_button_new(_("Insert with_out sound"),
+							 TRUE,radiobutton2_group,LIVES_BOX(hbox),NULL);
 
-  gtk_widget_show_all (hbox);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(insertw->without_sound),
+				 !((cfile->achans>0||clipboard->achans>0)&&mainw->ccpd_with_sound));
 
-  gtk_table_attach (GTK_TABLE (table2), hbox, 2, 3, 1, 2,
+  gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
   gtk_widget_set_sensitive (insertw->with_sound, clipboard->achans>0||cfile->achans>0);
   gtk_widget_set_sensitive (insertw->without_sound, clipboard->achans>0||cfile->achans>0);
 
-  vseparator1 = gtk_vseparator_new ();
-  gtk_widget_show (vseparator1);
-  gtk_table_attach (GTK_TABLE (table2), vseparator1, 1, 2, 0, 1,
+  vseparator = lives_vseparator_new ();
+  gtk_table_attach (GTK_TABLE (table), vseparator, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
-  vseparator2 = gtk_vseparator_new ();
-  gtk_widget_show (vseparator2);
-  gtk_table_attach (GTK_TABLE (table2), vseparator2, 1, 2, 1, 2,
+  vseparator = lives_vseparator_new ();
+  gtk_table_attach (GTK_TABLE (table), vseparator, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
-  dialog_action_area3 = GTK_DIALOG (insertw->insert_dialog)->action_area;
-  gtk_widget_show (dialog_action_area3);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area3), GTK_BUTTONBOX_END);
-
-  cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (insertw->insert_dialog), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_FOCUS);
-
-  okbutton1 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (insertw->insert_dialog), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_widget_grab_default(okbutton1);
-  gtk_widget_grab_focus(okbutton1);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (insertw->insert_dialog));
+
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
+
+  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_dialog_add_action_widget (GTK_DIALOG (insertw->insert_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+
+  okbutton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_dialog_add_action_widget (GTK_DIALOG (insertw->insert_dialog), okbutton, GTK_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default (okbutton);
+  gtk_widget_grab_default(okbutton);
+  gtk_widget_grab_focus(okbutton);
 
   g_signal_connect (GTK_OBJECT (insertw->with_sound), "toggled",
-                      G_CALLBACK (on_insertwsound_toggled),
-                      NULL);
-  g_signal_connect (GTK_OBJECT (radiobutton4), "toggled",
-                      G_CALLBACK (on_boolean_toggled),
-                      &mainw->insert_after);
-  g_signal_connect (GTK_OBJECT (cancelbutton1), "clicked",
-                      G_CALLBACK (on_cancel_button1_clicked),
-                      insertw);
-  g_signal_connect (GTK_OBJECT (okbutton1), "clicked",
-                      G_CALLBACK (on_insert_activate),
-                      NULL);
+		    G_CALLBACK (on_insertwsound_toggled),
+		    NULL);
+  g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
+		    G_CALLBACK (on_boolean_toggled),
+		    &mainw->insert_after);
+  g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
+		    G_CALLBACK (lives_general_button_clicked),
+		    insertw);
+  g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+		    G_CALLBACK (on_insert_activate),
+		    NULL);
   g_signal_connect (GTK_OBJECT (insertw->fit_checkbutton), "toggled",
 		    G_CALLBACK (on_insfitaudio_toggled),
 		    NULL);
   g_signal_connect_after (GTK_OBJECT (insertw->spinbutton_times), "value_changed",
-                      G_CALLBACK (on_spin_value_changed),
-                      GINT_TO_POINTER (1));
-  g_signal_connect (GTK_OBJECT (insertw->insert_dialog), "delete_event",
-                      G_CALLBACK (return_true),
-                      NULL);
+			  G_CALLBACK (on_spin_value_changed),
+			  GINT_TO_POINTER (1));
 
-  gtk_widget_add_accelerator (cancelbutton1, "activate", accel_group,
-                              GDK_Escape,  (GdkModifierType)0, (GtkAccelFlags)0);
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape,  (GdkModifierType)0, (GtkAccelFlags)0);
 
+  gtk_widget_add_accelerator (okbutton, "activate", accel_group,
+                              LIVES_KEY_Return,  (GdkModifierType)0, (GtkAccelFlags)0);
+
+  gtk_widget_show_all(insertw->insert_dialog);
 
   return insertw;
 }
@@ -1562,128 +1134,96 @@
 
 
 
-GtkWidget*
-create_opensel_dialog (void)
-{
+GtkWidget *create_opensel_dialog (void) {
   GtkWidget *opensel_dialog;
-  GtkWidget *dialog_vbox9;
-  GtkWidget *vbox15;
-  GtkWidget *table5;
-  GtkWidget *label46;
-  GtkWidget *label47;
-  GObject *spinbutton23_adj;
-  GtkWidget *spinbutton23;
-  GObject *spinbutton24_adj;
-  GtkWidget *spinbutton24;
-  GtkWidget *dialog_action_area9;
-  GtkWidget *cancelbutton7;
-  GtkWidget *okbutton6;
-
-  opensel_dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (opensel_dialog), _("LiVES: - Open Selection"));
-  gtk_window_set_position (GTK_WINDOW (opensel_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (opensel_dialog), TRUE);
+  GtkWidget *dialog_vbox;
+  GtkWidget *vbox;
+  GtkWidget *table;
+  GtkWidget *label;
+  GtkWidget *spinbutton;
+  GtkWidget *dialog_action_area;
+  GtkWidget *cancelbutton;
+  GtkWidget *okbutton;
+
+  opensel_dialog = lives_standard_dialog_new (_("LiVES: - Open Selection"),FALSE);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(opensel_dialog),GTK_WINDOW(mainw->LiVES));
     else gtk_window_set_transient_for(GTK_WINDOW(opensel_dialog),GTK_WINDOW(mainw->multitrack->window));
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(opensel_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(opensel_dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (opensel_dialog), 10);
-  gtk_window_set_default_size (GTK_WINDOW (opensel_dialog), 300, 200);
 
-  dialog_vbox9 = lives_dialog_get_content_area(GTK_DIALOG(opensel_dialog));
-  gtk_widget_show (dialog_vbox9);
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(opensel_dialog));
+ 
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  vbox15 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox15);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox9), vbox15, TRUE, TRUE, 0);
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, widget_opts.packing_height);
 
-  table5 = gtk_table_new (2, 2, FALSE);
-  gtk_widget_show (table5);
-  gtk_box_pack_start (GTK_BOX (vbox15), table5, TRUE, TRUE, 12);
+  gtk_table_set_row_spacings (GTK_TABLE (table), widget_opts.packing_height*2);
 
-  gtk_table_set_row_spacings (GTK_TABLE (table5), 20);
-  label46 = gtk_label_new (_("    Selection start time (sec)"));
-  gtk_widget_show (label46);
-  gtk_table_attach (GTK_TABLE (table5), label46, 0, 1, 0, 1,
+  label = lives_standard_label_new (_("Selection start time (sec)"));
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label46), 0, 0.5);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label46, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
-  label47 = gtk_label_new (_("    Number of frames to open"));
-  gtk_widget_show (label47);
-  gtk_table_attach (GTK_TABLE (table5), label47, 0, 1, 1, 2,
+  label = lives_standard_label_new (_("Number of frames to open"));
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label47), 0, 0.5);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label47, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
-  spinbutton23_adj = (GObject *)gtk_adjustment_new (0, 0, G_MAXINT, 1, 10, 0);
-  spinbutton23 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton23_adj), 1, 2);
-  gtk_widget_show (spinbutton23);
-  gtk_table_attach (GTK_TABLE (table5), spinbutton23, 1, 2, 0, 1,
+  spinbutton = lives_standard_spin_button_new (NULL, FALSE, 0., 0., 1000000000., 1., 10., 2, NULL, NULL);
+
+  g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
+                            G_CALLBACK (on_spin_value_changed),
+                            GINT_TO_POINTER (1));
+
+  gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (GTK_EXPAND), 42, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton23), TRUE);
+                    (GtkAttachOptions) (GTK_EXPAND), widget_opts.packing_height*4+2, 0);
+
+
+  spinbutton = lives_standard_spin_button_new (NULL,FALSE,1000.,1.,(double)G_MAXINT, 1., 10., 0, NULL, NULL);
 
-  spinbutton24_adj = (GObject *)gtk_adjustment_new (1000, 1, G_MAXINT, 1, 10, 0);
-  spinbutton24 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton24_adj), 1, 0);
-  gtk_widget_show (spinbutton24);
-  gtk_table_attach (GTK_TABLE (table5), spinbutton24, 1, 2, 1, 2,
+  g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
+			  G_CALLBACK (on_spin_value_changed),
+			  GINT_TO_POINTER (2));
+
+  gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                    (GtkAttachOptions) (GTK_EXPAND), 42, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton24), TRUE);
+                    (GtkAttachOptions) (GTK_EXPAND), widget_opts.packing_height*4+2, 0);
 
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (opensel_dialog));
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
-  dialog_action_area9 = GTK_DIALOG (opensel_dialog)->action_area;
-  gtk_widget_show (dialog_action_area9);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area9), GTK_BUTTONBOX_END);
+  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_dialog_add_action_widget (GTK_DIALOG (opensel_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
-  cancelbutton7 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton7);
-  gtk_dialog_add_action_widget (GTK_DIALOG (opensel_dialog), cancelbutton7, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton7, GTK_CAN_DEFAULT);
+  okbutton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_dialog_add_action_widget (GTK_DIALOG (opensel_dialog), okbutton, GTK_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default (okbutton);
+  gtk_widget_grab_default(okbutton);
 
-  okbutton6 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton6);
-  gtk_dialog_add_action_widget (GTK_DIALOG (opensel_dialog), okbutton6, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton6, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default(okbutton6);
+  widget_add_preview (opensel_dialog, GTK_BOX (dialog_vbox), GTK_BOX (dialog_vbox), GTK_BOX(dialog_vbox), 3);
 
-  widget_add_preview (GTK_BOX (dialog_vbox9), GTK_BOX (dialog_vbox9), GTK_BOX(dialog_vbox9), 3);
+  g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
+		    G_CALLBACK (on_cancel_opensel_clicked),
+		    NULL);
+  g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+		    G_CALLBACK (on_opensel_range_ok_clicked),
+		    NULL);
 
-  g_signal_connect_after (GTK_OBJECT (spinbutton23), "value_changed",
-                            G_CALLBACK (on_spin_value_changed),
-                            GINT_TO_POINTER (1));
-  g_signal_connect_after (GTK_OBJECT (spinbutton24), "value_changed",
-                            G_CALLBACK (on_spin_value_changed),
-                            GINT_TO_POINTER (2));
-  g_signal_connect (GTK_OBJECT (cancelbutton7), "clicked",
-                      G_CALLBACK (on_cancel_opensel_clicked),
-                      NULL);
-  g_signal_connect (GTK_OBJECT (okbutton6), "clicked",
-                      G_CALLBACK (on_opensel_range_ok_clicked),
-                      NULL);
+  gtk_widget_show_all(opensel_dialog);
 
-   return opensel_dialog;
+  return opensel_dialog;
 }
 
 
 
 
-// TODO - move all prefs stuff into prefs.c
-
 
 _entryw* create_location_dialog (int type) {
   // type 1 is open location
@@ -1695,7 +1235,6 @@
   GtkWidget *okbutton;
   GtkWidget *label;
   GtkWidget *checkbutton;
-  GtkWidget *eventbox;
   GtkWidget *hbox;
   GtkWidget *buttond;
 
@@ -1703,11 +1242,16 @@
 
   GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
-  locw->dialog = gtk_dialog_new ();
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(locw->dialog),FALSE);
-    gtk_widget_modify_bg (locw->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  gchar *title,*tmp,*tmp2;
+
+  if (type==1) 
+    title=g_strdup(_("LiVES: - Open Location"));
+  else 
+    title=g_strdup(_("LiVES: - Open Youtube Clip"));
+
+  locw->dialog = lives_standard_dialog_new (title,FALSE);
+
+  g_free(title);
 
   gtk_window_add_accel_group (GTK_WINDOW (locw->dialog), accel_group);
 
@@ -1716,199 +1260,104 @@
     else gtk_window_set_transient_for(GTK_WINDOW(locw->dialog),GTK_WINDOW(mainw->multitrack->window));
   }
 
-  gtk_window_set_position (GTK_WINDOW (locw->dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (locw->dialog), TRUE);
-
-  if (type==1)
-    gtk_window_set_default_size (GTK_WINDOW (locw->dialog), 300, 200);
-  else
-    gtk_window_set_default_size (GTK_WINDOW (locw->dialog), 650, 450);
-
-  
-  gtk_container_set_border_width (GTK_CONTAINER (locw->dialog), 10);
-
-
-  if (type==1) 
-    gtk_window_set_title (GTK_WINDOW (locw->dialog), _("LiVES: - Open Location"));
-  else 
-    gtk_window_set_title (GTK_WINDOW (locw->dialog), _("LiVES: - Open Youtube Clip"));
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(locw->dialog));
-  gtk_widget_show (dialog_vbox);
+
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
 
   if (type==1) {
-    label = gtk_label_new (_("\n\nTo open a stream, you must make sure that you have the correct libraries compiled in mplayer.\nAlso make sure you have set your bandwidth in Preferences|Streaming\n\n"));
+    label = lives_standard_label_new (_("\n\nTo open a stream, you must make sure that you have the correct libraries compiled in mplayer.\nAlso make sure you have set your bandwidth in Preferences|Streaming\n\n"));
   }
   else { 
-    label = gtk_label_new (_("\n\nTo open a clip from Youtube, LiVES will first download it with youtube-dl.\nPlease make sure you have the latest version of that tool installed.\n\n"));
+    label = lives_standard_label_new (_("\n\nTo open a clip from Youtube, LiVES will first download it with youtube-dl.\nPlease make sure you have the latest version of that tool installed.\n\n"));
 
-    gtk_widget_show (label);
     gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
     
-    label=gtk_label_new(_("Enter the URL of the clip below.\nE.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n\n"));
+    label=lives_standard_label_new(_("Enter the URL of the clip below.\nE.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n\n"));
 
   }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  if (type==1)
-    label = gtk_label_new (_ ("URL : "));
-  else
-    label = gtk_label_new (_ ("Youtube URL : "));
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
 
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*2);
 
-  locw->entry = gtk_entry_new_with_max_length (32768);
-  gtk_widget_show (locw->entry);
-  gtk_box_pack_start (GTK_BOX (hbox), locw->entry, TRUE, TRUE, 0);
-  gtk_entry_set_activates_default (GTK_ENTRY (locw->entry), TRUE);
+  locw->entry = lives_standard_entry_new (type==1?_ ("URL : "):_ ("Youtube URL : "),FALSE,"",79,32768,LIVES_BOX(hbox),NULL);
 
+  if (type==1) {
+    hbox=lives_hbox_new (FALSE, 0);
+    checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Do not send bandwidth information"))),
+						   TRUE,LIVES_BOX(hbox),
+						   (tmp2=g_strdup(_("Try this setting if you are having problems getting a stream"))));
 
+    g_free(tmp); g_free(tmp2);
 
-  if (type==1) {
-    hbox=gtk_hbox_new (FALSE, 0);
-    checkbutton = gtk_check_button_new ();
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new_with_mnemonic (_("Do not send bandwidth information"));
-    gtk_widget_set_tooltip_text( checkbutton,_("Try this setting if you are having problems getting a stream"));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),prefs->no_bandwidth);
-    
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),prefs->no_bandwidth);
     
-    gtk_box_pack_start (GTK_BOX(dialog_vbox), hbox, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    gtk_box_pack_start (GTK_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
     
     g_signal_connect (GTK_OBJECT (checkbutton), "toggled",
 		      G_CALLBACK (on_boolean_toggled),
 		      &prefs->no_bandwidth);
     
-    gtk_widget_show_all(hbox);
-    
     add_deinterlace_checkbox(GTK_BOX(dialog_vbox));
 
   }
 
   if (type==2) {
-    hbox=gtk_hbox_new (FALSE, 0);
+    hbox=lives_hbox_new (FALSE, 0);
     
-    gtk_box_pack_start(GTK_BOX(dialog_vbox),hbox,TRUE,FALSE,0);
-
-    locw->dir_entry = gtk_entry_new_with_max_length (32768);
-
-    label=gtk_label_new_with_mnemonic (_("Download to _Directory : "));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),locw->dir_entry);
+    gtk_box_pack_start(GTK_BOX(dialog_vbox),hbox,TRUE,FALSE,widget_opts.packing_height);
 
-    gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    locw->dir_entry = lives_standard_entry_new (_("Download to _Directory : "),TRUE,mainw->vid_dl_dir,
+						72.*widget_opts.scale,PATH_MAX,LIVES_BOX(hbox),NULL);
 
-    gtk_widget_show (locw->dir_entry);
-    gtk_box_pack_start (GTK_BOX (hbox), locw->dir_entry, TRUE, TRUE, 10);
-    gtk_entry_set_activates_default (GTK_ENTRY (locw->dir_entry), TRUE);
+    lives_entry_set_editable(LIVES_ENTRY(locw->dir_entry),FALSE);
+    gtk_entry_set_max_length(GTK_ENTRY (locw->dir_entry),PATH_MAX);
 
     // add dir, with filechooser button
-    buttond = gtk_file_chooser_button_new(_("Download Directory..."),GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(buttond),mainw->vid_save_dir);
-    gtk_box_pack_start(GTK_BOX(hbox),buttond,TRUE,FALSE,0);
-    gtk_widget_show (buttond);
+    buttond = lives_standard_file_button_new (TRUE,NULL);
+    gtk_label_set_mnemonic_widget (GTK_LABEL(widget_opts.last_label),buttond);
+    gtk_box_pack_start(GTK_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
-    add_fill_to_box (GTK_BOX (hbox));
-    gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(buttond),16);
-    
-    g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),
-    		      (gpointer)locw->dir_entry);
-
-
-    gtk_widget_show_all (hbox);
 
+    add_fill_to_box (GTK_BOX (hbox));
 
-
-    hbox=gtk_hbox_new (FALSE, 0);
-    
-    gtk_box_pack_start(GTK_BOX(dialog_vbox),hbox,TRUE,FALSE,0);
-
-    locw->name_entry = gtk_entry_new_with_max_length (32768);
-
-
-    label=gtk_label_new_with_mnemonic (_("Download _File Name : "));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),locw->name_entry);
-
-    gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
+    hbox=lives_hbox_new (FALSE, 0);
     
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
+    gtk_box_pack_start(GTK_BOX(dialog_vbox),hbox,TRUE,FALSE,widget_opts.packing_height);
 
-    gtk_box_pack_start (GTK_BOX (hbox), locw->name_entry, TRUE, TRUE, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY (locw->name_entry), TRUE);
+    locw->name_entry = lives_standard_entry_new (_("Download _File Name : "),TRUE,"",
+						 74.*widget_opts.scale,PATH_MAX,LIVES_BOX(hbox),NULL);
 
+    g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)locw->dir_entry);
 
-    label=gtk_label_new (_(".webm"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),locw->name_entry);
-
-    gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
-    gtk_widget_show_all (hbox);
-
+    label=lives_standard_label_new (_(".webm"));
 
-  }
+    gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
+   }
 
 
 
-  dialog_action_area = GTK_DIALOG (locw->dialog)->action_area;
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (locw->dialog));
   gtk_widget_show (dialog_action_area);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (locw->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (cancelbutton);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (locw->dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
 
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
-		    G_CALLBACK (on_cancel_button1_clicked),
+		    G_CALLBACK (lives_general_button_clicked),
 		    locw);
 
   if (type==1) 
@@ -1921,19 +1370,18 @@
 		      G_CALLBACK (on_utube_select),
 		      NULL);
 
-  g_signal_connect (GTK_OBJECT (locw->dialog), "delete_event",
-                      G_CALLBACK (return_true),
-                      NULL);
 
   gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
+  gtk_widget_show_all(locw->dialog);
 
   return locw;
 }
 
+#define RW_ENTRY_DISPWIDTH 40
 
-
-_entryw* create_rename_dialog (gint type) {
+_entryw* create_rename_dialog (int type) {
   // type 1 = rename clip in menu
   // type 2 = save clip set
   // type 3 = reload clip set
@@ -1942,6 +1390,7 @@
 
   // type 6 = initial tempdir
 
+  // type 7 = rename track in mt
 
   GtkWidget *dialog_vbox;
   GtkWidget *hbox;
@@ -1953,16 +1402,33 @@
   GtkWidget *dirbutton1;
   GtkWidget *dirimage1;
 
-  _entryw *renamew=(_entryw*)(g_malloc(sizeof(_entryw)));
-
   GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
+  gchar *title=NULL;
+
+  _entryw *renamew=(_entryw*)(g_malloc(sizeof(_entryw)));
+
   renamew->setlist=NULL;
 
-  renamew->dialog = gtk_dialog_new ();
-  gtk_window_add_accel_group (GTK_WINDOW (renamew->dialog), accel_group);
+  if (type==1) {
+    title=g_strdup(_("LiVES: - Rename Clip"));
+  }
+  else if (type==2||type==4||type==5) {
+    title=g_strdup(_("LiVES: - Enter Set Name"));
+  }
+  else if (type==3) {
+    title=g_strdup(_("LiVES: - Enter a Set Name to Reload"));
+  }
+  else if (type==6) {
+    title=g_strdup(_("LiVES: - Choose a Working Directory"));
+  }
+  else if (type==7) {
+    title=g_strdup(_("LiVES: - Rename Current Track"));
+  }
+
+  renamew->dialog = lives_standard_dialog_new (title,FALSE);
 
-  gtk_window_set_position (GTK_WINDOW (renamew->dialog), GTK_WIN_POS_CENTER_ALWAYS);
+  gtk_window_add_accel_group (GTK_WINDOW (renamew->dialog), accel_group);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) {
@@ -1973,114 +1439,76 @@
     else gtk_window_set_transient_for(GTK_WINDOW(renamew->dialog),GTK_WINDOW(mainw->multitrack->window));
   }
 
-  gtk_window_set_modal (GTK_WINDOW (renamew->dialog), TRUE);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(renamew->dialog),FALSE);
-    gtk_widget_modify_bg (renamew->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  if (type!=6) gtk_window_set_default_size (GTK_WINDOW (renamew->dialog), 500, 200);
-
-  gtk_container_set_border_width (GTK_CONTAINER (renamew->dialog), 10);
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(renamew->dialog));
-  gtk_widget_show (dialog_vbox);
 
   if (type==4) {
-    label = gtk_label_new (_("You need to enter a name for the current clip set.\nThis will allow you reload the layout with the same clips later.\nPlease enter the set name you wish to use.\nLiVES will remind you to save the clip set later when you try to exit.\n"));
-    gtk_widget_show (label);
+    label = lives_standard_label_new 
+      (_("You need to enter a name for the current clip set.\nThis will allow you reload the layout with the same clips later.\nPlease enter the set name you wish to use.\nLiVES will remind you to save the clip set later when you try to exit.\n"));
     gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
   }
 
   if (type==5) {
-    label = gtk_label_new (_("In order to export this project, you must enter a name for this clip set.\nThis will also be used for the project name.\n"));
-    gtk_widget_show (label);
+    label = lives_standard_label_new 
+      (_("In order to export this project, you must enter a name for this clip set.\nThis will also be used for the project name.\n"));
     gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
   }
 
 
   if (type==6) {
-    label = gtk_label_new (_("Welcome to LiVES !\nThis startup wizard will guide you through the\ninitial install so that you can get the most from this application.\n"));
-    gtk_widget_show (label);
+    label = lives_standard_label_new 
+      (_("Welcome to LiVES !\nThis startup wizard will guide you through the\ninitial install so that you can get the most from this application.\n"));
     gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    label = gtk_label_new (_("\nFirst of all you need to choose a working directory for LiVES.\nThis should be a directory with plenty of disk space available.\nNote, on many systems, /tmp is cleared on shutdown, so it may be inadvisable to create it in /tmp.\n"));
-    gtk_widget_show (label);
+
+    label = lives_standard_label_new 
+      (_("\nFirst of all you need to choose a working directory for LiVES.\nThis should be a directory with plenty of disk space available.\n"));
     gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
   }
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  if (type!=6) {
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-  }
-  else {
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 40);
-  }
+  hbox = lives_hbox_new (FALSE, 0);
 
-  if (type==1) {
-    gtk_window_set_title (GTK_WINDOW (renamew->dialog), _("LiVES: - Rename Clip"));
-  }
-  else if (type==2||type==4||type==5) {
-    gtk_window_set_title (GTK_WINDOW (renamew->dialog), _("LiVES: - Enter Set Name"));
+  if (type==3) {
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, FALSE, widget_opts.packing_height*4);
   }
-  else if (type==3) {
-    gtk_window_set_title (GTK_WINDOW (renamew->dialog), _("LiVES: - Enter a Set Name to Reload"));
+  else if (type!=6&&type!=7&&type!=1) {
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*2);
   }
-  else if (type==6) {
-    gtk_window_set_title (GTK_WINDOW (renamew->dialog), _("LiVES: - Choose a Working Directory"));
+  else {
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*4);
   }
 
-  if (type==1) {
-    label = gtk_label_new (_("New name "));
+
+  if (type==1||type==7) {
+    label = lives_standard_label_new (_("New name "));
   }
   else if (type==2||type==3||type==4||type==5) {
-    label = gtk_label_new (_("Set name "));
+    label = lives_standard_label_new (_("Set name "));
   }
   else {
-    label = gtk_label_new ("");
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+    label = lives_standard_label_new ("");
   }
 
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width*4);
+
 
   if (type==3) {
     GtkListStore *store;
     GtkEntryCompletion *completion;
     GList *xlist;
 
-    set_combo=gtk_combo_new();
+    set_combo=lives_combo_new();
+
     renamew->setlist=get_set_list(prefs->tmpdir);
-    combo_set_popdown_strings(GTK_COMBO(set_combo),renamew->setlist);
-    renamew->entry=(GTK_COMBO(set_combo))->entry;
+
+    lives_combo_populate(LIVES_COMBO(set_combo),renamew->setlist);
+
+    renamew->entry=lives_combo_get_entry(LIVES_COMBO(set_combo));
 
     if (strlen(prefs->ar_clipset_name)) {
       // set default to our auto-reload clipset
       gtk_entry_set_text(GTK_ENTRY(renamew->entry),prefs->ar_clipset_name);
     }
 
-    gtk_widget_show (set_combo);
     gtk_box_pack_start (GTK_BOX (hbox), set_combo, TRUE, TRUE, 0);
 
     xlist=renamew->setlist;
@@ -2101,71 +1529,73 @@
     gtk_entry_completion_set_popup_completion (completion, TRUE);
     gtk_entry_completion_set_popup_single_match(completion,FALSE);
     gtk_entry_set_completion (GTK_ENTRY (renamew->entry), completion);
+
+
   }
   else {
-    renamew->entry = gtk_entry_new_with_max_length (type==6?PATH_MAX:128);
+    renamew->entry = gtk_entry_new();
+    gtk_entry_set_max_length (GTK_ENTRY(renamew->entry),type==6?PATH_MAX:type==7?16:128);
     if (type==2&&strlen (mainw->set_name)) {
       gtk_entry_set_text (GTK_ENTRY (renamew->entry),mainw->set_name);
     }
     if (type==6) {
       gchar *tmpdir;
-      if (prefs->startup_phase==-1) tmpdir=g_strdup_printf("%s/livestmp/",capable->home_dir);
+      if (prefs->startup_phase==-1) tmpdir=g_build_filename(capable->home_dir,LIVES_TMP_NAME,NULL);
       else tmpdir=g_strdup(prefs->tmpdir);
       gtk_entry_set_text (GTK_ENTRY (renamew->entry),tmpdir);
       g_free(tmpdir);
     }
     gtk_box_pack_start (GTK_BOX (hbox), renamew->entry, TRUE, TRUE, 0);
-    gtk_widget_show (renamew->entry);
   }
 
 
   if (type==6) {
     dirbutton1 = gtk_button_new ();
-    gtk_widget_show (dirbutton1);
     
-    dirimage1 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-    gtk_widget_show (dirimage1);
+    dirimage1 = lives_image_new_from_stock ("gtk-open", LIVES_ICON_SIZE_BUTTON);
 
     gtk_container_add (GTK_CONTAINER (dirbutton1), dirimage1);
 
-    gtk_box_pack_start (GTK_BOX (hbox), dirbutton1, FALSE, TRUE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), dirbutton1, FALSE, TRUE, widget_opts.packing_width);
     g_signal_connect(dirbutton1, "clicked", G_CALLBACK (on_filesel_complex_clicked),renamew->entry);
 
   }
 
 
   gtk_entry_set_activates_default (GTK_ENTRY (renamew->entry), TRUE);
+  gtk_entry_set_width_chars (GTK_ENTRY (renamew->entry),RW_ENTRY_DISPWIDTH);
+
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (renamew->dialog));
 
-  dialog_action_area = GTK_DIALOG (renamew->dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
+
   gtk_dialog_add_action_widget (GTK_DIALOG (renamew->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (cancelbutton);
+
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+			      LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   if (type==6) {
     okbutton = gtk_button_new_from_stock ("gtk-go-forward");
     gtk_button_set_label(GTK_BUTTON(okbutton),_("_Next"));
   }
   else okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
+
   gtk_dialog_add_action_widget (GTK_DIALOG (renamew->dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
 
+  gtk_widget_grab_focus (renamew->entry);
+
 
   if (type!=4&&type!=2&&type!=5) {
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
-		      G_CALLBACK (on_cancel_button1_clicked),
-		      renamew);
-  }
-  else {
-    g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
-		      G_CALLBACK (response_cancel),
+		      G_CALLBACK (lives_general_button_clicked),
 		      renamew);
   }
+
   if (type==1) {
     g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 		      G_CALLBACK (on_rename_set_name),
@@ -2176,19 +1606,12 @@
 		      G_CALLBACK (on_load_set_ok),
 		      GINT_TO_POINTER(FALSE));
   }
-  else if (type==4||type==2||type==5||type==6) {
-    g_signal_connect (GTK_OBJECT (okbutton), "clicked",
-		      G_CALLBACK (response_ok),
-		      NULL);
-  }
 
-  g_signal_connect (GTK_OBJECT (renamew->dialog), "delete_event",
-                      G_CALLBACK (return_true),
-                      NULL);
 
   gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
+  gtk_widget_show_all(renamew->dialog);
 
   return renamew;
 }
@@ -2209,7 +1632,7 @@
     gtk_widget_hide(tvcardw->adv_vbox);
   }
 
-  gtk_widget_queue_resize(tvcardw->adv_vbox->parent);
+  gtk_widget_queue_resize(lives_widget_get_parent(tvcardw->adv_vbox));
 
 }
 
@@ -2217,7 +1640,7 @@
 static void rb_tvcarddef_toggled(GtkToggleButton *tbut, gpointer user_data) {
   lives_tvcardw_t *tvcardw=(lives_tvcardw_t *)(user_data);
 
-  if (!gtk_toggle_button_get_active(tbut)) {
+  if (!lives_toggle_button_get_active(tbut)) {
     gtk_widget_set_sensitive(tvcardw->spinbuttonw,TRUE);
     gtk_widget_set_sensitive(tvcardw->spinbuttonh,TRUE);
     gtk_widget_set_sensitive(tvcardw->spinbuttonf,TRUE);
@@ -2234,12 +1657,13 @@
 
 static void after_dialog_combo_changed (GtkWidget *combo, gpointer user_data) {
   GList *list=(GList *)user_data;
-  gchar *etext=gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo));
+  gchar *etext=lives_combo_get_active_text(LIVES_COMBO(combo));
   mainw->fx1_val=lives_list_index(list,etext);
+  g_free(etext);
 }
 
 
-GtkWidget *create_combo_dialog (gint type, gpointer user_data) {
+GtkWidget *create_combo_dialog (int type, gpointer user_data) {
   // create a dialog with combo box selector
 
   // type 1 == 1 combo box
@@ -2248,26 +1672,17 @@
   GtkWidget *dialog_vbox;
   GtkWidget *label;
   GtkWidget *combo;
-  GtkWidget *okbutton;
-  GtkWidget *cancelbutton;
-  GtkWidget *dialog_action_area;
 
-  gchar *label_text=NULL;
+  gchar *label_text=NULL,*title=NULL;
 
   GList *list=(GList *)user_data;
 
-  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
-
-  combo_dialog = gtk_dialog_new ();
   if (type==1) {
-    gtk_window_set_title (GTK_WINDOW (combo_dialog), _("LiVES:- Select input device"));
+    title=g_strdup(_("LiVES:- Select input device"));
   }
 
-  gtk_window_set_position (GTK_WINDOW (combo_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (combo_dialog), TRUE);
-
-  gtk_container_set_border_width (GTK_CONTAINER (combo_dialog), 20);
-  //gtk_window_set_default_size (GTK_WINDOW (combo_dialog), 300, 200);
+  combo_dialog = lives_standard_dialog_new (title,TRUE);
+  if (title!=NULL) g_free(title);
 
   if (prefs->show_gui) {
     if (type==1) {
@@ -2278,70 +1693,41 @@
     }
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(combo_dialog),FALSE);
-    gtk_widget_modify_bg (combo_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(combo_dialog));
-  gtk_widget_show (dialog_vbox);
 
   if (type==1) {
     label_text=g_strdup(_("Select input device:"));
   }
 
-  label = gtk_label_new (label_text);
+  label = lives_standard_label_new (label_text);
   if (label_text!=NULL) g_free(label_text);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
   gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 0);
-  gtk_widget_show (label);
 
-  combo = gtk_combo_box_new_text();
+  combo = lives_combo_new();
+
+  gtk_entry_set_width_chars (GTK_ENTRY (lives_combo_get_entry(LIVES_COMBO(combo))), 64);
+
+  lives_combo_populate(LIVES_COMBO(combo),list);
 
-  populate_combo_box(GTK_COMBO_BOX(combo), list);
   gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 
   g_signal_connect_after (G_OBJECT (combo), "changed", G_CALLBACK (after_dialog_combo_changed), list);
 
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), combo, TRUE, TRUE, 20);
-  gtk_widget_show (combo);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), combo, TRUE, TRUE, widget_opts.packing_height*2);
 
   if (type==1) {
     add_deinterlace_checkbox(GTK_BOX(dialog_vbox));
   }
 
-  dialog_action_area = GTK_DIALOG (combo_dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
-
-  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (combo_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
-
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
-
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (combo_dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default (okbutton);
-
-  gtk_window_add_accel_group (GTK_WINDOW (combo_dialog), accel_group);
+  if (prefs->show_gui)
+    gtk_widget_show_all(combo_dialog);
 
   return combo_dialog;
-
-
 }
 
 
-GtkWidget*
-create_cdtrack_dialog (gint type, gpointer user_data)
-{
+GtkWidget* create_cdtrack_dialog (int type, gpointer user_data) {
   // general purpose dialog with label and up to 2 spinbuttons
 
   // type 0 = cd track
@@ -2356,55 +1742,43 @@
   // TODO - add pref for dvd/vcd device
 
   // TODO - for CD make this nicer - get track names
+  lives_tvcardw_t *tvcardw=NULL;
 
   GtkWidget *cd_dialog;
   GtkWidget *dialog_vbox;
   GtkWidget *hbox;
-  GtkWidget *hbox17;
-  GtkWidget *hbox17b;
-  GtkWidget *label;
-  GtkWidget *label62=NULL;
-  GtkWidget *label62b;
-  GObject *spinbutton35_adj=NULL;
-  GtkWidget *spinbutton35;
-  GObject *spinbutton36_adj;
-  GtkWidget *spinbutton36=NULL;
-  GObject *spinbutton36b_adj;
-  GtkWidget *spinbutton36b;
-  GtkWidget *radiobutton;
-  GtkWidget *eventbox;
+  GtkWidget *spinbutton;
   GtkWidget *dialog_action_area;
   GtkWidget *cancelbutton;
   GtkWidget *okbutton;
-  GObject *spinbutton_adj;
 
-  gchar *label_text=NULL;
   GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
   
   GSList *radiobutton_group=NULL;
 
-  cd_dialog = gtk_dialog_new ();
+  gchar *label_text=NULL,*title;
+ 
+
   if (type==0) {
-    gtk_window_set_title (GTK_WINDOW (cd_dialog), _("LiVES:- Load CD Track"));
+    title=g_strdup(_("LiVES:- Load CD Track"));
   }
   else if (type==1) {
-    gtk_window_set_title (GTK_WINDOW (cd_dialog), _("LiVES:- Select DVD Title/Chapter"));
+    title=g_strdup(_("LiVES:- Select DVD Title/Chapter"));
   }
   else if (type==2) {
-    gtk_window_set_title (GTK_WINDOW (cd_dialog), _("LiVES:- Select VCD Title"));
+    title=g_strdup(_("LiVES:- Select VCD Title"));
   }
   else if (type==3) {
-    gtk_window_set_title (GTK_WINDOW (cd_dialog), _("LiVES:- Change Maximum Visible Tracks"));
+    title=g_strdup(_("LiVES:- Change Maximum Visible Tracks"));
   }
-  else if (type==4||type==5) {
-    gtk_window_set_title (GTK_WINDOW (cd_dialog), _("LiVES:- Device details"));
+  else {
+    title=g_strdup(_("LiVES:- Device details"));
   }
 
-  gtk_window_set_position (GTK_WINDOW (cd_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (cd_dialog), TRUE);
+  cd_dialog = lives_standard_dialog_new (title,FALSE);
+  g_free(title);
 
-  gtk_container_set_border_width (GTK_CONTAINER (cd_dialog), 10);
-  gtk_window_set_default_size (GTK_WINDOW (cd_dialog), 300, 200);
+  //gtk_window_set_default_size (GTK_WINDOW (cd_dialog), 300, 240);
 
   if (prefs->show_gui) {
     if (type==0||type==1||type==2||type==4||type==5) {
@@ -2415,17 +1789,10 @@
     }
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(cd_dialog),FALSE);
-    gtk_widget_modify_bg (cd_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(cd_dialog));
-  gtk_widget_show (dialog_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 50);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
   if (type==0) {
     label_text=g_strdup_printf(_("Track to load (from %s)"),prefs->cdplay_device);
@@ -2446,79 +1813,66 @@
     label_text=g_strdup(_("Device:        fw:"));
   }
 
-  label = gtk_label_new (label_text);
-  g_free(label_text);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
   if (type==0||type==1||type==2) {
-    spinbutton35_adj = (GObject *)gtk_adjustment_new (mainw->fx1_val, 1., 256., 1., 10., 0.);
+    spinbutton = lives_standard_spin_button_new (label_text,FALSE, mainw->fx1_val,
+						 1., 256., 1., 10., 0,
+						 LIVES_BOX(hbox),NULL);
   }
   else if (type==3) {
-    spinbutton35_adj = (GObject *)gtk_adjustment_new (mainw->fx1_val, 4., 8., 1., 1., 0.);
+    spinbutton = lives_standard_spin_button_new (label_text,FALSE, mainw->fx1_val,
+						 4., 8., 1., 1.,0,
+						 LIVES_BOX(hbox),NULL);
   }
-  else if (type==4||type==5) {
-    spinbutton35_adj = (GObject *)gtk_adjustment_new (0., 0., 7., 1., 1., 0.);
+  else {
+    spinbutton = lives_standard_spin_button_new (label_text,FALSE, 0.,
+						 0., 31., 1., 1., 0, 
+						 LIVES_BOX(hbox),NULL);
   }
 
-  spinbutton35 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton35_adj), 1, 0);
-  gtk_widget_show (spinbutton35);
-  gtk_box_pack_start (GTK_BOX (hbox), spinbutton35, FALSE, TRUE, 0);
-  gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbutton35)->entry)), TRUE);
+  g_free(label_text);
 
-  add_fill_to_box(GTK_BOX(hbox));
+  g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
+			  G_CALLBACK (on_spin_value_changed),
+			  GINT_TO_POINTER (1));
 
-  if (type==1||type==4) {
 
-    hbox17 = gtk_hbox_new (FALSE, 50);
+  add_fill_to_box(GTK_BOX(hbox));
 
-    if (type==1) spinbutton36_adj = (GObject *)gtk_adjustment_new (mainw->fx2_val, 1, 1024, 1, 10, 0);
-    else spinbutton36_adj = (GObject *)gtk_adjustment_new (1, 1, 69, 1, 1, 0);
+  if (type==1||type==4) {
 
-    gtk_widget_show (hbox17);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox17, TRUE, TRUE, 0);
+    hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
-    if (type==1) label62=gtk_label_new(_("Chapter  "));
-    else if (type==4) label62=gtk_label_new(_("Channel  "));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label62, GTK_STATE_NORMAL, &palette->normal_fore);
+    if (type==1) {
+      spinbutton = lives_standard_spin_button_new (_("Chapter  "), FALSE, mainw->fx2_val,
+						   1., 1024., 1., 10., 0, 
+						   LIVES_BOX(hbox),NULL);
     }
+    else {
+      spinbutton = lives_standard_spin_button_new (_("Channel  "), FALSE, 1.,
+						   1., 69., 1., 1., 0, 
+						   LIVES_BOX(hbox),NULL);
 
-    gtk_widget_show (label62);
-    gtk_box_pack_start (GTK_BOX (hbox17), label62, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label62), GTK_JUSTIFY_LEFT);
+    }
 
-    spinbutton36 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton36_adj), 1, 0);
-    gtk_widget_show (spinbutton36);
-    gtk_box_pack_start (GTK_BOX (hbox17), spinbutton36, FALSE, TRUE, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbutton36)->entry)), TRUE);
+    g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
+			    G_CALLBACK (on_spin_value_changed),
+			    GINT_TO_POINTER (2));
 
 
     if (type==1) {
-      hbox17b = gtk_hbox_new (FALSE, 50);
-      if (type==1) spinbutton36b_adj = (GObject *)gtk_adjustment_new (mainw->fx3_val, 128, 159, 1, 1, 0);
-      spinbutton36b = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton36b_adj), 1, 0);
-      gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbutton36b)->entry)), TRUE);
-      
-      gtk_widget_show (hbox17b);
-      gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox17b, TRUE, TRUE, 0);
-      
-      label62b=gtk_label_new(_("Audio ID  "));
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg (label62b, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
-      
-      gtk_widget_show (label62b);
-      gtk_box_pack_start (GTK_BOX (hbox17b), label62b, FALSE, FALSE, 0);
-      gtk_label_set_justify (GTK_LABEL (label62b), GTK_JUSTIFY_LEFT);
+      hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+      gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
       
-      gtk_widget_show (spinbutton36b);
-      gtk_box_pack_start (GTK_BOX (hbox17b), spinbutton36b, FALSE, TRUE, 0);
+      spinbutton = lives_standard_spin_button_new (_("Audio ID  "), FALSE, mainw->fx3_val,
+						   128., 159., 1., 1., 0, 
+						   LIVES_BOX(hbox),NULL);
+
+      g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
+			      G_CALLBACK (on_spin_value_changed),
+			      GINT_TO_POINTER (3));
+
     }
   }
 
@@ -2532,7 +1886,7 @@
     GList *dlist=NULL;
     GList *olist=NULL;
 
-    lives_tvcardw_t *tvcardw=(lives_tvcardw_t *)g_malloc(sizeof(lives_tvcardw_t));
+    tvcardw=(lives_tvcardw_t *)g_malloc(sizeof(lives_tvcardw_t));
     tvcardw->use_advanced=FALSE;
 
     dlist=g_list_append(dlist,(gpointer)"autodetect");
@@ -2552,239 +1906,114 @@
     olist=g_list_append(olist,(gpointer)"i420");
 
 
-    gtk_box_set_spacing(GTK_BOX(dialog_vbox),20);
+    lives_box_set_spacing(GTK_BOX(dialog_vbox),widget_opts.packing_height*2);
+
+    hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
 
-    hbox = gtk_hbox_new (FALSE, 50);
-    gtk_widget_show (hbox);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 20);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
     
     add_fill_to_box(GTK_BOX(hbox));
 
     tvcardw->advbutton = gtk_button_new_with_mnemonic (_("_Advanced"));
-    gtk_widget_show (tvcardw->advbutton);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->advbutton, TRUE, TRUE, 40);
+
+    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->advbutton, TRUE, TRUE, widget_opts.packing_width*4);
     
     add_fill_to_box(GTK_BOX(hbox));
 
 
-    tvcardw->adv_vbox = gtk_vbox_new (FALSE, 50);
-    gtk_widget_show (tvcardw->adv_vbox);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), tvcardw->adv_vbox, TRUE, TRUE, 20);
+    tvcardw->adv_vbox = lives_vbox_new (FALSE, widget_opts.packing_width*5);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), tvcardw->adv_vbox, TRUE, TRUE, widget_opts.packing_height*2);
     
 
     // add input, width, height, fps, driver and outfmt
 
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    label=gtk_label_new_with_mnemonic(_("Input number"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    
-    spinbutton_adj = (GObject *)gtk_adjustment_new (0.,0.,16.,1.,1.,0.);
-    tvcardw->spinbuttoni = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj),1,0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (tvcardw->spinbuttoni)->entry)), TRUE);
-    
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), tvcardw->spinbuttoni);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->spinbuttoni, TRUE, FALSE, 0);
-
+    hbox = lives_hbox_new (FALSE, 0);
     gtk_box_pack_start (GTK_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
-    gtk_widget_show_all (hbox);
 
+    tvcardw->spinbuttoni = lives_standard_spin_button_new (_("Input number"),FALSE,
+							   0.,0.,16.,1.,1.,0,
+							   LIVES_BOX(hbox),NULL);
+							   
 
-    hbox = gtk_hbox_new (FALSE, 0);
-
-    tvcardw->radiobuttond = gtk_radio_button_new (NULL);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (tvcardw->radiobuttond), radiobutton_group);
-    radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (tvcardw->radiobuttond));
-    
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->radiobuttond, FALSE, FALSE, 10);
-    
-    label=gtk_label_new_with_mnemonic (_ ("Use default width, height and FPS"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),tvcardw->radiobuttond);
-    
-    eventbox=gtk_event_box_new();
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
 
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      tvcardw->radiobuttond);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    tvcardw->radiobuttond = lives_standard_radio_button_new (_("Use default width, height and FPS"),FALSE,
+							     radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (tvcardw->radiobuttond));
     
-
     g_signal_connect_after (GTK_OBJECT (tvcardw->radiobuttond), "toggled",
 			    G_CALLBACK (rb_tvcarddef_toggled),
 			    (gpointer)tvcardw);
 
-
-
+    hbox = lives_hbox_new (FALSE, 0);
     gtk_box_pack_start (GTK_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
-    gtk_widget_show_all (hbox);
 
-
-
-    hbox = gtk_hbox_new (FALSE, 0);
-
-    radiobutton = gtk_radio_button_new (radiobutton_group);
-    
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (hbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (hbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-
-    label=gtk_label_new_with_mnemonic(_("Width"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
+    lives_standard_radio_button_new (NULL,FALSE,
+				     radiobutton_group,LIVES_BOX(hbox),NULL);
     
-    spinbutton_adj = (GObject *)gtk_adjustment_new (640.,4.,4096.,2.,2.,0.);
-    tvcardw->spinbuttonw = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj),1,0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (tvcardw->spinbuttonw)->entry)), TRUE);
-    
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), tvcardw->spinbuttonw);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->spinbuttonw, TRUE, FALSE, 0);
+    tvcardw->spinbuttonw = lives_standard_spin_button_new (_("Width"),FALSE,
+							   640.,4.,4096.,2.,2.,0,
+							   LIVES_BOX(hbox),NULL);
 
     gtk_widget_set_sensitive(tvcardw->spinbuttonw,FALSE);
 
-    label=gtk_label_new_with_mnemonic(_("Height"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    
-    spinbutton_adj = (GObject *)gtk_adjustment_new (480.,4.,4096.,2.,2.,0.);
-    tvcardw->spinbuttonh = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj),1,0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (tvcardw->spinbuttonh)->entry)), TRUE);
-    
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), tvcardw->spinbuttonh);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->spinbuttonh, TRUE, FALSE, 0);
+    tvcardw->spinbuttonh = lives_standard_spin_button_new (_("Height"),FALSE,
+							   480.,4.,4096.,2.,2.,0,
+							   LIVES_BOX(hbox),NULL);
+
     gtk_widget_set_sensitive(tvcardw->spinbuttonh,FALSE);
     
+    tvcardw->spinbuttonf = lives_standard_spin_button_new (_("FPS"),FALSE,
+							   25., 1., FPS_MAX, 1., 10., 3,
+							   LIVES_BOX(hbox),NULL);
 
-    label=gtk_label_new_with_mnemonic(_("FPS"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    
-    spinbutton_adj = (GObject *)gtk_adjustment_new (25., 1., FPS_MAX, 1., 10., 0.);
-    tvcardw->spinbuttonf = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj),1,3);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (tvcardw->spinbuttonf)->entry)), TRUE);
-    
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), tvcardw->spinbuttonf);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->spinbuttonf, TRUE, FALSE, 0);
     gtk_widget_set_sensitive(tvcardw->spinbuttonf,FALSE);
 
-    gtk_box_pack_start (GTK_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
-    gtk_widget_show_all (hbox);
-
-
-    hbox = gtk_hbox_new (FALSE, 0);
-
-    tvcardw->combod = gtk_combo_new ();
- 
-    label = gtk_label_new_with_mnemonic (_("Driver"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),GTK_COMBO(tvcardw->combod)->entry);
- 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->combod, FALSE, TRUE, 10);
-    gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO (tvcardw->combod))->entry),FALSE);
-   
-    combo_set_popdown_strings (GTK_COMBO (tvcardw->combod), dlist);
-    gtk_entry_set_activates_default(GTK_ENTRY((GTK_COMBO(tvcardw->combod))->entry),TRUE);
-
-
-
+    hbox = lives_hbox_new (FALSE, 0);
 
-    tvcardw->comboo = gtk_combo_new ();
- 
-    label = gtk_label_new_with_mnemonic (_("Output format"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),GTK_COMBO(tvcardw->comboo)->entry);
- 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    tvcardw->combod = lives_standard_combo_new (_("_Driver"),TRUE,dlist,LIVES_BOX(hbox),NULL);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(tvcardw->combod), 0);
 
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), tvcardw->comboo, FALSE, TRUE, 10);
-    gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO (tvcardw->comboo))->entry),FALSE);
-    gtk_entry_set_activates_default(GTK_ENTRY((GTK_COMBO(tvcardw->comboo))->entry),TRUE);
-   
-    combo_set_popdown_strings (GTK_COMBO (tvcardw->comboo), olist);
+    tvcardw->comboo = lives_standard_combo_new (_("_Output format"),TRUE,olist,LIVES_BOX(hbox),NULL);
 
 
     gtk_widget_show_all (hbox);
     gtk_box_pack_start (GTK_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
 
-
-
-
-
-
-
-
     g_signal_connect (GTK_OBJECT (tvcardw->advbutton), "clicked",
 		      G_CALLBACK (on_liveinp_advanced_clicked),
 		      tvcardw);
 
-
     gtk_widget_hide(tvcardw->adv_vbox);
 
     g_object_set_data(G_OBJECT(cd_dialog),"tvcard_data",tvcardw);
 
   }
 
-  dialog_action_area = GTK_DIALOG (cd_dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (cd_dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (cd_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
-
-  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (cd_dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
+
   gtk_widget_grab_default (okbutton);
-  
-  g_signal_connect_after (GTK_OBJECT (spinbutton35), "value_changed",
-			  G_CALLBACK (on_spin_value_changed),
-			  GINT_TO_POINTER (1));
 
-  if (type==4) {
-    g_signal_connect_after (GTK_OBJECT (spinbutton36), "value_changed",
-			    G_CALLBACK (on_spin_value_changed),
-			    GINT_TO_POINTER (2));
-  }
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
-  if (type==1) {
-    g_signal_connect_after (GTK_OBJECT (spinbutton36), "value_changed",
-			    G_CALLBACK (on_spin_value_changed),
-			    GINT_TO_POINTER (3));
-  }
+  
+  gtk_widget_add_accelerator (okbutton, "activate", accel_group,
+                              LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
 
   if (type!=4&&type!=5) {
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
-		      G_CALLBACK (on_cancel_button1_clicked),
+		      G_CALLBACK (lives_general_button_clicked),
 		      NULL);
   }
 
@@ -2804,22 +2033,21 @@
 		      user_data);
   }
 
-
   gtk_window_add_accel_group (GTK_WINDOW (cd_dialog), accel_group);
 
+  gtk_widget_show_all(cd_dialog);
+
+  if (type==4) gtk_widget_hide(tvcardw->adv_vbox);
 
   return cd_dialog;
 }
 
 
 
-static void rb_aud_sel_pressed (GtkButton *button,
-				gpointer user_data) {
-  
+static void rb_aud_sel_pressed (GtkButton *button, gpointer user_data) {
   aud_dialog_t *audd=(aud_dialog_t *)user_data;
   audd->is_sel=!audd->is_sel;
-  gtk_widget_set_sensitive(audd->time_spin,audd->is_sel);
-
+  gtk_widget_set_sensitive(audd->time_spin,!audd->is_sel);
 }
 
 
@@ -2833,49 +2061,34 @@
   GtkWidget *hbox;
   GtkWidget *rb_time;
   GtkWidget *rb_sel;
-  GtkWidget *label61;
-  GtkWidget *label62;
-  GObject *spinbutton35_adj;
-  GtkWidget *dialog_action_area11;
-  GtkWidget *cancelbutton9;
-  GtkWidget *okbutton8;
-  gchar *label_text=NULL,*label_text2=NULL;
-  gdouble max;
+  GtkWidget *label;
+
+  gchar *label_text=NULL,*label_text2=NULL,*title;
+
+  double max;
+
   GSList *radiobutton_group = NULL;
 
   aud_dialog_t *audd=(aud_dialog_t *)g_malloc(sizeof(aud_dialog_t));
 
-  audd->is_sel=FALSE;
-
-  audd->dialog = gtk_dialog_new ();
   if (type==0) {
-    gtk_window_set_title (GTK_WINDOW (audd->dialog), _("LiVES:- Fade Audio In"));
+    title=g_strdup(_("LiVES:- Fade Audio In"));
   }
-  else if (type==1) {
-    gtk_window_set_title (GTK_WINDOW (audd->dialog), _("LiVES:- Fade Audio Out"));
+  else {
+    title=g_strdup(_("LiVES:- Fade Audio Out"));
   }
 
-  gtk_window_set_position (GTK_WINDOW (audd->dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (audd->dialog), TRUE);
-
-  gtk_container_set_border_width (GTK_CONTAINER (audd->dialog), 10);
-  gtk_window_set_default_size (GTK_WINDOW (audd->dialog), 300, 200);
+  audd->dialog = lives_standard_dialog_new (title,TRUE);
+  g_free(title);
 
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(audd->dialog),GTK_WINDOW(mainw->LiVES));
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(audd->dialog),FALSE);
-    gtk_widget_modify_bg (audd->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(audd->dialog));
-  gtk_widget_show (dialog_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 50);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, TB_HEIGHT_A);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
   if (type==0) {
     label_text=g_strdup(_("Fade in over  "));
@@ -2886,96 +2099,55 @@
     label_text2=g_strdup(_("last"));
   }
 
-  label61 = gtk_label_new (label_text);
+
+  label = lives_standard_label_new (label_text);
   if (label_text!=NULL) g_free(label_text);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label61, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  gtk_widget_show (label61);
-  gtk_box_pack_start (GTK_BOX (hbox), label61, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label61), GTK_JUSTIFY_LEFT);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-  rb_time=gtk_radio_button_new(radiobutton_group);
-  gtk_widget_show (rb_time);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb_time));
+  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
-  gtk_box_pack_start (GTK_BOX (hbox), rb_time, FALSE, TRUE, 0);
+  rb_time=lives_standard_radio_button_new(label_text2,FALSE,radiobutton_group,
+					  LIVES_BOX(hbox),NULL);
 
-  label61 = gtk_label_new (label_text2);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rb_time));
   if (label_text2!=NULL) g_free(label_text2);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label61, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (label61);
-  gtk_box_pack_start (GTK_BOX (hbox), label61, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label61), GTK_JUSTIFY_LEFT);
-
-  max=cfile->laudio_time/2.;
-  if (max>MAX_FADE_SECS) max=MAX_FADE_SECS;
-
-  spinbutton35_adj = (GObject *)gtk_adjustment_new (10, .1, max, 1, 10, 0);
-  audd->time_spin = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton35_adj), 1, 1);
-  gtk_widget_show (audd->time_spin);
-  gtk_box_pack_start (GTK_BOX (hbox), audd->time_spin, FALSE, TRUE, 0);
 
-  label62=gtk_label_new(_("seconds."));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label62, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  gtk_widget_show (label62);
-  gtk_box_pack_start (GTK_BOX (hbox), label62, FALSE, FALSE, 10);
-  gtk_label_set_justify (GTK_LABEL (label62), GTK_JUSTIFY_LEFT);
+  max=cfile->laudio_time;
 
-  hbox = gtk_hbox_new (FALSE, 50);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
+  widget_opts.swap_label=TRUE;
+  audd->time_spin = lives_standard_spin_button_new (_("seconds."),FALSE,
+						    max/2.>DEF_AUD_FADE_SECS?DEF_AUD_FADE_SECS:max/2., .1, max, 1., 10., 2,
+						    LIVES_BOX(hbox),NULL);
+  widget_opts.swap_label=FALSE;
 
-  add_fill_to_box(GTK_BOX(hbox));
+  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
+  rb_sel=lives_standard_radio_button_new(_("selection"),FALSE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
-  rb_sel=gtk_radio_button_new(radiobutton_group);
-  gtk_widget_show (rb_sel);
+  audd->is_sel=FALSE;
 
-  gtk_box_pack_start (GTK_BOX (hbox), rb_sel, FALSE, TRUE, 0);
+  if ((cfile->end-1.)/cfile->fps>cfile->laudio_time) {
+    // if selection is longer than audio time, we cannot use sel len
+    gtk_widget_set_sensitive(rb_sel,FALSE);
+  }
+  else {
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rb_sel),TRUE);
+    rb_aud_sel_pressed(GTK_BUTTON(rb_sel),(gpointer)audd);
+  }
 
   g_signal_connect_after (GTK_OBJECT (rb_sel), "toggled",
 			  G_CALLBACK (rb_aud_sel_pressed),
 			  (gpointer)audd);
 
-  label62=gtk_label_new(_("selection."));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label62, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (label62);
-  gtk_box_pack_start (GTK_BOX (hbox), label62, FALSE, FALSE, 10);
-  gtk_label_set_justify (GTK_LABEL (label62), GTK_JUSTIFY_LEFT);
 
   add_fill_to_box(GTK_BOX(hbox));
 
-  dialog_action_area11 = GTK_DIALOG (audd->dialog)->action_area;
-  gtk_widget_show (dialog_action_area11);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area11), GTK_BUTTONBOX_END);
-
-  cancelbutton9 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton9);
-  gtk_dialog_add_action_widget (GTK_DIALOG (audd->dialog), cancelbutton9, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton9, GTK_CAN_DEFAULT);
-
-  okbutton8 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton8);
-  gtk_dialog_add_action_widget (GTK_DIALOG (audd->dialog), okbutton8, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton8, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default (okbutton8);
-
 
-  if ((cfile->end-1.)/cfile->fps>cfile->laudio_time) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rb_sel),FALSE);
-    gtk_widget_set_sensitive(rb_sel,FALSE);
-  }
+  gtk_widget_show_all(audd->dialog);
   
   return audd;
 }
@@ -2983,366 +2155,106 @@
 
 
 
-_xranw *
-create_rp_dialog (void)
-{
-  GtkWidget *dialog_vbox14;
-  GtkWidget *vbox19;
-  GtkWidget *hbox21;
-  GtkWidget *label89;
-  GObject *spinbutton50_adj;
-  GtkWidget *hbox20;
-  GtkWidget *label88;
-  GtkWidget *button13;
-  GtkWidget *image413;
-  GtkWidget *hbox22;
-  GtkWidget *eventbox;
-  GtkWidget *hbox;
-  GtkWidget *label;
-  GtkWidget *label90;
-  GObject *spinbutton51_adj;
-  GtkWidget *hbox23;
-  GtkWidget *label91;
-  GObject *spinbutton52_adj;
-  GtkWidget *dialog_action_area14;
-  GtkWidget *cancelbutton12;
-  GtkWidget *okbutton11;
-
-  _xranw *xranw=(_xranw*)(g_malloc(sizeof(_xranw)));
-
-  xranw->rp_dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (xranw->rp_dialog), _("LiVES: - Play Random Music"));
-
-  dialog_vbox14 = lives_dialog_get_content_area(GTK_DIALOG(xranw->rp_dialog));
-  gtk_widget_show (dialog_vbox14);
-
-  if (prefs->show_gui) {
-    gtk_window_set_transient_for(GTK_WINDOW(xranw->rp_dialog),GTK_WINDOW(mainw->LiVES));
-  }
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(xranw->rp_dialog),FALSE);
-    gtk_widget_modify_bg (xranw->rp_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_window_set_position (GTK_WINDOW (xranw->rp_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (xranw->rp_dialog), TRUE);
-
-  gtk_container_set_border_width (GTK_CONTAINER (xranw->rp_dialog), 10);
-  gtk_window_set_default_size (GTK_WINDOW (xranw->rp_dialog), 600, 300);
-
-  vbox19 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox19);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox14), vbox19, TRUE, TRUE, 0);
-
-  hbox21 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox21);
-  gtk_box_pack_start (GTK_BOX (vbox19), hbox21, TRUE, TRUE, 0);
-
-  label89 = gtk_label_new (_("Number of Tracks Requested:    "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label89, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (label89);
-  gtk_box_pack_start (GTK_BOX (hbox21), label89, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label89), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label89, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton50_adj = (GObject *)gtk_adjustment_new (10, 1, 100, 1, 10, 0);
-  xranw->numtracks = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton50_adj), 1, 0);
-  gtk_widget_show (xranw->numtracks);
-  gtk_box_pack_start (GTK_BOX (hbox21), xranw->numtracks, FALSE, FALSE, 0);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (xranw->numtracks), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (xranw->numtracks), GTK_UPDATE_IF_VALID);
-
-  hbox20 = gtk_hbox_new (FALSE, 16);
-  gtk_widget_show (hbox20);
-  gtk_box_pack_start (GTK_BOX (vbox19), hbox20, TRUE, TRUE, 0);
-
-  label88 = gtk_label_new (_("Directory:"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label88, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label88);
-  gtk_box_pack_start (GTK_BOX (hbox20), label88, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label88), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label88, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  xranw->dir = gtk_entry_new ();
-  gtk_widget_show (xranw->dir);
-  gtk_box_pack_start (GTK_BOX (hbox20), xranw->dir, TRUE, TRUE, 0);
-  gtk_entry_set_text(GTK_ENTRY(xranw->dir),mainw->audio_dir);
-
-  button13 = gtk_button_new ();
-  gtk_widget_show (button13);
-  gtk_box_pack_start (GTK_BOX (hbox20), button13, FALSE, FALSE, 0);
-
-  image413 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (image413);
-  gtk_container_add (GTK_CONTAINER (button13), image413);
-
-  xranw->subdir_check = gtk_check_button_new ();
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic (_("Include subdirectories"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),xranw->subdir_check);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    xranw->subdir_check);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox19), hbox, FALSE, FALSE, 10);
-
-  gtk_box_pack_start (GTK_BOX (hbox), xranw->subdir_check, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  GTK_WIDGET_SET_FLAGS (xranw->subdir_check, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_widget_show_all(hbox);
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(xranw->subdir_check),TRUE);
-
-  hbox22 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox22);
-  gtk_box_pack_start (GTK_BOX (vbox19), hbox22, TRUE, TRUE, 0);
-
-  label90 = gtk_label_new (_("Minimum File Size (MB)         "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label90, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label90);
-  gtk_box_pack_start (GTK_BOX (hbox22), label90, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label90), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label90, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton51_adj = (GObject *)gtk_adjustment_new (2, 0, 100, 1, 10, 0);
-  xranw->minsize = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton51_adj), 1, 0);
-  gtk_widget_show (xranw->minsize);
-  gtk_box_pack_start (GTK_BOX (hbox22),xranw->minsize, FALSE, FALSE, 10);
-
-  hbox23 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox23);
-  gtk_box_pack_start (GTK_BOX (vbox19), hbox23, TRUE, TRUE, 0);
-
-  label91 = gtk_label_new (_("Maximum File Size (MB)        "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label91, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label91);
-  gtk_box_pack_start (GTK_BOX (hbox23), label91, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label91), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label91, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton52_adj = (GObject *)gtk_adjustment_new (10, 0, 100, 1, 10, 0);
-  xranw->maxsize = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton52_adj), 1, 0);
-  gtk_widget_show (xranw->maxsize);
-  gtk_box_pack_start (GTK_BOX (hbox23), xranw->maxsize, FALSE, FALSE, 10);
-
-  dialog_action_area14 = GTK_DIALOG (xranw->rp_dialog)->action_area;
-  gtk_widget_show (dialog_action_area14);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area14), GTK_BUTTONBOX_END);
-
-  cancelbutton12 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton12);
-  gtk_dialog_add_action_widget (GTK_DIALOG (xranw->rp_dialog), cancelbutton12, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton12, GTK_CAN_DEFAULT);
-
-  okbutton11 = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton11);
-  gtk_dialog_add_action_widget (GTK_DIALOG (xranw->rp_dialog), okbutton11, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton11, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default (okbutton11);
-
-  g_signal_connect(okbutton11, "clicked", G_CALLBACK (on_xmms_ran_ok_clicked),NULL);
-  g_signal_connect(cancelbutton12, "clicked", G_CALLBACK (on_cancel_button1_clicked),xranw);
-  g_signal_connect(button13, "clicked", G_CALLBACK (on_filesel_simple_clicked),xranw->dir);
-  g_signal_connect (GTK_OBJECT (xranw->rp_dialog), "delete_event",
-                      G_CALLBACK (return_true),
-                      NULL);
-
-  return xranw;
-}
-
 
 _commentsw* create_comments_dialog (file *sfile, gchar *filename) {
   GtkWidget *dialog_vbox;
   GtkWidget *table;
   GtkWidget *label;
-  GtkWidget *expander;
   GtkWidget *vbox;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
-  GtkWidget *dialog_action_area;
-  GtkWidget *okbutton;
-  GtkWidget *cancelbutton;
   GtkWidget *buttond;
 
   _commentsw *commentsw=(_commentsw*)(g_malloc(sizeof(_commentsw)));
 
-  gint bheight=200;
+  commentsw->comments_dialog = lives_standard_dialog_new (_("LiVES: - File Comments (optional)"),TRUE);
 
-  if (sfile!=NULL) bheight=350;
-
-  commentsw->comments_dialog = gtk_dialog_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (commentsw->comments_dialog), 10);
-  gtk_window_set_title (GTK_WINDOW (commentsw->comments_dialog), _("LiVES: - File Comments (optional)"));
-  gtk_window_set_position (GTK_WINDOW (commentsw->comments_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (commentsw->comments_dialog), TRUE);
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(commentsw->comments_dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(commentsw->comments_dialog),FALSE);
-    gtk_widget_modify_bg (commentsw->comments_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_window_set_default_size (GTK_WINDOW (commentsw->comments_dialog), 600, bheight);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(commentsw->comments_dialog));
-  gtk_widget_show (dialog_vbox);
 
   table = gtk_table_new (4, 2, FALSE);
-  gtk_widget_show (table);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), table, TRUE, TRUE, 10);
+  gtk_container_set_border_width(GTK_CONTAINER(table), widget_opts.border_width);
+
+  gtk_table_set_row_spacings(GTK_TABLE(table), widget_opts.packing_height*2);
+
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), table, TRUE, TRUE, widget_opts.packing_height);
+
+  label = lives_standard_label_new (_("Title/Name : "));
 
-  label = gtk_label_new (_("Title/Name : "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
-  label = gtk_label_new (_("Author/Artist : "));
-  gtk_widget_show (label);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label = lives_standard_label_new (_("Author/Artist : "));
+
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
-  label = gtk_label_new (_("Comments : "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
+  label = lives_standard_label_new (_("Comments : "));
+
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
-  commentsw->title_entry = gtk_entry_new ();
-  gtk_widget_show (commentsw->title_entry);
+  commentsw->title_entry = lives_standard_entry_new (NULL,FALSE,cfile->title,80,-1,NULL,NULL);
+
   gtk_table_attach (GTK_TABLE (table), commentsw->title_entry, 1, 2, 0, 1,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_entry_set_text (GTK_ENTRY (commentsw->title_entry),cfile->title);
 
-  commentsw->author_entry = gtk_entry_new ();
-  gtk_widget_show (commentsw->author_entry);
+  commentsw->author_entry = lives_standard_entry_new (NULL,FALSE,cfile->author,80,-1,NULL,NULL);
+
   gtk_table_attach (GTK_TABLE (table), commentsw->author_entry, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_entry_set_text (GTK_ENTRY (commentsw->author_entry),cfile->author);
 
-  commentsw->comment_entry = gtk_entry_new ();
-  gtk_widget_show (commentsw->comment_entry);
+  commentsw->comment_entry = lives_standard_entry_new (NULL,FALSE,cfile->comment,80,250,NULL,NULL);
+
   gtk_table_attach (GTK_TABLE (table), commentsw->comment_entry, 1, 2, 3, 4,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_entry_set_max_length (GTK_ENTRY (commentsw->comment_entry), 250);
-
-  gtk_entry_set_text (GTK_ENTRY (commentsw->comment_entry),cfile->comment);
 
   if (sfile!=NULL) {
+    // options
+    vbox = lives_vbox_new (FALSE, 0);
 
-    expander=gtk_expander_new_with_mnemonic(_("_Options"));
-    gtk_widget_show (expander);
-  
-    if (palette->style&STYLE_1) {
-      label=gtk_expander_get_label_widget(GTK_EXPANDER(expander));
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), expander, TRUE, TRUE, 0);
-
-    vbox = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox);
-    gtk_container_add (GTK_CONTAINER (expander), vbox);
+    lives_standard_expander_new(_("_Options"),TRUE,LIVES_BOX(dialog_vbox),vbox);
 
-    // options
+    add_fill_to_box(LIVES_BOX(vbox));
 
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    commentsw->subt_checkbutton = gtk_check_button_new ();
-    //if (param->desc!=NULL) gtk_widget_set_tooltip_text( checkbutton, param->desc, NULL);
-    eventbox=gtk_event_box_new();
-    //gtk_tooltips_copy(eventbox,checkbutton);
-    label=gtk_label_new_with_mnemonic (_("Save _subtitles to file"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),commentsw->subt_checkbutton);
-    
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      commentsw->subt_checkbutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
+    commentsw->subt_checkbutton = lives_standard_check_button_new (_("Save _subtitles to file"),TRUE,LIVES_BOX(hbox),NULL);
 
     if (sfile->subt==NULL) {
       gtk_widget_set_sensitive(commentsw->subt_checkbutton,FALSE);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(commentsw->subt_checkbutton),FALSE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton),FALSE);
     }
-    else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(commentsw->subt_checkbutton),TRUE);
+    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton),TRUE);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), commentsw->subt_checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    gtk_widget_show_all (hbox);
 
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-    commentsw->subt_entry=gtk_entry_new();
-    gtk_entry_set_width_chars(GTK_ENTRY(commentsw->subt_entry),32);
-    label = gtk_label_new_with_mnemonic (_("Subtitle file"));
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    commentsw->subt_entry=lives_standard_entry_new(_("Subtitle file"),FALSE,NULL,32,-1,LIVES_BOX(hbox),NULL);
 
     buttond = gtk_button_new_with_mnemonic(_("Browse..."));
 
     g_signal_connect (buttond, "clicked",G_CALLBACK (on_save_subs_activate),
     		      (gpointer)commentsw->subt_entry);
 
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), commentsw->subt_entry, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), buttond, FALSE, FALSE, 10);
-    gtk_widget_show_all (hbox);
+    gtk_box_pack_start (GTK_BOX (hbox), buttond, FALSE, FALSE, widget_opts.packing_width);
+
+    add_fill_to_box(LIVES_BOX(vbox));
+
 
     if (sfile->subt==NULL) {
       gtk_widget_set_sensitive(commentsw->subt_entry,FALSE);
@@ -3371,63 +2283,71 @@
     }
   }
 
-  dialog_action_area = GTK_DIALOG (commentsw->comments_dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
+  gtk_widget_show_all(commentsw->comments_dialog);
 
-  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (commentsw->comments_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  return commentsw;
+}
 
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (commentsw->comments_dialog), okbutton, GTK_RESPONSE_OK);
 
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_widget_grab_focus (okbutton);
-  gtk_widget_grab_default (okbutton);
+gchar last_good_folder[PATH_MAX];
 
-  return commentsw;
-}
+static void chooser_check_dir(GtkFileChooser *chooser, gpointer user_data) {
+  gchar *cwd=g_get_current_dir();
+  gchar *new_dir=gtk_file_chooser_get_current_folder(chooser);
+
+  if (!strcmp(new_dir,last_good_folder)) return;
 
+  if (lives_chdir(new_dir,TRUE)) {
+    g_free(cwd);
+    gtk_file_chooser_set_current_folder(chooser,last_good_folder);
+    do_dir_perm_access_error(new_dir);
+    return;
+  }
+  g_snprintf(last_good_folder,PATH_MAX,"%s",new_dir);
+  lives_chdir(cwd,FALSE);
+  g_free(cwd);
+
+}
 
 
 
 
-gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, GtkFileChooserAction act, const char *title, 
-		   GtkWidget *extra_widget) {
+gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, lives_file_chooser_action_t act, const char *title, GtkWidget *extra_widget) {
   // new style file chooser
 
   // in/out values are in utf8 encoding
 
-  GList *children;
-
   GtkWidget *chooser;
   GtkFileFilter *filter;
-  gchar *filename;
-  int i;
-  gint response;
+
+  gchar *filename=NULL;
   gchar *mytitle;
-  gchar *tmp;
+
+  int response;
+
+  register int i;
 
   if (title==NULL) {
-    if (act==GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) {
-      mytitle=g_strdup(_("LiVES: choose a directory"));
+    if (act==LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE) {
+      mytitle=g_strdup(_("LiVES: - choose a device"));
+      act=LIVES_FILE_CHOOSER_ACTION_OPEN;
+    }
+    else if (act==LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER) {
+      mytitle=g_strdup(_("LiVES: - choose a directory"));
     }
     else {
-      mytitle=g_strdup(_("LiVES: choose a file"));
+      mytitle=g_strdup(_("LiVES: - choose a file"));
     }
   }
   else mytitle=g_strdup(title);
 
-  if (act!=GTK_FILE_CHOOSER_ACTION_SAVE) 
-    chooser=gtk_file_chooser_dialog_new(mytitle,GTK_WINDOW(mainw->LiVES),act,GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+  if (act!=LIVES_FILE_CHOOSER_ACTION_SAVE) 
+    chooser=gtk_file_chooser_dialog_new(mytitle,GTK_WINDOW(mainw->LiVES),(GtkFileChooserAction)act,GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 					NULL);
 
   else {
-    chooser=gtk_file_chooser_dialog_new(mytitle,GTK_WINDOW(mainw->LiVES),act,GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+    chooser=gtk_file_chooser_dialog_new(mytitle,GTK_WINDOW(mainw->LiVES),(GtkFileChooserAction)act,GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 					NULL);
   }
@@ -3436,22 +2356,16 @@
   g_free(mytitle);
 
   gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(chooser),TRUE);
-  if (dir!=NULL) {
-    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),(tmp=g_filename_from_utf8(dir,-1,NULL,NULL,NULL)));
-    gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(chooser),tmp,NULL);
-    g_free(tmp);
-  }
-#if GLIB_CHECK_VERSION(2,8,0)
-  gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser),TRUE);
-#endif
+
+
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(chooser, GTK_STATE_NORMAL, &palette->normal_back);
-    children=gtk_container_get_children(GTK_CONTAINER(chooser));
-    while (children!=NULL) {
-      GtkWidget *child=(GtkWidget *)children->data;
-      gtk_widget_modify_fg(child, GTK_STATE_NORMAL, &palette->normal_fore);
-      children=children->next;
-    }
+    lives_widget_set_bg_color(chooser, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    gtk_container_forall(GTK_CONTAINER(chooser),set_child_colour,GINT_TO_POINTER(FALSE));
+  }
+
+  if (dir!=NULL) {
+    gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),dir);
+    gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(chooser),dir,NULL);
   }
 
   if (filt!=NULL) {
@@ -3459,30 +2373,66 @@
     gtk_file_filter_add_pattern(filter,filt[0]);
     for (i=1;filt[i]!=NULL;i++) gtk_file_filter_add_pattern(filter,filt[i]);
     gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(chooser),filter);
-    if (fname!=NULL) gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser),fname);
-    else if (i==1&&act==GTK_FILE_CHOOSER_ACTION_SAVE) gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser),filt[0]);
+    if (fname==NULL&&i==1&&act==LIVES_FILE_CHOOSER_ACTION_SAVE) 
+      gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser),filt[0]); //utf-8
   }
-  else {
+
+  if (fname!=NULL) {
+    gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser),fname); // utf-8
     if (fname!=NULL&&dir!=NULL) {
-      gchar *ffname=g_strconcat(dir,fname,NULL);
-      gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER(chooser), dir);
-      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER(chooser), fname);
-      gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(chooser),ffname);
+      gchar *ffname=g_build_filename(dir,fname,NULL);
+      gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(chooser),ffname); // must be dir and file
       g_free(ffname);
     }
   }
 
-  if (extra_widget!=NULL) gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(chooser),extra_widget);
+  gtk_container_set_border_width (GTK_CONTAINER (chooser), widget_opts.border_width);
+  gtk_window_set_position (GTK_WINDOW (chooser), GTK_WIN_POS_CENTER_ALWAYS);
+
+  if (prefs->show_gui) {
+    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(chooser),GTK_WINDOW(mainw->LiVES));
+    else gtk_window_set_transient_for(GTK_WINDOW(chooser),GTK_WINDOW(mainw->multitrack->window));
+  }
+
+  if (prefs->gui_monitor!=0) {
+    int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width
+						   -lives_widget_get_allocation_width(chooser))/2;
+   int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
+						  lives_widget_get_allocation_height(chooser))/2;
+   gtk_window_move(GTK_WINDOW(chooser),xcen,ycen);
+  }
+  
+  g_signal_connect (chooser, "current-folder-changed", G_CALLBACK (chooser_check_dir), NULL);
+
+  gtk_widget_grab_focus (chooser);
 
   gtk_widget_show(chooser);
 
-  if ((response=gtk_dialog_run(GTK_DIALOG(chooser)))==GTK_RESPONSE_CANCEL) {
-    gtk_widget_destroy(chooser);
-    return NULL;
+  gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
+
+  memset(last_good_folder,0,1);
+
+  if (extra_widget==mainw->LiVES) {
+    return (gchar *)chooser; // kludge to allow custom adding of extra widgets
   }
 
-  filename=g_filename_to_utf8((tmp=gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser))),-1,NULL,NULL,NULL);
-  g_free(tmp);
+  if (extra_widget!=NULL) gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(chooser),extra_widget);
+
+ rundlg:
+  
+  if ((response=gtk_dialog_run(GTK_DIALOG(chooser)))!=GTK_RESPONSE_CANCEL) {
+    gchar *tmp;
+    filename=g_filename_to_utf8((tmp=gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser))),-1,NULL,NULL,NULL);
+    g_free(tmp);
+  }
+
+  if (filename!=NULL&&act==LIVES_FILE_CHOOSER_ACTION_SAVE) {
+    if (!check_file(filename,TRUE)) {
+      g_free(filename);
+      filename=NULL;
+      goto rundlg;
+    }
+  }
 
   gtk_widget_destroy(chooser);
 
@@ -3491,6 +2441,65 @@
 }
 
 
+static void chooser_response(GtkDialog *dialog, gint response, gpointer user_data) {
+  int type=GPOINTER_TO_INT(user_data);
+
+  if (response!=GTK_RESPONSE_CANCEL) {
+    switch (type) {
+    case 1:
+      on_ok_filesel_open_clicked(GTK_FILE_CHOOSER(dialog),NULL);
+      break;
+    case 2:
+      on_open_new_audio_clicked(GTK_FILE_CHOOSER(dialog),NULL);
+      break;
+    case 3:
+      on_ok_file_open_clicked(GTK_FILE_CHOOSER(dialog),NULL);
+      break;
+    case 4:
+      //on_xmms_ok_clicked(GTK_FILE_CHOOSER(dialog),NULL);
+      break;
+    case 5:
+      on_ok_append_audio_clicked(GTK_FILE_CHOOSER(dialog),NULL);
+      break;
+    default:
+      break;
+    }
+  }
+  else on_cancel_button1_clicked(GTK_WIDGET(dialog),NULL);
+}
+
+
+
+
+void choose_file_with_preview (gchar *dir, const gchar *title, int preview_type) {
+  // preview_type 1 - video and audio open (single - opensel)
+  // preview type 2 - import audio
+  // preview_type 3 - video and audio open (multiple)
+  // type 4 xmms (deprecated)
+  // type 5 append audio
+
+  GtkWidget *chooser;
+
+  chooser=(GtkWidget *)choose_file(dir,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,title,mainw->LiVES);
+  
+  if (preview_type==3) gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(chooser),TRUE);
+
+  widget_add_preview(chooser,LIVES_BOX(lives_dialog_get_content_area(LIVES_DIALOG(chooser))),
+		     LIVES_BOX(lives_dialog_get_content_area(LIVES_DIALOG(chooser))),
+		     LIVES_BOX(lives_dialog_get_action_area(LIVES_DIALOG(chooser))),
+		     preview_type==3?1:preview_type>3?2:preview_type);
+
+  if (prefs->fileselmax) {
+    gtk_window_set_resizable (GTK_WINDOW(chooser),TRUE);
+    gtk_window_maximize (GTK_WINDOW(chooser));
+    gtk_widget_queue_draw(chooser);
+    lives_widget_context_update();
+  }
+
+  g_signal_connect (chooser, "response", G_CALLBACK (chooser_response), GINT_TO_POINTER(preview_type));
+}
+
+
 
 
 
@@ -3510,18 +2519,10 @@
 
   cdsw->warn_checkbutton=NULL;
 
-  cdsw->dialog = gtk_dialog_new ();
+  cdsw->dialog = lives_standard_dialog_new (_("LiVES: - Cancel/Discard/Save"),FALSE);
+
   accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (cdsw->dialog), accel_group);
-  gtk_window_set_title (GTK_WINDOW (cdsw->dialog), _("LiVES: - Cancel/Discard/Save"));
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(cdsw->dialog),FALSE);
-    gtk_widget_modify_bg(cdsw->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_window_set_modal (GTK_WINDOW (cdsw->dialog), TRUE);
-  gtk_window_set_position (GTK_WINDOW (cdsw->dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (cdsw->dialog), 350, 200);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(cdsw->dialog),GTK_WINDOW(mainw->LiVES));
@@ -3529,94 +2530,61 @@
   }
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(cdsw->dialog));
-  gtk_widget_show (dialog_vbox);
 
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
   if (type==0) {
     if (strlen(mainw->multitrack->layout_name)==0) {
-      label = gtk_label_new (_("You are about to leave multitrack mode.\nThe current layout has not been saved.\nWhat would you like to do ?\n"));
+      label = lives_standard_label_new (_("You are about to leave multitrack mode.\nThe current layout has not been saved.\nWhat would you like to do ?\n"));
     }
     else {
-      label = gtk_label_new (_("You are about to leave multitrack mode.\nThe current layout has been changed since the last save.\nWhat would you like to do ?\n"));
+      label = lives_standard_label_new (_("You are about to leave multitrack mode.\nThe current layout has been changed since the last save.\nWhat would you like to do ?\n"));
     }
   }
   else if (type==1) {
-    if (!mainw->only_close) label = gtk_label_new (_("You are about to exit LiVES.\nThe current clip set can be saved.\nWhat would you like to do ?\n"));
-    else label = gtk_label_new (_("The current clip set has not been saved.\nWhat would you like to do ?\n"));
+    if (!mainw->only_close) label = lives_standard_label_new (_("You are about to exit LiVES.\nThe current clip set can be saved.\nWhat would you like to do ?\n"));
+    else label = lives_standard_label_new (_("The current clip set has not been saved.\nWhat would you like to do ?\n"));
   }
   else if (type==2||type==3) {
     if ((mainw->multitrack!=NULL&&mainw->multitrack->changed)||(mainw->stored_event_list!=NULL&&mainw->stored_event_list_changed)) {
-      label = gtk_label_new (_("The current layout has not been saved.\nWhat would you like to do ?\n"));
+      label = lives_standard_label_new (_("The current layout has not been saved.\nWhat would you like to do ?\n"));
     }
     else {
-      label = gtk_label_new (_("The current layout has not been changed since it was last saved.\nWhat would you like to do ?\n"));
+      label = lives_standard_label_new (_("The current layout has not been changed since it was last saved.\nWhat would you like to do ?\n"));
     }
   }
   else if (type==4) {
     if (mainw->multitrack!=NULL&&mainw->multitrack->changed) {
-      label = gtk_label_new (_("The current layout contains generated frames and cannot be retained.\nYou may wish to render it before exiting multitrack mode.\n"));
+      label = lives_standard_label_new (_("The current layout contains generated frames and cannot be retained.\nYou may wish to render it before exiting multitrack mode.\n"));
     }
     else {
-      label = gtk_label_new (_("You are about to leave multitrack mode.\nThe current layout contains generated frames and cannot be retained.\nWhat do you wish to do ?"));
+      label = lives_standard_label_new (_("You are about to leave multitrack mode.\nThe current layout contains generated frames and cannot be retained.\nWhat do you wish to do ?"));
     }
   }
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-  gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
   if (type==1) {
-    GtkWidget *eventbox,*checkbutton;
+    GtkWidget *checkbutton;
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    
-    cdsw->entry = gtk_entry_new_with_max_length (128);
-    if (strlen (mainw->set_name)) {
-      gtk_entry_set_text (GTK_ENTRY (cdsw->entry),mainw->set_name);
-    }
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     
-    label=gtk_label_new_with_mnemonic (_("Clip set _name"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),cdsw->entry);
-    if (palette->style&STYLE_1&&mainw!=NULL) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), cdsw->entry, FALSE, TRUE, 0);
-    gtk_entry_set_width_chars (GTK_ENTRY (cdsw->entry),32);
-    gtk_entry_set_activates_default(GTK_ENTRY(cdsw->entry),TRUE);
-    gtk_widget_show_all (hbox);
+    cdsw->entry = lives_standard_entry_new (_("Clip set _name"),TRUE,strlen (mainw->set_name)?mainw->set_name:"",
+					    32.*widget_opts.scale,128.*widget_opts.scale,LIVES_BOX(hbox),NULL);
 
-    checkbutton = gtk_check_button_new ();
-    label=gtk_label_new_with_mnemonic (_("_Auto reload next time"));
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+    checkbutton = lives_standard_check_button_new (_("_Auto reload next time"),TRUE,LIVES_BOX(hbox),NULL);
 
-    eventbox=gtk_event_box_new();
-    gtk_container_add (GTK_CONTAINER (eventbox), label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-    if (palette->style&STYLE_1&&mainw!=NULL) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    gtk_widget_show_all (hbox);
-    GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-    
     if ((type==0&&prefs->ar_layout)||(type==1&&!mainw->only_close)) {
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
       if (type==1) prefs->ar_clipset=TRUE;
       else prefs->ar_layout=TRUE;
     }
     else {
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),FALSE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
       if (type==1) prefs->ar_clipset=FALSE;
       else prefs->ar_layout=FALSE;
     }
@@ -3632,18 +2600,15 @@
     add_warn_check(GTK_BOX(dialog_vbox),WARN_MASK_EXIT_MT);
   }
 
-  dialog_action_area = GTK_DIALOG (cdsw->dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (cdsw->dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (cdsw->dialog), cancelbutton, 0);
   gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   discardbutton = gtk_button_new_from_stock ("gtk-delete");
-  gtk_widget_show (discardbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (cdsw->dialog), discardbutton, 1+(type==2));
   gtk_button_set_use_stock(GTK_BUTTON(discardbutton),FALSE);
   gtk_button_set_use_underline(GTK_BUTTON(discardbutton),TRUE);
@@ -3653,16 +2618,17 @@
   else if (type==2) gtk_button_set_label(GTK_BUTTON(discardbutton),_("_Delete layout"));
 
   savebutton = gtk_button_new_from_stock ("gtk-save");
-  gtk_widget_show (savebutton);
   gtk_button_set_use_stock(GTK_BUTTON(savebutton),FALSE);
   gtk_button_set_use_underline(GTK_BUTTON(savebutton),TRUE);
   if (type==0||type==3) gtk_button_set_label(GTK_BUTTON(savebutton),_("_Save layout"));
   else if (type==1) gtk_button_set_label(GTK_BUTTON(savebutton),_("_Save clip set"));
   else if (type==2) gtk_button_set_label(GTK_BUTTON(savebutton),_("_Wipe layout"));
   if (type!=4) gtk_dialog_add_action_widget (GTK_DIALOG (cdsw->dialog), savebutton, 2-(type==2));
-  GTK_WIDGET_SET_FLAGS (savebutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (savebutton);
   if (type==1||type==2)gtk_widget_grab_default(savebutton);
 
+  gtk_widget_show_all(cdsw->dialog);
+
   return cdsw;
 }
 
@@ -3675,29 +2641,23 @@
   GtkWidget *okbutton;
   GtkWidget *cancelbutton;
 
-  GtkWidget *mdialog=gtk_dialog_new ();
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+
+  GtkWidget *mdialog=lives_standard_dialog_new (_("LiVES: recover layout ?"),FALSE);
 
-  gtk_window_set_title (GTK_WINDOW (mdialog), _("LiVES: recover layout ?"));
-  gtk_window_set_position (GTK_WINDOW (mdialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (mdialog), 450, 200);
+  gtk_window_add_accel_group (GTK_WINDOW (mdialog), accel_group);
 
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(mdialog),GTK_WINDOW(mainw->LiVES));
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(mdialog),FALSE);
-    gtk_widget_modify_bg(mdialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(mdialog));
   
-  label = gtk_label_new (_("\nLiVES has detected a multitrack layout from a previous session.\nWould you like to try and recover it ?\n"));
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  label = lives_standard_label_new 
+    (_("\nLiVES has detected a multitrack layout from a previous session.\nWould you like to try and recover it ?\n"));
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  if (mainw!=NULL&&palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
   gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
 
@@ -3705,12 +2665,12 @@
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (mdialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (cancelbutton);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (mdialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default(okbutton);
   gtk_widget_grab_focus(okbutton);
 
@@ -3718,6 +2678,9 @@
 
   g_signal_connect (okbutton, "clicked",G_CALLBACK (recover_layout),NULL);
 
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
   gtk_widget_show_all(mdialog);
 }
 
@@ -3734,132 +2697,60 @@
   GtkWidget *scrollw;
   GtkWidget *vbox;
   GtkWidget *hbox;
-  GtkWidget *label;
   GtkWidget *checkbutton;
   GtkWidget *okbutton;
   GtkWidget *resetbutton;
-  GtkWidget *eventbox;
 
+  gchar *tmp,*tmp2;
 
-    dialog = gtk_dialog_new ();
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Disk Recovery Options"));
-    if (palette->style&STYLE_1) {
-      gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-      gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    
-    /*if (prefs->show_gui) {
-      gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
-      }*/
-    
-    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-    gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-    gtk_window_set_default_size (GTK_WINDOW (dialog), 450, 300);
+  dialog = lives_standard_dialog_new (_("LiVES: - Disk Recovery Options"),FALSE);
 
+  if (prefs->show_gui) {
+    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
+    else gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->multitrack->window));
+  }
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
 
-  scrollw = gtk_scrolled_window_new (NULL, NULL);
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width*2);
+
+  scrollw = lives_standard_scrolled_window_new (450.*widget_opts.scale,300.*widget_opts.scale,vbox);
 
   gtk_container_add (GTK_CONTAINER (dialog_vbox), scrollw);
    
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollw), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-
-
-  vbox = gtk_vbox_new (FALSE, 0);
-
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
-
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollw), vbox);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(scrollw)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(scrollw)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
 
-  // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
-  checkbutton = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Delete _Orphaned Clips"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), checkbutton);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), checkbutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  checkbutton = lives_standard_check_button_new((tmp=g_strdup(_("Delete _Orphaned Clips"))),TRUE,LIVES_BOX(hbox),
+						(tmp2=g_strdup(_("Delete any clips which are not currently loaded or part of a set"))));
 
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, TRUE, TRUE, 0);
+  g_free(tmp); g_free(tmp2);
 
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), !(prefs->clear_disk_opts & LIVES_CDISK_LEAVE_ORPHAN_SETS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), !(prefs->clear_disk_opts & LIVES_CDISK_LEAVE_ORPHAN_SETS));
 
-  //----
   g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			  G_CALLBACK (flip_cdisk_bit),
 			  GINT_TO_POINTER(LIVES_CDISK_LEAVE_ORPHAN_SETS));
 
-  // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
-  checkbutton = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Clear _Backup Files from Closed Clips"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), checkbutton);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), checkbutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
 
+  checkbutton = lives_standard_check_button_new(_("Clear _Backup Files from Closed Clips"),TRUE,LIVES_BOX(hbox),NULL);
 
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, TRUE, TRUE, 0);
-
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), !(prefs->clear_disk_opts & LIVES_CDISK_LEAVE_BFILES));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), !(prefs->clear_disk_opts & LIVES_CDISK_LEAVE_BFILES));
 
   g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			  G_CALLBACK (flip_cdisk_bit),
 			  GINT_TO_POINTER(LIVES_CDISK_LEAVE_BFILES));
-  //----
-
 
-  // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
-  checkbutton = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Remove Sets which have _Layouts but no Clips"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), checkbutton);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), checkbutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
 
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, TRUE, TRUE, 0);
-  //----
+  checkbutton = lives_standard_check_button_new(_("Remove Sets which have _Layouts but no Clips"),TRUE,LIVES_BOX(hbox),NULL);
 
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), 
-			       (prefs->clear_disk_opts & LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), 
+				 (prefs->clear_disk_opts & LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
   
   g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			  G_CALLBACK (flip_cdisk_bit),
@@ -3872,11 +2763,10 @@
   okbutton = gtk_button_new_from_stock ("gtk-ok");
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
 
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default (okbutton);
   gtk_button_set_label(GTK_BUTTON(okbutton),_("_Accept"));
 
-
   return dialog;
 
 }
@@ -3885,6 +2775,12 @@
 GtkTextView *create_output_textview(void) {
   GtkWidget *textview=gtk_text_view_new();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
+    lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
+  }
+
   g_object_ref(textview);
   gtk_widget_show(textview);
   return GTK_TEXT_VIEW(textview);

LiVES-1.6.1.tar.bz2/src/interface.h -> LiVES-2.0.3.tar.bz2/src/interface.h Changed

@@ -1,42 +1,27 @@
 // interface.h
 // LiVES
-// (c) G. Finch 2003 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2003 - 2012 <salsaman@gmail.com>
 // Released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
 #ifndef HAS_LIVES_INTERFACE_H
 #define HAS_LIVES_INTERFACE_H
 
-// a few GUI specific settings
-#define DEFAULT_FRAME_HSIZE 320
-#define DEFAULT_FRAME_VSIZE 200
-
-#define PROCW_STRETCHER "                                                                                                                            " ///< blank label to show so our message dialogs are not too small
-
-#define ENC_DETAILS_WIN_H 200 ///< horizontal size in pixels of the encoder output window
-#define ENC_DETAILS_WIN_V 200 ///< vertical size in pixels of the encoder output window
-
-#define MAX_MSG_WIDTH_CHARS 100 ///< max width of text on warning/error labels
-
-void load_theme (void);
-
-GtkWidget* create_fileselection (const gchar *title, gint preview_type, gpointer free_on_cancel);
-GtkWidget* create_window4 (void);
-GtkWidget* create_dialog2 (gint warning_mask);
-GtkWidget* create_dialog3 (const gchar *text, gboolean is_blocking, gint warning_mask);
+GtkWidget* create_info_error_dialog (const gchar *text, boolean is_blocking, int mask, lives_info_t infotype);
 GtkWidget* create_opensel_dialog (void);
-GtkWidget* create_encoder_prep_dialog (const gchar *text1, const gchar *text2, gboolean opt_resize);
+GtkWidget* create_encoder_prep_dialog (const gchar *text1, const gchar *text2, boolean opt_resize);
 
-void widget_add_preview(GtkBox *for_preview, GtkBox *for_button, GtkBox *for_deinterlace, gint preview_type);  ///< for fileselector preview
+void widget_add_preview(GtkWidget *widget, LiVESBox *for_preview, LiVESBox *for_button, 
+			LiVESBox *for_deinterlace, int preview_type);  ///< for fileselector preview
 
-gboolean do_audio_choice_dialog(short startup_phase);
+boolean do_audio_choice_dialog(short startup_phase);
 
 void do_layout_recover_dialog(void);
 
 GtkWidget *create_cleardisk_advanced_dialog(void);
 
-typedef struct _fileinfo {
-  GtkWidget *info_window;
+typedef struct {
+  GtkWidget *dialog;
   GtkWidget *textview24;
   GtkWidget *textview25;
   GtkWidget *textview26;
@@ -47,9 +32,9 @@
   GtkWidget *textview_rtime;
   GtkWidget *textview_lrate;
   GtkWidget *textview_rrate;
-} fileinfo;
+} lives_clipinfo_t;
 
-fileinfo* create_info_window (gint audio_channels, gboolean is_mt);
+lives_clipinfo_t * create_clip_info_window (int audio_channels, boolean is_mt);
 
 
 typedef struct {
@@ -61,9 +46,9 @@
   GList *setlist;
 } _entryw;
 
-_entryw* create_rename_dialog (gint type);
-_entryw* create_location_dialog (gint type);
-_entryw* create_cds_dialog (gint type);
+_entryw* create_rename_dialog (int type);
+_entryw* create_location_dialog (int type);
+_entryw* create_cds_dialog (int type);
 
 typedef struct __insertw {
   GtkWidget *insert_dialog;
@@ -75,17 +60,6 @@
 
 _insertw* create_insert_dialog (void);
 
-typedef struct __xranw {
-  // xmms random play
-  GtkWidget *rp_dialog;
-  GtkWidget *numtracks;
-  GtkWidget *dir;
-  GtkWidget *subdir_check;
-  GtkWidget *minsize;
-  GtkWidget *maxsize;
-} _xranw;
-
-_xranw* create_rp_dialog (void);
 
 typedef struct __commentsw {
   GtkWidget *comments_dialog;
@@ -112,12 +86,12 @@
 typedef struct {
   GtkWidget *dialog;
   GtkWidget *time_spin;
-  gboolean is_sel;
+  boolean is_sel;
 } aud_dialog_t;
 
 
 typedef struct {
-  gboolean use_advanced;
+  boolean use_advanced;
   GtkWidget *advbutton;
   GtkWidget *adv_vbox;
   GtkWidget *combod;
@@ -132,18 +106,17 @@
 
 
 
-aud_dialog_t *create_audfade_dialog (gint type);
-GtkWidget *create_combo_dialog (gint type, gpointer user_data);
+aud_dialog_t *create_audfade_dialog (int type);
+GtkWidget *create_combo_dialog (int type, gpointer user_data);
 
 _commentsw *commentsw;
-_xranw *xranw;
 _entryw *renamew;
 _entryw *locw;
 _insertw *insertw;
 text_window *textwindow;
 
 
-#define MAX_FADE_SECS 30. ///< max time to offer fade audio in/out for
+#define DEF_AUD_FADE_SECS 10. ///< default time to offer fade audio in/out for

LiVES-1.6.1.tar.bz2/src/jack.c -> LiVES-2.0.3.tar.bz2/src/jack.c Changed

@@ -1,6 +1,6 @@
 // jack.c
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2012
+// (c) G. Finch 2005 - 2013
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -11,6 +11,7 @@
 #ifdef ENABLE_JACK
 #include "callbacks.h"
 #include "support.h"
+#include "effects-weed.h"
 
 #define afile mainw->files[jackd->playing_file]
 
@@ -19,9 +20,12 @@
 static unsigned char *zero_buff=NULL;
 static size_t zero_buff_count=0;
 
-static gboolean seek_err;
+static boolean seek_err;
 
-static gboolean check_zero_buff(size_t check_size) {
+static size_t audio_read_inner(jack_driver_t *jackd, float **in_buffer, int fileno, 
+			       int nframes, double out_scale, boolean rev_endian, boolean out_unsigned, size_t rbytes);
+
+static boolean check_zero_buff(size_t check_size) {
   if (check_size>zero_buff_count) {
     zero_buff=(unsigned char *)g_try_realloc(zero_buff,check_size);
     if (zero_buff) {
@@ -35,7 +39,7 @@
   return TRUE;
 }
 
-gboolean lives_jack_init (void) {
+boolean lives_jack_init (void) {
   gchar *jt_client=g_strdup_printf("LiVES-%d",getpid());
   const char *server_name="default";
   jack_options_t options=JackServerName;
@@ -108,15 +112,18 @@
 
 
 
-gdouble jack_transport_get_time(void) {
+uint64_t jack_transport_get_time(void) {
 #ifdef ENABLE_JACK_TRANSPORT
+  uint64_t val;
+
   jack_nframes_t srate; 
   jack_position_t pos;
 
   jack_transport_query (jack_transport_client, &pos);
 
   srate=jack_get_sample_rate(jack_transport_client);
-  return (gdouble)pos.frame/(gdouble)srate;
+  val=(double)pos.frame/(double)srate;
+  if (val>0.) return val;
 #endif
   return 0.;
 }
@@ -156,7 +163,7 @@
 }
 #endif
 
-gboolean lives_jack_poll(void) {
+boolean lives_jack_poll(void) {
   // data is always NULL
   // must return TRUE
 #ifdef ENABLE_JACK_TRANSPORT
@@ -227,7 +234,7 @@
   }
 }
 
-static void jack_set_rec_avals(jack_driver_t *jackd, gboolean is_forward) {
+static void jack_set_rec_avals(jack_driver_t *jackd, boolean is_forward) {
   // record direction change
   mainw->rec_aclip=jackd->playing_file;
   if (mainw->rec_aclip!=-1) {
@@ -241,6 +248,8 @@
 static void push_cache_buffer (lives_audio_buf_t *cache_buffer, jack_driver_t *jackd, 
 			       size_t in_bytes, size_t nframes, double shrink_factor) {
 
+  // push a cache_buffer for another thread to fill
+
   cache_buffer->fileno = jackd->playing_file;
   cache_buffer->seek = jackd->seek_pos;
   cache_buffer->bytesize = in_bytes;
@@ -267,6 +276,8 @@
 
 
 static lives_audio_buf_t *pop_cache_buffer (void) {
+  // get next available cache_buffer
+
   lives_audio_buf_t *cache_buffer=audio_cache_get_buffer();
   if (cache_buffer!=NULL) return cache_buffer;
   return NULL;
@@ -281,15 +292,16 @@
   jack_position_t pos;
   register int i;
   aserver_message_t *msg;
-  long xseek;
+  int64_t xseek;
   int new_file;
-  gboolean from_memory=FALSE;
-  gboolean wait_cache_buffer=FALSE;
+  boolean from_memory=FALSE;
+  boolean wait_cache_buffer=FALSE;
+  boolean pl_error=FALSE; ///< flag tells if we had an error during plugin processing
   lives_audio_buf_t *cache_buffer=NULL;
-  size_t nbytes;
+  size_t nbytes,rbytes;
 
 #ifdef DEBUG_AJACK
-  g_printerr("nframes %ld, sizeof(float) == %d\n", (long)nframes, sizeof(float));
+  g_printerr("nframes %ld, sizeof(float) == %d\n", (int64_t)nframes, sizeof(float));
 #endif
 
   if (!mainw->is_ready||jackd==NULL||(mainw->playing_file==-1&&jackd->is_silent&&jackd->msgq==NULL)) return 0;
@@ -300,7 +312,7 @@
     // TODO - set seek_pos after setting record params
     switch (msg->command) {
     case ASERVER_CMD_FILE_OPEN:
-      new_file=atoi(msg->data);
+      new_file=atoi((char *)msg->data);
       if (jackd->playing_file!=new_file) {
 	jackd->playing_file=new_file;
       }
@@ -315,7 +327,7 @@
       break;
     case ASERVER_CMD_FILE_SEEK:
       if (jackd->playing_file<0) break;
-      xseek=atol(msg->data);
+      xseek=atol((char *)msg->data);
       if (xseek<0.) xseek=0.;
       jackd->seek_pos=xseek;
       jackd->audio_ticks=mainw->currticks;
@@ -324,7 +336,7 @@
     default:
       msg->data=NULL;
     }
-    if (msg->data!=NULL) g_free(msg->data);
+    if (msg->data!=NULL) g_free((char *)msg->data);
     msg->command=ASERVER_CMD_PROCESSED;
     if (msg->next==NULL) jackd->msgq=NULL; 
     else jackd->msgq = msg->next;
@@ -336,53 +348,62 @@
   for (i = 0; i < jackd->num_output_channels; i++) 
     out_buffer[i] = (float *) jack_port_get_buffer(jackd->output_port[i], 
 						   nframes);
-
-  if (jackd->read_abuf==-1) {
-    // assign local copy from 
-    if (mainw->playing_file==-1 || ( cache_buffer = pop_cache_buffer() )==NULL || !cache_buffer->is_ready ) {
-      // audio buffer is not ready yet
-      if (!jackd->is_silent) {
-	for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
-	jackd->is_silent=TRUE;
+  if (mainw->agen_key==0||mainw->agen_needs_reinit||mainw->multitrack!=NULL) {
+    // if a plugin is generating audio we do not use cache_buffers, otherwise:
+    if (jackd->read_abuf==-1) {
+      // assign local copy from cache_buffers
+      if (mainw->playing_file==-1 || ( cache_buffer = pop_cache_buffer() )==NULL || !cache_buffer->is_ready ) {
+	// audio buffer is not ready yet
+	if (!jackd->is_silent) {
+	  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
+	  jackd->is_silent=TRUE;
+	}
+	return 0;
       }
-      return 0;
+      if (cache_buffer->fileno==-1) jackd->playing_file=-1;
     }
-    if (cache_buffer->fileno==-1) jackd->playing_file=-1;
+    
+    if (cache_buffer!=NULL && cache_buffer->in_achans>0 && !cache_buffer->is_ready ) wait_cache_buffer=TRUE;
   }
 
-  if (cache_buffer!=NULL && cache_buffer->in_achans>0 && !cache_buffer->is_ready ) wait_cache_buffer=TRUE;
-
   jackd->state=jack_transport_query (jackd->client, &pos);
 
+
 #ifdef DEBUG_AJACK
   g_printerr("STATE is %d %d\n",jackd->state,jackd->play_when_stopped);
 #endif
 
   /* handle playing state */
   if (jackd->state==JackTransportRolling||jackd->play_when_stopped) {
-    gulong jackFramesAvailable = nframes; /* frames we have left to write to jack */
-    gulong inputFramesAvailable;          /* frames we have available this loop */
-    gulong numFramesToWrite;              /* num frames we are writing this loop */
-    glong in_frames=0;
-    gulong in_bytes=0;
+    uint64_t jackFramesAvailable = nframes; /* frames we have left to write to jack */
+    uint64_t inputFramesAvailable;          /* frames we have available this loop */
+    uint64_t numFramesToWrite;              /* num frames we are writing this loop */
+    int64_t in_frames=0;
+    uint64_t in_bytes=0,xin_bytes=0;
     gfloat shrink_factor=1.f;
     gdouble vol;
 
+    file *xfile=afile;
+
 #ifdef DEBUG_AJACK
     g_printerr("playing... jackFramesAvailable = %ld\n", jackFramesAvailable);
 #endif
 
     jackd->num_calls++;
 
-    if (!jackd->in_use||((jackd->playing_file<0||jackd->seek_pos<0.)&&jackd->read_abuf<0)||jackd->is_paused) {
+
+    if (!jackd->in_use||((jackd->playing_file<0||jackd->seek_pos<0.)&&jackd->read_abuf<0
+			  &&(mainw->agen_key==0||mainw->multitrack!=NULL))
+			 ||jackd->is_paused) {
+
       /* output silence if nothing is being outputted */
       if (!jackd->is_silent) for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
       jackd->is_silent=TRUE;
 
       // external streaming
-      nbytes=nframes*4;
-      check_zero_buff(nbytes);
-      audio_stream(zero_buff,nbytes,jackd->astream_fd);
+      rbytes=nframes*jackd->num_output_channels*2;
+      check_zero_buff(rbytes);
+      audio_stream(zero_buff,rbytes,jackd->astream_fd);
 
       if (!jackd->is_paused) jackd->frames_written+=nframes;
       if (jackd->seek_pos<0.&&jackd->playing_file>-1&&afile!=NULL) {
@@ -407,7 +428,13 @@
 
       }
       else {
+
 	if (G_LIKELY(jackd->playing_file>=0)) {
+
+	  if (jackd->playing_file==mainw->ascrap_file&&mainw->playing_file>=-1&&mainw->files[mainw->playing_file]->achans>0) {
+	    xfile=mainw->files[mainw->playing_file];
+	  }
+
 	  in_bytes=ABS((in_frames=((gdouble)jackd->sample_in_rate/(gdouble)jackd->sample_out_rate*
 				   (gdouble)jackFramesAvailable+((gdouble)fastrand()/(gdouble)G_MAXUINT32))))
 	    *jackd->num_input_channels*jackd->bytes_per_channel;
@@ -455,14 +482,15 @@
 	      }
 	    }
 
-	    if (!wait_cache_buffer) push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
+	    if (!wait_cache_buffer&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)) 
+	      push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
 
 	    for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
 
 	    // external streaming
-	    nbytes=nframes*4;
-	    check_zero_buff(nbytes);
-	    audio_stream(zero_buff,nbytes,jackd->astream_fd);
+	    rbytes=nframes*jackd->num_output_channels*2;
+	    check_zero_buff(rbytes);
+	    audio_stream(zero_buff,rbytes,jackd->astream_fd);
 
 	    jackd->frames_written+=nframes;
 	    return 0;
@@ -471,7 +499,10 @@
 	  else {
 	    if (shrink_factor>0.) {
 	      if (!(*jackd->cancelled)) {
-		gboolean eof=cache_buffer->eof;
+		boolean eof=FALSE;
+
+		if (mainw->agen_key==0) eof=cache_buffer->eof;
+		else if (jackd->playing_file>-1 && xfile!=NULL && xfile->afilesize <=jackd->seek_pos) eof=TRUE;
 
 		if (eof) {
 		  // reached the end, forwards
@@ -501,7 +532,11 @@
 	      }
 	    }
 	  }
-
+	  xin_bytes=in_bytes;
+	}
+	if (mainw->agen_key!=0&&mainw->multitrack==NULL) {
+	  in_bytes=jackFramesAvailable*jackd->num_output_channels*4;
+	  if (xin_bytes==0) xin_bytes=in_bytes;
 	}
 
 	if (!jackd->in_use||in_bytes==0) {
@@ -510,18 +545,21 @@
 	  jackd->is_silent=TRUE;
 
 	  // external streaming
-	  nbytes=nframes*4;
-	  check_zero_buff(nbytes);
-	  audio_stream(zero_buff,nbytes,jackd->astream_fd);
+	  rbytes=nframes*jackd->num_output_channels*2;
+	  check_zero_buff(rbytes);
+	  audio_stream(zero_buff,rbytes,jackd->astream_fd);
 
 	  if (!jackd->is_paused) jackd->frames_written+=nframes;
-	  if (jackd->seek_pos<0.&&jackd->playing_file>-1&&afile!=NULL) {
-	    jackd->seek_pos+=nframes*afile->achans*afile->asampsize/8;
+	  if (jackd->seek_pos<0.&&jackd->playing_file>-1&&xfile!=NULL) {
+	    jackd->seek_pos+=nframes*xfile->achans*xfile->asampsize/8;
 	  }
 	  return 0;
 	}
 	
-	inputFramesAvailable = cache_buffer->samp_space;
+	if (mainw->multitrack!=NULL||(mainw->agen_key==0&&!mainw->agen_needs_reinit)) 
+	  inputFramesAvailable = cache_buffer->samp_space;
+	else inputFramesAvailable=jackFramesAvailable;
+
 #ifdef DEBUG_AJACK
 	g_printerr("%d inputFramesAvailable == %ld, %ld %ld,jackFramesAvailable == %ld\n", inputFramesAvailable, 
 		   in_frames,jackd->sample_in_rate,jackd->sample_out_rate,jackFramesAvailable);
@@ -533,7 +571,6 @@
 #ifdef DEBUG_AJACK
 	g_printerr("nframes == %d, jackFramesAvailable == %ld,\n\tjackd->num_input_channels == %ld, jackd->num_output_channels == %ld, nf2w %ld, in_bytes %d, sf %.8f\n",  nframes, jackFramesAvailable, jackd->num_input_channels, jackd->num_output_channels, numFramesToWrite, in_bytes, shrink_factor);
 #endif
-	
 	jackd->frames_written+=numFramesToWrite;
 	jackFramesAvailable-=numFramesToWrite; /* take away what was written */
 	
@@ -541,130 +578,229 @@
 	g_printerr("jackFramesAvailable == %ld\n", jackFramesAvailable);
 #endif
       }
+
       // playback from memory or file
       vol=mainw->volume*mainw->volume; // TODO - we should really use a logarithmic scale
       
-      if ( !from_memory && numFramesToWrite > 0 ) {
-	//	if (((gint)(jackd->num_calls/100.))*100==jackd->num_calls) if (mainw->soft_debug) g_print("audio pip\n");
-	if (cache_buffer->bufferf!=NULL) {
-	  for (i=0;i<jackd->num_output_channels;i++) {
-	    sample_move_d16_float(out_buffer[i], cache_buffer->buffer16[0] + i, numFramesToWrite, 
-				  jackd->num_output_channels, afile->signed_endian&AFORM_UNSIGNED, vol);
-	  }
+      if (numFramesToWrite) {
+
+	if (!from_memory) {
+	  //	if (((gint)(jackd->num_calls/100.))*100==jackd->num_calls) if (mainw->soft_debug) g_print("audio pip\n");
+	  if ((mainw->agen_key!=0||mainw->agen_needs_reinit||cache_buffer->bufferf!=NULL)&&!jackd->mute) {
+	    float *fbuffer=NULL;
 
-	  if (jackd->astream_fd!=-1) {
-	    unsigned char *xbuf=(unsigned char *)cache_buffer->buffer16[0];
-	    // audio streaming if enabled
-	    nbytes=numFramesToWrite*4;
-
-	    if (jackd->num_output_channels!=2) {
-	      // need to remap channels to stereo (assumed for now)
-	      size_t bysize=4,tsize=0;
-	      unsigned char *inbuf=(unsigned char *)cache_buffer->buffer16[0];
-	      xbuf=(unsigned char *)g_try_malloc(nbytes);
-	      if (!xbuf) {
-		for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], numFramesToWrite);
+	    if (mainw->agen_key!=0||mainw->agen_needs_reinit) {
+	      // audio generated from plugin
+
+	      if (mainw->agen_needs_reinit) pl_error=TRUE;
+	      else {
+		fbuffer=(float *)g_malloc(numFramesToWrite*jackd->num_output_channels*4);
 		
-		// external streaming
-		nbytes=numFramesToWrite*4;
-		if (check_zero_buff(nbytes))
-		  audio_stream(zero_buff,nbytes,jackd->astream_fd);
-		return 0;
+		if (!get_audio_from_plugin(fbuffer,jackd->num_output_channels,jackd->sample_out_rate,numFramesToWrite)) {
+		  pl_error=TRUE;
+		}
 	      }
-	      if (jackd->num_output_channels==1) bysize=2;
-	      while (nbytes>0) {
-		memcpy(xbuf+tsize,inbuf,bysize);
-		tsize+=bysize;
-		nbytes-=bysize;
-		if (bysize==2) {
-		  // duplicate mono channel
-		  memcpy(xbuf+tsize,inbuf,bysize);
-		  tsize+=bysize;
-		  nbytes-=bysize;
-		  inbuf+=bysize;
+
+	      // get back non-interleaved float fbuffer; rate and channels should match
+
+	      for (i=0;i<jackd->num_output_channels;i++) {
+		if (pl_error) sample_silence_dS(out_buffer[i], nframes);
+		else {
+		   lives_memcpy(out_buffer[i],fbuffer+(i*numFramesToWrite),numFramesToWrite*sizeof(float));
 		}
+	      }
+
+	      if (!pl_error&&has_audio_filters(FALSE)) {
+		uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(gdouble)jackd->sample_out_rate*U_SEC);
+	       // apply any audio effects with in_channels
+		weed_apply_audio_effects_rt(out_buffer,jackd->num_output_channels,numFramesToWrite,jackd->sample_out_rate,tc,FALSE);
+	      }
+
+	      if (mainw->record&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
+		int out_unsigned=mainw->files[mainw->ascrap_file]->signed_endian&AFORM_UNSIGNED;
+		rbytes=numFramesToWrite*mainw->files[mainw->ascrap_file]->achans*
+		  mainw->files[mainw->ascrap_file]->asampsize>>3;
+
+		rbytes=audio_read_inner(jackd,out_buffer,mainw->ascrap_file,numFramesToWrite,1.0,
+					!(mainw->files[mainw->ascrap_file]->signed_endian&AFORM_BIG_ENDIAN),out_unsigned,rbytes);
+		mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+	      }
+
+	    }
+	    else {
+	      for (i=0;i<jackd->num_output_channels;i++) {
+		sample_move_d16_float(out_buffer[i], cache_buffer->buffer16[0] + i, numFramesToWrite, 
+				      jackd->num_output_channels, afile->signed_endian&AFORM_UNSIGNED, FALSE, vol);
+	      }
+
+	      if (has_audio_filters(FALSE)&&jackd->playing_file!=mainw->ascrap_file) {
+		uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(gdouble)jackd->sample_out_rate*U_SEC);
+	       // apply any audio effects with in_channels
+		weed_apply_audio_effects_rt(out_buffer,jackd->num_output_channels,numFramesToWrite,jackd->sample_out_rate,tc,FALSE);
+	      }
+
+	    }
+	    
+	    if (jackd->astream_fd!=-1) {
+	      // audio streaming if enabled
+	      unsigned char *xbuf;
+
+	      nbytes=numFramesToWrite*jackd->num_output_channels*4;
+	      rbytes=numFramesToWrite*jackd->num_output_channels*2;
+
+	      if (pl_error) {
+		check_zero_buff(rbytes);
+		audio_stream(zero_buff,rbytes,jackd->astream_fd);
+	      }
+	      else {
+		if (mainw->agen_key==0)
+		  xbuf=(unsigned char *)cache_buffer->buffer16[0];
 		else {
-		  // or skip extra channels
-		  inbuf+=jackd->num_output_channels*4;
+		  // plugin is generating and we are streaming: convert fbuffer to s16
+		  float **fp=(float **)g_malloc(jackd->num_output_channels*sizeof(float *));
+		  for (i=0;i<jackd->num_output_channels;i++) {
+		    fp[i]=fbuffer+i;
+		  }
+
+		  xbuf=(unsigned char *)g_malloc(nbytes*jackd->num_output_channels);
+
+		  sample_move_float_int((void *)xbuf,fp,numFramesToWrite,1.0,jackd->num_output_channels,16,0,TRUE,TRUE,1.0);
+
+		}
+	      
+		if (jackd->num_output_channels!=2) {
+		  // need to remap channels to stereo (assumed for now)
+		  size_t bysize=4,tsize=0;
+		  unsigned char *inbuf,*oinbuf=NULL;
+
+		  if (mainw->agen_key!=0) inbuf=(unsigned char *)cache_buffer->buffer16[0];
+		  else oinbuf=inbuf=xbuf;
+
+		  xbuf=(unsigned char *)g_try_malloc(nbytes);
+		  if (!xbuf) {
+		    // external streaming
+		    rbytes=numFramesToWrite*jackd->num_output_channels*2;
+		    if (check_zero_buff(rbytes))
+		      audio_stream(zero_buff,rbytes,jackd->astream_fd);
+		    return 0;
+		  }
+		  if (jackd->num_output_channels==1) bysize=2;
+		  while (nbytes>0) {
+		    lives_memcpy(xbuf+tsize,inbuf,bysize);
+		    tsize+=bysize;
+		    nbytes-=bysize;
+		    if (bysize==2) {
+		      // duplicate mono channel
+		      lives_memcpy(xbuf+tsize,inbuf,bysize);
+		      tsize+=bysize;
+		      nbytes-=bysize;
+		      inbuf+=bysize;
+		    }
+		    else {
+		      // or skip extra channels
+		      inbuf+=jackd->num_output_channels*4;
+		    }
+		  }
+		  nbytes=numFramesToWrite*jackd->num_output_channels*4;
+		  if (oinbuf!=NULL) g_free(oinbuf);
 		}
+		rbytes=numFramesToWrite*jackd->num_output_channels*2;
+		audio_stream(xbuf,rbytes,jackd->astream_fd);
+		if (mainw->agen_key!=0||xbuf!=(unsigned char *)cache_buffer->buffer16[0]) g_free(xbuf);
 	      }
-	      nbytes=numFramesToWrite*4;
 	    }
-	    audio_stream(xbuf,nbytes,jackd->astream_fd);
-	    if (xbuf!=(unsigned char *)cache_buffer->buffer16[0]) g_free(xbuf);
+	    
+	    if (fbuffer!=NULL) g_free(fbuffer);
+	    
 	  }
-
-	}
-	else {
-	  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], numFramesToWrite);
+	  else {
+	    for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], numFramesToWrite);
 	  
-	  // external streaming
-	  nbytes=numFramesToWrite*4;
-	  check_zero_buff(nbytes);
-	  audio_stream(zero_buff,nbytes,jackd->astream_fd);
+	    // external streaming
+	    if (jackd->astream_fd!=-1) {
+	      rbytes=numFramesToWrite*jackd->num_output_channels*2;
+	      check_zero_buff(rbytes);
+	      audio_stream(zero_buff,rbytes,jackd->astream_fd);
+	    }
+	  }
 	}
-      }
-      else {
-	if (jackd->read_abuf>-1&&!jackd->mute) {
-	  sample_move_abuf_float(out_buffer,jackd->num_output_channels,nframes,jackd->sample_out_rate,vol);
-
-	  if (jackd->astream_fd!=-1) {
-	    // audio streaming if enabled
-	    unsigned char *xbuf=(unsigned char *)out_buffer;
-	    nbytes=numFramesToWrite*4;
-
-	    if (jackd->num_output_channels!=2) {
-	      // need to remap channels to stereo (assumed for now)
-	      size_t bysize=4,tsize=0;
-	      unsigned char *inbuf=(unsigned char *)out_buffer;
-	      xbuf=(unsigned char *)g_try_malloc(nbytes);
-	      if (!xbuf) {
-		for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], numFramesToWrite);
+	else {
+	  if (jackd->read_abuf>-1&&!jackd->mute) {
+	    sample_move_abuf_float(out_buffer,jackd->num_output_channels,nframes,jackd->sample_out_rate,vol);
+	    
+	    if (jackd->astream_fd!=-1) {
+	      // audio streaming if enabled
+	      unsigned char *xbuf=(unsigned char *)out_buffer;
+	      nbytes=numFramesToWrite*jackd->num_output_channels*4;
+	      
+	      if (jackd->num_output_channels!=2) {
+		// need to remap channels to stereo (assumed for now)
+		size_t bysize=4,tsize=0;
+		unsigned char *inbuf=(unsigned char *)out_buffer;
+		xbuf=(unsigned char *)g_try_malloc(nbytes);
+		if (!xbuf) {
+		  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], numFramesToWrite);
+		  
+		  // external streaming
+		  rbytes=numFramesToWrite*jackd->num_output_channels*2;
+		  if (check_zero_buff(rbytes))
+		    audio_stream(zero_buff,rbytes,jackd->astream_fd);
+		  return 0;
+		}
 		
-		// external streaming
-		nbytes=numFramesToWrite*4;
-		if (check_zero_buff(nbytes))
-		  audio_stream(zero_buff,nbytes,jackd->astream_fd);
-		return 0;
-	      }
-
-	      if (jackd->num_output_channels==1) bysize=2;
-	      while (nbytes>0) {
-		memcpy(xbuf+tsize,inbuf,bysize);
-		tsize+=bysize;
-		nbytes-=bysize;
-		if (bysize==2) {
-		  // duplicate mono channel
-		  memcpy(xbuf+tsize,inbuf,bysize);
+		if (jackd->num_output_channels==1) bysize=2;
+		while (nbytes>0) {
+		  lives_memcpy(xbuf+tsize,inbuf,bysize);
 		  tsize+=bysize;
 		  nbytes-=bysize;
-		  inbuf+=bysize;
-		}
-		else {
-		  // or skip extra channels
-		  inbuf+=jackd->num_output_channels*4;
+		  if (bysize==2) {
+		    // duplicate mono channel
+		    lives_memcpy(xbuf+tsize,inbuf,bysize);
+		    tsize+=bysize;
+		    nbytes-=bysize;
+		    inbuf+=bysize;
+		  }
+		  else {
+		    // or skip extra channels
+		    inbuf+=jackd->num_output_channels*4;
+		  }
 		}
+		nbytes=numFramesToWrite*jackd->num_output_channels*2;
 	      }
-	      nbytes=numFramesToWrite*4;
+	      rbytes=numFramesToWrite*jackd->num_output_channels*2;
+	      audio_stream(xbuf,rbytes,jackd->astream_fd);
+	      if (xbuf!=(unsigned char *)out_buffer) g_free(xbuf);
 	    }
-	    audio_stream(xbuf,nbytes,jackd->astream_fd);
-	    if (xbuf!=(unsigned char *)out_buffer) g_free(xbuf);
+	  }
+	  else {
+	    for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
+	    
+	    // external streaming
+	    rbytes=numFramesToWrite*jackd->num_output_channels*2;
+	    check_zero_buff(rbytes);
+	    audio_stream(zero_buff,rbytes,jackd->astream_fd);
 	  }
 	}
-	else {
-	  for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
+      }
+      else {
+	// no input frames
+	nframes=jackFramesAvailable;
+	for(i = 0; i < jackd->num_output_channels; i++) sample_silence_dS(out_buffer[i], nframes);
 	  
-	  // external streaming
-	  nbytes=nframes*4;
-	  check_zero_buff(nbytes);
-	  audio_stream(zero_buff,nbytes,jackd->astream_fd);
-	}
+	// external streaming
+	rbytes=numFramesToWrite*jackd->num_output_channels*2;
+	check_zero_buff(rbytes);
+	audio_stream(zero_buff,rbytes,jackd->astream_fd);
       }
+
+
     }
 
+
     if (!from_memory) {
-      if (!wait_cache_buffer) push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
-      if (shrink_factor>0.) jackd->seek_pos+=in_bytes;
+      if (!wait_cache_buffer&&mainw->agen_key==0) 
+	push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
+      if (shrink_factor>0.) jackd->seek_pos+=xin_bytes;
     }
 
     /*    jackd->jack_pulse[0]=set_pulse(out_buffer[0],jack->buffer_size,8);
@@ -682,9 +818,10 @@
 	sample_silence_dS(out_buffer[i] + (nframes - jackFramesAvailable), jackFramesAvailable);
 
       // external streaming
-      nbytes=jackFramesAvailable*4;
-      check_zero_buff(nbytes);
-      audio_stream(zero_buff,nbytes,jackd->astream_fd);
+      rbytes=numFramesToWrite*jackd->num_output_channels*2;
+
+      check_zero_buff(rbytes);
+      audio_stream(zero_buff,rbytes,jackd->astream_fd);
     }
 
   }
@@ -699,9 +836,9 @@
     jackd->is_silent=TRUE;
 
     // external streaming
-    nbytes=nframes*4;
-    check_zero_buff(nbytes);
-    audio_stream(zero_buff,nbytes,jackd->astream_fd);
+    rbytes=nframes*jackd->num_output_channels*2;
+    check_zero_buff(rbytes);
+    audio_stream(zero_buff,rbytes,jackd->astream_fd);
 
     /* if we were told to reset then zero out some variables */
     /* and transition to STOPPED */
@@ -720,7 +857,7 @@
 
 
 int lives_start_ready_callback (jack_transport_state_t state, jack_position_t *pos, void *arg) {
-  gboolean seek_ready;
+  boolean seek_ready;
 
   // mainw->video_seek_ready is generally FALSE
   // if we are not playing, the transport poll should start playing which will set set 
@@ -760,6 +897,39 @@
 }
 
 
+static size_t audio_read_inner(jack_driver_t *jackd, float **in_buffer, int ofileno, int nframes, 
+			       double out_scale, boolean rev_endian, boolean out_unsigned, size_t rbytes) {
+  int frames_out;
+
+  void *holding_buff=g_try_malloc(rbytes);
+
+  file *ofile=mainw->files[ofileno];
+
+  size_t bytes=0;
+
+  if (!holding_buff) return 0;
+
+  frames_out=sample_move_float_int((void *)holding_buff,in_buffer,nframes,out_scale,ofile->achans,
+				   ofile->asampsize,out_unsigned,rev_endian,FALSE,1.);
+
+  if (mainw->rec_samples>0) {
+    if (frames_out>mainw->rec_samples) frames_out=mainw->rec_samples;
+    mainw->rec_samples-=frames_out;
+  }
+
+  if (mainw->bad_aud_file==NULL) {
+    size_t target=frames_out*(ofile->asampsize/8)*ofile->achans;
+    // use write not lives_write - because of potential threading issues
+    bytes=write (mainw->aud_rec_fd,holding_buff,target);
+
+    if (bytes<target) mainw->bad_aud_file=filename_from_fd(NULL,mainw->aud_rec_fd);
+    if (bytes<0) bytes=0;
+  }
+
+  g_free(holding_buff);
+
+  return bytes;
+}
 
 
 static int audio_read (nframes_t nframes, void *arg) {
@@ -768,53 +938,62 @@
   // this is the jack callback for when we are recording audio
 
   jack_driver_t* jackd = (jack_driver_t*)arg;
-  void *holding_buff;
   float *in_buffer[jackd->num_input_channels];
-  float out_scale=(float)jackd->sample_in_rate/(float)afile->arate;
-  int out_unsigned=afile->signed_endian&AFORM_UNSIGNED;
+  float out_scale;
+  int out_unsigned;
   int i;
-  long frames_out;
+  int64_t frames_out;
 
   size_t rbytes;
 
+  if (mainw->playing_file<0&&prefs->audio_src==AUDIO_SRC_EXT) return 0; 
+
   if (mainw->effects_paused) return 0; // pause during record
 
   if (mainw->rec_samples==0) return 0; // wrote enough already, return until main thread stop
 
-  frames_out=(long)((gdouble)nframes/out_scale+1.);
-
-  rbytes=frames_out*afile->achans*afile->asampsize/8;
-  holding_buff=g_try_malloc(rbytes);
-
-  if (!holding_buff) return 0;
-
   for (i=0;i<jackd->num_input_channels;i++) {
     in_buffer[i] = (float *) jack_port_get_buffer(jackd->input_port[i], nframes);
   }
 
-  frames_out=sample_move_float_int((void *)holding_buff,in_buffer,nframes,out_scale,afile->achans,
-				   afile->asampsize,out_unsigned,jackd->reverse_endian,1.);
-
   jackd->frames_written+=nframes;
 
-  if (mainw->record&&(prefs->rec_opts&REC_EXT_AUDIO)&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
-    mainw->files[mainw->playing_file]->aseek_pos+=rbytes;
-    jackd->seek_pos+=rbytes;
-  }
+  if (prefs->audio_src==AUDIO_SRC_EXT&&(jackd->playing_file==-1||jackd->playing_file==mainw->ascrap_file)) {
+    // TODO - dont apply filters when doing ext window grab, or voiceover
+
+    // in this case we read external audio, but maybe not record it
+    // we may wish to analyse the audio for example
+
+    if (has_audio_filters(TRUE)) {
+	uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(gdouble)jackd->sample_in_rate*U_SEC);
+	// apply any audio effects with in_channels and no out_channels
+	weed_apply_audio_effects_rt(in_buffer,jackd->num_input_channels,nframes,jackd->sample_in_rate,tc,TRUE);
+    }
+
 
-  if (mainw->rec_samples>0) {
-    if (frames_out>mainw->rec_samples) frames_out=mainw->rec_samples;
-    mainw->rec_samples-=frames_out;
   }
 
-  if (mainw->bad_aud_file==NULL) {
-    size_t target=frames_out*(afile->asampsize/8)*afile->achans,bytes;
-    // use write not lives_write - because of potential threading issues
-    bytes=write (mainw->aud_rec_fd,holding_buff,target);
-    if (bytes<target) mainw->bad_aud_file=filename_from_fd(NULL,mainw->aud_rec_fd);
+  if (jackd->playing_file==-1||(mainw->record&&mainw->record_paused)) {
+    return 0;
   }
 
-  g_free(holding_buff);
+  if (jackd->playing_file==-1) out_scale=1.0; // just listening
+  else out_scale=(float)jackd->sample_in_rate/(float)afile->arate;
+  
+  out_unsigned=afile->signed_endian&AFORM_UNSIGNED;
+  
+  frames_out=(int64_t)((gdouble)nframes/out_scale+1.);
+  rbytes=frames_out*afile->achans*afile->asampsize/8;
+  
+  rbytes=audio_read_inner(jackd,in_buffer,jackd->playing_file,nframes,out_scale,jackd->reverse_endian,
+			  out_unsigned,rbytes);
+  
+
+  if (mainw->record&&prefs->audio_src==AUDIO_SRC_EXT&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
+    mainw->files[mainw->playing_file]->aseek_pos+=rbytes;
+    if (!mainw->record_paused&&mainw->ascrap_file!=mainw->playing_file) mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+    jackd->seek_pos+=rbytes;
+  }
 
   if (mainw->rec_samples==0&&mainw->cancelled==CANCEL_NONE) mainw->cancelled=CANCEL_KEEP; // we wrote the required #
 
@@ -824,7 +1003,7 @@
 
 
 int jack_get_srate (nframes_t nframes, void *arg) {
-  //g_printerr("the sample rate is now %ld/sec\n", (long)nframes);
+  //g_printerr("the sample rate is now %ld/sec\n", (int64_t)nframes);
   return 0;
 }
 
@@ -847,7 +1026,8 @@
   mainw->jackd=jack_get_driver(0,TRUE);
   mainw->jackd->msgq=NULL;
 
-  if (mainw->jackd->playing_file!=-1&&afile!=NULL) jack_audio_seek_bytes(mainw->jackd,mainw->jackd->seek_pos); // at least re-seek to the right place
+  if (mainw->jackd->playing_file!=-1&&afile!=NULL) 
+    jack_audio_seek_bytes(mainw->jackd,mainw->jackd->seek_pos); // at least re-seek to the right place
 }
 
 
@@ -912,6 +1092,8 @@
   jack_set_error_function(jack_error_func);
   jackd->client=NULL;
 
+  // TODO - use alarm
+
   stime=lives_get_current_ticks();
 
   while (jackd->client==NULL&&ntime<JACK_START_WAIT) {
@@ -968,9 +1150,7 @@
      just decides to stop calling us. */
   jack_on_shutdown(jackd->client, jack_shutdown, jackd);
 
-  // set process callback and start
-  jack_set_process_callback (jackd->client, audio_process, jackd);  
-
+  jack_set_process_callback ((jack_client_t *)jackd->client, audio_process, jackd);  
 
   return 0;
 
@@ -1055,7 +1235,7 @@
 
   int i;
   const char** ports;
-  gboolean failed=FALSE;
+  boolean failed=FALSE;
 
   if (jackd->is_active) return 0; // already running
 
@@ -1170,7 +1350,7 @@
   // connect driver for reading
   int i;
   const char** ports;
-  gboolean failed=FALSE;
+  boolean failed=FALSE;
 
   /* tell the JACK server that we are ready to roll */
   if (jack_activate(jackd->client)) {
@@ -1271,7 +1451,7 @@
 
 
 
-jack_driver_t *jack_get_driver(gint dev_idx, gboolean is_output) {
+jack_driver_t *jack_get_driver(gint dev_idx, boolean is_output) {
   jack_driver_t *jackd;
 
   if (is_output) jackd = &outdev[dev_idx];
@@ -1285,7 +1465,7 @@
 
 
 
-static void jack_reset_dev(gint dev_idx, gboolean is_output) {
+static void jack_reset_dev(gint dev_idx, boolean is_output) {
   jack_driver_t *jackd = jack_get_driver(dev_idx,is_output);
   //g_printerr("resetting dev %d\n", dev_idx);
   jack_reset_driver(jackd);
@@ -1365,15 +1545,16 @@
   return jackd->msgq;
 }
 
-gint64 lives_jack_get_time(jack_driver_t *jackd, gboolean absolute) {
+uint64_t lives_jack_get_time(jack_driver_t *jackd, boolean absolute) {
   // get the time in ticks since either playback started or since last seek
 
   volatile aserver_message_t *msg=jackd->msgq;
-  gdouble frames_written=jackd->frames_written;
+  gdouble frames_written;
+
+  int64_t xtime;
 
-  if (frames_written<0.) frames_written=0.;
   if (msg!=NULL&&msg->command==ASERVER_CMD_FILE_SEEK) {
-    gboolean timeout;
+    boolean timeout;
     int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
     while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(jackd)!=NULL) {
       sched_yield(); // wait for seek
@@ -1381,8 +1562,15 @@
     if (timeout) return -1;
     lives_alarm_clear(alarm_handle);
   }
-  if (jackd->is_output) return jackd->audio_ticks*absolute+(gint64)(frames_written/(gdouble)jackd->sample_out_rate*U_SEC);
-  return jackd->audio_ticks*absolute+(gint64)(frames_written/(gdouble)jackd->sample_in_rate*U_SEC);
+
+  frames_written=jackd->frames_written;
+  if (frames_written<0.) frames_written=0.;
+
+  pthread_mutex_lock(&mainw->afilter_mutex);
+  if (jackd->is_output) xtime = jackd->audio_ticks*absolute+(uint64_t)(frames_written/(gdouble)jackd->sample_out_rate*U_SEC);
+  else xtime = jackd->audio_ticks*absolute+(uint64_t)(frames_written/(gdouble)jackd->sample_in_rate*U_SEC);
+  pthread_mutex_unlock(&mainw->afilter_mutex);
+  return xtime;
 }
 
 
@@ -1393,14 +1581,14 @@
 
 
 
-gboolean jack_audio_seek_frame (jack_driver_t *jackd, gint frame) {
+boolean jack_audio_seek_frame (jack_driver_t *jackd, gint frame) {
   // seek to frame "frame" in current audio file
   // position will be adjusted to (floor) nearest sample
 
   volatile aserver_message_t *jmsg;
-  long seekstart;
+  int64_t seekstart;
   int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-  gboolean timeout;
+  boolean timeout;
 
   if (alarm_handle==-1) return FALSE;
 
@@ -1415,22 +1603,22 @@
   }
   lives_alarm_clear(alarm_handle);
   if (frame>afile->frames) frame=afile->frames;
-  seekstart=(long)((gdouble)(frame-1.)/afile->fps*afile->arate)*afile->achans*(afile->asampsize/8);
+  seekstart=(int64_t)((gdouble)(frame-1.)/afile->fps*afile->arate)*afile->achans*(afile->asampsize/8);
   jack_audio_seek_bytes(jackd,seekstart);
   return TRUE;
 }
 
 
-long jack_audio_seek_bytes (jack_driver_t *jackd, long bytes) {
+int64_t jack_audio_seek_bytes (jack_driver_t *jackd, int64_t bytes) {
   // seek to position "bytes" in current audio file
   // position will be adjusted to (floor) nearest sample
 
   // if the position is > size of file, we will seek to the end of the file
 
   volatile aserver_message_t *jmsg;
-  long seekstart;
+  int64_t seekstart;
 
-  gboolean timeout;
+  boolean timeout;
   int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
 
   seek_err=FALSE;
@@ -1451,7 +1639,7 @@
   }
   lives_alarm_clear(alarm_handle);
 
-  seekstart=((long)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8);
+  seekstart=((int64_t)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8);
 
   if (seekstart<0) seekstart=0;
   if (seekstart>afile->afilesize) seekstart=afile->afilesize;
@@ -1462,7 +1650,7 @@
   return seekstart;
 }
 
-gboolean jack_try_reconnect(void) {
+boolean jack_try_reconnect(void) {
 
   if (!lives_jack_init()) goto err123;
 
@@ -1487,6 +1675,8 @@
 
 
 void jack_aud_pb_ready(gint fileno) {
+  // TODO - can we merge with switch_audio_clip()
+
   // prepare to play file fileno
   // - set loop mode
   // - check if we need to reconnect
@@ -1512,7 +1702,7 @@
 	 (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering&&
 	  g_file_test((tmpfilename=g_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL)),
 		      G_FILE_TEST_EXISTS)))) {
-      gboolean timeout;
+      boolean timeout;
       int alarm_handle;
       
       if (tmpfilename!=NULL) g_free(tmpfilename);
@@ -1522,7 +1712,7 @@
       mainw->jackd->usigned=!asigned;
       mainw->jackd->seek_end=sfile->afilesize;
       
-      if ((aendian&&(G_BYTE_ORDER==G_BIG_ENDIAN))||(!aendian&&(G_BYTE_ORDER==G_LITTLE_ENDIAN))) 
+      if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||(!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
 	mainw->jackd->reverse_endian=TRUE;
       else mainw->jackd->reverse_endian=FALSE;
       
@@ -1539,7 +1729,6 @@
 	jack_message.command=ASERVER_CMD_FILE_OPEN;
 	jack_message.data=g_strdup_printf("%d",fileno);
 	
-	// TODO ** - use chain messages
 	jack_message.next=NULL;
 	mainw->jackd->msgq=&jack_message;
 	
@@ -1554,6 +1743,7 @@
 	mainw->rec_aseek=(gdouble)sfile->aseek_pos/(gdouble)(sfile->arate*sfile->achans*(sfile->asampsize/8));
       }
     }
+    if (mainw->agen_key!=0&&mainw->multitrack==NULL) mainw->jackd->in_use=TRUE; // audio generator is active
   }
 }

LiVES-1.6.1.tar.bz2/src/jack.h -> LiVES-2.0.3.tar.bz2/src/jack.h Changed

@@ -1,6 +1,6 @@
 // jack.h
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2009
+// (c) G. Finch 2005 - 2013
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -18,8 +18,8 @@
 #include <jack/jack.h>
 #include <jack/transport.h>
 
-gboolean lives_jack_init (void); /** start up server on LiVES init */
-gboolean lives_jack_poll(void); /** poll function to check transport state */
+boolean lives_jack_init (void); /** start up server on LiVES init */
+boolean lives_jack_poll(void); /** poll function to check transport state */
 void lives_jack_end (void);
 
 int lives_start_ready_callback (jack_transport_state_t state, jack_position_t *pos, void *arg);
@@ -50,13 +50,13 @@
 
 typedef struct {
   gint      dev_idx;                      /**< id of this device ??? */ 
-  glong     sample_out_rate;                   /**< samples(frames) per second */
-  glong     sample_in_rate;                   /**< samples(frames) per second */
-  gulong    num_input_channels;            /**< number of input channels(1 is mono, 2 stereo etc..) */
-  gulong    num_output_channels;           /**< number of output channels(1 is mono, 2 stereo etc..) */
-  gulong    bytes_per_channel;
+  int64_t     sample_out_rate;                   /**< samples(frames) per second */
+  int64_t     sample_in_rate;                   /**< samples(frames) per second */
+  uint64_t    num_input_channels;            /**< number of input channels(1 is mono, 2 stereo etc..) */
+  uint64_t    num_output_channels;           /**< number of output channels(1 is mono, 2 stereo etc..) */
+  uint64_t    bytes_per_channel;
 
-  gulong    num_calls;                     /**< count of process_audio() calls */
+  uint64_t    num_calls;                     /**< count of process_audio() calls */
 
   jack_port_t*     output_port[JACK_MAX_OUTPUT_PORTS]; /**< output ports */
   jack_port_t*     input_port[JACK_MAX_INPUT_PORTS]; /**< input ports */
@@ -64,7 +64,7 @@
 
   gchar             **jack_port_name;              /**< user given strings for the port names, can be NULL */
   unsigned int     jack_port_name_count;          /**< the number of port names given */
-  gulong    jack_port_flags;               /**< flags to be passed to jack when opening the output ports */
+  uint64_t    jack_port_flags;               /**< flags to be passed to jack when opening the output ports */
 
   lives_audio_loop_t loop;
 
@@ -72,37 +72,37 @@
 
   float     volume[JACK_MAX_OUTPUT_PORTS];      ///< amount volume, 1.0 is full volume
 
-  gboolean          in_use;                        /**< true if this device is currently in use */
-  gboolean mute;
+  boolean          in_use;                        /**< true if this device is currently in use */
+  boolean mute;
 
   volatile aserver_message_t   *msgq;          /**< linked list of messages we are sending to the callback process */
 
   off_t seek_pos;
   off_t seek_end;
-  gboolean usigned;
-  gboolean reverse_endian;
+  boolean usigned;
+  boolean reverse_endian;
 
   lives_whentostop_t *whentostop; ///< pointer to mainw->whentostop
   volatile lives_cancel_t *cancelled; ///< pointer to mainw->cancelled
 
   /* variables used for trying to restart the connection to jack */
-  gboolean             jackd_died;                    /**< true if jackd has died and we should try to restart it */
+  boolean             jackd_died;                    /**< true if jackd has died and we should try to restart it */
   struct timeval   last_reconnect_attempt;
 
-  gboolean play_when_stopped; ///< if we should play audio even when jack transport is stopped
-  gint64 audio_ticks; ///< ticks when we did the last seek, used to calculate current ticks from audio
-  gulong frames_written;
+  boolean play_when_stopped; ///< if we should play audio even when jack transport is stopped
+  uint64_t audio_ticks; ///< ticks when we did the last seek, used to calculate current ticks from audio
+  uint64_t frames_written;
 
   gint out_chans_available;
   gint in_chans_available;
 
-  gboolean is_paused;
+  boolean is_paused;
 
-  gboolean is_output; ///< is output FROM host to jack
+  boolean is_output; ///< is output FROM host to jack
 
-  gboolean is_silent;
+  boolean is_silent;
 
-  gboolean is_active;
+  boolean is_active;
 
   gint playing_file;
 
@@ -122,7 +122,7 @@
 
 ////////////////////////////////////////////////////////////////////////////
 
-jack_driver_t *jack_get_driver(gint dev_idx, gboolean is_output); ///< get driver
+jack_driver_t *jack_get_driver(gint dev_idx, boolean is_output); ///< get driver
 
 int jack_audio_init(void); ///< init jack for host output
 int jack_audio_read_init(void); ///< init jack for host input
@@ -135,20 +135,20 @@
 
 void jack_close_device(jack_driver_t*);
 
-gboolean jack_try_reconnect(void);
+boolean jack_try_reconnect(void);
 
 void jack_aud_pb_ready(gint fileno);
 
 
 // utils
 volatile aserver_message_t *jack_get_msgq(jack_driver_t *); ///< pull last msg from msgq, or return NULL
-gint64 lives_jack_get_time(jack_driver_t *, gboolean absolute); ///< get time from jack, in 10^-8 seconds
-gboolean jack_audio_seek_frame (jack_driver_t *, gint frame); ///< seek to (video) frame
-long jack_audio_seek_bytes (jack_driver_t *, long bytes); ///< seek to byte position
+uint64_t lives_jack_get_time(jack_driver_t *, boolean absolute); ///< get time from jack, in 10^-8 seconds
+boolean jack_audio_seek_frame (jack_driver_t *, gint frame); ///< seek to (video) frame
+int64_t jack_audio_seek_bytes (jack_driver_t *, int64_t bytes); ///< seek to byte position
 
 void jack_get_rec_avals(jack_driver_t *);
 
-gdouble jack_transport_get_time(void);
+uint64_t jack_transport_get_time(void);
 
 gdouble lives_jack_get_pos(jack_driver_t *);

LiVES-1.6.1.tar.bz2/src/keyboard.c -> LiVES-2.0.3.tar.bz2/src/keyboard.c Changed

@@ -1,6 +1,6 @@
 // keyboard.c
 // LiVES
-// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2012 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -19,11 +19,14 @@
 #include "../libweed/weed-host.h"
 #endif
 
+#define NEEDS_TRANSLATION 1<<15
+
 
 #ifdef ENABLE_OSC
 #include "omc-learn.h"
 #endif
 
+#ifdef ENABLE_OSC
 
 static void handle_omc_events(void) {
   // check for external controller events
@@ -71,19 +74,36 @@
 }
 
 
+#endif
+
+
+boolean ext_triggers_poll(gpointer data) {
+
+  if (mainw->is_exiting) return FALSE;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  if (mainw->kb_timer_end) {
+    mainw->kb_timer_end=FALSE;
+    return FALSE;
+  }
+#endif
 
+  if (mainw->playing_file>-1) plugin_poll_keyboard(); ///< keyboard control during playback
 
-gboolean ext_triggers_poll(gpointer data) {
   // check for external controller events
 #ifdef ENABLE_JACK
 #ifdef ENABLE_JACK_TRANSPORT
-  if (mainw->jack_trans_poll) lives_jack_poll(); // check for jack transport start
+  if (mainw->jack_trans_poll) lives_jack_poll(); ///<   check for jack transport start
 #endif
 #endif
 
 #ifdef ENABLE_OSC
-  handle_omc_events(); // check for playback start triggered by js, MIDI, etc.
+  handle_omc_events(); ///< check for playback start triggered by js, MIDI, etc.
+#endif
+
+  /// if we have OSC we will poll it here,
+#ifdef ENABLE_OSC
+  if (prefs->osc_udp_started) lives_osc_poll(NULL);
 #endif
 
   return TRUE;
@@ -91,19 +111,63 @@
 
 
 
-gboolean 
-key_snooper (GtkWidget *widget, GdkEventKey *event, gpointer data) {
-  // this gets called for every keypress - check for cached keys
-  guint modifiers;
-  handle_omc_events();
-  modifiers = gtk_accelerator_get_default_mod_mask ();
 
-  return pl_key_function ((event->type==GDK_KEY_PRESS),event->keyval,event->state&modifiers);
+GdkFilterReturn filter_func(GdkXEvent *xevent, GdkEvent *event, gpointer data) {
+  // filter events at X11 level and act on key press/release
+  guint modifiers=0;
+
+#ifndef IS_MINGW
+  XEvent *xev=(XEvent *)xevent;
+  if (xev->type<2||xev->type>3) return GDK_FILTER_CONTINUE;
+  modifiers = (gtk_accelerator_get_default_mod_mask() & xev->xkey.state)|NEEDS_TRANSLATION;
+
+  // key down
+  if (xev->type==2) return pl_key_function(TRUE,xev->xkey.keycode,modifiers)?GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+
+  // key up
+  return pl_key_function(FALSE,xev->xkey.keycode,modifiers)?GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+#else
+  // windows uses MSGs
+  PMSG msg=(PMSG)xevent;
+  guint16 key;
+
+#define KEY_DOWN(vk_code) ((GetAsyncKeyState(vk_code) & 0x8000) ? 1 : 0)
+
+  if (msg->message!=WM_KEYDOWN && msg->message!=WM_KEYUP) return GDK_FILTER_CONTINUE;
+
+  if (KEY_DOWN(VK_CONTROL))
+    modifiers |= LIVES_CONTROL_MASK;
+  
+  if (KEY_DOWN(VK_MENU))
+    modifiers |= LIVES_ALT_MASK;
+  
+  if (KEY_DOWN(VK_SHIFT))
+    modifiers |= LIVES_SHIFT_MASK;
+
+  key = (guint16)msg->wParam;
+  
+  switch (key) {
+  case VK_LEFT: key=LIVES_KEY_Left; break;
+  case VK_RIGHT: key=LIVES_KEY_Right; break;
+  case VK_UP: key=LIVES_KEY_Up; break;
+  case VK_DOWN: key=LIVES_KEY_Down; break;
+  default: break;
+  }
+  
+  if (msg->message==WM_KEYDOWN) return pl_key_function(TRUE,key,modifiers)?
+				  GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+
+  return pl_key_function(FALSE,key,modifiers)?GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+
+#endif
+
+  return GDK_FILTER_CONTINUE;
 }
 
 
-gboolean 
-plugin_poll_keyboard (gpointer data) {
+
+
+gboolean plugin_poll_keyboard (void) {
   static int last_kb_time=0,current_kb_time;
 
   // this is a function which should be called periodically during playback.
@@ -114,10 +178,11 @@
   // as of LiVES 1.1.0, this is now called 10 times faster to provide lower latency for
   // OSC and external controllers
 
+
   if (mainw->ext_keyboard) {
-    //let plugin call pl_key_function itself, with any keycodes it has received
+     //let plugin call pl_key_function itself, with any keycodes it has received
     if (mainw->vpp->send_keycodes!=NULL) (*mainw->vpp->send_keycodes)(pl_key_function);
-  }
+   }
   
   current_kb_time=mainw->currticks*(1000/U_SEC_RATIO);
 
@@ -127,27 +192,6 @@
     gtk_accel_groups_activate (G_OBJECT (mainw->LiVES),(guint)cached_key, (GdkModifierType)cached_mod);
   }
 
-
-  // if we have OSC we will poll it here, as we seem to only be able to run 1 gtk_timeout 
-  // at a time
-#ifdef ENABLE_OSC
-  if (prefs->osc_udp_started) lives_osc_poll(NULL);
-#endif
-
-
-  if (!mainw->is_processing||(mainw->multitrack!=NULL&&mainw->playing_file==mainw->multitrack->render_file&&
-			      !mainw->multitrack->is_rendering)) {
-
-  // check jack transport state
-#ifdef ENABLE_JACK
-#ifdef ENABLE_JACK_TRANSPORT
-    if (mainw->jack_trans_poll) lives_jack_poll(); // check for jack transport start
-#endif
-#endif
-
-    handle_omc_events();
-
-  }
   return TRUE;
 }
 
@@ -158,12 +202,8 @@
   // plugins can also call this with a unicode key to pass key events to LiVES
   // (via a polling mechanism)
 
-#define NEEDS_TRANSLATION 1<<15
-
   // mask for ctrl and alt
-  GdkModifierType state=(GdkModifierType)(keymod&(GDK_CONTROL_MASK|GDK_MOD1_MASK));
-
-  //g_print("got %d %d %d\n",down,unicode,keymod);
+  GdkModifierType state=(GdkModifierType)(keymod&(LIVES_CONTROL_MASK|LIVES_ALT_MASK));
 
   if (!down) {
     // up...
@@ -171,16 +211,18 @@
       switch (unicode) {
 	// some keys need translating when a modifier is held down
       case(key_left) :
-      case (key_left2): if (cached_key==GDK_Left) cached_key=0;return FALSE;
+      case (key_left2): if (cached_key==LIVES_KEY_Left) cached_key=0;return FALSE;
       case(key_right) : 
-      case (key_right2): if (cached_key==GDK_Right) cached_key=0;return FALSE;
+      case (key_right2): if (cached_key==LIVES_KEY_Right) cached_key=0;return FALSE;
       case(key_up)  :
-      case (key_up2): if (cached_key==GDK_Up) cached_key=0;return FALSE;
+      case (key_up2): if (cached_key==LIVES_KEY_Up) cached_key=0;return FALSE;
       case(key_down) : 
-      case (key_down2): if (cached_key==GDK_Down) cached_key=0;return FALSE;
+      case (key_down2): if (cached_key==LIVES_KEY_Down) cached_key=0;return FALSE;
       }
     }
-    else if (cached_key==unicode) cached_key=0;
+    else {
+      if (cached_key==unicode) cached_key=0;
+    }
     return FALSE;
   }
 
@@ -188,60 +230,64 @@
   if (keymod&NEEDS_TRANSLATION) {
     switch (unicode) {
       // some keys need translating when a modifier is held down
-    case (65) :unicode=GDK_space;break;
-    case (22) :unicode=GDK_BackSpace;break;
-    case (36) :unicode=GDK_Return;break;
-    case (24) :unicode=GDK_q;break;
-    case (10) :unicode=GDK_1;break;
-    case (11) :unicode=GDK_2;break;
-    case (12) :unicode=GDK_3;break;
-    case (13) :unicode=GDK_4;break;
-    case (14) :unicode=GDK_5;break;
-    case (15) :unicode=GDK_6;break;
-    case (16) :unicode=GDK_7;break;
-    case (17) :unicode=GDK_8;break;
-    case (18) :unicode=GDK_9;break;
-    case (19) :unicode=GDK_0;break;
-    case (67) :unicode=GDK_F1;break;
-    case (68) :unicode=GDK_F2;break;
-    case (69) :unicode=GDK_F3;break;
-    case (70) :unicode=GDK_F4;break;
-    case (71) :unicode=GDK_F5;break;
-    case (72) :unicode=GDK_F6;break;
-    case (73) :unicode=GDK_F7;break;
-    case (74) :unicode=GDK_F8;break;
-    case (75) :unicode=GDK_F9;break;
-    case (76) :unicode=GDK_F10;break;
-    case (95) :unicode=GDK_F11;break;
-    case (96) :unicode=GDK_F12;break;
+    case (65) :unicode=LIVES_KEY_Space;break;
+    case (22) :unicode=LIVES_KEY_BackSpace;break;
+    case (36) :unicode=LIVES_KEY_Return;break;
+    case (24) :unicode=LIVES_KEY_q;break;
+    case (10) :unicode=LIVES_KEY_1;break;
+    case (11) :unicode=LIVES_KEY_2;break;
+    case (12) :unicode=LIVES_KEY_3;break;
+    case (13) :unicode=LIVES_KEY_4;break;
+    case (14) :unicode=LIVES_KEY_5;break;
+    case (15) :unicode=LIVES_KEY_6;break;
+    case (16) :unicode=LIVES_KEY_7;break;
+    case (17) :unicode=LIVES_KEY_8;break;
+    case (18) :unicode=LIVES_KEY_9;break;
+    case (19) :unicode=LIVES_KEY_0;break;
+    case (67) :unicode=LIVES_KEY_F1;break;
+    case (68) :unicode=LIVES_KEY_F2;break;
+    case (69) :unicode=LIVES_KEY_F3;break;
+    case (70) :unicode=LIVES_KEY_F4;break;
+    case (71) :unicode=LIVES_KEY_F5;break;
+    case (72) :unicode=LIVES_KEY_F6;break;
+    case (73) :unicode=LIVES_KEY_F7;break;
+    case (74) :unicode=LIVES_KEY_F8;break;
+    case (75) :unicode=LIVES_KEY_F9;break;
+    case (76) :unicode=LIVES_KEY_F10;break;
+    case (95) :unicode=LIVES_KEY_F11;break;
+    case (96) :unicode=LIVES_KEY_F12;break;
     case (99) :
-    case (112) :unicode=GDK_Page_Up;break;
+    case (112) :unicode=LIVES_KEY_Page_Up;break;
     case (105) :
-    case (117) :unicode=GDK_Page_Down;break;
+    case (117) :unicode=LIVES_KEY_Page_Down;break;
 
       // auto repeat keys
     case(key_left) :
-    case (key_left2): unicode=GDK_Left;break;
+    case (key_left2): unicode=LIVES_KEY_Left;break;
     case(key_right) :
-    case (key_right2): unicode=GDK_Right;break;
+    case (key_right2): unicode=LIVES_KEY_Right;break;
     case(key_up)  :
-    case (key_up2): unicode=GDK_Up;break;
+    case (key_up2): unicode=LIVES_KEY_Up;break;
     case(key_down) :
-    case (key_down2): unicode=GDK_Down;break;
+    case (key_down2): unicode=LIVES_KEY_Down;break;
 
     }
   }
 
-  if ((unicode==GDK_Left||unicode==GDK_Right||unicode==GDK_Up||unicode==GDK_Down)&&(keymod&GDK_CONTROL_MASK)) {
+  
+  if ((unicode==LIVES_KEY_Left||unicode==LIVES_KEY_Right||unicode==LIVES_KEY_Up||unicode==LIVES_KEY_Down)&&
+      (keymod&LIVES_CONTROL_MASK)) {
     cached_key=unicode;
-    cached_mod=GDK_CONTROL_MASK;
+    cached_mod=LIVES_CONTROL_MASK;
   }
 
-  if (mainw->rte_textparm!=NULL&&(keymod==0||keymod==GDK_SHIFT_MASK||keymod==GDK_LOCK_MASK)) {
-    if (unicode==GDK_Return||unicode==13) unicode='\n'; // CR
-    if (unicode==GDK_BackSpace) unicode=8; // bs
-    if (unicode==GDK_Tab||unicode==9) mainw->rte_textparm=NULL;
+  if (mainw->rte_textparm!=NULL&&(keymod==0||keymod==LIVES_SHIFT_MASK||keymod==LIVES_LOCK_MASK)) {
+    if (unicode==LIVES_KEY_Return||unicode==13) unicode='\n'; // CR
+    if (unicode==LIVES_KEY_BackSpace) unicode=8; // bs
+    if (unicode==LIVES_KEY_Tab||unicode==9) mainw->rte_textparm=NULL;
     else if (unicode>0&&unicode<256) {
+      weed_plant_t *inst;
+      int param_number,copyto;
       int error;
       char *nval;
       char *cval=weed_get_string_value(mainw->rte_textparm,"value",&error);
@@ -252,11 +298,13 @@
       else nval=g_strdup_printf("%s%c",cval,(unsigned char)unicode); // append 1 char
       weed_free(cval);
       weed_set_string_value(mainw->rte_textparm,"value",nval);
+      inst=weed_get_plantptr_value(mainw->rte_textparm,"host_instance",&error);
+      param_number=weed_get_int_value(mainw->rte_textparm,"host_idx",&error);
+      copyto=set_copy_to(inst,param_number,TRUE);
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
 	// if we are recording, add this change to our event_list
-	weed_plant_t *inst=weed_get_plantptr_value(mainw->rte_textparm,"host_instance",&error);
-	int param_number=weed_get_int_value(mainw->rte_textparm,"host_idx",&error);
 	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
       }
       g_free(nval);
       return TRUE;
@@ -270,7 +318,6 @@
     if (!mainw->ext_keyboard) return TRUE; // if user switched out of ext_keyboard, do no further processing *
   }
 
-
   return FALSE;
 
   // * function was disabled so we must exit 
@@ -356,7 +403,6 @@
 
 gboolean rec_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mainw->record_perf),!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mainw->record_perf)));
-  LIVES_DEBUG("rozzz");
   return TRUE;
 }

LiVES-1.6.1.tar.bz2/src/keyboard.h -> LiVES-2.0.3.tar.bz2/src/keyboard.h Changed

LiVES-1.6.1.tar.bz2/src/ldvcallbacks.c -> LiVES-2.0.3.tar.bz2/src/ldvcallbacks.c Changed

@@ -1,6 +1,6 @@
 // ldvcallbacks.c
 // LiVES
-// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2006 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -10,22 +10,6 @@
 #include "ldvinterface.h"
 
 
-static void dvgrab_set_cursor_style(gint cstyle) {
-  if (dvgrabw->cursor!=NULL) gdk_cursor_unref(dvgrabw->cursor);
-  dvgrabw->cursor=NULL;
-
-  switch(cstyle) {
-  case LIVES_CURSOR_NORMAL:
-    gdk_window_set_cursor (dvgrabw->window->window, NULL);
-    return;
-  case LIVES_CURSOR_BUSY:
-    dvgrabw->cursor=gdk_cursor_new(GDK_WATCH);
-    gdk_window_set_cursor (dvgrabw->window->window, dvgrabw->cursor);
-    return;
-  }
-}
-
-
 
 void on_camgrab_clicked (GtkButton *button, gpointer user_data) {
   gchar *msg;
@@ -34,7 +18,7 @@
   dvgrabw->filename=find_free_camfile(cam->format);
   if (dvgrabw->filename==NULL) return;
   gtk_widget_set_sensitive(dvgrabw->grab,FALSE);
-  dvgrab_set_cursor_style(LIVES_CURSOR_BUSY);
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,dvgrabw->dialog);
   if (!dvgrabw->playing) on_camplay_clicked(NULL,user_data);
   msg=g_strdup_printf(_("Recording to %s/%s"),dvgrabw->dirname,dvgrabw->filename);
   gtk_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),msg);
@@ -52,11 +36,11 @@
   dvgrabw->playing=FALSE;
 
   if (cam->format==CAM_FORMAT_DV) {
-    lives_kill(cam->pgid, LIVES_SIGTERM);
-    cam->pgid=-0;
+    if (cam->pgid!=0) lives_kill(cam->pgid, LIVES_SIGTERM);
+    cam->pgid=0;
   }
 
-  dvgrab_set_cursor_style(LIVES_CURSOR_NORMAL);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,dvgrabw->dialog);
   camstop(cam);
   gtk_button_set_label(GTK_BUTTON(dvgrabw->play),"gtk-media-play");
   gtk_widget_set_sensitive(dvgrabw->grab,TRUE);
@@ -96,22 +80,7 @@
 }
 
 
-void on_camfile_clicked (GtkFileChooser *ch, gpointer entry) {
-  gchar *dir=gtk_file_chooser_get_current_folder(ch);
-  if (access(dir,W_OK)) {
-    gchar *tmp;
-    gtk_file_chooser_set_current_folder(ch,(tmp=g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(entry)),-1,NULL,NULL,NULL)));
-    g_free(tmp);
-    return;
-  }
-  if (dvgrabw->dirname!=NULL) g_free(dvgrabw->dirname);
-  gtk_entry_set_text(GTK_ENTRY(entry),(dvgrabw->dirname=g_filename_to_utf8(dir,-1,NULL,NULL,NULL)));
-  g_free(dir);
-}
-
-
-
-gboolean on_camdelete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+boolean on_camdelete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
   on_camquit_clicked(NULL,user_data);
   return FALSE;
 }
@@ -121,11 +90,13 @@
   s_cam *cam=(s_cam *)user_data;
   on_camstop_clicked(button,user_data);
   //if (cam->format==CAM_FORMAT_HDV) close_raw1394(cam->rec_handle);
-  gtk_widget_destroy(dvgrabw->window);
-  if (dvgrabw->cursor!=NULL) gdk_cursor_unref(dvgrabw->cursor);
+  gtk_widget_destroy(dvgrabw->dialog);
+  if (dvgrabw->cursor!=NULL) lives_cursor_unref(dvgrabw->cursor);
   if (dvgrabw->filename!=NULL) g_free(dvgrabw->filename);
   if (dvgrabw->dirname!=NULL) g_free(dvgrabw->dirname);
-  if (cam->grabbed_clips) do_error_dialog_with_check(_("\nClips grabbed from the device can now be loaded with File|Open File/Directory.\n"),WARN_MASK_AFTER_DVGRAB);
+  if (cam->grabbed_clips) do_error_dialog_with_check
+			    (_("\nClips grabbed from the device can now be loaded with File|Open File/Directory.\n"),
+			     WARN_MASK_AFTER_DVGRAB);
 
   if (mainw->multitrack!=NULL) {
     mt_sensitise(mainw->multitrack);

LiVES-1.6.1.tar.bz2/src/ldvcallbacks.h -> LiVES-2.0.3.tar.bz2/src/ldvcallbacks.h Changed

@@ -1,18 +1,17 @@
 // ldvcallbacks.h
 // LiVES
-// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2006 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
 
-void on_camgrab_clicked (GtkButton *button, gpointer user_data);
-void on_camplay_clicked (GtkButton *button, gpointer user_data);
-void on_camstop_clicked (GtkButton *button, gpointer user_data);
-void on_camrew_clicked (GtkButton *button, gpointer user_data);
-void on_camff_clicked (GtkButton *button, gpointer user_data);
-void on_cameject_clicked (GtkButton *button, gpointer user_data);
-void on_camfile_clicked (GtkFileChooser *ch, gpointer entry);
-void on_campause_clicked (GtkButton *button, gpointer user_data);
-void on_camquit_clicked (GtkButton *button, gpointer user_data);
+void on_camgrab_clicked (GtkButton *, gpointer s_cam);
+void on_camplay_clicked (GtkButton *, gpointer s_cam);
+void on_camstop_clicked (GtkButton *, gpointer s_cam);
+void on_camrew_clicked (GtkButton *, gpointer s_cam);
+void on_camff_clicked (GtkButton *, gpointer s_cam);
+void on_cameject_clicked (GtkButton *, gpointer s_cam);
+void on_campause_clicked (GtkButton *, gpointer s_cam);
+void on_camquit_clicked (GtkButton *, gpointer s_cam);
 
-gboolean on_camdelete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data);
+boolean on_camdelete_event (GtkWidget *, GdkEvent *, gpointer s_cam);

LiVES-1.6.1.tar.bz2/src/ldvgrab.c -> LiVES-2.0.3.tar.bz2/src/ldvgrab.c Changed

@@ -1,6 +1,6 @@
 // ldvgrab.c
 // LiVES
-// (c) G. Finch 2006 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2006 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -212,7 +212,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-gchar *find_free_camfile(gint format) {
+gchar *find_free_camfile(int format) {
   gchar *filename=g_strdup(gtk_entry_get_text(GTK_ENTRY(dvgrabw->filent)));
   int i;
   gchar *fname,*tmp=NULL,*tmp2,*tmp3;
@@ -220,7 +220,9 @@
   if (format==CAM_FORMAT_HDV) {
     for (i=1;i<10000;i++) {
       fname=g_strdup_printf("%s%04d.mpg",filename,i);
-      if (!g_file_test((tmp=g_strdup_printf("%s/%s",(tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),(tmp3=g_filename_from_utf8(fname,-1,NULL,NULL,NULL)))),G_FILE_TEST_EXISTS)) break;
+      if (!g_file_test((tmp=g_build_filename((tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+					     (tmp3=g_filename_from_utf8(fname,-1,NULL,NULL,NULL)),NULL)),
+		       G_FILE_TEST_EXISTS)) break;
       g_free(tmp);
       g_free(tmp2);
       g_free(tmp3);
@@ -230,7 +232,9 @@
   else {
     for (i=1;i<1000;i++) {
       fname=g_strdup_printf("%s%03d.dv",filename,i);
-      if (!g_file_test((tmp=g_strdup_printf("%s/%s",(tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),(tmp3=g_filename_from_utf8(fname,-1,NULL,NULL,NULL)))),G_FILE_TEST_EXISTS)) break;
+      if (!g_file_test((tmp=g_build_filename((tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+					     (tmp3=g_filename_from_utf8(fname,-1,NULL,NULL,NULL)),NULL)),
+		       G_FILE_TEST_EXISTS)) break;
       g_free(tmp);
       g_free(tmp2);
       g_free(tmp3);
@@ -244,7 +248,7 @@
 }
 
 
-gboolean rec(s_cam *cam) {
+boolean rec(s_cam *cam) {
   // returns filename of file being written
 
   gchar *tmp2,*tmp3,*com;
@@ -252,14 +256,20 @@
 
   if (cam->pgid!=0) return FALSE;
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dvgrabw->split))) splits=g_strdup("-autosplit ");
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(dvgrabw->split))) splits=g_strdup("-autosplit ");
   else splits=g_strdup("");
 
   if (cam->format==CAM_FORMAT_DV) {
     // dv format
+#ifndef IS_MINGW
     com=g_strdup_printf("dvgrab -format raw %s\"%s/%s\" >/dev/null 2>&1 &",splits,
 			(tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
 			(tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+#else
+    com=g_strdup_printf("dvgrab.exe -format raw %s\"%s/%s\" >NUL 2>&1 &",splits,
+			(tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+			(tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+#endif
     cam->pgid=lives_fork (com);
     g_free(com);
     g_free(tmp2);
@@ -269,9 +279,15 @@
   }
 
   // hdv format
+#ifndef IS_MINGW
   com=g_strdup_printf("dvgrab -format mpeg2 %s\"%s/%s\" >/dev/null 2>&1 &",splits,
 		      (tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
 		      (tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+#else
+  com=g_strdup_printf("dvgrab.exe -format mpeg2 %s\"%s/%s\" >NUL 2>&1 &",splits,
+		      (tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+		      (tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+#endif
   cam->pgid=lives_fork (com);
   g_free(com);
   g_free(tmp2);
@@ -284,7 +300,7 @@
 
 
 void on_open_fw_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  gint type=GPOINTER_TO_INT(user_data); // type 0==dv, type 1==hdv
+  int type=GPOINTER_TO_INT(user_data); // type 0==dv, type 1==hdv
   s_cam *cam;
 
   if (type==CAM_FORMAT_DV&&!capable->has_dvgrab) {
@@ -310,13 +326,12 @@
     mt_desensitise(mainw->multitrack);
   }
 
-
   dvgrabw = create_camwindow (cam,type);
   dvgrabw->cursor=NULL;
   cam->format=type;
   cam->grabbed_clips=FALSE;
   cam->pgid=0;
-  gtk_widget_show (dvgrabw->window);
+  gtk_widget_show (dvgrabw->dialog);
   dvgrabw->cam=cam;
 }

LiVES-1.6.1.tar.bz2/src/ldvgrab.h -> LiVES-2.0.3.tar.bz2/src/ldvgrab.h Changed

LiVES-1.6.1.tar.bz2/src/ldvinterface.c -> LiVES-2.0.3.tar.bz2/src/ldvinterface.c Changed

@@ -1,6 +1,6 @@
 // ldvinterface.c
 // LiVES
-// (c) G. Finch 2006-2011 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2006-2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -20,9 +20,7 @@
   GtkWidget *image;
   GtkWidget *vbox;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
   GtkWidget *label;
-  GtkWidget *hseparator;
   GtkWidget *direntry;
 
   gchar *tmp;
@@ -31,158 +29,134 @@
 
   dvgrabw->filename=NULL;
 
-  dvgrabw->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  dvgrabw->dialog = lives_standard_dialog_new (_("LiVES: DVGrab"),FALSE);
   dvgrabw->playing=FALSE;
-  gtk_window_set_title (GTK_WINDOW (dvgrabw->window), (_("LiVES: DVGrab")));
-  gtk_container_set_border_width (GTK_CONTAINER (dvgrabw->window), 20);
 
-  gtk_window_set_modal (GTK_WINDOW (dvgrabw->window), TRUE);
-  gtk_window_set_position (GTK_WINDOW (dvgrabw->window), GTK_WIN_POS_CENTER_ALWAYS);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dvgrabw->window, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  gtk_container_set_border_width (GTK_CONTAINER (dvgrabw->dialog), widget_opts.border_width*2);
 
   if (prefs->show_gui) {
-    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(dvgrabw->window),GTK_WINDOW(mainw->LiVES));
-    else gtk_window_set_transient_for(GTK_WINDOW(dvgrabw->window),GTK_WINDOW(mainw->multitrack->window));
+    if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(dvgrabw->dialog),GTK_WINDOW(mainw->LiVES));
+    else gtk_window_set_transient_for(GTK_WINDOW(dvgrabw->dialog),GTK_WINDOW(mainw->multitrack->window));
   }
 
-  vbox=gtk_vbox_new(FALSE,10);
-  gtk_container_add (GTK_CONTAINER (dvgrabw->window), vbox);
+  vbox=lives_dialog_get_content_area(LIVES_DIALOG(dvgrabw->dialog));
 
-  hbox = gtk_hbox_new (FALSE,10);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,10);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
-  label=gtk_label_new_with_mnemonic(_("Save _directory :"));
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  direntry=gtk_entry_new();
-  gtk_box_pack_start(GTK_BOX(hbox),direntry,TRUE,TRUE,0);
-  gtk_entry_set_text(GTK_ENTRY(direntry),(tmp=g_filename_to_utf8(g_get_current_dir(),-1,NULL,NULL,NULL)));
-  g_free(tmp);
-  gtk_entry_set_editable(GTK_ENTRY(direntry),FALSE);
+  buttond = lives_standard_file_button_new(TRUE,NULL);
+
+  label=lives_standard_label_new_with_mnemonic(_("Save _directory :"),buttond);
+  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
 
-  buttond = gtk_file_chooser_button_new(_("Save directory"),GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(buttond),g_get_current_dir());
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label),buttond);
+  gtk_box_pack_start(GTK_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
-  gtk_box_pack_start(GTK_BOX(hbox),buttond,FALSE,FALSE,10);
-  GTK_WIDGET_SET_FLAGS (buttond, GTK_CAN_DEFAULT);
+  direntry=lives_standard_entry_new(NULL,FALSE,(tmp=g_filename_to_utf8(g_get_current_dir(),-1,NULL,NULL,NULL)),-1,PATH_MAX,
+				    LIVES_BOX(hbox),NULL);
 
+  g_free(tmp);
 
-  hbox = gtk_hbox_new (FALSE,10);
-  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,10);
 
-  label=gtk_label_new_with_mnemonic(_("File_name:"));
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)direntry);
 
-  dvgrabw->filent=gtk_entry_new();
 
-  gtk_box_pack_start(GTK_BOX(hbox),dvgrabw->filent,FALSE,FALSE,0);
-  if (type==CAM_FORMAT_DV) gtk_entry_set_text(GTK_ENTRY(dvgrabw->filent),"dvgrab-");
-  else gtk_entry_set_text(GTK_ENTRY(dvgrabw->filent),"hdvgrab-");
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label),dvgrabw->filent);
+  //////////////////
 
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
-  if (type==CAM_FORMAT_DV) label=gtk_label_new("%d.dv");
-  else label=gtk_label_new("%d.mpg");
+  dvgrabw->filent=lives_standard_entry_new(_("File_name:"),TRUE,type==CAM_FORMAT_DV?"dvgrab-":"hdvgrab-",-1,-1,LIVES_BOX(hbox),NULL);
+
+  if (type==CAM_FORMAT_DV) label=lives_standard_label_new("%d.dv");
+  else label=lives_standard_label_new("%d.mpg");
   gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  label=gtk_label_new(_("(files will not be overwritten)"));
-  gtk_box_pack_end(GTK_BOX(hbox),label,FALSE,FALSE,0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label=lives_standard_label_new(_("(files will not be overwritten)"));
+  gtk_box_pack_end(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
 
-  dvgrabw->split=gtk_check_button_new();
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(eventbox,dvgrabw->split);
-  label=gtk_label_new_with_mnemonic (_("_Split into scenes"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),dvgrabw->split);
-  
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    dvgrabw->split);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  hbox = gtk_hbox_new (FALSE, 0);
-  
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-  
-  gtk_box_pack_start (GTK_BOX (hbox), dvgrabw->split, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  dvgrabw->split=lives_standard_check_button_new(_("_Split into scenes"),TRUE,LIVES_BOX(hbox),NULL);
 
 
+  // TODO - widget_opts.editable
   dvgrabw->status_entry=gtk_entry_new();
 
-  gtk_box_pack_start(GTK_BOX(vbox),dvgrabw->status_entry,FALSE,FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox),dvgrabw->status_entry,FALSE,FALSE,widget_opts.packing_height);
   gtk_entry_set_text(GTK_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
   gtk_editable_set_editable (GTK_EDITABLE(dvgrabw->status_entry),FALSE);
 
+  add_hsep_to_box(LIVES_BOX(vbox));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), hseparator, FALSE, TRUE, 10);
+  hbuttonbox1 = lives_hbutton_box_new ();
 
-  hbuttonbox1 = gtk_hbutton_box_new ();
+  gtk_box_pack_start(GTK_BOX(vbox),hbuttonbox1,FALSE,FALSE,widget_opts.packing_height);
 
-  gtk_box_pack_start(GTK_BOX(vbox),hbuttonbox1,FALSE,FALSE,0);
+#if GTK_CHECK_VERSION(2,6,0)
+  button3 = gtk_button_new_from_stock (GTK_STOCK_MEDIA_REWIND);
+#else
+  button3 = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
+#endif
 
-  button3 = gtk_button_new_from_stock(GTK_STOCK_MEDIA_REWIND);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), button3);
-  GTK_WIDGET_SET_FLAGS (button3, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus (button3,TRUE);
 
-  button4 = gtk_button_new_from_stock(GTK_STOCK_MEDIA_FORWARD);
+#if GTK_CHECK_VERSION(2,6,0)
+  button4 = gtk_button_new_from_stock (GTK_STOCK_MEDIA_FORWARD);
+#else
+  button4 = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+#endif
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), button4);
-  GTK_WIDGET_SET_FLAGS (button4, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus (button4,TRUE);
 
+#if GTK_CHECK_VERSION(2,6,0)
   dvgrabw->stop = gtk_button_new_from_stock (GTK_STOCK_MEDIA_STOP);
+#else
+  dvgrabw->stop = gtk_button_new_from_stock (GTK_STOCK_STOP);
+#endif
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->stop);
-  GTK_WIDGET_SET_FLAGS (dvgrabw->stop, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (dvgrabw->stop);
   gtk_widget_set_sensitive(dvgrabw->stop,FALSE);
 
+#if GTK_CHECK_VERSION(2,6,0)
   dvgrabw->play = gtk_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
+#else
+  dvgrabw->play = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+#endif
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->play);
-  GTK_WIDGET_SET_FLAGS (dvgrabw->play, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (dvgrabw->play);
   gtk_button_set_use_stock(GTK_BUTTON(dvgrabw->play),TRUE);
 
+#if GTK_CHECK_VERSION(2,6,0)
   dvgrabw->grab = gtk_button_new_from_stock (GTK_STOCK_MEDIA_RECORD);
+#else
+  dvgrabw->grab = gtk_button_new_from_stock (GTK_STOCK_NO);
+#endif
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), dvgrabw->grab);
-  GTK_WIDGET_SET_FLAGS (dvgrabw->grab, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (dvgrabw->grab);
 
-  image=gtk_image_new_from_stock(GTK_STOCK_MEDIA_RECORD,GTK_ICON_SIZE_BUTTON);
+#if GTK_CHECK_VERSION(2,6,0)
+  image = lives_image_new_from_stock (GTK_STOCK_MEDIA_RECORD,LIVES_ICON_SIZE_BUTTON);
+#else
+  image = lives_image_new_from_stock (GTK_STOCK_NO,LIVES_ICON_SIZE_BUTTON);
+#endif
   gtk_button_set_label(GTK_BUTTON(dvgrabw->grab),_("_Grab"));
   gtk_button_set_image(GTK_BUTTON(dvgrabw->grab),image);
 
-  label=gtk_label_new(_("\nUse this tool to control your camera and grab clips.\nAfter grabbing your clips, you can close this window \nand then load them into LiVES.\n"));
-  gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,40);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label=lives_standard_label_new(_("\nUse this tool to control your camera and grab clips.\nAfter grabbing your clips, you can close this window \nand then load them into LiVES.\n"));
+  gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,widget_opts.packing_height*4);
 
 
-  hbuttonbox2 = gtk_hbutton_box_new ();
-  gtk_box_pack_start(GTK_BOX(vbox),hbuttonbox2,FALSE,FALSE,0);
+  hbuttonbox2 = lives_hbutton_box_new ();
+  gtk_box_pack_start(GTK_BOX(vbox),hbuttonbox2,FALSE,FALSE,widget_opts.packing_height);
 
   dvgrabw->quit = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
   gtk_container_add (GTK_CONTAINER (hbuttonbox2), dvgrabw->quit);
-  GTK_WIDGET_SET_FLAGS (dvgrabw->quit, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (dvgrabw->quit);
 
-  image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,GTK_ICON_SIZE_BUTTON);
+  image=lives_image_new_from_stock(GTK_STOCK_CLOSE,LIVES_ICON_SIZE_BUTTON);
   gtk_button_set_label(GTK_BUTTON(dvgrabw->quit),_("_Close Window"));
   gtk_button_set_image(GTK_BUTTON(dvgrabw->quit),image);
 
@@ -194,13 +168,9 @@
   g_signal_connect (dvgrabw->play, "clicked",G_CALLBACK (on_camplay_clicked),(gpointer)cam);
   g_signal_connect (dvgrabw->grab, "clicked",G_CALLBACK (on_camgrab_clicked),(gpointer)cam);
   g_signal_connect (dvgrabw->quit, "clicked",G_CALLBACK (on_camquit_clicked),(gpointer)cam);
-  g_signal_connect (buttond, "current_folder_changed",G_CALLBACK (on_camfile_clicked),(gpointer)direntry);
 
-  g_signal_connect (GTK_OBJECT (dvgrabw->window), "delete_event",
-		    G_CALLBACK (on_camdelete_event),
-		    (gpointer)cam);
 
-  gtk_widget_show_all(dvgrabw->window);
+  gtk_widget_show_all(dvgrabw->dialog);
   
   dvgrabw->dirname=NULL;

LiVES-1.6.1.tar.bz2/src/ldvinterface.h -> LiVES-2.0.3.tar.bz2/src/ldvinterface.h Changed

LiVES-1.6.1.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-2.0.3.tar.bz2/src/lives-yuv4mpeg.c Changed

@@ -1,6 +1,6 @@
 // yuv4mpeg.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -132,7 +132,7 @@
     while (ntime<YUV4_O_TIME&&!pthread_kill(y4thread,0)) {
       // wait for thread to complete or timeout
       g_usleep(prefs->sleep_time);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       
       gettimeofday(&otv, NULL);
       ntime=(otv.tv_sec*1000000+otv.tv_usec-stime);
@@ -170,7 +170,7 @@
   while (ntime<YUV4_H_TIME&&!pthread_kill(y4thread,0)) {
     // wait for thread to complete or timeout
     g_usleep(prefs->sleep_time);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     gettimeofday(&otv, NULL);
     ntime=(otv.tv_sec*1000000+otv.tv_usec-stime);
@@ -400,17 +400,12 @@
     d_print (_ ("none\n"));
   }
   else {
-    d_print ((tmp=g_strdup_printf(_ ("%d Hz %d channel(s) %d bps\n"),cfile->arate,cfile->achans,cfile->asampsize)));
+    d_print ((tmp=g_strdup_printf(P_("%d Hz %d channel %d bps\n","%d Hz %d channels %d bps\n",cfile->achans),cfile->arate,cfile->achans,cfile->asampsize)));
     g_free(tmp);
   }
 
   // if not playing, start playing
   if (mainw->playing_file==-1) {
-    if (mainw->play_window!=NULL&&old_file==-1) {
-      // usually preview or load_preview_frame would do this
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
 
     // temp kludge, symlink audiodump.pcm to wav file, then pretend we are playing
     // an opening preview . Doesn't work with fifo.
@@ -427,9 +422,14 @@
     audio_fake=g_build_filename(prefs->tmpdir,cfile->handle,"audiodump.pcm",NULL);
 
 
+#ifndef IS_MINGW
     // fake file will go away when we close the current clip
     lives_system ((tmp=g_strdup_printf ("/bin/ln -s \"%s\" \"%s\" >/dev/null 2>&1",
 					audio_real,audio_fake)),TRUE);
+#else
+    // TODO
+#endif
+
     g_free(audio_real);
     g_free(audio_fake);
 
@@ -635,7 +635,8 @@
   mkfifo(fifofile,S_IRUSR|S_IWUSR);
 
   if (!tvcardw->use_advanced) {
-    com=g_strdup_printf("smogrify open_tv_card \"%s\" \"%s\" \"%s\" \"%s\"",cfile->handle,chanstr,devstr,fifofile);
+    com=g_strdup_printf("%s open_tv_card \"%s\" \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,chanstr,
+			devstr,fifofile);
   }
   else {
     gdouble fps=0.;
@@ -643,17 +644,17 @@
     gint width=0,height=0;
     gint input=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttoni));
     
-    if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tvcardw->radiobuttond))) {
+    if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(tvcardw->radiobuttond))) {
       width=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttonw));
       height=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(tvcardw->spinbuttonh));
       fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(tvcardw->spinbuttonf));
     }
 
-    driver=g_strdup(gtk_entry_get_text(GTK_ENTRY((GTK_COMBO(tvcardw->combod))->entry)));
-    outfmt=g_strdup(gtk_entry_get_text(GTK_ENTRY((GTK_COMBO(tvcardw->comboo))->entry)));
+    driver=lives_combo_get_active_text(LIVES_COMBO(tvcardw->combod));
+    outfmt=lives_combo_get_active_text(LIVES_COMBO(tvcardw->comboo));
 
-    com=g_strdup_printf("smogrify open_tv_card \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %.3f \"%s\" \"%s\"",
-			cfile->handle,chanstr,
+    com=g_strdup_printf("%s open_tv_card \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %.3f \"%s\" \"%s\"",
+			prefs->backend,cfile->handle,chanstr,
 			devstr,fifofile,input,width,height,fps,driver,outfmt);
     g_free(driver);
     g_free(outfmt);
@@ -751,7 +752,7 @@
   unlink(fifofile);
   mkfifo(fifofile,S_IRUSR|S_IWUSR);
 
-  com=g_strdup_printf("smogrify open_fw_card \"%s\" %d %d \"%s\"",cfile->handle,cardno,cache,fifofile);
+  com=g_strdup_printf("%s open_fw_card \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cardno,cache,fifofile);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   g_free(com);

LiVES-1.6.1.tar.bz2/src/main.c -> LiVES-2.0.3.tar.bz2/src/main.c Changed

@@ -16,11 +16,6 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 */
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glib.h>
 
 #if HAVE_SYSTEM_WEED
@@ -37,6 +32,8 @@
 #include "../libweed/weed-host.h"
 #endif
 
+#define NEED_DEF_WIDGET_OPTS
+
 #include "main.h"
 #include "interface.h"
 #include "support.h"
@@ -89,13 +86,13 @@
 
 //////////////////////////////////////////
 
-static gboolean no_recover=FALSE,auto_recover=FALSE;
-static gboolean upgrade_error=FALSE;
+static boolean no_recover=FALSE,auto_recover=FALSE;
+static boolean upgrade_error=FALSE;
 static gchar start_file[PATH_MAX];
 static gdouble start=0.;
 static gint end=0;
 
-static gboolean theme_expected;
+static boolean theme_expected;
 
 static _ign_opts ign_opts;
 
@@ -111,16 +108,52 @@
 };
 
 
+
 /////////////////////////////////
 #ifdef NO_COMPILE // never compile this
 void tr_msg(void) {
-  // dummy function for translators message
+  // TRANSLATORS: do not translate this message
   gchar *msg=(_("Attention Translators !\nThis message is intended for you, so please do not translate it.\n\nAll translators should read the LiVES translation notes at\nhttp://lives.sourceforge.net/TRANS-README.txt"));
 }
 #endif
 
 
 
+static void lives_log_handler (const char *domain, LiVESLogLevelFlags level, const char *message,  gpointer data) {
+  gchar *msg;
+
+#ifdef LIVES_NO_DEBUG
+  if (level>=LIVES_LOG_LEVEL_WARNING ) return;
+#else
+  if ((level&LIVES_LOG_LEVEL_MASK)==LIVES_LOG_LEVEL_WARNING) 
+    msg=g_strdup_printf(_("%s Warning: %s\n"),domain,message);
+#endif
+  else {
+    if ((level&LIVES_LOG_LEVEL_MASK)==LIVES_LOG_LEVEL_CRITICAL) 
+      msg=g_strdup_printf(_("%s Critical error: %s\n"),domain,message);
+    else msg=g_strdup_printf(_("%s Fatal error: %s\n"),domain,message);
+  }
+
+  if (mainw->is_ready) {
+    d_print(msg);
+  }
+
+  g_printerr("%s",msg);
+  g_free(msg);
+
+  if (level&LIVES_LOG_FATAL_MASK) raise(LIVES_SIGSEGV);
+}
+
+#ifdef IS_MINGW
+typedef void (*SignalHandlerPointer)(int);
+#endif
+
+
+void defer_sigint(int signum) {
+  mainw->signal_caught=signum;
+  return;
+}
+
 void catch_sigint(int signum) {
   // trap for ctrl-C and others 
   if (mainw!=NULL) {
@@ -128,9 +161,13 @@
       if (mainw->foreign) {
 	exit (signum);
       }
-      if (signum==SIGABRT||signum==SIGSEGV) {
-	signal (SIGSEGV, SIG_DFL);
-	signal (SIGABRT, SIG_DFL);
+
+      if (mainw->multitrack!=NULL) mainw->multitrack->idlefunc=0;
+      mainw->fatal=TRUE;
+
+      if (signum==LIVES_SIGABRT||signum==LIVES_SIGSEGV) {
+	signal (LIVES_SIGSEGV, SIG_DFL);
+	signal (LIVES_SIGABRT, SIG_DFL);
 	g_printerr("%s",_("\nUnfortunately LiVES crashed.\nPlease report this bug at http://sourceforge.net/tracker/?group_id=64341&atid=507139\nThanks. Recovery should be possible if you restart LiVES.\n"));
 	g_printerr("%s",_("\n\nWhen reporting crashes, please include details of your operating system, distribution, and the LiVES version (" LiVES_VERSION ")\n"));
 
@@ -165,8 +202,14 @@
   GSList *dlist,*dislist;
   GdkDisplay *disp;
   GdkScreen *screen;
+#if GTK_CHECK_VERSION(3,0,0)
+  GdkDeviceManager *devman;
+  GList *devlist;
+  register int k;
+#endif
+
   gint nscreens,nmonitors;
-  int i,j,idx=0;
+  register int i,j,idx=0;
 
   if (mainw->mgeom!=NULL) g_free(mainw->mgeom);
   mainw->mgeom=NULL;
@@ -191,31 +234,49 @@
 
   if (prefs->force_single_monitor) capable->nmonitors=1; // force for clone mode
 
-  if (capable->nmonitors>1) {
-    mainw->mgeom=(lives_mgeometry_t *)g_malloc(capable->nmonitors*sizeof(lives_mgeometry_t));
-    dlist=dislist;
+  mainw->mgeom=(lives_mgeometry_t *)g_malloc(capable->nmonitors*sizeof(lives_mgeometry_t));
+  dlist=dislist;
 
-    while (dlist!=NULL) {
-      disp=(GdkDisplay *)dlist->data;
+  while (dlist!=NULL) {
+    disp=(GdkDisplay *)dlist->data;
 
-      // get screens
-      nscreens=gdk_display_get_n_screens(disp);
-      for (i=0;i<nscreens;i++) {
-	screen=gdk_display_get_screen(disp,i);
-	nmonitors=gdk_screen_get_n_monitors(screen);
-	for (j=0;j<nmonitors;j++) {
-	  GdkRectangle rect;
-	  gdk_screen_get_monitor_geometry(screen,j,&(rect));
-	  mainw->mgeom[idx].x=rect.x;
-	  mainw->mgeom[idx].y=rect.y;
-	  mainw->mgeom[idx].width=rect.width;
-	  mainw->mgeom[idx].height=rect.height;
-	  mainw->mgeom[idx].screen=screen;
-	  idx++;
+#if GTK_CHECK_VERSION(3,0,0)
+    devman=gdk_display_get_device_manager(disp);
+    devlist=gdk_device_manager_list_devices(devman,GDK_DEVICE_TYPE_MASTER);
+#endif
+    // get screens
+    nscreens=gdk_display_get_n_screens(disp);
+    for (i=0;i<nscreens;i++) {
+      screen=gdk_display_get_screen(disp,i);
+      nmonitors=gdk_screen_get_n_monitors(screen);
+      for (j=0;j<nmonitors;j++) {
+	GdkRectangle rect;
+	gdk_screen_get_monitor_geometry(screen,j,&(rect));
+	mainw->mgeom[idx].x=rect.x;
+	mainw->mgeom[idx].y=rect.y;
+	mainw->mgeom[idx].width=rect.width;
+	mainw->mgeom[idx].height=rect.height;
+	mainw->mgeom[idx].mouse_device=NULL;
+#if GTK_CHECK_VERSION(3,0,0)
+	// get (virtual) mouse device for this screen
+	for (k=0;k<g_list_length(devlist);k++) {
+	  GdkDevice *device=(GdkDevice *)g_list_nth_data(devlist,k);
+	  if (gdk_device_get_display(device)==disp&&
+	      gdk_device_get_source(device)==GDK_SOURCE_MOUSE) { 
+	    mainw->mgeom[idx].mouse_device=device;
+	    break;
+	  }
 	}
+#endif
+	mainw->mgeom[idx].disp=disp;
+	mainw->mgeom[idx].screen=screen;
+	idx++;
       }
-      dlist=dlist->next;
     }
+#if GTK_CHECK_VERSION(3,0,0)
+    g_list_free(devlist);
+#endif
+    dlist=dlist->next;
   }
 
   g_slist_free(dislist);
@@ -226,22 +287,22 @@
 
 
 
-static gboolean pre_init(void) {
+static boolean pre_init(void) {
   // stuff which should be done *before* mainwindow is created
   // returns TRUE if we expect to load a theme
+
   pthread_mutexattr_t mattr;
 
   gchar buff[256];
   int i;
-  gboolean needs_update=FALSE;
-  gchar *rcfile;
+  boolean needs_update=FALSE;
 
   sizint=sizeof(gint);
   sizdbl=sizeof(gdouble);
   sizshrt=sizeof(gshort);
 
-  mainw=(mainwindow*)(g_malloc(sizeof(mainwindow)));
-  mainw->is_ready=FALSE;
+  mainw=(mainwindow*)(g_malloc0(sizeof(mainwindow)));
+  mainw->is_ready=mainw->fatal=FALSE;
 
   mainw->free_fn=lives_free_normal;
   mainw->do_not_free=NULL;
@@ -262,10 +323,17 @@
   pthread_mutex_init(&mainw->interp_mutex,NULL);
 
   pthread_mutex_init(&mainw->abuf_mutex,NULL);
+  pthread_mutex_init(&mainw->afilter_mutex,&mattr); // mattr because audio filters can pull values from data connections
+  pthread_mutex_init(&mainw->data_mutex,&mattr); // mattr because audio filters can pull values from data connections
 
-  prefs=(_prefs *)g_malloc(sizeof(_prefs));
+  mainw->vrfx_update=NULL;
+
+  mainw->kb_timer=-1;
+
+  prefs=(_prefs *)g_malloc0(sizeof(_prefs));
   future_prefs=(_future_prefs *)g_malloc(sizeof(_future_prefs));
 
+  prefs->wm=NULL;
   prefs->sleep_time=1000;
   mainw->cached_list=NULL;
 
@@ -274,11 +342,24 @@
   mainw->threaded_dialog=FALSE;
   clear_mainw_msg();
 
+  
+#ifdef IS_MINGW
+  // TODO - for mingw we will get from the registry, whatever was set at install time
+  g_snprintf (prefs->prefix_dir,PATH_MAX,"%s",PREFIX_DEFAULT);
+#endif
+
   // check the backend is there, get some system details and prefs
   capable=get_capabilities();
 
   palette=(_palette*)(g_malloc(sizeof(_palette)));
 
+  widget_opts = def_widget_opts;
+  widget_opts.border_width*=widget_opts.scale;
+  widget_opts.packing_width*=widget_opts.scale;
+  widget_opts.packing_height*=widget_opts.scale;
+  widget_opts.filler_len*=widget_opts.scale;
+
+
   prefs->show_gui=TRUE;
   prefs->show_splash=TRUE;
   prefs->show_playwin=TRUE;
@@ -288,7 +369,11 @@
   g_snprintf(prefs->aplayer,512,"%s","sox");
   prefs->open_decorated=TRUE;
 
+#ifdef ENABLE_GIW
   prefs->lamp_buttons=TRUE;
+#else
+  prefs->lamp_buttons=FALSE;
+#endif
 
   prefs->autoload_subs=TRUE;
   prefs->show_subtitles=TRUE;
@@ -306,9 +391,12 @@
   }
 
   // from here onwards we can use get_pref() and friends  //////
-  rcfile=g_strdup_printf("%s/.lives",capable->home_dir);
-  cache_file_contents(rcfile);
-  g_free(rcfile);
+#ifndef IS_MINGW
+  capable->rcfile=g_strdup_printf("%s/.lives",capable->home_dir);
+#else
+  capable->rcfile=g_strdup_printf("%s/LiVES.ini",capable->home_dir);
+#endif
+  cache_file_contents(capable->rcfile);
 
   get_pref("gui_theme",prefs->theme,64);
   if (!strlen(prefs->theme)) {
@@ -316,7 +404,8 @@
   }
   // get some prefs we need to set menu options
   future_prefs->show_recent=prefs->show_recent=get_boolean_pref ("show_recent_files");
-  
+
+#ifndef IS_MINGW  
   get_pref ("prefix_dir",prefs->prefix_dir,PATH_MAX);
   
   if (!strlen (prefs->prefix_dir)) {
@@ -330,19 +419,26 @@
   }
   
   if (ensure_isdir(prefs->prefix_dir)) needs_update=TRUE;
+
+
   if (needs_update) set_pref("prefix_dir",prefs->prefix_dir);
-  
+
   needs_update=FALSE;
-  
+
   get_pref ("lib_dir",prefs->lib_dir,PATH_MAX);
   
   if (!strlen (prefs->lib_dir)) {
+
     g_snprintf (prefs->lib_dir,PATH_MAX,"%s",LIVES_LIBDIR);
     needs_update=TRUE;
   }
-  
+
   if (ensure_isdir(prefs->lib_dir)) needs_update=TRUE;
   if (needs_update) set_pref("lib_dir",prefs->lib_dir);
+
+#else
+    g_snprintf (prefs->lib_dir,PATH_MAX,"%s",prefs->prefix_dir);
+#endif
   
   needs_update=FALSE;
 
@@ -418,6 +514,8 @@
     if (prefs->play_monitor>capable->nmonitors) prefs->play_monitor=capable->nmonitors;
   }
 
+  mainw->scr_width=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].width;
+  mainw->scr_height=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].height;
 
   for (i=0;i<MAX_FX_CANDIDATE_TYPES;i++) {
     mainw->fx_candidates[i].delegate=-1;
@@ -426,8 +524,6 @@
     mainw->fx_candidates[i].rfx=NULL;
   }
 
-  mainw->cursor=NULL;
-
   for (i=0;i<MAX_EXT_CNTL;i++) mainw->ext_cntl[i]=FALSE;
 
   prefs->omc_dev_opts=get_int_pref("omc_dev_opts");
@@ -436,6 +532,7 @@
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
+#ifndef IS_MINGW
   if (strlen(prefs->omc_js_fname)==0) {
     const gchar *tmp=get_js_filename();
     if (tmp!=NULL) {
@@ -444,10 +541,12 @@
   }
 #endif
 #endif
+#endif
   
   get_pref_utf8("omc_midi_fname",prefs->omc_midi_fname,256);
 #ifdef ENABLE_OSC
 #ifdef OMC_MIDI_IMPL
+#ifndef IS_MINGW
   if (strlen(prefs->omc_midi_fname)==0) {
     const gchar *tmp=get_midi_filename();
     if (tmp!=NULL) {
@@ -456,6 +555,7 @@
   }
 #endif
 #endif
+#endif
 
 #ifdef ALSA_MIDI
     prefs->use_alsa_midi=TRUE;
@@ -481,7 +581,10 @@
     mainw->alarms[i]=LIVES_NO_ALARM_TICKS;
   }
 
-  if (!strcasecmp(prefs->theme,"none")) return FALSE;
+  needs_update=needs_update; // stop compiler warnings
+
+  if (!g_ascii_strcasecmp(prefs->theme,"none")) return FALSE;
+
   return TRUE;
 
 }
@@ -499,7 +602,8 @@
 
   if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate!=-1) {
     
-    resize_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_RESIZER].list,mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate));
+    resize_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_RESIZER].list,
+					      mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate));
     filter=get_weed_filter(resize_fx);
     rfx=weed_to_rfx(filter,TRUE);
     
@@ -514,7 +618,8 @@
     g_free(rfx->menu_text);
 
     if (mainw->resize_menuitem==NULL) {
-      mainw->resize_menuitem = gtk_menu_item_new_with_mnemonic(_("_Resize All Frames"));
+      rfx->menu_text=g_strdup(_("_Resize All Frames"));
+      mainw->resize_menuitem = gtk_menu_item_new_with_mnemonic(rfx->menu_text);
       gtk_widget_show(mainw->resize_menuitem);
       gtk_menu_shell_insert (GTK_MENU_SHELL (mainw->tools_menu), mainw->resize_menuitem, RFX_TOOL_MENU_POSN);
     }
@@ -525,7 +630,7 @@
       for (i=strlen(mtext)-1;i>0&&!strncmp(&mtext[i],".",1);i--) memset(&mtext[i],0,1);
       
       rfx->menu_text=g_strdup(mtext);
-      
+
       // disconnect old menu entry
       g_signal_handler_disconnect(mainw->resize_menuitem,mainw->fx_candidates[FX_CANDIDATE_RESIZER].func);
       
@@ -553,37 +658,19 @@
   int i;
   int randfd;
   int naudp=0;
+
+  boolean needs_free;
+
   ssize_t randres;
   gchar buff[256];
   uint32_t rseed;
   GList *encoders=NULL;
   GList *encoder_capabilities=NULL;
-  struct sigaction sact;
-  sigset_t smask;
-
-  sigemptyset(&smask);
 
-  sigaddset(&smask,SIGINT);
-  sigaddset(&smask,SIGTERM);
-  sigaddset(&smask,SIGSEGV);
-  sigaddset(&smask,SIGABRT);
+  gchar *weed_plugin_path;
+  gchar *frei0r_path;
+  gchar *ladspa_path;
 
-  sact.sa_handler=catch_sigint;
-  sact.sa_flags=0;
-  sact.sa_mask=smask;
-
-  signal (SIGHUP,SIG_IGN);
-  signal (SIGPIPE,SIG_IGN);
-  signal (SIGUSR1,SIG_IGN);
-
-  sigaction (SIGINT, &sact, NULL);
-  sigaction (SIGTERM, &sact, NULL);
-  sigaction (SIGSEGV, &sact, NULL);
-  sigaction (SIGABRT, &sact, NULL);
-
-  // initialise the mainwindow data
-  mainw->scr_width=gdk_screen_width();
-  mainw->scr_height=gdk_screen_height();
 
   for (i=0;i<=MAX_FILES;mainw->files[i++]=NULL);
   mainw->fs=FALSE;
@@ -609,9 +696,8 @@
   mainw->opening_loc=FALSE;
   mainw->toy_type=LIVES_TOY_NONE;
   mainw->framedraw=mainw->framedraw_spinbutton=NULL;
-  mainw->framedraw_copy_pixmap=mainw->framedraw_orig_pixmap=mainw->framedraw_bitmap=NULL;
-  mainw->framedraw_bitmapgc=NULL;
-  mainw->framedraw_colourgc=NULL;
+  mainw->fd_layer=NULL;
+  mainw->fd_layer_orig=NULL;
   mainw->is_processing=FALSE;
   mainw->is_rendering=FALSE;
   mainw->is_generating=FALSE;
@@ -645,7 +731,6 @@
   mainw->rte=EFFECT_NONE;
 
   mainw->must_resize=FALSE;
-  mainw->gc=NULL;
 
   mainw->preview_box = NULL;
   mainw->prv_link=PRV_FREE;
@@ -657,6 +742,7 @@
   mainw->blend_file=-1;
 
   mainw->pre_src_file=-2;
+  mainw->pre_src_audio_file=-1;
 
   mainw->size_warn=FALSE;
   mainw->dvgrab_preview=FALSE;
@@ -692,9 +778,6 @@
   // can now be set through OSC: /output/nodrop/enable
   mainw->noframedrop=FALSE;
 
-  // install our key_snooper, this will do for ctrl-arrow key autorepeat
-  mainw->ksnoop=gtk_key_snooper_install (key_snooper, NULL);
-
   prefs->omc_noisy=FALSE;
   prefs->omc_events=TRUE;
 
@@ -722,6 +805,12 @@
 
   prefs->rec_opts|=(REC_FPS+REC_FRAMES);
 
+  prefs->audio_src=get_int_pref("audio_src");
+
+  if (!((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
+    prefs->audio_src=AUDIO_SRC_INT;
+  }
+
   mainw->new_clip=-1;
   mainw->record=FALSE;
   mainw->event_list=NULL;
@@ -736,7 +825,9 @@
 
   mainw->video_seek_ready=FALSE;
 
-  mainw->filter_map=NULL; // filter map for rendering
+  mainw->filter_map=NULL; // filter map for video rendering
+  mainw->afilter_map=NULL; // filter map for audio rendering
+  mainw->audio_event=NULL;
 
   mainw->did_rfx_preview=FALSE;
   mainw->invis=NULL;
@@ -753,7 +844,7 @@
 
   mainw->affected_layouts_map=mainw->current_layouts_map=NULL;
 
-  mainw->recovery_file=g_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
+  mainw->recovery_file=g_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),lives_getpid());
   mainw->leave_recovery=TRUE;
 
   mainw->pchains=NULL;
@@ -779,20 +870,24 @@
   mainw->suppress_dprint=FALSE;
 
   // TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-  mainw->any_string=g_strdup(_("Any"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_ANY]=g_strdup(_("Any"));
   // TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-  mainw->none_string=g_strdup(_("None"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_NONE]=g_strdup(_("None"));
   // TRANSLATORS: text saying "recommended", for plugin names, etc.
-  mainw->recommended_string=g_strdup(_("recommended"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]=g_strdup(_("recommended"));
   // TRANSLATORS: text saying "disabled", (as in "not enabled")
-  mainw->disabled_string=g_strdup(_("disabled !"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_DISABLED]=g_strdup(_("disabled !"));
   // TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-  mainw->cl_string=g_strdup(_("**The current layout**"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_CL]=g_strdup(_("**The current layout**"));
+  // TRANSLATORS: adjective for "Built in" type effects
+  mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]=g_strdup(_("Builtin"));
+  // TRANSLATORS: adjective for "Custom" type effects
+  mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]=g_strdup(_("Custom"));
+  // TRANSLATORS: adjective for "Test" type effects
+  mainw->string_constants[LIVES_STRING_CONSTANT_TEST]=g_strdup(_("Test"));
 
   mainw->opening_frames=-1;
 
-  mainw->general_gc=NULL;
-
   mainw->show_procd=TRUE;
 
   mainw->framedraw_preview=mainw->framedraw_reset=NULL;
@@ -815,8 +910,6 @@
 
   mainw->stream_ticks=-1;
 
-  hidden_cursor=NULL;
-
   mainw->keep_pre=FALSE;
 
   mainw->reverse_pb=FALSE;
@@ -840,7 +933,7 @@
 
 
   mainw->stored_event_list=NULL;
-  mainw->stored_event_list_changed=FALSE;
+  mainw->stored_event_list_changed=mainw->stored_event_list_auto_changed=FALSE;
   mainw->stored_layout_save_all_vals=TRUE;
 
   mainw->affected_layout_marks=NULL;
@@ -852,9 +945,6 @@
   mainw->sl_undo_buffer_used=0;
   mainw->sl_undo_offset=0;
 
-  mainw->sig_pid=0;
-  mainw->sig_file=NULL;
-
   mainw->go_away=TRUE;
 
   mainw->aud_file_to_kill=-1;
@@ -889,8 +979,6 @@
 
   mainw->jack_trans_poll=FALSE;
 
-  mainw->pw_exp_is_blocked=TRUE;
-
   mainw->toy_alives_pid=0;
   mainw->autolives_reset_fx=FALSE;
 
@@ -911,11 +999,34 @@
   mainw->tried_ds_recover=FALSE;
 
   mainw->foreign_visual=NULL;
+
+  mainw->pconx=NULL;
+  mainw->cconx=NULL;
+
+  cached_key=cached_mod=0;
+
+  mainw->agen_key=0;
+  mainw->agen_needs_reinit=FALSE;
+  mainw->agen_samps_count=0;
+
+  mainw->draw_blocked=FALSE;
+
+  mainw->ce_frame_height=mainw->ce_frame_width=-1;
+
+  mainw->overflow_height=0;
+
+  mainw->cursor_style=LIVES_CURSOR_NORMAL;
+
+  mainw->rowstride_alignment=mainw->rowstride_alignment_hint=1;
+
+  mainw->sepwin_minwidth=MIN_SEPWIN_WIDTH;
+  mainw->sepwin_minheight=PREVIEW_BOX_HT;
+
+  mainw->signal_caught=0;
+  mainw->signals_deferred=FALSE;
   /////////////////////////////////////////////////// add new stuff just above here ^^
 
-  // TODO - dirsep
 
-  g_snprintf(mainw->first_info_file,PATH_MAX,"%s/.info.%d",prefs->tmpdir,getpid());
   memset (mainw->set_name,0,1);
   mainw->clips_available=0;
 
@@ -940,14 +1051,13 @@
     prefs->no_bandwidth=FALSE;
     prefs->ocp=get_int_pref ("open_compression_percent");
 
-    colour_equal(&palette->fade_colour,&palette->black);
+    lives_widget_color_copy(&palette->fade_colour,&palette->black);
 
     // we set the theme here in case it got reset to 'none'
     set_pref("gui_theme",prefs->theme);
     g_snprintf(future_prefs->theme,64,"%s",prefs->theme);
 
     prefs->stop_screensaver=get_boolean_pref("stop_screensaver");
-    prefs->pause_xmms=get_boolean_pref("pause_xmms_on_playback");
     prefs->open_maximised=get_boolean_pref("open_maximised");
     future_prefs->show_tool=prefs->show_tool=get_boolean_pref("show_toolbar");
     memset (future_prefs->vpp_name,0,64);
@@ -955,9 +1065,9 @@
 
     if (prefs->gui_monitor!=0) {
       gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						      mainw->LiVES->allocation.width)/2;
+						      lives_widget_get_allocation_width(mainw->LiVES))/2;
       gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						      mainw->LiVES->allocation.height)/2;
+						      lives_widget_get_allocation_height(mainw->LiVES))/2;
       gtk_window_set_screen(GTK_WINDOW(mainw->LiVES),mainw->mgeom[prefs->gui_monitor-1].screen);
       gtk_window_move(GTK_WINDOW(mainw->LiVES),xcen,ycen);
 
@@ -1023,6 +1133,13 @@
     prefs->force_system_clock=FALSE;  ///< prefer soundcard timing
 
     prefs->alpha_post=FALSE; ///< allow pre-multiplied alpha internally
+
+    prefs->auto_trim_audio=TRUE;
+
+    prefs->force64bit=FALSE;
+
+    prefs->present=FALSE;
+
     //////////////////////////////////////////////////////////////////
 
     weed_memory_init();
@@ -1044,7 +1161,7 @@
 	rseed=tv.tv_sec+tv.tv_usec;
       }
 
-      srandom(rseed);
+      lives_srandom(rseed);
 
       randres=-1;
 
@@ -1148,7 +1265,11 @@
       }
 
       // scan for encoder plugins
+#ifndef IS_MINGW
       if ((encoders=get_plugin_list (PLUGIN_ENCODERS,FALSE,NULL,NULL))!=NULL) {
+#else
+      if ((encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL))!=NULL) {
+#endif
 	capable->has_encoder_plugins=TRUE;
 	g_list_free_strings (encoders);
 	g_list_free (encoders);
@@ -1273,6 +1394,7 @@
       g_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",prefs->def_vid_save_dir);
       ensure_isdir(mainw->vid_save_dir);
 
+      g_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",mainw->vid_save_dir);
       
       get_pref_utf8("audio_dir",prefs->def_audio_dir,PATH_MAX);
       if (!strlen(prefs->def_audio_dir)) {
@@ -1285,7 +1407,6 @@
       }
       g_snprintf(mainw->audio_dir,PATH_MAX,"%s",prefs->def_audio_dir);
       ensure_isdir(mainw->audio_dir);
-      g_snprintf(mainw->xmms_dir,PATH_MAX,"%s",mainw->audio_dir);
       
       get_pref_utf8("image_dir",prefs->def_image_dir,PATH_MAX);
       if (!strlen(prefs->def_image_dir)) {
@@ -1341,6 +1462,42 @@
       prefs->fxdefsfile=NULL;
       prefs->fxsizesfile=NULL;
       
+      needs_free=FALSE;
+      weed_plugin_path=getenv("WEED_PLUGIN_PATH");
+      if (weed_plugin_path==NULL) {
+	get_pref("weed_plugin_path",prefs->weed_plugin_path,PATH_MAX);
+	if (strlen(prefs->weed_plugin_path)==0) weed_plugin_path=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL);
+	else weed_plugin_path=g_strdup(prefs->weed_plugin_path);
+	lives_setenv("WEED_PLUGIN_PATH",weed_plugin_path);
+	needs_free=TRUE;
+      }
+      snprintf(prefs->weed_plugin_path,PATH_MAX,"%s",weed_plugin_path);
+      if (needs_free) g_free(weed_plugin_path);
+      
+      needs_free=FALSE;
+      frei0r_path=getenv("FREI0R_PATH");
+      if (frei0r_path==NULL) {
+	get_pref("frei0r_path",prefs->frei0r_path,PATH_MAX);
+	if (strlen(prefs->frei0r_path)==0) frei0r_path=g_strdup_printf("/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:%s/frei0r-1",capable->home_dir);
+	else frei0r_path=g_strdup(prefs->frei0r_path);
+	lives_setenv("FREI0R_PATH",frei0r_path);
+	needs_free=TRUE;
+      }
+      snprintf(prefs->frei0r_path,PATH_MAX,"%s",frei0r_path);
+      if (needs_free) g_free(frei0r_path);
+      
+      needs_free=FALSE;
+      ladspa_path=getenv("LADSPA_PATH");
+      if (ladspa_path==NULL||strlen(ladspa_path)==0) {
+	get_pref("ladspa_path",prefs->ladspa_path,PATH_MAX);
+	if (strlen(prefs->ladspa_path)==0) ladspa_path=g_build_filename(prefs->lib_dir,"ladspa",NULL);
+	else ladspa_path=g_strdup(prefs->ladspa_path);
+	lives_setenv("LADSPA_PATH",ladspa_path);
+	needs_free=TRUE;
+      }
+      snprintf(prefs->ladspa_path,PATH_MAX,"%s",ladspa_path);
+      if (needs_free) g_free(ladspa_path);
+
       splash_msg(_("Loading realtime effect plugins..."),.6);
       weed_load_all();
 
@@ -1385,7 +1542,7 @@
 
       if (capable->has_jackd) naudp++;
       if (capable->has_pulse_audio) naudp++;
-      if (capable->has_sox) naudp++;
+      if (capable->has_sox_play) naudp++;
       if (capable->has_mplayer) naudp++;
 
       if (naudp>1) {
@@ -1436,7 +1593,13 @@
 #else
 	      gchar *otherbit="\"lives -aplayer sox\".";
 #endif
-	      g_printerr("%s%s\n\n",_("\n\nManual start of jackd required. Please make sure jackd is running, \nor else change the value of <jack_opts> in ~/.lives to 16\nand restart LiVES.\n\nAlternatively, try to start lives with either \"lives -jackopts 16\", or "),otherbit);
+	      gchar *tmp;
+
+	      gchar *msg=g_strdup_printf(_("\n\nManual start of jackd required. Please make sure jackd is running, \nor else change the value of <jack_opts> in %s to 16\nand restart LiVES.\n\nAlternatively, try to start lives with either \"lives -jackopts 16\", or "),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+	      g_printerr("%s%s\n\n",msg,otherbit);
+	      g_free(msg);
+	      g_free(tmp);
+
 	    }
 
 	    if (mainw->jackd==NULL) {
@@ -1490,7 +1653,7 @@
       prefs->startup_phase=5;
       do_startup_interface_query();
       txt=get_new_install_msg();
-      startup_message_nonfatal(txt);
+      startup_message_info(txt);
       g_free(txt);
 
       set_int_pref("startup_phase",100); // tell backend to delete this
@@ -1500,26 +1663,28 @@
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
 
     // toolbar buttons
-    gtk_widget_modify_bg (mainw->tb_hbox, GTK_STATE_NORMAL, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->toolbar, GTK_STATE_NORMAL, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_stopbutton, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_bckground, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_sepwin, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_double, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_fullscreen, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_faster, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_slower, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_forward, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_back, GTK_STATE_PRELIGHT, &palette->fade_colour);
-    gtk_widget_modify_bg (mainw->t_infobutton, GTK_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->tb_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->toolbar, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_stopbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_bckground, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_sepwin, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_double, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_fullscreen, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_faster, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_slower, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_forward, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_back, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color (mainw->t_infobutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
     
 
   }
-}
+  }
 
 
 
 void do_start_messages(void) {
+  gchar *endian;
+
   d_print("\n");
   d_print(_("Checking optional dependencies:"));
   if (capable->has_mplayer) d_print(_ ("mplayer...detected..."));
@@ -1528,7 +1693,7 @@
   else d_print(_ ("convert...NOT DETECTED..."));
   if (capable->has_composite) d_print(_ ("composite...detected..."));
   else d_print(_ ("composite...NOT DETECTED..."));
-  if (capable->has_sox) d_print(_ ("sox...detected\n"));
+  if (capable->has_sox_sox) d_print(_ ("sox...detected\n"));
   else d_print(_ ("sox...NOT DETECTED\n"));
   if (capable->has_cdda2wav) d_print(_ ("cdda2wav...detected..."));
   else d_print(_ ("cdda2wav...NOT DETECTED..."));
@@ -1543,11 +1708,15 @@
   if (capable->has_xwininfo) d_print(_ ("xwininfo...detected..."));
   else d_print(_ ("xwininfo...NOT DETECTED..."));
 
-#ifdef USE_X11
+#ifdef GDK_WINDOWING_X11
   prefs->wm=g_strdup(gdk_x11_screen_get_window_manager_name (gdk_screen_get_default()));
 #else
+#ifdef IS_MINGW
+  prefs->wm=g_strdup_printf(_("Windows version %04X"),WINVER);
+#else
   prefs->wm=g_strdup((_("UNKNOWN - please patch me !")));
 #endif
+#endif
 
   g_snprintf(mainw->msg,512,_ ("\n\nWindow manager reports as \"%s\"; "),prefs->wm);
   d_print(mainw->msg);
@@ -1555,7 +1724,46 @@
   g_snprintf(mainw->msg,512,_("number of monitors detected: %d\n"),capable->nmonitors);
   d_print(mainw->msg);
 
-  g_snprintf(mainw->msg,512,_("Number of CPUs detected: %d\n"),capable->ncpus);
+  g_snprintf(mainw->msg,512,_("Number of CPUs detected: %d "),capable->ncpus);
+  d_print(mainw->msg);
+
+  if (capable->byte_order==LIVES_LITTLE_ENDIAN) endian=g_strdup(_("little endian"));
+  else endian=g_strdup(_("big endian"));
+  g_snprintf(mainw->msg,512,_("(%d bits, %s)\n"),capable->cpu_bits,endian);
+  d_print(mainw->msg);
+  g_free(endian);
+
+  g_snprintf(mainw->msg,512,"%s",_("GUI type is: "));
+  d_print(mainw->msg);
+
+#ifdef GUI_GTK
+  g_snprintf(mainw->msg,512,_("GTK+ "
+#if GTK_CHECK_VERSION(3,0,0)
+"version %d.%d.%d ("
+#endif
+"compiled with %d.%d.%d"
+#if GTK_CHECK_VERSION(3,0,0)
+")"
+#endif
+),
+#if GTK_CHECK_VERSION(3,0,0)
+	     gtk_get_major_version(),
+	     gtk_get_minor_version(),
+	     gtk_get_micro_version(),
+#endif
+	     GTK_MAJOR_VERSION,
+	     GTK_MINOR_VERSION,
+	     GTK_MICRO_VERSION
+	     );
+  d_print(mainw->msg);
+#endif
+
+#ifdef PAINTER_CAIRO
+  g_snprintf(mainw->msg,512,"%s",_(", with cairo support"));
+  d_print(mainw->msg);
+#endif
+
+  g_snprintf(mainw->msg,512,"\n");
   d_print(mainw->msg);
 
   g_snprintf(mainw->msg,512,_ ("Temp directory is %s\n"),prefs->tmpdir);
@@ -1582,102 +1790,111 @@
 
 // TODO - allow user definable themes
 void set_palette_colours (void) {
-  // bitmap transparencies
-  GdkColor opaque={0,0,0,0};
-  GdkColor trans={0xFF,0xFF,0xFF,0xFF};
-  colour_equal (&palette->bm_opaque,&opaque);
-  colour_equal (&palette->bm_trans,&trans);
 
   // set configurable colours and theme colours for the app
-  gdk_color_parse ("black", &palette->black);
-  gdk_color_parse ("white", &palette->white);
-  gdk_color_parse ("SeaGreen3", &palette->light_green);
-  gdk_color_parse ("dark red", &palette->dark_red);
-  gdk_color_parse ("light blue", &palette->light_blue);
-  gdk_color_parse ("light yellow", &palette->light_yellow);
-  gdk_color_parse ("grey10", &palette->grey20);
-  gdk_color_parse ("grey25", &palette->grey25);
-  gdk_color_parse ("grey45", &palette->grey45);
-  gdk_color_parse ("grey60", &palette->grey60);
-  gdk_color_parse ("pink", &palette->pink);
-  gdk_color_parse ("salmon", &palette->light_red);
-  gdk_color_parse ("DarkOrange4", &palette->dark_orange);
+  lives_color_parse ("black", &palette->black);
+  lives_color_parse ("white", &palette->white);
+  lives_color_parse ("SeaGreen3", &palette->light_green);
+  lives_color_parse ("dark red", &palette->dark_red);
+  lives_color_parse ("light blue", &palette->light_blue);
+  lives_color_parse ("light yellow", &palette->light_yellow);
+  lives_color_parse ("grey10", &palette->grey20);
+  lives_color_parse ("grey25", &palette->grey25);
+  lives_color_parse ("grey45", &palette->grey45);
+  lives_color_parse ("grey60", &palette->grey60);
+  lives_color_parse ("pink", &palette->pink);
+  lives_color_parse ("salmon", &palette->light_red);
+  lives_color_parse ("DarkOrange4", &palette->dark_orange);
 
-  colour_equal(&palette->banner_fade_text,&palette->white);
+  lives_widget_color_copy(&palette->banner_fade_text,&palette->white);
   palette->style=STYLE_PLAIN;
 
   // STYLE_PLAIN will overwrite this
   if (!(strcmp(prefs->theme,"pinks"))) {
     
-    palette->normal_back.red=228*256;
-    palette->normal_back.green=196*256;
-    palette->normal_back.blue=196*256;
-      
-    colour_equal(&palette->normal_fore,&palette->black);
-    colour_equal(&palette->menu_and_bars,&palette->pink);
-    colour_equal(&palette->info_text,&palette->normal_fore);
-    colour_equal(&palette->info_base,&palette->normal_back);
+    palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(228.);
+    palette->normal_back.green=LIVES_WIDGET_COLOR_SCALE_255(196.);
+    palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(196.);
+#if GTK_CHECK_VERSION(3,0,0)
+    palette->normal_back.alpha=1.;
+#endif      
+    lives_widget_color_copy(&palette->normal_fore,&palette->black);
+    lives_widget_color_copy(&palette->menu_and_bars,&palette->pink);
+    lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
+    lives_widget_color_copy(&palette->info_base,&palette->normal_back);
     palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
   }
   else {
     if (!(strcmp(prefs->theme,"cutting_room"))) {
 
-      palette->normal_back.red=224*256;
-      palette->normal_back.green=224*256;
-      palette->normal_back.blue=128*256;
+      palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(224.);
+      palette->normal_back.green=LIVES_WIDGET_COLOR_SCALE_255(224.);
+      palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(128.);
+#if GTK_CHECK_VERSION(3,0,0)
+      palette->normal_back.alpha=1.;
+#endif      
 	  
-      colour_equal(&palette->normal_fore,&palette->black);
-      colour_equal(&palette->menu_and_bars,&palette->white);
-      colour_equal(&palette->info_text,&palette->normal_fore);
-      colour_equal(&palette->info_base,&palette->white);
+      lives_widget_color_copy(&palette->normal_fore,&palette->black);
+      lives_widget_color_copy(&palette->menu_and_bars,&palette->white);
+      lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
+      lives_widget_color_copy(&palette->info_base,&palette->white);
       palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
     }
     else {
       if (!(strcmp(prefs->theme,"camera"))) {
 
-	palette->normal_back.red=30*256;
-	palette->normal_back.green=144*256;
-	palette->normal_back.blue=232*256;
+	palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(30.);
+	palette->normal_back.green=LIVES_WIDGET_COLOR_SCALE_255(144.);
+	palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(232.);
+#if GTK_CHECK_VERSION(3,0,0)
+	palette->normal_back.alpha=1.;
+#endif      
 	  
-	colour_equal(&palette->normal_fore,&palette->black);
-	colour_equal(&palette->menu_and_bars,&palette->white);
-	colour_equal(&palette->info_base,&palette->normal_back);
-	colour_equal(&palette->info_text,&palette->normal_fore);
+	lives_widget_color_copy(&palette->normal_fore,&palette->black);
+	lives_widget_color_copy(&palette->menu_and_bars,&palette->white);
+	lives_widget_color_copy(&palette->info_base,&palette->normal_back);
+	lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
 	palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
       }
       else {
 	if (!(strcmp(prefs->theme,"editor"))) {
-	  colour_equal(&palette->normal_back,&palette->grey25);
-	  colour_equal(&palette->normal_fore,&palette->white);
-	  colour_equal(&palette->menu_and_bars,&palette->grey60);
-	  colour_equal(&palette->info_base,&palette->grey20);
-	  colour_equal(&palette->info_text,&palette->white);
+	  lives_widget_color_copy(&palette->normal_back,&palette->grey25);
+	  lives_widget_color_copy(&palette->normal_fore,&palette->white);
+	  lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
+	  lives_widget_color_copy(&palette->info_base,&palette->grey20);
+	  lives_widget_color_copy(&palette->info_text,&palette->white);
 	  palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
 	}
 	else {
 	  if (!(strcmp(prefs->theme,"crayons-bright"))) {
-	    colour_equal(&palette->normal_back,&palette->black);
-	    colour_equal(&palette->normal_fore,&palette->white);
+	    lives_widget_color_copy(&palette->normal_back,&palette->black);
+	    lives_widget_color_copy(&palette->normal_fore,&palette->white);
 
-	    palette->menu_and_bars.red=225*256;
-	    palette->menu_and_bars.green=160*256;
-	    palette->menu_and_bars.blue=80*256;
-
-	    palette->info_base.red=200*256;
-	    palette->info_base.green=190*256;
-	    palette->info_base.blue=52*256;
+	    palette->menu_and_bars.red=LIVES_WIDGET_COLOR_SCALE_255(225.);
+	    palette->menu_and_bars.green=LIVES_WIDGET_COLOR_SCALE_255(160.);
+	    palette->menu_and_bars.blue=LIVES_WIDGET_COLOR_SCALE_255(80.);
+#if GTK_CHECK_VERSION(3,0,0)
+	    palette->menu_and_bars.alpha=1.;
+#endif      
+
+	    palette->info_base.red=LIVES_WIDGET_COLOR_SCALE_255(200.);
+	    palette->info_base.green=LIVES_WIDGET_COLOR_SCALE_255(190.);
+	    palette->info_base.blue=LIVES_WIDGET_COLOR_SCALE_255(52.);
+#if GTK_CHECK_VERSION(3,0,0)
+	    palette->info_base.alpha=1.;
+#endif      
 	      
-	    colour_equal(&palette->info_text,&palette->black);
+	    lives_widget_color_copy(&palette->info_text,&palette->black);
 
 	    palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
 	  }
 	  else {
 	    if (!(strcmp(prefs->theme,"crayons"))) {
-	      colour_equal(&palette->normal_back,&palette->grey25);
-	      colour_equal(&palette->normal_fore,&palette->white);
-	      colour_equal(&palette->menu_and_bars,&palette->grey60);
-	      colour_equal(&palette->info_base,&palette->grey20);
-	      colour_equal(&palette->info_text,&palette->white);
+	      lives_widget_color_copy(&palette->normal_back,&palette->grey25);
+	      lives_widget_color_copy(&palette->normal_fore,&palette->white);
+	      lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
+	      lives_widget_color_copy(&palette->info_base,&palette->grey20);
+	      lives_widget_color_copy(&palette->info_text,&palette->white);
 
 	      palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
 
@@ -1688,6 +1905,14 @@
 }
 
 
+static boolean is_big_endian() {
+  int32_t testint = 0x12345678;
+  char *pMem;
+  pMem = (char *) &testint;
+  if (pMem[0] == 0x78) return FALSE;
+  return TRUE;
+}
+
 
 capability *get_capabilities (void) {
   // get capabilities of backend system
@@ -1707,16 +1932,24 @@
   natural_t numProcessors = 0U;
   kern_return_t kerr;
 #else
+#ifndef IS_MINGW
   size_t len;
   FILE *tfile;
 #endif
+#endif
 
   capable=(capability *)g_malloc(sizeof(capability));
 
+
+  // this is _compile time_ bits, not runtime bits
   capable->cpu_bits=32;
   if (sizeof(void *)==8) capable->cpu_bits=64;
 
-  capable->byte_order=G_BYTE_ORDER;
+  // _runtime_ byte order
+  if (is_big_endian()) 
+    capable->byte_order=LIVES_BIG_ENDIAN;
+  else 
+    capable->byte_order=LIVES_LITTLE_ENDIAN;
 
   capable->has_smogrify=FALSE;
   capable->smog_version_correct=FALSE;
@@ -1727,7 +1960,15 @@
   capable->can_write_to_config=FALSE;
   capable->can_read_from_config=FALSE;
 
+#ifndef IS_MINGW
   g_snprintf(capable->home_dir,PATH_MAX,"%s",g_get_home_dir());
+#else
+  // TODO/REG - we will get from registry
+
+  g_snprintf(capable->home_dir,PATH_MAX,"%s\\Application Data\\LiVES",g_get_home_dir());
+#endif
+
+  g_snprintf(capable->system_tmpdir,PATH_MAX,"%s",g_get_tmp_dir());
 
   memset(capable->startup_msg,0,1);
 
@@ -1735,8 +1976,9 @@
   capable->has_mplayer=FALSE;
   capable->has_convert=FALSE;
   capable->has_composite=FALSE;
-  capable->has_sox=FALSE;
-  capable->has_xmms=FALSE;
+  capable->has_identify=FALSE;
+  capable->has_sox_play=FALSE;
+  capable->has_sox_sox=FALSE;
   capable->has_dvgrab=FALSE;
   capable->has_cdda2wav=FALSE;
   capable->has_autolives=FALSE;
@@ -1752,17 +1994,41 @@
   capable->has_gconftool_2=FALSE;
   capable->has_xdg_screensaver=FALSE;
 
-  safer_bfile=g_strdup_printf("%s.%d.%d",BOOTSTRAP_NAME,getuid(),getgid());
+#ifndef IS_MINGW
+  safer_bfile=g_strdup_printf("%s"G_DIR_SEPARATOR_S".smogrify.%d.%d",capable->system_tmpdir,lives_getuid(),lives_getgid());
+#else
+  safer_bfile=g_strdup_printf("%s"G_DIR_SEPARATOR_S"smogrify.%d.%d",capable->system_tmpdir,lives_getuid(),lives_getgid());
+#endif
   unlink (safer_bfile);
 
   // check that we can write to /tmp
   if (!check_file (safer_bfile,FALSE)) return capable;
   capable->can_write_to_tmp=TRUE;
 
+#ifndef IS_MINGW
+  g_snprintf(prefs->backend_sync,PATH_MAX,"%s","smogrify");
+  g_snprintf(prefs->backend,PATH_MAX,"%s","smogrify");
   if ((tmp=g_find_program_in_path ("smogrify"))==NULL) return capable;
   g_free(tmp);
-  
-  g_snprintf(string,256,"smogrify report \"%s\" 2>/dev/null",(tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+
+  g_snprintf(string,256,"%s report \"%s\" 2>/dev/null",prefs->backend_sync,
+	     (tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+
+  g_free(tmp);
+
+  g_snprintf(string,256,"%s report \"%s\" 2>/dev/null",prefs->backend_sync,
+	     (tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+#else
+
+  g_snprintf(prefs->backend_sync,PATH_MAX,"perl \"%s\\smogrify\"",prefs->prefix_dir);
+  g_snprintf(prefs->backend,PATH_MAX,"START /MIN /B perl \"%s\\smogrify\"",prefs->prefix_dir);
+
+  g_snprintf(string,256,"%s report \"%s\" 2>NUL",prefs->backend_sync,
+	     (tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+
+#endif
+
+
   g_free(tmp);
 
   err=system(string);
@@ -1850,19 +2116,26 @@
   get_location("mplayer",string,256);
   if (strlen(string)) capable->has_mplayer=TRUE;
 
+#ifndef IS_MINGW
   get_location("convert",string,256);
+#else
+  get_location("mgkvert",string,256);
+#endif
   if (strlen(string)) capable->has_convert=TRUE;
 
   get_location("composite",string,256);
   if (strlen(string)) capable->has_composite=TRUE;
 
+  get_location("identify",string,256);
+  if (strlen(string)) capable->has_identify=TRUE;
+
   ///////////////////////////////////////////////////////
 
   get_location("play",string,256);
-  if (strlen(string)) capable->has_sox=TRUE;
+  if (strlen(string)) capable->has_sox_play=TRUE;
 
-  get_location("xmms",string,256);
-  if (strlen(string)) capable->has_xmms=TRUE;
+  get_location("sox",string,256);
+  if (strlen(string)) capable->has_sox_sox=TRUE;
 
   get_location("dvgrab",string,256);
   if (strlen(string)) capable->has_dvgrab=TRUE;
@@ -1904,11 +2177,20 @@
 
   capable->ncpus=0;
 
-#ifdef IS_DARWIN  
-  kerr = host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &numProcessors, &processorInfo, &numProcessorInfo);
+#ifdef IS_DARWIN
+  kerr = host_processor_info(mach_host_self(), PROCESSOR_BASIC_INFO, &numProcessors, &processorInfo, &numProcessorInfo);
+  if (kerr == KERN_SUCCESS) {
+    vm_deallocate(mach_task_self(), (vm_address_t) processorInfo, numProcessorInfo * sizint);
+  }
   capable->ncpus=(gint)numProcessors;
 #else
 
+#ifdef IS_MINGW
+  // FIXME:
+
+  //capable->ncpus=lives_win32_get_num_logical_cpus();
+#else
+
   tfile=popen("cat /proc/cpuinfo 2>/dev/null | grep processor 2>/dev/null | wc -l 2>/dev/null","r");
   len=fread((void *)buffer,1,1024,tfile);
   pclose(tfile);
@@ -1916,6 +2198,7 @@
   memset(buffer+len,0,1);
   capable->ncpus=atoi(buffer);
 #endif
+#endif
 
   if (capable->ncpus==0) capable->ncpus=1;
 
@@ -1924,7 +2207,7 @@
 
 void print_notice() {
   g_printerr("\nLiVES %s\n",LiVES_VERSION);
-  g_printerr("Copyright 2002-2012 Gabriel Finch (salsaman@gmail.com) and others.\n");
+  g_printerr("Copyright 2002-2013 Gabriel Finch (salsaman@gmail.com) and others.\n");
   g_printerr("LiVES comes with ABSOLUTELY NO WARRANTY\nThis is free software, and you are welcome to redistribute it\nunder certain conditions; see the file COPYING for details.\n\n");
 }
 
@@ -1974,7 +2257,7 @@
 
 //// things to do - on startup
 #ifdef HAVE_YUV4MPEG
-static gboolean open_yuv4m_startup(gpointer data) {
+static boolean open_yuv4m_startup(gpointer data) {
   on_open_yuv4m_activate(NULL,data);
   return FALSE;
 }
@@ -1984,9 +2267,11 @@
 /////////////////////////////////
 
 
-static gboolean lives_startup(gpointer data) {
-  gboolean got_files=FALSE;
+static boolean lives_startup(gpointer data) {
+  GError *gerr=NULL;
+  boolean got_files=FALSE;
   gchar *tmp;
+  gchar *icon;
 
   if (!mainw->foreign) {
     if (prefs->show_splash) splash_init();
@@ -1997,15 +2282,23 @@
 
   create_LiVES ();
 
+  icon=g_build_filename(prefs->prefix_dir,DESKTOP_ICON_DIR,"lives.png",NULL);
+  gtk_window_set_default_icon_from_file(icon,&gerr);
+  g_free(icon);
+
+  if (gerr!=NULL) g_error_free(gerr);
+
   gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   mainw->startup_error=FALSE;
 
   if (capable->smog_version_correct) {
     if (theme_expected&&palette->style==STYLE_PLAIN&&!mainw->foreign) {
       // non-fatal errors
-      gchar *err=g_strdup_printf(_ ("\n\nThe theme you requested could not be located. Please make sure you have the themes installed in\n%s/%s.\n(Maybe you need to change the value of <prefix_dir> in your ~/.lives file)\n"),(tmp=g_filename_to_utf8(prefs->prefix_dir,-1,NULL,NULL,NULL)),THEME_DIR);
+      gchar *tmp2;
+      gchar *err=g_strdup_printf(_ ("\n\nThe theme you requested could not be located. Please make sure you have the themes installed in\n%s/%s.\n(Maybe you need to change the value of <prefix_dir> in your %s file)\n"),(tmp=g_filename_to_utf8(prefs->prefix_dir,-1,NULL,NULL,NULL)),THEME_DIR,(tmp2=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+      g_free(tmp2);
       g_free(tmp);
       startup_message_nonfatal (err);
       g_free(err);
@@ -2018,7 +2311,8 @@
   if (!mainw->foreign) {
     // fatal errors
     if (!capable->can_write_to_tmp) {
-      startup_message_fatal(_ ("\nLiVES was unable to write a small file to /tmp\nPlease make sure you have write access to /tmp and try again.\n"));
+      startup_message_fatal((tmp=g_strdup_printf(_ ("\nLiVES was unable to write a small file to %s\nPlease make sure you have write access to %s and try again.\n"),capable->system_tmpdir)));
+      g_free(tmp);
     }
     else {
       if (!capable->has_smogrify) {
@@ -2028,14 +2322,14 @@
       }
       else {
 	if (!capable->can_read_from_config) {
-	  gchar *err=g_strdup_printf(_ ("\nLiVES was unable to read from its configuration file\n%s/.lives\n\nPlease check the file permissions for this file and try again.\n"),(tmp=g_filename_to_utf8(capable->home_dir,-1,NULL,NULL,NULL)));
+	  gchar *err=g_strdup_printf(_ ("\nLiVES was unable to read from its configuration file\n%s\n\nPlease check the file permissions for this file and try again.\n"),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
 	  g_free(tmp);
 	  startup_message_fatal(err);
 	  g_free(err);
 	}
 	else {
 	  if (!capable->can_write_to_config) {
-	    gchar *err=g_strdup_printf(_ ("\nLiVES was unable to write to its configuration file\n%s/.lives\n\nPlease check the file permissions for this file and directory\nand try again.\n"),(tmp=g_filename_to_utf8(capable->home_dir,-1,NULL,NULL,NULL)));
+	    gchar *err=g_strdup_printf(_ ("\nLiVES was unable to write to its configuration file\n%s\n\nPlease check the file permissions for this file and directory\nand try again.\n"),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
 	    g_free(tmp);
 	    startup_message_fatal(err);
 	    g_free(err);
@@ -2045,8 +2339,8 @@
 	      gchar *extrabit;
 	      gchar *err;
 	      if (!mainw->has_session_tmpdir) {
-		extrabit=g_strdup_printf(_("Please check the <tempdir> setting in \n%s/.lives\nand try again.\n"),
-				  (tmp=g_filename_to_utf8(capable->home_dir,-1,NULL,NULL,NULL)));
+		extrabit=g_strdup_printf(_("Please check the <tempdir> setting in \n%s\nand try again.\n"),
+				  (tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
 		g_free(tmp);
 	      }
 	      else 
@@ -2063,9 +2357,15 @@
 		startup_message_fatal(_ ("\nAn incorrect version of smogrify was found in your path.\n\nPlease review the README file which came with this package\nbefore running LiVES.\n\nThankyou.\n"));
 	      }
 	      else {
-		if (!capable->has_sox&&!capable->has_mplayer){
+		#ifndef IS_MINGW
+		if ((!capable->has_sox_sox||!capable->has_sox_play)&&!capable->has_mplayer){
 		  startup_message_fatal(_ ("\nLiVES currently requires either 'mplayer' or 'sox' to function. Please install one or other of these, and try again.\n"));
 		}
+		#else
+		if (!capable->has_sox_sox||!capable->has_mplayer){
+		  startup_message_fatal(_ ("\nLiVES currently requires both 'mplayer' and 'sox' to function. Please install these, and try again.\n"));
+		}
+		#endif
 		else {
 		  if (strlen(capable->startup_msg)) {
 		    startup_message_nonfatal (capable->startup_msg);
@@ -2081,11 +2381,12 @@
 		    if (!capable->has_composite) {
 		      startup_message_nonfatal_dismissable (_ ("\nLiVES was unable to locate 'composite'. You should install composite and image-magick if you want to use the merge function.\n"),WARN_MASK_NO_MPLAYER);
 		    }
-		    if (!capable->has_sox) {
+		    if (!capable->has_sox_sox) {
 		      startup_message_nonfatal_dismissable (_ ("\nLiVES was unable to locate 'sox'. Some audio features may not work. You should install 'sox'.\n"),WARN_MASK_NO_MPLAYER);
 		    }
 		    if (!capable->has_encoder_plugins) {
-		      gchar *err=g_strdup_printf(_ ("\nLiVES was unable to find any encoder plugins.\nPlease check that you have them installed correctly in\n%s%s%s/\nYou will not be able to 'Save' without them.\nYou may need to change the value of <lib_dir> in ~/.lives\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS);
+		      gchar *err=g_strdup_printf(_ ("\nLiVES was unable to find any encoder plugins.\nPlease check that you have them installed correctly in\n%s%s%s/\nYou will not be able to 'Save' without them.\nYou may need to change the value of <lib_dir> in %s\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+		      g_free(tmp);
 		      startup_message_nonfatal_dismissable (err,WARN_MASK_NO_ENCODERS);
 		      g_free(err);
 		      upgrade_error=TRUE;
@@ -2122,16 +2423,21 @@
 		      gtk_widget_show (mainw->LiVES);
 		    }
 #ifdef ENABLE_OSC
-		    lives_osc_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=g_strdup_printf("%d",STARTUP_MT)));
+		    lives_osc_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=g_strdup_printf("%d",STARTUP_CE)));
 		    g_free(tmp);
 #endif
 		  }
 		}}}}}}}}
 
   else {
-  // capture mode
+    // capture mode
     mainw->foreign_key=atoi(zargv[2]);
-    mainw->foreign_id=atoi(zargv[3]);
+
+#if GTK_CHECK_VERSION(3,0,0)
+    mainw->foreign_id=(Window)atoi(zargv[3]);
+#else
+    mainw->foreign_id=(GdkNativeWindow)atoi(zargv[3]);
+#endif
     mainw->foreign_width=atoi(zargv[4]);
     mainw->foreign_height=atoi(zargv[5]);
     g_snprintf(prefs->image_ext,16,"%s",zargv[6]);
@@ -2143,6 +2449,14 @@
     mainw->rec_achans=atoi(zargv[12]);
     mainw->rec_signed_endian=atoi(zargv[13]);
 
+    if (zargc>14) {
+      mainw->foreign_visual=g_strdup(zargv[14]);
+      if (!strcmp(mainw->foreign_visual,"(null)")) {
+	g_free(mainw->foreign_visual);
+	mainw->foreign_visual=NULL;
+      }
+    }
+
 #ifdef ENABLE_JACK
     if (prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd&&mainw->rec_achans>0) {
       jack_audio_read_init();
@@ -2175,22 +2489,24 @@
   if (!prefs->show_gui) gtk_widget_hide(mainw->LiVES);
 
   if (prefs->startup_phase==100) {
+#ifndef IS_MINGW
     if (upgrade_error) {
       do_upgrade_error_dialog();
     }
+#endif
     prefs->startup_phase=0;
   }
 
+  // splash_end() will start up mulitrack if in STARTUP_MT mode
   if (strlen (start_file)&&strcmp(start_file,"-")) {
     splash_end();
     deduce_file(start_file,start,end);
     got_files=TRUE;
   } else {
     set_main_title(NULL,0);
+    splash_end();
   }
 
-  splash_end();
-
   if (prefs->crash_recovery&&!no_recover) got_files=check_for_recovery_files(auto_recover);
 
   if (!mainw->foreign&&!got_files&&prefs->ar_clipset) {
@@ -2214,24 +2530,86 @@
 
   if (!prefs->show_gui&&prefs->startup_interface==STARTUP_CE) mainw->is_ready=TRUE;
 
-  mainw->go_away=FALSE;
-
-  gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+  mainw->kb_timer_end=FALSE;
+  mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+  mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#endif
 
 #ifdef HAVE_YUV4MPEG
   if (strlen(prefs->yuvin)>0) g_idle_add(open_yuv4m_startup,NULL);
 #endif
 
+  gdk_window_add_filter(NULL, filter_func, NULL);
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+  if (!mainw->foreign&&prefs->show_gui) {
+    calibrate_sepwin_size();
+  }
+#endif
+
+  mainw->go_away=FALSE;
 
   return FALSE;
-}
+} // end lives_startup()
+
 
+void set_signal_handlers(SignalHandlerPointer sigfunc) {
+#ifndef IS_MINGW
+  sigset_t smask;
+
+  struct sigaction sact;
+
+  sigemptyset(&smask);
+
+  sigaddset(&smask,LIVES_SIGINT);
+  sigaddset(&smask,LIVES_SIGTERM);
+  sigaddset(&smask,LIVES_SIGSEGV);
+  sigaddset(&smask,LIVES_SIGABRT);
+
+  sact.sa_handler=sigfunc;
+  sact.sa_flags=0;
+  sact.sa_mask=smask;
+
+
+  sigaction (LIVES_SIGINT, &sact, NULL);
+  sigaction (LIVES_SIGTERM, &sact, NULL);
+  sigaction (LIVES_SIGSEGV, &sact, NULL);
+  sigaction (LIVES_SIGABRT, &sact, NULL);
+
+#else
+  SignalHandlerPointer previousHandler;
+  
+  previousHandler = signal(LIVES_SIGINT, (SignalHandlerPointer)catch_sigint);
+  previousHandler = signal(LIVES_SIGTERM, (SignalHandlerPointer)catch_sigint);
+  previousHandler = signal(LIVES_SIGSEGV, (SignalHandlerPointer)catch_sigint);
+  previousHandler = signal(LIVES_SIGABRT, (SignalHandlerPointer)catch_sigint);
+
+  previousHandler = previousHandler; // shut gcc up
+#endif
+
+  if (mainw!=NULL) {
+    if (sigfunc==defer_sigint) mainw->signals_deferred=TRUE;
+    else mainw->signals_deferred=FALSE;
+  }
+}
 
 
 int main (int argc, char *argv[]) {
+#ifdef ENABLE_OSC
+#ifdef IS_MINGW
+  WSADATA wsaData;
+  int iResult;
+#endif
+#endif
   ssize_t mynsize;
   gchar fbuff[PATH_MAX];
 
+  mainw=NULL;
+  set_signal_handlers((SignalHandlerPointer)catch_sigint);
+
   ign_opts.ign_clipset=ign_opts.ign_osc=ign_opts.ign_aplayer=ign_opts.ign_stmode=ign_opts.ign_vppdefs=FALSE;
 
 #ifdef ENABLE_OIL
@@ -2255,13 +2633,28 @@
   // force decimal point to be a "."
   putenv ("LC_NUMERIC=C");
 
+#ifdef ENABLE_OSC
+#ifdef IS_MINGW
+
+  // Initialize Winsock
+  iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
+  if (iResult != 0) {
+    printf("WSAStartup failed: %d\n", iResult);
+    exit (1);
+
+  }
+#endif
+#endif
+
   gtk_init (&argc, &argv);
 
 #ifdef LIVES_NO_DEBUG
   // don't crash on GTK+ fatals
-  g_log_set_always_fatal ((GLogLevelFlags)0);
+  //g_log_set_always_fatal ((GLogLevelFlags)0);
 #endif
 
+  g_log_set_default_handler(lives_log_handler,NULL);
+
   theme_expected=pre_init();
 
   // mainw->foreign is set if we are grabbing an external window
@@ -2269,10 +2662,16 @@
   memset (start_file,0,1);
   mainw->has_session_tmpdir=FALSE;
 
+#ifndef IS_MINGW
+  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S".info.%d",prefs->tmpdir,getpid());
+#else
+  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S"info.%d",prefs->tmpdir,getpid());
+#endif
+
   // what's my name ?
   capable->myname_full=g_find_program_in_path(argv[0]);
 
-  if ((mynsize=readlink(capable->myname_full,fbuff,PATH_MAX))!=-1) {
+  if ((mynsize=lives_readlink(capable->myname_full,fbuff,PATH_MAX))!=-1) {
     // no. i mean, what's my real name ?
     memset(fbuff+mynsize,0,1);
     g_free(capable->myname_full);
@@ -2312,7 +2711,9 @@
 	{"yuvin", 1, 0, 0},
 	{"set", 1, 0, 0},
 	{"noset", 0, 0, 0},
+#ifdef ENABLE_OSC
         {"devicemap", 1, 0, 0},
+#endif
         {"vppdefaults", 1, 0, 0},
 	{"recover", 0, 0, 0},
 	{"norecover", 0, 0, 0},
@@ -2358,16 +2759,13 @@
 	  continue;
 	}
 	if (!strcmp(charopt,"tmpdir")) {
-	  gchar *com;
 	  mainw->has_session_tmpdir=TRUE;
 	  // override tempdir setting
 	  g_snprintf(prefs->tmpdir,PATH_MAX,"%s",optarg);
 	  g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
 	  set_pref("session_tempdir",prefs->tmpdir);
-	  com=g_strdup_printf ("/bin/mkdir -p \"%s\" 2>/dev/null",prefs->tmpdir);
-	  mainw->com_failed=FALSE;
-	  lives_system(com,TRUE);
-	  if (mainw->com_failed) {
+
+	  if (g_mkdir_with_parents(prefs->tmpdir,S_IRWXU)==-1) {
 	    if (!check_dir_access(prefs->tmpdir)) {
 	      // abort if we cannot create the new subdir
 	      LIVES_ERROR("Could not create directory");
@@ -2406,11 +2804,13 @@
 	  ign_opts.ign_clipset=TRUE;
 	  continue;
 	}
+#ifdef ENABLE_OSC
         if (!strcmp(charopt,"devicemap")&&optarg!=NULL) {
           // force devicemap loading
           on_midi_load_activate(NULL, optarg);
           continue;
         }
+#endif
         if (!strcmp(charopt,"vppdefaults")&&optarg!=NULL) {
           // load alternate vpp file
 	  g_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s",optarg);
@@ -2419,7 +2819,7 @@
         }
 	if (!strcmp(charopt,"aplayer")) {
 	  gchar buff[256];
-	  gboolean apl_valid=FALSE;
+	  boolean apl_valid=FALSE;
 
 	  g_snprintf(buff,256,"%s",optarg);
 	  // override aplayer default
@@ -2542,7 +2942,7 @@
 
 
 
-gboolean startup_message_fatal(const gchar *msg) {
+boolean startup_message_fatal(const gchar *msg) {
   splash_end();
   do_blocking_error_dialog (msg);
   mainw->startup_error=TRUE;
@@ -2550,13 +2950,24 @@
   return TRUE;
 }
 
-gboolean startup_message_nonfatal(const gchar *msg) {
+boolean startup_message_nonfatal(const gchar *msg) {
+  if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
   do_error_dialog (msg);
+  widget_opts.apply_theme=FALSE;
   return TRUE;
 }
 
-gboolean startup_message_nonfatal_dismissable(const gchar *msg, gint warning_mask) {
+boolean startup_message_info(const gchar *msg) {
+  if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
+  do_info_dialog (msg);
+  widget_opts.apply_theme=FALSE;
+  return TRUE;
+}
+
+boolean startup_message_nonfatal_dismissable(const gchar *msg, gint warning_mask) {
+  if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
   do_error_dialog_with_check (msg, warning_mask);
+  widget_opts.apply_theme=FALSE;
   return TRUE;
 }
 
@@ -2566,14 +2977,18 @@
   gchar short_file[256];
 
   if (file!=NULL) {
-    if (untitled) title=g_strdup_printf(_ ("LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,untitled,cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
+    if (untitled) title=g_strdup_printf(_ ("LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,untitled,
+					cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
     else {
       g_snprintf(short_file,256,"%s",file);
       if (cfile->restoring||(cfile->opening&&cfile->frames==123456789)) {
-	title=g_strdup_printf(_("LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"),LiVES_VERSION,(tmp=g_path_get_basename(file)),cfile->hsize,cfile->vsize,cfile->fps);
+	title=g_strdup_printf(_("LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"),LiVES_VERSION,
+			      (tmp=g_path_get_basename(file)),cfile->hsize,cfile->vsize,cfile->fps);
       }
       else {
-	title=g_strdup_printf(_ ("LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,cfile->clip_type!=CLIP_TYPE_VIDEODEV?(tmp=g_path_get_basename(file)):(tmp=g_strdup(file)),cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
+	title=g_strdup_printf(_ ("LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,
+			      cfile->clip_type!=CLIP_TYPE_VIDEODEV?(tmp=g_path_get_basename(file))
+			      :(tmp=g_strdup(file)),cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
       }
       g_free(tmp);
     }
@@ -2643,14 +3058,22 @@
   gtk_widget_set_sensitive (mainw->add_live_menu,TRUE);
   gtk_widget_set_sensitive (mainw->export_proj, mainw->current_file>0);
   gtk_widget_set_sensitive (mainw->import_proj, mainw->current_file==-1);
-
+  
   if (!mainw->foreign) {
-    for (i=0;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
+    for (i=1;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
 	   mainw->num_rendered_effects_test;i++) 
       if (mainw->rendered_fx[i].menuitem!=NULL&&mainw->rendered_fx[i].min_frames>=0) 
 	gtk_widget_set_sensitive(mainw->rendered_fx[i].menuitem,mainw->current_file>0&&cfile->frames>0);
-  }
 
+    if (mainw->current_file>0&&((has_video_filters(FALSE)&&!has_video_filters(TRUE))||
+				(cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(FALSE))||
+				mainw->agen_key!=0)) {
+      
+      gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
+    }
+    else gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+  }
+  
   gtk_widget_set_sensitive (mainw->record_perf, TRUE);
   gtk_widget_set_sensitive (mainw->export_submenu, mainw->current_file>0&&(cfile->achans>0));
   gtk_widget_set_sensitive (mainw->recaudio_submenu, TRUE);
@@ -2663,7 +3086,7 @@
   gtk_widget_set_sensitive (mainw->trim_to_pstart, mainw->current_file>0&&(cfile->achans&&cfile->pointer_time>0.));
   gtk_widget_set_sensitive (mainw->delaudio_submenu, mainw->current_file>0&&cfile->achans>0);
   gtk_widget_set_sensitive (mainw->delsel_audio, mainw->current_file>0&&cfile->frames>0);
-  gtk_widget_set_sensitive (mainw->resample_audio, mainw->current_file>0&&(cfile->achans>0&&capable->has_sox));
+  gtk_widget_set_sensitive (mainw->resample_audio, mainw->current_file>0&&(cfile->achans>0&&capable->has_sox_sox));
   gtk_widget_set_sensitive (mainw->dsize, !(mainw->fs));
   gtk_widget_set_sensitive (mainw->fade, !(mainw->fs));
   gtk_widget_set_sensitive (mainw->mute_audio, TRUE);
@@ -2900,18 +3323,68 @@
 }
 
 
+
+
+void set_ce_frame_from_pixbuf(GtkImage *image, GdkPixbuf *pixbuf, lives_painter_t *cairo) {
+#if GTK_CHECK_VERSION(3,0,0)
+  
+  int rwidth=lives_widget_get_allocation_width(LIVES_WIDGET(image));
+  int rheight=lives_widget_get_allocation_height(LIVES_WIDGET(image));
+
+  lives_painter_t *cr;
+
+  if (cairo==NULL) cr=lives_painter_create_from_widget (LIVES_WIDGET(image));
+  else cr=cairo;
+
+  if (cr==NULL) return;
+
+  lives_painter_set_source_to_bg(cr,LIVES_WIDGET(image));
+
+  lives_painter_rectangle(cr,0,0,
+			  rwidth,
+			  rheight);
+  lives_painter_fill(cr);
+  
+  if (pixbuf!=NULL) {
+    int width=lives_pixbuf_get_width(pixbuf);
+    int height=lives_pixbuf_get_height(pixbuf);
+    int cx=(rwidth-width)/2;
+    int cy=(rheight-height)/2;
+
+    lives_painter_set_source_pixbuf (cr, pixbuf, cx, cy);
+    lives_painter_rectangle(cr,cx,cy,
+			    width,
+			    height);
+    lives_painter_fill(cr);
+  }
+  if (cairo==NULL) lives_painter_destroy(cr);
+#else
+  gtk_image_set_from_pixbuf(image,pixbuf);
+#endif
+}
+
+
+
+
+
+
 void load_start_image(gint frame) {
   GdkPixbuf *start_pixbuf=NULL;
   weed_plant_t *layer;
   weed_timecode_t tc;
   gint rwidth,rheight,width,height;
-  gboolean noswitch=mainw->noswitch;
+  boolean noswitch=mainw->noswitch;
   LiVESInterpType interp;
 
+
   if (!prefs->show_gui) return;
 
   if (mainw->multitrack!=NULL) return;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_block_by_func(mainw->image272,(gpointer)expose_sim,NULL);
+#endif
+
   if (mainw->current_file>-1&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
     if (mainw->camframe==NULL) {
       GError *error=NULL;
@@ -2920,7 +3393,11 @@
       if (mainw->camframe!=NULL) gdk_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
       g_free(tmp);
     }
-    gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->camframe);
+    set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->camframe,NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handlers_unblock_by_func(mainw->image272,(gpointer)expose_sim,NULL);
+    g_signal_stop_emission_by_name(mainw->image272,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
@@ -2928,12 +3405,16 @@
       (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) {
     threaded_dialog_spin();
     if (!(mainw->imframe==NULL)) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->imframe);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image272),mainw->imframe,NULL);
     }
     else {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),NULL);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image272),NULL,NULL);
     }
     threaded_dialog_spin();
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_unblock_by_func(mainw->image272,(gpointer)expose_sim,NULL);
+    g_signal_stop_emission_by_name(mainw->image272,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
@@ -2944,24 +3425,28 @@
     layer=weed_plant_new(WEED_PLANT_CHANNEL);
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
-    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,cfile->hsize,cfile->vsize,
+    if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,cfile->hsize,cfile->vsize,
 			   WEED_PALETTE_RGB24)) {
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       interp=get_interp_value(prefs->pb_quality);
-      resize_layer(layer,cfile->hsize,cfile->vsize,interp);
+      resize_layer(layer,cfile->hsize,cfile->vsize,interp,WEED_PALETTE_RGB24,0);
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       start_pixbuf=layer_to_pixbuf(layer);
     }
     weed_plant_free(layer);
   
     if (GDK_IS_PIXBUF(start_pixbuf)) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),start_pixbuf);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image272),start_pixbuf,NULL);
     }
     if (start_pixbuf!=NULL) {
       if (G_IS_OBJECT(start_pixbuf)) {
-	gdk_pixbuf_unref(start_pixbuf);
+	lives_object_unref(start_pixbuf);
       }
     }
     threaded_dialog_spin();
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handlers_unblock_by_func(mainw->image272,(gpointer)expose_sim,NULL);
+    g_signal_stop_emission_by_name(mainw->image272,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
@@ -2972,48 +3457,64 @@
   do {
     width=cfile->hsize;
     height=cfile->vsize;
-    rwidth=mainw->image272->allocation.width;
-    rheight=mainw->image272->allocation.height;
+
+    // TODO *** - if width*height==0, show broken frame image
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+    rwidth=mainw->ce_frame_width-H_RESIZE_ADJUST*2;
+    rheight=mainw->ce_frame_height-V_RESIZE_ADJUST*2;
+#else
+    rwidth=lives_widget_get_allocation_width(mainw->image272);
+    rheight=lives_widget_get_allocation_height(mainw->image272);
+#endif
+
     calc_maxspect(rwidth,rheight,&width,&height);
 
     layer=weed_plant_new(WEED_PLANT_CHANNEL);
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
 
-    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,width,height,WEED_PALETTE_RGB24)) {
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+    if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,width,height,WEED_PALETTE_RGB24)) {
       interp=get_interp_value(prefs->pb_quality);
-      resize_layer(layer,width,height,interp);
+      resize_layer(layer,width,height,interp,WEED_PALETTE_RGB24,0);
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       start_pixbuf=layer_to_pixbuf(layer);
     }
     weed_plant_free(layer);
   
     if (GDK_IS_PIXBUF(start_pixbuf)) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image272),start_pixbuf);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image272),start_pixbuf,NULL);
     }
     if (start_pixbuf!=NULL) {
       if (G_IS_OBJECT(start_pixbuf)) {
-	gdk_pixbuf_unref(start_pixbuf);
+	lives_object_unref(start_pixbuf);
       }
     }
 
     start_pixbuf=NULL;
 
+#if !GTK_CHECK_VERSION(3,0,0)
     gtk_widget_queue_resize(mainw->image272);
 
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
+
     if (mainw->current_file==-1) {
       // user may close file
       load_start_image(0);
       return;
     }
-  } while (rwidth!=mainw->image272->allocation.width||rheight!=mainw->image272->allocation.height);
-
+  } while (rwidth!=lives_widget_get_allocation_width(mainw->image272)||rheight!=lives_widget_get_allocation_height(mainw->image272));
+#else
+  } while (FALSE);
+#endif
   threaded_dialog_spin();
-
-
   mainw->noswitch=noswitch;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_unblock_by_func(mainw->image272,(gpointer)expose_sim,NULL);
+  g_signal_stop_emission_by_name(mainw->image272,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
 
 }
 
@@ -3024,13 +3525,17 @@
   weed_plant_t *layer;
   weed_timecode_t tc;
   gint rwidth,rheight,width,height;
-  gboolean noswitch=mainw->noswitch;
+  boolean noswitch=mainw->noswitch;
   LiVESInterpType interp;
 
   if (!prefs->show_gui) return;
 
   if (mainw->multitrack!=NULL) return;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_block_by_func(mainw->image273,(gpointer)expose_sim,NULL);
+#endif
+
   if (mainw->current_file>-1&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
     if (mainw->camframe==NULL) {
       GError *error=NULL;
@@ -3039,7 +3544,7 @@
       if (mainw->camframe!=NULL) gdk_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
       g_free(tmp);
     }
-    gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->camframe);
+    set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->camframe,NULL);
     return;
   }
 
@@ -3047,12 +3552,16 @@
       (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) {
     threaded_dialog_spin();
     if (!(mainw->imframe==NULL)) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->imframe);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image273),mainw->imframe,NULL);
     }
     else {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),NULL);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image273),NULL,NULL);
     }
     threaded_dialog_spin();
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handlers_unblock_by_func(mainw->image273,(gpointer)expose_sim,NULL);
+    g_signal_stop_emission_by_name(mainw->image273,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
@@ -3065,24 +3574,28 @@
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
 
-    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,cfile->hsize,cfile->vsize,
+    if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,cfile->hsize,cfile->vsize,
 			   WEED_PALETTE_RGB24)) {
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       interp=get_interp_value(prefs->pb_quality);
-      resize_layer(layer,cfile->hsize,cfile->vsize,interp);
+      resize_layer(layer,cfile->hsize,cfile->vsize,interp,WEED_PALETTE_RGB24,0);
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       end_pixbuf=layer_to_pixbuf(layer);
     }
     weed_plant_free(layer);
   
     if (GDK_IS_PIXBUF(end_pixbuf)) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),end_pixbuf);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image273),end_pixbuf,NULL);
     }
     if (end_pixbuf!=NULL) {
       if (G_IS_OBJECT(end_pixbuf)) {
-	gdk_pixbuf_unref(end_pixbuf);
+	lives_object_unref(end_pixbuf);
       }
     }
     threaded_dialog_spin();
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handlers_unblock_by_func(mainw->image273,(gpointer)expose_sim,NULL);
+    g_signal_stop_emission_by_name(mainw->image273,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
@@ -3092,61 +3605,88 @@
   do {
     width=cfile->hsize;
     height=cfile->vsize;
-    rwidth=mainw->image273->allocation.width;
-    rheight=mainw->image273->allocation.height;
+
+#if GTK_CHECK_VERSION(3,0,0)
+    rwidth=mainw->ce_frame_width-H_RESIZE_ADJUST*2;
+    rheight=mainw->ce_frame_height-V_RESIZE_ADJUST*2;
+#else
+    rwidth=lives_widget_get_allocation_width(mainw->image273);
+    rheight=lives_widget_get_allocation_height(mainw->image273);
+#endif
+
     calc_maxspect(rwidth,rheight,&width,&height);
 
     layer=weed_plant_new(WEED_PLANT_CHANNEL);
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
 
-    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,width,height,WEED_PALETTE_RGB24)) {
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);  
+    if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,width,height,WEED_PALETTE_RGB24)) {
       interp=get_interp_value(prefs->pb_quality);
-      resize_layer(layer,width,height,interp);
+      resize_layer(layer,width,height,interp,WEED_PALETTE_RGB24,0);
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);  
       end_pixbuf=layer_to_pixbuf(layer);
     }
 
     weed_plant_free(layer);
   
     if (GDK_IS_PIXBUF(end_pixbuf)) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image273),end_pixbuf);
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image273),end_pixbuf,NULL);
     }
     if (end_pixbuf!=NULL) {
       if (G_IS_OBJECT(end_pixbuf)) {
-	gdk_pixbuf_unref(end_pixbuf);
+	lives_object_unref(end_pixbuf);
       }
     }
 
     end_pixbuf=NULL;
 
+#if !GTK_CHECK_VERSION(3,0,0)
     gtk_widget_queue_resize(mainw->image273);
 
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     if (mainw->current_file==-1) {
       // user may close file
       load_end_image(0);
+#if GTK_CHECK_VERSION(3,0,0)
+      g_signal_handlers_unblock_by_func(mainw->image273,(gpointer)expose_sim,NULL);
+      g_signal_stop_emission_by_name(mainw->image273,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
       return;
     }
-  } while (rwidth!=mainw->image273->allocation.width||rheight!=mainw->image273->allocation.height);
-
+  } while (rwidth!=lives_widget_get_allocation_width(mainw->image273)||rheight!=lives_widget_get_allocation_height(mainw->image273));
+#else
+  } while (FALSE);
+#endif
   threaded_dialog_spin();
   mainw->noswitch=noswitch;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_unblock_by_func(mainw->image273,(gpointer)expose_sim,NULL);
+  g_signal_stop_emission_by_name(mainw->image273,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
 
 }
 
 
 
 
-void load_preview_image(gboolean update_always) {
+
+
+void load_preview_image(boolean update_always) {
   // this is for the sepwin preview
   // update_always==TRUE = update widgets from mainw->preview_frame
   GdkPixbuf *pixbuf=NULL;
-  gint preview_frame;
+
+  int preview_frame;
 
   if (!prefs->show_gui) return;
 
+  if (mainw->playing_file>-1) return;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_block_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+#endif
+
   if (mainw->current_file>-1&&cfile!=NULL&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
     if (mainw->camframe==NULL) {
       GError *error=NULL;
@@ -3156,34 +3696,38 @@
       g_free(tmp);
     }
     pixbuf=lives_pixbuf_scale_simple(mainw->camframe,mainw->pwidth,mainw->pheight,LIVES_INTERP_BEST);
-    if (mainw->preview_frame>cfile->frames) {
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
-    gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image),pixbuf);
-    gdk_pixbuf_unref(pixbuf);
+    set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->preview_image),pixbuf,NULL);
+    lives_object_unref(pixbuf);
     mainw->preview_frame=1;
     g_signal_handler_block(mainw->preview_spinbutton,mainw->preview_spin_func);
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->preview_spinbutton),1,1);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->preview_spinbutton),1);
     g_signal_handler_unblock(mainw->preview_spinbutton,mainw->preview_spin_func);
-    gtk_widget_queue_resize(mainw->preview_box);
+    gtk_widget_set_size_request(mainw->preview_image,mainw->pwidth,mainw->pheight);
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handlers_unblock_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+    g_signal_stop_emission_by_name(mainw->preview_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
   if (mainw->current_file<0||cfile==NULL||!cfile->frames||(cfile->clip_type!=CLIP_TYPE_DISK&&
 							   cfile->clip_type!=CLIP_TYPE_FILE)) {
-    if (mainw->preview_frame>cfile->frames) {
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
-    gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), mainw->imframe);
+
     mainw->preview_frame=0;
     g_signal_handler_block(mainw->preview_spinbutton,mainw->preview_spin_func);
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->preview_spinbutton),0,0);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->preview_spinbutton),0);
     g_signal_handler_unblock(mainw->preview_spinbutton,mainw->preview_spin_func);
-    gtk_widget_queue_resize(mainw->preview_box);
+    if (mainw->imframe!=NULL) {
+      gtk_widget_set_size_request(mainw->preview_image,lives_pixbuf_get_width(mainw->imframe),lives_pixbuf_get_height(mainw->imframe));
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->preview_image), mainw->imframe, NULL);
+    }
+    else set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->preview_image), NULL, NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_handlers_unblock_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+    g_signal_stop_emission_by_name(mainw->preview_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
     return;
   }
 
@@ -3202,7 +3746,7 @@
 	break;
       default:
 	preview_frame=mainw->preview_frame>0?mainw->preview_frame:1;
-	if (preview_frame>cfile->frames) preview_frame=mainw->preview_frame=cfile->frames;
+	if (preview_frame>cfile->frames) preview_frame=cfile->frames;
 	break;
       }
 
@@ -3211,10 +3755,6 @@
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->preview_spinbutton),preview_frame);
       g_signal_handler_unblock(mainw->preview_spinbutton,mainw->preview_spin_func);
 
-      if (mainw->preview_frame>cfile->frames&&preview_frame<=cfile->frames) {
-	g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	mainw->pw_exp_is_blocked=TRUE;
-      }
       mainw->preview_frame=preview_frame;
   }
   
@@ -3226,25 +3766,27 @@
     weed_timecode_t tc=((mainw->preview_frame-1.))/cfile->fps*U_SECL;
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",mainw->preview_frame);
-    if (pull_frame_at_size(layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,mainw->pwidth,mainw->pheight,
+    if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,mainw->pwidth,mainw->pheight,
 			   WEED_PALETTE_RGB24)) {
-        LiVESInterpType interp=get_interp_value(prefs->pb_quality);
+      LiVESInterpType interp=get_interp_value(prefs->pb_quality);
+      resize_layer(layer,mainw->pwidth,mainw->pheight,interp,WEED_PALETTE_RGB24,0);
       convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
-      resize_layer(layer,mainw->pwidth,mainw->pheight,interp);
       pixbuf=layer_to_pixbuf(layer);
     }
     weed_plant_free(layer);
   }
-  gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->preview_image), pixbuf);
 
+  set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->preview_image), pixbuf, NULL);
+  gtk_widget_set_size_request(mainw->preview_image,MAX(mainw->pwidth,mainw->sepwin_minwidth),mainw->pheight);
 
   if (update_always) {
     // set spins from current frame
     switch (mainw->prv_link) {
     case PRV_PTR:
       //cf. hrule_reset
-      if ((GTK_RULER (mainw->hruler)->position=cfile->pointer_time=
-	   calc_time_from_frame(mainw->current_file,mainw->preview_frame))>0.) {
+      cfile->pointer_time=calc_time_from_frame(mainw->current_file,mainw->preview_frame);
+      lives_ruler_set_value(LIVES_RULER(mainw->hruler),cfile->pointer_time);
+      if (cfile->pointer_time>0.) {
 	gtk_widget_set_sensitive (mainw->rewind, TRUE);
 	gtk_widget_set_sensitive (mainw->trim_to_pstart, cfile->achans>0);
 	gtk_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
@@ -3280,7 +3822,12 @@
       break;
     }
   }
-  if (pixbuf!=NULL) gdk_pixbuf_unref(pixbuf);
+  if (pixbuf!=NULL) lives_object_unref(pixbuf);
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_handlers_unblock_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+  g_signal_stop_emission_by_name(mainw->preview_image,LIVES_WIDGET_EVENT_EXPOSE_EVENT);
+#endif
+
 }
 
 #ifndef NO_PROG_LOAD
@@ -3306,7 +3853,7 @@
 
 #ifdef USE_LIBPNG
 
-gboolean layer_from_png(FILE *fp, weed_plant_t *layer, gboolean prog) {
+boolean layer_from_png(FILE *fp, weed_plant_t *layer, boolean prog) {
   png_structp png_ptr;
   png_infop info_ptr;
 
@@ -3322,7 +3869,7 @@
   unsigned char **row_ptrs;
 
   size_t bsize=fread(buff,1,8,fp),framesize;
-  gboolean is_png = !png_sig_cmp(buff, 0, bsize);
+  boolean is_png = !png_sig_cmp(buff, 0, bsize);
 
   float screen_gamma=2.2;
   double file_gamma;
@@ -3528,7 +4075,7 @@
 
 #ifdef USE_LIBPNG
   {
-    gboolean ret;
+    boolean ret;
     FILE *fp=fopen(fname,"rb");
     if (!fp) return FALSE;
     ret=layer_from_png(fp,layer,FALSE);
@@ -3537,7 +4084,7 @@
   }
 #endif
 
-  pixbuf=lives_pixbuf_new_from_file_at_scale(fname,width,height,FALSE,gerror);
+  pixbuf=lives_pixbuf_new_from_file_at_scale(fname,width>0?width:-1,height>0?height:-1,FALSE,gerror);
 
 #endif
 
@@ -3559,7 +4106,7 @@
   do_not_free=pixbuf_to_layer(layer,pixbuf);
 
   if (do_not_free) {
-    mainw->do_not_free=gdk_pixbuf_get_pixels(pixbuf);
+    mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
     mainw->free_fn=lives_free_with_check;
   }
   g_object_unref(pixbuf);
@@ -3624,7 +4171,7 @@
 
 
 
-gboolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, int width, int height, 
+boolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, int width, int height, 
 			     int target_palette) {
   // pull a frame from an external source into a layer
   // the "clip" and "frame" leaves must be set in layer
@@ -3740,7 +4287,7 @@
 	return TRUE;
       }
       else {
-	gboolean ret;
+	boolean ret;
 	gchar *fname=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,frame,image_ext);
 	if (height*width==0) {
 	  ret=weed_layer_new_from_file_progressive(layer,fname,0,0,image_ext,&gerror);
@@ -3798,7 +4345,7 @@
 }
 
 
-gboolean pull_frame (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc) {
+boolean pull_frame (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc) {
   // pull a frame from an external source into a layer
   // the "clip" and "frame" leaves must be set in layer
   // tc is used instead of "frame" for some sources (e.g. generator plugins)
@@ -3830,19 +4377,22 @@
     pixbuf=layer_to_pixbuf(layer);
   }
   weed_plant_free(layer);
-  if (pixbuf!=NULL&&(lives_pixbuf_get_width(pixbuf)!=width||lives_pixbuf_get_height(pixbuf)!=height)) {
+  if (pixbuf!=NULL&&((width!=0&&lives_pixbuf_get_width(pixbuf)!=width)
+		     ||(height!=0&&lives_pixbuf_get_height(pixbuf)!=height))) {
     GdkPixbuf *pixbuf2;
     threaded_dialog_spin();
     // TODO - could use resize plugin here
     pixbuf2=lives_pixbuf_scale_simple(pixbuf,width,height,interp);
-    gdk_pixbuf_unref(pixbuf);
+    lives_object_unref(pixbuf);
     threaded_dialog_spin();
     pixbuf=pixbuf2;
   }
   return pixbuf;
 }
 
-
+LIVES_INLINE LiVESPixbuf *pull_lives_pixbuf(int clip, int frame, const char *image_ext, weed_timecode_t tc) {
+  return pull_lives_pixbuf_at_size(clip,frame,image_ext,tc,0,0,LIVES_INTERP_NORMAL);
+}
 
 static void get_max_opsize(int *opwidth, int *opheight) {
   // calc max output size for display
@@ -3917,10 +4467,10 @@
     if (mainw->fs&&!mainw->is_rendering) {
       if (!mainw->sep_win) {
 	do {
-	  *opwidth=mainw->playframe->allocation.width;
-	  *opheight=mainw->playframe->allocation.height;
+	  *opwidth=lives_widget_get_allocation_width(mainw->playframe);
+	  *opheight=lives_widget_get_allocation_height(mainw->playframe);
 	  if (*opwidth * *opheight==0) {
-	    while (g_main_context_iteration(NULL,FALSE));
+	    lives_widget_context_update();
 	  }
 	} while (*opwidth * *opheight == 0);
       }
@@ -3944,16 +4494,24 @@
       }
       else {
 	if (!mainw->sep_win) {
+#if GTK_CHECK_VERSION(3,0,0)
+	  int rwidth=mainw->ce_frame_width;
+	  int rheight=mainw->ce_frame_height;
+	  *opwidth=cfile->hsize;
+	  *opheight=cfile->vsize;
+	  calc_maxspect(rwidth,rheight,opwidth,opheight);
+#else
 	  do {
-	    *opwidth=mainw->playframe->allocation.width;
-	    *opheight=mainw->playframe->allocation.height;
+	    *opwidth=lives_widget_get_allocation_width(mainw->playframe);
+	    *opheight=lives_widget_get_allocation_height(mainw->playframe);
 	    if (*opwidth * *opheight==0) {
-	      while (g_main_context_iteration(NULL,FALSE));
+	      lives_widget_context_update();
 	    }
 	  } while (*opwidth * *opheight == 0);
+#endif
 	}
 	else {
-	  if (mainw->pwidth<*opwidth||mainw->pheight<*opheight) {
+	  if (mainw->pwidth<*opwidth||mainw->pheight<*opheight||*opwidth==0||*opheight==0) {
 	    *opwidth=mainw->pwidth;
 	    *opheight=mainw->pheight;
 	  }
@@ -3961,6 +4519,7 @@
       }
     }
   }
+
 }
 
 
@@ -3989,29 +4548,31 @@
 
   gchar *framecount=NULL,*tmp;
   gchar *fname_next=NULL,*info_file=NULL;
-  gchar *img_ext=NULL;
+  const gchar *img_ext=NULL;
 
   LiVESInterpType interp;
 
-  gboolean was_preview;
-  gboolean rec_after_pb=FALSE;
+  boolean was_preview;
+  boolean rec_after_pb=FALSE;
   int weed_error;
   int retval;
   int layer_palette,cpal;
 
   int opwidth=0,opheight=0;
-  gboolean noswitch=mainw->noswitch;
+  boolean noswitch=mainw->noswitch;
   gint pmonitor;
   int pwidth,pheight;
   int lb_width=0,lb_height=0;
+  int bad_frame_count=0;
 
+#define BFC_LIMIT 1000
 
   if (G_UNLIKELY(cfile->frames==0&&!mainw->foreign&&!mainw->is_rendering)) {
     if (mainw->record&&!mainw->record_paused) {
       // add blank frame
       weed_plant_t *event=get_last_event(mainw->event_list);
       weed_plant_t *event_list=insert_blank_frame_event_at(mainw->event_list,mainw->currticks,&event);
-      if (mainw->rec_aclip!=-1&&(prefs->rec_opts&REC_AUDIO)&&!mainw->record_starting&&!(prefs->rec_opts&REC_EXT_AUDIO)) {
+      if (mainw->rec_aclip!=-1&&(prefs->rec_opts&REC_AUDIO)&&!mainw->record_starting&&prefs->audio_src==AUDIO_SRC_INT&&!(has_audio_filters(FALSE))) {
 	// we are recording, and the audio clip changed; add audio
 	if (mainw->event_list==NULL) mainw->event_list=event_list;
 	insert_audio_event_at(mainw->event_list,event,-1,mainw->rec_aclip,mainw->rec_aseek,mainw->rec_avel);
@@ -4022,6 +4583,10 @@
     return;
   }
 
+
+  mainw->rowstride_alignment=mainw->rowstride_alignment_hint;
+  mainw->rowstride_alignment_hint=1;
+
   if (!mainw->foreign) {
     mainw->actual_frame=cfile->last_frameno=frame;
 
@@ -4032,6 +4597,8 @@
       // normal play
 
       if (G_UNLIKELY(mainw->nervous)) {
+	// nervous mode
+
 	if ((mainw->actual_frame+=(-10+(int) (21.*rand()/(RAND_MAX+1.0))))>cfile->frames||
 	    mainw->actual_frame<1) mainw->actual_frame=frame;
 	else {
@@ -4039,31 +4606,33 @@
 #ifdef ENABLE_JACK
 	  if (prefs->audio_player==AUD_PLAYER_JACK&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
 	      mainw->jackd!=NULL&&cfile->achans>0 &&
-	    !(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO))) {
+	      !(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0)) {
 	    if (!jack_audio_seek_frame(mainw->jackd,frame)) {
 	      if (jack_try_reconnect()) jack_audio_seek_frame(mainw->jackd,frame);
 	    }
 
-	    mainw->rec_aclip=mainw->current_file;
-	    mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	    mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
-	    
+	    if (!(mainw->record&&!mainw->record_paused&&has_audio_filters(FALSE))) {
+	      mainw->rec_aclip=mainw->current_file;
+	      mainw->rec_avel=cfile->pb_fps/cfile->fps;
+	      mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
+	    }
 	  }
 #endif
 #ifdef HAVE_PULSE_AUDIO
 	  if (prefs->audio_player==AUD_PLAYER_PULSE&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
 	      mainw->pulsed!=NULL&&cfile->achans>0 &&
-	      !(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO))) {
+	      !(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0)) {
 
 	    if (!pulse_audio_seek_frame(mainw->pulsed,mainw->play_start)) {
 	      if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,mainw->play_start);
 	      else mainw->aplayer_broken=TRUE;
 	    }
 
-	    mainw->rec_aclip=mainw->current_file;
-	    mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	    mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
-	    
+	    if (!(mainw->record&&!mainw->record_paused&&has_audio_filters(FALSE))) {
+	      mainw->rec_aclip=mainw->current_file;
+	      mainw->rec_avel=cfile->pb_fps/cfile->fps;
+	      mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
+	    }
 	  }
 #endif
 	}
@@ -4119,14 +4688,14 @@
 
 #ifdef ENABLE_JACK
 	  if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&
-	      (prefs->rec_opts&REC_AUDIO)&&!(prefs->rec_opts&REC_EXT_AUDIO)&&mainw->rec_aclip!=-1) {
+	      (prefs->rec_opts&REC_AUDIO)&&prefs->audio_src==AUDIO_SRC_INT&&mainw->rec_aclip!=mainw->ascrap_file) {
 	    // get current seek postion
 	    jack_get_rec_avals(mainw->jackd);
 	  }
 #endif
 #ifdef HAVE_PULSE_AUDIO
 	  if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&
-	      (prefs->rec_opts&REC_AUDIO)&&!(prefs->rec_opts&REC_EXT_AUDIO)&&mainw->rec_aclip!=-1) {
+	      (prefs->rec_opts&REC_AUDIO)&&prefs->audio_src==AUDIO_SRC_INT&&mainw->rec_aclip!=mainw->ascrap_file) {
 	    // get current seek postion
 	    pulse_get_rec_avals(mainw->pulsed);
 	  }
@@ -4149,8 +4718,14 @@
 	if (framecount!=NULL) g_free(framecount);
 	if ((event_list=append_frame_event (mainw->event_list,mainw->currticks,numframes,clips,frames))!=NULL) {
 	  if (mainw->event_list==NULL) mainw->event_list=event_list;
-	  if (mainw->rec_aclip!=-1&&((prefs->rec_opts&REC_AUDIO)||(prefs->rec_opts&REC_EXT_AUDIO))) {
-	    weed_plant_t *event=get_last_event(mainw->event_list);
+	  if (mainw->rec_aclip!=-1&&((prefs->rec_opts&REC_AUDIO))) {
+	    weed_plant_t *event=get_last_frame_event(mainw->event_list);
+
+	    if (mainw->rec_aclip==mainw->ascrap_file) {
+	      mainw->rec_aseek=(double)mainw->files[mainw->ascrap_file]->aseek_pos/
+		(double)(mainw->files[mainw->ascrap_file]->arps*mainw->files[mainw->ascrap_file]->achans*mainw->files[mainw->ascrap_file]->asampsize>>3);
+
+	    }
 	    insert_audio_event_at(mainw->event_list,event,-1,mainw->rec_aclip,mainw->rec_aseek,mainw->rec_avel);
 	    mainw->rec_aclip=-1;
 	  }
@@ -4196,7 +4771,11 @@
     }
 
     if (was_preview) {
+#ifndef IS_MINGW
       info_file=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+#else
+      info_file=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+#endif
       // preview
       if (prefs->safer_preview&&cfile->proc_ptr!=NULL&&cfile->proc_ptr->frames_done>0&&
 	  frame>=(cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start)) {
@@ -4243,13 +4822,12 @@
 	}
 	else {
 	  if (!mainw->keep_pre) {
-	    img_ext=g_strdup("mgk");
-	    fname_next=g_strdup_printf("%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,frame+1);
+	    img_ext="mgk";
 	  }
 	  else {
-	    img_ext=g_strdup("pre");
-	    fname_next=g_strdup_printf("%s/%s/%08d.pre",prefs->tmpdir,cfile->handle,frame+1);
+	    img_ext="pre";
 	  }
+	  fname_next=g_strdup_printf("%s/%s/%08d.pre",prefs->tmpdir,cfile->handle,frame+1);
 	}
       }
       mainw->actual_frame=frame;
@@ -4258,12 +4836,11 @@
     // maybe the performance finished and we weren't looping
     if ((mainw->actual_frame<1||mainw->actual_frame>cfile->frames)&&
 	(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
-      if (img_ext!=NULL) g_free(img_ext);
       mainw->noswitch=noswitch;
       if (framecount!=NULL) g_free(framecount);
       return;
     }
-
+  
 
     // limit max frame size unless we are saving to disk or rendering
 
@@ -4296,7 +4873,7 @@
 	  mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL);
 	  weed_set_int_value(mainw->frame_layer,"clip",mainw->clip_index[0]);
 	  weed_set_int_value(mainw->frame_layer,"frame",mainw->frame_index[0]);
-	  if (!pull_frame(mainw->frame_layer,cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",tc)) {
+	  if (!pull_frame(mainw->frame_layer,get_image_ext_for_type(cfile->img_type),tc)) {
 	    weed_plant_free(mainw->frame_layer);
 	    mainw->frame_layer=NULL;
 	  }
@@ -4324,7 +4901,6 @@
 
 	if (mainw->internal_messaging) {
 	  // this happens if we are calling from multitrack, or apply rte.  We get our mainw->frame_layer and exit.
-	  if (img_ext!=NULL) g_free(img_ext);
 	  mainw->noswitch=noswitch;
 	  if (framecount!=NULL) g_free(framecount);
 	  return;
@@ -4336,11 +4912,19 @@
 	  mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL);
 	  weed_set_int_value(mainw->frame_layer,"clip",mainw->current_file);
 	  weed_set_int_value(mainw->frame_layer,"frame",mainw->actual_frame);
-	  if (img_ext==NULL) img_ext=(cfile->img_type==IMG_TYPE_JPEG?g_strdup("jpg"):g_strdup("png"));
+	  if (img_ext==NULL) img_ext=get_image_ext_for_type(cfile->img_type);
 	  if (!pull_frame_at_size(mainw->frame_layer,img_ext,(weed_timecode_t)mainw->currticks,
 				  cfile->hsize,cfile->vsize,WEED_PALETTE_END)) {
 	    if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
 	    mainw->frame_layer=NULL;
+
+	    if (cfile->opening && cfile->img_type==IMG_TYPE_PNG && sget_file_size(fname_next)==0) {
+	      if (++bad_frame_count>BFC_LIMIT) {
+		mainw->cancelled=check_for_bad_ffmpeg();
+		bad_frame_count=0;
+	      }
+	      else g_usleep(prefs->sleep_time);
+	    }
 	  }
 	}
 
@@ -4353,7 +4937,6 @@
 	  if (mainw->cancelled) {
 	    g_free(fname_next);
 	    g_free(info_file);
-	    if (img_ext!=NULL) g_free(img_ext);
 	    mainw->noswitch=noswitch;
 	    if (framecount!=NULL) g_free(framecount);
 	    return;
@@ -4363,7 +4946,7 @@
 	  mainw->startticks=mainw->currticks+mainw->deltaticks;
 	}
 	  
-	if (img_ext!=NULL) g_free(img_ext);
+	img_ext=NULL;
 	
 	if (mainw->internal_messaging) {
 	  mainw->noswitch=noswitch;
@@ -4425,7 +5008,7 @@
 	    if (framecount!=NULL) g_free(framecount);
 	    return;
 	  }
-	  else if (mainw->preview||cfile->opening) while (g_main_context_iteration (NULL, FALSE));
+	  else if (mainw->preview||cfile->opening) lives_widget_context_update();
 	}
       }
     } while (mainw->frame_layer==NULL&&mainw->cancelled==CANCEL_NONE&&cfile->clip_type==CLIP_TYPE_DISK);
@@ -4478,7 +5061,7 @@
     ////////////////////////
 #ifdef ENABLE_JACK
     if (!mainw->foreign&&mainw->jackd!=NULL&&prefs->audio_player==AUD_PLAYER_JACK) {
-      gboolean timeout;
+      boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
 	sched_yield(); // wait for seek
@@ -4490,7 +5073,7 @@
 #endif
 #ifdef HAVE_PULSE_AUDIO
     if (!mainw->foreign&&mainw->pulsed!=NULL&&prefs->audio_player==AUD_PLAYER_PULSE) {
-      gboolean timeout;
+      boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
 	sched_yield(); // wait for seek
@@ -4594,9 +5177,20 @@
 
       }
 
+      // chain any data to the playback plugin
+      if (!(mainw->preview||mainw->is_rendering)) {
+	// chain any data pipelines
+	if (mainw->pconx!=NULL) {
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  pconx_chain_data(-2,0);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	if (mainw->cconx!=NULL) cconx_chain_data(-2,0);
+      }
+
       if (!(*mainw->vpp->render_frame)(weed_get_int_value(frame_layer,"width",&weed_error),
 				       weed_get_int_value(mainw->frame_layer,"height",&weed_error),
-				       mainw->currticks-mainw->stream_ticks,pd_array,retdata)) {
+				       mainw->currticks-mainw->stream_ticks,pd_array,retdata,mainw->vpp->play_params)) {
 	vid_playback_plugin_exit();
 	if (return_layer!=NULL) weed_layer_free(return_layer);
 	weed_free(retdata);
@@ -4613,7 +5207,7 @@
 		      weed_get_int_value(return_layer,"width",&weed_error));
 	int height=MIN(weed_get_int_value(mainw->frame_layer,"height",&weed_error),
 		       weed_get_int_value(return_layer,"height",&weed_error));
-	resize_layer(return_layer,width,height,LIVES_INTERP_FAST); 
+	resize_layer(return_layer,width,height,LIVES_INTERP_FAST,WEED_PALETTE_END,0); 
 
 	save_to_scrap_file (return_layer);
 	weed_layer_free(return_layer);
@@ -4677,7 +5271,7 @@
       }
     }
     else {
-      gboolean size_ok=FALSE;
+      boolean size_ok=FALSE;
 
       pmonitor=prefs->play_monitor;
 
@@ -4687,8 +5281,8 @@
       if (!mainw->is_rendering) {
 	do {
 	  if (pmonitor==0) {
-	    if (mainw->pwidth>mainw->scr_width-DSIZE_SAFETY_H||
-		mainw->pheight>mainw->scr_height-DSIZE_SAFETY_V) { 
+	    if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
+		mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) { 
 	      mainw->pheight=(mainw->pheight>>2)<<1;
 	      mainw->pwidth=(mainw->pwidth>>2)<<1;
 	      mainw->sepwin_scale/=2.;
@@ -4696,8 +5290,8 @@
 	    else size_ok=TRUE;
 	  }
 	  else {
-	    if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-DSIZE_SAFETY_H||
-		mainw->pheight>mainw->mgeom[pmonitor-1].height-DSIZE_SAFETY_V) {
+	    if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+		mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
 	      mainw->pheight=(mainw->pheight>>2)<<1;
 	      mainw->pwidth=(mainw->pwidth>>2)<<1;
 	      mainw->sepwin_scale/=2.;
@@ -4708,11 +5302,20 @@
       }
 
       if (mainw->multitrack==NULL&&mainw->play_window==NULL&&prefs->ce_maxspect) {
-	gint rwidth=mainw->image274->allocation.width;
-	gint rheight=mainw->image274->allocation.height;
+#if GTK_CHECK_VERSION(3,0,0)
+	int rwidth=mainw->ce_frame_width-H_RESIZE_ADJUST*2;
+	int rheight=mainw->ce_frame_height-V_RESIZE_ADJUST*2;
 	if (mainw->double_size) {
-	  mainw->pwidth*=2;
-	  mainw->pheight*=2;
+	  rwidth*=4;
+	  rheight*=4;
+	}
+#else
+	int rwidth=lives_widget_get_allocation_width(mainw->image274);
+	int rheight=lives_widget_get_allocation_height(mainw->image274);
+#endif
+	if (mainw->double_size) {
+	  mainw->pwidth=(mainw->pwidth-H_RESIZE_ADJUST)*4+H_RESIZE_ADJUST;
+	  mainw->pheight=(mainw->pheight-V_RESIZE_ADJUST)*4+H_RESIZE_ADJUST;
 	}
 	calc_maxspect(rwidth,rheight,&mainw->pwidth,&mainw->pheight);
 	if (mainw->pwidth<2) mainw->pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
@@ -4750,9 +5353,18 @@
       }
       else frame_layer=mainw->frame_layer;
 
+      if (frame_layer==mainw->frame_layer && !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && 
+	  ((weed_palette_is_rgb_palette(layer_palette) && 
+	  !(weed_palette_is_rgb_palette(mainw->vpp->palette))) || 
+	(weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
+	// mainw->frame_layer is RGB and so is our screen, but plugin is YUV
+	// so copy layer and convert, retaining original
+	frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
+      }
+
       if ((mainw->vpp->fwidth>0&&mainw->vpp->fheight>0)&&lb_width==0) {
 	resize_layer(frame_layer,mainw->vpp->fwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
-		     mainw->vpp->fheight,interp);
+		     mainw->vpp->fheight,interp,mainw->vpp->palette,mainw->vpp->YUV_clamping);
       }
 
       // resize_layer can change palette
@@ -4776,6 +5388,8 @@
 	mainw->vpp->fheight=mainw->scr_height;
       }
 
+      convert_layer_palette(frame_layer,mainw->vpp->palette,mainw->vpp->YUV_clamping);
+
       if (mainw->vpp->fwidth!=pwidth||mainw->vpp->fheight!=pheight||lb_width!=0) {
 
 	if (lb_width==0) {
@@ -4793,8 +5407,6 @@
 
       }
 
-      convert_layer_palette(frame_layer,mainw->vpp->palette,mainw->vpp->YUV_clamping);
-
       if (mainw->stream_ticks==-1) mainw->stream_ticks=(mainw->currticks);
 
       // vid plugin expects compacted rowstrides (i.e. no padding/alignment after pixel row)
@@ -4821,11 +5433,22 @@
 	retdata=weed_get_voidptr_array(return_layer,"pixel_data",&weed_error);
       }
 
+      // chain any data to the playback plugin
+      if (!(mainw->preview||mainw->is_rendering)) {
+	// chain any data pipelines
+	if (mainw->pconx!=NULL) {
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  pconx_chain_data(-2,0);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	}
+	if (mainw->cconx!=NULL) cconx_chain_data(-2,0);
+      }
+
       if (!(*mainw->vpp->render_frame)(weed_get_int_value(frame_layer,"width",&weed_error),
 				       weed_get_int_value(frame_layer,"height",&weed_error),
 				       mainw->currticks-mainw->stream_ticks,
 				       (pd_array=weed_get_voidptr_array(frame_layer,"pixel_data",&weed_error)),
-				       retdata)) {
+				       retdata,mainw->vpp->play_params)) {
 	vid_playback_plugin_exit();
 	if (return_layer!=NULL) {
 	  weed_layer_free(return_layer);
@@ -4844,7 +5467,7 @@
 		      weed_get_int_value(return_layer,"width",&weed_error));
 	int height=MIN(weed_get_int_value(mainw->frame_layer,"height",&weed_error),
 		       weed_get_int_value(return_layer,"height",&weed_error));
-	resize_layer(return_layer,width,height,LIVES_INTERP_FAST); 
+	resize_layer(return_layer,width,height,LIVES_INTERP_FAST,WEED_PALETTE_END,0); 
 
 	save_to_scrap_file (return_layer);
 	weed_layer_free(return_layer);
@@ -4883,16 +5506,14 @@
     if (cfile->img_type==IMG_TYPE_JPEG||!weed_palette_has_alpha_channel(layer_palette)) cpal=WEED_PALETTE_RGB24;
     else cpal=WEED_PALETTE_RGBA32;
 
-    convert_layer_palette(mainw->frame_layer,cpal,0);
-
     if (mainw->fs&&!mainw->ext_playback&&(mainw->multitrack==NULL||mainw->sep_win)) {
       // set again, in case vpp was turned off because of preview conditions
       if (!mainw->sep_win) {
 	do {
-	  mainw->pwidth=mainw->playframe->allocation.width;
-	  mainw->pheight=mainw->playframe->allocation.height;
+	  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe);
+	  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe);
 	  if (mainw->pwidth * mainw->pheight==0) {
-	    while (g_main_context_iteration(NULL,FALSE));
+	    lives_widget_context_update();
 	  }
 	} while (mainw->pwidth * mainw->pheight == 0);
       }
@@ -4911,13 +5532,10 @@
     }
 
     if (mainw->play_window!=NULL&&!mainw->fs) {
-      mainw->pwidth=mainw->play_window->allocation.width;
-      mainw->pheight=mainw->play_window->allocation.height;
+      mainw->pwidth=lives_widget_get_allocation_width(mainw->play_window);
+      mainw->pheight=lives_widget_get_allocation_height(mainw->play_window);
     }
 
-
-    layer_palette=weed_layer_get_palette(mainw->frame_layer);
-
     pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error)*
       weed_palette_get_pixels_per_macropixel(layer_palette);
     pheight=weed_get_int_value(mainw->frame_layer,"height",&weed_error)*
@@ -4925,6 +5543,8 @@
 
     if (pwidth!=mainw->pwidth||pheight!=mainw->pheight||lb_width!=0) {
       if (lb_width!=0) {
+	convert_layer_palette(mainw->frame_layer,cpal,0);
+
 	letterbox_layer(mainw->frame_layer,lb_width/
 			weed_palette_get_pixels_per_macropixel(layer_palette),
 			lb_height,mainw->pwidth/
@@ -4934,14 +5554,16 @@
       else {
 	interp=get_interp_value(prefs->pb_quality);
 	resize_layer(mainw->frame_layer,mainw->pwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
-		     mainw->pheight,interp);
+		     mainw->pheight,interp,cpal,0);
+	convert_layer_palette(mainw->frame_layer,cpal,0);
       }
     }
     else {
-      if (mainw->play_window!=NULL&&GDK_IS_WINDOW (mainw->play_window->window)) {
+      if (mainw->play_window!=NULL&&GDK_IS_WINDOW (lives_widget_get_xwindow(mainw->play_window))) {
 	interp=get_interp_value(prefs->pb_quality);
 	resize_layer(mainw->frame_layer,mainw->pwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
-		     mainw->pheight,interp);
+		     mainw->pheight,interp,cpal,0);
+	convert_layer_palette(mainw->frame_layer,cpal,0);
       }
     }
 
@@ -4953,19 +5575,17 @@
 
     // internal player, double size or fullscreen, or multitrack
 
-    if (mainw->play_window!=NULL&&GDK_IS_WINDOW (mainw->play_window->window)) {
-      cairo_t *cr = gdk_cairo_create (mainw->play_window->window);
+    if (mainw->play_window!=NULL&&GDK_IS_WINDOW (lives_widget_get_xwindow(mainw->play_window))) {
+      lives_painter_t *cr = lives_painter_create_from_widget(mainw->play_window);
       block_expose();
 
-      gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
+      lives_painter_set_source_pixbuf (cr, pixbuf, 0, 0);
+      lives_painter_paint (cr);
+      lives_painter_destroy (cr);
 
-      //gdk_draw_pixbuf (GDK_DRAWABLE (mainw->play_window->window),mainw->gc,GDK_PIXBUF (pixbuf),
-      //	       0,0,0,0,-1,-1,GDK_RGB_DITHER_NONE,0,0);
       unblock_expose();
     }
-    else gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),pixbuf);
+    else set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image274),pixbuf,NULL);
 
     if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
 
@@ -4974,7 +5594,7 @@
 			     mainw->current_file!=mainw->scrap_file) 
       get_play_times();
     
-    gdk_pixbuf_unref(pixbuf);
+    lives_object_unref(pixbuf);
     
 #ifdef ENABLE_OSC
     // format is now msg|timecode|fgclip|fgframe|fgfps|
@@ -4989,9 +5609,10 @@
 
   // record external window
   if (mainw->record_foreign) {
+    gchar fname[PATH_MAX];
     gint xwidth,xheight;
     GError *gerror=NULL;
-    cairo_t *cr = gdk_cairo_create (mainw->playarea->window);
+    lives_painter_t *cr = lives_painter_create_from_widget (mainw->playarea);
       
 
     if (mainw->rec_vid_frames==-1) gtk_entry_set_text(GTK_ENTRY(mainw->framecounter),(tmp=g_strdup_printf("%9d",frame)));
@@ -5006,22 +5627,23 @@
       g_free(tmp);
     }
 
-    gdk_window_get_size(mainw->foreign_window,&xwidth,&xheight);
 
 #if GTK_CHECK_VERSION(3,0,0)
+    xwidth=gdk_window_get_width(mainw->foreign_window);
+    xheight=gdk_window_get_height(mainw->foreign_window);
     if ((pixbuf=gdk_pixbuf_get_from_window (mainw->foreign_window,
 					      0,0,
 					      xwidth,
 					      xheight
 					      ))!=NULL) {
 #else
+    gdk_window_get_size(mainw->foreign_window,&xwidth,&xheight);
     if ((pixbuf=gdk_pixbuf_get_from_drawable (NULL,GDK_DRAWABLE(mainw->foreign_window),
 					      mainw->foreign_cmap,0,0,0,0,
 					      xwidth,
 					      xheight
 					      ))!=NULL) {
 #endif
-      gchar fname[PATH_MAX];
       g_snprintf(fname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame,prefs->image_ext);
       do {
 	if (gerror!=NULL) g_error_free(gerror);
@@ -5031,11 +5653,11 @@
       } while (gerror!=NULL);
 
 
-      gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
+      lives_painter_set_source_pixbuf (cr, pixbuf, 0, 0);
+      lives_painter_paint (cr);
+      lives_painter_destroy (cr);
 
-      gdk_pixbuf_unref(pixbuf);
+      lives_object_unref(pixbuf);
       cfile->frames=frame;
     }
     else {
@@ -5052,7 +5674,7 @@
 
 /** Save a pixbuf to a file using the specified imgtype and the specified quality/compression value */
 
-GError *lives_pixbuf_save(GdkPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, int quality, gboolean do_chmod, 
+GError *lives_pixbuf_save(GdkPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, int quality, boolean do_chmod, 
 			  GError **gerrorptr) {
   // CALLER should check for errors
 
@@ -5060,11 +5682,13 @@
 
   // if do_chmod, we try to set permissions to default
 
+#ifndef IS_MINGW
   mode_t xumask=0;
 
   if (do_chmod) {
     xumask=umask(DEF_FILE_UMASK);
   }
+#endif
 
   if (imgtype==IMG_TYPE_JPEG) {
     gchar *qstr=g_strdup_printf("%d",quality);
@@ -5080,13 +5704,11 @@
     //gdk_pixbuf_save_to_callback(...);
   }
 
-  /*  if (do_chmod) {
-    chmod(fname,DEF_FILE_PERMS);
-    }*/
-
+#ifndef IS_MINGW
   if (do_chmod) {
     umask(xumask);
   }
+#endif
 
   return *gerrorptr;
 }
@@ -5099,7 +5721,7 @@
   gint index=-1;
   gint old_file=mainw->current_file;
   GList *list_index;
-  gboolean need_new_blend_file=FALSE;
+  boolean need_new_blend_file=FALSE;
 
   if (mainw->playing_file==-1) {
     if (mainw->current_file!=mainw->scrap_file) desensitize();
@@ -5191,8 +5813,15 @@
     }
 
     if (cfile->clip_type==CLIP_TYPE_FILE&&cfile->ext_src!=NULL) {
+      gchar *cwd=g_get_current_dir();
+      gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+      lives_chdir(ppath,FALSE);
+      g_free(ppath);
       close_decoder_plugin((lives_decoder_t *)cfile->ext_src);
       cfile->ext_src=NULL;
+
+      lives_chdir(cwd,FALSE);
+      g_free(cwd);
     }
 
     if (cfile->frame_index!=NULL) g_free(cfile->frame_index);
@@ -5201,7 +5830,24 @@
     if (cfile->op_dir!=NULL) g_free(cfile->op_dir);
 
     if (cfile->clip_type!=CLIP_TYPE_GENERATOR&&!mainw->only_close) {
-      com=g_strdup_printf("smogrify close \"%s\"",cfile->handle);
+#ifdef IS_MINGW
+      // kill any active processes: for other OSes the backend does this
+      // get pid from backend
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+      int pid;
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+      lives_win32_kill_subprocesses(pid,TRUE);
+  
+#endif
+
+      com=g_strdup_printf("%s close \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE);
       g_free(com); 
 
@@ -5231,6 +5877,14 @@
 #endif
     }
 
+    if (cfile->laudio_drawable!=NULL) {
+      lives_painter_surface_destroy(cfile->laudio_drawable);
+    }
+
+    if (cfile->raudio_drawable!=NULL) {
+      lives_painter_surface_destroy(cfile->raudio_drawable);
+    }
+
     g_free(cfile);
     cfile=NULL;
 
@@ -5238,7 +5892,8 @@
       mt_delete_clips(mainw->multitrack,mainw->current_file);
     }
 
-    if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) mainw->first_free_file=mainw->current_file;
+    if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) 
+      mainw->first_free_file=mainw->current_file;
 
     if (!mainw->only_close) {
       if (file_to_switch_to>0&&mainw->files[file_to_switch_to]!=NULL) {
@@ -5316,7 +5971,6 @@
 	}
       }
     }
-  
 
     // no other clips
     mainw->current_file=-1;
@@ -5336,20 +5990,36 @@
     gtk_widget_hide(mainw->redo);
     gtk_widget_show(mainw->undo);
     gtk_widget_set_sensitive(mainw->undo,FALSE);
-    
-    if (mainw->preview_box!=NULL&&mainw->preview_box->parent!=NULL) {
-      g_object_unref(mainw->preview_box);
-      gtk_container_remove (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
-      mainw->preview_box=NULL;
-    }
-    if (mainw->play_window!=NULL&&!mainw->fs) {
-      g_signal_handlers_block_matched(mainw->play_window,(GSignalMatchType)(G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_UNBLOCKED),
-				      0,0,0,(gpointer)expose_play_window,NULL);
-      g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=FALSE;
+
+
+    if (!mainw->is_ready) return;
+
+    if (mainw->playing_file==-1&&mainw->play_window!=NULL) {
+      // if the clip is loaded
+      if (mainw->preview_box==NULL) {
+	// create the preview box that shows frames...
+	make_preview_box();
+      }
+      // add it the play window...
+      if (lives_widget_get_parent(mainw->preview_box)==NULL) {
+	gtk_widget_queue_draw(mainw->play_window);
+	gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
+	gtk_widget_grab_focus (mainw->preview_spinbutton);
+      }
+
+      gtk_widget_hide(mainw->preview_controls);
+
+      // and resize it
       resize_play_window();
-    }
 
+      play_window_set_title();
+
+      load_preview_image(FALSE);
+      //gtk_widget_queue_draw(mainw->preview_box);
+
+      //lives_widget_context_update();
+    }
+      
     if (mainw->multitrack==NULL) {
       resize(1);
       load_start_image (0);
@@ -5386,6 +6056,7 @@
       mt_clip_select(mainw->multitrack,TRUE);
     }
   }
+
 }
 
 
@@ -5396,8 +6067,6 @@
   GtkWidget *active_image;
   gint orig_file=mainw->current_file;
 
-  gchar *xtrabit,*xtitle;
-
   // should use close_current_file
   if (new_file==-1||new_file>MAX_FILES) {
     g_printerr("warning - attempt to switch to invalid clip %d\n",new_file);
@@ -5429,13 +6098,15 @@
       changed_fps_during_pb (GTK_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
     }
 
-    if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||(mainw->event_list!=NULL&&!mainw->record)) mainw->play_end=INT_MAX;
+    if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||(mainw->event_list!=NULL&&!mainw->record)) 
+      mainw->play_end=INT_MAX;
   }
 
   if (old_file!=new_file) {
     if (old_file*new_file) mainw->preview_frame=0;
     if (old_file!=-1) {
-      if (old_file>0&&mainw->files[old_file]!=NULL&&mainw->files[old_file]->menuentry!=NULL&&(mainw->files[old_file]->clip_type==CLIP_TYPE_DISK||mainw->files[old_file]->clip_type==CLIP_TYPE_FILE)) {
+      if (old_file>0&&mainw->files[old_file]!=NULL&&mainw->files[old_file]->menuentry!=NULL&&
+	  (mainw->files[old_file]->clip_type==CLIP_TYPE_DISK||mainw->files[old_file]->clip_type==CLIP_TYPE_FILE)) {
 	gchar menutext[32768];
 	get_menu_text_long(mainw->files[old_file]->menuentry,menutext);
 
@@ -5443,7 +6114,7 @@
 	  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->files[old_file]->menuentry), NULL);
 	}
 	else {
-	  active_image = gtk_image_new_from_stock ("gtk-no", GTK_ICON_SIZE_MENU);
+	  active_image = lives_image_new_from_stock ("gtk-no", LIVES_ICON_SIZE_MENU);
 	  gtk_widget_show (active_image);
 	  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mainw->files[old_file]->menuentry), active_image);
 	}
@@ -5472,7 +6143,7 @@
     sensitize();
   }
 
-  if ((mainw->playing_file==-1&&prefs->sepwin_type==1&&mainw->sep_win&&new_file>0&&cfile->is_loaded)
+  if ((mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded)
       &&orig_file!=new_file) {
     // if the clip is loaded
     if (mainw->preview_box==NULL) {
@@ -5480,41 +6151,30 @@
       make_preview_box();
     }
     // add it the play window...
-    if (mainw->preview_box->parent==NULL) {
+    if (lives_widget_get_parent(mainw->preview_box)==NULL) {
       gtk_widget_queue_draw(mainw->play_window);
       gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
-      if (old_file==-1) {
-	g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	mainw->pw_exp_is_blocked=TRUE;
-      }
+      gtk_widget_grab_focus (mainw->preview_spinbutton);
     }
+
+    gtk_widget_show(mainw->preview_controls);
+    gtk_widget_grab_focus (mainw->preview_spinbutton);
+
     // and resize it
     resize_play_window();
 
-    if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-    else xtrabit=g_strdup("");
-    xtitle=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-    if (mainw->play_window!=NULL)
-      gtk_window_set_title (GTK_WINDOW (mainw->play_window), xtitle);
-    g_free(xtitle);
-    g_free(xtrabit);
+    play_window_set_title();
 
     load_preview_image(FALSE);
-    gtk_widget_queue_resize(mainw->preview_box);
-
-    g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=TRUE;
-
-    while (g_main_context_iteration (NULL,FALSE));
   }
   
   if (new_file>0) {
-    GTK_RULER (mainw->hruler)->position=cfile->pointer_time;
+    lives_ruler_set_value (LIVES_RULER(mainw->hruler),cfile->pointer_time);
     if (!cfile->opening&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
-      active_image = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+      active_image = lives_image_new_from_stock ("gtk-close", LIVES_ICON_SIZE_MENU);
     }
     else {
-      active_image = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
+      active_image = lives_image_new_from_stock ("gtk-yes", LIVES_ICON_SIZE_MENU);
       load_start_image(0);
       load_end_image(0);
       gtk_widget_set_sensitive (mainw->rename, FALSE);
@@ -5552,7 +6212,7 @@
     gtk_widget_set_sensitive (mainw->trim_to_pstart, (cfile->achans>0&&cfile->pointer_time>0.));
     gtk_widget_set_sensitive (mainw->delaudio_submenu, (cfile->achans>0));
     gtk_widget_set_sensitive (mainw->delsel_audio, (cfile->frames>0));
-    gtk_widget_set_sensitive (mainw->resample_audio, (cfile->achans>0&&capable->has_sox));
+    gtk_widget_set_sensitive (mainw->resample_audio, (cfile->achans>0&&capable->has_sox_sox));
     gtk_widget_set_sensitive (mainw->fade_aud_in, cfile->achans>0);
     gtk_widget_set_sensitive (mainw->fade_aud_out, cfile->achans>0);
     gtk_widget_set_sensitive (mainw->loop_video, (cfile->achans>0&&cfile->frames>0));
@@ -5613,10 +6273,6 @@
 	  g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
           load_start_image(cfile->start);
           load_end_image(cfile->end);
-	  if (prefs->ce_maxspect) {
-	    load_start_image(cfile->start);
-	    load_end_image(cfile->end);
-	  }
 	  load_frame_image(cfile->frameno);
 	}
 	if (mainw->double_size) {
@@ -5639,50 +6295,15 @@
 }
 
 
+void switch_audio_clip(gint new_file, boolean activate) {
 
-void do_quick_switch (gint new_file) {
-  // handle clip switching during playback
-
-  gint ovsize=mainw->pheight;
-  gint ohsize=mainw->pwidth;
-  gboolean osc_block;
-
-  if (mainw->current_file<1||mainw->files[new_file]==NULL) return;
-
-  if (mainw->noswitch||(mainw->record&&!mainw->record_paused&&!(prefs->rec_opts&REC_CLIPS))||
-      mainw->foreign||(mainw->preview&&!mainw->is_rendering&&mainw->multitrack==NULL)) return;
-
-  if (new_file==mainw->current_file) {
-    if (!((mainw->fs&&prefs->gui_monitor==prefs->play_monitor)||(mainw->faded&&mainw->double_size)||
-	  mainw->multitrack!=NULL)) {
-      switch_to_file (mainw->current_file=0, new_file);
-      if (mainw->play_window!=NULL&&!mainw->double_size&&!mainw->fs&&mainw->current_file!=-1&&cfile!=NULL&&
-	  (ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
-	// for single size sepwin, we resize frames to fit the window
-	mainw->must_resize=TRUE;
-	mainw->pheight=ovsize;
-	mainw->pwidth=ohsize;
-      }
-      else if (mainw->multitrack==NULL) mainw->must_resize=FALSE;
-    }
-    return;
-  }
-
-  // reset old info file
-  if (cfile!=NULL) {
-    gchar *tmp=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
-    g_snprintf(cfile->info_file,PATH_MAX,"%s",tmp);
-    g_free(tmp);
-  }
-  osc_block=mainw->osc_block;
-  mainw->osc_block=TRUE;
-
-  if (prefs->audio_player==AUD_PLAYER_JACK&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)&&!mainw->is_rendering&&
-      !(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO))) {
+  if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-  if (mainw->jackd!=NULL) {
-      gboolean timeout;
+    if (mainw->jackd!=NULL) {
+      boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
+      if (!activate) mainw->jackd->in_use=FALSE;
+
       while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
 	sched_yield(); // wait for seek
       }
@@ -5703,22 +6324,27 @@
 	lives_alarm_clear(alarm_handle);
 	
       }
+
+      if (new_file<0||mainw->files[new_file]==NULL) {
+	mainw->jackd->in_use=FALSE;
+	return;
+      }
       
-      mainw->jackd->in_use=TRUE;
+      if (activate) mainw->jackd->in_use=TRUE;
       
       if (mainw->files[new_file]->achans>0) { 
-        gint asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
-        gint aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
-        mainw->jackd->num_input_channels=mainw->files[new_file]->achans;
-        mainw->jackd->bytes_per_channel=mainw->files[new_file]->asampsize/8;
-        if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-          if (!mainw->files[new_file]->play_paused) 
+	gint asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
+	gint aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
+	mainw->jackd->num_input_channels=mainw->files[new_file]->achans;
+	mainw->jackd->bytes_per_channel=mainw->files[new_file]->asampsize/8;
+	if (activate&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
+	  if (!mainw->files[new_file]->play_paused) 
 	    mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->pb_fps/
 	      mainw->files[new_file]->fps;
-          else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
+	  else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
 		 mainw->files[new_file]->fps;
-        }
-        else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate;
+	}
+	else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate;
 	mainw->jackd->usigned=!asigned;
 	mainw->jackd->seek_end=mainw->files[new_file]->afilesize;
 
@@ -5727,47 +6353,51 @@
 	  mainw->jackd->reverse_endian=TRUE;
 	else mainw->jackd->reverse_endian=FALSE;
 
-        if (mainw->ping_pong) mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
-        else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
+	if (mainw->ping_pong) mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
+	else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
 
 	// tell jack server to open audio file and start playing it
 
 	jack_message.command=ASERVER_CMD_FILE_OPEN;
 
-        jack_message.data=g_strdup_printf("%d",new_file);
+	jack_message.data=g_strdup_printf("%d",new_file);
 
 	jack_message2.command=ASERVER_CMD_FILE_SEEK;
 	jack_message.next=&jack_message2;
-        jack_message2.data=g_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
+	jack_message2.data=g_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
 	jack_message2.next=NULL;
 
-        mainw->jackd->msgq=&jack_message;
-        mainw->jackd->in_use=TRUE;
+	mainw->jackd->msgq=&jack_message;
+	mainw->jackd->in_use=TRUE;
 
-	if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-	  mainw->jackd->is_paused=mainw->files[new_file]->play_paused;
-	  mainw->jackd->is_silent=FALSE;
+	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+	  if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+	    mainw->jackd->is_paused=mainw->files[new_file]->play_paused;
+	    mainw->jackd->is_silent=FALSE;
+	  }
+	  
+	  mainw->rec_aclip=new_file;
+	  mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
+	  mainw->rec_aseek=(gdouble)mainw->files[new_file]->aseek_pos/
+	    (gdouble)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
 	}
-
-       mainw->rec_aclip=new_file;
-       mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
-       mainw->rec_aseek=(gdouble)mainw->files[new_file]->aseek_pos/
-	 (gdouble)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
-     }
-    else {
-      mainw->rec_aclip=mainw->current_file;
-      mainw->rec_avel=0.;
-      mainw->rec_aseek=0.;
-     }
+      }
+      else {
+	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+	  mainw->rec_aclip=mainw->current_file;
+	  mainw->rec_avel=0.;
+	  mainw->rec_aseek=0.;
+	}
+      }
     }
 #endif
   }
 
-  if (prefs->audio_player==AUD_PLAYER_PULSE&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)&&!mainw->is_rendering&&
-      !(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EXT_AUDIO))) {
+  // switch audio clip
+ if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-  if (mainw->pulsed!=NULL) {
-      gboolean timeout;
+    if (mainw->pulsed!=NULL) {
+      boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
 	sched_yield(); // wait for seek
@@ -5789,21 +6419,26 @@
 	lives_alarm_clear(alarm_handle);
       }
 
+      if (new_file<0||mainw->files[new_file]==NULL) {
+	mainw->pulsed->in_use=FALSE;
+	return;
+      }
+
       mainw->pulsed->in_use=TRUE;
       
       if (mainw->files[new_file]->achans>0) { 
-        gint asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
-        gint aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
-        mainw->pulsed->in_achans=mainw->files[new_file]->achans;
-        mainw->pulsed->in_asamps=mainw->files[new_file]->asampsize;
-        if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-          if (!mainw->files[new_file]->play_paused) 
+	gint asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
+	gint aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
+	mainw->pulsed->in_achans=mainw->files[new_file]->achans;
+	mainw->pulsed->in_asamps=mainw->files[new_file]->asampsize;
+	if (activate&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
+	  if (!mainw->files[new_file]->play_paused) 
 	    mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->pb_fps/
 	      mainw->files[new_file]->fps;
-          else mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
+	  else mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
 		 mainw->files[new_file]->fps;
-        }
-        else mainw->pulsed->in_arate=mainw->files[new_file]->arate;
+	}
+	else mainw->pulsed->in_arate=mainw->files[new_file]->arate;
 	mainw->pulsed->usigned=!asigned;
 	mainw->pulsed->seek_end=mainw->files[new_file]->afilesize;
 	if (mainw->files[new_file]->opening) mainw->pulsed->is_opening=TRUE;
@@ -5814,41 +6449,101 @@
 	  mainw->pulsed->reverse_endian=TRUE;
 	else mainw->pulsed->reverse_endian=FALSE;
 
-        if (mainw->ping_pong) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
-        else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
+	if (mainw->ping_pong) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
+	else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
 
 	// tell pulse server to open audio file and start playing it
 
 	pulse_message.command=ASERVER_CMD_FILE_OPEN;
 
 	if (mainw->files[new_file]->opening) {
-          mainw->pulsed->is_opening=TRUE;
-        }
-        pulse_message.data=g_strdup_printf("%d",new_file);
+	  mainw->pulsed->is_opening=TRUE;
+	}
+	pulse_message.data=g_strdup_printf("%d",new_file);
 
 	pulse_message2.command=ASERVER_CMD_FILE_SEEK;
 	pulse_message.next=&pulse_message2;
-        pulse_message2.data=g_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
+	pulse_message2.data=g_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
 	pulse_message2.next=NULL;
-        mainw->pulsed->msgq=&pulse_message;
-        mainw->pulsed->in_use=TRUE;
+	mainw->pulsed->msgq=&pulse_message;
+	mainw->pulsed->in_use=TRUE;
 
-	if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-	  mainw->pulsed->is_paused=mainw->files[new_file]->play_paused;
+	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+	  if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+	    mainw->pulsed->is_paused=mainw->files[new_file]->play_paused;
+	  }
+	    
+	  mainw->rec_aclip=new_file;
+	  mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
+	  mainw->rec_aseek=(gdouble)mainw->files[new_file]->aseek_pos/
+	    (gdouble)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
 	}
+      }
+      else {
+	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+	  mainw->rec_aclip=mainw->current_file;
+	  mainw->rec_avel=0.;
+	  mainw->rec_aseek=0.;
+	}
+      }
+    }
+#endif
+ }
+}
+
+
+
+void do_quick_switch (gint new_file) {
+  // handle clip switching during playback
+
+  gint ovsize=mainw->pheight;
+  gint ohsize=mainw->pwidth;
+  boolean osc_block;
+
+  if (mainw->current_file<1||mainw->files[new_file]==NULL) return;
 
-       mainw->rec_aclip=new_file;
-       mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
-       mainw->rec_aseek=(gdouble)mainw->files[new_file]->aseek_pos/
-	 (gdouble)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
+  if (mainw->noswitch||(mainw->record&&!mainw->record_paused&&!(prefs->rec_opts&REC_CLIPS))||
+      mainw->foreign||(mainw->preview&&!mainw->is_rendering&&mainw->multitrack==NULL)) return;
+
+  if (!mainw->sep_win&&mainw->multitrack==NULL) {
+    gtk_widget_show(mainw->playframe);
+  }
+
+  if (new_file==mainw->current_file) {
+    if (!((mainw->fs&&prefs->gui_monitor==prefs->play_monitor)||(mainw->faded&&mainw->double_size)||
+	  mainw->multitrack!=NULL)) {
+      switch_to_file (mainw->current_file=0, new_file);
+      if (mainw->play_window!=NULL&&!mainw->double_size&&!mainw->fs&&mainw->current_file!=-1&&cfile!=NULL&&
+	  (ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
+	// for single size sepwin, we resize frames to fit the window
+	mainw->must_resize=TRUE;
+	mainw->pheight=ovsize;
+	mainw->pwidth=ohsize;
       }
-    else {
-      mainw->rec_aclip=mainw->current_file;
-      mainw->rec_avel=0.;
-      mainw->rec_aseek=0.;
-     }
+      else if (mainw->multitrack==NULL) mainw->must_resize=FALSE;
     }
+    return;
+  }
+
+  // reset old info file
+  if (cfile!=NULL) {
+    gchar *tmp;
+#ifndef IS_MINGW
+      tmp=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+#else
+      tmp=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
 #endif
+    g_snprintf(cfile->info_file,PATH_MAX,"%s",tmp);
+    g_free(tmp);
+  }
+
+  osc_block=mainw->osc_block;
+  mainw->osc_block=TRUE;
+ 
+  // switch audio clip
+  if ((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE)&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)&&!mainw->is_rendering&&
+      (mainw->preview||!(mainw->agen_key!=0||prefs->audio_src==AUDIO_SRC_EXT))) {
+    switch_audio_clip(new_file,TRUE);
   }
 
   mainw->whentostop=NEVER_STOP;
@@ -5873,6 +6568,7 @@
   if (mainw->fs||(mainw->faded&&mainw->double_size)||mainw->multitrack!=NULL) {
     mainw->current_file=new_file;
     if (!mainw->sep_win) {
+      if (mainw->faded&&mainw->double_size) resize(2);
       if (cfile->menuentry!=NULL) {
 	gchar title[256];
 	get_menu_text(cfile->menuentry,title);
@@ -5890,7 +6586,7 @@
   mainw->play_end=cfile->frames;
 
   if (mainw->play_window!=NULL) {
-    gchar *title=g_strdup_printf(_("LiVES: - Play Window"));
+    gchar *title=g_strdup(_("LiVES: - Play Window"));
     gtk_window_set_title (GTK_WINDOW (mainw->play_window), title);
     g_free(title);
     if (mainw->double_size&&!mainw->fs&&(ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
@@ -5936,11 +6632,9 @@
 
 
 
-void
-resize (gdouble scale) {
+void resize (gdouble scale) {
   // resize the frame widgets
   // set scale<0. to _force_ the playback frame to expand (for external capture)
-#define HSPACE 320
   gdouble oscale=scale;
   gint xsize;
   gint bx,by;
@@ -5950,7 +6644,7 @@
   gint hsize,vsize;
   gint scr_width,scr_height;
 
-  if (!prefs->show_gui||mainw->multitrack!=NULL||!mainw->is_ready) return;
+  if (!prefs->show_gui||mainw->multitrack!=NULL) return;
   get_border_size (mainw->LiVES,&bx,&by);
 
   if (prefs->gui_monitor==0) {
@@ -5962,8 +6656,8 @@
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
 
-  hsize=(scr_width-(72+bx))/3;
-  vsize=(scr_height-(HSPACE+hspace+by));
+  hsize=(scr_width-(V_RESIZE_ADJUST*2+bx))/3;
+  vsize=(scr_height-(CE_FRAME_HSPACE+hspace+by));
 
   if (scale<0.) {
     // foreign capture
@@ -5990,6 +6684,11 @@
     }
   }
 
+  mainw->ce_frame_width=hsize;
+  mainw->ce_frame_height=vsize;
+
+  if (!mainw->is_ready) return;
+
   gtk_widget_set_size_request (mainw->playframe, (gint)hsize*scale+H_RESIZE_ADJUST, (gint)vsize*scale+V_RESIZE_ADJUST);
 
   if (oscale==2.) {
@@ -6003,6 +6702,8 @@
     gtk_widget_set_size_request (mainw->eventbox3, (gint)hsize/scale+H_RESIZE_ADJUST, vsize+V_RESIZE_ADJUST);
     gtk_widget_set_size_request (mainw->frame2, (gint)hsize/scale+H_RESIZE_ADJUST, vsize/scale+V_RESIZE_ADJUST);
     gtk_widget_set_size_request (mainw->eventbox4, (gint)hsize/scale+H_RESIZE_ADJUST, vsize+V_RESIZE_ADJUST);
+    mainw->ce_frame_width=(gint)hsize/scale+H_RESIZE_ADJUST;
+    mainw->ce_frame_height=vsize/scale+V_RESIZE_ADJUST;
   }
 
   else {
@@ -6012,6 +6713,8 @@
       gtk_widget_set_size_request (mainw->eventbox3, xsize/scale, vsize+V_RESIZE_ADJUST);
       gtk_widget_set_size_request (mainw->frame2, xsize/scale, vsize+V_RESIZE_ADJUST);
       gtk_widget_set_size_request (mainw->eventbox4, xsize/scale, vsize+V_RESIZE_ADJUST);
+      mainw->ce_frame_width=xsize/scale;
+      mainw->ce_frame_height=vsize+V_RESIZE_ADJUST;
     }
     else {
       // this is for foreign capture

LiVES-1.6.1.tar.bz2/src/main.h -> LiVES-2.0.3.tar.bz2/src/main.h Changed

@@ -1,6 +1,6 @@
 // main.h
 // LiVES
-// (c) G. Finch (salsaman@xs4all.nl,salsaman@gmail.com) 2003 - 2012
+// (c) G. Finch (salsaman@gmail.com) 2003 - 2013
 // see file ../COPYING for full licensing details
 
 /*  This program is free software; you can redistribute it and/or modify
@@ -52,23 +52,97 @@
 #define HAS_LIVES_MAIN_H
 
 #define GUI_GTK
+#define PAINTER_CAIRO
 
 #ifdef GUI_GTK
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#if GTK_CHECK_VERSION(3,0,0)
+#ifdef ENABLE_GIW
+#define ENABLE_GIW_3
+#endif
+#endif
+
+#endif
+
+#ifdef IS_MINGW
+
+#ifndef WINVER
+#define WINVER 0x0500
+#endif
+
+#include <windows.h>
+#include <winbase.h>
+#include <tlhelp32.h>
+#include <sddl.h>
+#include <sys/stat.h>
+
+#define O_SYNC (FILE_FLAG_NO_BUFFERING|FILE_FLAG_WRITE_THROUGH)
+
+typedef PROCESS_INFORMATION * lives_pid_t;
+typedef PROCESS_INFORMATION * lives_pgid_t;
+
+#ifdef GUI_GTK
+#ifndef GDK_WINDOWING_WIN32
+#define GDK_WINDOWING_WIN32
+#endif
+#endif
+
+#else // IS_MINGW
+
+#ifdef GUI_GTK
+#ifndef GDK_WINDOWING_X11
+#define GDK_WINDOWING_X11
+#endif
+#endif
+
+typedef pid_t lives_pid_t;
+typedef int lives_pgid_t;
+
+#endif
+
+
+
+#ifdef GUI_GTK
+
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+
+#ifndef GDK_IS_WIN32_DISPLAY 
+#define GDK_IS_WIN32_DISPLAY(display) (TRUE)
+#endif
+
+#endif //GDK_WINDOWING_WIN32
+
 #ifdef GDK_WINDOWING_X11
-#define USE_X11
 
 // needed for GDK_WINDOW_XID - for fileselector preview
 // needed for gdk_x11_screen_get_window_manager_name()
 
 #include <gdk/gdkx.h>
+
+#ifndef GDK_IS_X11_DISPLAY 
+#define GDK_IS_X11_DISPLAY(display) (TRUE)
 #endif
 
+#ifndef GDK_IS_WIN32_DISPLAY 
+#define GDK_IS_WIN32_DISPLAY(display) (FALSE)
+#endif
+
+
+#else
+
+#ifndef GDK_IS_X11_DISPLAY 
+#define GDK_IS_X11_DISPLAY(display) (FALSE)
+#endif
+
+#endif // GDK_WINDOWING_X11
+
 #endif // GUI_GTK
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -77,13 +151,12 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "widget-helper.h"
+#define  __STDC_CONSTANT_MACROS
+#include <stdint.h>
+
 
 #define QUOTEME(x) #x
 
-/// don't change this unless the backend is changed as well
-/// i.e. $GUI_BOOTSTRAP_FILE in smogrify
-#define BOOTSTRAP_NAME "/tmp/.smogrify"
 
 /// max files is actually 1 more than this, since file 0 is the clipboard
 #define MAX_FILES 65535
@@ -91,7 +164,12 @@
 /// this must match AC_PREFIX_DEFAULT in configure.in
 /// TODO - when lives-plugins is a separate package, use pkg-config to get PREFIX and remove PREFIX_DEFAULT
 #ifndef PREFIX_DEFAULT
+#ifndef IS_MINGW
 #define PREFIX_DEFAULT "/usr"
+#else
+// TODO - get this from the installer
+#define PREFIX_DEFAULT "C:\\Program Files\\LiVES"
+#endif
 #endif
 
 /// if --prefix= was not set, this is set to "NONE"
@@ -99,14 +177,33 @@
 #define PREFIX PREFIX_DEFAULT
 #endif
 
+
+
+#ifndef IS_MINGW
 #define DOC_DIR "/share/doc/lives-"
 
 #define THEME_DIR "/share/lives/themes/"
 #define PLUGIN_SCRIPTS_DIR "/share/lives/plugins/"
+#define PLUGIN_COMPOUND_DIR "/share/lives/plugins/"
 #define PLUGIN_EXEC_DIR "/lives/plugins/"
 #define ICON_DIR "/share/lives/icons/"
+#define DESKTOP_ICON_DIR "/share/app-install/icons/"
 #define DATA_DIR "/share/lives/"
 #define LIVES_CONFIG_DIR ".lives-dir/"
+#define LIVES_TMP_NAME "livestmp"
+
+#else // IS_MINGW
+#define DOC_DIR "\\Documents/"
+
+#define THEME_DIR "\\Themes/"
+#define PLUGIN_SCRIPTS_DIR "\\Plugins/"
+#define PLUGIN_COMPOUND_DIR "\\Plugins/"
+#define PLUGIN_EXEC_DIR "\\Plugins/"
+#define ICON_DIR "\\Icons/"
+#define DATA_DIR "\\Data/"
+#define LIVES_CONFIG_DIR "\\Config/"
+#define LIVES_TMP_NAME "livescache"
+#endif
 
 #define LIVES_DEVICE_DIR "/dev/"
 
@@ -138,6 +235,9 @@
 /// maximum fps we will allow (gdouble)
 #define FPS_MAX 200.
 
+#define MAX_FRAME_WIDTH 100000.
+#define MAX_FRAME_HEIGHT 100000.
+
 #define ENABLE_DVD_GRAB
 
 #define FP_BITS 16 /// max fp bits [apparently 16 is faster]
@@ -159,8 +259,12 @@
 #include <limits.h>
 
 #ifndef PATH_MAX
+#ifdef MAX_PATH
+#define PATH_MAX MAX_PATH
+#else
 #define PATH_MAX 4096
 #endif
+#endif
 
 #ifdef __GNUC__
 #  define WARN_UNUSED  __attribute__((warn_unused_result))
@@ -172,6 +276,8 @@
 #define LIVES_LOG "lives.log"
 #endif
 
+#include "widget-helper.h"
+
 typedef  void *(*fn_ptr) (void *ptr);
 
 
@@ -330,9 +436,9 @@
 
 
 typedef enum {
-  IMG_TYPE_UNKNOWN=(1<<0),
-  IMG_TYPE_JPEG=(1<<1),
-  IMG_TYPE_PNG=(1<<2)
+  IMG_TYPE_UNKNOWN=0,
+  IMG_TYPE_JPEG,
+  IMG_TYPE_PNG
 } lives_image_type_t;
 
 
@@ -346,16 +452,16 @@
 
 
 typedef struct {
-  gshort red;
-  gshort green;
-  gshort blue;
+  uint16_t red;
+  uint16_t green;
+  uint16_t blue;
 } lives_colRGB24_t;
 
 typedef struct {
-  gshort red;
-  gshort green;
-  gshort blue;
-  gshort alpha;
+  uint16_t red;
+  uint16_t green;
+  uint16_t blue;
+  uint16_t alpha;
 } lives_colRGBA32_t;
 
 
@@ -379,7 +485,7 @@
   guint signed_endian; ///< bitfield
 
   gint arate; ///< audio playback rate
-  gint64 unique_id;    ///< this and the handle can be used to uniquely id a file
+  guint64 unique_id;    ///< this and the handle can be used to uniquely id a file
   gint achans;
   gint asampsize;
 
@@ -406,8 +512,8 @@
   gchar handle[256];
   gint ohsize;
   gint ovsize;
-  glong f_size;
-  glong afilesize;
+  int64_t f_size;
+  int64_t afilesize;
   gint old_frames; ///< for deordering, etc.
   gchar file_name[PATH_MAX]; ///< input file
   gchar info_file[PATH_MAX];
@@ -420,28 +526,28 @@
   gint insert_end;
   gint progress_start;
   gint progress_end;
-  gboolean changed;
+  boolean changed;
   GtkWidget *menuentry;
-  gboolean orig_file_name;
-  gboolean was_renamed;
-  gboolean is_untitled;
+  boolean orig_file_name;
+  boolean was_renamed;
+  boolean is_untitled;
   gdouble pb_fps;
   gdouble freeze_fps;
-  gboolean play_paused;
+  boolean play_paused;
   
   //opening/restoring status
-  gboolean opening;
-  gboolean opening_audio;
-  gboolean opening_only_audio;
-  gboolean opening_loc;
-  gboolean restoring;
-  gboolean is_loaded;  ///< should we continue loading if we come back to this clip
+  boolean opening;
+  boolean opening_audio;
+  boolean opening_only_audio;
+  boolean opening_loc;
+  boolean restoring;
+  boolean is_loaded;  ///< should we continue loading if we come back to this clip
 
   /// don't show preview/pause buttons on processing
-  gboolean nopreview;
+  boolean nopreview;
 
   /// don't show the 'keep' button - e.g. for operations which resize frames
-  gboolean nokeep;
+  boolean nokeep;
 
   // various times; total time is calculated as the gint64est of video, laudio and raudio
   gdouble total_time;
@@ -477,8 +583,8 @@
   gint undo_end;
   gchar undo_text[32];
   gchar redo_text[32];
-  gboolean undoable;
-  gboolean redoable;
+  boolean undoable;
+  boolean redoable;
 
   // used for storing undo values
   gint undo1_int;
@@ -488,9 +594,9 @@
   guint undo1_uint;
   gdouble undo1_dbl;
   gdouble undo2_dbl;
-  gboolean undo1_boolean;
-  gboolean undo2_boolean;
-  gboolean undo3_boolean;
+  boolean undo1_boolean;
+  boolean undo2_boolean;
+  boolean undo3_boolean;
 
   gint undo_arate; ///< audio playback rate
   guint undo_signed_endian;
@@ -516,16 +622,16 @@
 
 #define IMG_BUFF_SIZE 4096 ///< chunk size for reading images
 
-  gboolean ratio_fps; ///< if the fps was set by a ratio
+  boolean ratio_fps; ///< if the fps was set by a ratio
 
-  glong aseek_pos; ///< audio seek posn. (bytes) for when we switch clips
+  int64_t aseek_pos; ///< audio seek posn. (bytes) for when we switch clips
 
   // decoder data
 
   gchar mime_type[256];
 
 
-  gboolean deinterlace; ///< auto deinterlace
+  boolean deinterlace; ///< auto deinterlace
 
   lives_image_type_t img_type;
 
@@ -540,11 +646,14 @@
   gchar *op_dir;
   guint64 op_ds_warn_level; ///< current disk space warning level for any output directory
 
-  gboolean no_proc_sys_errors; ///< skip system error dialogs in processing
-  gboolean no_proc_read_errors; ///< skip read error dialogs in processing
-  gboolean no_proc_write_errors; ///< skip write error dialogs in processing
+  boolean no_proc_sys_errors; ///< skip system error dialogs in processing
+  boolean no_proc_read_errors; ///< skip read error dialogs in processing
+  boolean no_proc_write_errors; ///< skip write error dialogs in processing
+
+  boolean keep_without_preview; ///< allow keep, even when nopreview is set - TODO use only nopreview and nokeep
 
-  gboolean keep_without_preview; ///< allow keep, even when nopreview is set - TODO use only nopreview and nokeep
+  lives_painter_surface_t *laudio_drawable;
+  lives_painter_surface_t *raudio_drawable;
 
   // TODO - change to lives_clip_t
 } file;
@@ -553,40 +662,46 @@
 
 typedef struct {
   // the following can be assumed TRUE, they are checked on startup
-  gboolean has_smogrify;
-  gboolean smog_version_correct;
-  gboolean can_read_from_config;
-  gboolean can_write_to_config;
-  gboolean can_write_to_tmp;
-  gboolean can_write_to_tempdir;
+  boolean has_smogrify;
+  boolean smog_version_correct;
+  boolean can_read_from_config;
+  boolean can_write_to_config;
+  boolean can_write_to_tmp;
+  boolean can_write_to_tempdir;
 
   // the following may need checking before use
-  gboolean has_xmms;
-  gboolean has_dvgrab;
-  gboolean has_sox;
-  gboolean has_autolives;
-  gboolean has_mplayer;
-  gboolean has_convert;
-  gboolean has_composite;
-  gboolean has_cdda2wav;
-  gboolean has_midistartstop;
-  gboolean has_jackd;
-  gboolean has_pulse_audio;
-  gboolean has_xwininfo;
-  gboolean has_gdb;
-  gboolean has_gconftool_2;
-  gboolean has_xdg_screensaver;
+  boolean has_dvgrab;
+  boolean has_sox_play;
+  boolean has_sox_sox;
+  boolean has_autolives;
+  boolean has_mplayer;
+  boolean has_convert;
+  boolean has_composite;
+  boolean has_identify;
+  boolean has_cdda2wav;
+  boolean has_midistartstop;
+  boolean has_jackd;
+  boolean has_pulse_audio;
+  boolean has_xwininfo;
+  boolean has_gdb;
+  boolean has_gconftool_2;
+  boolean has_xdg_screensaver;
 
   /// home directory - default location for config file - locale encoding
   gchar home_dir[PATH_MAX];
 
+  /// system tempdir (e.g /tmp for linux, C:\TEMP for win32)
+  gchar system_tmpdir[PATH_MAX];  ///< kept in locale encoding
+
+  gchar *rcfile;
+
   /// used for returning startup messages from the backend
   gchar startup_msg[256];
 
   // plugins
-  gboolean has_encoder_plugins;
+  boolean has_encoder_plugins;
 
-  gboolean has_python;
+  boolean has_python;
   guint64 python_version;
 
   gshort cpu_bits;
@@ -595,7 +710,7 @@
   gchar *myname_full;
   gchar *myname;
 
-  gboolean has_stderr;
+  boolean has_stderr;
 
   gint nmonitors;
 
@@ -646,7 +761,7 @@
 #endif // ifndef PRI64d
 
 
-// common defs for mainwindow
+// common defs for mainwindow (retain this order)
 #include "plugins.h"
 #include "colourspace.h"
 #include "paramspecial.h"
@@ -694,17 +809,6 @@
 } lives_clip_details_t;
 
 
-typedef enum {
-  LIVES_CURSOR_NORMAL=0,  ///< must be zero
-  LIVES_CURSOR_BLOCK,
-  LIVES_CURSOR_AUDIO_BLOCK,
-  LIVES_CURSOR_BUSY,
-  LIVES_CURSOR_FX_BLOCK
-} lives_cursor_t;
-
-
-
-
 // some useful functions
 
 // interface.c
@@ -715,25 +819,30 @@
 void resize_play_window (void);
 void kill_play_window (void);
 void make_preview_box (void);
+void play_window_set_title(void);
 void add_to_playframe (void);
-GtkWidget* create_cdtrack_dialog (gint type, gpointer user_data);
+GtkWidget* create_cdtrack_dialog (int type, gpointer user_data);
 GtkTextView *create_output_textview(void);
-gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, GtkFileChooserAction act, const char *title, GtkWidget *extra);
+gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, lives_file_chooser_action_t act, const char *title, GtkWidget *extra);
+void choose_file_with_preview (gchar *dir, const gchar *title, int preview_type);
 void add_suffix_check(GtkBox *box, const gchar *ext);
 
 
 // dialogs.c
-gboolean do_progress_dialog(gboolean visible, gboolean cancellable, const gchar *text);
-gboolean do_warning_dialog(const gchar *text);
-gboolean do_warning_dialog_with_check(const gchar *text, gint warn_mask_number);
-gboolean do_warning_dialog_with_check_transient(const gchar *text, gint warn_mask_number, GtkWindow *transient);
-gboolean do_yesno_dialog(const gchar *text) WARN_UNUSED;
+boolean do_progress_dialog(boolean visible, boolean cancellable, const gchar *text);
+boolean do_warning_dialog(const gchar *text);
+boolean do_warning_dialog_with_check(const gchar *text, int warn_mask_number);
+boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, GtkWindow *transient);
+boolean do_yesno_dialog(const gchar *text) WARN_UNUSED;
 int do_abort_cancel_retry_dialog(const gchar *text, GtkWindow *transient) WARN_UNUSED;
 void do_error_dialog(const gchar *text);
-void do_error_dialog_with_check(const gchar *text, gint warn_mask_number);
+void do_info_dialog(const gchar *text);
+void do_error_dialog_with_check(const gchar *text, int warn_mask_number);
 void do_blocking_error_dialog(const gchar *text);
-void do_error_dialog_with_check_transient(const gchar *text, gboolean is_blocking,gint warn_mask_number, 
+void do_blocking_info_dialog(const gchar *text);
+void do_error_dialog_with_check_transient(const gchar *text, boolean is_blocking, int warn_mask_number, 
 					  GtkWindow *transient);
+void do_info_dialog_with_transient(const gchar *text, boolean is_blocking, GtkWindow *transient);
 
 
 void do_system_failed_error(const char *com, int retval, const char *addinfo);
@@ -741,41 +850,41 @@
 void do_write_failed_error_s(const char *filename, const char *addinfo);
 int do_read_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, GtkWindow *transient) WARN_UNUSED;
 void do_read_failed_error_s(const char *filename, const char *addinfo);
-gboolean do_header_write_error(int clip);
+boolean do_header_write_error(int clip);
 int do_header_read_error_with_retry(int clip) WARN_UNUSED;
 int do_header_missing_detail_error(int clip, lives_clip_details_t detail) WARN_UNUSED;
 void do_chdir_failed_error(const char *dir);
 void handle_backend_errors(void);
-gboolean check_backend_return(file *sfile);
+boolean check_backend_return(file *sfile);
 
 /** warn about disk space */
 gchar *ds_critical_msg(const gchar *dir, guint64 dsval);
 gchar *ds_warning_msg(const gchar *dir, guint64 dsval, guint64 cwarn, guint64 nwarn);
-gboolean check_storage_space(file *sfile, gboolean is_processing);
+boolean check_storage_space(file *sfile, boolean is_processing);
 
 gchar *get_upd_msg(void);
 gchar *get_new_install_msg(void);
 
-gboolean ask_permission_dialog(int what);
-gboolean do_abort_check(void);
-void add_warn_check (GtkBox *box, gint warn_mask_number);
+boolean ask_permission_dialog(int what);
+boolean do_abort_check(void);
+void add_warn_check (GtkBox *box, int warn_mask_number);
 void do_memory_error_dialog (void);
 void too_many_files(void);
 void tempdir_warning (void);
 void do_audio_import_error(void);
 void do_mt_backup_space_error(lives_mt *, gint memreq_mb);
 
-gboolean do_clipboard_fps_warning(void);
+boolean do_clipboard_fps_warning(void);
 void perf_mem_warning(void);
 void do_dvgrab_error(void);
-gboolean do_comments_dialog (file *sfile, gchar *filename);
-gboolean do_auto_dialog(const gchar *text, gint type);
+boolean do_comments_dialog (file *sfile, gchar *filename);
+boolean do_auto_dialog(const gchar *text, int type);
 void do_encoder_acodec_error (void);
 void do_encoder_sox_error(void);
-gboolean rdet_suggest_values (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, gint arate, 
-			      gint asigned, gboolean swap_endian, gboolean anr, gboolean ignore_fps);
-gboolean do_encoder_restrict_dialog (gint width, gint height, gdouble fps, gint fps_num, gint fps_denom, 
-				     gint arate, gint asigned, gboolean swap_endian, gboolean anr, gboolean save_all);
+boolean rdet_suggest_values (int width, int height, double fps, int fps_num, int fps_denom, int arate, 
+			     int asigned, boolean swap_endian, boolean anr, boolean ignore_fps);
+boolean do_encoder_restrict_dialog (int width, int height, double fps, int fps_num, int fps_denom, 
+				    int arate, int asigned, boolean swap_endian, boolean anr, boolean save_all);
 void do_keys_window (void);
 void do_mt_keys_window (void);
 void do_messages_window (void);
@@ -787,26 +896,26 @@
 void do_layout_scrap_file_error(void);
 void do_layout_ascrap_file_error(void);
 void do_set_load_lmap_error(void);
-gboolean do_set_duplicate_warning (const gchar *new_set);
-gboolean do_set_rename_old_layouts_warning(const gchar *new_set);
-gboolean do_layout_alter_frames_warning(void);
-gboolean do_layout_alter_audio_warning(void);
-gboolean do_yuv4m_open_warning(void);
+boolean do_set_duplicate_warning (const gchar *new_set);
+boolean do_set_rename_old_layouts_warning(const gchar *new_set);
+boolean do_layout_alter_frames_warning(void);
+boolean do_layout_alter_audio_warning(void);
+boolean do_yuv4m_open_warning(void);
 void do_mt_undo_mem_error(void);
 void do_mt_undo_buf_error(void);
-void do_mt_set_mem_error(gboolean has_mt, gboolean trans);
-void do_mt_audchan_error(gint warn_mask);
+void do_mt_set_mem_error(boolean has_mt, boolean trans);
+void do_mt_audchan_error(int warn_mask);
 void do_mt_no_audchan_error(void);
-void do_mt_no_jack_error(gint warn_mask);
-gboolean do_mt_rect_prompt(void);
+void do_mt_no_jack_error(int warn_mask);
+boolean do_mt_rect_prompt(void);
 void do_audrate_error_dialog(void);
-gboolean do_event_list_warning(void);
+boolean do_event_list_warning(void);
 void do_nojack_rec_error(void);
 void do_vpp_palette_error (void);
 void do_vpp_fps_error (void);
 void do_decoder_palette_error (void);
 void do_rmem_max_error (gint size);
-gboolean do_original_lost_warning(const gchar *fname);
+boolean do_original_lost_warning(const gchar *fname);
 void do_no_decoder_error(const gchar *fname);
 void do_jack_noopen_warn(void);
 void do_jack_noopen_warn2(void);
@@ -814,16 +923,17 @@
 void do_jack_noopen_warn4(void);
 void do_file_perm_error(const gchar *file_name);
 void do_dir_perm_error(const gchar *dir_name);
+void do_dir_perm_access_error(const gchar *dir_name);
 void do_encoder_img_ftm_error(render_details *rdet);
 void do_after_crash_warning (void);
 void do_bad_layout_error(void);
 void do_card_in_use_error(void);
 void do_dev_busy_error(const gchar *devstr);
-gboolean do_existing_subs_warning(void);
+boolean do_existing_subs_warning(void);
 void do_invalid_subs_error(void);
-gboolean do_erase_subs_warning(void);
-gboolean do_sub_type_warning(const gchar *ext, const gchar *type_ext);
-gboolean do_move_tmpdir_dialog(void);
+boolean do_erase_subs_warning(void);
+boolean do_sub_type_warning(const gchar *ext, const gchar *type_ext);
+boolean do_move_tmpdir_dialog(void);
 void do_set_locked_warning (const gchar *setname);
 void do_no_in_vdevs_error(void);
 void do_locked_in_vdevs_error(void);
@@ -834,12 +944,11 @@
 void do_pulse_lost_conn_error(void);
 void do_jack_lost_conn_error(void);
 
-gboolean process_one (gboolean visible);
-void do_threaded_dialog(gchar *translated_text, gboolean has_cancel);
+boolean process_one (boolean visible);
+void do_threaded_dialog(gchar *translated_text, boolean has_cancel);
 void end_threaded_dialog(void);
 void threaded_dialog_spin (void);
 void response_ok (GtkButton *button, gpointer user_data);
-void response_cancel (GtkButton *button, gpointer user_data);
 void pump_io_chan(GIOChannel *iochan);
 
 void do_splash_progress(void);
@@ -855,69 +964,78 @@
 void do_text_window (const gchar *title, const gchar *text);
 
 // saveplay.c
-gboolean add_file_info(const gchar *check_handle, gboolean aud_only);
-gboolean save_file_comments (int fileno);
+boolean read_file_details(const gchar *file_name, boolean only_check_for_audio);
+boolean add_file_info(const gchar *check_handle, boolean aud_only);
+boolean save_file_comments (int fileno);
 void reget_afilesize (int fileno);
-void deduce_file(const gchar *filename, gdouble start_time, gint end);
+void deduce_file(const gchar *filename, double start_time, int end);
 void open_file (const gchar *filename);
-void open_file_sel(const gchar *file_name,gdouble start_time, gint frames);
+void open_file_sel(const gchar *file_name, double start_time, int frames);
 void open_fw_device (void);
-gboolean get_new_handle(gint index, const gchar *name);
-gboolean get_temp_handle(gint index, gboolean create);
-gboolean get_handle_from_info_file(gint index);
+boolean get_new_handle(int index, const gchar *name);
+boolean get_temp_handle(int index, boolean create);
+boolean get_handle_from_info_file(int index);
 void create_cfile(void);
 void save_file (int clip, int start, int end, const char *filename);
 void play_file (void);
 void save_frame (GtkMenuItem *menuitem, gpointer user_data);
-gboolean save_frame_inner(gint clip, gint frame, const gchar *file_name, gint width, gint height, gboolean auto_overwrite);
+boolean save_frame_inner(int clip, int frame, const gchar *file_name, int width, int height, boolean from_osc);
 void wait_for_stop (const gchar *stop_command);
-gboolean save_clip_values(gint which_file);
+boolean save_clip_values(int which_file);
 void add_to_recovery_file (const gchar *handle);
 void rewrite_recovery_file(void);
-gboolean check_for_recovery_files (gboolean auto_recover);
-void recover_layout_map(gint numclips);
+boolean check_for_recovery_files (boolean auto_recover);
+void recover_layout_map(int numclips);
 const gchar *get_deinterlace_string(void);
 
 // saveplay.c backup
 void backup_file(int clip, int start, int end, const gchar *filename);
 gint save_event_frames(void);
-gboolean write_headers (file *file);
+boolean write_headers (file *file);
 
 // saveplay.c restore
 void restore_file(const gchar *filename);
-gboolean read_headers(const gchar *file_name);
+boolean read_headers(const gchar *file_name);
 
 // saveplay.c sets
 void open_set_file (const gchar *set_name, gint clipnum);
 
 
 // saveplay.c scrap file
-gboolean open_scrap_file (void);
-gboolean open_ascrap_file (void);
-gint save_to_scrap_file (weed_plant_t *layer);
-gboolean load_from_scrap_file(weed_plant_t *layer, int frame);
+boolean open_scrap_file (void);
+boolean open_ascrap_file (void);
+int save_to_scrap_file (weed_plant_t *layer);
+boolean load_from_scrap_file(weed_plant_t *layer, int frame);
 void close_ascrap_file (void);
 void close_scrap_file (void);
 
 
 // main.c
+typedef void (*SignalHandlerPointer)(int);
+
+void set_signal_handlers(SignalHandlerPointer sigfunc);
 void catch_sigint(int signum);
-gboolean startup_message_fatal(const gchar *msg);
-gboolean startup_message_nonfatal(const gchar *msg);
-gboolean startup_message_nonfatal_dismissable(const gchar *msg, gint warning_mask);
+void defer_sigint(int signum);
+boolean startup_message_fatal(const gchar *msg);
+boolean startup_message_nonfatal(const gchar *msg);
+boolean startup_message_info(const gchar *msg);
+boolean startup_message_nonfatal_dismissable(const gchar *msg, gint warning_mask);
 capability *get_capabilities(void);
 void get_monitors(void);
+void set_ce_frame_from_pixbuf(GtkImage *image, GdkPixbuf *pixbuf, lives_painter_t *);
 void load_start_image(gint frame);
 void load_end_image(gint frame);
-void load_preview_image(gboolean update_always);
+void load_preview_image(boolean update_always);
 
-gboolean pull_frame(weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc);
-gboolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, 
+boolean pull_frame(weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc);
+boolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, 
 			     int width, int height, int target_palette);
 LiVESPixbuf *pull_lives_pixbuf_at_size(int clip, int frame, const char *image_ext, weed_timecode_t tc, 
 				       int width, int height, LiVESInterpType interp);
+LiVESPixbuf *pull_lives_pixbuf(int clip, int frame, const char *image_ext, weed_timecode_t tc);
+
 GError * lives_pixbuf_save(GdkPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, 
-			   int quality, gboolean do_chmod, GError **gerrorptr);
+			   int quality, boolean do_chmod, GError **gerrorptr);
 
 void load_frame_image(gint frame);
 void sensitize(void);
@@ -927,15 +1045,14 @@
 void get_next_free_file(void);
 void switch_to_file(gint old_file, gint new_file);
 void do_quick_switch (gint new_file);
+void switch_audio_clip(gint new_file, boolean activate);
 void resize (gdouble scale);
-gboolean read_file_details(const gchar *file_name, gboolean only_check_for_audio);
 void do_start_messages(void);
 void set_palette_colours (void);
 void set_main_title(const gchar *filename, gint or_untitled_number);
 void set_record (void);
 
 //gui.c
-//gui.c
 void  create_LiVES (void);
 void enable_record (void);
 void toggle_record (void);
@@ -948,117 +1065,115 @@
 void frame_size_update(void);
 void splash_init(void);
 void splash_end(void);
-void splash_msg(const gchar *msg, gdouble pct);
+void splash_msg(const gchar *msg, double pct);
 void add_message_scroller(GtkWidget *conter);
-
-// utils.c
-#ifdef IS_IRIX
-void setenv(const char *name, const char *val, int _xx);
+void resize_widgets_for_monitor(boolean get_play_times);
+#if GTK_CHECK_VERSION(3,0,0)
+void calibrate_sepwin_size(void);
+boolean expose_pim (GtkWidget *widget, lives_painter_t *cr, gpointer user_data);
+boolean expose_sim (GtkWidget *widget, lives_painter_t *cr, gpointer user_data);
+boolean expose_eim (GtkWidget *widget, lives_painter_t *cr, gpointer user_data);
 #endif
-
 // system calls in utils.c
-int lives_system(const char *com, gboolean allow_error);
-pid_t lives_fork(const char *com);
-ssize_t lives_write(int fd, const void *buf, size_t count, gboolean allow_fail);
-ssize_t lives_write_le(int fd, const void *buf, size_t count, gboolean allow_fail);
-ssize_t lives_read(int fd, void *buf, size_t count, gboolean allow_less);
-ssize_t lives_read_le(int fd, void *buf, size_t count, gboolean allow_less);
-int lives_chdir(const char *path, gboolean allow_fail);
+int lives_system(const char *com, boolean allow_error);
+lives_pid_t lives_fork(const char *com);
+ssize_t lives_write(int fd, const void *buf, size_t count, boolean allow_fail);
+ssize_t lives_write_le(int fd, const void *buf, size_t count, boolean allow_fail);
+ssize_t lives_read(int fd, void *buf, size_t count, boolean allow_less);
+ssize_t lives_read_le(int fd, void *buf, size_t count, boolean allow_less);
+int lives_chdir(const char *path, boolean allow_fail);
 int lives_fputs(const char *s, FILE *stream);
 char *lives_fgets(char *s, int size, FILE *stream);
+pid_t lives_getpid(void);
+int lives_getgid(void);
+int lives_getuid(void);
+void lives_freep(void **ptr);
+void lives_free(gpointer ptr);
+void lives_free_with_check(gpointer ptr);
+#ifdef IS_MINGW
+boolean lives_win32_suspend_resume_process(DWORD pid, boolean suspend);
+boolean lives_win32_kill_subprocesses(DWORD pid, boolean kill_parent);
+int lives_win32_get_num_logical_cpus(void);
+#endif
+int lives_kill(lives_pid_t pid, int sig);
+int lives_killpg(lives_pgid_t pgrp, int sig);
+void lives_srandom(unsigned int seed);
+uint64_t lives_random(void);
+ssize_t lives_readlink(const char *path, char *buf, size_t bufsiz);
+boolean lives_setenv(const char *name, const char *value);
+boolean lives_fsync(int fd);
+void lives_sync(void);
 
 char *filename_from_fd(char *val, int fd);
 
-
 float LEFloat_to_BEFloat(float f);
 uint64_t lives_10pow(int pow);
 int get_approx_ln(guint val);
-void lives_freep(void **ptr);
-void lives_free(gpointer ptr);
-void lives_free_with_check(gpointer ptr);
-int lives_kill(pid_t pid, int sig);
-int lives_killpg(int pgrp, int sig);
+
 int64_t lives_get_current_ticks(void);
-gboolean lives_alarm_get(int alarm_handle);
+boolean lives_alarm_get(int alarm_handle);
 int lives_alarm_set(int64_t ticks);
 void lives_alarm_clear(int alarm_handle);
 lives_storage_status_t get_storage_status(const char *dir, guint64 warn_level, guint64 *dsval);
 gchar *lives_format_storage_space_string(guint64 space);
 
 
-gint myround(gdouble n);
+int myround(double n);
 void get_dirname(gchar *filename);
 gchar *get_dir(const gchar *filename);
 void get_basename(gchar *filename);
-void get_filename(gchar *filename, gboolean strip_dir);
+void get_filename(gchar *filename, boolean strip_dir);
 gchar *get_extension(const gchar *filename);
-guint64 get_version_hash(const gchar *exe, const gchar *sep, int piece);
+uint64_t get_version_hash(const gchar *exe, const gchar *sep, int piece);
+uint64_t make_version_hash(const char *ver);
 void d_print(const gchar *text);
 void init_clipboard(void);
-gboolean cache_file_contents(const gchar *filename);
+boolean cache_file_contents(const gchar *filename);
 gchar *get_val_from_cached_list(const gchar *key, size_t maxlen);
-void get_pref(const gchar *key, gchar *val, gint maxlen);
-void get_pref_utf8(const gchar *key, gchar *val, gint maxlen);
-void get_pref_default(const gchar *key, gchar *val, gint maxlen);
-gboolean get_boolean_pref(const gchar *key);
-gdouble get_double_pref(const gchar *key);
-gint get_int_pref(const gchar *key);
-GList *get_list_pref(const gchar *key);
-void get_location(const gchar *exe, gchar *val, gint maxlen);
-void set_pref (const gchar *key, const gchar *value);
-void delete_pref (const gchar *key);
-void set_boolean_pref(const gchar *key, gboolean value);
-void set_double_pref(const gchar *key, gdouble value);
-void set_int_pref(const gchar *key, gint value);
-void set_int64_pref(const gchar *key, gint64 value);
-void set_list_pref(const char *key, GList *values);
-gboolean apply_prefs(gboolean skip_warnings);
-void save_future_prefs(void);
-void set_menu_text(GtkWidget *menu, const gchar *text, gboolean use_mnemonic);
+
+void get_location(const gchar *exe, gchar *val, int maxlen);
+
+void set_menu_text(GtkWidget *menu, const gchar *text, boolean use_mnemonic);
 void get_menu_text(GtkWidget *menu, gchar *text);
 void get_menu_text_long(GtkWidget *menuitem, gchar *text);
-gint get_box_child_index (GtkBox *box, GtkWidget *tchild);
 void reset_clip_menu (void);
 void get_play_times(void);
 void get_total_time (file *file);
-guint get_signed_endian (gboolean is_signed, gboolean little_endian);
+guint get_signed_endian (boolean is_signed, boolean little_endian);
 void fullscreen_internal(void);
-void unhide_cursor(GdkWindow *window);
-void hide_cursor(GdkWindow *window);
-void set_alwaysontop(GtkWidget *window, gboolean ontop); ///< TODO - use for playwin
 void colour_equal(GdkColor *c1, const GdkColor *c2);
 void switch_to_int_player(void);
 void switch_to_mplayer(void);
-void switch_aud_to_sox(gboolean set_pref);
-gboolean switch_aud_to_jack(void);
-gboolean switch_aud_to_pulse(void);
-void switch_aud_to_mplayer(gboolean set_pref);
-void prepare_to_play_foreign(void);
-gboolean after_foreign_play(void);
-gboolean check_file(const gchar *file_name, gboolean check_exists);  ///< check if file exists
-gboolean check_dir_access (const gchar *dir);
-gulong get_file_size(int fd);
-gulong sget_file_size(const gchar *name);
-gulong get_fs_free(const char *dir);
-gboolean is_writeable_dir(const char *dir);
-gboolean ensure_isdir(gchar *fname);
+void switch_aud_to_sox(boolean set_pref);
+boolean switch_aud_to_jack(void);
+boolean switch_aud_to_pulse(void);
+void switch_aud_to_mplayer(boolean set_pref);
+boolean prepare_to_play_foreign(void);
+boolean after_foreign_play(void);
+boolean check_file(const gchar *file_name, boolean check_exists);  ///< check if file exists
+boolean check_dir_access (const gchar *dir);
+uint64_t get_file_size(int fd);
+uint64_t sget_file_size(const gchar *name);
+uint64_t get_fs_free(const char *dir);
+boolean is_writeable_dir(const char *dir);
+boolean ensure_isdir(gchar *fname);
 gchar *ensure_extension(const gchar *fname, const gchar *ext) WARN_UNUSED;
-gboolean check_dev_busy(gchar *devstr);
+boolean check_dev_busy(gchar *devstr);
 void activate_url_inner(const gchar *link);
 void activate_url (GtkAboutDialog *about, const gchar *link, gpointer data);
 void show_manual_section (const gchar *lang, const gchar *section);
 
-gdouble calc_time_from_frame (gint clip, gint frame);
-gint calc_frame_from_time (gint filenum, gdouble time);  ///< nearest frame start
-gint calc_frame_from_time2 (gint filenum, gdouble time); ///< nearest frame end
-gint calc_frame_from_time3 (gint filenum, gdouble time); ///< nearest frame mid
+double calc_time_from_frame (int clip, int frame);
+gint calc_frame_from_time (int filenum, double time);  ///< nearest frame start
+gint calc_frame_from_time2 (int filenum, double time); ///< nearest frame end
+gint calc_frame_from_time3 (int filenum, double time); ///< nearest frame mid
 
-gboolean check_for_ratio_fps (gdouble fps);
-gdouble get_ratio_fps(const gchar *string);
+boolean check_for_ratio_fps (double fps);
+double get_ratio_fps(const gchar *string);
 void calc_maxspect(gint rwidth, gint rheight, gint *cwidth, gint *cheight);
 
 gchar *remove_trailing_zeroes(gdouble val);
-void toggle_button_toggle (GtkToggleButton *tbutton);
+
 void remove_layout_files(GList *lmap);
 gboolean add_lmap_error(lives_lmap_error_t lerror, const gchar *name, gpointer user_data, 
 			gint clipno, gint frameno, gdouble atime, gboolean affects_current);
@@ -1071,13 +1186,12 @@
 void save_clip_value(int which, lives_clip_details_t, void *val);
 gboolean check_frame_count(gint idx);
 void get_frame_count(gint idx);
+void get_frames_sizes(int fileno, int frame_to_test);
 gint count_resampled_frames (gint in_frames, gdouble orig_fps, gdouble resampled_fps);
-gboolean int_array_contains_value(int *array, int num_elems, int value);
+boolean int_array_contains_value(int *array, int num_elems, int value);
 gboolean check_for_lock_file(const gchar *set_name, gint type);
 void g_list_free_strings(GList *list);
-void gtk_tooltips_copy(GtkWidget *dest, GtkWidget *source);
-void adjustment_configure(GtkAdjustment *adjustment, gdouble value, gdouble lower, gdouble upper, 
-			  gdouble step_increment, gdouble page_increment, gdouble page_size);
+
 gboolean create_event_space(gint length_in_eventsb);
 void add_to_recent(const gchar *filename, gdouble start, gint frames, const gchar *file_open_params);
 gint verhash (gchar *version);
@@ -1087,17 +1201,16 @@
 void draw_little_bars (gdouble ptrtime);
 void set_sel_label (GtkWidget *label);
 void clear_mainw_msg (void);
-gint get_token_count (const gchar *string, int delim);
-GdkPixmap* gdk_pixmap_copy (GdkPixmap *pixmap);
+int get_token_count (const gchar *string, int delim);
 LiVESPixbuf *lives_pixbuf_new_blank(int width, int height, int palette);
-void get_border_size (GtkWidget *win, gint *bx, gint *by);
 gchar *g_strappend (gchar *string, gint len, const gchar *newbit);
 GList *g_list_append_unique(GList *xlist, const gchar *add);
 void find_when_to_stop (void);
-gint calc_new_playback_position(gint fileno, gint64 otc, gint64 *ntc);
+int calc_new_playback_position(int fileno, uint64_t otc, uint64_t *ntc);
 void calc_aframeno(gint fileno);
 void minimise_aspect_delta (gdouble allowed_aspect,gint hblock,gint vblock,gint hsize,gint vsize,gint *width,gint *height);
 LiVESInterpType get_interp_value(gshort quality);
+
 GList *g_list_move_to_first(GList *list, GList *item) WARN_UNUSED;
 GList *g_list_delete_string(GList *, char *string) WARN_UNUSED;
 GList *g_list_copy_strings(GList *list);
@@ -1105,7 +1218,6 @@
 
 
 GList *get_set_list(const gchar *dir);
-void combo_set_popdown_strings (GtkCombo *combo, GList *list);
 
 gchar *subst (const gchar *string, const gchar *from, const gchar *to);
 gchar *insert_newlines(const gchar *text, int maxwidth);
@@ -1113,25 +1225,18 @@
 gint hextodec (const gchar *string);
 gint get_hex_digit (const gchar *c);
 
+const char *get_image_ext_for_type(lives_image_type_t imgtype);
+
 guint32 fastrand(void);
 void fastsrand(guint32 seed);
 
 gint lives_list_index (GList *list, const gchar *data);
 
-void set_fg_colour(gint red, gint green, gint blue);
-gboolean label_act_toggle (GtkWidget *, GdkEventButton *, GtkToggleButton *);
-gboolean widget_act_toggle (GtkWidget *, GtkToggleButton *);
-
-void lives_set_cursor_style(lives_cursor_t cstyle, GdkWindow *window);
-
-
-gchar *text_view_get_text(GtkTextView *textview);
-void text_view_set_text(GtkTextView *textview, const gchar *text);
-
+lives_cancel_t check_for_bad_ffmpeg(void);
 
 // plugins.c
 GList *get_external_window_hints(lives_rfx_t *rfx);
-gboolean check_encoder_restrictions (gboolean get_extension, gboolean user_audio, gboolean save_all);
+gboolean check_encoder_restrictions (boolean get_extension, boolean user_audio, boolean save_all);
 
 //callbacks.c
 void lives_exit (void);
@@ -1142,12 +1247,31 @@
 void on_cancel_keep_button_clicked (GtkButton *, gpointer user_data);
 void on_cleardisk_activate (GtkWidget *, gpointer user_data);
 void on_cleardisk_advanced_clicked (GtkWidget *, gpointer user_data);
+void popup_lmap_errors(GtkMenuItem *, gpointer);
+void on_filesel_button_clicked (GtkButton *button, gpointer user_data);
 
-// paramspecial.c
-gboolean mt_framedraw(lives_mt *, GdkPixbuf *);
 
-// paramwindow.c
-void add_fill_to_box (GtkBox *);
+//preferences.c
+void get_pref(const gchar *key, gchar *val, int maxlen);
+void get_pref_utf8(const gchar *key, gchar *val, int maxlen);
+void get_pref_default(const gchar *key, gchar *val, int maxlen);
+boolean get_boolean_pref(const gchar *key);
+double get_double_pref(const gchar *key);
+int get_int_pref(const gchar *key);
+GList *get_list_pref(const gchar *key);
+void set_pref (const gchar *key, const gchar *value);
+void delete_pref (const gchar *key);
+void set_boolean_pref(const gchar *key, boolean value);
+void set_double_pref(const gchar *key, double value);
+void set_int_pref(const gchar *key, int value);
+void set_int64_pref(const gchar *key, int64_t value);
+void set_list_pref(const char *key, GList *values);
+boolean apply_prefs(boolean skip_warnings);
+void save_future_prefs(void);
+
+
+// paramspecial.c
+LiVESPixbuf *mt_framedraw(lives_mt *, LiVESPixbuf *);
 
 // rte_window.c
 void refresh_rte_window (void);
@@ -1157,6 +1281,7 @@
 void *lives_memcpy(void *dest, const void *src, size_t n);
 void *lives_memset(void *s, int c, size_t n);
 void lives_free(void *ptr); ///< calls mainw->free_fn
+void *lives_calloc(size_t nmemb, size_t size);
 
 /// values of mainw->free_fn
 void lives_free_normal(void *ptr);
@@ -1199,18 +1324,15 @@
 #define L2U8(String) ( g_locale_to_utf8 (String,-1,NULL,NULL,NULL) ) 
 
 
-#define PREFS_TIMEOUT 10000000 ///< 10 seconds // TODO !
+#define PREFS_TIMEOUT 10000000 ///< 10 seconds
 
 #define LIVES_TV_CHANNEL1 "http://www.serverwillprovide.com/sorteal/livestvclips/livestv.ogm"
 
 
 // round (double) a up to next (integer) multiple of (double) b
-// haha
 #define CEIL(a,b) ((int)(((double)a+(double)b-.000000001)/((double)b))*b)
 
 
-// should sprinkle some of these around
-
 gchar *dummychar;
 
 #define LIVES_NO_DEBUG
@@ -1248,7 +1370,7 @@
 
 #ifndef LIVES_FATAL
 #ifndef LIVES_NO_FATAL
-#define LIVES_FATAL(x)      fprintf(stderr, "LiVES fatal: %s\n", x)
+#define LIVES_FATAL(x)      {fprintf(stderr, "LiVES fatal: %s\n", x); raise (LIVES_SIGSEGV);}
 #else // LIVES_NO_FATAL
 #define LIVES_FATAL(x)      dummychar = x
 #endif // LIVES_NO_FATAL

LiVES-1.6.1.tar.bz2/src/mainwindow.h -> LiVES-2.0.3.tar.bz2/src/mainwindow.h Changed

@@ -1,6 +1,6 @@
 // mainwindow.h
 // LiVES (lives-exe)
-// (c) G. Finch <salsaman@xs4all.nl,salsaman@gmail.com> 2003 - 2012
+// (c) G. Finch <salsaman@gmail.com> 2003 - 2013
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -8,8 +8,11 @@
 #ifndef HAS_LIVES_MAINWINDOW_H
 #define HAS_LIVES_MAINWINDOW_H
 
+
 #include <pthread.h>
 
+#include "effects-data.h"
+
 #ifdef ALSA_MIDI
 #include <alsa/asoundlib.h>
 #endif
@@ -27,21 +30,62 @@
 #define U_SECL (gint64)100000000
 #define U_SEC_RATIO (U_SECL/1000000) ///< how many U_SECs (ticks) in a microsecond [default 100]
 
+
+
+/////// GUI related constants /////////////////////////////////////////////////////////
+
 // parameters for resizing the image frames, and for capture
-// TODO - make prefs
 #define V_RESIZE_ADJUST 36
-#define H_RESIZE_ADJUST 22
+#define H_RESIZE_ADJUST 24
+
+#define CE_FRAME_HSPACE ((int)(320.*widget_opts.scale))
+
+#define MIN_SEPWIN_WIDTH 600
+#define MIN_SEPWIN_HEIGHT 36
 
-// sepwin/screen size safety margins in pixels
-#define DSIZE_SAFETY_H 100
-#define DSIZE_SAFETY_V 100
+/// sepwin/screen size safety margins in pixels
+#define SCR_HEIGHT_SAFETY ((int)(100.*widget_opts.scale))
+#define SCR_WIDTH_SAFETY ((int)(100.*widget_opts.scale))
 
 /// default size for generators
 #define DEF_GEN_WIDTH 640
 #define DEF_GEN_HEIGHT 480
 
-// height of preview widgets in sepwin
-#define PREVIEW_BOX_HT 100
+/// height of preview widgets in sepwin
+#define PREVIEW_BOX_HT ((int)(100.*widget_opts.scale))
+
+/// height of msg area
+#define MSG_AREA_HEIGHT ((int)(50.*widget_opts.scale))
+
+/// clip editor hrule height
+#define CE_HRULE_HEIGHT ((int)(20.*widget_opts.scale))
+
+/// clip edit vid/aud bar height
+#define CE_VIDBAR_HEIGHT ((int)(10.*widget_opts.scale))
+
+// a few GUI specific settings
+#define DEFAULT_FRAME_HSIZE 320
+#define DEFAULT_FRAME_VSIZE 200
+
+#define MAIN_SPIN_SPACER ((int)52.*widget_opts.scale) ///< pixel spacing for start/end spins for clip and multitrack editors
+
+/// blank label to show so our message dialogs are not too small
+#define PROCW_STRETCHER "                                                                                                                            "
+
+#define ENC_DETAILS_WIN_H ((int)(600.*widget_opts.scale)) ///< horizontal size in pixels of the encoder output window
+#define ENC_DETAILS_WIN_V ((int)(200.*widget_opts.scale)) ///< vertical size in pixels of the encoder output window
+
+#define MAX_MSG_WIDTH_CHARS ((int)(100.*widget_opts.scale)) ///< max width of text on warning/error labels
+
+/// size of the fx dialog windows scrollwindow
+#define RFX_WINSIZE_H ((int)(mainw->scr_width>1024?(820.*widget_opts.scale):600))
+#define RFX_WINSIZE_V ((int)(480.*widget_opts.scale))
+
+#define RFX_TEXT_SCROLL_HEIGHT ((int)(80.*widget_opts.scale)) ///< height of textview scrolled window
+
+#define DEF_BUTTON_WIDTH ((int)(80.*widget_opts.scale))
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// number of function keys
 #define FN_KEYS 12
@@ -61,6 +105,7 @@
 
 #define MAX_FX_THREADS 65536
 
+#define LIVES_DCLICK_TIME 400 ///< double click time (milliseconds)
 
 /// max ext_cntl + 1
 #define MAX_EXT_CNTL 2
@@ -97,8 +142,15 @@
   LIVES_DIALOG_ABORT_CANCEL_RETRY
 } lives_dialog_t;
 
+typedef enum {
+  LIVES_INFO_TYPE_INFO,
+  LIVES_INFO_TYPE_WARNING,
+  LIVES_INFO_TYPE_QUESTION,
+  LIVES_INFO_TYPE_ERROR
+} lives_info_t;
+
 
-// return values from abort/cancel/retry dialog and yes/no dialog
+/// return values from abort/cancel/retry dialog and yes/no dialog
 enum {
   LIVES_NO=0,
   LIVES_YES,
@@ -109,7 +161,7 @@
 };
 
 
-// various return conditions from rendering (multitrack or after recording)
+/// various return conditions from rendering (multitrack or after recording)
 typedef enum {
   LIVES_RENDER_ERROR_NONE=0,
   LIVES_RENDER_READY,
@@ -125,7 +177,7 @@
 } lives_render_error_t;
 
 
-// disk/storage status values
+/// disk/storage status values
 typedef enum {
   LIVES_STORAGE_STATUS_UNKNOWN=0,
   LIVES_STORAGE_STATUS_NORMAL,
@@ -147,42 +199,55 @@
 #define STYLE_5 1<<4 ///< drop down menu text col. in mt
 #define STYLE_6 1<<4 ///< separator col. in mt
 
-  GdkColor white;
-  GdkColor black;
-  GdkColor light_blue;
-  GdkColor light_yellow;
-  GdkColor pink;
-  GdkColor light_red;
-  GdkColor dark_red;
-  GdkColor light_green;
-  GdkColor grey20;
-  GdkColor grey25;
-  GdkColor grey45;
-  GdkColor grey60;
-  GdkColor dark_orange;
-  GdkColor fade_colour;
-  GdkColor normal_back;
-  GdkColor normal_fore;
-
-  GdkColor menu_and_bars;
-  GdkColor banner_fade_text;
-  GdkColor info_text;
-  GdkColor info_base;
-
-  GdkColor bm_opaque;
-  GdkColor bm_trans;
+  LiVESWidgetColor white;
+  LiVESWidgetColor black;
+  LiVESWidgetColor light_blue;
+  LiVESWidgetColor light_yellow;
+  LiVESWidgetColor pink;
+  LiVESWidgetColor light_red;
+  LiVESWidgetColor dark_red;
+  LiVESWidgetColor light_green;
+  LiVESWidgetColor grey20;
+  LiVESWidgetColor grey25;
+  LiVESWidgetColor grey45;
+  LiVESWidgetColor grey60;
+  LiVESWidgetColor dark_orange;
+  LiVESWidgetColor fade_colour;
+  LiVESWidgetColor normal_back;
+  LiVESWidgetColor normal_fore;
+
+  LiVESWidgetColor menu_and_bars;
+  LiVESWidgetColor banner_fade_text;
+  LiVESWidgetColor info_text;
+  LiVESWidgetColor info_base;
 
 } _palette;
 
-
+/// screen details
 typedef struct {
-  gint x;
-  gint y;
-  gint width;
-  gint height;
-  GdkScreen *screen;
+  int x;
+  int y;
+  int width;
+  int height;
+  LiVESXDevice *mouse_device; ///< unused for gtk+ < 3.0.0
+  LiVESXDisplay *disp;
+  LiVESXScreen *screen;
 } lives_mgeometry_t;
 
+/// constant strings
+enum {
+  LIVES_STRING_CONSTANT_ANY=0,
+  LIVES_STRING_CONSTANT_NONE,
+  LIVES_STRING_CONSTANT_RECOMMENDED,
+  LIVES_STRING_CONSTANT_DISABLED,
+  LIVES_STRING_CONSTANT_CL,
+  LIVES_STRING_CONSTANT_BUILTIN,
+  LIVES_STRING_CONSTANT_CUSTOM,
+  LIVES_STRING_CONSTANT_TEST,
+  NUM_LIVES_STRING_CONSTANTS
+};
+
+
 
 /// where do we add the builtin tools in the tools menu
 #define RFX_TOOL_MENU_POSN 2
@@ -197,11 +262,11 @@
   file *files[MAX_FILES+1]; ///< +1 for the clipboard
   gchar vid_load_dir[PATH_MAX];
   gchar vid_save_dir[PATH_MAX];
+  gchar vid_dl_dir[PATH_MAX];
   gchar audio_dir[PATH_MAX];
   gchar image_dir[PATH_MAX];
   gchar proj_load_dir[PATH_MAX];
   gchar proj_save_dir[PATH_MAX];
-  gchar xmms_dir[PATH_MAX];
   gint untitled_number;
   gint cap_number;
   gint clips_available;
@@ -213,20 +278,20 @@
   gchar set_name[256];   // actually 128 is the limit now
 
   // playback
-  gboolean faded;
-  gboolean double_size;
-  gboolean sep_win;
-  gboolean fs;
-  gboolean loop;
-  gboolean loop_cont;
-  gboolean ping_pong;
-  gboolean mute;
-  gboolean must_resize; ///< fixed playback size in gui; playback plugins have their own fwidth and fheight
+  boolean faded;
+  boolean double_size;
+  boolean sep_win;
+  boolean fs;
+  boolean loop;
+  boolean loop_cont;
+  boolean ping_pong;
+  boolean mute;
+  boolean must_resize; ///< fixed playback size in gui; playback plugins have their own fwidth and fheight
   gint audio_start;
   gint audio_end;
 
-  gboolean ext_playback; ///< using external video playback plugin
-  volatile gboolean ext_keyboard; ///< keyboard codes must be polled from video playback plugin
+  boolean ext_playback; ///< using external video playback plugin
+  volatile boolean ext_keyboard; ///< keyboard codes must be polled from video playback plugin
 
   gint ptr_x;
   gint ptr_y;
@@ -235,27 +300,29 @@
 
 
   // flags
-  gboolean save_with_sound;
-  gboolean ccpd_with_sound;
-  gboolean selwidth_locked;
-  gboolean is_ready;
-  gboolean opening_loc;  ///< opening location (streaming)
-  gboolean dvgrab_preview;
-  gboolean switch_during_pb;
-  gboolean clip_switched; ///< for recording - did we switch clips ?
-  gboolean record;
-
-  gboolean in_fs_preview;
+  boolean save_with_sound;
+  boolean ccpd_with_sound;
+  boolean selwidth_locked;
+  boolean is_ready;
+  boolean fatal; ///< got fatal signal
+  boolean opening_loc;  ///< opening location (streaming)
+  boolean dvgrab_preview;
+  boolean switch_during_pb;
+  boolean clip_switched; ///< for recording - did we switch clips ?
+  boolean record;
+
+  boolean in_fs_preview;
   volatile lives_cancel_t cancelled;
 
-  gboolean error;
+  boolean error;
 
   lives_cancel_type_t cancel_type;
 
   weed_plant_t *event_list; ///< current event_list, for recording
   weed_plant_t *stored_event_list; ///< stored mt -> clip editor
-  gboolean stored_event_list_changed;
-  gboolean stored_layout_save_all_vals;
+  boolean stored_event_list_changed;
+  boolean stored_event_list_auto_changed;
+  boolean stored_layout_save_all_vals;
   gchar stored_layout_name[PATH_MAX];
 
   GList *stored_layout_undos;
@@ -270,26 +337,32 @@
 
   lives_whentostop_t whentostop;
 
-  gboolean noframedrop;
+  boolean noframedrop;
 
   gint play_start;
   gint play_end;
-  gboolean playing_sel;
-  gboolean preview;
+  boolean playing_sel;
+  boolean preview;
 
-  gboolean is_processing;
-  gboolean is_rendering;
-  gboolean resizing;
+  boolean is_processing;
+  boolean is_rendering;
+  boolean resizing;
 
-  gboolean foreign;  ///< for external window capture
-  gboolean record_foreign;
-  gboolean t_hidden;
+  boolean foreign;  ///< for external window capture
+  boolean record_foreign;
+  boolean t_hidden;
 
   // recording from an external window
   guint foreign_key;
-  unsigned int foreign_id;
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+  Window foreign_id;
+#else
+  GdkNativeWindow foreign_id;
   GdkColormap *foreign_cmap;
   GdkPixmap *foreign_map;
+#endif
   GdkWindow *foreign_window;
   gint foreign_width;
   gint foreign_height;
@@ -297,7 +370,7 @@
   gchar *foreign_visual;
 
   /// some VJ effects
-  gboolean nervous;
+  boolean nervous;
 
   lives_rfx_t *rendered_fx;
   gint num_rendered_effects_builtin;
@@ -307,9 +380,9 @@
   // for the merge dialog
   gint last_transition_idx;
   gint last_transition_loops;
-  gboolean last_transition_loop_to_fit;
-  gboolean last_transition_align_start;
-  gboolean last_transition_ins_frames;
+  boolean last_transition_loop_to_fit;
+  boolean last_transition_align_start;
+  boolean last_transition_ins_frames;
 
 
   guint64 rte; ///< current max for VJ mode == 64 effects on fg clip
@@ -329,19 +402,20 @@
   /// which number file we are playing (or -1)
   gint playing_file;
 
-  gint pre_src_file; ///< file we were editing before any ext input started
+  gint pre_src_file; ///< video file we were playing before any ext input started
+  gint pre_src_audio_file; ///< audio file we were playing before any ext input started
 
-  gint scr_width;
-  gint scr_height;
+  int scr_width;
+  int scr_height;
   lives_toy_t toy_type;
-  pid_t toy_alives_pid; // 0, or thread for autolives toy
-  gboolean autolives_reset_fx;
+  lives_pid_t toy_alives_pid; // 0, or thread for autolives toy
+  boolean autolives_reset_fx;
 
-  gboolean toy_go_wild;
+  boolean toy_go_wild;
 
   // copy/paste
-  gboolean insert_after;
-  gboolean with_sound;
+  boolean insert_after;
+  boolean with_sound;
 
   // selection
   gint sel_start;
@@ -358,7 +432,7 @@
 #define PREFS_THEME_CHANGED (1<<0)
 #define PREFS_JACK_CHANGED (1<<1)
 #define PREFS_TEMPDIR_CHANGED (1<<2)
-  gboolean prefs_need_restart;
+  boolean prefs_need_restart;
 
   /// default sizes for when no file is loaded
   gint def_width;
@@ -372,15 +446,15 @@
 
   // end of static-ish info
   gchar first_info_file[PATH_MAX];
-  gboolean leave_files;
-  gboolean was_set;
+  boolean leave_files;
+  boolean was_set;
 
   /// extra parameters for opening special files
   gchar *file_open_params;
-  gboolean open_deint;
+  boolean open_deint;
 
   gint last_dprint_file;
-  gboolean no_switch_dprint;
+  boolean no_switch_dprint;
 
   /// actual frame being displayed
   gint actual_frame;
@@ -403,21 +477,21 @@
   gint64 stream_ticks;  ///< ticks since first frame sent to playback plugin
   gint64 last_display_ticks; /// currticks when last display was shown (used for fixed fps)
 
-  gboolean size_warn; ///< warn the user that incorrectly sized frames were found
+  boolean size_warn; ///< warn the user that incorrectly sized frames were found
 
   /// set to TRUE during frame load/display operation. If TRUE we should not switch clips, 
   /// close the current clip, or call load_frame_image()
-  gboolean noswitch; 
+  boolean noswitch; 
   gint new_clip;
 
   gint aud_file_to_kill; ///< # of audio file to kill on crash
 
-  gboolean reverse_pb; ///< used in osc.c
+  boolean reverse_pb; ///< used in osc.c
 
   /// TODO - make this a mutex and more finely grained : things we need to block are (clip switches, clip closure, effects on/off, etc)
-  gboolean osc_block;
+  boolean osc_block;
 
-  gboolean osc_auto; ///< bypass user choices automatically
+  boolean osc_auto; ///< bypass user choices automatically
 
   /// encode width, height and fps set externally
   gint osc_enc_width;
@@ -431,7 +505,7 @@
   gdouble fixed_fpsd; ///< <=0. means free playback
 
   /// video playback plugin was updated; write settings to a file
-  gboolean write_vpp_file;
+  boolean write_vpp_file;
 
   volatile gshort scratch;
 #define SCRATCH_NONE 0
@@ -440,10 +514,10 @@
 #define SCRATCH_JUMP 2
 
   /// internal fx
-  gboolean internal_messaging;
-  lives_render_error_t (*progress_fn) (gboolean reset);
+  boolean internal_messaging;
+  lives_render_error_t (*progress_fn) (boolean reset);
 
-  volatile gboolean threaded_dialog;
+  volatile boolean threaded_dialog;
 
   // fx controls
   gdouble fx1_val;
@@ -468,15 +542,15 @@
   gint fx3_end;
   gint fx4_end;
 
-  gboolean fx1_bool;
-  gboolean fx2_bool;
-  gboolean fx3_bool;
-  gboolean fx4_bool;
-  gboolean fx5_bool;
-  gboolean fx6_bool;
+  boolean fx1_bool;
+  boolean fx2_bool;
+  boolean fx3_bool;
+  boolean fx4_bool;
+  boolean fx5_bool;
+  boolean fx6_bool;
 
-  gboolean effects_paused;
-  gboolean did_rfx_preview;
+  boolean effects_paused;
+  boolean did_rfx_preview;
 
   //function pointers
   guint kb_timer;
@@ -500,22 +574,19 @@
   gulong sepwin_cb_func;
 
   // for jack transport
-  gboolean jack_can_stop;
-  gboolean jack_can_start;
+  boolean jack_can_stop;
+  boolean jack_can_start;
 
-  volatile gboolean video_seek_ready;
+  volatile boolean video_seek_ready;
 
   // selection pointers
   gulong mouse_fn1;
-  gboolean mouse_blocked;
-  gboolean hrule_blocked;
+  boolean mouse_blocked;
+  boolean hrule_blocked;
 
   /// stored clips
   gint clipstore[FN_KEYS-1];
 
-  /// GdkGC (graphics context)
-  GdkGC *gc;
-
   /// key function for autorepeat ctrl-arrows
   guint ksnoop;
 
@@ -525,6 +596,8 @@
 
   GtkWidget *frame1;
   GtkWidget *frame2;
+  GtkWidget *freventbox0;
+  GtkWidget *freventbox1;
   GtkWidget *playframe;
   GtkWidget *pl_eventbox;
   GdkPixbuf *imframe;
@@ -631,9 +704,6 @@
   GtkWidget *resample_audio;
   GtkWidget *resample_video;
   GtkWidget *preferences;
-  GtkWidget *xmms_play_audio;
-  GtkWidget *xmms_random_audio;
-  GtkWidget *xmms_stop_audio;
   GtkWidget *rename;
   GtkWidget *toys;
   GtkWidget *toy_none;
@@ -659,6 +729,12 @@
   GtkWidget *vj_reset;
   GtkWidget *mt_menu;
   GtkWidget *troubleshoot;
+  GtkWidget *export_custom_rfx;
+  GtkWidget *delete_custom_rfx;
+  GtkWidget *edit_test_rfx;
+  GtkWidget *rename_test_rfx;
+  GtkWidget *delete_test_rfx;
+  GtkWidget *promote_test_rfx;
 
   /// for the fileselection preview
   GtkWidget *fs_playarea;
@@ -671,39 +747,34 @@
   GtkWidget *framedraw_preview; ///< the 'redraw' button
   GtkWidget *framedraw_spinbutton; ///< the frame number button
   GtkWidget *framedraw_scale; ///< the slider
-  GtkWidget *framedraw_image; ///< the image
   GtkWidget *fd_frame; ///< surrounding frame widget
 
-  GdkPixmap *framedraw_orig_pixmap; ///< the original frame pixmap
-  GdkPixmap *framedraw_copy_pixmap; ///< the altered frame pixmap
-  GdkBitmap *framedraw_bitmap; ///< and its mask
-  GdkGC *framedraw_bitmapgc;  ///< the GC for the bitmap
-  GdkGC *framedraw_colourgc;  ///< the GC for the pixmap, we can draw in colours !
+  weed_plant_t *fd_layer_orig; ///< original layer uneffected
+  weed_plant_t *fd_layer; ///< framedraw preview layer
 
   // bars here -> actually text above bars
   GtkWidget *vidbar;
   GtkWidget *laudbar;
   GtkWidget *raudbar;
 
-#define MAIN_SPIN_SPACER 52 ///< pixel spacing for start/end spins for clip and multitrack editors
   GtkWidget *spinbutton_end;
   GtkWidget *spinbutton_start;
 
   GtkWidget *arrow1;
   GtkWidget *arrow2;
 
-  GdkCursor *cursor;
+  lives_cursor_t cursor_style;
 
-  weed_plant_t *filter_map;
-  void ***pchains;
+  weed_plant_t *filter_map; // the video filter map for rendering
+  weed_plant_t *afilter_map; // the audio filter map for renering
+  weed_plant_t *audio_event; // event for audio render tracking
+  void ***pchains; // parameter value chains for interpolation
 
   // for the internal player
   GtkWidget *image274;
   GtkWidget *play_window;
   weed_plant_t *frame_layer;
   GtkWidget *plug;
-  gulong pw_exp_func;
-  gboolean pw_exp_is_blocked;
 
   // frame preview in the separate window
   GtkWidget *preview_box;
@@ -775,6 +846,7 @@
   gint opwy;
 
   // sepwin buttons
+  GtkWidget *preview_controls;
   GtkWidget *p_playbutton;
   GtkWidget *p_playselbutton;
   GtkWidget *p_rewindbutton;
@@ -784,11 +856,14 @@
 
   // timer bars
   GtkWidget *video_draw;
-  GdkPixmap *video_drawable;
   GtkWidget *laudio_draw;
-  GdkPixmap *laudio_drawable;
   GtkWidget *raudio_draw;
-  GdkPixmap *raudio_drawable;
+
+  lives_painter_surface_t *video_drawable;
+  lives_painter_surface_t *laudio_drawable;
+  lives_painter_surface_t *raudio_drawable;
+  lives_painter_surface_t *blank_laudio_drawable;
+  lives_painter_surface_t *blank_raudio_drawable;
 
   // framecounter
   GtkWidget *framebar;
@@ -827,8 +902,10 @@
 
   GtkWidget *resize_menuitem;
 
-  gboolean only_close; ///< only close clips - do not exit
-  gboolean is_exiting; ///< set during shutdown (inverse of only_close then)
+  boolean only_close; ///< only close clips - do not exit
+  volatile boolean is_exiting; ///< set during shutdown (inverse of only_close then)
+
+  gulong pw_scroll_func;
 
 #ifdef ENABLE_JACK
   jack_driver_t *jackd; ///< jack audio playback device
@@ -861,11 +938,11 @@
   GList *xlays;
 
   gchar *recovery_file;  ///< the filename of our recover file
-  gboolean leave_recovery;
+  boolean leave_recovery;
 
-  gboolean unordered_blocks; ///< are we recording unordered blocks ?
+  boolean unordered_blocks; ///< are we recording unordered blocks ?
 
-  gboolean no_exit; ///< if TRUE, do not exit after saving set
+  boolean no_exit; ///< if TRUE, do not exit after saving set
 
   mt_opts multi_opts; ///< some multitrack options that survive between mt calls
 
@@ -881,6 +958,10 @@
   pthread_mutex_t interp_mutex;  ///< interpolation mutex - parameter interpolation must be single threaded
 
   pthread_mutex_t abuf_mutex;  ///< used to synch audio buffer request count - shared between audio and video threads
+  pthread_mutex_t afilter_mutex;  ///< used to prevent video/gui thread deiniting an audio filter while it may be active
+  pthread_mutex_t data_mutex;  ///< used to prevent data being connected while it is possibly being updated
+
+  volatile lives_rfx_t *vrfx_update;
 
   lives_fx_candidate_t fx_candidates[MAX_FX_CANDIDATE_TYPES]; ///< effects which can have candidates from which a delegate is selected (current examples are: audio_volume, resize)
 
@@ -891,7 +972,7 @@
 
   int aud_rec_fd; ///< fd of file we are recording audio to
   gdouble rec_end_time;
-  long rec_samples;
+  int64_t rec_samples;
   gdouble rec_fps;
   gint rec_vid_frames;
   gint rec_arate;
@@ -899,7 +980,9 @@
   gint rec_asamps;
   gint rec_signed_endian;
 
-  gboolean suppress_dprint; ///< tidy up, e.g. by blocking "switched to file..." and "closed file..." messages
+  boolean suppress_dprint; ///< tidy up, e.g. by blocking "switched to file..." and "closed file..." messages
+
+  gchar *string_constants[NUM_LIVES_STRING_CONSTANTS];
   gchar *any_string;  ///< localised text saying "Any", for encoder and output format
   gchar *none_string;  ///< localised text saying "None", for playback plugin name, etc.
   gchar *recommended_string;  ///< localised text saying "recommended", for encoder and output format
@@ -908,30 +991,26 @@
 
   gint opening_frames; ///< count of frames so far opened, updated after preview (currently)
 
-  gboolean show_procd; ///< override showing of "processing..." dialog
-
-  gboolean block_param_updates; ///< block visual param changes from updating real values
-  gboolean no_interp; ///< block interpolation (for single frame previews)
+  boolean show_procd; ///< override showing of "processing..." dialog
 
-  gdouble fd_scale; ///< framedraw scale (image scaling downsize factor)
+  boolean block_param_updates; ///< block visual param changes from updating real values
+  boolean no_interp; ///< block interpolation (for single frame previews)
 
   weed_timecode_t cevent_tc; ///< timecode of currently processing event
 
-  gboolean opening_multi; ///< flag to indicate multiple file selection
+  boolean opening_multi; ///< flag to indicate multiple file selection
 
-  gboolean record_paused; ///< pause during recording
+  boolean record_paused; ///< pause during recording
 
-  gboolean record_starting; ///< start recording at next frame
+  boolean record_starting; ///< start recording at next frame
 
   gint img_concat_clip;  ///< when opening multiple, image files can get concatenated here (prefs->concat_images)
 
-  GdkGC *general_gc;  ///< used for colour drawing
-
   /// rendered generators
-  gboolean gen_to_clipboard;
-  gboolean is_generating;
+  boolean gen_to_clipboard;
+  boolean is_generating;
 
-  gboolean keep_pre;
+  boolean keep_pre;
 
   GtkWidget *textwidget_focus;
 
@@ -942,7 +1021,7 @@
 
 
   /// external control inputs
-  gboolean ext_cntl[MAX_EXT_CNTL];
+  boolean ext_cntl[MAX_EXT_CNTL];
 
   #ifdef ALSA_MIDI
   snd_seq_t *seq_handle;
@@ -958,28 +1037,24 @@
   GtkWidget *splash_label;
   GtkWidget *splash_progress;
 
-  gboolean recoverable_layout;
+  boolean recoverable_layout;
 
-  gboolean soft_debug; ///< for testing
+  boolean soft_debug; ///< for testing
 
   /// encoder text output
   GIOChannel *iochan;
   GtkTextView *optextview;
 
-  /// error signalling during decoder plugin "rip_audio"
-  pthread_t sig_pid;
-  gchar *sig_file;
-
-  gboolean has_custom_tools;
-  gboolean has_custom_gens;
-  gboolean has_custom_utilities;
+  boolean has_custom_tools;
+  boolean has_custom_gens;
+  boolean has_custom_utilities;
 
   /// decoders
-  gboolean decoders_loaded;
+  boolean decoders_loaded;
   GList *decoder_list;
 
-  gboolean go_away;
-  gboolean debug; ///< debug crashes and asserts
+  boolean go_away;
+  boolean debug; ///< debug crashes and asserts
 
   gchar *subt_save_file; ///< name of file to save subtitles to
 
@@ -994,7 +1069,7 @@
 
   int log_fd;
 
-  gboolean jack_trans_poll;
+  boolean jack_trans_poll;
 
 #define LIVES_MAX_ALARMS 1024
 #define LIVES_NO_ALARM_TICKS -1
@@ -1002,19 +1077,33 @@
   int64_t alarms[LIVES_MAX_ALARMS];
   int next_free_alarm;
 
-  gboolean aplayer_broken;
+  // stuff specific to audio gens (will be extended to all rt audio fx)
+  volatile int agen_key; ///< which fx key is generating audio [1 based] (or 0 for none)
+  volatile boolean agen_needs_reinit;
+  gint64 agen_samps_count; ///< count of samples since init
+
+  boolean aplayer_broken;
+
+  boolean com_failed;
+  boolean write_failed;
+  boolean read_failed;
+  boolean chdir_failed;
 
-  gboolean com_failed;
-  gboolean write_failed;
-  gboolean read_failed;
-  gboolean chdir_failed;
+  boolean add_clear_ds_button;
+  boolean add_clear_ds_adv;
+  boolean tried_ds_recover;
+
+  boolean has_session_tmpdir;
+  boolean startup_error;
+
+#if GTK_CHECK_VERSION(3,0,0)
+  boolean kb_timer_end;
+#endif
 
-  gboolean add_clear_ds_button;
-  gboolean add_clear_ds_adv;
-  gboolean tried_ds_recover;
+  boolean draw_blocked; // block drawing of timeline bars : prevents an infinite loop
 
-  gboolean has_session_tmpdir;
-  gboolean startup_error;
+  int ce_frame_height;
+  int ce_frame_width;
 
   gchar *read_failed_file;
   gchar *write_failed_file;
@@ -1026,9 +1115,21 @@
 
   float sepwin_scale;
 
-} mainwindow;
+  lives_pconnect_t *pconx; ///< list of out -> in param connections
+  lives_cconnect_t *cconx; ///< list of out -> in alpha channel connections
+
+  int overflow_height;
+
+  int rowstride_alignment;
+  int rowstride_alignment_hint;
 
-GdkCursor *hidden_cursor;
+  int sepwin_minwidth;
+  int sepwin_minheight;
+
+  guint signal_caught;
+  boolean signals_deferred;
+
+} mainwindow;
 
 extern _palette *palette;
 
@@ -1040,11 +1141,10 @@
   GtkWidget *drop_frame_button;
   GtkWidget *param_vbox;
   GtkWidget *spinbutton_loops;
-  GtkWidget *trans_entry;
 
-  gboolean loop_to_fit;
-  gboolean align_start;
-  gboolean ins_frames;
+  boolean loop_to_fit;
+  boolean align_start;
+  boolean ins_frames;
   int *list_to_rfx_index;
   GList *trans_list;
 
@@ -1058,6 +1158,11 @@
 
 
 #define LIVES_SIGKILL SIGKILL
+#define LIVES_SIGINT  SIGINT
+#define LIVES_SIGPIPE SIGPIPE
+#define LIVES_SIGUSR1 SIGUSR1
+#define LIVES_SIGABRT SIGABRT
+#define LIVES_SIGSEGV SIGSEGV
 #define LIVES_SIGHUP  SIGHUP
 #define LIVES_SIGTERM SIGTERM
 #define LIVES_SIGQUIT SIGQUIT

LiVES-1.6.1.tar.bz2/src/merge.c -> LiVES-2.0.3.tar.bz2/src/merge.c Changed

@@ -1,14 +1,9 @@
 // merge.c
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2012 (salsaman@gmail.com)
+// (c) G. Finch 2003 - 2013 (salsaman@gmail.com)
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -26,29 +21,35 @@
 _merge_opts* merge_opts;
 
 void create_merge_dialog (void) {
+  lives_rfx_t *rfx;
+
   GtkWidget *dialog_vbox;
   GtkWidget *vbox;
-  GSList *radiobutton_align_group = NULL;
-  GSList *radiobutton_insdrop_group = NULL;
   GtkWidget *align_start_button;
   GtkWidget *align_end_button;
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *fit_button;
-  GtkWidget *hseparator;
   GtkWidget *transition_combo;
-  GObject *spinbutton_adj;
   GtkWidget *dialog_action_area;
   GtkWidget *cancelbutton;
   GtkWidget *okbutton;
 
-  int i,idx=0;
-  lives_rfx_t *rfx;
+  GSList *radiobutton_align_group = NULL;
+  GSList *radiobutton_insdrop_group = NULL;
+
+  GList *retvals;
+
+  GtkAccelGroup *accel_group;
 
-  gint cb_frames=clipboard->frames;
   gchar *txt;
 
-  gint defstart=0;
+  int idx=0;
+
+  int cb_frames=clipboard->frames;
+  int defstart=0;
+
+  register int i;
 
   merge_opts=(_merge_opts*)(g_malloc(sizeof(_merge_opts)));
   merge_opts->list_to_rfx_index=(int *)g_malloc (sizint*(mainw->num_rendered_effects_builtin+
@@ -56,6 +57,8 @@
 							 mainw->num_rendered_effects_test));
   merge_opts->trans_list=NULL;
 
+  merge_opts->spinbutton_loops=NULL;
+
   for (i=0;i<mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test;i++) {
     if ((rfx=&mainw->rendered_fx[i])->num_in_channels==2) {
       if (i==mainw->last_transition_idx) defstart=idx;
@@ -79,34 +82,22 @@
     return;
   }
 
+  merge_opts->merge_dialog = lives_standard_dialog_new (_("LiVES: - Merge"),FALSE);
 
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (merge_opts->merge_dialog), accel_group);
 
-  merge_opts->merge_dialog = gtk_dialog_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (merge_opts->merge_dialog), 10);
-  gtk_window_set_title (GTK_WINDOW (merge_opts->merge_dialog), _("LiVES: - Merge"));
-  gtk_window_set_position (GTK_WINDOW (merge_opts->merge_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (merge_opts->merge_dialog), TRUE);
-  gtk_window_set_default_size (GTK_WINDOW(merge_opts->merge_dialog), 720, -1);
-  gtk_dialog_set_has_separator(GTK_DIALOG(merge_opts->merge_dialog),FALSE);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg (merge_opts->merge_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  if (!prefs->show_gui) {
+  if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(merge_opts->merge_dialog),GTK_WINDOW(mainw->LiVES));
   }
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(merge_opts->merge_dialog));
-  gtk_widget_show (dialog_vbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_widget_show (vbox);
+  vbox = lives_vbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 19);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
   txt=g_strdup_printf(_ ("Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"),clipboard->frames,cfile->end-cfile->start+1);
   if (prefs->ins_resample&&clipboard->fps!=cfile->fps) {
@@ -117,262 +108,189 @@
     }
   }
 
-  label = gtk_label_new (txt);
+  label = lives_standard_label_new (txt);
   g_free(txt);
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  label = gtk_label_new ("");
-  gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-  align_start_button = gtk_radio_button_new (NULL);
+  add_fill_to_box(LIVES_BOX(hbox));
 
-  gtk_widget_show (align_start_button);
-  gtk_box_pack_start (GTK_BOX (hbox),align_start_button, TRUE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (align_start_button), radiobutton_align_group);
-  radiobutton_align_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (align_start_button));
+  align_start_button = lives_standard_radio_button_new (_("Align _Starts"),TRUE,radiobutton_align_group,LIVES_BOX(hbox),NULL);
+  radiobutton_align_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (align_start_button));
 
-  label = gtk_label_new_with_mnemonic ( _("Align _Starts"));
-  gtk_widget_show (label);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),align_start_button);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  add_fill_to_box(LIVES_BOX(hbox));
 
-  label = gtk_label_new ("");
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-
-  align_end_button = gtk_radio_button_new (radiobutton_align_group);
-  gtk_widget_show (align_end_button);
-  gtk_box_pack_start (GTK_BOX (hbox), align_end_button, TRUE, FALSE, 0);
-  radiobutton_align_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (align_end_button));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (align_end_button, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(align_end_button),!mainw->last_transition_align_start);
-  
+  align_end_button = lives_standard_radio_button_new (_("Align _Ends"),TRUE,radiobutton_align_group,LIVES_BOX(hbox),NULL);
 
-  label = gtk_label_new_with_mnemonic ( _("Align _Ends"));
-  gtk_widget_show (label);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),align_end_button);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 22);
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (1, 1, (gint)((cfile->end-cfile->start+1)/cb_frames), 1, 10, 0);
-  merge_opts->spinbutton_loops = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  merge_opts->ins_frame_button = gtk_radio_button_new (NULL);
-  merge_opts->drop_frame_button = gtk_radio_button_new (NULL);
-  fit_button = gtk_check_button_new ();
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(align_end_button),!mainw->last_transition_align_start);
 
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops),mainw->last_transition_loops);
 
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fit_button),mainw->last_transition_loop_to_fit);
 
-  gtk_widget_set_sensitive(merge_opts->spinbutton_loops,!mainw->last_transition_loop_to_fit);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height*2);
 
   if ((cfile->end-cfile->start+1)<cb_frames) {
     // hide loop controls if selection is smaller than clipboard
-    label = gtk_label_new (_("What to do with extra clipboard frames -"));
-    gtk_widget_show (label);
+    label = lives_standard_label_new (_("What to do with extra clipboard frames -"));
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    gtk_widget_show (merge_opts->ins_frame_button);
-    gtk_box_pack_start (GTK_BOX (hbox), merge_opts->ins_frame_button, TRUE, FALSE, 0);
-    label = gtk_label_new_with_mnemonic (_("_Insert Frames"));
-    gtk_widget_show (label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),merge_opts->ins_frame_button);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    merge_opts->ins_frame_button=lives_standard_radio_button_new(_("_Insert Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL);
+    radiobutton_insdrop_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (merge_opts->ins_frame_button));
 
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (merge_opts->ins_frame_button), radiobutton_insdrop_group);
-    radiobutton_insdrop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (merge_opts->ins_frame_button));
+    merge_opts->ins_frame_function=g_signal_connect (GTK_OBJECT (merge_opts->ins_frame_button),
+						     "toggled",G_CALLBACK (on_ins_frames_toggled),NULL);
 
-    gtk_widget_show (merge_opts->drop_frame_button);
-    gtk_box_pack_start (GTK_BOX (hbox), merge_opts->drop_frame_button, TRUE, FALSE, 0);
+    merge_opts->drop_frame_button=lives_standard_radio_button_new(_("_Drop Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL);
 
-    label = gtk_label_new_with_mnemonic (_("_Drop Frames"));
-    gtk_widget_show (label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),merge_opts->drop_frame_button);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (merge_opts->drop_frame_button), radiobutton_insdrop_group);
-    radiobutton_insdrop_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (merge_opts->drop_frame_button));
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(merge_opts->drop_frame_button),!mainw->last_transition_ins_frames);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(merge_opts->drop_frame_button),!mainw->last_transition_ins_frames);
   }
   else if ((cfile->end-cfile->start+1)>cb_frames) {
+    merge_opts->spinbutton_loops = lives_standard_spin_button_new 
+      (_("Number of Times to Loop Clipboard"),FALSE,1.,1.,
+       (int)((cfile->end-cfile->start+1)/cb_frames), 1., 10., 0, LIVES_BOX(hbox), NULL);
     
-    label = gtk_label_new_with_mnemonic (_("Number of Times to Loop Clipboard"));
-    gtk_widget_show (label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),merge_opts->spinbutton_loops);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_widget_show (merge_opts->spinbutton_loops);
-    gtk_box_pack_start (GTK_BOX (hbox), merge_opts->spinbutton_loops, TRUE, FALSE, 0);
-
-    gtk_widget_show (fit_button);
-    gtk_box_pack_start (GTK_BOX (hbox), fit_button, FALSE, FALSE, 0);
-    label = gtk_label_new_with_mnemonic (_ ("_Loop Clipboard to Fit Selection"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),fit_button);
-    gtk_widget_show (label);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-  }
-  else {
-    gtk_widget_hide(hbox);
-  }
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (vbox), hseparator, FALSE, TRUE, 0);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops),mainw->last_transition_loops);
+    gtk_widget_set_sensitive(merge_opts->spinbutton_loops,!mainw->last_transition_loop_to_fit);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
+    g_signal_connect_after (GTK_OBJECT (merge_opts->spinbutton_loops), "value_changed",
+			    G_CALLBACK (after_spinbutton_loops_changed),
+			    NULL);
 
-  label = gtk_label_new_with_mnemonic (_("_Transition Method:"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    fit_button = lives_standard_check_button_new (_("_Loop Clipboard to Fit Selection"),TRUE,LIVES_BOX(hbox),NULL);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(fit_button),mainw->last_transition_loop_to_fit);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+    g_signal_connect (GTK_OBJECT (fit_button), "toggled",
+		      G_CALLBACK (on_fit_toggled),
+		      NULL);
   }
 
-  transition_combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (transition_combo), merge_opts->trans_list);
-  gtk_box_pack_start (GTK_BOX (hbox), transition_combo, TRUE, FALSE, 0);
-  gtk_widget_show(transition_combo);
-  merge_opts->trans_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(transition_combo))->entry));
-  gtk_entry_set_text (GTK_ENTRY (merge_opts->trans_entry),(gchar *)g_list_nth_data (merge_opts->trans_list,defstart));
-  gtk_editable_set_editable (GTK_EDITABLE(merge_opts->trans_entry),FALSE);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),merge_opts->trans_entry);
+  add_hsep_to_box(LIVES_BOX(vbox));
+  
+  hbox = lives_hbox_new (TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  transition_combo = lives_standard_combo_new (_("_Transition Method:"),TRUE,merge_opts->trans_list,LIVES_BOX(hbox),NULL);
+
+  gtk_combo_box_set_active(GTK_COMBO_BOX(transition_combo),defstart);
 
   mainw->last_transition_idx=merge_opts->list_to_rfx_index[defstart];
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(vbox));
 
 
   // now the dynamic part...
-  merge_opts->param_vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER(merge_opts->param_vbox), 10);
+  merge_opts->param_vbox = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER(merge_opts->param_vbox), widget_opts.border_width>>1);
 
   gtk_box_pack_start (GTK_BOX (vbox), merge_opts->param_vbox, TRUE, TRUE, 0);
 
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
+  mainw->overflow_height=900;
   make_param_box(GTK_VBOX (merge_opts->param_vbox), rfx);
+  mainw->overflow_height=0;
   gtk_widget_show_all (merge_opts->param_vbox);
+
+  retvals=do_onchange_init(rfx);
+
+  if (retvals!=NULL) {
+    // now apply visually anything we got from onchange_init
+    //param_demarshall (rfx,retvals,TRUE,TRUE);
+    g_list_free_strings (retvals);
+    g_list_free (retvals);
+  }
+
   // done !
 
 
-  dialog_action_area = GTK_DIALOG (merge_opts->merge_dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (merge_opts->merge_dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (merge_opts->merge_dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus (cancelbutton,TRUE);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (merge_opts->merge_dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
- 
-
-
+  lives_widget_set_can_focus_and_default (okbutton);
+  gtk_widget_grab_default (okbutton);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
                       G_CALLBACK (on_merge_cancel_clicked),
                       rfx);
 
-  g_signal_connect (GTK_OBJECT (okbutton), "clicked",
-                      G_CALLBACK (on_merge_ok_clicked),
-                      rfx);
 
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape,  (GdkModifierType)0, (GtkAccelFlags)0);
 
-  g_signal_connect (GTK_OBJECT(merge_opts->trans_entry),"changed",G_CALLBACK (on_trans_method_changed),NULL);
 
+  g_signal_connect (GTK_OBJECT (okbutton), "clicked",
+                      G_CALLBACK (on_merge_ok_clicked),
+                      rfx);
+  
+  g_signal_connect (GTK_OBJECT(transition_combo),"changed",G_CALLBACK (on_trans_method_changed),NULL);
+  
 
   g_signal_connect (GTK_OBJECT (align_start_button), "toggled",
 		    G_CALLBACK (on_align_start_end_toggled),
 		    rfx);
 
 
-  if ((cfile->end-cfile->start+1)>cb_frames) {
-    g_signal_connect (GTK_OBJECT (fit_button), "toggled",
-		      G_CALLBACK (on_fit_toggled),
-		      NULL);
-  }
-  else if ((cfile->end-cfile->start+1)<cb_frames) {
-    merge_opts->ins_frame_function=g_signal_connect (GTK_OBJECT (merge_opts->ins_frame_button), "toggled",G_CALLBACK (on_ins_frames_toggled),NULL);
+  if (prefs->show_gui) {
+    gtk_widget_show_all(merge_opts->merge_dialog);
   }
+}
 
-  g_signal_connect_after (GTK_OBJECT (merge_opts->spinbutton_loops), "value_changed",
-			  G_CALLBACK (after_spinbutton_loops_changed),
-			  NULL);
+static void bang (GtkWidget *widget, gpointer null) {
+  gtk_widget_destroy (widget);
 }
 
 
+void on_trans_method_changed (GtkComboBox *combo, gpointer user_data) {
+  lives_rfx_t *rfx;
+
+  GList *retvals;
 
+  char *txt=lives_combo_get_active_text (combo);
 
-void on_trans_method_changed (GtkWidget *entry, gpointer user_data) {
   int idx;
-  lives_rfx_t *rfx;
-
-  if (!strlen (gtk_entry_get_text (GTK_ENTRY (entry)))) return;
 
-  for (idx=0;strcmp((char *)g_list_nth_data (merge_opts->trans_list,idx),
-		    (char *)gtk_entry_get_text(GTK_ENTRY (entry)));idx++);
+  if (!strlen (txt)) {
+    g_free(txt);
+    return;
+  }
 
-  mainw->last_transition_idx=merge_opts->list_to_rfx_index[idx];
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
 
   gtk_container_foreach (GTK_CONTAINER(merge_opts->param_vbox),bang,NULL);
   on_paramwindow_cancel_clicked (NULL,rfx);
+
+  idx=lives_list_index(merge_opts->trans_list,txt);
+
+  g_free(txt);
+
+  mainw->last_transition_idx=merge_opts->list_to_rfx_index[idx];
+  rfx=&mainw->rendered_fx[mainw->last_transition_idx];
+
   make_param_box(GTK_VBOX (merge_opts->param_vbox), rfx);
   gtk_widget_show_all (merge_opts->param_vbox);
-  merge_opts->align_start=!merge_opts->align_start;
-  on_align_start_end_toggled (NULL,NULL);
-}
 
+  retvals=do_onchange_init(rfx);
 
+  if (retvals!=NULL) {
+    // now apply visually anything we got from onchange_init
+    param_demarshall (rfx,retvals,TRUE,TRUE);
+    g_list_free_strings (retvals);
+    g_list_free (retvals);
+  }
 
-void bang (GtkWidget *widget, gpointer null) {
-  gtk_widget_destroy (widget);
+  merge_opts->align_start=!merge_opts->align_start;
+  on_align_start_end_toggled (NULL,NULL);
 }
 
 
 
+
 void
 on_merge_activate                     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -383,7 +301,6 @@
   merge_opts->ins_frames=mainw->last_transition_ins_frames;
   merge_opts->align_start=!mainw->last_transition_align_start;
 
-  gtk_widget_show (merge_opts->merge_dialog);
   on_align_start_end_toggled (NULL,NULL);
 }
 
@@ -395,9 +312,10 @@
 {
   lives_rfx_t *rfx=(lives_rfx_t *)user_data;
   on_paramwindow_cancel_clicked (NULL,rfx);
-  mainw->last_transition_loops=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
+  if (merge_opts->spinbutton_loops!=NULL) 
+    mainw->last_transition_loops=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
   gtk_widget_destroy(merge_opts->merge_dialog);
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_widget_context_update();
   mainw->last_transition_loop_to_fit=merge_opts->loop_to_fit;
   mainw->last_transition_ins_frames=merge_opts->ins_frames;
   mainw->last_transition_align_start=merge_opts->align_start;
@@ -419,7 +337,7 @@
   gint start,end;
 
   gint cb_start=1;
-  gboolean cb_video_change=FALSE;
+  boolean cb_video_change=FALSE;
   gint current_file=mainw->current_file;
   gint old_frames=clipboard->frames;
 
@@ -431,7 +349,9 @@
 
   lives_rfx_t *rfx;
 
-  mainw->last_transition_loops=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
+  if (merge_opts->spinbutton_loops!=NULL) 
+    mainw->last_transition_loops=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (merge_opts->spinbutton_loops));
+
   mainw->last_transition_loop_to_fit=merge_opts->loop_to_fit;
   mainw->last_transition_ins_frames=merge_opts->ins_frames;
   mainw->last_transition_align_start=merge_opts->align_start;
@@ -442,7 +362,7 @@
     if (!do_clipboard_fps_warning()) {
       on_paramwindow_cancel_clicked (NULL,rfx);
       gtk_widget_destroy(merge_opts->merge_dialog);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       g_list_free (merge_opts->trans_list);
       g_free (merge_opts->list_to_rfx_index);
       g_free(merge_opts);
@@ -450,11 +370,14 @@
     }
   }
 
-  times_to_loop=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(merge_opts->spinbutton_loops));
+  if (merge_opts->spinbutton_loops!=NULL) 
+    times_to_loop=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(merge_opts->spinbutton_loops));
+  else 
+    times_to_loop=1;
 
   on_paramwindow_cancel_clicked (NULL,rfx);
   gtk_widget_destroy(merge_opts->merge_dialog);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   g_list_free (merge_opts->trans_list);
   g_free (merge_opts->list_to_rfx_index);
   g_free(merge_opts);
@@ -490,7 +413,7 @@
   // insert pre-frames
   if (!mainw->last_transition_align_start&&excess_frames>0&&mainw->last_transition_ins_frames) {
     mainw->insert_after=FALSE;
-    msg=g_strdup_printf(_ ("inserting %d extra frame(s) before merge\n"),excess_frames);
+    msg=g_strdup_printf(P_ ("inserting %d extra frame before merge\n","inserting %d extra frames before merge\n",excess_frames),excess_frames);
     d_print(msg);
     g_free(msg);
   
@@ -525,13 +448,15 @@
 
 
   // number of frames to merge, must be <= selection length
-  if (!mainw->last_transition_loop_to_fit&&mainw->last_transition_align_start) { //loop_to_fit_audio
+  if (!mainw->last_transition_loop_to_fit) {
     cb_end=(clipboard->frames-excess_frames)*times_to_loop;
   }
   else {
+    //loop_to_fit_audio
     cb_end=cfile->end-cfile->start+1;
   } 
 
+
   // here we use undo_start and undo_end to mark the merged section,
   // insert_start and insert_end to mark the inserted section (if any)
   if (mainw->last_transition_align_start) {
@@ -550,10 +475,20 @@
     }
   }
 
-  cfile->progress_end=cb_end-cb_start+cfile->start+excess_frames*!mainw->last_transition_align_start;
-  cfile->progress_start=cfile->start;
-
-  clipboard->start=cb_start;
+  if (!mainw->last_transition_loop_to_fit) {
+    if (mainw->last_transition_align_start) {
+      cfile->progress_end=cb_end-cb_start+cfile->start+excess_frames*!mainw->last_transition_align_start;
+      cfile->progress_start=cfile->start;
+    }
+    else {
+      cfile->progress_end=cfile->end;
+      cfile->progress_start=cfile->end-cb_end+1;
+    }
+  }
+  else {
+    cfile->progress_start=cfile->start;
+    cfile->progress_end=cfile->end;
+  }
 
   // do the actual merge
   if (!do_effect (rfx,FALSE)) {
@@ -597,7 +532,7 @@
   // insert any post frames
   if (mainw->last_transition_align_start&&excess_frames>0&&mainw->last_transition_ins_frames) {
     mainw->insert_after=TRUE;
-    msg=g_strdup_printf(_ ("now inserting %d extra frame(s)\n"),excess_frames);
+    msg=g_strdup_printf(P_ ("now inserting %d extra frame\n","now inserting %d extra frames\n",excess_frames),excess_frames);
     d_print(msg);
     g_free(msg);

LiVES-1.6.1.tar.bz2/src/merge.h -> LiVES-2.0.3.tar.bz2/src/merge.h Changed

LiVES-1.6.1.tar.bz2/src/multitrack.c -> LiVES-2.0.3.tar.bz2/src/multitrack.c Changed

@@ -1,6 +1,7 @@
+
 // multitrack.c
 // LiVES
-// (c) G. Finch 2005 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2005 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -18,7 +19,7 @@
 // the multitrack window is designed to be more-or-less standalone
 // it relies on functions in other files for applying effects and rendering
 // we use a Weed event list to store our timeline
-// (see weed events extension in weed-docs directory
+// (see weed events extension in weed-docs directory)
 
 // future plans include timeline plugins, which would generate event lists 
 // or adjust the currently playing one
@@ -46,50 +47,78 @@
 #include "interface.h"
 #include "audio.h"
 #include "startup.h"
+#include "framedraw.h"
 
 #ifdef ENABLE_GIW
 #include "giw/giwvslider.h"
 #include "giw/giwled.h"
 #endif
 
-#define BORD_HEIGHT 10
+#ifdef ENABLE_GIW_3
+#include "giw/giwtimeline.h"
+#endif
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+static boolean expose_timeline_reg_event (GtkWidget *, lives_painter_t *cr, gpointer mt);
+static boolean mt_expose_audtrack_event (GtkWidget *ebox, lives_painter_t *, gpointer mt);
+#else
+static boolean expose_timeline_reg_event (GtkWidget *, GdkEventExpose *, gpointer mt);
+static boolean mt_expose_audtrack_event (GtkWidget *ebox, GdkEventExpose *, gpointer mt);
+#endif
+
+static void on_rename_track_activate (GtkMenuItem *, gpointer mt);
+
+static boolean mt_add_block_effect_idle (gpointer mt);
+static boolean mt_add_region_effect_idle (gpointer mt);
+static boolean mt_fx_edit_idle (gpointer mt);
 
-static int renumbered_clips[MAX_FILES+1]; // used to match clips from the event recorder with renumbered clips (without gaps)
-static gdouble lfps[MAX_FILES+1]; // table of layout fps
-static void **pchain; // param chain for currently being edited filter
+/// used to match clips from the event recorder with renumbered clips (without gaps)
+static int renumbered_clips[MAX_FILES+1];
+static double lfps[MAX_FILES+1]; ///< table of layout fps
+static void **pchain; ///< param chain for currently being edited filter
 
-static GdkColor audcol;
-static GdkColor fxcol;
+static lives_colRGB24_t audcol;
+static lives_colRGB24_t fxcol;
 
-static gint xachans,xarate,xasamps,xse;
-static gboolean ptaud;
-static gint btaud;
+static int xachans,xarate,xasamps,xse;
+static boolean ptaud;
+static int btaud;
 
-static gint aofile;
+static int aofile;
 static int afd;
 
-static gint dclick_time=0;
+static int dclick_time=0;
+
+static boolean force_pertrack_audio;
+static int force_backing_tracks;
+
+static int clips_to_files[MAX_FILES];
+
+static boolean pb_audio_needs_prerender;
+static weed_plant_t *pb_loop_event,*pb_filter_map,*pb_afilter_map;
+
+static boolean mainw_was_ready;
+
+static boolean nb_ignore=FALSE;
 
-static gboolean force_pertrack_audio;
-static gint force_backing_tracks;
+static GtkWidget *dummy_menuitem;
 
-static gint clips_to_files[MAX_FILES];
+static boolean doubleclick=FALSE;
+
+static guint32 last_press_time=0;
 
-static gboolean pb_audio_needs_prerender;
-static weed_plant_t *pb_loop_event,*pb_filter_map;
 
-static gboolean mainw_was_ready;
 
 ///////////////////////////////////////////////////////////////////
 
 #define LIVES_AVOL_SCALE ((double)1000000.)
 
-
-static LIVES_INLINE gint mt_file_from_clip(lives_mt *mt, gint clip) {
+static LIVES_INLINE int mt_file_from_clip(lives_mt *mt, int clip) {
   return clips_to_files[clip];
 }
 
-static LIVES_INLINE gint mt_clip_from_file(lives_mt *mt, gint file) {
+static LIVES_INLINE int mt_clip_from_file(lives_mt *mt, int file) {
   register int i;
   for (i=0;i<MAX_FILES;i++) {
     if (clips_to_files[i]==file) return i;
@@ -98,31 +127,34 @@
 }
 
 /// return track number for a given block
-///
 static LIVES_INLINE int get_track_for_block(track_rect *block) {
   return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));  
 }
 
 
 
-static LIVES_INLINE gboolean is_empty_track(GObject *track) {
+static LIVES_INLINE boolean is_empty_track(GObject *track) {
   return (g_object_get_data(track, "blocks")==NULL);
 }
 
-gdouble get_mixer_track_vol(lives_mt *mt, int trackno) {
-  gdouble vol=(gdouble)(GPOINTER_TO_INT(g_list_nth_data(mt->audio_vols,trackno)));
+double get_mixer_track_vol(lives_mt *mt, int trackno) {
+  double vol=(double)(GPOINTER_TO_INT(g_list_nth_data(mt->audio_vols,trackno)));
   return vol/LIVES_AVOL_SCALE;
 }
 
-void set_mixer_track_vol(lives_mt *mt, int trackno, gdouble vol) {
+void set_mixer_track_vol(lives_mt *mt, int trackno, double vol) {
   int x=vol*LIVES_AVOL_SCALE;
   g_list_nth(mt->audio_vols,trackno)->data=GINT_TO_POINTER(x);
 }
 
 
 
-static gboolean save_event_list_inner(lives_mt *mt, int fd, weed_plant_t *event_list, unsigned char **mem) {
-  weed_plant_t *event=get_first_event(event_list);
+static boolean save_event_list_inner(lives_mt *mt, int fd, weed_plant_t *event_list, unsigned char **mem) {
+  weed_plant_t *event;
+
+  if (event_list==NULL) return TRUE;
+
+  event=get_first_event(event_list);
 
   threaded_dialog_spin();
 
@@ -131,6 +163,11 @@
   weed_set_int_value(event_list,"audio_channels",cfile->achans);
   weed_set_int_value(event_list,"audio_rate",cfile->arate);
   weed_set_int_value(event_list,"audio_sample_size",cfile->asampsize);
+
+  // new: save sizeof(void *) - for conversion to/from 8/16 bit systems
+  weed_set_int_value(event_list,"ptrsize",8);
+
+
   if (cfile->signed_endian&AFORM_UNSIGNED) weed_set_boolean_value(event_list,"audio_signed",WEED_FALSE);
   else weed_set_boolean_value(event_list,"audio_signed",WEED_TRUE);
   if (cfile->signed_endian&AFORM_BIG_ENDIAN) weed_set_int_value(event_list,"audio_endian",1);
@@ -138,10 +175,10 @@
   
   if (mt!=NULL&&mt->audio_vols!=NULL&&mt->audio_draws!=NULL) {
     int i;
-    gint natracks=g_list_length(mt->audio_draws);
+    int natracks=g_list_length(mt->audio_draws);
     int *atracks=(int *)g_malloc(natracks*sizint);
-    gdouble *avols;
-    gint navols;
+    double *avols;
+    int navols;
     for (i=0;i<natracks;i++) {
       atracks[i]=i-mt->opts.back_audio_tracks;
     }
@@ -151,7 +188,7 @@
     if (mt->opts.gang_audio) navols=1+mt->opts.back_audio_tracks;
     else navols=natracks;
     
-    avols=(gdouble *)g_malloc(navols*sizeof(double));
+    avols=(double *)g_malloc(navols*sizeof(double));
     for (i=0;i<navols;i++) {
       avols[i]=get_mixer_track_vol(mt,i);
     }
@@ -166,7 +203,10 @@
   mainw->write_failed=FALSE;
   weed_plant_serialise(fd,event_list,mem);
   while (!mainw->write_failed&&event!=NULL) {
-    if (WEED_EVENT_IS_FILTER_INIT(event)) weed_set_voidptr_value(event,"event_id",(void *)event);
+    if (WEED_EVENT_IS_FILTER_INIT(event)) {
+      weed_leaf_delete(event,"event_id");
+      weed_set_voidptr_value(event,"event_id",(void *)event);
+    }
     weed_plant_serialise(fd,event,mem);
     event=get_next_event(event);
     threaded_dialog_spin();
@@ -184,6 +224,7 @@
   char *buf;
 
   boolean tried_all=FALSE;
+  boolean needs_idlefunc=FALSE;
 
   int nframe,oframe=frame;
 
@@ -194,13 +235,17 @@
 
   if (width<2||height<2) return NULL;
 
-  if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
+  if (mt->idlefunc>0) {
+    needs_idlefunc=TRUE;
+    g_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
+  }
 
   do {
 
     if (mainw->files[file]->frames>0) {
       weed_timecode_t tc=(frame-1.)/mainw->files[file]->fps*U_SECL;
-      thumbnail=pull_lives_pixbuf_at_size(file,frame,mainw->files[file]->img_type==IMG_TYPE_JPEG?"jpg":"png",tc,
+      thumbnail=pull_lives_pixbuf_at_size(file,frame,get_image_ext_for_type(mainw->files[file]->img_type),tc,
 					  width,height,LIVES_INTERP_BEST);
     }
     else {
@@ -211,8 +256,7 @@
       g_free(buf);
       if (error!=NULL||pixbuf==NULL) {
 	g_error_free(error);
-	if (mt->idlefunc>0) {
-	  mt->idlefunc=0;
+	if (needs_idlefunc) {
 	  mt->idlefunc=mt_idle_add(mt);
 	}
 	return NULL;
@@ -221,7 +265,7 @@
       if (lives_pixbuf_get_width(pixbuf)!=width||lives_pixbuf_get_height(pixbuf)!=height) {
 	// ...at_scale is inaccurate
 	thumbnail=lives_pixbuf_scale_simple(pixbuf,width,height,LIVES_INTERP_BEST);
-	gdk_pixbuf_unref(pixbuf);
+	lives_object_unref(pixbuf);
       }
       else thumbnail=pixbuf;
     }
@@ -237,15 +281,14 @@
 	tried_all=TRUE;
       }
       frame=nframe;
-      if (thumbnail!=NULL) gdk_pixbuf_unref(thumbnail);
+      if (thumbnail!=NULL) lives_object_unref(thumbnail);
       thumbnail=NULL;
     }
 
 
   } while (noblanks);
 
-  if (mt->idlefunc>0) {
-    mt->idlefunc=0;
+  if (needs_idlefunc) {
     mt->idlefunc=mt_idle_add(mt);
   }
 
@@ -253,38 +296,37 @@
 }
 
 
-static void set_cursor_style(lives_mt *mt, gint cstyle, gint width, gint height, gint clip, gint hsx, gint hsy) {
-  GdkPixbuf *pixbuf=NULL;
+static void mt_set_cursor_style(lives_mt *mt, lives_cursor_t cstyle, int width, int height, int clip, int hsx, int hsy) {
+  GdkCursor *cursor;
+  LiVESXDisplay *disp;
+
+  LiVESPixbuf *pixbuf=NULL;
+  LiVESPixbuf *thumbnail=NULL;
+
   guchar *cpixels,*tpixels;
-  int i,j,k;
-  GdkPixbuf *thumbnail=NULL;
-  gint twidth=0,twidth3,twidth4,trow;
+
   file *sfile=mainw->files[clip];
 
-  int frame_start;
-  gdouble frames_width;
+  double frames_width;
 
   unsigned int cwidth,cheight;
 
-  if (mt->cursor!=NULL) gdk_cursor_unref(mt->cursor);
-  mt->cursor=NULL;
+  int twidth=0,twidth3,twidth4,trow;
+  int frame_start;
+
+  register int i,j,k;
+
+  disp=lives_widget_get_display(mt->window);
 
-  gdk_display_get_maximal_cursor_size(gdk_screen_get_display(gtk_widget_get_screen(mt->window)),&cwidth,&cheight);
+  gdk_display_get_maximal_cursor_size(disp,&cwidth,&cheight);
   if (width>cwidth) width=cwidth;
 
   mt->cursor_style=cstyle;
   switch(cstyle) {
-  case LIVES_CURSOR_NORMAL:
-    gdk_window_set_cursor (mt->window->window, NULL);
-    return;
-  case LIVES_CURSOR_BUSY:
-    mt->cursor=gdk_cursor_new(GDK_WATCH);
-    gdk_window_set_cursor (mt->window->window, mt->cursor);
-    return;
   case LIVES_CURSOR_BLOCK:
     if (sfile!=NULL&&sfile->frames>0) {
       frame_start=mt->opts.ign_ins_sel?1:sfile->start;
-      frames_width=(gdouble)(mt->opts.ign_ins_sel?sfile->frames:sfile->end-sfile->start+1.);
+      frames_width=(double)(mt->opts.ign_ins_sel?sfile->frames:sfile->end-sfile->start+1.);
 
       pixbuf=lives_pixbuf_new (TRUE, width, height);
 
@@ -293,19 +335,19 @@
 	twidth=BLOCK_THUMB_WIDTH;
 	if ((i+twidth)>width) twidth=width-i;
 	if (twidth>=2) {
-	  thumbnail=make_thumb(mt,clip,twidth,height,frame_start+(gint)((gdouble)i/(gdouble)width*frames_width),FALSE);
+	  thumbnail=make_thumb(mt,clip,twidth,height,frame_start+(int)((double)i/(double)width*frames_width),FALSE);
 	  // render it in the eventbox
 	  if (thumbnail!=NULL) {
 	    trow=lives_pixbuf_get_rowstride(thumbnail);
 	    twidth=lives_pixbuf_get_width(thumbnail);
-	    cpixels=gdk_pixbuf_get_pixels(pixbuf)+(i*4);
-	    tpixels=gdk_pixbuf_get_pixels(thumbnail);
+	    cpixels=lives_pixbuf_get_pixels(pixbuf)+(i*4);
+	    tpixels=lives_pixbuf_get_pixels(thumbnail);
 
 	    if (!lives_pixbuf_get_has_alpha(thumbnail)) {
 	      twidth3=twidth*3;
 	      for (j=0;j<height;j++) {
 		for (k=0;k<twidth3;k+=3) {
-		  memcpy(cpixels,&tpixels[k],3);
+		  lives_memcpy(cpixels,&tpixels[k],3);
 		  memset(cpixels+3,0xFF,1);
 		  cpixels+=4;
 		}
@@ -316,12 +358,12 @@
 	    else {
 	      twidth4=twidth*4;
 	      for (j=0;j<height;j++) {
-		memcpy(cpixels,tpixels,twidth4);
+		lives_memcpy(cpixels,tpixels,twidth4);
 		tpixels+=trow;
 		cpixels+=width<<2;
 	      }
 	    }
-	    gdk_pixbuf_unref(thumbnail);
+	    lives_object_unref(thumbnail);
 	  }
 	}
       }
@@ -331,7 +373,7 @@
   case LIVES_CURSOR_AUDIO_BLOCK:
     pixbuf=lives_pixbuf_new (TRUE, width, height);
     trow=lives_pixbuf_get_rowstride(pixbuf);
-    cpixels=gdk_pixbuf_get_pixels(pixbuf);
+    cpixels=lives_pixbuf_get_pixels(pixbuf);
     for (j=0;j<height;j++) {
       for (k=0;k<width;k++) {
 	cpixels[0]=audcol.red;
@@ -346,7 +388,7 @@
   case LIVES_CURSOR_FX_BLOCK:
     pixbuf=lives_pixbuf_new (TRUE, width, height);
     trow=lives_pixbuf_get_rowstride(pixbuf);
-    cpixels=gdk_pixbuf_get_pixels(pixbuf);
+    cpixels=lives_pixbuf_get_pixels(pixbuf);
     for (j=0;j<height;j++) {
       for (k=0;k<width;k++) {
 	cpixels[0]=fxcol.red;
@@ -358,22 +400,26 @@
       cpixels+=(trow-width*4);
     }
     break;
+  default:
+    return;
   }
 
-  mt->cursor = gdk_cursor_new_from_pixbuf (gdk_display_get_default(), pixbuf, hsx, hsy);
-  gdk_window_set_cursor (mt->window->window, mt->cursor);
-  gdk_pixbuf_unref (pixbuf);
+  cursor = gdk_cursor_new_from_pixbuf (disp, pixbuf, hsx, hsy);
+  gdk_window_set_cursor (lives_widget_get_xwindow(mt->window), cursor);
 
+  if (pixbuf!=NULL) lives_object_unref (pixbuf);
+  if (cursor!=NULL) lives_cursor_unref(cursor);
 }
 
 
 
-gboolean write_backup_layout_numbering(lives_mt *mt) {
+boolean write_backup_layout_numbering(lives_mt *mt) {
   // link clip numbers in the auto save event_list to actual clip numbers
 
   int fd,i,vali,hdlsize;
-  gdouble vald;
-  gchar *asave_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
+  double vald;
+  gchar *asave_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
+				    lives_getpid());
   GList *clist=mainw->cliplist;
 
   fd=creat(asave_file,DEF_FILE_PERMS);
@@ -429,9 +475,10 @@
   //but the numbering may have changed (for example we started last time in mt mode, this time in ce mode)
 
   int fd,vari,clipn,offs;
-  gdouble vard;
-  gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
-  gboolean isfirst=TRUE;
+  double vard;
+  gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
+				    lives_getpid());
+  boolean isfirst=TRUE;
   char buf[256];
 
   fd=open(aload_file,O_RDONLY);
@@ -482,16 +529,16 @@
   struct timeval otv;
 
   int fd;
-  gchar *asave_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
+  gchar *asave_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),lives_getpid());
   lives_mt_poly_state_t poly_state;
 
-  gboolean retval=TRUE;
+  boolean retval=TRUE;
   int retval2;
 
   mt_desensitise(mt);
 
   // flush any pending events
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   do {
     retval2=0;
@@ -499,9 +546,20 @@
 
     fd=creat(asave_file,DEF_FILE_PERMS);
     if (fd>=0) {
+#ifdef IS_MINGW
+      setmode(fd,O_BINARY);
+#endif
       add_markers(mt,mt->event_list);
       do_threaded_dialog(_("Auto backup"),FALSE);
+      
+      set_signal_handlers((SignalHandlerPointer)defer_sigint);
+
       retval=save_event_list_inner(mt,fd,mt->event_list,NULL);
+
+      if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
+
+      set_signal_handlers((SignalHandlerPointer)catch_sigint);
+
       end_threaded_dialog();
       
       if (retval) retval=write_backup_layout_numbering(mt);
@@ -538,24 +596,20 @@
 
 
 
-static gboolean mt_auto_backup(gpointer user_data) {
+static boolean mt_auto_backup(gpointer user_data) {
 
   struct timeval otv;
   int64_t stime,diff;
-  gboolean had_idlefunc=FALSE;
 
   lives_mt *mt=(lives_mt *)user_data;
 
-  if (!mt->auto_changed||mt->event_list==NULL||mt->idlefunc==0||prefs->mt_auto_back<0) {
+  if (mt->idlefunc==0||!mt->auto_changed||mt->event_list==NULL||prefs->mt_auto_back<0) {
     mt->idlefunc=0;
     return FALSE;
   }
 
-  if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
-    mt->idlefunc=0;
-    had_idlefunc=TRUE;
-  }
+  g_source_remove(mt->idlefunc);
+  mt->idlefunc=0;
 
   gettimeofday(&otv, NULL);
   stime=otv.tv_sec;
@@ -565,44 +619,53 @@
   diff=stime-mt->auto_back_time;
   if (diff>=prefs->mt_auto_back) {
     save_mt_autoback(mt,stime);
+    mt->auto_changed=FALSE;
   }
 
-
-  if (had_idlefunc) {
-    mt->idlefunc=mt_idle_add(mt);
-  }
+  mt->idlefunc=mt_idle_add(mt);
 
   return TRUE;
 }
 
 
 guint mt_idle_add(lives_mt *mt) {
+  guint retval;
+
   if (prefs->mt_auto_back<0) return 0;
 
+  if (prefs->mt_auto_back>0&&mt->idlefunc>0) return mt->idlefunc;
+
   if (prefs->mt_auto_back==0) {
     mt->idlefunc=-1;
     mt_auto_backup(mt);
     return 0;
   }
 
-  if (mt->idlefunc>0) return mt->idlefunc;
+  set_signal_handlers((SignalHandlerPointer)defer_sigint);
+
+  retval=g_idle_add_full(G_PRIORITY_LOW,mt_auto_backup,mt,NULL);
+
+  if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
+
+  set_signal_handlers((SignalHandlerPointer)catch_sigint);
+
+  return retval;
 
-  return g_idle_add_full(G_PRIORITY_LOW,mt_auto_backup,mt,NULL);
 }
 
 
 void recover_layout_cancelled(GtkButton *button, gpointer user_data) {
-  gchar *eload_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
+  gchar *eload_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),lives_getpid());
 
   if (button!=NULL) {
-    gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+    lives_general_button_clicked(button,NULL);
     mainw->recoverable_layout=FALSE;
   }
 
   unlink(eload_file);
   g_free(eload_file);
   
-  eload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
+  eload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),lives_getpid());
   unlink(eload_file);
   g_free(eload_file);
 
@@ -613,8 +676,9 @@
 
 
 static void mt_load_recovery_layout(lives_mt *mt) {
-    gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
-    gchar *eload_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
+    gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
+				      lives_getpid());
+    gchar *eload_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),lives_getpid());
 
     mt->auto_reloading=TRUE;
     mainw->event_list=mt->event_list=load_event_list(mt,eload_file);
@@ -630,17 +694,23 @@
       // failed to load
       // keep the faulty layout for forensic purposes
       gchar *com;
-      gchar *uldir=g_build_filename(prefs->tmpdir,"unrecoverable_layouts/",NULL);
+      gchar *uldir=g_build_filename(prefs->tmpdir,"unrecoverable_layouts",G_DIR_SEPARATOR_S,NULL);
 
-      com=g_strdup_printf("/bin/mkdir -p \"%s\" 2>/dev/null",uldir);
-      lives_system(com,TRUE);
-      g_free(com);
+      g_mkdir_with_parents(uldir,S_IRWXU);
 
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",eload_file,uldir);
+#else
+      com=g_strdup_printf("mv.exe \"%s\" \"%s\"",eload_file,uldir);
+#endif
       lives_system(com,TRUE);
       g_free(com);
 
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",aload_file,uldir);
+#else
+      com=g_strdup_printf("mv.exe \"%s\" \"%s\"",aload_file,uldir);
+#endif
       lives_system(com,TRUE);
       g_free(com);
 
@@ -655,8 +725,7 @@
 
 
 void recover_layout(GtkButton *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
   if (prefs->startup_interface==STARTUP_CE) {
     if (!on_multitrack_activate(NULL,NULL)) {
       multitrack_delete(mainw->multitrack,FALSE);
@@ -685,7 +754,7 @@
 }
 
 
-LIVES_INLINE gchar *get_track_name(lives_mt *mt, int track_num, gboolean is_audio) {
+LIVES_INLINE gchar *get_track_name(lives_mt *mt, int track_num, boolean is_audio) {
   GtkWidget *xeventbox;
   if (track_num<0) return g_strdup(_("Backing audio")); 
   if (!is_audio) xeventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,track_num);
@@ -694,8 +763,8 @@
 }
 
 
-LIVES_INLINE gdouble get_time_from_x(lives_mt *mt, gint x) {
-  gdouble time=(gdouble)x/(gdouble)mt->timeline->allocation.width*(mt->tl_max-mt->tl_min)+mt->tl_min;
+LIVES_INLINE double get_time_from_x(lives_mt *mt, int x) {
+  double time=(double)x/(double)lives_widget_get_allocation_width(mt->timeline)*(mt->tl_max-mt->tl_min)+mt->tl_min;
   if (time<0.) time=0.;
   else if (time>mt->end_secs+1./mt->fps) time=mt->end_secs+1./mt->fps;
   return q_dbl(time,mt->fps)/U_SEC;
@@ -707,14 +776,14 @@
   for (i=0;i<rfx->num_params;i++) rfx->params[i].changed=FALSE;
 }
 
-static gint get_track_height(lives_mt *mt) {
+static int get_track_height(lives_mt *mt) {
   GtkWidget *eventbox;
   GList *glist=mt->video_draws;
 
   while (glist!=NULL) {
     eventbox=(GtkWidget *)glist->data;
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))==0) 
-      return GTK_WIDGET(eventbox)->allocation.height;
+      return lives_widget_get_allocation_height(eventbox);
     glist=glist->next;
   }
 
@@ -722,7 +791,7 @@
 }
 
 
-static gboolean is_audio_eventbox(lives_mt *mt, GtkWidget *ebox) {
+static boolean is_audio_eventbox(lives_mt *mt, GtkWidget *ebox) {
   GList *slist=mt->audio_draws;
 
   while (slist!=NULL) {
@@ -733,86 +802,104 @@
 }
 
 
-static void draw_block (lives_mt *mt,track_rect *block, gint x1, gint x2) {
+static void draw_block (lives_mt *mt, lives_painter_t *cairo, 
+			lives_painter_surface_t *surf, track_rect *block, int x1, int x2) {
   // x1 is start point of drawing area (in pixels), x2 is width of drawing area (in pixels)
+  lives_painter_t *cr;
+
+  LiVESWidgetColor bgcolor;
 
-  gdouble tl_span=mt->tl_max-mt->tl_min;
-  GtkWidget *eventbox=block->eventbox;
   weed_plant_t *event=block->start_event;
+
   weed_timecode_t tc=get_event_timecode(event);
 
-  gdouble offset_startd=tc/U_SEC;
-  gdouble offset_endd;
-  gint offset_start;
-  gint offset_end;
-  int i,filenum,track;
+  GtkWidget *eventbox=block->eventbox;
+
   GdkPixbuf *thumbnail=NULL;
+
+  double tl_span=mt->tl_max-mt->tl_min;
+  double offset_startd=tc/U_SEC;
+  double offset_endd;
+
+  int offset_start;
+  int offset_end;
+  int i,filenum,track;
+
   int framenum,last_framenum;
-  gint width=BLOCK_THUMB_WIDTH;
+  int width=BLOCK_THUMB_WIDTH;
+
+  int hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
 
-  gint hidden=(gint)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
   if (hidden) return;
 
   // block to right of screen
   if (offset_startd>=mt->tl_max) return;
 
   // block to right of drawing area
-  offset_start=(int)((offset_startd-mt->tl_min)/tl_span*eventbox->allocation.width+.5);
+  offset_start=(int)((offset_startd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5);
   if ((x1>0||x2>0)&&offset_start>(x1+x2)) return;
 
   offset_endd=get_event_timecode(block->end_event)/U_SEC+(!is_audio_eventbox(mt,eventbox))/cfile->fps;
-  offset_end=(offset_endd-mt->tl_min)/tl_span*eventbox->allocation.width;
+  offset_end=(offset_endd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox);
 
   //if (offset_end+offset_start>eventbox->allocation.width) offset_end=eventbox->allocation.width-offset_start;
 
   // end of block before drawing area
   if (offset_end<x1) return;
 
+  if (surf==NULL) cr=cairo;
+  else cr=lives_painter_create(surf);
+
+  lives_painter_set_line_width(cr,1.);
+
+  lives_widget_get_bg_color(mt->window,&bgcolor);
+
   switch (block->state) {
   case BLOCK_UNSELECTED:
+
     track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
     if (BLOCK_DRAW_TYPE==BLOCK_DRAW_SIMPLE) {
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_start, 
-		     eventbox->allocation.height);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_end, 
-		     eventbox->allocation.height, offset_end, 0);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_end, 
-		     eventbox->allocation.height);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 
-		     eventbox->allocation.height, offset_end, 0);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_end, 0);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 
-		     eventbox->allocation.height-1, offset_end, eventbox->allocation.height-1);
+      lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      lives_painter_new_path(cr);
+      lives_painter_rectangle(cr,offset_start, 0, offset_end-offset_start, lives_widget_get_allocation_height(eventbox));
+
+      lives_painter_move_to(cr,offset_start,0);
+      lives_painter_line_to(cr,offset_end, lives_widget_get_allocation_height(eventbox));
+
+      lives_painter_move_to(cr,offset_end,0);
+      lives_painter_line_to(cr,offset_start, lives_widget_get_allocation_height(eventbox));
+
+      lives_painter_stroke(cr);
     }
     else {
-      if ((cfile->achans==0||!is_audio_eventbox(mt,eventbox))&&track>-1) {
-	cairo_t *cr = gdk_cairo_create (eventbox->window);
+      if ((!is_audio_eventbox(mt,eventbox))&&track>-1) {
 	filenum=get_frame_event_clip(block->start_event,track);
 	last_framenum=-1;
 	for (i=offset_start;i<offset_end;i+=BLOCK_THUMB_WIDTH) {
 	  if (i>x2) break;
 	  event=get_frame_event_at(mt->event_list,tc,event,FALSE);
-	  tc+=tl_span/eventbox->allocation.width*width*U_SEC;
+	  tc+=tl_span/lives_widget_get_allocation_width(eventbox)*width*U_SEC;
 	  if (i+width>=0) {
 	    // create a small thumb
 	    framenum=get_frame_event_frame(event,track);
 	    
-	    if (thumbnail!=NULL) gdk_pixbuf_unref(thumbnail);
+	    if (thumbnail!=NULL) lives_object_unref(thumbnail);
 	    thumbnail=NULL;
-	    if (framenum!=last_framenum) thumbnail=make_thumb(mt,filenum,width,eventbox->allocation.height-1,
+	    if (framenum!=last_framenum) thumbnail=make_thumb(mt,filenum,width,
+							      lives_widget_get_allocation_height(eventbox),
 							      framenum,FALSE);
 	    last_framenum=framenum;
 	    // render it in the eventbox
 	    if (thumbnail!=NULL) {
-	      gdk_cairo_set_source_pixbuf (cr, thumbnail, i, 0);
+	      lives_painter_set_source_pixbuf (cr, thumbnail, i, 0);
 	      if (i+width>offset_end) {
 		width=offset_end-i;
 		// crop to width
-		cairo_new_path(cr);
-		cairo_rectangle(cr,0,0,i+width,eventbox->allocation.height-1);
-		cairo_clip(cr);
+		lives_painter_new_path(cr);
+		lives_painter_rectangle(cr,0,0,i+width,lives_widget_get_allocation_height(eventbox));
+		lives_painter_clip(cr);
 	      }
-	      cairo_paint (cr);
+	      lives_painter_paint (cr);
 	    }
 	    if (mainw->playing_file>-1) unpaint_lines(mt);
 	    mt->redraw_block=TRUE; // stop drawing cursor during playback
@@ -820,21 +907,19 @@
 	    mt->redraw_block=FALSE;
 	  }
 	}
-	if (thumbnail!=NULL) gdk_pixbuf_unref(thumbnail);
-	cairo_destroy (cr);
+	if (thumbnail!=NULL) lives_object_unref(thumbnail);
       }
       else {
-	set_fg_colour(audcol.red>>8,audcol.green>>8,audcol.blue>>8);
-	gdk_draw_rectangle (GDK_DRAWABLE(eventbox->window), mainw->general_gc, TRUE, offset_start, 0, 
-			    offset_end-offset_start, eventbox->allocation.height-1);
-      }
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_start, 
-		     eventbox->allocation.height-1);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_end, 
-		     eventbox->allocation.height-1, offset_end, 0);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_end, 0);
-      gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 
-		     eventbox->allocation.height-1, offset_end, eventbox->allocation.height-1);
+	lives_painter_set_source_rgb(cr,(double)audcol.red/65535.,(double)audcol.green/65535.,(double)audcol.blue/65535.);
+	lives_painter_new_path(cr);
+	lives_painter_rectangle(cr,offset_start,0,offset_end-offset_start,lives_widget_get_allocation_height(eventbox));
+	lives_painter_fill(cr);
+      }
+      lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      lives_painter_new_path(cr);
+      lives_painter_rectangle(cr,offset_start, 0, offset_end-offset_start, lives_widget_get_allocation_height(eventbox));
+      lives_painter_stroke(cr);
+
       if (mainw->playing_file>-1) unpaint_lines(mt);
       mt->redraw_block=TRUE; // stop drawing cursor during playback
       if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
@@ -842,56 +927,70 @@
     }
     break;
   case BLOCK_SELECTED:
-    gdk_draw_rectangle (GDK_DRAWABLE(eventbox->window), mt->window->style->bg_gc[0], TRUE, offset_start, 0, 
-			offset_end-offset_start, eventbox->allocation.height-1);
-    gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_start, 
-		   eventbox->allocation.height-1);
-    gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_end, eventbox->allocation.height-1, 
-		   offset_end, 0);
-    gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_end, 
-		   eventbox->allocation.height-1);
-    gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 
-		   eventbox->allocation.height-1, offset_end, 0);
-    gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 0, offset_end, 0);
-    gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset_start, 
-		   eventbox->allocation.height-1, offset_end, eventbox->allocation.height-1);
+    lives_painter_new_path(cr);
+    lives_painter_set_source_rgba (cr, 
+				   LIVES_WIDGET_COLOR_SCALE(bgcolor.red),
+				   LIVES_WIDGET_COLOR_SCALE(bgcolor.green), 
+				   LIVES_WIDGET_COLOR_SCALE(bgcolor.blue), 
+				   0.6);
+    lives_painter_rectangle(cr,offset_start, 0, offset_end-offset_start, lives_widget_get_allocation_height(eventbox));
+    lives_painter_fill(cr);
+
+    lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+    lives_painter_new_path(cr);
+    lives_painter_rectangle(cr,offset_start, 0, offset_end-offset_start, lives_widget_get_allocation_height(eventbox));
+
+    lives_painter_move_to(cr,offset_start,0);
+    lives_painter_line_to(cr,offset_end, lives_widget_get_allocation_height(eventbox));
+    
+    lives_painter_move_to(cr,offset_end,0);
+    lives_painter_line_to(cr,offset_start, lives_widget_get_allocation_height(eventbox));
+
+    lives_painter_stroke(cr);
+
     break;
   }
-  if (mainw->playing_file>-1) unpaint_lines(mt);
-  mt->redraw_block=TRUE; // stop drawing cursor during playback
-  if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
-  mt->redraw_block=FALSE; // stop drawing cursor during playback
+
+  if (surf!=NULL) lives_painter_destroy (cr);
+
 }
 
 
 
-static void draw_aparams(lives_mt *mt, GtkWidget *eventbox, GList *param_list, weed_plant_t *init_event, gint startx, gint width) {
+static void draw_aparams(lives_mt *mt, GtkWidget *eventbox, lives_painter_t *cr, GList *param_list, weed_plant_t *init_event, 
+			 int startx, int width) {
   // draw audio parameters : currently we overlay coloured lines on the audio track to show the level of 
   // parameters in the audio_volume plugin
   // we only display whichever parameters the user has elected to show
 
+  GList *plist;
 
-  gdouble dtime;
+  weed_plant_t **in_params,*param,*ptmpl;
   weed_plant_t *filter,*inst,*deinit_event;
-  gdouble ratio;
+
+  weed_timecode_t tc,start_tc,end_tc;
+
+  double tl_span=mt->tl_max-mt->tl_min;
+  double dtime;
+  double ratio;
   double vald,mind,maxd,*valds;
+
+  double y;
+
   int vali,mini,maxi,*valis;
   int i,error,pnum;
-  weed_plant_t **in_params,*param,*ptmpl;
-  weed_timecode_t tc,start_tc,end_tc;
   int hint;
-  gdouble tl_span=mt->tl_max-mt->tl_min;
-  gint offset_start,offset_end,startpos;
-  GList *plist;
+
+  int offset_start,offset_end,startpos;
+  int track;
+
   gchar *fhash;
-  gint track;
 
-  void **pchainx=weed_get_voidptr_array(init_event,"in_parameters",&error);
+  void **pchainx=NULL;
 
   fhash=weed_get_string_value(init_event,"filter",&error);
 
   if (fhash==NULL) {
-    weed_free(pchainx);
     return;
   }
 
@@ -906,25 +1005,35 @@
   start_tc=get_event_timecode(init_event);
   end_tc=get_event_timecode(deinit_event);
 
-  offset_start=(gint)((start_tc/U_SEC-mt->tl_min)/tl_span*eventbox->allocation.width+.5);
-  offset_end=(gint)((end_tc/U_SEC-mt->tl_min)/tl_span*eventbox->allocation.width+.5);
+  offset_start=(int)((start_tc/U_SEC-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5);
+  offset_end=(int)((end_tc/U_SEC-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5);
 
-  if (offset_end<0||offset_start>eventbox->allocation.width) {
+  if (offset_end<0||offset_start>lives_widget_get_allocation_width(eventbox)) {
     weed_free(in_params);
-    weed_free(pchainx);
     return;
   }
 
   if (offset_start>startx) startpos=offset_start;
   else startpos=startx;
 
-  track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox),"layer_number"))+1;
+  track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox),"layer_number"))+mt->opts.back_audio_tracks;
 
+  lives_painter_set_line_width(cr,1.);
+  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+
+  if (weed_plant_has_leaf(init_event,"in_parameters")) {
+    if (weed_leaf_num_elements(init_event,"in_parameters")>0)
+      pchainx=weed_get_voidptr_array(init_event,"in_parameters",&error);
+  }
+
+  //lives_painter_set_operator (cr, LIVES_PAINTER_OPERATOR_DEST_OVER);
   for (i=startpos;i<startx+width;i++) {
     dtime=get_time_from_x(mt,i);
     tc=dtime*U_SEC;
     if (tc>=end_tc) break;
-    interpolate_params(inst,pchainx,tc);
+
+    if (pchainx!=NULL) interpolate_params(inst,pchainx,tc);
+
     plist=param_list;
     while (plist!=NULL) {
       pnum=GPOINTER_TO_INT(plist->data);
@@ -938,7 +1047,7 @@
 	else vali=valis[0];
 	mini=weed_get_int_value(ptmpl,"min",&error);
 	maxi=weed_get_int_value(ptmpl,"max",&error);
-	ratio=(gdouble)(vali-mini)/(gdouble)(maxi-mini);
+	ratio=(double)(vali-mini)/(double)(maxi-mini);
 	weed_free(valis);
 	break;
       case WEED_HINT_FLOAT:
@@ -953,11 +1062,19 @@
       default:
 	continue;
       }
-      gdk_draw_point(GDK_DRAWABLE(eventbox->window),mt->window->style->fg_gc[0],i,(1.-ratio)*eventbox->allocation.height);
+
+      y=(1.-ratio)*(double)lives_widget_get_allocation_height(eventbox);
+
+      lives_painter_move_to(cr, i-1, y-1);
+      lives_painter_line_to(cr, i, y);
+ 
       plist=plist->next;
     }
   }
 
+  lives_painter_stroke (cr);
+  lives_painter_surface_flush (lives_painter_get_target(cr));
+
   weed_free(pchainx);
   weed_free(in_params);
 }
@@ -965,14 +1082,10 @@
 
 
 static void redraw_eventbox(lives_mt *mt, GtkWidget *eventbox) {
-  GdkPixbuf *bgimg;
 
-  if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
-    gdk_pixbuf_unref(bgimg);
-    g_object_set_data(G_OBJECT(eventbox), "bgimg",NULL);
-  }
+  if (!G_IS_OBJECT(eventbox)) return;
 
-  g_object_set_data (G_OBJECT(eventbox), "drawn",GINT_TO_POINTER(FALSE));
+  g_object_set_data(G_OBJECT(eventbox),"drawn",GINT_TO_POINTER(FALSE));
   gtk_widget_queue_draw (eventbox); // redraw the track
 
   if (is_audio_eventbox(mt,eventbox)) {
@@ -980,124 +1093,160 @@
     GtkWidget *xeventbox;
     if (cfile->achans>0) {
       xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
-      if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
-	gdk_pixbuf_unref(bgimg);
-	g_object_set_data(G_OBJECT(xeventbox), "bgimg",NULL);
-      }
-      
       g_object_set_data (G_OBJECT(xeventbox), "drawn",GINT_TO_POINTER(FALSE));
       gtk_widget_queue_draw (xeventbox); // redraw the track
-
       if (cfile->achans>1) {
 	xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
-	if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
-	  gdk_pixbuf_unref(bgimg);
-	  g_object_set_data(G_OBJECT(xeventbox), "bgimg",NULL);
-	}
-	
 	g_object_set_data (G_OBJECT(xeventbox), "drawn",GINT_TO_POINTER(FALSE));
 	gtk_widget_queue_draw (xeventbox); // redraw the track
       }
     }
   }
+  gdk_window_process_all_updates();
 }
 
 
-static gint expose_track_event (GtkWidget *eventbox, GdkEventExpose *event, gpointer user_data) {
-  track_rect *block;
+#if GTK_CHECK_VERSION(3,0,0)
+static boolean expose_track_event (GtkWidget *eventbox, lives_painter_t *cairo, gpointer user_data) {
+#else
+static boolean expose_track_event (GtkWidget *eventbox, GdkEventExpose *event, gpointer user_data) {
+  lives_painter_t *cairo=NULL;
+#endif
+
+  lives_painter_t *cr=cairo;
+
   lives_mt *mt=(lives_mt *)user_data;
-  GdkRegion *reg=event->region;
-  GdkRectangle rect;
-  gint hidden;
-  gint startx,width;
-  GdkPixbuf *bgimage;
+
+  track_rect *block;
   track_rect *sblock=NULL;
+
   gulong idlefunc;
 
+#if !GTK_CHECK_VERSION(3,0,0)
+  GdkRegion *reg;
+  GdkRectangle rect;
+#endif
+
+  lives_painter_surface_t *bgimage;
+
+  int startx,starty,width,height;
+  int hidden;
+
   if (mt->no_expose) return TRUE;
 
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (event!=NULL&&event->count>0) {
+    return TRUE;
+  }
+  reg=event->region;
   gdk_region_get_clipbox(reg,&rect);
   startx=rect.x;
+  starty=rect.y;
   width=rect.width;
+  height=rect.height;
+#else
+  startx=starty=0;
+  width=lives_widget_get_allocation_width(eventbox);
+  height=lives_widget_get_allocation_height(eventbox);
+#endif
 
-  if (event!=NULL&&event->count>0) {
-    return TRUE;
-  }
+  if (width==0) return FALSE;
 
-  hidden=(gint)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
+  hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
   if (hidden!=0) {
     GtkWidget *label=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "label");
     gtk_widget_hide(eventbox);
-    gtk_widget_hide(label->parent);
+    gtk_widget_hide(lives_widget_get_parent(label));
     return FALSE;
   }
 
-
   idlefunc=mt->idlefunc;
-  if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
-  mt->idlefunc=0;
+  if (mt->idlefunc>0) {
+    g_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
+  }
+
+  if (width>lives_widget_get_allocation_width(eventbox)-startx) width=lives_widget_get_allocation_width(eventbox)-startx;
 
-  if (width>eventbox->allocation.width-startx) width=eventbox->allocation.width-startx;
+  if (cairo==NULL) cr = lives_painter_create_from_widget (eventbox);
+  bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
+
+ draw1:
 
   if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "drawn"))) {
-    bgimage=(GdkPixbuf *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
-    if (bgimage!=NULL&&lives_pixbuf_get_width(bgimage)>0) {
-      cairo_t *cr = gdk_cairo_create (eventbox->window);
-      gdk_cairo_set_source_pixbuf (cr, bgimage, startx, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
+    if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
+      lives_painter_set_source_surface (cr, bgimage, startx, starty);
+      lives_painter_rectangle(cr,startx,starty,width,height);
+      lives_painter_paint (cr);
+ 
+      if (mt->block_selected!=NULL&&mt->block_selected->eventbox==eventbox) {
+	draw_block(mt,cr,NULL,mt->block_selected,-1,-1);
+      }
+
       if (is_audio_eventbox(mt,eventbox)&&mt->avol_init_event!=NULL&&mt->aparam_view_list!=NULL) 
-	draw_aparams(mt,eventbox,mt->aparam_view_list,mt->avol_init_event,startx,width);
-      if (mt->block_selected!=NULL) draw_block(mt,mt->block_selected,-1,-1);
+	draw_aparams(mt,eventbox,cr,mt->aparam_view_list,mt->avol_init_event,startx,width);
+
       if (idlefunc>0) {
 	mt->idlefunc=mt_idle_add(mt);
       }
-      return FALSE;
+      if (cairo==NULL) lives_painter_destroy (cr);
+      return TRUE;
     }
   }
-  set_cursor_style(mt,LIVES_CURSOR_BUSY,0,0,0,0,0);
 
-  mt->redraw_block=TRUE; // stop drawing cursor during playback
-  gdk_window_clear_area (eventbox->window, startx, 0, width, eventbox->allocation.height);
-  mt->redraw_block=FALSE;
+#if !GTK_CHECK_VERSION(3,0,0)
+  width=lives_widget_get_allocation_width(eventbox);
+  height=lives_widget_get_allocation_height(eventbox);
+#endif
 
-  block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
+  if (bgimage!=NULL) lives_painter_surface_destroy(bgimage);
 
-  if (mt->block_selected!=NULL) {
-    sblock=mt->block_selected;
-    sblock->state=BLOCK_UNSELECTED;
-  }
+  bgimage=lives_painter_image_surface_create(LIVES_PAINTER_FORMAT_ARGB32,
+					     width,
+					     height);
 
-  while (block!=NULL) {
-    draw_block(mt,block,startx,width);
-    block=block->next;
-    mt->redraw_block=TRUE; // stop drawing cursor during playback
-    if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
-    mt->redraw_block=FALSE;
-  }
+  if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
+    lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
-  bgimage=gdk_pixbuf_get_from_drawable(NULL,GDK_DRAWABLE(eventbox->window),NULL,0,0,0,0,
-				       eventbox->allocation.width,eventbox->allocation.height);
-  if (lives_pixbuf_get_width(bgimage)>0) {
-    g_object_set_data (G_OBJECT(eventbox), "drawn",GINT_TO_POINTER(TRUE));
-    g_object_set_data (G_OBJECT(eventbox), "bgimg",bgimage);
-  }
+    if (mt->block_selected!=NULL) {
+      sblock=mt->block_selected;
+      sblock->state=BLOCK_UNSELECTED;
+    }
+    
+    block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
+    
+    while (block!=NULL) {
+      draw_block(mt,NULL,bgimage,block,startx,width);
+      block=block->next;
+      mt->redraw_block=TRUE; // stop drawing cursor during playback
+      if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
+      mt->redraw_block=FALSE;
+    }
 
-  if (sblock!=NULL) {
-    mt->block_selected=sblock;
-    sblock->state=BLOCK_SELECTED;
-    draw_block(mt,mt->block_selected,-1,-1);
+    if (sblock!=NULL) {
+      mt->block_selected=sblock;
+      sblock->state=BLOCK_SELECTED;
+    }
+
+    lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+  }
+  else if (bgimage!=NULL) {
+    lives_painter_surface_destroy(bgimage);
+    bgimage=NULL;
   }
 
-  if (is_audio_eventbox(mt,eventbox)&&mt->avol_init_event!=NULL&&mt->aparam_view_list!=NULL) 
-    draw_aparams(mt,eventbox,mt->aparam_view_list,mt->avol_init_event,startx,width);
+  g_object_set_data(G_OBJECT(eventbox),"bgimg",(gpointer)bgimage);
+  g_object_set_data(G_OBJECT(eventbox),"drawn",GINT_TO_POINTER(bgimage!=NULL));
 
-  set_cursor_style(mt,LIVES_CURSOR_NORMAL,0,0,0,0,0);
+  if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) goto draw1;
+
+  if (cairo==NULL) lives_painter_destroy (cr);
 
   if (idlefunc>0) {
     mt->idlefunc=mt_idle_add(mt);
   }
-  return FALSE;
+
+  return TRUE;
 }
 
 
@@ -1118,12 +1267,12 @@
   return ltext;
 }
 
-gdouble mt_get_effect_time(lives_mt *mt) {
+double mt_get_effect_time(lives_mt *mt) {
   return q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC,mt->fps)/U_SEC;
 }
 
 
-static gboolean add_mt_param_box(lives_mt *mt) {
+boolean add_mt_param_box(lives_mt *mt) {
   // here we add a GUI box which will hold effect parameters
 
   // if we set keep_scale to TRUE, the current time slider is kept
@@ -1132,13 +1281,20 @@
   // returns TRUE if we have any parameters
 
   weed_plant_t *deinit_event;
-  gdouble fx_start_time,fx_end_time;
-  gchar *ltext;
+
   weed_timecode_t tc;
+
+  double fx_start_time,fx_end_time;
+  double cur_time=lives_ruler_get_value(LIVES_RULER (mt->timeline));
+
+  gchar *ltext;
+
+  boolean res=FALSE;
+
   int error;
-  gboolean res;
 
-  gdouble cur_time=GTK_RULER (mt->timeline)->position;
+  int dph=widget_opts.packing_height;
+  int dbw=widget_opts.border_width;
 
   tc=get_event_timecode((weed_plant_t *)mt->init_event);
   deinit_event=(weed_plant_t *)weed_get_voidptr_value(mt->init_event,"deinit_event",&error);
@@ -1150,24 +1306,23 @@
     gtk_widget_destroy(mt->fx_box);
   }
 
-  mt->fx_box=gtk_vbox_new(FALSE,0);
+  mt->fx_box=lives_vbox_new(FALSE,0);
   gtk_box_pack_end(GTK_BOX(mt->fx_base_box),mt->fx_box,TRUE,TRUE,0);
 
   ltext=mt_params_label(mt);
 
-  g_signal_handler_block(mt->node_spinbutton,mt->node_adj_func);
-  adjustment_configure (GTK_ADJUSTMENT(mt->node_adj), cur_time-fx_start_time, 0., 
-			fx_end_time-fx_start_time, 1./mt->fps, 10./mt->fps, 0.);
-  g_signal_handler_unblock(mt->node_spinbutton,mt->node_adj_func);
+  g_signal_handlers_block_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
+  lives_spin_button_configure (LIVES_SPIN_BUTTON(mt->node_spinbutton), cur_time-fx_start_time, 0., 
+			       fx_end_time-fx_start_time, 1./mt->fps, 10./mt->fps);
+  g_signal_handlers_unblock_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
 
+  widget_opts.packing_height=2.*widget_opts.scale;
+  widget_opts.border_width=2.*widget_opts.scale;
   res=make_param_box(GTK_VBOX (mt->fx_box), mt->current_rfx);
+  widget_opts.packing_height=dph;
+  widget_opts.border_width=dbw;
 
-  mt->fx_params_label=gtk_label_new(ltext);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mt->fx_params_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (mt->fx_box), mt->fx_params_label, FALSE, FALSE, 0);
+  gtk_label_set_text(GTK_LABEL(mt->fx_params_label),ltext);
 
   g_free(ltext);
 
@@ -1181,10 +1336,12 @@
 }
 
 
-static track_rect *get_block_from_time (GtkWidget *eventbox, gdouble time, lives_mt *mt) {
+static track_rect *get_block_from_time (GtkWidget *eventbox, double time, lives_mt *mt) {
   // return block (track_rect) at seconds time in eventbox
   weed_timecode_t tc=time*U_SECL;
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
+  track_rect *block;
+
+  block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
   tc=q_gint64(tc,mt->fps);
 
   while (block!=NULL) {
@@ -1223,7 +1380,7 @@
 
 
 
-static gboolean get_track_index(lives_mt *mt, weed_timecode_t tc) {
+static boolean get_track_index(lives_mt *mt, weed_timecode_t tc) {
   // set mt->track_index to the in_channel index of mt->current_track in "in_tracks" in mt->init_event
   // set -1 if there is no frame for that in_channel, or if mt->current_track lies outside the "in_tracks" of mt->init_event
 
@@ -1238,7 +1395,7 @@
   int track_index=mt->track_index;
 
   int chindx;
-  gboolean retval=FALSE;
+  boolean retval=FALSE;
 
   mt->track_index=-1;
   mt->inwidth=mt->inheight=0;
@@ -1270,7 +1427,8 @@
     for (i=0;i<num_in_tracks;i++) {
       if (in_tracks[i]==mt->current_track) {
 	mt->track_index=i;
-	if (mt->current_track>=0&&mt->current_track<numtracks&&clips[mt->current_track]>-1) {
+	if (mt->current_track>=0&&mt->current_track<numtracks&&
+	    (clips[mt->current_track]>-1)) {
 	  mt->inwidth=mainw->files[clips[mt->current_track]]->hsize*opwidth/cfile->hsize;
 	  mt->inheight=mainw->files[clips[mt->current_track]]->vsize*opheight/cfile->vsize;
 	}
@@ -1297,9 +1455,36 @@
 void track_select (lives_mt *mt) {
   int i;
   GtkWidget *labelbox,*ahbox,*eventbox,*oeventbox,*checkbutton=NULL;
-  gint hidden=0;
+  int hidden=0;
   weed_timecode_t tc;
 
+  if (mt->current_track<0) {
+    // back aud sel
+    
+    gtk_widget_set_sensitive(mt->select_track,FALSE);
+    gtk_widget_set_sensitive(mt->rename_track,FALSE);
+    gtk_widget_set_sensitive(mt->insert, FALSE);
+
+    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
+
+
+    gtk_widget_set_sensitive(mt->cback_audio,FALSE);
+    gtk_widget_set_sensitive (mt->audio_insert, mt->file_selected>0&&
+			      mainw->files[mt->file_selected]->achans>0&&
+			      mainw->files[mt->file_selected]->laudio_time>0.);
+
+  }
+  else {
+    // vid sel
+    gtk_widget_set_sensitive(mt->select_track,TRUE);
+    gtk_widget_set_sensitive(mt->rename_track,TRUE);
+    gtk_widget_set_sensitive(mt->cback_audio,TRUE);
+
+    gtk_widget_set_sensitive(mt->insert, mt->file_selected>0&&mainw->files[mt->file_selected]->frames>0);
+    gtk_widget_set_sensitive(mt->adjust_start_end, mt->file_selected>0);
+    gtk_widget_set_sensitive(mt->audio_insert, FALSE);
+  }
+
   if (cfile->achans>0) {
     for (i=0;i<g_list_length(mt->audio_draws);i++) {
       eventbox=(GtkWidget *)g_list_nth_data(mt->audio_draws,i);
@@ -1309,26 +1494,18 @@
       if (hidden==0) {
 	labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
 	ahbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
-	if (mt->current_track==i-mt->opts.back_audio_tracks&&(mt->current_track==-1||mt->aud_track_selected)) {
-	  if (labelbox!=NULL) gtk_widget_set_state(labelbox,GTK_STATE_SELECTED);
-	  if (ahbox!=NULL) gtk_widget_set_state(ahbox,GTK_STATE_SELECTED);
+	if (mt->current_track==i-mt->opts.back_audio_tracks&&(mt->current_track<0||mt->aud_track_selected)) {
+	  // audio track is selected
+
+	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
+	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
 	  gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
 	  gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	  if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) 
-	    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
-	  gtk_widget_set_sensitive(mt->select_track,FALSE);
-	  gtk_widget_set_sensitive(mt->cback_audio,FALSE);
-	  gtk_widget_set_sensitive (mt->audio_insert, mt->file_selected>0&&
-				    mainw->files[mt->file_selected]->achans>0&&
-				    mainw->files[mt->file_selected]->laudio_time>0.);
-	  gtk_widget_set_sensitive (mt->insert, FALSE);
-	  if (mt->poly_state==POLY_FX_STACK) polymorph(mt,POLY_FX_STACK);
+
 	}
 	else {
-	  if (labelbox!=NULL&&GTK_IS_WIDGET(labelbox)) gtk_widget_set_state(labelbox,GTK_STATE_NORMAL);
-	  if (ahbox!=NULL&&GTK_IS_WIDGET(ahbox)) gtk_widget_set_state(ahbox,GTK_STATE_NORMAL);
-	  gtk_widget_set_sensitive(mt->select_track,TRUE);
-	  gtk_widget_set_sensitive(mt->cback_audio,TRUE);
+	  if (labelbox!=NULL&&GTK_IS_WIDGET(labelbox)) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+	  if (ahbox!=NULL&&GTK_IS_WIDGET(ahbox)) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
 	}
       }
     }
@@ -1340,58 +1517,48 @@
     if (hidden==0) {
       labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
       ahbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
-      if (i==mt->current_track&&!mt->aud_track_selected) {
-	if (labelbox!=NULL) gtk_widget_set_state(labelbox,GTK_STATE_SELECTED);
-	if (ahbox!=NULL) gtk_widget_set_state(ahbox,GTK_STATE_SELECTED);
-	gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-
-	checkbutton=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "checkbutton");
+      checkbutton=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "checkbutton");
+      if (i==mt->current_track) {
 	
-#ifdef ENABLE_GIW
-	if ((prefs->lamp_buttons&&!giw_led_get_mode(GIW_LED(checkbutton)))||(!prefs->lamp_buttons&&
-#else			
-        if (
-#endif
-	    !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)))
-#ifdef ENABLE_GIW
-	    )
-#endif
-	  {
-	  if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) 
-	    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
-	  else on_seltrack_activate(GTK_MENU_ITEM(mt->select_track),mt);
+	if (!mt->aud_track_selected) {
+	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
+	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
+	  if (checkbutton!=NULL) {
+	    // gtk 3+ idiocy...
+	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
+	    gtk_widget_queue_draw(checkbutton);
+	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
+	    gtk_widget_queue_draw(checkbutton);
+	  }
+	  gtk_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+	  gtk_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
 	}
 	else {
-	  if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) 
-	    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),TRUE);
-	  else on_seltrack_activate(GTK_MENU_ITEM(mt->select_track),mt);
+	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
+	  if (checkbutton!=NULL) {
+	    // gtk 3+ idiocy...
+	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
+	    gtk_widget_queue_draw(checkbutton);
+	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
+	    gtk_widget_queue_draw(checkbutton);
+	  }
 	}
-	gtk_widget_set_sensitive (mt->insert, mt->file_selected>0&&mainw->files[mt->file_selected]->frames>0);
-	gtk_widget_set_sensitive (mt->adjust_start_end, mt->file_selected>0);
-	gtk_widget_set_sensitive (mt->audio_insert, FALSE);
-	if (mt->poly_state==POLY_FX_STACK) polymorph(mt,POLY_FX_STACK);
-      }
-      else {
-	if (labelbox!=NULL) gtk_widget_set_state(labelbox,GTK_STATE_NORMAL);
-	if (ahbox!=NULL) gtk_widget_set_state(ahbox,GTK_STATE_NORMAL);
-      }
-    }
-    else {
-      if (i==mt->current_track) {
-	checkbutton=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "checkbutton");
+
 #ifdef ENABLE_GIW
 	if ((prefs->lamp_buttons&&!giw_led_get_mode(GIW_LED(checkbutton)))||(!prefs->lamp_buttons&&
 #else			
-        if (
+	if (
 #endif
-	    !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton)))
+	    !lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton)))
 #ifdef ENABLE_GIW
-	    )
+	  )
 #endif
 	  {
-	   if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) 
-	     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
+	    // set other widgets
+	    if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mt->select_track))) {
+ 	      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),FALSE);
+	    }
 	  else on_seltrack_activate(GTK_MENU_ITEM(mt->select_track),mt);
 	}
 	else {
@@ -1399,13 +1566,22 @@
 	    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->select_track),TRUE);
 	  else on_seltrack_activate(GTK_MENU_ITEM(mt->select_track),mt);
 	}
+    }
+    else {
+	if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+	if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
+	if (checkbutton!=NULL) {
+	  lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
+	  gtk_widget_queue_draw(checkbutton);
+	}
       }
     }
   }
 
-  if (mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&
+  if (mt->poly_state==POLY_FX_STACK) polymorph(mt,POLY_FX_STACK);
+  else if (mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&
       weed_plant_has_leaf(mt->init_event,"in_tracks")) {
-    gboolean xx;
+    boolean xx;
     weed_timecode_t init_tc=get_event_timecode(mt->init_event);
     tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+init_tc,mt->fps);
 
@@ -1416,7 +1592,7 @@
 	interpolate_params((weed_plant_t *)mt->current_rfx->source,pchain,tc);
       }
       if (!xx) {
-	gboolean aprev=mt->opts.fx_auto_preview;
+	boolean aprev=mt->opts.fx_auto_preview;
 	mt->opts.fx_auto_preview=FALSE;
 	mainw->block_param_updates=TRUE;
 	update_visual_params(mt->current_rfx,FALSE);
@@ -1439,17 +1615,17 @@
 }
 
 
-static void show_track_info(lives_mt *mt, GtkWidget *eventbox, gint track, gdouble timesecs) {
+static void show_track_info(lives_mt *mt, GtkWidget *eventbox, int track, double timesecs) {
   gchar *tmp,*tmp1;
   track_rect *block=get_block_from_time(eventbox,timesecs,mt);
-  gint filenum;
+  int filenum;
 
   clear_context(mt);
-  if (cfile->achans==0||!is_audio_eventbox(mt,eventbox)) add_context_label 
-							   (mt,(tmp=g_strdup_printf 
-								(_("Current track: %s (layer %d)\n"),
-								 g_object_get_data(G_OBJECT(eventbox),
-										   "track_name"),track)));
+  if (!is_audio_eventbox(mt,eventbox)) add_context_label 
+					 (mt,(tmp=g_strdup_printf 
+					      (_("Current track: %s (layer %d)\n"),
+					       g_object_get_data(G_OBJECT(eventbox),
+								 "track_name"),track)));
   else {
     if (track==-1) add_context_label (mt,(tmp=g_strdup (_("Current track: Backing audio\n"))));
     else add_context_label (mt,(tmp=g_strdup_printf (_("Current track: Layer %d audio\n"),track)));
@@ -1458,7 +1634,7 @@
   add_context_label (mt,(tmp=g_strdup_printf (_("%.2f sec.\n"),timesecs)));
   g_free(tmp);
   if (block!=NULL) {
-    if (cfile->achans==0||!is_audio_eventbox(mt,eventbox)) filenum=get_frame_event_clip(block->start_event,track);
+    if (!is_audio_eventbox(mt,eventbox)) filenum=get_frame_event_clip(block->start_event,track);
     else filenum=get_audio_frame_clip(block->start_event,track);
     add_context_label (mt,(tmp=g_strdup_printf (_("Source: %s"),(tmp1=g_path_get_basename(mainw->files[filenum]->name)))));
     g_free(tmp);
@@ -1469,10 +1645,10 @@
 }
 
 
-static gboolean
+static boolean
 atrack_ebox_pressed (GtkWidget *labelbox, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gint current_track=mt->current_track;
+  int current_track=mt->current_track;
   mt->current_track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(labelbox),"layer_number"));
   if (current_track!=mt->current_track) mt->fm_edit_event=NULL;
   mt->aud_track_selected=TRUE;
@@ -1485,10 +1661,10 @@
 
 
 
-static gboolean
+static boolean
 track_ebox_pressed (GtkWidget *labelbox, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gint current_track=mt->current_track;
+  int current_track=mt->current_track;
   mt->current_track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(labelbox),"layer_number"));
   if (current_track!=mt->current_track) mt->fm_edit_event=NULL;
   mt->aud_track_selected=FALSE;
@@ -1499,18 +1675,18 @@
 
 
 
-static gboolean
+static boolean
 on_mt_timeline_scroll           (GtkWidget       *widget,
 				 GdkEventScroll  *event,
 				 gpointer         user_data) {
   // scroll timeline up/down with mouse wheel
   lives_mt *mt=(lives_mt *)user_data;
 
-  gint cval;
+  int cval;
 
   if (!gtk_window_has_toplevel_focus(GTK_WINDOW(mainw->multitrack->window))) return FALSE;
 
-  cval=GTK_ADJUSTMENT(GTK_RANGE(mt->scrollbar)->adjustment)->value;
+  cval=gtk_adjustment_get_value(gtk_range_get_adjustment(GTK_RANGE(mt->scrollbar)));
 
   if (event->direction==GDK_SCROLL_UP) {
     if (--cval<0) return FALSE;;
@@ -1526,13 +1702,13 @@
 
 
 
-static gint get_top_track_for(lives_mt *mt, gint track) {
+static int get_top_track_for(lives_mt *mt, int track) {
   // find top track such that all of track fits at the bottom
 
   GtkWidget *eventbox;
   GList *vdraw;
-  gint extras=mt->max_disp_vtracks-1;
-  gint hidden,expanded;
+  int extras=mt->max_disp_vtracks-1;
+  int hidden,expanded;
 
   if (mt->opts.back_audio_tracks>0&&mt->audio_draws==NULL) mt->opts.back_audio_tracks=0;
   if (cfile->achans>0&&mt->opts.back_audio_tracks>0) {
@@ -1593,11 +1769,10 @@
 
 
 
-void scroll_tracks (lives_mt *mt, gint top_track) {
-  int rows=0;
+ void scroll_tracks (lives_mt *mt, int top_track, boolean set_value) {
   GList *vdraws=mt->video_draws;
   GList *table_children;
-  gulong seltrack_func;
+
   GtkWidget *eventbox;
   GtkWidget *label;
   GtkWidget *arrow;
@@ -1605,15 +1780,19 @@
   GtkWidget *labelbox;
   GtkWidget *hbox;
   GtkWidget *ahbox;
-  gint aud_tracks=0;
-  gboolean expanded;
   GtkWidget *xeventbox,*aeventbox;
-  gint hidden;
-  gulong exp_track_func;
 
-  GTK_ADJUSTMENT(mt->vadjustment)->page_size=mt->max_disp_vtracks;
-  GTK_ADJUSTMENT(mt->vadjustment)->upper=mt->num_video_tracks*2-1;
-  GTK_ADJUSTMENT(mt->vadjustment)->value=top_track;
+  boolean expanded;
+
+  int rows=0;
+  int aud_tracks=0;
+  int hidden;
+
+  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),(double)mt->max_disp_vtracks);
+  lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),(double)(mt->num_video_tracks*2-1));
+
+  if (set_value)
+    gtk_adjustment_set_value(GTK_ADJUSTMENT(mt->vadjustment),(double)top_track);
 
   if (top_track<0) top_track=0;
   if (top_track>=g_list_length(mt->video_draws)) top_track=g_list_length(mt->video_draws)-1;
@@ -1665,7 +1844,7 @@
 
   gtk_container_add (GTK_CONTAINER (mt->tl_eventbox), mt->timeline_table);
 
-  gtk_table_set_row_spacings (GTK_TABLE(mt->timeline_table),5);
+  gtk_table_set_row_spacings (GTK_TABLE(mt->timeline_table),widget_opts.packing_height>>1);
   gtk_table_set_col_spacings (GTK_TABLE(mt->timeline_table),0);
 
   if (mt->opts.back_audio_tracks>0&&mt->audio_draws==NULL) mt->opts.back_audio_tracks=0;
@@ -1681,24 +1860,24 @@
       arrow=(GTK_WIDGET(g_object_get_data(G_OBJECT(mt->audio_draws->data),"arrow")));
       
       labelbox=gtk_event_box_new();
-      hbox=gtk_hbox_new(FALSE,10);
+      hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
       ahbox=gtk_event_box_new();
       
-      gtk_widget_set_state(label,GTK_STATE_NORMAL);
-      gtk_widget_set_state(arrow,GTK_STATE_NORMAL);
+      lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+      lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
 
       if (palette->style&STYLE_1) {
 	if (palette->style&STYLE_3) {
-	  if (labelbox!=NULL) gtk_widget_modify_bg (labelbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	  if (ahbox!=NULL) gtk_widget_modify_bg (ahbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	  gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	  gtk_widget_modify_fg (arrow, GTK_STATE_SELECTED, &palette->info_text);
+	  if (labelbox!=NULL) lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	  if (ahbox!=NULL) lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
 	}
 	else {
-	  if (labelbox!=NULL) gtk_widget_modify_bg (labelbox, GTK_STATE_SELECTED, &palette->normal_back);
-	  if (ahbox!=NULL) gtk_widget_modify_bg (ahbox, GTK_STATE_SELECTED, &palette->normal_back);
-	  gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->normal_fore);
-	  gtk_widget_modify_fg (arrow, GTK_STATE_SELECTED, &palette->normal_fore);
+	  if (labelbox!=NULL) lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	  if (ahbox!=NULL) lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
 	}
       }
       gtk_container_add (GTK_CONTAINER (labelbox), hbox);
@@ -1725,19 +1904,18 @@
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			(GtkAttachOptions) (GTK_FILL), 0, 0);
 
-      gtk_widget_modify_bg((GtkWidget *)mt->audio_draws->data, GTK_STATE_NORMAL, &palette->white);
-
-      
       g_signal_connect (GTK_OBJECT (mt->audio_draws->data), "button_press_event",
 			G_CALLBACK (on_track_click),
 			(gpointer)mt);
       g_signal_connect (GTK_OBJECT (mt->audio_draws->data), "button_release_event",
 			G_CALLBACK (on_track_release),
 			(gpointer)mt);
-      exp_track_func=g_signal_connect_after (GTK_OBJECT (mt->audio_draws->data), "expose_event",
-					     G_CALLBACK (expose_track_event),
-					     (gpointer)mt);
-      g_object_set_data (G_OBJECT(mt->audio_draws->data),"expose_func",(gpointer)exp_track_func);
+
+      lives_widget_set_bg_color(GTK_WIDGET(mt->audio_draws->data), LIVES_WIDGET_STATE_NORMAL, &palette->white);
+      gtk_widget_set_app_paintable(GTK_WIDGET(mt->audio_draws->data),TRUE);
+      g_signal_connect (GTK_OBJECT (mt->audio_draws->data), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+			G_CALLBACK (expose_track_event),
+			(gpointer)mt);
 
       if (expanded) {
 	xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"achan0");
@@ -1746,13 +1924,12 @@
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			  (GtkAttachOptions) (GTK_FILL), 0, 0);
 	
-	exp_track_func=g_signal_connect_after (GTK_OBJECT (xeventbox), "expose_event",
-					       G_CALLBACK (mt_expose_laudtrack_event),
-					       (gpointer)mt);
-	g_object_set_data (G_OBJECT(xeventbox),"expose_func",(gpointer)exp_track_func);
+	lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+	gtk_widget_set_app_paintable(xeventbox,TRUE);
+	g_signal_connect (GTK_OBJECT (xeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+			  G_CALLBACK (mt_expose_audtrack_event),
+			  (gpointer)mt);
 
-	gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->white);
-	
 	if (cfile->achans>1) {
 	  xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"achan1");
 	  
@@ -1760,12 +1937,12 @@
 			    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			    (GtkAttachOptions) (GTK_FILL), 0, 0);
 	  
-	  exp_track_func=g_signal_connect_after (GTK_OBJECT (xeventbox), "expose_event",
-						 G_CALLBACK (mt_expose_raudtrack_event),
-						 (gpointer)mt);
+	  lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+	  gtk_widget_set_app_paintable(xeventbox,TRUE);
+	  g_signal_connect (GTK_OBJECT (xeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+			    G_CALLBACK (mt_expose_audtrack_event),
+			    (gpointer)mt);
 	  
-	  gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->white);
-	  g_object_set_data (G_OBJECT(xeventbox),"expose_func",(gpointer)exp_track_func);
 	}
 	aud_tracks+=cfile->achans;
       }
@@ -1773,7 +1950,8 @@
   }
 
 
-  GTK_ADJUSTMENT(mt->vadjustment)->page_size-=aud_tracks;
+  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+				 (double)((int)(lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment)))-aud_tracks));
 
   vdraws=g_list_nth(mt->video_draws,top_track);
 
@@ -1791,42 +1969,38 @@
       arrow=(GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"arrow")));
       checkbutton=(GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"checkbutton")));
       labelbox=gtk_event_box_new();
-      hbox=gtk_hbox_new(FALSE,10);
+      hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
       ahbox=gtk_event_box_new();
-      gtk_widget_set_state(label,GTK_STATE_NORMAL);
-      gtk_widget_set_state(arrow,GTK_STATE_NORMAL);
+      lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+      lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
+      lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
 
       if (palette->style&STYLE_1) {
 	if (palette->style&STYLE_3) {
-	  gtk_widget_modify_bg (labelbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	  gtk_widget_modify_bg (ahbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	  gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	  gtk_widget_modify_fg (arrow, GTK_STATE_SELECTED, &palette->info_text);
-	  gtk_widget_modify_fg (checkbutton, GTK_STATE_SELECTED, &palette->info_text);
+	  lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	  lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	  lives_widget_set_bg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	  lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
 	}
 	else {
-	  gtk_widget_modify_bg (labelbox, GTK_STATE_SELECTED, &palette->normal_back);
-	  gtk_widget_modify_bg (ahbox, GTK_STATE_SELECTED, &palette->normal_back);
-	  gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->normal_fore);
-	  gtk_widget_modify_fg (arrow, GTK_STATE_SELECTED, &palette->normal_fore);
-	  gtk_widget_modify_fg (checkbutton, GTK_STATE_SELECTED, &palette->normal_fore);
+	  lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	  lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	  lives_widget_set_bg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+	  lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
 	}
-#ifdef ENABLE_GIW
-	if (prefs->lamp_buttons) {
-	  if (0&&palette->style&STYLE_3) {
-	    gtk_widget_modify_bg (checkbutton, GTK_STATE_SELECTED, &palette->normal_back);
-	  }
-	  else {
-	    gtk_widget_modify_bg (checkbutton, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	  }
-	}
-#endif
       }
 
-
 #ifdef ENABLE_GIW
       if (prefs->lamp_buttons) {
+#if GTK_CHECK_VERSION(3,0,0)
+	giw_led_set_rgba(GIW_LED(checkbutton),palette->light_green,palette->dark_red);
+#else
 	giw_led_set_colors(GIW_LED(checkbutton),palette->light_green,palette->dark_red);
+#endif
       }
 #endif
 
@@ -1849,28 +2023,27 @@
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			(GtkAttachOptions) (GTK_FILL), 0, 0);
 
-      gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->white);
-
       if (!prefs->lamp_buttons) {
-	seltrack_func=g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
+	g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 					      G_CALLBACK (on_seltrack_toggled),
 					      mt);
       }
       else {
-	seltrack_func=g_signal_connect_after (GTK_OBJECT (checkbutton), "mode-changed",
-					      G_CALLBACK (on_seltrack_toggled),
-					      mt);
+	g_signal_connect_after (GTK_OBJECT (checkbutton), "mode-changed",
+				G_CALLBACK (on_seltrack_toggled),
+				mt);
       }
+
       g_signal_connect (GTK_OBJECT (labelbox), "button_press_event",
 			G_CALLBACK (track_ebox_pressed),
 			(gpointer)mt);
 
-      g_object_set_data(G_OBJECT(checkbutton),"tfunc",(gpointer)seltrack_func);
-
-      exp_track_func=g_signal_connect_after (GTK_OBJECT (eventbox), "expose_event",
-			      G_CALLBACK (expose_track_event),
-			      (gpointer)mt);
-      g_object_set_data (G_OBJECT(eventbox),"expose_func",(gpointer)exp_track_func);
+      lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+      gtk_widget_set_app_paintable(eventbox,TRUE);
+      g_signal_connect (GTK_OBJECT (eventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+			G_CALLBACK (expose_track_event),
+			(gpointer)mt);
+      gtk_widget_set_app_paintable(eventbox,TRUE);
 
       g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
 			G_CALLBACK (on_track_click),
@@ -1896,7 +2069,8 @@
 
 
 	if (hidden==0) {
-	  GTK_ADJUSTMENT(mt->vadjustment)->page_size--;
+	  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+					 (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
 	    
 	  expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(aeventbox),"expanded"));
 	    
@@ -1904,24 +2078,24 @@
 	  arrow=(GTK_WIDGET(g_object_get_data(G_OBJECT(aeventbox),"arrow")));
 	  
 	  labelbox=gtk_event_box_new();
-	  hbox=gtk_hbox_new(FALSE,10);
+	  hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
 	  ahbox=gtk_event_box_new();
 	  
-	  gtk_widget_set_state(label,GTK_STATE_NORMAL);
-	  gtk_widget_set_state(arrow,GTK_STATE_NORMAL);
+	  lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+	  lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
 	  
 	  if (palette->style&STYLE_1) {
 	    if (palette->style&STYLE_3) {
-	      gtk_widget_modify_bg (labelbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	      gtk_widget_modify_bg (ahbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
-	      gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	      gtk_widget_modify_fg (arrow, GTK_STATE_SELECTED, &palette->info_text);
+	      lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	      lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	      lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
 	    }
 	    else {
-	      gtk_widget_modify_bg (labelbox, GTK_STATE_SELECTED, &palette->normal_back);
-	      gtk_widget_modify_bg (ahbox, GTK_STATE_SELECTED, &palette->normal_back);
-	      gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->normal_fore);
-	      gtk_widget_modify_fg (arrow, GTK_STATE_SELECTED, &palette->normal_fore);
+	      lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	      lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+	      lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
 	    }
 	  }
 	  
@@ -1936,7 +2110,6 @@
 	  g_object_set_data (G_OBJECT(aeventbox),"ahbox",ahbox);
 	  g_object_set_data (G_OBJECT(ahbox),"eventbox",aeventbox);
 	  g_object_set_data(G_OBJECT(labelbox),"layer_number",GINT_TO_POINTER(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"))));
-	  gtk_widget_modify_bg(aeventbox, GTK_STATE_NORMAL, &palette->white);
 	  
 	  g_signal_connect (GTK_OBJECT (labelbox), "button_press_event",
 			    G_CALLBACK (atrack_ebox_pressed),
@@ -1956,10 +2129,12 @@
 	  g_signal_connect (GTK_OBJECT (aeventbox), "button_release_event",
 			    G_CALLBACK (on_track_release),
 			    (gpointer)mt);
-	  exp_track_func=g_signal_connect_after (GTK_OBJECT (aeventbox), "expose_event",
-						 G_CALLBACK (expose_track_event),
-						 (gpointer)mt);
-	  g_object_set_data (G_OBJECT(aeventbox),"expose_func",(gpointer)exp_track_func);
+
+	  lives_widget_set_bg_color(aeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+	  gtk_widget_set_app_paintable(aeventbox,TRUE);
+	  g_signal_connect (GTK_OBJECT (aeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+			    G_CALLBACK (expose_track_event),
+			    (gpointer)mt);
 	  
 
 	  rows++;
@@ -1972,20 +2147,20 @@
 	    g_object_set_data(G_OBJECT(xeventbox),"hidden",GINT_TO_POINTER(hidden));
 	    
 	    if (hidden==0) {
-	      GTK_ADJUSTMENT(mt->vadjustment)->page_size--;
+	      lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+					     (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
 
 
 	      gtk_table_attach (GTK_TABLE (mt->timeline_table), xeventbox, 7, 40, rows, rows+1,
 				(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 				(GtkAttachOptions) (GTK_FILL), 0, 0);
 	      
-	      exp_track_func=g_signal_connect_after (GTK_OBJECT (xeventbox), "expose_event",
-						     G_CALLBACK (mt_expose_laudtrack_event),
-						     (gpointer)mt);
-	      g_object_set_data (G_OBJECT(xeventbox),"expose_func",(gpointer)exp_track_func);
+	      lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+	      gtk_widget_set_app_paintable(xeventbox,TRUE);
+	      g_signal_connect (GTK_OBJECT (xeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+				G_CALLBACK (mt_expose_audtrack_event),
+				(gpointer)mt);
 	      
-	      gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->white);
-
 	      rows++;
 	      if (rows==mt->max_disp_vtracks) break;
 	    }
@@ -1996,18 +2171,19 @@
 	      g_object_set_data(G_OBJECT(xeventbox),"hidden",GINT_TO_POINTER(hidden));
 	      
 	      if (hidden==0) {
-		GTK_ADJUSTMENT(mt->vadjustment)->page_size--;
+		lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+					       (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
 		
 		gtk_table_attach (GTK_TABLE (mt->timeline_table), xeventbox, 7, 40, rows, rows+1,
 				  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 				  (GtkAttachOptions) (GTK_FILL), 0, 0);
 		
-		gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->white);
-		exp_track_func=g_signal_connect_after (GTK_OBJECT (xeventbox), "expose_event",
-						       G_CALLBACK (mt_expose_raudtrack_event),
-						       (gpointer)mt);
+		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+		gtk_widget_set_app_paintable(xeventbox,TRUE);
+		g_signal_connect (GTK_OBJECT (xeventbox), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+				  G_CALLBACK (mt_expose_audtrack_event),
+				  (gpointer)mt);
 		
-		g_object_set_data (G_OBJECT(xeventbox),"expose_func",(gpointer)exp_track_func);
 		
 		rows++;
 		if (rows==mt->max_disp_vtracks) break;
@@ -2022,19 +2198,29 @@
   }
   
 
-  if (GTK_ADJUSTMENT(mt->vadjustment)->page_size<1) GTK_ADJUSTMENT(mt->vadjustment)->page_size=1;
+  if (lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))<1.) 
+    lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),1.);
+
+  lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),
+			     (double)(get_top_track_for(mt,mt->num_video_tracks-1)+
+				      (int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))));
+
 
-  GTK_ADJUSTMENT(mt->vadjustment)->upper=get_top_track_for(mt,mt->num_video_tracks-1)+GTK_ADJUSTMENT(mt->vadjustment)->page_size;
+  if (gtk_adjustment_get_value(GTK_ADJUSTMENT(mt->vadjustment))+lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))>
+      lives_adjustment_get_upper(LIVES_ADJUSTMENT(mt->vadjustment)))
+    lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),gtk_adjustment_get_value(GTK_ADJUSTMENT(mt->vadjustment))+
+			       lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment)));
 
-  table_children=GTK_TABLE(mt->timeline_table)->children;
+  table_children=gtk_container_get_children(GTK_CONTAINER(mt->timeline_table));
 
   while (table_children!=NULL) {
-    GtkRequisition req;
-    GtkTableChild *child=(GtkTableChild *)table_children->data;
-    req=child->widget->requisition;
-    gtk_widget_set_size_request(child->widget,req.width,25);
+    //GtkRequisition req;
+    GtkWidget *child=(GtkWidget *)table_children->data;
+    //req=child->requisition;
+    gtk_widget_set_size_request(child,-1,MT_TRACK_HEIGHT);
     table_children=table_children->next;
   }
+
   gtk_widget_show_all(mt->timeline_table);
   gtk_widget_queue_draw (mt->vpaned);
 
@@ -2042,11 +2228,11 @@
 
 
 
-gboolean track_arrow_pressed (GtkWidget *ebox, GdkEventButton *event, gpointer user_data) {
+boolean track_arrow_pressed (GtkWidget *ebox, GdkEventButton *event, gpointer user_data) {
   GtkWidget *eventbox=(GtkWidget *)g_object_get_data(G_OBJECT(ebox),"eventbox");
   GtkWidget *arrow=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"arrow"),*new_arrow;
   lives_mt *mt=(lives_mt *)user_data;
-  gboolean expanded=!(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+  boolean expanded=!(g_object_get_data(G_OBJECT(eventbox),"expanded"));
 
   if (mt->audio_draws==NULL||(!mt->opts.pertrack_audio&&(mt->opts.back_audio_tracks==0||
 							 eventbox!=mt->audio_draws->data))) {
@@ -2064,17 +2250,17 @@
   }
 
 
-  gtk_widget_ref(new_arrow);
+  g_object_ref(new_arrow);
 
   g_object_set_data(G_OBJECT(eventbox),"arrow",new_arrow);
 
-  gtk_tooltips_copy(new_arrow,arrow);
+  lives_tooltips_copy(new_arrow,arrow);
 
   // must do this after we update object data, to avoid a race condition
-  gtk_widget_unref(arrow);
+  g_object_unref(arrow);
   gtk_widget_destroy(arrow);
 
-  scroll_tracks(mt,mt->top_track);
+  scroll_tracks(mt,mt->top_track,FALSE);
   track_select(mt);
   return FALSE;
 }
@@ -2090,21 +2276,21 @@
 void multitrack_view_in_out (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->block_selected==NULL) return;
-  polymorph (mt,POLY_IN_OUT);
+  if (!nb_ignore) polymorph (mt,POLY_IN_OUT);
 }
 
 
-static void time_to_string (lives_mt *mt, gdouble secs, gint length) {
-  gint hours,mins,rest;
+static void time_to_string (lives_mt *mt, double secs, int length) {
+  int hours,mins,rest;
   gchar *string;
 
   hours=secs/3600;
   secs-=hours*3600.;
   mins=secs/60;
   secs-=mins*60.;
-  rest=(secs-((gint)secs)*1.)*100.+.5;
-  secs=(gint)secs*1.;
-  string=g_strdup_printf("   %02d:%02d:%02d.%02d",hours,mins,(gint)secs,rest);
+  rest=(secs-((int)secs)*1.)*100.+.5;
+  secs=(int)secs*1.;
+  string=g_strdup_printf("   %02d:%02d:%02d.%02d",hours,mins,(int)secs,rest);
   gtk_entry_set_text (GTK_ENTRY (mt->timecode),string);
   g_free(string);
 }
@@ -2125,7 +2311,7 @@
 
   GList *clist;
 
-  gboolean bad_header=FALSE;
+  boolean bad_header=FALSE;
 
   renumbered_clips[0]=0;
 
@@ -2178,7 +2364,7 @@
     if (mainw->files[cclip]!=NULL&&cclip!=mainw->scrap_file&&cclip!=mainw->ascrap_file&&
 	(mainw->files[cclip]->clip_type==CLIP_TYPE_DISK||mainw->files[cclip]->clip_type==CLIP_TYPE_FILE)&&
 	mainw->files[cclip]->unique_id==0l) {
-      mainw->files[cclip]->unique_id=random();
+      mainw->files[cclip]->unique_id=lives_random();
       save_clip_value(cclip,CLIP_DETAILS_UNIQUE_ID,&mainw->files[cclip]->unique_id);
       if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
 
@@ -2255,12 +2441,12 @@
 
 
 
-void mt_clip_select (lives_mt *mt, gboolean scroll) {
-  GList *list=GTK_BOX (mt->clip_inner_box)->children;
-  GtkBoxChild *clipbox=NULL;
-  gint len;
+void mt_clip_select (lives_mt *mt, boolean scroll) {
+  GList *list=gtk_container_get_children(GTK_CONTAINER (mt->clip_inner_box));
+  GtkWidget *clipbox=NULL;
+  int len;
   int i;
-  gboolean was_neg=FALSE;
+  boolean was_neg=FALSE;
   mt->file_selected=-1;
 
   if (list==NULL) return;
@@ -2290,12 +2476,14 @@
   mt->file_selected=mt_file_from_clip(mt,mt->clip_selected);
 
   for (i=0;i<len;i++) {
-    clipbox=(GtkBoxChild *)g_list_nth_data (list,i);
+    clipbox=(GtkWidget *)g_list_nth_data (list,i);
     if (i==mt->clip_selected) {
       GtkAdjustment *adj;
-      gint value=(adj=GTK_RANGE(GTK_SCROLLED_WINDOW(mt->clip_scroll)->hscrollbar)->adjustment)->upper*(mt->clip_selected+.5)/len;
-      if (scroll) gtk_adjustment_clamp_page(adj,value-adj->page_size/2,value+adj->page_size/2);
-      gtk_widget_set_state(clipbox->widget,GTK_STATE_SELECTED);
+      int value=lives_adjustment_get_upper((adj=gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(mt->clip_scroll))))
+	*(mt->clip_selected+.5)/len;
+      if (scroll) gtk_adjustment_clamp_page(adj,value-lives_adjustment_get_page_size(adj)/2,
+					    value+lives_adjustment_get_page_size(adj)/2);
+      lives_widget_set_state(clipbox,LIVES_WIDGET_STATE_PRELIGHT);
       gtk_widget_set_sensitive (mt->adjust_start_end, mainw->files[mt->file_selected]->frames>0);
       if (mt->current_track>-1) {
 	gtk_widget_set_sensitive (mt->insert, mainw->files[mt->file_selected]->frames>0);
@@ -2306,12 +2494,12 @@
 	gtk_widget_set_sensitive (mt->insert, FALSE);
       }
     }
-    else gtk_widget_set_state(clipbox->widget,GTK_STATE_NORMAL);
+    else lives_widget_set_state(clipbox,LIVES_WIDGET_STATE_NORMAL);
   }
 }
 
 
-gboolean mt_prevclip (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_prevclip (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->clip_selected--;
   polymorph(mt,POLY_CLIPS);
@@ -2319,7 +2507,7 @@
   return TRUE;
 }
 
-gboolean mt_nextclip (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_nextclip (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->clip_selected++;
   polymorph(mt,POLY_CLIPS);
@@ -2329,19 +2517,19 @@
 
 
 static void set_time_scrollbar(lives_mt *mt) {
-  gdouble page=mt->tl_max-mt->tl_min;
+  double page=mt->tl_max-mt->tl_min;
   if (mt->end_secs==0.) mt->end_secs=DEF_TIME;
 
   if (mt->tl_max>mt->end_secs) mt->end_secs=mt->tl_max;
 
   gtk_range_set_range(GTK_RANGE(mt->time_scrollbar),0.,mt->end_secs);
   gtk_range_set_increments(GTK_RANGE(mt->time_scrollbar),page/4.,page);
-  GTK_ADJUSTMENT(mt->hadjustment)->value=mt->tl_min;
-  GTK_ADJUSTMENT(mt->hadjustment)->page_size=page;
+  gtk_adjustment_set_value(GTK_ADJUSTMENT(mt->hadjustment),(double)mt->tl_min);
+  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->hadjustment),(double)page);
   gtk_widget_queue_draw(mt->time_scrollbar);
 }
 
-static void redraw_all_event_boxes(lives_mt *mt) {
+void redraw_all_event_boxes(lives_mt *mt) {
   GList *slist;
 
   slist=mt->audio_draws;
@@ -2357,12 +2545,12 @@
   }
 }
 
-void set_timeline_end_secs (lives_mt *mt, gdouble secs) {
-  gdouble pos=GTK_RULER (mt->timeline)->position;
+void set_timeline_end_secs (lives_mt *mt, double secs) {
+  double pos=lives_ruler_get_value(LIVES_RULER (mt->timeline));
 
   mt->end_secs=secs;
 
-  gtk_ruler_set_range (GTK_RULER (mt->timeline), mt->tl_min, mt->tl_max, mt->tl_min, mt->end_secs+1./mt->fps);
+  lives_ruler_set_range (LIVES_RULER (mt->timeline), mt->tl_min, mt->tl_max, mt->tl_min, mt->end_secs+1./mt->fps);
   gtk_widget_queue_draw (mt->timeline);
   gtk_widget_queue_draw (mt->timeline_table);
   gtk_spin_button_set_range (GTK_SPIN_BUTTON (mt->spinbutton_start),0.,mt->end_secs);
@@ -2370,7 +2558,7 @@
 
   set_time_scrollbar(mt);
 
-  GTK_RULER (mt->timeline)->position=pos;
+  lives_ruler_set_value(LIVES_RULER (mt->timeline),pos);
 
   redraw_all_event_boxes(mt);
 }
@@ -2380,7 +2568,7 @@
 
 static weed_timecode_t set_play_position(lives_mt *mt) {
   // get start event
-  gboolean has_pb_loop_event=FALSE;
+  boolean has_pb_loop_event=FALSE;
   weed_timecode_t tc;
 #ifdef ENABLE_JACK_TRANSPORT
   weed_timecode_t end_tc=event_list_get_end_tc(mt->event_list);
@@ -2404,7 +2592,7 @@
   }
   else {
 #endif
-    tc=q_gint64(GTK_RULER(mt->timeline)->position*U_SEC,cfile->fps);
+    tc=q_gint64(lives_ruler_get_value(LIVES_RULER(mt->timeline))*U_SEC,cfile->fps);
 #ifdef ENABLE_JACK_TRANSPORT
   }
 #endif
@@ -2421,20 +2609,24 @@
  
  
  
-void mt_show_current_frame(lives_mt *mt, gboolean return_layer) {
+void mt_show_current_frame(lives_mt *mt, boolean return_layer) {
   // show preview of current frame in play_box and/or play_window
 
   // or, if return_layer is TRUE, we just set mainw->frame_layer
 
-  gint current_file;
-  gdouble ptr_time=GTK_RULER(mt->timeline)->position;
-  gboolean is_rendering=mainw->is_rendering;
   weed_timecode_t curr_tc;
-  gint actual_frame;
+
+  double ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+
   weed_plant_t *frame_layer=mainw->frame_layer;
-  gboolean internal_messaging=mainw->internal_messaging;
-  gboolean needs_idlefunc=FALSE;
-  cairo_t *cr;
+
+  int current_file;
+  int actual_frame;
+  int error;
+
+  boolean is_rendering=mainw->is_rendering;
+  boolean internal_messaging=mainw->internal_messaging;
+  boolean needs_idlefunc=FALSE;
 
   if (mt->idlefunc>0) {
     g_source_remove(mt->idlefunc);
@@ -2445,11 +2637,11 @@
   if (!return_layer) {
     // show frame image in window
     if (!mt->mt_frame_preview) {
-      gboolean sep_win=mainw->sep_win;
+      boolean sep_win=mainw->sep_win;
       mt->mt_frame_preview=TRUE;
 
-      if (mt->play_blank->parent!=NULL) {
-	gtk_widget_ref(mt->play_blank);
+      if (lives_widget_get_parent(mt->play_blank)!=NULL) {
+	g_object_ref(mt->play_blank);
 	gtk_container_remove (GTK_CONTAINER(mt->play_box),mt->play_blank);
       }
 
@@ -2460,13 +2652,13 @@
       }
 
       if (GTK_IS_WIDGET(mainw->playarea)) gtk_widget_destroy (mainw->playarea);
-      mainw->playarea = gtk_hbox_new (FALSE,0);
+      mainw->playarea = lives_hbox_new (FALSE,0);
       gtk_widget_show(mainw->playarea);
       gtk_container_add (GTK_CONTAINER (mt->play_box), mainw->playarea);
       //gtk_widget_set_app_paintable(mainw->playarea,TRUE);
 
       if (mt->is_ready)
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
   
       mainw->sep_win=FALSE;
       add_to_playframe();
@@ -2475,12 +2667,35 @@
   }
 
   if (mainw->playing_file>-1) {
-
+    if (mainw->play_window!=NULL&&GDK_IS_WINDOW (lives_widget_get_xwindow(mainw->play_window))) {
+#if GTK_CHECK_VERSION(3,0,0)
+      if (mt->frame_pixbuf==NULL||mt->frame_pixbuf!=mainw->imframe) {
+	if (mt->frame_pixbuf!=NULL) g_object_unref(mt->frame_pixbuf);
+	mt->frame_pixbuf=mainw->imframe;
+      }
+#else
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image274),mainw->imframe,NULL);
+#endif
+    }
+    else {
+#if GTK_CHECK_VERSION(3,0,0)
+      if (mt->frame_pixbuf!=mainw->imframe) {
+	if (mt->frame_pixbuf!=NULL) g_object_unref(mt->frame_pixbuf);
+	mt->frame_pixbuf=NULL;
+      }
+#else
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image274),NULL,NULL);
+#endif
+    }
+    gtk_widget_queue_draw_area(mt->play_box,0,0,
+			       lives_widget_get_allocation_width(mt->play_box),
+			       lives_widget_get_allocation_height(mt->play_box));
     return;
   }
+
   // start "playback" at current pos, we just "play" one frame
   curr_tc=set_play_position(mt);
-  actual_frame=(gint)((gdouble)(curr_tc/U_SECL)*cfile->fps+1.4999);
+  actual_frame=(int)((double)(curr_tc/U_SECL)*cfile->fps+1.4999);
   mainw->frame_layer=NULL;
 
   if (mt->is_rendering&&actual_frame<=cfile->frames) {
@@ -2510,12 +2725,14 @@
       if (mt->current_rfx!=NULL&&mt->init_event!=NULL) {
 	if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) {
 	  weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
-	  weed_call_init_func(inst);
+	  do {
+	    weed_call_init_func(inst);
+	  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 	}
       }
 
       mainw->last_display_ticks=0;
-      process_events(mt->pb_start_event,0);
+      process_events(mt->pb_start_event,FALSE,0);
       mainw->internal_messaging=internal_messaging;
       mainw->current_file=current_file;
       deinit_render_effects();
@@ -2524,7 +2741,9 @@
       if (mt->current_rfx!=NULL&&mt->init_event!=NULL) {
 	if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) {
 	  weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
-	  weed_call_deinit_func(inst);
+	  do {
+	    weed_call_deinit_func(inst);
+	  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 	}
       }
 
@@ -2539,107 +2758,57 @@
 
   if (return_layer) return;
 
+#if GTK_CHECK_VERSION(3,0,0)
+  if (mt->frame_pixbuf!=NULL&&mt->frame_pixbuf!=mainw->imframe) {
+    g_object_unref(mt->frame_pixbuf);
+    mt->frame_pixbuf=NULL;
+  }
+#endif
+
   mt->outwidth=cfile->hsize;
   mt->outheight=cfile->vsize;
   calc_maxspect(mt->play_width,mt->play_height,&mt->outwidth,&mt->outheight);
 
   if (mainw->frame_layer!=NULL) {
-    int fx_layer_palette;
     GdkPixbuf *pixbuf;
     int weed_error;
 
     mainw->pwidth=mt->outwidth;
     mainw->pheight=mt->outheight;
 
-    fx_layer_palette=weed_get_int_value(mainw->frame_layer,"current_palette",&weed_error);
-    if (fx_layer_palette!=WEED_PALETTE_RGB24) convert_layer_palette(mainw->frame_layer,WEED_PALETTE_RGB24,0);
+    if ((mt->outwidth!=(weed_get_int_value(mainw->frame_layer,"width",&weed_error))||
+	 mt->outheight!=weed_get_int_value(mainw->frame_layer,"height",&weed_error))) 
+      resize_layer(mainw->frame_layer,mt->outwidth,mt->outheight,LIVES_INTERP_BEST,WEED_PALETTE_RGB24,0);
 
-    if (mainw->play_window==NULL||(mt->poly_state==POLY_PARAMS&&mt->framedraw!=NULL)) {
-      if ((mt->outwidth!=(weed_get_int_value(mainw->frame_layer,"width",&weed_error))||
-	   mt->outheight!=weed_get_int_value(mainw->frame_layer,"height",&weed_error))) 
-	resize_layer(mainw->frame_layer,mt->outwidth,mt->outheight,LIVES_INTERP_BEST);
-    }
-    else resize_layer(mainw->frame_layer,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST);
+    convert_layer_palette(mainw->frame_layer,WEED_PALETTE_RGB24,0);
 
     pixbuf=layer_to_pixbuf(mainw->frame_layer);
     weed_plant_free(mainw->frame_layer);
     mainw->frame_layer=NULL;
 
-    if (mainw->play_window!=NULL&&GDK_IS_WINDOW (mainw->play_window->window)) {
+    if (mt->framedraw!=NULL) pixbuf=mt_framedraw(mt,pixbuf);
 
-      mainw->pwidth=cfile->hsize;
-      mainw->pheight=cfile->vsize;
+#if GTK_CHECK_VERSION(3,0,0)
+      mt->frame_pixbuf=pixbuf;
+#else
+      set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image274),pixbuf,NULL);
+#endif
+      gtk_widget_queue_draw(mt->play_box);
 
-      // force signal unblocked
-      g_signal_handlers_block_matched(mainw->play_window,(GSignalMatchType)(G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_UNBLOCKED),
-				      0,0,0,(gpointer)expose_play_window,NULL);
-      g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=FALSE;
-
-      gtk_window_resize (GTK_WINDOW (mainw->play_window), mainw->pwidth, mainw->pheight);
-
-      cr = gdk_cairo_create (mainw->play_window->window);
-
-      gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-
-      gtk_widget_queue_draw (mainw->play_window);
-      gtk_widget_queue_resize (mainw->play_window);
-      if (mt->framedraw==NULL||!mt_framedraw(mt,pixbuf)) {
-	if (mt->poly_state!=POLY_PARAMS) {
-	  gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),mainw->imframe);
-	  gtk_widget_queue_draw(mt->play_box);
-	}
-	else {
-	  gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),pixbuf);
-	  gtk_widget_queue_draw(mt->play_box);
-	}
-      }
-    }
-    else {
-      if (mt->framedraw==NULL||!mt_framedraw(mt,pixbuf)) {
-	gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),pixbuf);
-	gtk_widget_queue_draw(mt->play_box);
-      }
-    }
-    if (mt->sepwin_pixbuf!=NULL&&mt->sepwin_pixbuf!=mainw->imframe) {
-      gdk_pixbuf_unref(mt->sepwin_pixbuf);
-      mt->sepwin_pixbuf=NULL;
-    }
-    if (mt->framedraw==NULL) mt->sepwin_pixbuf=pixbuf;
-    else if (mainw->imframe!=NULL) 
-      mt->sepwin_pixbuf=lives_pixbuf_scale_simple(mainw->imframe,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST);
   }
   else {
     // no frame - show blank
-    if (mainw->play_window!=NULL&&GDK_IS_WINDOW (mainw->play_window->window)) {
-
-      mainw->pwidth=lives_pixbuf_get_width(mainw->imframe);
-      mainw->pheight=lives_pixbuf_get_height(mainw->imframe);
-
-      gtk_window_resize (GTK_WINDOW (mainw->play_window), mainw->pwidth, mainw->pheight);
-
-      cr = gdk_cairo_create (mainw->play_window->window);
-      gdk_cairo_set_source_pixbuf (cr, GDK_PIXBUF(mainw->imframe), 0, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-
-      gtk_widget_queue_draw (mainw->play_window);
-    }
-
-    if (mt->poly_state!=POLY_PARAMS) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(mainw->image274),mainw->imframe);
-      gtk_widget_queue_draw(mt->play_box);
-    }
-
-    if (mt->sepwin_pixbuf!=NULL&&mt->sepwin_pixbuf!=mainw->imframe) gdk_pixbuf_unref(mt->sepwin_pixbuf);
-    mt->sepwin_pixbuf=mainw->imframe;
+#if GTK_CHECK_VERSION(3,0,0)
+    mt->frame_pixbuf=mainw->imframe;
+#else
+    set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image274),mainw->imframe,NULL);
+#endif
+    gtk_widget_queue_draw(mt->play_box);
   }
 
   mainw->frame_layer=frame_layer;
 
-  GTK_RULER(mt->timeline)->position=ptr_time;
+  lives_ruler_set_value(LIVES_RULER(mt->timeline),ptr_time);
   gtk_widget_queue_draw(mt->timeline);
 
   if (needs_idlefunc) {
@@ -2650,16 +2819,16 @@
 
 
 
-void mt_tl_move(lives_mt *mt, gdouble pos_rel) {
-  gdouble pos;
+void mt_tl_move(lives_mt *mt, double pos_rel) {
+  double pos;
   if (mainw->playing_file>-1) return;
 
-  pos=GTK_RULER (mt->timeline)->position+pos_rel;
+  pos=lives_ruler_get_value(LIVES_RULER (mt->timeline))+pos_rel;
 
   pos=q_dbl(pos,mt->fps)/U_SEC;
   if (pos<0.) pos=0.;
 
-  mt->ptr_time=GTK_RULER (mt->timeline)->position=pos;
+  mt->ptr_time=lives_ruler_set_value(LIVES_RULER (mt->timeline),pos);
 
   if (pos>0.) {
     gtk_widget_set_sensitive (mt->rewind,TRUE);
@@ -2706,14 +2875,14 @@
 }
 
 
-gboolean mt_tlfor (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_tlfor (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->fm_edit_event=NULL;
   mt_tl_move(mt,1.);
   return TRUE;
 }
 
-gboolean mt_tlfor_frame (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_tlfor_frame (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->fm_edit_event=NULL;
   mt_tl_move(mt,1./mt->fps);
@@ -2721,14 +2890,14 @@
 }
 
 
-gboolean mt_tlback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_tlback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->fm_edit_event=NULL;
   mt_tl_move(mt,-1.);
   return TRUE;
 }
 
-gboolean mt_tlback_frame (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_tlback_frame (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->fm_edit_event=NULL;
   mt_tl_move(mt,-1./mt->fps);
@@ -2737,9 +2906,9 @@
 
 
 
-static void scroll_track_on_screen(lives_mt *mt, gint track) {
+static void scroll_track_on_screen(lives_mt *mt, int track) {
   if (track>mt->top_track) track=get_top_track_for(mt,track);
-  scroll_tracks(mt,track);
+  scroll_tracks(mt,track,track!=mt->top_track);
  
   return;
 }
@@ -2747,22 +2916,21 @@
 
 
 
-void
-scroll_track_by_scrollbar (GtkVScrollbar *sbar, gpointer user_data) {
+void scroll_track_by_scrollbar (GtkScrollbar *sbar, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  scroll_tracks(mt,GTK_ADJUSTMENT(GTK_RANGE(sbar)->adjustment)->value);
+  scroll_tracks(mt,gtk_adjustment_get_value(gtk_range_get_adjustment(GTK_RANGE(sbar))),FALSE);
   track_select(mt);
 }
 
 
 
 
-static void mt_zoom (lives_mt *mt, gdouble scale) {
-  gdouble tl_span=(mt->tl_max-mt->tl_min)/2.;
-  gdouble tl_cur;
+static void mt_zoom (lives_mt *mt, double scale) {
+  double tl_span=(mt->tl_max-mt->tl_min)/2.;
+  double tl_cur;
 
 
-  if (scale>0.) tl_cur=GTK_RULER(mt->timeline)->position;  // center on cursor
+  if (scale>0.) tl_cur=lives_ruler_get_value(LIVES_RULER(mt->timeline));  // center on cursor
   else {
     tl_cur=mt->tl_min+tl_span; // center on middle of screen
     scale=-scale;
@@ -2781,8 +2949,8 @@
 
   if (mt->tl_min==mt->tl_max) mt->tl_max=mt->tl_min+1./mt->fps;
 
-  GTK_RULER(mt->timeline)->upper=mt->tl_max;
-  GTK_RULER(mt->timeline)->lower=mt->tl_min;
+  lives_ruler_set_upper(LIVES_RULER(mt->timeline),mt->tl_max);
+  lives_ruler_set_lower(LIVES_RULER(mt->timeline),mt->tl_min);
 
   set_time_scrollbar(mt);
 
@@ -2796,13 +2964,14 @@
 static void
 scroll_time_by_scrollbar (GtkVScrollbar *sbar, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->tl_min=(GTK_ADJUSTMENT(GTK_RANGE(sbar)->adjustment)->value);
-  mt->tl_max=(GTK_ADJUSTMENT(GTK_RANGE(sbar)->adjustment)->value+GTK_ADJUSTMENT(GTK_RANGE(sbar)->adjustment)->page_size);
+  mt->tl_min=gtk_adjustment_get_value(gtk_range_get_adjustment(GTK_RANGE(sbar)));
+  mt->tl_max=gtk_adjustment_get_value(gtk_range_get_adjustment(GTK_RANGE(sbar)))
+    +lives_adjustment_get_page_size(gtk_range_get_adjustment(GTK_RANGE(sbar)));
   mt_zoom(mt,-1.);
 }
 
 
-gboolean mt_trdown (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_trdown (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
   if (mt->current_track>=0&&mt->opts.pertrack_audio&&!mt->aud_track_selected) {
@@ -2839,7 +3008,7 @@
 }
 
 
-gboolean mt_trup (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_trup (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->current_track==-1||(mt->current_track==0&&!mt->aud_track_selected&&!mt->opts.show_audio)) return TRUE;
 
@@ -2860,11 +3029,11 @@
 
 
 
-LIVES_INLINE gint poly_page_to_tab(guint page) {
+LIVES_INLINE int poly_page_to_tab(guint page) {
   return ++page;
 }
 
-LIVES_INLINE gint poly_tab_to_page(guint tab) {
+LIVES_INLINE int poly_tab_to_page(guint tab) {
   return --tab;
 }
 
@@ -2878,27 +3047,32 @@
   guint page=poly_tab_to_page(tab);
 
   if (mt->nb_label!=NULL) gtk_widget_destroy(mt->nb_label);
+  mt->nb_label=NULL;
+
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
 
   switch(err) {
   case NB_ERROR_SEL:
-    mt->nb_label=gtk_label_new(_("\n\nPlease select a block\nin the timeline by\nright or double clicking on it.\n"));
+    mt->nb_label=lives_standard_label_new(_("\n\nPlease select a block\nin the timeline by\nright or double clicking on it.\n"));
     break;
   case NB_ERROR_NOEFFECT:
-    mt->nb_label=gtk_label_new(_("\n\nNo effect selected.\nSelect an effect in FX stack first to view its parameters.\n"));
+    mt->nb_label=lives_standard_label_new(_("\n\nNo effect selected.\nSelect an effect in FX stack first to view its parameters.\n"));
     break;
   case NB_ERROR_NOCLIP:
-    mt->nb_label=gtk_label_new(_("\n\nNo clips loaded.\n"));
+    mt->nb_label=lives_standard_label_new(_("\n\nNo clips loaded.\n"));
     break;
   case NB_ERROR_NOTRANS:
-    mt->nb_label=gtk_label_new(_("You must select two video tracks\nand a time region\nto apply transitions.\n\nAlternately, you can enable Autotransitions from the Effects menu\nbefore inserting clips into the timeline."));
+    mt->nb_label=lives_standard_label_new(_("You must select two video tracks\nand a time region\nto apply transitions.\n\nAlternately, you can enable Autotransitions from the Effects menu\nbefore inserting clips into the timeline."));
     break;
   case NB_ERROR_NOCOMP:
-    mt->nb_label=gtk_label_new(_("\n\nYou must select at least one video track\nand a time region\nto apply compositors.\n"));
+    mt->nb_label=lives_standard_label_new(_("\n\nYou must select at least one video track\nand a time region\nto apply compositors.\n"));
     break;
   }
 
-  gtk_label_set_justify (GTK_LABEL (mt->nb_label), GTK_JUSTIFY_CENTER);
-  gtk_widget_modify_fg(mt->nb_label, GTK_STATE_NORMAL, &palette->normal_fore);
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
+
+  lives_widget_set_hexpand(mt->nb_label,TRUE);
+
   gtk_container_add(GTK_CONTAINER(gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page)),mt->nb_label);
   gtk_widget_show(mt->nb_label);
   gtk_widget_hide(mt->poly_box);
@@ -2931,22 +3105,18 @@
   fhash=weed_get_string_value(mt->init_event,"filter",&error);
   mt->current_fx=weed_get_idx_for_hashname(fhash,TRUE);
   weed_free(fhash);
-  
+
   if (weed_plant_has_leaf(mt->selected_init_event,"in_parameters")&&weed_get_voidptr_value(mt->selected_init_event,"in_parameters",&error)!=NULL) {
     npch=weed_leaf_num_elements(mt->init_event,"in_parameters");
     pchainx=weed_get_voidptr_array(mt->init_event,"in_parameters",&error);
-    pchain=(void **)g_malloc(npch*sizeof(void *)); // because we later g_free(), must use g_malloc and not weed_malloc (althought normally weed_malloc==g_malloc)
+    pchain=(void **)g_malloc(npch*sizeof(void *)); 
     for (i=0;i<npch;i++) pchain[i]=pchainx[i];
     weed_free(pchainx);
   }
  }
 
 
-
-
-
-
-static gboolean notebook_page(GtkWidget *nb, GtkNotebookPage *nbp, guint tab, gpointer user_data) {
+static boolean notebook_page(GtkWidget *nb, GtkWidget *nbp, guint tab, gpointer user_data) {
   guint page;
   lives_mt *mt=(lives_mt *)user_data;
 
@@ -2966,54 +3136,54 @@
   switch (tab) {
   case POLY_CLIPS:
     if (mt->clip_labels==NULL) {
-      notebook_error(GTK_NOTEBOOK(nb),tab,NB_ERROR_NOCLIP,mt);
+      notebook_error(GTK_NOTEBOOK(mt->nb),tab,NB_ERROR_NOCLIP,mt);
       return FALSE;
     }
-    if (mt->poly_state!=POLY_CLIPS) polymorph(mt,POLY_CLIPS);
-    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    if (mt->poly_state!=POLY_CLIPS&&nb!=NULL) polymorph(mt,POLY_CLIPS);
+    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     break;
   case POLY_IN_OUT:
     if (mt->block_selected==NULL&&mt->poly_state!=POLY_IN_OUT) {
-      notebook_error(GTK_NOTEBOOK(nb),tab,NB_ERROR_SEL,mt);
+      notebook_error(GTK_NOTEBOOK(mt->nb),tab,NB_ERROR_SEL,mt);
       return FALSE;
     }
     if (mt->poly_state!=POLY_IN_OUT) polymorph(mt,POLY_IN_OUT);
-    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     break;
   case POLY_FX_STACK:
     if (mt->poly_state!=POLY_FX_STACK) polymorph(mt,POLY_FX_STACK);
-    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     break;
   case POLY_EFFECTS:
     if (mt->block_selected==NULL&&mt->poly_state!=POLY_EFFECTS) {
-      notebook_error(GTK_NOTEBOOK(nb),tab,NB_ERROR_SEL,mt);
+      notebook_error(GTK_NOTEBOOK(mt->nb),tab,NB_ERROR_SEL,mt);
       return FALSE;
     }
     if (mt->poly_state!=POLY_EFFECTS) polymorph(mt,POLY_EFFECTS);
-    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     break;
   case POLY_TRANS:
     if (g_list_length(mt->selected_tracks)!=2||mt->region_start==mt->region_end) {
-      notebook_error(GTK_NOTEBOOK(nb),tab,NB_ERROR_NOTRANS,mt);
+      notebook_error(GTK_NOTEBOOK(mt->nb),tab,NB_ERROR_NOTRANS,mt);
       return FALSE;
     }
     if (mt->poly_state!=POLY_TRANS) polymorph(mt,POLY_TRANS);
-    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     break;
   case POLY_COMP:
     if (mt->selected_tracks==NULL||mt->region_start==mt->region_end) {
-      notebook_error(GTK_NOTEBOOK(nb),tab,NB_ERROR_NOCOMP,mt);
+      notebook_error(GTK_NOTEBOOK(mt->nb),tab,NB_ERROR_NOCOMP,mt);
       return FALSE;
     }
     if (mt->poly_state!=POLY_COMP) polymorph(mt,POLY_COMP);
-    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    else gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     break;
   case POLY_PARAMS:
     if (mt->poly_state!=POLY_PARAMS&&mt->selected_init_event==NULL) {
-      notebook_error(GTK_NOTEBOOK(nb),tab,NB_ERROR_NOEFFECT,mt);
+      notebook_error(GTK_NOTEBOOK(mt->nb),tab,NB_ERROR_NOEFFECT,mt);
       return FALSE;
     }
-    gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb),page));
+    gtk_widget_reparent(mt->poly_box,gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
     if (mt->selected_init_event!=NULL&&mt->poly_state!=POLY_PARAMS) {
       fubar(mt);
       polymorph(mt,POLY_PARAMS);
@@ -3021,51 +3191,56 @@
     break;
   }
 
-  return FALSE;
+  return TRUE;
 } 
 
 
 static void set_poly_tab(lives_mt *mt, guint tab) {
-  gint page=poly_tab_to_page(tab);
-
-  if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mt->nb))==page) notebook_page(mt->nb,NULL,tab,mt);
-  else gtk_notebook_set_page(GTK_NOTEBOOK(mt->nb),page);
+  int page=poly_tab_to_page(tab);
+  gtk_widget_show(gtk_notebook_get_nth_page(GTK_NOTEBOOK(mt->nb),page));
+  gtk_notebook_set_current_page(GTK_NOTEBOOK(mt->nb),page);
 }
 
 
 
 static void select_block (lives_mt *mt) {
   track_rect *block=mt->putative_block;
-  gint track;
-  gint filenum;
+  int track;
+  int filenum;
   gchar *tmp,*tmp2;
 
   if (block!=NULL) {
     GtkWidget *eventbox=block->eventbox;
 
-    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) 
+      track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
     else track=-1;
 
-    if (cfile->achans==0||mt->audio_draws==NULL||!is_audio_eventbox(mt,eventbox)) filenum=get_frame_event_clip(block->start_event,track);
+    if (!is_audio_eventbox(mt,eventbox)) filenum=get_frame_event_clip(block->start_event,track);
     else filenum=get_audio_frame_clip(block->start_event,track);
     block->state=BLOCK_SELECTED;
     mt->block_selected=block;
 
     clear_context(mt);
 
-    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) add_context_label (mt,(tmp2=g_strdup_printf (_("Current track: %s (layer %d)\n"),g_object_get_data(G_OBJECT(eventbox),"track_name"),track)));
+    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) 
+      add_context_label (mt,(tmp2=g_strdup_printf (_("Current track: %s (layer %d)\n"),g_object_get_data(G_OBJECT(eventbox),"track_name"),track)));
     else add_context_label (mt,(tmp2=g_strdup (_("Current track: Backing audio\n"))));
     g_free(tmp2);
     
-    add_context_label (mt,(tmp2=g_strdup_printf (_("%.2f sec. to %.2f sec.\n"),get_event_timecode(block->start_event)/U_SEC,get_event_timecode(block->end_event)/U_SEC+1./mt->fps)));
+    add_context_label (mt,(tmp2=g_strdup_printf (_("%.2f sec. to %.2f sec.\n"),get_event_timecode(block->start_event)/U_SEC,
+						 get_event_timecode(block->end_event)/U_SEC+1./mt->fps)));
     g_free(tmp2);
     add_context_label (mt,(tmp2=g_strdup_printf (_("Source: %s"),(tmp=g_path_get_basename (mainw->files[filenum]->name)))));
     g_free(tmp2);
     add_context_label (mt,(_("Right click for context menu.\n")));
     add_context_label (mt,(_("Single click on timeline\nto select a frame.\n")));
     g_free(tmp);
+
     gtk_widget_set_sensitive(mt->view_in_out,TRUE);
     gtk_widget_set_sensitive (mt->fx_block, TRUE);
+    gtk_widget_set_sensitive (mt->fx_blockv, TRUE);
+    if (cfile->achans>0) gtk_widget_set_sensitive (mt->fx_blocka, TRUE);
 
     redraw_eventbox(mt,eventbox);
 
@@ -3077,124 +3252,144 @@
 }
 
 
-static gboolean
+static boolean
 on_drag_filter_end           (GtkWidget       *widget,
 			      GdkEventButton  *event,
 			      gpointer         user_data) {
   GdkWindow *window;
-  GtkWidget *eventbox;
+  GtkWidget *eventbox=NULL,*oeventbox;
   GtkWidget *labelbox;
   GtkWidget *ahbox;
-  GtkWidget *menuitem;
   lives_mt *mt=(lives_mt *)user_data;
-  int win_x,win_y;
-  int i;
-  gint tchan=0;
-  gdouble timesecs;
+
+  double timesecs=0.;
+
+  int win_x,win_y,nins;
+
+  int tchan=0;
+
+  boolean ok=FALSE;
+
+  register int i;
 
   if (mt->cursor_style!=LIVES_CURSOR_FX_BLOCK) {
     mt->selected_filter=-1;
     return FALSE;
   }
 
-  set_cursor_style(mt,LIVES_CURSOR_NORMAL,0,0,0,0,0);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 
   if (mt->is_rendering||mainw->playing_file>-1||mt->selected_filter==-1) {
     mt->selected_filter=-1;
     return FALSE;
   }
 
-  window=gdk_display_get_window_at_pointer (mt->display,&win_x,&win_y);
+  window=lives_display_get_window_at_pointer 
+    ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+     mt->display,&win_x,&win_y);
 
-  if (cfile->achans>0&&mt->opts.back_audio_tracks>0&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
-    labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"labelbox");
-    ahbox=(GtkWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"ahbox");
-  
-    if (GTK_WIDGET(mt->audio_draws->data)->window==window||labelbox->window==window||ahbox->window==window) {
-      if (labelbox->window==window||ahbox->window==window) timesecs=0.;
-      else {
-	gdk_window_get_pointer(GDK_WINDOW (mt->timeline->window), &mt->sel_x, &mt->sel_y, NULL);
-	timesecs=get_time_from_x(mt,mt->sel_x);
+  if (cfile->achans>0&&enabled_in_channels(get_weed_filter(mt->selected_filter),TRUE)==1) {
+    for (i=0;i<g_list_length(mt->audio_draws);i++) {
+      eventbox=(GtkWidget *)g_list_nth_data(mt->audio_draws,i);
+      if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))!=0) continue;
+      labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
+      if (lives_widget_get_xwindow(eventbox)==window||lives_widget_get_xwindow(labelbox)==window) {
+	if (lives_widget_get_xwindow(labelbox)!=window) {
+	  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				   mt->timeline, &mt->sel_x, &mt->sel_y);
+	  timesecs=get_time_from_x(mt,mt->sel_x);
+	}
+	tchan=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+	if ((oeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"owner"))!=NULL) {
+	  eventbox=oeventbox;
+	}
+	ok=TRUE;
+	break;
       }
-      tchan=-1;
-      eventbox=(GtkWidget *)mt->audio_draws->data;
     }
   }
 
-  if (tchan==0) {
-    tchan=-1;
+  if (!ok) {
     for (i=0;i<g_list_length(mt->video_draws);i++) {
       eventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,i);
       if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))!=0) continue;
       labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
       ahbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
-      if (eventbox->window==window||labelbox->window==window||ahbox->window==window) {
-	if (labelbox->window==window||ahbox->window==window) timesecs=0.;
-	else {
-	  gdk_window_get_pointer(GDK_WINDOW (mt->timeline->window), &mt->sel_x, &mt->sel_y, NULL);
+      if (lives_widget_get_xwindow(eventbox)==window||lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
+	if (lives_widget_get_xwindow(labelbox)!=window) {
+	  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				   mt->timeline, &mt->sel_x, &mt->sel_y);
 	  timesecs=get_time_from_x(mt,mt->sel_x);
 	}
 	tchan=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+	ok=TRUE;
 	break;
       }
     }
-    if (tchan==-1) {
-      mt->selected_filter=-1;
-      return FALSE;
-    }
+  }
+
+  if (!ok) {
+    mt->selected_filter=-1;
+    return FALSE;
   }
 
   mt->current_fx=mt->selected_filter;
   mt->selected_filter=-1;
 
   // create dummy menuitem
-  menuitem=gtk_menu_item_new();
-  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(mt->current_fx));
+  dummy_menuitem=gtk_menu_item_new();
+  g_object_set_data(G_OBJECT(dummy_menuitem),"idx",GINT_TO_POINTER(mt->current_fx));
 
-  switch (enabled_in_channels(get_weed_filter(mt->current_fx),TRUE)) {
-  case 1:
-    // filter - either we drop on a region or on a block
+  nins=enabled_in_channels(get_weed_filter(mt->current_fx),TRUE);
+  if (nins==1) {
+    /*    // filter - either we drop on a region or on a block
     if (g_list_length(mt->selected_tracks)==1&&mt->region_start!=mt->region_end) {
       // apply to region
       mt_add_region_effect(GTK_MENU_ITEM(menuitem),mt);
     }
-    else {
-      track_rect *block;
-      if (tchan==-1) {
-	gtk_widget_destroy(menuitem);
-	return FALSE;
-      }
-      block=get_block_from_time(eventbox,timesecs,mt);
-      unselect_all(mt);
-      mt->putative_block=block;
-      select_block(mt);
-      // apply to block
-      mt->putative_block=NULL;
-      mt_add_block_effect(GTK_MENU_ITEM(menuitem),mt);
+    else {*/
+    // always apply to block
+    track_rect *block;
+    if (tchan==-1) {
+      gtk_widget_destroy(dummy_menuitem);
+      return FALSE;
     }
-    break;
-  case 2:
+    block=get_block_from_time(eventbox,timesecs,mt);
+    if (block==NULL) {
+      gtk_widget_destroy(dummy_menuitem);
+      return FALSE;
+    }
+    nb_ignore=TRUE;
+    unselect_all(mt);
+    mt->putative_block=block;
+    select_block(mt);
+    nb_ignore=FALSE;
+    // apply to block
+    mt->putative_block=NULL;
+    g_idle_add_full(G_PRIORITY_HIGH,mt_add_block_effect_idle,mt,NULL); // work around bug in gtk+
+  }
+  else if (nins==2) {
     // transition
     if (g_list_length(mt->selected_tracks)==2&&mt->region_start!=mt->region_end) {
       // apply to region
-      mt_add_region_effect(GTK_MENU_ITEM(menuitem),mt);
+      g_idle_add_full(G_PRIORITY_HIGH,mt_add_region_effect_idle,mt,NULL);
     }
-    break;
-  case 1000000:
+  }
+  else if (nins>=1000000) {
     // compositor
     if (mt->selected_tracks!=NULL&&mt->region_start!=mt->region_end) {
       // apply to region
-      mt_add_region_effect(NULL,mt);
+      g_idle_add_full(G_PRIORITY_HIGH,mt_add_region_effect_idle,mt,NULL);
     }
   }
 
-  gtk_widget_destroy(menuitem);
+  //gtk_widget_destroy(menuitem);
   return FALSE;
 }
 
 
 
-static gboolean
+static boolean
 filter_ebox_pressed (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
@@ -3213,7 +3408,7 @@
       return FALSE;
     }
     else {
-      set_cursor_style(mt,LIVES_CURSOR_FX_BLOCK,FX_BLOCK_WIDTH,FX_BLOCK_HEIGHT,0,0,FX_BLOCK_HEIGHT/2);
+      mt_set_cursor_style(mt,LIVES_CURSOR_FX_BLOCK,FX_BLOCK_WIDTH,FX_BLOCK_HEIGHT,0,0,FX_BLOCK_HEIGHT/2);
       mt->hotspot_x=mt->hotspot_y=0;
     }
   }
@@ -3228,19 +3423,32 @@
 
 
 
-static void populate_filter_box(GtkWidget *box, gint ninchans, lives_mt *mt) {
-  GtkWidget *xeventbox,*vbox,*label;
+static void populate_filter_box(GtkWidget *box, int ninchans, lives_mt *mt) {
+  GtkWidget *eventbox=NULL,*xeventbox,*vbox,*label;
   gchar *txt;
-  gint nfilts=rte_get_numfilters();
-  int i,error;
-  lives_fx_cat_t cat,subcat;
   gchar *tmp;
 
+  lives_fx_cat_t cat,subcat;
+
+  int nfilts=rte_get_numfilters(FALSE);
+  int error,nins;
+
+  register int i;
+
+  if (mt->block_selected==NULL&&ninchans==1) return;
+
+  if (mt->block_selected) eventbox=mt->block_selected->eventbox;
+
   for (i=0;i<nfilts;i++) {
     weed_plant_t *filter=get_weed_filter(i);
     if (filter!=NULL&&!weed_plant_has_leaf(filter,"host_menu_hide")) {
 
-      if (enabled_in_channels(filter,TRUE)==ninchans&&enabled_out_channels(filter,FALSE)==1) {
+      if ((is_pure_audio(filter,FALSE)&&(eventbox==NULL||!is_audio_eventbox(mt,eventbox)))||
+	  (!is_pure_audio(filter,FALSE)&&eventbox!=NULL&&is_audio_eventbox(mt,eventbox))) continue;
+
+      nins=enabled_in_channels(filter,TRUE);
+
+      if ((nins==ninchans||(ninchans==1000000&&nins>=ninchans))&&enabled_out_channels(filter,FALSE)==1) {
 	if (weed_plant_has_leaf(filter,"plugin_unstable")&&
 	    weed_get_boolean_value(filter,"plugin_unstable",&error)==WEED_TRUE) {
 	  if (!prefs->unstable_fx) continue;
@@ -3251,7 +3459,7 @@
 	else txt=weed_filter_get_name(i);
 
 	cat=weed_filter_categorise(filter,enabled_in_channels(filter,TRUE),enabled_out_channels(filter,FALSE));
-	if ((subcat=weed_filter_subcategorise(filter,cat,(cat==5)))!=0) {
+	if ((subcat=weed_filter_subcategorise(filter,cat,(cat==LIVES_FX_CAT_COMPOSITOR)))!=0) {
 	  tmp=g_strdup_printf("%s (%s)",txt,lives_fx_cat_to_text(subcat,FALSE));
 	  g_free(txt);
 	  txt=tmp;
@@ -3263,31 +3471,31 @@
 	gtk_widget_add_events (xeventbox, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK);
 	if (palette->style&STYLE_1) {
 	  if (palette->style&STYLE_3) {
-	    gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->normal_back);
-	    gtk_widget_modify_bg(xeventbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
+	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
 	  }
 	  else {
-	    gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
-	    gtk_widget_modify_bg(xeventbox, GTK_STATE_SELECTED, &palette->normal_back);
+	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
 	  }
 	}
 
-	vbox=gtk_vbox_new(FALSE,0);
+	vbox=lives_vbox_new(FALSE,0);
 
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width>>1);
 	gtk_container_add (GTK_CONTAINER (xeventbox), vbox);
-	label=gtk_label_new(txt);
+	label=lives_standard_label_new(txt);
 	g_free(txt);
 	
 	if (palette->style&STYLE_1) {
-	  gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->info_text);
-	  gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
+	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
+	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
 	}
-	gtk_container_set_border_width (GTK_CONTAINER (xeventbox), 5);
+	gtk_container_set_border_width (GTK_CONTAINER (xeventbox), widget_opts.border_width>>1);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
 	// pack a/v transitions first
-	if (get_transition_param(filter)==-1||!has_video_chans_in(filter,FALSE)) 
+	if (get_transition_param(filter,FALSE)==-1||!has_video_chans_in(filter,FALSE)) 
 	  gtk_box_pack_end (GTK_BOX (box), xeventbox, FALSE, FALSE, 0);
 	else gtk_box_pack_start (GTK_BOX (box), xeventbox, FALSE, FALSE, 0);
 	
@@ -3304,21 +3512,23 @@
 
 
 
-
-gboolean mt_selblock (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+static void mt_selblock(GtkMenuItem *menuitem, gpointer user_data) {
   // ctrl-Enter - select block at current time/track
   lives_mt *mt=(lives_mt *)user_data;
   GtkWidget *eventbox;
-  gdouble timesecs=GTK_RULER (mt->timeline)->position;
-
-  unselect_all(mt);
+  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  boolean desel=TRUE;
 
-  if (mt->current_track==-1) eventbox=(GtkWidget *)mt->audio_draws->data;
+  if (mt->current_track==-1||mt->aud_track_selected) 
+    eventbox=(GtkWidget *)g_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks);
   else eventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
 
   mt->putative_block=get_block_from_time(eventbox,timesecs,mt);
-  select_block((lives_mt *)user_data);
-  return TRUE;
+
+  if (mt->putative_block!=NULL&&mt->putative_block->state==BLOCK_UNSELECTED) desel=FALSE;
+
+  unselect_all(mt);
+  if (!desel) select_block((lives_mt *)user_data);
 }
 
 
@@ -3351,23 +3561,31 @@
 }
 
 
+static void no_time_selected(lives_mt *mt) {
+    clear_context(mt);
+    add_context_label(mt,_("You can click and drag\nbelow the timeline"));
+    add_context_label(mt,_("to select a time region.\n"));
+ }
+
+
 
 void
 mt_spin_start_value_changed           (GtkSpinButton   *spinbutton,
 				       gpointer         user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gboolean has_region=(mt->region_start!=mt->region_end);
+  boolean has_region=(mt->region_start!=mt->region_end);
 
   g_signal_handler_block(mt->spinbutton_start,mt->spin_start_func);
   mt->region_start=q_dbl(gtk_spin_button_get_value(spinbutton),mt->fps)/U_SEC;
   gtk_spin_button_set_value(spinbutton,mt->region_start);
-  gtk_spin_button_set_range (GTK_SPIN_BUTTON (mt->spinbutton_end),mt->region_start+1./mt->fps,mt->end_secs);
+  gtk_spin_button_set_range (GTK_SPIN_BUTTON (mt->spinbutton_end),mt->region_start,mt->end_secs);
   gtk_widget_queue_draw(mt->timeline_reg);
-  gdk_window_process_updates(mt->timeline_reg->window,FALSE);
+  gdk_window_process_updates(lives_widget_get_xwindow(mt->timeline_reg),FALSE);
   draw_region(mt);
   do_sel_context(mt);
 
-  if ((((mt->region_start!=mt->region_end&&!has_region)||(mt->region_start==mt->region_end&&has_region)))&&mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
+  if ((((mt->region_start!=mt->region_end&&!has_region)||(mt->region_start==mt->region_end&&has_region)))&&
+      mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
   if (mt->selected_tracks!=NULL) {
       gtk_widget_set_sensitive(mt->split_sel,TRUE);
       if (mt->region_start!=mt->region_end) {
@@ -3394,6 +3612,8 @@
     }
   }
 
+  if (mt->region_start==mt->region_end) no_time_selected(mt);
+
   g_signal_handler_unblock(mt->spinbutton_start,mt->spin_start_func);
 }
 
@@ -3403,19 +3623,19 @@
 mt_spin_end_value_changed           (GtkSpinButton   *spinbutton,
 				     gpointer         user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gboolean has_region=(mt->region_start!=mt->region_end);
+  boolean has_region=(mt->region_start!=mt->region_end);
 
   g_signal_handler_block(mt->spinbutton_end,mt->spin_end_func);
-
   mt->region_end=q_dbl(gtk_spin_button_get_value(spinbutton),mt->fps)/U_SEC;
   gtk_spin_button_set_value(spinbutton,mt->region_end);
-  gtk_spin_button_set_range (GTK_SPIN_BUTTON (mt->spinbutton_start),0.,mt->region_end-1./mt->fps);
+  gtk_spin_button_set_range (GTK_SPIN_BUTTON (mt->spinbutton_start),0.,mt->region_end);
   gtk_widget_queue_draw(mt->timeline_reg);
-  gdk_window_process_updates(mt->timeline_reg->window,FALSE);
+  gdk_window_process_updates(lives_widget_get_xwindow(mt->timeline_reg),FALSE);
   draw_region(mt);
   do_sel_context(mt);
 
-  if ((((mt->region_start!=mt->region_end&&!has_region)||(mt->region_start==mt->region_end&&has_region)))&&mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
+  if ((((mt->region_start!=mt->region_end&&!has_region)||(mt->region_start==mt->region_end&&has_region)))&&
+      mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
     if (mt->selected_tracks!=NULL) {
       gtk_widget_set_sensitive(mt->split_sel,TRUE);
       if (mt->region_start!=mt->region_end) {
@@ -3443,22 +3663,24 @@
     }
   }
 
+  if (mt->region_start==mt->region_end) no_time_selected(mt);
+
   g_signal_handler_unblock(mt->spinbutton_end,mt->spin_end_func);
 }
 
 
-static gboolean in_out_ebox_pressed (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
+static boolean in_out_ebox_pressed (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
 
   int height;
-  gdouble width;
-  gint ebwidth;
+  double width;
+  int ebwidth;
   file *sfile;
-  gint file;
+  int file;
   lives_mt *mt=(lives_mt *)user_data;
 
   if (mt->block_selected!=NULL) return FALSE;
 
-  ebwidth=GTK_WIDGET(mt->timeline)->allocation.width;
+  ebwidth=lives_widget_get_allocation_width(mt->timeline);
   file=mt_file_from_clip(mt,mt->clip_selected);
   sfile=mainw->files[file];
 
@@ -3477,12 +3699,14 @@
     }
     else width=sfile->laudio_time;
     if (width==0) return FALSE;
-    width=width/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
+    width=width/(mt->tl_max-mt->tl_min)*(double)ebwidth;
     if (width>ebwidth) width=ebwidth;
     if (width<2) width=2;
     height=get_track_height(mt);
-    gdk_window_set_cursor (eventbox->window, NULL);
-    set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,file,0,height/2);
+
+    lives_set_cursor_style (LIVES_CURSOR_NORMAL,eventbox);
+    mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,file,0,height/2);
+
     mt->hotspot_x=mt->hotspot_y=0;
   }
 
@@ -3505,7 +3729,7 @@
   gtk_menu_set_title (GTK_MENU(menu),_("LiVES: Selected clip"));
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   if (sfile->frames>0) {
@@ -3547,19 +3771,19 @@
 
 
 
-static gboolean clip_ebox_pressed (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
+static boolean clip_ebox_pressed (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
 
   int height;
-  gdouble width;
-  gint ebwidth;
+  double width;
+  int ebwidth;
   file *sfile;
-  gint file;
+  int file;
   lives_mt *mt=(lives_mt *)user_data;
 
   if (!mt->is_ready) return FALSE;
 
   if (event->type!=GDK_BUTTON_PRESS&&!mt->is_rendering) {
-    set_cursor_style(mt,LIVES_CURSOR_NORMAL,0,0,0,0,0);
+    lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
     // double click, open up in clip editor
     if (mainw->playing_file==-1) multitrack_delete(mt,!(prefs->warning_mask&WARN_MASK_EXIT_MT));
     return FALSE;
@@ -3568,7 +3792,7 @@
   mt->clip_selected=get_box_child_index(GTK_BOX(mt->clip_inner_box),eventbox);
   mt_clip_select(mt,FALSE);
   
-  ebwidth=GTK_WIDGET(mt->timeline)->allocation.width;
+  ebwidth=lives_widget_get_allocation_width(mt->timeline);
   file=mt_file_from_clip(mt,mt->clip_selected);
   sfile=mainw->files[file];
 
@@ -3592,12 +3816,12 @@
     }
     else width=sfile->laudio_time;
     if (width==0) return FALSE;
-    width=width/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
+    width=width/(mt->tl_max-mt->tl_min)*(double)ebwidth;
     if (width>ebwidth) width=ebwidth;
     if (width<2) width=2;
     height=get_track_height(mt);
-    gdk_window_set_cursor (eventbox->window, NULL);
-    set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,file,0,height/2);
+    lives_set_cursor_style (LIVES_CURSOR_NORMAL,eventbox);
+    mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,file,0,height/2);
     mt->hotspot_x=mt->hotspot_y=0;
   }
   
@@ -3606,46 +3830,54 @@
 
 
 
-static gboolean
+static boolean
 on_drag_clip_end           (GtkWidget       *widget,
 			    GdkEventButton  *event,
 			    gpointer         user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
+
   GdkWindow *window;
   GtkWidget *eventbox;
   GtkWidget *labelbox;
   GtkWidget *ahbox;
-  lives_mt *mt=(lives_mt *)user_data;
+
+  double timesecs,osecs;
+
   int win_x,win_y;
-  int i;
-  gdouble timesecs,osecs;
+
+  register int i;
 
   if (mt->is_rendering) return FALSE;
 
   if (mt->cursor_style!=LIVES_CURSOR_BLOCK) return FALSE;
 
-  osecs=GTK_RULER (mt->timeline)->position;
+  osecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
-  set_cursor_style(mt,LIVES_CURSOR_BUSY,0,0,0,0,0);
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
-  window=gdk_display_get_window_at_pointer (mt->display,&win_x,&win_y);
+  window=lives_display_get_window_at_pointer 
+    ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+     mt->display,&win_x,&win_y);
 
   if (cfile->achans>0&&mt->opts.back_audio_tracks>0&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
     labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"labelbox");
     ahbox=(GtkWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"ahbox");
   
-    if (GTK_WIDGET(mt->audio_draws->data)->window==window||labelbox->window==window||ahbox->window==window) {
+    if (lives_widget_get_xwindow(LIVES_WIDGET(mt->audio_draws->data))==window||
+	lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
 
       // insert in backing audio
-      if (labelbox->window==window||ahbox->window==window) timesecs=0.;
+      if (lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) timesecs=0.;
       else {
-	gdk_window_get_pointer(GDK_WINDOW (mt->timeline->window), &mt->sel_x, &mt->sel_y, NULL);
+	lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				 mt->timeline, &mt->sel_x, &mt->sel_y);
 	timesecs=get_time_from_x(mt,mt->sel_x);
       }
       mt->current_track=-1;
       track_select(mt);
       
       if (mainw->playing_file==-1) {
-	GTK_RULER (mt->timeline)->position=timesecs;
+	lives_ruler_set_value(LIVES_RULER (mt->timeline),timesecs);
 	if (!mt->is_paused) {
 	  if (mt->poly_state==POLY_FX_STACK) {
 	    polymorph(mt,POLY_FX_STACK);
@@ -3659,9 +3891,12 @@
 	gtk_widget_queue_draw (mt->timeline);
       }
 
-      if (mainw->playing_file==-1&&(mainw->files[mt->file_selected]->laudio_time>((mainw->files[mt->file_selected]->start-1.)/mainw->files[mt->file_selected]->fps)||(mainw->files[mt->file_selected]->laudio_time>0.&&mt->opts.ign_ins_sel))) insert_audio_here_cb(NULL,(gpointer)mt);
-      set_cursor_style(mt,LIVES_CURSOR_NORMAL,0,0,0,0,0);
-      if (mt->is_paused) GTK_RULER (mt->timeline)->position=osecs;
+      if (mainw->playing_file==-1&&(mainw->files[mt->file_selected]->laudio_time>
+				    ((mainw->files[mt->file_selected]->start-1.)/mainw->files[mt->file_selected]->fps)||
+				    (mainw->files[mt->file_selected]->laudio_time>0.&&mt->opts.ign_ins_sel))) 
+	insert_audio_here_cb(NULL,(gpointer)mt);
+      lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+      if (mt->is_paused) lives_ruler_set_value(LIVES_RULER (mt->timeline),osecs);
       return FALSE;
     }
   }
@@ -3671,10 +3906,11 @@
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))!=0) continue;
     labelbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
     ahbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
-    if (eventbox->window==window||labelbox->window==window||ahbox->window==window) {
-      if (labelbox->window==window||ahbox->window==window) timesecs=0.;
+    if (lives_widget_get_xwindow(eventbox)==window||lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
+      if (lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) timesecs=0.;
       else {
-	gdk_window_get_pointer(GDK_WINDOW (mt->timeline->window), &mt->sel_x, &mt->sel_y, NULL);
+	lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				 mt->timeline, &mt->sel_x, &mt->sel_y);
 	timesecs=get_time_from_x(mt,mt->sel_x);
       }
       mt->current_track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
@@ -3682,7 +3918,7 @@
       track_select(mt);
 
       if (mainw->playing_file==-1) {
-	GTK_RULER (mt->timeline)->position=timesecs;
+	lives_ruler_set_value(LIVES_RULER (mt->timeline),timesecs);
 	if (!mt->is_paused) {
 	  mt_show_current_frame(mt, FALSE);
 	  if (timesecs>0.) {
@@ -3697,56 +3933,67 @@
     }
   }
 
-  if (mt->is_paused) GTK_RULER (mt->timeline)->position=osecs;
-  set_cursor_style(mt,LIVES_CURSOR_NORMAL,0,0,0,0,0);
+  if (mt->is_paused) lives_ruler_set_value(LIVES_RULER (mt->timeline),osecs);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 
   return FALSE;
 }
 
 
-static gboolean
-on_clipbox_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
-  GdkCursor *cursor;
+static boolean on_clipbox_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->cursor_style!=0) return FALSE;
-  cursor=gdk_cursor_new_for_display (mt->display, GDK_HAND2);
-  gdk_window_set_cursor (widget->window, cursor);
+  if (mt->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
+  lives_set_cursor_style(LIVES_CURSOR_HAND2,widget);
   return FALSE;
 }
 
 
 void mt_init_start_end_spins(lives_mt *mt) {
-  GtkWidget *hbox,*btoolbar;
-  GObject *spinbutton_start_adj;
-  GObject *spinbutton_end_adj;
-  
-  hbox = gtk_hbox_new (FALSE, 0);
+  GtkWidget *hbox,*btoolbar,*label,*eventbox;
+
+  int dpw;
+  boolean woat;
+
+  hbox = lives_hbox_new (FALSE, 0);
   gtk_widget_show (hbox);
   
   gtk_box_pack_start (GTK_BOX (mt->top_vbox), hbox, FALSE, FALSE, 6);
 
-  btoolbar=gtk_toolbar_new();
-  gtk_box_pack_start (GTK_BOX (hbox), btoolbar, FALSE, FALSE, 20);
 
-  gtk_toolbar_set_show_arrow(GTK_TOOLBAR(btoolbar),FALSE);
+  eventbox = gtk_event_box_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width*2);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_NORMAL, &palette->menu_and_bars);
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_PRELIGHT, &palette->menu_and_bars);
-  }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_INSENSITIVE, &palette->normal_back);
+    lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
+  btoolbar=gtk_toolbar_new();
+  gtk_container_add (GTK_CONTAINER (eventbox), btoolbar);
+
+  gtk_toolbar_set_show_arrow(GTK_TOOLBAR(btoolbar),FALSE);
+
   gtk_toolbar_set_style (GTK_TOOLBAR (btoolbar), GTK_TOOLBAR_TEXT);
 
 
-  mt->amixer_button=GTK_WIDGET(gtk_tool_button_new(NULL,_ ("Audio mixer (ctrl-m)")));
+  mt->amixer_button=GTK_WIDGET(gtk_tool_button_new(NULL,NULL));
+
+  label=lives_standard_label_new(_ ("Audio mixer (ctrl-m)"));
+  gtk_tool_button_set_label_widget(GTK_TOOL_BUTTON(mt->amixer_button),label);
 
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mt->amixer_button),-1);
 
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+
+    lives_widget_set_bg_color(mt->amixer_button, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+  }
+
   gtk_widget_add_accelerator (mt->amixer_button, "clicked", mt->accel_group,
-                              GDK_m, GDK_CONTROL_MASK,
+                              LIVES_KEY_m, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   if (cfile->achans==0||!mt->opts.pertrack_audio) gtk_widget_set_sensitive(mt->amixer_button,FALSE);
@@ -3755,51 +4002,56 @@
 		    G_CALLBACK (amixer_show),
 		    (gpointer)mt);
 
-  spinbutton_start_adj = (GObject *)gtk_adjustment_new (0., 0., 0., 1./mt->fps, 1./mt->fps, 0.);
-  mt->spinbutton_start = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_start_adj), 1, 3);
+  woat=widget_opts.apply_theme;
+  dpw=widget_opts.packing_width;
+
+  widget_opts.apply_theme=FALSE;
+  widget_opts.packing_width=MAIN_SPIN_SPACER;
+  mt->spinbutton_start = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1./mt->fps, 1./mt->fps, 3,
+							 NULL,NULL);
+  widget_opts.apply_theme=woat;
+  widget_opts.packing_width=dpw;
 
   gtk_box_pack_start (GTK_BOX (hbox), mt->spinbutton_start, TRUE, FALSE, MAIN_SPIN_SPACER);
-  GTK_WIDGET_SET_FLAGS (mt->spinbutton_start, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mt->spinbutton_start), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mt->spinbutton_start),GTK_UPDATE_ALWAYS);
 
   mt->l_sel_arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_OUT);
   gtk_box_pack_start (GTK_BOX (hbox), mt->l_sel_arrow, FALSE, FALSE, 0);
-  gtk_widget_modify_fg(mt->l_sel_arrow, GTK_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color(mt->l_sel_arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
   gtk_entry_set_width_chars (GTK_ENTRY (mt->spinbutton_start),12);
-  mt->sel_label = gtk_label_new(NULL);
-
+  mt->sel_label = lives_standard_label_new(NULL);
 
   set_sel_label(mt->sel_label);
-
   gtk_box_pack_start (GTK_BOX (hbox), mt->sel_label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (mt->sel_label), GTK_JUSTIFY_LEFT);
-  gtk_widget_modify_fg(mt->sel_label, GTK_STATE_NORMAL, &palette->normal_fore);
 
   mt->r_sel_arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
   gtk_box_pack_start (GTK_BOX (hbox), mt->r_sel_arrow, FALSE, FALSE, 3);
-  gtk_widget_modify_fg(mt->r_sel_arrow, GTK_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color(mt->r_sel_arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+
+  widget_opts.apply_theme=FALSE;
+  widget_opts.packing_width=MAIN_SPIN_SPACER;
+  mt->spinbutton_end = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1./mt->fps, 1./mt->fps, 3,
+							 NULL,NULL);
+
+  widget_opts.apply_theme=woat;
+  widget_opts.packing_width=dpw;
 
-  spinbutton_end_adj = (GObject *)gtk_adjustment_new (0., 0., 0., 1./mt->fps, 1./mt->fps, 0.);
-  mt->spinbutton_end = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_end_adj), 1, 3);
-  gtk_box_pack_start (GTK_BOX (hbox), mt->spinbutton_end, TRUE, FALSE, MAIN_SPIN_SPACER);
   gtk_entry_set_width_chars (GTK_ENTRY (mt->spinbutton_end),12);
 
-  GTK_WIDGET_SET_FLAGS (mt->spinbutton_end, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mt->spinbutton_end), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mt->spinbutton_end),GTK_UPDATE_ALWAYS);
+  gtk_box_pack_start (GTK_BOX (hbox), mt->spinbutton_end, TRUE, FALSE, MAIN_SPIN_SPACER);
 
   if (palette->style&STYLE_1&&palette->style&STYLE_2) {
-    gtk_widget_modify_base(mt->spinbutton_start, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_base(mt->spinbutton_start, GTK_STATE_INSENSITIVE, &palette->normal_back);
-    gtk_widget_modify_base(mt->spinbutton_end, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_base(mt->spinbutton_end, GTK_STATE_INSENSITIVE, &palette->normal_back);
-    gtk_widget_modify_text(mt->spinbutton_start, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_text(mt->spinbutton_start, GTK_STATE_INSENSITIVE, &palette->normal_fore);
-    gtk_widget_modify_text(mt->spinbutton_end, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_text(mt->spinbutton_end, GTK_STATE_INSENSITIVE, &palette->normal_fore);
-    gtk_widget_modify_fg(mt->sel_label, GTK_STATE_NORMAL, &palette->normal_fore);
+#if !GTK_CHECK_VERSION(3,0,0)
+    lives_widget_set_base_color(mt->spinbutton_start, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_base_color(mt->spinbutton_start, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+    lives_widget_set_base_color(mt->spinbutton_end, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_base_color(mt->spinbutton_end, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+    lives_widget_set_text_color(mt->spinbutton_start, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_text_color(mt->spinbutton_start, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+    lives_widget_set_text_color(mt->spinbutton_end, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_text_color(mt->spinbutton_end, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+#endif
+    lives_widget_set_fg_color(mt->sel_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   mt->spin_start_func=g_signal_connect_after (GTK_OBJECT (mt->spinbutton_start), "value_changed",
@@ -3920,7 +4172,7 @@
 }
 
 
-static size_t estimate_space(lives_mt *mt, gint undo_type) {
+static size_t estimate_space(lives_mt *mt, int undo_type) {
   size_t needed=sizeof(mt_undo);
 
   switch (undo_type) {
@@ -3933,7 +4185,7 @@
   return needed;
 }
 
-static gchar *get_undo_text(gint action, void *extra) {
+static gchar *get_undo_text(int action, void *extra) {
   gchar *filtname,*ret;
   int error;
 
@@ -3978,7 +4230,7 @@
 
 
 
-static void mt_set_undoable (lives_mt *mt, gint what, void *extra, gboolean sensitive) {
+static void mt_set_undoable (lives_mt *mt, int what, void *extra, boolean sensitive) {
   mt->undoable=sensitive;
   if (what!=MT_UNDO_NONE) {
     gchar *what_safe;
@@ -4000,7 +4252,7 @@
 }
 
 
-static void mt_set_redoable (lives_mt *mt, gint what, void *extra, gboolean sensitive) {
+static void mt_set_redoable (lives_mt *mt, int what, void *extra, boolean sensitive) {
   mt->redoable=sensitive;
   if (what!=MT_UNDO_NONE) {
     gchar *what_safe;
@@ -4022,7 +4274,7 @@
 
 
 
-gboolean make_backup_space (lives_mt *mt, size_t space_needed) {
+boolean make_backup_space (lives_mt *mt, size_t space_needed) {
   // read thru mt->undos and eliminate that space until we have space_needed
   size_t space_avail=(size_t)(prefs->mt_undo_buf*1024*1024)-mt->undo_buffer_used;
   size_t space_freed=0;
@@ -4064,7 +4316,7 @@
 }
 
 
-void mt_backup(lives_mt *mt, gint undo_type, weed_timecode_t tc) {
+void mt_backup(lives_mt *mt, int undo_type, weed_timecode_t tc) {
   // backup an operation in the undo/redo list
 
   size_t space_needed=0;
@@ -4132,7 +4384,7 @@
       ((size_t)(prefs->mt_undo_buf*1024*1024)-mt->undo_buffer_used)) {
     if (!make_backup_space(mt,space_needed)) {
       remove_markers(mt->event_list);
-      do_mt_backup_space_error(mt,(gint)((space_needed*3)>>20));
+      do_mt_backup_space_error(mt,(int)((space_needed*3)>>20));
       return;
     }
     memblock=(unsigned char *)(mt->undo_mem+mt->undo_buffer_used+sizeof(mt_undo));
@@ -4152,7 +4404,7 @@
 }
 
 void mt_aparam_view_toggled (GtkMenuItem *menuitem, gpointer user_data) {
-  gint which=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"pnum"));
+  int which=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"pnum"));
   lives_mt *mt=(lives_mt *)user_data;
   int i;
 
@@ -4179,7 +4431,6 @@
   gtk_container_foreach(GTK_CONTAINER(mt->aparam_submenu),destroy_widget,NULL);
 
   if (mt->avol_fx==-1||mt->audio_draws==NULL) {
-    gtk_widget_hide(mt->insa_eventbox);
     gtk_widget_hide(mt->insa_checkbutton);
     gtk_widget_hide(mt->aparam_separator);
     gtk_widget_hide(mt->aparam_menuitem);
@@ -4197,7 +4448,6 @@
     return;
   }
   if (mt->opts.pertrack_audio) {
-    gtk_widget_show(mt->insa_eventbox);
     gtk_widget_show(mt->insa_checkbutton);
   }
 
@@ -4213,9 +4463,11 @@
   filter=get_weed_filter(mt->avol_fx);
   rfx=weed_to_rfx(filter,FALSE);
   for (i=0;i<rfx->num_params;i++) {
+    // TODO - check rfx->params[i].multi
     if ((rfx->params[i].hidden|HIDDEN_MULTI)==HIDDEN_MULTI&&rfx->params[i].type==LIVES_PARAM_NUM) {
       menuitem = gtk_check_menu_item_new_with_label (rfx->params[i].name);
-      if (mt->aparam_view_list!=NULL&&g_list_find(mt->aparam_view_list,GINT_TO_POINTER(i))) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);
+      if (mt->aparam_view_list!=NULL&&g_list_find(mt->aparam_view_list,GINT_TO_POINTER(i))) 
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);
       else gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),FALSE);
       gtk_container_add (GTK_CONTAINER (mt->aparam_submenu), menuitem);
       gtk_widget_show(menuitem);
@@ -4237,7 +4489,10 @@
   weed_plant_t *init_event=mt->avol_init_event,*new_end_event;
   weed_plant_t *deinit_event;
   weed_timecode_t new_tc;
-  int error,i;
+
+  int error;
+
+  register int i;
 
   if (mt->opts.back_audio_tracks==0&&!mt->opts.pertrack_audio) return;
 
@@ -4247,7 +4502,7 @@
     remove_filter_from_event_list(mt->event_list,init_event);
     if (mt->aparam_view_list!=NULL) {
       for (i=0;i<g_list_length(mt->audio_draws);i++) {
-	redraw_eventbox(mt,(GtkWidget *)g_list_nth_data(mt->audio_draws,i));
+	gtk_widget_queue_draw((GtkWidget *)g_list_nth_data(mt->audio_draws,i));
       }
     }
     return;
@@ -4256,14 +4511,21 @@
   if (mt->opts.pertrack_audio) gtk_widget_set_sensitive(mt->prerender_aud,TRUE);
 
   if (init_event==NULL) {
-    gdouble region_start=mt->region_start;
-    gdouble region_end=mt->region_end;
     GList *slist=g_list_copy(mt->selected_tracks);
-    int current_fx=mt->current_fx;
+
     weed_plant_t *old_mt_init=mt->init_event;
-    gboolean did_backup=mt->did_backup;
+
+    double region_start=mt->region_start;
+    double region_end=mt->region_end;
+
+    boolean did_backup=mt->did_backup;
+    boolean needs_idlefunc=FALSE;
+
+    int current_fx=mt->current_fx;
+
 
     if (!did_backup&&mt->idlefunc>0) {
+      needs_idlefunc=TRUE;
       g_source_remove(mt->idlefunc);
       mt->idlefunc=0;
     }
@@ -4298,11 +4560,11 @@
 
     if (mt->aparam_view_list!=NULL) {
       for (i=0;i<g_list_length(mt->audio_draws);i++) {
-	redraw_eventbox(mt,(GtkWidget *)g_list_nth_data(mt->audio_draws,i));
+	gtk_widget_queue_draw((GtkWidget *)g_list_nth_data(mt->audio_draws,i));
       }
     }
 
-    if (!did_backup) mt->idlefunc=mt_idle_add(mt);
+    if (!did_backup&&needs_idlefunc) mt->idlefunc=mt_idle_add(mt);
 
     return;
   }
@@ -4315,7 +4577,7 @@
 
   if (mt->aparam_view_list!=NULL) {
     for (i=0;i<g_list_length(mt->audio_draws);i++) {
-      redraw_eventbox(mt,(GtkWidget *)g_list_nth_data(mt->audio_draws,i));
+      gtk_widget_queue_draw((GtkWidget *)g_list_nth_data(mt->audio_draws,i));
     }
   }
 }
@@ -4329,8 +4591,9 @@
   // TODO - in future we may have more audio filters
 
   weed_plant_t *inst;
-  gint num_in,num_out;
   weed_plant_t **in_channels,**out_channels;
+
+  int num_in,num_out;
   int i,error;
   
   add_aparam_menuitems(mt);
@@ -4371,11 +4634,12 @@
   if (cfile->signed_endian&AFORM_BIG_ENDIAN) g_strappend(sendian,128,_("big endian"));
   else g_strappend(sendian,128,_("little endian"));
   
-  return g_strdup_printf(_("Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, audio rate %d, audio sample size %d, %s.\n"),cfile->fps,cfile->hsize,cfile->vsize,cfile->achans,cfile->arate,cfile->asampsize,sendian);
+  return g_strdup_printf(_("Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, audio rate %d, audio sample size %d, %s.\n"),
+			 cfile->fps,cfile->hsize,cfile->vsize,cfile->achans,cfile->arate,cfile->asampsize,sendian);
 }
 
 
-static void set_mt_play_sizes(lives_mt *mt, gint width, gint height) {
+static void set_mt_play_sizes(lives_mt *mt, int width, int height) {
   if (!mt->opts.show_ctx) {
     mt->play_width=MIN(width,MT_PLAY_WIDTH_EXP);
     mt->play_height=MIN(height,MT_PLAY_HEIGHT_EXP);
@@ -4390,18 +4654,19 @@
   }
 }
 
-static weed_plant_t *load_event_list_inner (lives_mt *mt, int fd, gboolean show_errors, gint *num_events, unsigned char **mem, unsigned char *mem_end) {
+static weed_plant_t *load_event_list_inner (lives_mt *mt, int fd, boolean show_errors, int *num_events, 
+					    unsigned char **mem, unsigned char *mem_end) {
   weed_plant_t *event,*eventprev=NULL;
   weed_plant_t *event_list;
   int error;
-  gdouble fps=-1;
+  double fps=-1;
   gchar *msg;
 
   if (fd>0||mem!=NULL) event_list=weed_plant_deserialise(fd,mem);
   else event_list=mainw->stored_event_list;
 
   if (mt!=NULL) mt->layout_set_properties=FALSE;
-
+  
   if (event_list==NULL||!WEED_PLANT_IS_EVENT_LIST(event_list)) {
     if (show_errors) d_print(_("invalid event list. Failed.\n"));
     return NULL;
@@ -4439,7 +4704,7 @@
 
     // check for optional leaves
     if (weed_plant_has_leaf(event_list,"width")) {
-      gint width=weed_get_int_value(event_list,"width",&error);
+      int width=weed_get_int_value(event_list,"width",&error);
       if (width>0) {
 	cfile->hsize=width;
 	if (mt!=NULL) mt->layout_set_properties=TRUE;
@@ -4447,7 +4712,7 @@
     }
     
     if (weed_plant_has_leaf(event_list,"height")) {
-      gint height=weed_get_int_value(event_list,"height",&error);
+      int height=weed_get_int_value(event_list,"height",&error);
       if (height>0) {
 	cfile->vsize=height;
 	if (mt!=NULL) mt->layout_set_properties=TRUE;
@@ -4455,8 +4720,7 @@
     }
     
     if (weed_plant_has_leaf(event_list,"audio_channels")) {
-      gint achans=weed_get_int_value(event_list,"audio_channels",&error);
-
+      int achans=weed_get_int_value(event_list,"audio_channels",&error);
       if (achans>=0&&mt!=NULL) {
 	if (achans>2) {
 	  gchar *err=g_strdup_printf(_("\nThis has an invalid number of audio channels (%d) for LiVES.\nIt cannot be loaded.\n"),achans);
@@ -4471,7 +4735,7 @@
     }
     
     if (weed_plant_has_leaf(event_list,"audio_rate")) {
-      gint arate=weed_get_int_value(event_list,"audio_rate",&error);
+      int arate=weed_get_int_value(event_list,"audio_rate",&error);
       if (arate>0) {
 	cfile->arate=cfile->arps=arate;
 	if (mt!=NULL) mt->layout_set_properties=TRUE;
@@ -4479,7 +4743,7 @@
     }
     
     if (weed_plant_has_leaf(event_list,"audio_sample_size")) {
-      gint asamps=weed_get_int_value(event_list,"audio_sample_size",&error);
+      int asamps=weed_get_int_value(event_list,"audio_sample_size",&error);
       if (asamps==8||asamps==16) {
 	cfile->asampsize=asamps;
 	if (mt!=NULL) mt->layout_set_properties=TRUE;
@@ -4488,7 +4752,7 @@
     }
     
     if (weed_plant_has_leaf(event_list,"audio_signed")) {
-      gint asigned=weed_get_boolean_value(event_list,"audio_signed",&error);
+      int asigned=weed_get_boolean_value(event_list,"audio_signed",&error);
       if (asigned==WEED_TRUE) {
 	if (cfile->signed_endian&AFORM_UNSIGNED) cfile->signed_endian^=AFORM_UNSIGNED;
       }
@@ -4499,7 +4763,7 @@
     }
     
     if (weed_plant_has_leaf(event_list,"audio_endian")) {
-      gint aendian=weed_get_int_value(event_list,"audio_endian",&error);
+      int aendian=weed_get_int_value(event_list,"audio_endian",&error);
       if (aendian==0) {
 	if (cfile->signed_endian&AFORM_BIG_ENDIAN) cfile->signed_endian^=AFORM_BIG_ENDIAN;
       }
@@ -4530,6 +4794,13 @@
   weed_set_voidptr_value(event_list,"first",NULL);
   weed_set_voidptr_value(event_list,"last",NULL);
 
+  // force 64 bit ptrs when reading layouts (for compatibility)
+  prefs->force64bit=FALSE;
+
+  if (weed_plant_has_leaf(event_list,"ptrsize")) {
+    if (weed_get_int_value(event_list,"ptrsize",&error)==8) prefs->force64bit=TRUE;
+  }
+
   do {
     if (mem!=NULL&&(*mem)>=mem_end) break;
     event=weed_plant_deserialise(fd,mem);
@@ -4557,34 +4828,35 @@
 
 static void on_insa_toggled (GtkToggleButton *tbutton, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->opts.insert_audio=gtk_toggle_button_get_active(tbutton);
+  mt->opts.insert_audio=lives_toggle_button_get_active(tbutton);
   if (prefs->lamp_buttons) {
-    if (mt->opts.insert_audio) gtk_widget_modify_bg(GTK_WIDGET(tbutton), GTK_STATE_PRELIGHT, &palette->light_green);
-    else gtk_widget_modify_bg(GTK_WIDGET(tbutton), GTK_STATE_PRELIGHT, &palette->dark_red);
+    if (mt->opts.insert_audio) lives_widget_set_bg_color(GTK_WIDGET(tbutton), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
+    else lives_widget_set_bg_color(GTK_WIDGET(tbutton), LIVES_WIDGET_STATE_PRELIGHT, &palette->dark_red);
   }
 }
 
 static void on_snapo_toggled (GtkToggleButton *tbutton, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->opts.snap_over=gtk_toggle_button_get_active(tbutton);
+  mt->opts.snap_over=lives_toggle_button_get_active(tbutton);
   if (prefs->lamp_buttons) {
-    if (mt->opts.snap_over) gtk_widget_modify_bg(GTK_WIDGET(tbutton), GTK_STATE_PRELIGHT, &palette->light_green);
-    else gtk_widget_modify_bg(GTK_WIDGET(tbutton), GTK_STATE_PRELIGHT, &palette->dark_red);
+    if (mt->opts.snap_over) lives_widget_set_bg_color(GTK_WIDGET(tbutton), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
+    else lives_widget_set_bg_color(GTK_WIDGET(tbutton), LIVES_WIDGET_STATE_PRELIGHT, &palette->dark_red);
   }
 }
 
 
 
-gchar *set_values_from_defs(lives_mt *mt, gboolean from_prefs) {
+gchar *set_values_from_defs(lives_mt *mt, boolean from_prefs) {
   // set various multitrack state flags from either defaults or user preferences
 
   gchar *retval=NULL;
-  gint hsize=cfile->hsize;
-  gint vsize=cfile->vsize;
-  gint arate=cfile->arate;
-  gint achans=cfile->achans;
-  gint asamps=cfile->asampsize;
-  gint ase=cfile->signed_endian;
+
+  int hsize=cfile->hsize;
+  int vsize=cfile->vsize;
+  int arate=cfile->arate;
+  int achans=cfile->achans;
+  int asamps=cfile->asampsize;
+  int ase=cfile->signed_endian;
 
   if (mainw->stored_event_list!=NULL) {
     load_event_list_inner(mt,-1,TRUE,NULL,NULL,NULL);
@@ -4623,7 +4895,7 @@
     retval=mt_set_vals_string();
   }
 
-  if (mt->is_ready) scroll_tracks(mt,0);
+  if (mt->is_ready) scroll_tracks(mt,0,TRUE);
 
   if (cfile->achans==0) {
     mt->avol_fx=-1;
@@ -4647,6 +4919,8 @@
   mt->undo_buffer_used=0;
   mt->undo_offset=0;
 
+  if (mainw->is_exiting) return;
+
   mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
   mt_set_redoable(mt,MT_UNDO_NONE,NULL,FALSE);
 }
@@ -4671,7 +4945,7 @@
 void remove_current_from_affected_layouts(lives_mt *mt) {
   // remove from affected layouts map
   if (mainw->affected_layouts_map!=NULL) {
-    GList *found=g_list_find_custom(mainw->affected_layouts_map,mainw->cl_string,(GCompareFunc)strcmp);
+    GList *found=g_list_find_custom(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL],(GCompareFunc)strcmp);
     if (found!=NULL) {
       g_free(found->data);
       mainw->affected_layouts_map=g_list_delete_link(mainw->affected_layouts_map,found);
@@ -4720,7 +4994,7 @@
 
 
 
-void stored_event_list_free_all(gboolean wiped) {
+void stored_event_list_free_all(boolean wiped) {
   int i;
 
   for (i=0;i<MAX_FILES;i++) {
@@ -4745,16 +5019,16 @@
 
 
 
-gboolean check_for_layout_del (lives_mt *mt, gboolean exiting) {
+boolean check_for_layout_del (lives_mt *mt, boolean exiting) {
   // save or wipe event_list
-  gint resp=2;
+  int resp=2;
 
   if ((mt==NULL||mt->event_list==NULL||get_first_event(mt->event_list)==NULL)&&
       (mainw->stored_event_list==NULL||get_first_event(mainw->stored_event_list)==NULL)) return TRUE;
 
   if (((mt!=NULL&&(mt->changed||mainw->scrap_file!=-1||mainw->ascrap_file!=-1))||(mainw->stored_event_list!=NULL&&
 										  mainw->stored_event_list_changed))) {
-    gint type=((mainw->scrap_file==-1&&mainw->ascrap_file==-1)||mt==NULL)?3*(!exiting):4;
+    int type=((mainw->scrap_file==-1&&mainw->ascrap_file==-1)||mt==NULL)?3*(!exiting):4;
     _entryw *cdsw=create_cds_dialog(type);
 
     do {
@@ -4817,7 +5091,7 @@
 }
 
 
-void delete_audio_tracks(lives_mt *mt, GList *list, gboolean full) {
+void delete_audio_tracks(lives_mt *mt, GList *list, boolean full) {
   GList *slist=list;
   while (slist!=NULL) {
     delete_audio_track(mt,(GtkWidget *)slist->data,full);
@@ -4847,12 +5121,14 @@
 }
 
 
-static gboolean timecode_string_validate(GtkEntry *entry, lives_mt *mt) {
+static boolean timecode_string_validate(GtkEntry *entry, lives_mt *mt) {
   const gchar *etext=gtk_entry_get_text(entry);
   gchar **array;
-  gint hrs,mins;
-  gdouble secs;
-  gdouble tl_range,pos;
+
+  double secs;
+  double tl_range,pos;
+
+  int hrs,mins;
 
   if (get_token_count((gchar *)etext,':')!=3) return FALSE;
 
@@ -4886,21 +5162,16 @@
 
   }
   
-  pos=GTK_RULER (mt->timeline)->position;
+  pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   pos=q_dbl(pos,mt->fps)/U_SEC;
   if (pos<0.) pos=0.;
 
   mt_tl_move(mt,secs-pos);
 
-  if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
-  while (g_main_context_iteration(NULL,FALSE));
-  if (mt->idlefunc>0) {
-    mt->idlefunc=0;
-    mt->idlefunc=mt_idle_add(mt);
-  }
+  lives_widget_context_update();
 
-  pos=GTK_RULER (mt->timeline)->position;
+  pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   pos=q_dbl(pos,mt->fps)/U_SEC;
   if (pos<0.) pos=0.;
@@ -4910,7 +5181,7 @@
   return TRUE;
 }
 
-static gboolean on_mt_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+static boolean on_mt_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
   mt_quit_activate(NULL,user_data);
   return FALSE;
 }
@@ -4932,7 +5203,7 @@
   prefs->atrans_fx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"idx"));
 
   // set pref
-  atrans_hash=make_weed_hashname(prefs->atrans_fx,FALSE);
+  atrans_hash=make_weed_hashname(prefs->atrans_fx,FALSE,FALSE);
   set_pref("current_autotrans",atrans_hash);
   g_free(atrans_hash);
 }
@@ -4940,10 +5211,10 @@
 
 static void after_timecode_changed(GtkWidget *entry, GtkDirectionType dir, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gdouble pos;
+  double pos;
 
   if (!timecode_string_validate(GTK_ENTRY(entry),mt)) {
-    pos=GTK_RULER (mt->timeline)->position;
+    pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
     pos=q_dbl(pos,mt->fps)/U_SEC;
     if (pos<0.) pos=0.;
     time_to_string(mt,pos,TIMECODE_LENGTH);
@@ -4951,8 +5222,160 @@
   
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+static boolean expose_pb (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
+  set_ce_frame_from_pixbuf(GTK_IMAGE(mainw->image274),mt->frame_pixbuf,cr);
+  return TRUE;
+}
+
+static boolean draw_cool_toggle (GtkWidget *widget, lives_painter_t *cr, gpointer user_data) {
+  double rwidth=(double)lives_widget_get_allocation_width(LIVES_WIDGET(widget));
+  double rheight=(double)lives_widget_get_allocation_height(LIVES_WIDGET(widget));
+
+  double rad;
+
+  double scalex=1.;
+  double scaley=.8;
+
+  lives_painter_translate(cr,rwidth*(1.-scalex)/2.,rheight*(1.-scaley)/2.);
+
+  rwidth*=scalex;
+  rheight*=scaley;
+
+  // draw the inside
+
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget))) {
+      lives_painter_set_source_rgba (cr, palette->light_green.red, palette->light_green.green,
+				     palette->light_green.blue, 1.);
+  }
+  else {
+      lives_painter_set_source_rgba (cr, palette->dark_red.red, palette->dark_red.green,
+				     palette->dark_red.blue, 1.);
+  }
+ 
+  // draw rounded rctangle
+  lives_painter_rectangle(cr,0,rwidth/4,
+			  rwidth,
+			  rheight-rwidth/2);
+  lives_painter_fill(cr);
 
- lives_mt *multitrack (weed_plant_t *event_list, gint orig_file, gdouble fps) {
+  lives_painter_rectangle(cr,rwidth/4,0,
+			  rwidth/2,
+			  rwidth/4);
+  lives_painter_fill(cr);
+
+  lives_painter_rectangle(cr,rwidth/4,rheight-rwidth/4,
+			  rwidth/2,
+			  rwidth/4);
+  lives_painter_fill(cr);
+
+  rad=rwidth/4.;
+
+  lives_painter_move_to(cr,rwidth/4.,rwidth/4.);
+  lives_painter_line_to(cr,0.,rwidth/4.);
+  lives_painter_arc(cr,rwidth/4.,rwidth/4.,rad,M_PI,1.5*M_PI);
+  lives_painter_line_to(cr,rwidth/4.,rwidth/4.);
+  lives_painter_fill(cr);
+
+  lives_painter_move_to(cr,rwidth/4.*3.,rwidth/4.);
+  lives_painter_line_to(cr,rwidth/4.*3.,0.);
+  lives_painter_arc(cr,rwidth/4.*3.,rwidth/4.,rad,-M_PI/2.,0.);
+  lives_painter_line_to(cr,rwidth/4.*3.,rwidth/4.);
+  lives_painter_fill(cr);
+
+  lives_painter_move_to(cr,rwidth/4.,rheight-rwidth/4.);
+  lives_painter_line_to(cr,rwidth/4.,rheight);
+  lives_painter_arc(cr,rwidth/4.,rheight-rwidth/4.,rad,M_PI/2.,M_PI);
+  lives_painter_line_to(cr,rwidth/4.,rheight-rwidth/4.);
+  lives_painter_fill(cr);
+
+  lives_painter_move_to(cr,rwidth/4.*3.,rheight-rwidth/4.);
+  lives_painter_line_to(cr,rwidth,rheight-rwidth/4.);
+  lives_painter_arc(cr,rwidth/4.*3.,rheight-rwidth/4.,rad,0.,M_PI/2.);
+  lives_painter_line_to(cr,rwidth/4.*3.,rheight-rwidth/4.);
+  lives_painter_fill(cr);
+
+
+  // draw the surround
+
+  lives_painter_new_path(cr);
+
+  lives_painter_set_source_rgba (cr, 0., 0., 0., .8);
+  lives_painter_set_line_width(cr,1.);
+
+  lives_painter_arc(cr,rwidth/4.,rwidth/4.,rad,M_PI,1.5*M_PI);
+  lives_painter_stroke(cr);
+  lives_painter_arc(cr,rwidth/4.*3.,rwidth/4.,rad,-M_PI/2.,0.);
+  lives_painter_stroke(cr);
+  lives_painter_arc(cr,rwidth/4.,rheight-rwidth/4.,rad,M_PI/2.,M_PI);
+  lives_painter_stroke(cr);
+  lives_painter_arc(cr,rwidth/4.*3.,rheight-rwidth/4.,rad,0.,M_PI/2.);
+
+  lives_painter_stroke(cr);
+
+  lives_painter_move_to(cr,rwidth/4.,0);
+  lives_painter_line_to(cr,rwidth/4.*3.,0);
+
+  lives_painter_stroke(cr);
+
+  lives_painter_move_to(cr,rwidth/4.,rheight);
+  lives_painter_line_to(cr,rwidth/4.*3.,rheight);
+
+  lives_painter_stroke(cr);
+
+  lives_painter_move_to(cr,0.,rwidth/4.);
+  lives_painter_line_to(cr,0.,rheight-rwidth/4.);
+
+  lives_painter_stroke(cr);
+
+  lives_painter_move_to(cr,rwidth,rwidth/4.);
+  lives_painter_line_to(cr,rwidth,rheight-rwidth/4.);
+
+  lives_painter_stroke(cr);
+
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget))) {
+    lives_painter_set_source_rgba (cr, 1., 1., 1., .6);
+
+    lives_painter_move_to(cr,rwidth/4.,rwidth/4.);
+    lives_painter_line_to(cr,rwidth/4.*3.,rheight-rwidth/4.);
+    lives_painter_stroke(cr);
+
+    lives_painter_move_to(cr,rwidth/4.,rheight-rwidth/4.);
+    lives_painter_line_to(cr,rwidth/4.*3.,rwidth/4.);
+    lives_painter_stroke(cr);
+  }
+
+  return TRUE;
+}
+
+#endif
+
+
+static gchar *get_tab_name(guint tab) {
+  switch (tab) {
+  case POLY_CLIPS:
+    return g_strdup(_("Clips"));
+  case POLY_IN_OUT:
+    return g_strdup(_("In/out"));
+  case POLY_FX_STACK:
+    return g_strdup(_("FX stack"));
+  case POLY_EFFECTS:
+    return lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,TRUE); // effects
+  case POLY_TRANS:
+    return lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,TRUE); // transitions
+  case POLY_COMP:
+    return lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,TRUE); // compositors
+  case POLY_PARAMS:
+    return g_strdup(_("Params."));
+  default:
+    break;
+  }
+  return g_strdup("");
+}
+
+
+lives_mt *multitrack (weed_plant_t *event_list, int orig_file, double fps) {
   GtkWidget *hseparator;
   GtkWidget *menubar;
   GtkWidget *btoolbar;
@@ -4976,7 +5399,6 @@
   GtkWidget *tl_vbox;
   GtkWidget *scrollbar;
   GtkWidget *hbox;
-  GtkWidget *hbox2;
   GtkWidget *vbox;
   GtkWidget *view_ctx;
   GtkWidget *eventbox;
@@ -4997,9 +5419,13 @@
 #endif
 
   GtkWidget *submenu_menu;
+  GtkWidget *submenu_menuv;
+  GtkWidget *submenu_menua;
   GtkWidget *submenu_menu2;
   GtkWidget *submenu_menu3;
   GtkWidget *submenu_menu4;
+  GtkWidget *submenu_menu4v;
+  GtkWidget *submenu_menu4a;
   GtkWidget *submenu_menu5;
   GtkWidget *submenu_menu10;
   GtkWidget *submenu_menu11;
@@ -5015,21 +5441,31 @@
   GtkWidget *suggest_feature;
   GtkWidget *help_translate;
 
-
   GObject *vadjustment;
-  GObject *spinbutton_adj;
-  gint num_filters;
-  int i,error;
-  gchar *cname,*tname,*msg;
+  LiVESAdjustment *spinbutton_adj;
 
   gchar buff[32768];
 
-  gint scr_width;
+  gchar *cname,*tname,*msg;
+  gchar *tmp,*tmp2;
+
+  int scr_width,dph;
+  int num_filters;
+  int error;
+  int dpw=widget_opts.packing_width;
+
+  register int i;
 
   lives_mt *mt=(lives_mt *)g_malloc(sizeof(lives_mt));
+
+  mainw->multitrack=mt;
+
+  mt->frame_pixbuf=NULL;
+
   mt->is_ready=FALSE;
   mt->tl_marks=NULL;
 
+
   mt->idlefunc=0; // idle function for auto backup
   mt->auto_back_time=0;
 
@@ -5065,14 +5501,10 @@
   mt->apply_fx_button=NULL;
 
   mt->cursor_style=LIVES_CURSOR_NORMAL;
-  mt->cursor=NULL;
 
   mt->file_selected=orig_file;
 
-  if (event_list==NULL) mt->changed=FALSE;
-  else mt->changed=TRUE;
-
-  mt->auto_changed=mt->changed;
+  mt->auto_changed=mt->changed=FALSE;
 
   mt->was_undo_redo=FALSE;
 
@@ -5157,6 +5589,8 @@
   mt->fm_edit_event=NULL;
 
   mt->nb_label=NULL;
+  mt->fx_list_box=NULL;
+  mt->fx_list_scroll=NULL;
 
   mt->moving_fx=NULL;
   mt->fx_order=FX_ORD_NONE;
@@ -5180,9 +5614,7 @@
   mt->context_time=-1.;
   mt->use_context=FALSE;
 
-  mt->sepwin_pixbuf=NULL;
-
-  mt->no_expose=FALSE;
+  mt->no_expose=TRUE;
 
   mt->is_paused=FALSE;
 
@@ -5201,7 +5633,8 @@
 
   if (mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate!=-1) {
     // user (or system) has delegated an audio volume filter from the candidates
-    mt->avol_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
+    mt->avol_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,
+						mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
   }
   else mt->avol_fx=-1;
   mt->avol_init_event=NULL;
@@ -5231,9 +5664,9 @@
   mt->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
-      gtk_widget_modify_bg(mt->window, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(mt->window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-    else gtk_widget_modify_bg(mt->window, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    else lives_widget_set_bg_color(mt->window, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_drag_dest_set(mt->window,GTK_DEST_DEFAULT_ALL,mainw->target_table,2,
@@ -5243,17 +5676,17 @@
 		    G_CALLBACK (drag_from_outside),
 		    NULL);
 
-  mt->top_vbox = gtk_vbox_new (FALSE, 0);
+  mt->top_vbox = lives_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (mt->window), mt->top_vbox);
 
-  menu_hbox = gtk_hbox_new (FALSE, 0);
+  menu_hbox = lives_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (mt->top_vbox), menu_hbox, FALSE, FALSE, 0);
 
   menubar = gtk_menu_bar_new ();
   gtk_box_pack_start (GTK_BOX (menu_hbox), menubar, TRUE, TRUE, 0);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menubar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -5265,7 +5698,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -5278,7 +5711,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->open_menu), menuitem_menu2);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu2, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   menuitem = gtk_menu_item_new_with_mnemonic (_("_Open File/Directory"));
@@ -5304,7 +5737,7 @@
     open_loc_submenu=gtk_menu_new();
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (open_loc_menu), open_loc_submenu);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(open_loc_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+      lives_widget_set_bg_color(open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     }
 
     menuitem = gtk_menu_item_new_with_mnemonic (_("Open _Youtube Clip..."));
@@ -5336,7 +5769,7 @@
     vcd_dvd_submenu=gtk_menu_new();
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (vcd_dvd_menu), vcd_dvd_submenu);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(vcd_dvd_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+      lives_widget_set_bg_color(vcd_dvd_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     }
     
     
@@ -5372,7 +5805,7 @@
 
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (device_menu), device_submenu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(device_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(device_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   menuitem = gtk_menu_item_new_with_mnemonic (_("Import from _Firewire Device (dv)"));
@@ -5403,7 +5836,7 @@
 
 
   gtk_widget_add_accelerator (mt->close, "activate", mt->accel_group,
-                              GDK_w, GDK_CONTROL_MASK,
+                              LIVES_KEY_w, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mt->recent_menu = gtk_menu_item_new_with_mnemonic (_("_Recent Files..."));
@@ -5441,7 +5874,7 @@
   gtk_container_add (GTK_CONTAINER (recent_submenu), mt->recent4);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(recent_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(recent_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   
   gtk_widget_show (recent_submenu);
@@ -5491,7 +5924,7 @@
   gtk_widget_set_sensitive (mt->save_event_list, FALSE);
 
   gtk_widget_add_accelerator (mt->save_event_list, "activate", mt->accel_group,
-                              GDK_s, GDK_CONTROL_MASK,
+                              LIVES_KEY_s, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mt->load_event_list = gtk_image_menu_item_new_with_mnemonic (_("_Load layout..."));
@@ -5502,7 +5935,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->clear_event_list);
 
   gtk_widget_add_accelerator (mt->clear_event_list, "activate", mt->accel_group,
-                              GDK_d, GDK_CONTROL_MASK,
+                              LIVES_KEY_d, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   gtk_widget_set_sensitive(mt->clear_event_list,mt->event_list!=NULL);
@@ -5540,7 +5973,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->quit);
 
   gtk_widget_add_accelerator (mt->quit, "activate", mt->accel_group,
-                              GDK_q, GDK_CONTROL_MASK,
+                              LIVES_KEY_q, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   // Edit
@@ -5552,7 +5985,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->undo = gtk_image_menu_item_new_with_mnemonic (_("_Undo"));
@@ -5561,10 +5994,10 @@
   gtk_widget_set_sensitive (mt->undo, FALSE);
 
   gtk_widget_add_accelerator (mt->undo, "activate", mt->accel_group,
-                              GDK_u, GDK_CONTROL_MASK,
+                              LIVES_KEY_u, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
   
-  image = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock ("gtk-undo", LIVES_ICON_SIZE_MENU);
   gtk_widget_show (image);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mt->undo), image);
 
@@ -5583,10 +6016,10 @@
   gtk_widget_set_sensitive (mt->redo, FALSE);
 
   gtk_widget_add_accelerator (mt->redo, "activate", mt->accel_group,
-                              GDK_z, GDK_CONTROL_MASK,
+                              LIVES_KEY_z, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image = gtk_image_new_from_stock ("gtk-redo", GTK_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock ("gtk-redo", LIVES_ICON_SIZE_MENU);
   gtk_widget_show (image);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mt->redo), image);
 
@@ -5609,7 +6042,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->clipedit);
 
   gtk_widget_add_accelerator (mt->clipedit, "activate", mt->accel_group,
-                              GDK_e, GDK_CONTROL_MASK,
+                              LIVES_KEY_e, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -5621,7 +6054,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->adjust_start_end);
 
   gtk_widget_add_accelerator (mt->adjust_start_end, "activate", mt->accel_group,
-                              GDK_x, GDK_CONTROL_MASK,
+                              LIVES_KEY_x, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_set_sensitive (mt->adjust_start_end, FALSE);
 
@@ -5630,10 +6063,10 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->insert);
 
   gtk_widget_add_accelerator (mt->insert, "activate", mt->accel_group,
-                              GDK_i, (GdkModifierType)0,
+                              LIVES_KEY_i, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_add_accelerator (mt->insert, "activate", mt->accel_group,
-                              GDK_i, GDK_CONTROL_MASK,
+                              LIVES_KEY_i, LIVES_CONTROL_MASK,
                               (GtkAccelFlags)0);
   gtk_widget_set_sensitive (mt->insert, FALSE);
 
@@ -5642,7 +6075,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->audio_insert);
 
   gtk_widget_add_accelerator (mt->audio_insert, "activate", mt->accel_group,
-                              GDK_i, GDK_CONTROL_MASK,
+                              LIVES_KEY_i, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_set_sensitive (mt->audio_insert, FALSE);
 
@@ -5652,7 +6085,7 @@
   gtk_widget_set_sensitive (mt->delblock, FALSE);
 
   gtk_widget_add_accelerator (mt->delblock, "activate", mt->accel_group,
-                              GDK_d, GDK_CONTROL_MASK,
+                              LIVES_KEY_d, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -5660,7 +6093,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->jumpback);
 
   gtk_widget_add_accelerator (mt->jumpback, "activate", mt->accel_group,
-                              GDK_j, GDK_CONTROL_MASK,
+                              LIVES_KEY_j, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   gtk_widget_set_sensitive (mt->jumpback, FALSE);
@@ -5669,7 +6102,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->jumpnext);
 
   gtk_widget_add_accelerator (mt->jumpnext, "activate", mt->accel_group,
-                              GDK_l, GDK_CONTROL_MASK,
+                              LIVES_KEY_l, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   gtk_widget_set_sensitive (mt->jumpnext, FALSE);
@@ -5699,24 +6132,24 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->playall = gtk_image_menu_item_new_with_mnemonic (_("_Play from Timeline Position"));
   gtk_widget_add_accelerator (mt->playall, "activate", mt->accel_group,
-                              GDK_p, (GdkModifierType)0,
+                              LIVES_KEY_p, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_widget_set_sensitive (mt->playall, FALSE);
 
 
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->playall);
 
-  image = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock ("gtk-refresh", LIVES_ICON_SIZE_MENU);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mt->playall), image);
 
   mt->playsel = gtk_image_menu_item_new_with_mnemonic (_("Pla_y selected time only"));
   gtk_widget_add_accelerator (mt->playsel, "activate", mt->accel_group,
-                              GDK_y, (GdkModifierType)0,
+                              LIVES_KEY_y, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->playsel);
   gtk_widget_set_sensitive (mt->playsel, FALSE);
@@ -5725,21 +6158,21 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->stop);
   gtk_widget_set_sensitive (mt->stop, FALSE);
   gtk_widget_add_accelerator (mt->stop, "activate", mt->accel_group,
-                              GDK_q, (GdkModifierType)0,
+                              LIVES_KEY_q, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
-  image = gtk_image_new_from_stock ("gtk-stop", GTK_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock ("gtk-stop", LIVES_ICON_SIZE_MENU);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mt->stop), image);
 
   mt->rewind = gtk_image_menu_item_new_with_mnemonic (_("Re_wind"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->rewind);
 
-  image = gtk_image_new_from_stock ("gtk-back", GTK_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock ("gtk-back", LIVES_ICON_SIZE_MENU);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mt->rewind), image);
   gtk_widget_set_sensitive (mt->rewind, FALSE);
 
   gtk_widget_add_accelerator (mt->rewind, "activate", mt->accel_group,
-                              GDK_w, (GdkModifierType)0,
+                              LIVES_KEY_w, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   separator = gtk_menu_item_new ();
@@ -5751,7 +6184,7 @@
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(full_screen),mainw->fs);
 
   gtk_widget_add_accelerator (full_screen, "activate", mt->accel_group,
-                              GDK_f, (GdkModifierType)0,
+                              LIVES_KEY_f, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mt->sepwin = gtk_check_menu_item_new_with_mnemonic (_("Play in _Separate Window"));
@@ -5759,7 +6192,7 @@
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->sepwin),mainw->sep_win);
 
   gtk_widget_add_accelerator (mt->sepwin, "activate", mt->accel_group,
-                              GDK_s, (GdkModifierType)0,
+                              LIVES_KEY_s, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mt->loop_continue = gtk_check_menu_item_new_with_mnemonic (_("L_oop Continuously"));
@@ -5767,7 +6200,7 @@
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->loop_continue),mainw->loop_cont);
 
   gtk_widget_add_accelerator (mt->loop_continue, "activate", mt->accel_group,
-                              GDK_o, (GdkModifierType)0,
+                              LIVES_KEY_o, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mt->mute_audio = gtk_check_menu_item_new_with_mnemonic (_("_Mute"));
@@ -5775,7 +6208,7 @@
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mt->mute_audio),mainw->mute);
 
   gtk_widget_add_accelerator (mt->mute_audio, "activate", mt->accel_group,
-                              GDK_z, (GdkModifierType)0,
+                              LIVES_KEY_z, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -5786,7 +6219,7 @@
   sticky = gtk_check_menu_item_new_with_mnemonic (_("Separate Window 'S_ticky' Mode"));
 
   gtk_widget_add_accelerator (sticky, "activate", mt->accel_group,
-                              GDK_t, (GdkModifierType)0,
+                              LIVES_KEY_t, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   gtk_container_add (GTK_CONTAINER (menuitem_menu), sticky);
@@ -5805,7 +6238,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->move_fx = gtk_check_menu_item_new_with_mnemonic (_("_Move effects with blocks"));
@@ -5828,7 +6261,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->atrans_menuitem), mt->submenu_atransfx);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mt->submenu_atransfx, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mt->submenu_atransfx, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   separator = gtk_menu_item_new ();
@@ -5855,9 +6288,54 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_block), submenu_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
+
+
+
+
+  tname=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_EFFECT,TRUE); // video effects
+  cname=g_strdup_printf("_%s...",tname);
+  g_free(tname);
+
+  mt->fx_blockv = gtk_menu_item_new_with_mnemonic (cname);
+  g_free(cname);
+
+
+  gtk_container_add (GTK_CONTAINER (submenu_menu), mt->fx_blockv);
+  gtk_widget_set_sensitive(mt->fx_blockv,FALSE);
+
+  submenu_menuv=gtk_menu_new();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_blockv), submenu_menuv);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(submenu_menuv, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
+
+
+
+  tname=lives_fx_cat_to_text(LIVES_FX_CAT_AUDIO_EFFECT,TRUE); // audio effects
+  cname=g_strdup_printf("_%s...",tname);
+  g_free(tname);
+
+  mt->fx_blocka = gtk_menu_item_new_with_mnemonic (cname);
+  g_free(cname);
+
+
+  gtk_container_add (GTK_CONTAINER (submenu_menu), mt->fx_blocka);
+  gtk_widget_set_sensitive(mt->fx_blocka,FALSE);
+
+  submenu_menua=gtk_menu_new();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_blocka), submenu_menua);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(submenu_menua, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
+
+
+
+
   mt->fx_region = gtk_menu_item_new_with_mnemonic (_("Apply effect to _region..."));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->fx_region);
   gtk_widget_set_sensitive(mt->fx_region,FALSE);
@@ -5866,7 +6344,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region), submenu_menu2);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu2, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,TRUE); // effects
@@ -5878,13 +6356,53 @@
   gtk_container_add (GTK_CONTAINER (submenu_menu2), mt->fx_region_1);
   gtk_widget_set_sensitive(mt->fx_region_1,FALSE);
 
+
   submenu_menu3=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_1), submenu_menu3);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu3, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu3, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
+
+  tname=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_EFFECT,TRUE); // video effects
+  cname=g_strdup_printf("_%s...",tname);
+  g_free(tname);
+
+  mt->fx_region_1v = gtk_menu_item_new_with_mnemonic (cname);
+  g_free(cname);
+  gtk_container_add (GTK_CONTAINER (submenu_menu3), mt->fx_region_1v);
+  gtk_widget_set_sensitive(mt->fx_region_1v,FALSE);
+
+  submenu_menu4v=gtk_menu_new();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_1v), submenu_menu4v);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(submenu_menu4v, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
+
+  
+
+  tname=lives_fx_cat_to_text(LIVES_FX_CAT_AUDIO_EFFECT,TRUE); // audio effects
+  cname=g_strdup_printf("_%s...",tname);
+  g_free(tname);
+
+  mt->fx_region_1a = gtk_menu_item_new_with_mnemonic (cname);
+  g_free(cname);
+  gtk_container_add (GTK_CONTAINER (submenu_menu3), mt->fx_region_1a);
+  gtk_widget_set_sensitive(mt->fx_region_1a,FALSE);
+
+  submenu_menu4a=gtk_menu_new();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_1a), submenu_menu4a);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(submenu_menu4a, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
+
+  
+
+
+
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,TRUE); // transitions
   cname=g_strdup_printf("_%s...",tname);
   g_free(tname);
@@ -5897,7 +6415,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_2), submenu_menu4);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu4, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu4, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -5913,7 +6431,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_2av), submenu_menu10);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu10, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu10, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -5929,7 +6447,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_2v), submenu_menu11);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu11, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu11, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -5947,7 +6465,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_2a), submenu_menu12);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu12, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu12, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -5965,10 +6483,10 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->fx_region_3), submenu_menu5);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu_menu5, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu_menu5, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  num_filters=rte_get_numfilters();
+  num_filters=rte_get_numfilters(FALSE);
   for (i=0;i<num_filters;i++) {
     weed_plant_t *filter=get_weed_filter(i);
     if (filter!=NULL&&!weed_plant_has_leaf(filter,"host_menu_hide")) {
@@ -5984,14 +6502,7 @@
       }
       else fxname=g_strdup(fname);
 
-      if (enabled_in_channels(filter,TRUE)>2&&enabled_out_channels(filter,FALSE)==1) {
-	// add all compositor effects to submenus
-	menuitem = gtk_image_menu_item_new_with_label (fxname);
-	gtk_container_add (GTK_CONTAINER (submenu_menu), menuitem);
-	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	g_signal_connect (GTK_OBJECT (menuitem), "activate",
-			  G_CALLBACK (mt_add_block_effect),
-			  (gpointer)mt);
+      if (enabled_in_channels(filter,TRUE)>=1000000&&enabled_out_channels(filter,FALSE)==1) {
 	menuitem = gtk_image_menu_item_new_with_label (fxname);
 	gtk_container_add (GTK_CONTAINER (submenu_menu5), menuitem);
 	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
@@ -6002,23 +6513,43 @@
       else if (enabled_in_channels(filter,FALSE)==1&&enabled_out_channels(filter,FALSE)==1) {
 	// add all filter effects to submenus
 	menuitem = gtk_image_menu_item_new_with_label (fxname);
-	gtk_container_add (GTK_CONTAINER (submenu_menu), menuitem);
-	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	g_signal_connect (GTK_OBJECT (menuitem), "activate",
-			  G_CALLBACK (mt_add_block_effect),
-			  (gpointer)mt);
-	menuitem = gtk_image_menu_item_new_with_label (fxname);
-	gtk_container_add (GTK_CONTAINER (submenu_menu3), menuitem);
-	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	g_signal_connect (GTK_OBJECT (menuitem), "activate",
-			  G_CALLBACK (mt_add_region_effect),
-			  (gpointer)mt);
+
+	if (!is_pure_audio(filter,FALSE)) {
+	  gtk_container_add (GTK_CONTAINER (submenu_menuv), menuitem);
+	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
+	  g_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    G_CALLBACK (mt_add_block_effect),
+			    (gpointer)mt);
+
+	  menuitem = gtk_image_menu_item_new_with_label (fxname);
+	  gtk_container_add (GTK_CONTAINER (submenu_menu4v), menuitem);
+	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
+	  g_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    G_CALLBACK (mt_add_region_effect),
+			    (gpointer)mt);
+	}
+	else {
+	  gtk_container_add (GTK_CONTAINER (submenu_menua), menuitem);
+	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
+	  g_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    G_CALLBACK (mt_add_block_effect),
+			    (gpointer)mt);
+
+	  menuitem = gtk_image_menu_item_new_with_label (fxname);
+	  gtk_container_add (GTK_CONTAINER (submenu_menu4a), menuitem);
+	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
+	  g_signal_connect (GTK_OBJECT (menuitem), "activate",
+			    G_CALLBACK (mt_add_region_effect),
+			    (gpointer)mt);
+	}
+
+
       }
       else if (enabled_in_channels(filter,FALSE)==2&&enabled_out_channels(filter,FALSE)==1) {
 	// add all transitions to submenus
 	menuitem = gtk_image_menu_item_new_with_label (fxname);
 	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	if (get_transition_param(filter)==-1) gtk_container_add (GTK_CONTAINER (submenu_menu11), menuitem);
+	if (get_transition_param(filter,FALSE)==-1) gtk_container_add (GTK_CONTAINER (submenu_menu11), menuitem);
 	else {
 	  if (has_video_chans_in(filter,FALSE)) {
 	    /// the autotransitions menu
@@ -6050,7 +6581,7 @@
   }
 
   /// None autotransition
-  menuitem2 = gtk_check_menu_item_new_with_label (mainw->none_string);
+  menuitem2 = gtk_check_menu_item_new_with_label (mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
   g_object_set_data(G_OBJECT(menuitem2),"idx",GINT_TO_POINTER(-1));
   gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem2),prefs->atrans_fx==-1);
   gtk_menu_shell_prepend(GTK_MENU_SHELL(mt->submenu_atransfx),menuitem2);
@@ -6069,14 +6600,22 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
+  mt->rename_track = gtk_image_menu_item_new_with_mnemonic (_("Rename current track"));
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->rename_track);
+
+  separator = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separator);
+  gtk_widget_set_sensitive (separator, FALSE);
+
+
   mt->cback_audio = gtk_image_menu_item_new_with_mnemonic (_("Make _Backing Audio current track"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->cback_audio);
 
   gtk_widget_add_accelerator (mt->cback_audio, "activate", mt->accel_group,
-                              GDK_b, GDK_CONTROL_MASK,
+                              LIVES_KEY_b, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   separator = gtk_menu_item_new ();
@@ -6087,7 +6626,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->add_vid_behind);
 
   gtk_widget_add_accelerator (mt->add_vid_behind, "activate", mt->accel_group,
-                              GDK_t, GDK_CONTROL_MASK,
+                              LIVES_KEY_t, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -6095,7 +6634,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->add_vid_front);
 
   gtk_widget_add_accelerator (mt->add_vid_front, "activate", mt->accel_group,
-                              GDK_t, (GdkModifierType)(GDK_CONTROL_MASK|GDK_SHIFT_MASK),
+                              LIVES_KEY_t, (GdkModifierType)(LIVES_CONTROL_MASK|LIVES_SHIFT_MASK),
                               GTK_ACCEL_VISIBLE);
 
 
@@ -6112,7 +6651,7 @@
 		    (gpointer)mt);
 
   gtk_widget_add_accelerator (menuitem, "activate", mt->accel_group,
-                              GDK_s, (GdkModifierType)GDK_CONTROL_MASK,
+                              LIVES_KEY_s, (GdkModifierType)LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -6157,7 +6696,7 @@
 		    (gpointer)mt);
 
   gtk_widget_add_accelerator (mt->remove_gaps, "activate", mt->accel_group,
-                              GDK_g, GDK_CONTROL_MASK,
+                              LIVES_KEY_g, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   mt->remove_first_gaps = gtk_menu_item_new_with_mnemonic ("");
@@ -6168,7 +6707,7 @@
 		    (gpointer)mt);
 
   gtk_widget_add_accelerator (mt->remove_first_gaps, "activate", mt->accel_group,
-                              GDK_f, GDK_CONTROL_MASK,
+                              LIVES_KEY_f, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -6182,14 +6721,14 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->select_track = gtk_check_menu_item_new_with_mnemonic (_("_Select Current Track"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->select_track);
 
   gtk_widget_add_accelerator (mt->select_track, "activate", mt->accel_group,
-                              GDK_space, GDK_CONTROL_MASK,
+                              LIVES_KEY_Space, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   menuitem = gtk_menu_item_new_with_mnemonic (_("Select _all video tracks"));
@@ -6214,7 +6753,7 @@
 		    (gpointer)mt);
 
   gtk_widget_add_accelerator (menuitem, "activate", mt->accel_group,
-                              GDK_a, GDK_CONTROL_MASK,
+                              LIVES_KEY_a, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   menuitem = gtk_menu_item_new_with_mnemonic (_("Select from _zero time"));
@@ -6238,7 +6777,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), selcopy_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(selcopy_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(selcopy_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->tc_to_rs = gtk_menu_item_new_with_mnemonic (_("_Timecode to region start"));
@@ -6272,6 +6811,20 @@
   gtk_widget_set_sensitive(mt->rs_to_tc,FALSE);
   gtk_widget_set_sensitive(mt->re_to_tc,FALSE);
 
+  separator = gtk_menu_item_new ();
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), separator);
+  gtk_widget_set_sensitive (separator, FALSE);
+
+  mt->seldesel_menuitem = gtk_menu_item_new_with_mnemonic (_("Select/deselect block at current track/time"));
+  gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->seldesel_menuitem);
+
+  g_signal_connect (GTK_OBJECT (mt->seldesel_menuitem), "activate",
+		    G_CALLBACK (mt_selblock),
+		    (gpointer)mt);
+
+  gtk_widget_add_accelerator (mt->seldesel_menuitem, "activate", mt->accel_group,
+                              LIVES_KEY_Return, LIVES_CONTROL_MASK,
+                              GTK_ACCEL_VISIBLE);
 
   // Tools
 
@@ -6282,7 +6835,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -6303,7 +6856,7 @@
   mt->gens_submenu = gtk_menu_item_new_with_mnemonic (_("_Generate"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->gens_submenu);
 
-  gtk_widget_ref(mainw->gens_menu);
+  g_object_ref(mainw->gens_menu);
   gtk_menu_detach(GTK_MENU(mainw->gens_menu));
 
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->gens_submenu), mainw->gens_menu);
@@ -6328,10 +6881,10 @@
   gtk_widget_show (menuitem);
   gtk_container_add (GTK_CONTAINER (menuitem_menu), menuitem);
   gtk_widget_add_accelerator (menuitem, "activate", mt->accel_group,
-                              GDK_p, GDK_CONTROL_MASK,
+                              LIVES_KEY_p, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock ("gtk-preferences", LIVES_ICON_SIZE_MENU);
   gtk_widget_show (image);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
 
@@ -6350,7 +6903,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->render = gtk_image_menu_item_new_with_mnemonic (_("_Render all to new clip"));
@@ -6358,7 +6911,7 @@
   gtk_widget_set_sensitive (mt->render, FALSE);
 
   gtk_widget_add_accelerator (mt->render, "activate", mt->accel_group,
-                              GDK_r, GDK_CONTROL_MASK,
+                              LIVES_KEY_r, LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   // TODO - render selected time
@@ -6406,7 +6959,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
@@ -6414,14 +6967,14 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->view_clips);
 
   gtk_widget_add_accelerator (mt->view_clips, "activate", mt->accel_group,
-                              GDK_c, (GdkModifierType)0,
+                              LIVES_KEY_c, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mt->view_in_out = gtk_menu_item_new_with_mnemonic (_("Block _In/out points"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->view_in_out);
 
   gtk_widget_add_accelerator (mt->view_in_out, "activate", mt->accel_group,
-                              GDK_n, (GdkModifierType)0,
+                              LIVES_KEY_n, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   gtk_widget_set_sensitive(mt->view_in_out,FALSE);
@@ -6430,7 +6983,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), mt->view_effects);
 
   gtk_widget_add_accelerator (mt->view_effects, "activate", mt->accel_group,
-                              GDK_e, (GdkModifierType)0,
+                              LIVES_KEY_e, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   show_messages = gtk_image_menu_item_new_with_mnemonic (_("Show _Messages"));
@@ -6451,7 +7004,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->aparam_menuitem), mt->aparam_submenu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mt->aparam_submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mt->aparam_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mt->view_audio = gtk_check_menu_item_new_with_mnemonic (_("Show backing _audio track"));
@@ -6463,7 +7016,7 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), view_ctx);
 
   gtk_widget_add_accelerator (view_ctx, "activate", mt->accel_group,
-                              GDK_d, (GdkModifierType)0,
+                              LIVES_KEY_d, (GdkModifierType)0,
                               GTK_ACCEL_VISIBLE);
 
   mt->change_max_disp = gtk_menu_item_new_with_mnemonic (_("Maximum tracks to display..."));
@@ -6481,25 +7034,25 @@
   gtk_container_add (GTK_CONTAINER (menuitem_menu), ccursor);
 
   gtk_widget_add_accelerator (ccursor, "activate", mt->accel_group,
-                              GDK_c, (GdkModifierType)GDK_CONTROL_MASK,
+                              LIVES_KEY_c, (GdkModifierType)LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   zoom_in = gtk_menu_item_new_with_mnemonic (_("_Zoom in"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), zoom_in);
 
   gtk_widget_add_accelerator (zoom_in, "activate", mt->accel_group,
-                              GDK_plus, (GdkModifierType)GDK_CONTROL_MASK,
+                              LIVES_KEY_Plus, (GdkModifierType)LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
   gtk_widget_add_accelerator (zoom_in, "activate", mt->accel_group,
-                              GDK_equal, (GdkModifierType)GDK_CONTROL_MASK,
+                              LIVES_KEY_Equal, (GdkModifierType)LIVES_CONTROL_MASK,
                               (GtkAccelFlags)0);
 
   zoom_out = gtk_menu_item_new_with_mnemonic (_("_Zoom out"));
   gtk_container_add (GTK_CONTAINER (menuitem_menu), zoom_out);
 
   gtk_widget_add_accelerator (zoom_out, "activate", mt->accel_group,
-                              GDK_minus, (GdkModifierType)GDK_CONTROL_MASK,
+                              LIVES_KEY_Minus, (GdkModifierType)LIVES_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
 
@@ -6541,7 +7094,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menuitem_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   show_mt_keys = gtk_menu_item_new_with_mnemonic (_("_Show multitrack keys"));
@@ -6607,7 +7160,7 @@
 
   submenu = gtk_menu_new ();
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->mm_menuitem), submenu);
 
@@ -6643,7 +7196,7 @@
 
   submenu = gtk_menu_new ();
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mt->ins_menuitem), submenu);
 
@@ -6730,6 +7283,9 @@
   g_signal_connect (GTK_OBJECT (sticky), "activate",
 		    G_CALLBACK (on_sticky_activate),
 		    NULL);
+  g_signal_connect (GTK_OBJECT (mt->rename_track), "activate",
+		    G_CALLBACK (on_rename_track_activate),
+		    (gpointer)mt);
   g_signal_connect (GTK_OBJECT (mt->cback_audio), "activate",
 		    G_CALLBACK (on_cback_audio_activate),
 		    (gpointer)mt);
@@ -6848,108 +7404,97 @@
                       G_CALLBACK (on_mt_list_fx_activate),
                       (gpointer)mt);
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_m, (GdkModifierType)0, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_m, (GdkModifierType)0, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_mark_callback),(gpointer)mt,NULL));
 
-  mt->insa_eventbox=gtk_event_box_new();
-  mt->insa_checkbutton = gtk_check_button_new ();
-  
-  // must do this here to set cfile->hsize, cfile->vsize; and we must have created aparam_submenu and insa_eventbox and insa_checkbutton
-  msg=set_values_from_defs(mt,!prefs->mt_enter_prompt||(mainw->recoverable_layout&&prefs->startup_interface==STARTUP_CE));
-  if (msg!=NULL) g_free(msg);
+  eventbox=gtk_event_box_new();
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
 
-  eventbox = gtk_event_box_new ();
-  hbox = gtk_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (mt->top_vbox), eventbox, FALSE, FALSE, 0);
+
+  hbox = lives_hbox_new (FALSE, 0);
   gtk_container_add(GTK_CONTAINER(eventbox),hbox);
 
+  btoolbar=gtk_toolbar_new();
+  gtk_box_pack_start (GTK_BOX (hbox), btoolbar, FALSE, FALSE, 0);
+
+  widget_opts.apply_theme=FALSE;
+  widget_opts.expand=LIVES_EXPAND_NONE;
+  mt->timecode=lives_standard_entry_new(NULL,FALSE,NULL,TIMECODE_LENGTH,TIMECODE_LENGTH,LIVES_BOX(hbox),NULL);
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
+
+  dpw=widget_opts.packing_width;
+  widget_opts.packing_width=2.*widget_opts.scale;
+  mt->insa_checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Insert with _audio"))),TRUE,LIVES_BOX(hbox),
+							   (tmp2=g_strdup(_("Select whether video clips are inserted and moved with their audio or not"))));
+  widget_opts.packing_width=dpw;
+  g_free(tmp); g_free(tmp2);
+
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(lives_widget_get_parent(widget_opts.last_label), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  // play buttons
 
-  btoolbar=gtk_toolbar_new();
-  gtk_box_pack_start (GTK_BOX (hbox), btoolbar, FALSE, FALSE, 0);
+  // must do this here to set cfile->hsize, cfile->vsize; and we must have created aparam_submenu and insa_eventbox and insa_checkbutton
+  msg=set_values_from_defs(mt,!prefs->mt_enter_prompt||(mainw->recoverable_layout&&prefs->startup_interface==STARTUP_CE));
+  if (msg!=NULL) g_free(msg);
+
+  // play buttons
 
   gtk_toolbar_set_show_arrow(GTK_TOOLBAR(btoolbar),FALSE);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_toolbar_set_style (GTK_TOOLBAR (btoolbar), GTK_TOOLBAR_ICONS);
-  gtk_toolbar_set_icon_size (GTK_TOOLBAR(btoolbar),GTK_ICON_SIZE_SMALL_TOOLBAR);
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR(btoolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
 
-  gtk_widget_ref(mainw->m_sepwinbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_sepwinbutton->parent),mainw->m_sepwinbutton);
+  g_object_ref(mainw->m_sepwinbutton);
+  lives_widget_unparent(mainw->m_sepwinbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_sepwinbutton),-1);
-  gtk_widget_unref(mainw->m_sepwinbutton);
+  g_object_unref(mainw->m_sepwinbutton);
 
-  gtk_widget_ref(mainw->m_rewindbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_rewindbutton->parent),mainw->m_rewindbutton);
+  g_object_ref(mainw->m_rewindbutton);
+  lives_widget_unparent(mainw->m_rewindbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_rewindbutton),-1);
-  gtk_widget_unref(mainw->m_rewindbutton);
+  g_object_unref(mainw->m_rewindbutton);
 
-  gtk_widget_ref(mainw->m_playbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_playbutton->parent),mainw->m_playbutton);
+  g_object_ref(mainw->m_playbutton);
+  lives_widget_unparent(mainw->m_playbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_playbutton),-1);
-  gtk_widget_unref(mainw->m_playbutton);
+  g_object_unref(mainw->m_playbutton);
 
-  gtk_widget_ref(mainw->m_stopbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_stopbutton->parent),mainw->m_stopbutton);
+  g_object_ref(mainw->m_stopbutton);
+  lives_widget_unparent(mainw->m_stopbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_stopbutton),-1);
-  gtk_widget_unref(mainw->m_stopbutton);
+  g_object_unref(mainw->m_stopbutton);
 
-
-  /*  gtk_widget_ref(mainw->m_playselbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_playselbutton->parent),mainw->m_playselbutton);
-  gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_playselbutton),-1);
-  gtk_widget_unref(mainw->m_playselbutton);*/
-
-
-  gtk_widget_ref(mainw->m_loopbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_loopbutton->parent),mainw->m_loopbutton);
+  g_object_ref(mainw->m_loopbutton);
+  lives_widget_unparent(mainw->m_loopbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_loopbutton),-1);
-  gtk_widget_unref(mainw->m_loopbutton);
+  g_object_unref(mainw->m_loopbutton);
 
 
 
-  mt->timecode=gtk_entry_new();
   time_to_string (mt,0.,TIMECODE_LENGTH);
-  gtk_entry_set_max_length(GTK_ENTRY (mt->timecode),TIMECODE_LENGTH);
-  gtk_entry_set_width_chars (GTK_ENTRY (mt->timecode),TIMECODE_LENGTH);
-  gtk_box_pack_start (GTK_BOX (hbox), mt->timecode, FALSE, FALSE, 10);
 
   gtk_widget_add_events(mt->timecode,GDK_FOCUS_CHANGE_MASK);
+  gtk_widget_set_sensitive(mt->timecode,FALSE);
 
   mt->tc_func=g_signal_connect_after (G_OBJECT (mt->timecode),"focus_out_event", G_CALLBACK (after_timecode_changed), (gpointer) mt);
 
-  gtk_widget_modify_base(mt->timecode, GTK_STATE_NORMAL, &palette->black);
-  gtk_widget_modify_text(mt->timecode, GTK_STATE_NORMAL, &palette->light_green);
-
+  lives_widget_set_bg_color(mt->timecode, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+  lives_widget_set_base_color(mt->timecode, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+  lives_widget_set_text_color(mt->timecode, LIVES_WIDGET_STATE_NORMAL, &palette->light_green);
+
+  lives_widget_set_bg_color(mt->timecode, LIVES_WIDGET_STATE_INSENSITIVE, &palette->black);
+  lives_widget_set_base_color(mt->timecode, LIVES_WIDGET_STATE_INSENSITIVE, &palette->black);
+  lives_widget_set_text_color(mt->timecode, LIVES_WIDGET_STATE_INSENSITIVE, &palette->light_green);
 
-  gtk_widget_set_tooltip_text( mt->insa_checkbutton, _("Select whether video clips are inserted and moved with their audio or not"));
-  hbox2 = gtk_hbox_new (FALSE, 0);
-
-  gtk_tooltips_copy(mt->insa_eventbox,mt->insa_checkbutton);
-  label=gtk_label_new_with_mnemonic (_("Insert with _audio"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),mt->insa_checkbutton);
-
-  gtk_container_add(GTK_CONTAINER(mt->insa_eventbox),label);
-  g_signal_connect (GTK_OBJECT (mt->insa_eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    mt->insa_checkbutton);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mt->insa_eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
-  }
-
-  gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 2);
-  gtk_box_pack_start (GTK_BOX (hbox2), mt->insa_checkbutton, FALSE, FALSE, 2);
-  gtk_box_pack_start (GTK_BOX (hbox2), mt->insa_eventbox, FALSE, FALSE, 2);
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mt->insa_checkbutton),mt->opts.insert_audio);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->insa_checkbutton),mt->opts.insert_audio);
 
   g_signal_connect_after (GTK_OBJECT (mt->insa_checkbutton), "toggled",
 			  G_CALLBACK (on_insa_toggled),
@@ -6959,32 +7504,33 @@
   if (prefs->lamp_buttons) {
     on_insa_toggled(GTK_TOGGLE_BUTTON(mt->insa_checkbutton),mt);
     gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(mt->insa_checkbutton),FALSE);
-    gtk_widget_modify_bg(mt->insa_checkbutton, GTK_STATE_ACTIVE, &palette->light_green);
-    gtk_widget_modify_bg(mt->insa_checkbutton, GTK_STATE_NORMAL, &palette->dark_red);
+
+    lives_widget_set_bg_color(mt->insa_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
+    lives_widget_set_bg_color(mt->insa_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
+
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_connect (GTK_OBJECT (mt->insa_checkbutton), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (draw_cool_toggle),
+		    NULL);
+#endif
+
   }
 
-  mt->snapo_checkbutton = gtk_check_button_new ();
-  gtk_widget_set_tooltip_text( mt->snapo_checkbutton, _("Select whether timeline selection snaps to overlap between selected tracks or not"));
-  hbox2 = gtk_hbox_new (FALSE, 0);
+  dpw=widget_opts.packing_width;
+  widget_opts.packing_width=2.*widget_opts.scale;
 
-  eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(eventbox,mt->snapo_checkbutton);
-  label=gtk_label_new_with_mnemonic (_("Select _overlap"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),mt->snapo_checkbutton);
+  mt->snapo_checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Select _overlap"))),TRUE,LIVES_BOX(hbox),
+							   (tmp2=g_strdup(_("Select whether timeline selection snaps to overlap between selected tracks or not"))));
+  widget_opts.packing_width=dpw;
+  g_free(tmp); g_free(tmp2);
+
+  widget_opts.apply_theme=TRUE;
 
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    mt->snapo_checkbutton);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(lives_widget_get_parent(widget_opts.last_label), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 2);
-  gtk_box_pack_start (GTK_BOX (hbox2), mt->snapo_checkbutton, FALSE, FALSE, 2);
-  gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 2);
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mt->snapo_checkbutton),mt->opts.snap_over);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->snapo_checkbutton),mt->opts.snap_over);
 
   g_signal_connect_after (GTK_OBJECT (mt->snapo_checkbutton), "toggled",
 			  G_CALLBACK (on_snapo_toggled),
@@ -6992,8 +7538,13 @@
 
   if (prefs->lamp_buttons) {
     gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(mt->snapo_checkbutton),FALSE);
-    gtk_widget_modify_bg(mt->snapo_checkbutton, GTK_STATE_ACTIVE, &palette->light_green);
-    gtk_widget_modify_bg(mt->snapo_checkbutton, GTK_STATE_NORMAL, &palette->dark_red);
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_connect (GTK_OBJECT (mt->snapo_checkbutton), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (draw_cool_toggle),
+		    NULL);
+#endif
+    lives_widget_set_bg_color(mt->snapo_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
+    lives_widget_set_bg_color(mt->snapo_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
     
     on_snapo_toggled(GTK_TOGGLE_BUTTON(mt->snapo_checkbutton),mt);
   }
@@ -7006,7 +7557,7 @@
   // add toolbar
 
   /*  volind=GTK_WIDGET(gtk_tool_item_new());
-  mainw->volind_hbox=gtk_hbox_new(TRUE,0);
+  mainw->volind_hbox=lives_hbox_new(TRUE,0);
   gtk_container_add(GTK_CONTAINER(volind),mainw->volind_hbox);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->vol_label),7);
   */
@@ -7017,12 +7568,12 @@
 
 
   btoolbar=gtk_toolbar_new();
-  gtk_box_pack_start (GTK_BOX (hbox), btoolbar, FALSE, FALSE, 20);
+  gtk_box_pack_start (GTK_BOX (hbox), btoolbar, FALSE, FALSE, widget_opts.packing_width*2);
 
   gtk_toolbar_set_show_arrow(GTK_TOOLBAR(btoolbar),FALSE);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_toolbar_set_style (GTK_TOOLBAR (btoolbar), GTK_TOOLBAR_TEXT);
@@ -7046,7 +7597,7 @@
   gtk_toolbar_set_show_arrow(GTK_TOOLBAR(btoolbar),FALSE);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_toolbar_set_style (GTK_TOOLBAR (btoolbar), GTK_TOOLBAR_TEXT);
@@ -7058,7 +7609,7 @@
 
   submenu = gtk_menu_new ();
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(submenu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (mt->grav_menuitem), submenu);
 
@@ -7105,40 +7656,39 @@
   gtk_toolbar_set_show_arrow(GTK_TOOLBAR(btoolbar),FALSE);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(btoolbar, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_toolbar_set_style (GTK_TOOLBAR (btoolbar), GTK_TOOLBAR_ICONS);
-  gtk_toolbar_set_icon_size (GTK_TOOLBAR(btoolbar),GTK_ICON_SIZE_SMALL_TOOLBAR);
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR(btoolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
 
 
 
-  gtk_widget_ref(mainw->m_mutebutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_mutebutton->parent),mainw->m_mutebutton);
+  g_object_ref(mainw->m_mutebutton);
+  lives_widget_unparent(mainw->m_mutebutton);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->m_mutebutton),-1);
-  gtk_widget_unref(mainw->m_mutebutton);
-
+  g_object_unref(mainw->m_mutebutton);
 
-#ifndef HAVE_GTK_NICE_VERSION
-  gtk_widget_ref(mainw->vol_label);
-  gtk_container_remove(GTK_CONTAINER(mainw->vol_label->parent),mainw->vol_label);
-  gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->vol_label),-1);
-  gtk_widget_unref(mainw->vol_label);
-#else
-  gtk_scale_button_set_orientation (GTK_SCALE_BUTTON(mainw->volume_scale),GTK_ORIENTATION_VERTICAL);
-#endif
+  if (!lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(mainw->volume_scale),LIVES_ORIENTATION_VERTICAL)) {
+    if (mainw->vol_label!=NULL) {
+      g_object_ref(mainw->vol_label);
+      lives_widget_unparent(mainw->vol_label);
+      gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->vol_label),-1);
+      g_object_unref(mainw->vol_label);
+    }
+  }
 
-  gtk_widget_ref(mainw->vol_toolitem);
-  gtk_container_remove(GTK_CONTAINER(mainw->vol_toolitem->parent),mainw->vol_toolitem);
+  g_object_ref(mainw->vol_toolitem);
+  lives_widget_unparent(mainw->vol_toolitem);
   gtk_toolbar_insert(GTK_TOOLBAR(btoolbar),GTK_TOOL_ITEM(mainw->vol_toolitem),-1);
-  gtk_widget_unref(mainw->vol_toolitem);
+  g_object_unref(mainw->vol_toolitem);
 
 
 
-  hseparator = gtk_hseparator_new ();
+  hseparator = lives_hseparator_new ();
   gtk_box_pack_start (GTK_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 0);
 
-  mt->hbox = gtk_hbox_new (FALSE, 0);
+  mt->hbox = lives_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (mt->top_vbox), mt->hbox, FALSE, FALSE, 0);
 
   mt->play_blank = gtk_image_new_from_pixbuf (mainw->imframe);
@@ -7146,22 +7696,35 @@
   gtk_box_pack_start (GTK_BOX (mt->hbox), frame, FALSE, FALSE, 0);
   mt->fd_frame=frame;
 
-  gtk_widget_modify_bg (frame, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_fg (frame, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_widget_modify_fg (gtk_frame_get_label_widget(GTK_FRAME(frame)), GTK_STATE_NORMAL, &palette->normal_fore);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color (gtk_frame_get_label_widget(GTK_FRAME(frame)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
 
   eventbox=gtk_event_box_new();
   gtk_widget_set_size_request (eventbox, mt->play_window_width, mt->play_window_height);
-  mt->play_box = gtk_vbox_new (FALSE, BORD_HEIGHT);
+  mt->play_box = lives_vbox_new (FALSE, widget_opts.border_width);
   gtk_widget_set_app_paintable(mt->play_box,TRUE);
   gtk_widget_set_size_request (mt->play_box, mt->play_window_width, mt->play_window_height);
 
+  lives_widget_set_hexpand(mt->play_box,FALSE);
+  lives_widget_set_vexpand(mt->play_box,FALSE);
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_connect (GTK_OBJECT (mt->play_box), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (expose_pb),
+		    (gpointer)mt);
+#endif
+
   gtk_container_add (GTK_CONTAINER (frame), eventbox);
   gtk_container_add (GTK_CONTAINER (eventbox), mt->play_box);
-  gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   gtk_container_add (GTK_CONTAINER (mt->play_box), mt->play_blank);
 
-  gtk_widget_add_events (eventbox, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY | GDK_LEAVE_NOTIFY);
+
+  gtk_widget_add_events (eventbox, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
 
   g_signal_connect (GTK_OBJECT (eventbox), "motion_notify_event",
 		    G_CALLBACK (on_framedraw_mouse_update),
@@ -7175,7 +7738,7 @@
   g_signal_connect (GTK_OBJECT(eventbox), "enter-notify-event",G_CALLBACK (on_framedraw_enter),NULL);
 
 
-  mt->hpaned=gtk_hpaned_new();
+  mt->hpaned=lives_hpaned_new();
   gtk_box_pack_start (GTK_BOX (mt->hbox), mt->hpaned, TRUE, TRUE, 0);
 
   g_signal_connect (GTK_OBJECT (mt->hpaned), "accept_position",
@@ -7185,35 +7748,45 @@
 
   mt->nb = gtk_notebook_new ();
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg (mt->nb, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_bg (mt->nb, GTK_STATE_ACTIVE, &palette->menu_and_bars);
+    lives_widget_set_bg_color (mt->hpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (mt->nb, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (mt->nb, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
   }
 
-  hbox = gtk_hbox_new (FALSE, 0);
 
-  gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
 
-  label=gtk_label_new (_("Clips"));
+  gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
 
+  tname=get_tab_name(POLY_CLIPS);
+  label=gtk_label_new (tname);
+  g_free(tname);
 
 
   // prepare polymorph box
-  mt->poly_box = gtk_vbox_new (FALSE, 0);
+  mt->poly_box = lives_vbox_new (FALSE, 0);
+
+  lives_widget_set_vexpand(mt->poly_box,FALSE);
+  lives_widget_set_hexpand(mt->poly_box,TRUE);
 
   gtk_container_add (GTK_CONTAINER (hbox), mt->poly_box);
 
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 0), label);
 
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), GTK_STATE_NORMAL, &palette->normal_fore);
-
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
   gtk_paned_pack1 (GTK_PANED (mt->hpaned), mt->nb, TRUE, FALSE);
 
-  gtk_paned_set_position(GTK_PANED(mt->hpaned),2*scr_width/5);
+  gtk_paned_set_position(GTK_PANED(mt->hpaned),scr_width/2);
 
   // poly clip scroll
   mt->clip_scroll = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_ref (mt->clip_scroll);
+  g_object_ref (mt->clip_scroll);
   gtk_widget_set_events (mt->clip_scroll, GDK_SCROLL_MASK);
   g_signal_connect (GTK_OBJECT (mt->clip_scroll), "scroll_event",
                       G_CALLBACK (on_mouse_scroll),
@@ -7221,86 +7794,143 @@
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mt->clip_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 
-  mt->clip_inner_box = gtk_hbox_new (FALSE, 10);
+  lives_widget_set_hexpand(mt->clip_scroll,TRUE);
+
+  mt->clip_inner_box = lives_hbox_new (FALSE, widget_opts.packing_width);
 
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (mt->clip_scroll), mt->clip_inner_box);
 
   if (palette->style&STYLE_4) {
-    gtk_widget_modify_bg(GTK_BIN(mt->clip_scroll)->child, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(mt->clip_scroll)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
 
-  label=gtk_label_new (_("In/out"));
-  hbox = gtk_hbox_new (FALSE, 0);
+  tname=get_tab_name(POLY_IN_OUT);
+  label=gtk_label_new (tname);
+  g_free(tname);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
+  lives_widget_set_hexpand(hbox,TRUE);
+  lives_widget_set_vexpand(hbox,TRUE);
 
   gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 1), label);
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), GTK_STATE_NORMAL, &palette->normal_fore);
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
 
+  tname=get_tab_name(POLY_FX_STACK);
+  label=gtk_label_new (tname);
+  g_free(tname);
 
-  label=gtk_label_new (_("FX stack"));
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
+  lives_widget_set_hexpand(hbox,TRUE);
+  lives_widget_set_vexpand(hbox,TRUE);
 
   gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 2), label);
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), GTK_STATE_NORMAL, &palette->normal_fore);
-
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
-  tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,TRUE); // effects
+  tname=get_tab_name(POLY_EFFECTS);
   label=gtk_label_new (tname);
   g_free(tname);
-  hbox = gtk_hbox_new (FALSE, 0);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
+  lives_widget_set_hexpand(hbox,TRUE);
+  lives_widget_set_vexpand(hbox,TRUE);
 
   gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 3), label);
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), GTK_STATE_NORMAL, &palette->normal_fore);
-
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
 
-  tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,TRUE); // transitions
+  tname=get_tab_name(POLY_TRANS);
   label=gtk_label_new (tname);
   g_free(tname);
-  hbox = gtk_hbox_new (FALSE, 0);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
+  lives_widget_set_hexpand(hbox,TRUE);
+  lives_widget_set_vexpand(hbox,TRUE);
 
   gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 4), label);
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), GTK_STATE_NORMAL, &palette->normal_fore);
-
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
-  tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,TRUE); // compositors
+  tname=get_tab_name(POLY_COMP);
   label=gtk_label_new (tname);
   g_free(tname);
-  hbox = gtk_hbox_new (FALSE, 0);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
+  lives_widget_set_hexpand(hbox,TRUE);
+  lives_widget_set_vexpand(hbox,TRUE);
 
   gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 5), label);
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), GTK_STATE_NORMAL, &palette->normal_fore);
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
+  tname=get_tab_name(POLY_PARAMS);
+  label=gtk_label_new (tname);
+  g_free(tname);
 
-  label=gtk_label_new (_("Params."));
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_widget_show(hbox);
+  lives_widget_set_hexpand(hbox,TRUE);
+  lives_widget_set_vexpand(hbox,TRUE);
 
 
   gtk_container_add (GTK_CONTAINER (mt->nb), hbox);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (mt->nb), gtk_notebook_get_nth_page (GTK_NOTEBOOK (mt->nb), 6), label);
-  gtk_widget_modify_fg (gtk_notebook_get_tab_label(GTK_NOTEBOOK(mt->nb),hbox), 
-			GTK_STATE_NORMAL, &palette->normal_fore);
-
+#if !GTK_CHECK_VERSION(3,0,0)
+  if (palette->style&STYLE_1) {
+    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  }
+#endif
 
 
 
   // params contents
 
-  mt->fx_base_box = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref(mt->fx_base_box);
+  mt->fx_base_box = lives_vbox_new (FALSE, 0);
+  g_object_ref(mt->fx_base_box);
+
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(mt->fx_base_box, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
+
+  mt->fx_contents_box=lives_vbox_new(FALSE,2);
 
-  mt->fx_contents_box=gtk_vbox_new(FALSE,10);
+  dph=widget_opts.packing_height;
+  widget_opts.packing_height=0;
+  add_hsep_to_box(LIVES_BOX(mt->fx_contents_box));
+  widget_opts.packing_height=dph;
 
   gtk_box_pack_end (GTK_BOX (mt->fx_base_box), mt->fx_contents_box, FALSE, FALSE, 0);
 
-
-  hbox=gtk_hbox_new(FALSE,10);
+  hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
   gtk_box_pack_end (GTK_BOX (mt->fx_contents_box), hbox, FALSE, FALSE, 0);
 
   mt->apply_fx_button = gtk_button_new_with_mnemonic (_("_Apply"));
@@ -7311,36 +7941,34 @@
 		    (gpointer)mt);
   
 
-  mt->node_adj = (GObject *)gtk_adjustment_new (0., 0., 0., 1./mt->fps, 10./mt->fps, 0.);
+  mt->node_adj = (GObject *)lives_adjustment_new (0., 0., 0., 1./mt->fps, 10./mt->fps, 0.);
 
-  mt->node_scale=gtk_hscale_new(GTK_ADJUSTMENT(mt->node_adj));
+  mt->node_scale=lives_hscale_new(LIVES_ADJUSTMENT(mt->node_adj));
   gtk_scale_set_draw_value(GTK_SCALE(mt->node_scale),FALSE);
   mt->node_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (mt->node_adj), 0, 3);
 
-  mt->node_adj_func=g_signal_connect_after (GTK_OBJECT (mt->node_spinbutton), "value_changed",
-					    G_CALLBACK (on_node_spin_value_changed),
-					    (gpointer)mt);
+  g_signal_connect_after (GTK_OBJECT (mt->node_spinbutton), "value_changed",
+			  G_CALLBACK (on_node_spin_value_changed),
+			  (gpointer)mt);
   
 
   gtk_widget_show (mt->node_spinbutton);
   gtk_box_pack_start (GTK_BOX (hbox), mt->node_spinbutton, FALSE, TRUE, 0);
 
-  label=gtk_label_new(_("Time"));
+  label=lives_standard_label_new(_("Time"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-    
   gtk_widget_show(mt->node_scale);
   gtk_widget_show(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox), mt->node_scale, TRUE, TRUE, 10);
+  gtk_box_pack_start (GTK_BOX (hbox), mt->node_scale, TRUE, TRUE, widget_opts.packing_width);
   
 
-  hbox=gtk_hbox_new(FALSE,10);
+  hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
   gtk_box_pack_end (GTK_BOX (mt->fx_contents_box), hbox, FALSE, FALSE, 0);
 
+  mt->fx_params_label=lives_standard_label_new("");
+  gtk_box_pack_start (GTK_BOX (hbox), mt->fx_params_label, TRUE, TRUE, widget_opts.packing_width);
+
   mt->del_node_button = gtk_button_new_with_mnemonic (_("_Del. node"));
   gtk_box_pack_end (GTK_BOX (hbox), mt->del_node_button, FALSE, FALSE, 0);
   gtk_widget_set_sensitive(mt->del_node_button,FALSE);
@@ -7366,12 +7994,8 @@
 		    (gpointer)mt);
   
 
-  mt->fx_label=gtk_label_new("");
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mt->fx_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_box_pack_end (GTK_BOX (hbox), mt->fx_label, FALSE, FALSE, 20);
+  mt->fx_label=lives_standard_label_new("");
+  gtk_box_pack_end (GTK_BOX (hbox), mt->fx_label, FALSE, FALSE, widget_opts.packing_width*2);
 
 
   set_mt_title(mt);
@@ -7379,76 +8003,59 @@
   mt_init_clips (mt,orig_file,FALSE);
 
   // poly audio velocity
-  mt->avel_box = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (mt->avel_box);
+  mt->avel_box = lives_vbox_new (FALSE, 0);
+  g_object_ref (mt->avel_box);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(mt->avel_box),hbox,FALSE,FALSE,8);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(mt->avel_box),hbox,FALSE,FALSE,widget_opts.packing_height>>1);
 
-  mt->checkbutton_avel_reverse = gtk_check_button_new ();
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic (_("_Reverse playback  "));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),mt->checkbutton_avel_reverse);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    mt->checkbutton_avel_reverse);
+  mt->checkbutton_avel_reverse = lives_standard_check_button_new (_("_Reverse playback  "),TRUE,LIVES_BOX(hbox),NULL);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  gtk_box_pack_start (GTK_BOX (hbox), mt->checkbutton_avel_reverse, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  GTK_WIDGET_SET_FLAGS (mt->checkbutton_avel_reverse, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-
   mt->check_avel_rev_func=g_signal_connect_after (GTK_OBJECT (mt->checkbutton_avel_reverse), "toggled",
 						  G_CALLBACK (avel_reverse_toggled),
 						  mt);
 
 
-  hbox = gtk_hbox_new (FALSE, 8);
-  gtk_box_pack_start(GTK_BOX(mt->avel_box),hbox,FALSE,FALSE,10);
+  hbox = lives_hbox_new (FALSE, 8);
+  gtk_box_pack_start(GTK_BOX(mt->avel_box),hbox,FALSE,FALSE,widget_opts.packing_height);
 
-
-  label = gtk_label_new_with_mnemonic (_("_Velocity  "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,TRUE,0);
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (1.,0.5,2.,.1,1.,0.);
-  mt->spinbutton_avel = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 0.1, 2);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mt->spinbutton_avel),TRUE);
-  gtk_box_pack_start(GTK_BOX(hbox),mt->spinbutton_avel,FALSE,TRUE,0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),mt->spinbutton_avel);
+  
+  mt->spinbutton_avel = lives_standard_spin_button_new (_("_Velocity  "),TRUE,1.,0.5,2.,.1,1.,2,
+							LIVES_BOX(hbox),NULL);
 
   mt->spin_avel_func=g_signal_connect_after (GTK_OBJECT (mt->spinbutton_avel), "value_changed",
 					     G_CALLBACK (avel_spin_changed),
 					     mt);
 
-  mt->avel_scale=gtk_hscale_new(GTK_ADJUSTMENT(spinbutton_adj));
-  gtk_box_pack_start (GTK_BOX (hbox), mt->avel_scale, TRUE, TRUE, 10);
+  spinbutton_adj=(LiVESAdjustment *)gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(mt->spinbutton_avel));
+
+
+  mt->avel_scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
+  gtk_box_pack_start (GTK_BOX (hbox), mt->avel_scale, TRUE, TRUE, widget_opts.packing_width);
   gtk_scale_set_draw_value(GTK_SCALE(mt->avel_scale),FALSE);
 
   gtk_widget_show_all(mt->avel_box);
 
   // poly in_out_box
-  mt->in_out_box = gtk_hbox_new (FALSE, 0);
-  gtk_widget_ref (mt->in_out_box);
+  mt->in_out_box = lives_hbox_new (FALSE, 0);
+  g_object_ref (mt->in_out_box);
+
+  lives_widget_set_hexpand(mt->in_out_box,TRUE);
+  lives_widget_set_vexpand(mt->in_out_box,TRUE);
 
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(mt->in_out_box),vbox,FALSE,TRUE,0);
 
-  mt->spinbutton_in_adj = (GObject *)gtk_adjustment_new (0.,0.,0.,1./mt->fps,1.,0.);
-  mt->spinbutton_in = gtk_spin_button_new (GTK_ADJUSTMENT (mt->spinbutton_in_adj), 1./mt->fps, 2);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mt->spinbutton_in),TRUE);
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(mt->in_out_box),vbox,FALSE,TRUE,0);
 
   mt->in_image=gtk_image_new();
+  lives_widget_set_hexpand(mt->in_image,TRUE);
+  lives_widget_set_vexpand(mt->in_image,TRUE);
+
   eventbox=gtk_event_box_new();
   gtk_container_add (GTK_CONTAINER (eventbox), mt->in_image);
   gtk_box_pack_start(GTK_BOX(vbox),eventbox,FALSE,FALSE,0);
@@ -7462,43 +8069,32 @@
 		    (gpointer)mt);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
-  }
-
-  mt->in_hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox),mt->in_hbox,TRUE,FALSE,0);
-  gtk_box_pack_start(GTK_BOX(mt->in_hbox),mt->spinbutton_in,FALSE,FALSE,0);
-
-  mt->checkbutton_start_anchored = gtk_check_button_new ();
-  gtk_widget_set_tooltip_text( mt->checkbutton_start_anchored, _("Anchor the start point to the timeline"));
-  mt->in_eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(mt->in_eventbox,mt->checkbutton_start_anchored);
-  label=gtk_label_new_with_mnemonic (_("Anchor _start"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),mt->checkbutton_start_anchored);
-
-  g_signal_connect (GTK_OBJECT (mt->in_eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    mt->checkbutton_start_anchored);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(mt->in_eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(mt->in_eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(mt->in_eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  gtk_box_pack_start (GTK_BOX (mt->in_hbox), mt->in_eventbox, FALSE, FALSE, 10);
+  hbox=lives_hbox_new(FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,FALSE,0);
+
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  mt->in_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(hbox),mt->in_hbox,TRUE,TRUE,0);
+ 
+  dpw=widget_opts.packing_width;
+  widget_opts.packing_width=0;
+  mt->spinbutton_in = lives_standard_spin_button_new (NULL,FALSE,0.,0.,0.,1./mt->fps,1.,2,
+						      LIVES_BOX(mt->in_hbox),NULL);
+  widget_opts.packing_width=dpw;
 
+  mt->checkbutton_start_anchored = lives_standard_check_button_new ((tmp=g_strdup(_("Anchor _start"))),TRUE,LIVES_BOX(mt->in_hbox),
+								    (tmp2=g_strdup(_("Anchor the start point to the timeline"))));
 
-  hbox = gtk_hbox_new (FALSE, 0);
 
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
-  gtk_box_pack_start(GTK_BOX(hbox),mt->checkbutton_start_anchored,TRUE,FALSE,10);
+  g_free(tmp); g_free(tmp2);
 
-  gtk_container_add (GTK_CONTAINER (mt->in_eventbox), hbox);
-  GTK_WIDGET_SET_FLAGS (mt->checkbutton_start_anchored, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  add_fill_to_box(LIVES_BOX(hbox));
   
   mt->spin_in_func=g_signal_connect_after (GTK_OBJECT (mt->spinbutton_in), "value_changed",
 					   G_CALLBACK (in_out_start_changed),
@@ -7509,19 +8105,20 @@
 					    mt);
 
 
-  mt->start_in_label=gtk_label_new(_("Start frame"));
-  gtk_box_pack_start (GTK_BOX (mt->in_hbox), mt->start_in_label, FALSE, FALSE, 10);
+  mt->start_in_label=lives_standard_label_new(_("Start frame"));
+  gtk_box_pack_start (GTK_BOX (mt->in_hbox), mt->start_in_label, FALSE, FALSE, widget_opts.packing_width);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mt->start_in_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  vbox = gtk_vbox_new (FALSE, 0);
+
+
+
+  vbox = lives_vbox_new (FALSE, 0);
+
   gtk_box_pack_end(GTK_BOX(mt->in_out_box),vbox,FALSE,TRUE,0);
-  mt->spinbutton_out_adj = (GObject *)gtk_adjustment_new (0.,0.,0.,1./mt->fps,1.,0.);
-  mt->spinbutton_out = gtk_spin_button_new (GTK_ADJUSTMENT (mt->spinbutton_out_adj), 1./mt->fps, 2);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mt->spinbutton_out),TRUE);
+
   mt->out_image=gtk_image_new();
+  lives_widget_set_hexpand(mt->out_image,TRUE);
+  lives_widget_set_vexpand(mt->out_image,TRUE);
 
   eventbox=gtk_event_box_new();
   gtk_container_add (GTK_CONTAINER (eventbox), mt->out_image);
@@ -7535,44 +8132,29 @@
 		    (gpointer)mt);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
-  }
-
-  mt->out_hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox),mt->out_hbox,TRUE,FALSE,0);
-
-  gtk_box_pack_start(GTK_BOX(mt->out_hbox),mt->spinbutton_out,FALSE,FALSE,0);
-
-  mt->checkbutton_end_anchored = gtk_check_button_new ();
-  gtk_widget_set_tooltip_text( mt->checkbutton_end_anchored, _("Anchor the end point to the timeline"));
-  mt->out_eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(mt->out_eventbox,mt->checkbutton_end_anchored);
-  label=gtk_label_new_with_mnemonic (_("Anchor _end"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),mt->checkbutton_end_anchored);
-
-  g_signal_connect (GTK_OBJECT (mt->out_eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    mt->checkbutton_end_anchored);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(mt->out_eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(mt->out_eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(mt->out_eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  gtk_box_pack_start (GTK_BOX (mt->out_hbox), mt->out_eventbox, FALSE, FALSE, 10);
+  hbox=lives_hbox_new(FALSE,0);
+  gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,FALSE,0);
+
+  add_fill_to_box(LIVES_BOX(hbox));
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  mt->out_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(hbox),mt->out_hbox,TRUE,TRUE,0);
 
-  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,10);
-  gtk_box_pack_start(GTK_BOX(hbox),mt->checkbutton_end_anchored,TRUE,FALSE,10);
+  dpw=widget_opts.packing_width;
+  widget_opts.packing_width=0;
+  mt->spinbutton_out = lives_standard_spin_button_new (NULL,FALSE,0.,0.,0.,1./mt->fps,1.,2,
+						       LIVES_BOX(mt->out_hbox),NULL);
+  widget_opts.packing_width=dpw;
 
-  gtk_container_add (GTK_CONTAINER (mt->out_eventbox), hbox);
+  mt->checkbutton_end_anchored = lives_standard_check_button_new ((tmp=g_strdup(_("Anchor _end"))),TRUE,LIVES_BOX(mt->out_hbox),
+								  (tmp2=g_strdup(_("Anchor the end point to the timeline"))));
 
-  GTK_WIDGET_SET_FLAGS (mt->checkbutton_end_anchored, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  g_free(tmp); g_free(tmp2);
 
   mt->spin_out_func=g_signal_connect_after (GTK_OBJECT (mt->spinbutton_out), "value_changed",
 					    G_CALLBACK (in_out_end_changed),
@@ -7582,12 +8164,8 @@
 					     G_CALLBACK (out_anchor_toggled),
 					     mt);
 
-  mt->end_out_label=gtk_label_new(_("End frame"));
-  gtk_box_pack_start (GTK_BOX (mt->out_hbox), mt->end_out_label, FALSE, FALSE, 10);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(mt->end_out_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  mt->end_out_label=lives_standard_label_new(_("End frame"));
+  gtk_box_pack_start (GTK_BOX (mt->out_hbox), mt->end_out_label, FALSE, FALSE, widget_opts.packing_width);
 
   g_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
   g_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
@@ -7600,13 +8178,18 @@
 		    (gpointer)mt);
 
 
+
+
+  ///////////////////////////////////////////////
+
+
   mt->poly_state=POLY_NONE;
   polymorph(mt,POLY_CLIPS);
 
   mt->context_frame = gtk_frame_new (_("Info"));
-  gtk_widget_modify_bg (mt->context_frame, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_fg (mt->context_frame, GTK_STATE_NORMAL, &palette->normal_fore);
-  gtk_widget_modify_fg (gtk_frame_get_label_widget(GTK_FRAME(mt->context_frame)), GTK_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_bg_color (mt->context_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_fg_color (mt->context_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color (gtk_frame_get_label_widget(GTK_FRAME(mt->context_frame)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
   gtk_paned_pack2 (GTK_PANED (mt->hpaned), mt->context_frame, TRUE, TRUE);
 
@@ -7616,40 +8199,45 @@
 
   if (mainw->imsep==NULL) {
     mt->sep_image=NULL;
-    hseparator = gtk_hseparator_new ();
+    hseparator = lives_hseparator_new ();
     gtk_box_pack_start (GTK_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 2);
     if (palette->style&STYLE_5) {
-      gtk_widget_modify_fg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
   }
   else {
-    hseparator = gtk_hseparator_new ();
+    hseparator = lives_hseparator_new ();
     gtk_box_pack_start (GTK_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 0);
     if (palette->style&STYLE_5) {
-      gtk_widget_modify_fg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     mt->sep_image = gtk_image_new_from_pixbuf (mainw->imsep);
     gtk_box_pack_start (GTK_BOX (mt->top_vbox), mt->sep_image, FALSE, FALSE, 0);
-    hseparator = gtk_hseparator_new ();
+    hseparator = lives_hseparator_new ();
     gtk_box_pack_start (GTK_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 0);
     if (palette->style&STYLE_5) {
-      gtk_widget_modify_fg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
   }
 
   mt_init_start_end_spins(mt);
 
-  mt->vpaned=gtk_vpaned_new();
+  mt->vpaned=lives_vpaned_new();
   gtk_box_pack_start (GTK_BOX (mt->top_vbox), mt->vpaned, TRUE, TRUE, 0);
 
+  if (palette->style&STYLE_1) {
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(mt->vpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(mt->vpaned, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+  }
+
   g_signal_connect (GTK_OBJECT (mt->vpaned), "accept_position",
 		    G_CALLBACK (paned_pos),
 		    (gpointer)mt);
 
-  tl_vbox = gtk_vbox_new (FALSE, 0);
+  tl_vbox = lives_vbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (tl_vbox), 0);
 
   gtk_container_add (GTK_CONTAINER (mt->vpaned), tl_vbox);
@@ -7662,8 +8250,8 @@
   gtk_box_pack_start (GTK_BOX (tl_vbox), eventbox, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
@@ -7680,34 +8268,34 @@
 				   (gpointer)mt);
   g_signal_handler_block (eventbox,mt->mouse_mot1);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (eventbox), hbox);
 
-  vadjustment = (GObject *)gtk_adjustment_new (1.0,1.0,1.0,1.0,1.0,1.0);
-  scrollbar=gtk_vscrollbar_new(GTK_ADJUSTMENT(vadjustment));
+  vadjustment = (GObject *)lives_adjustment_new (1.0,1.0,1.0,1.0,1.0,1.0);
+  scrollbar=lives_vscrollbar_new(LIVES_ADJUSTMENT(vadjustment));
   gtk_widget_set_sensitive(scrollbar,FALSE);
 
   gtk_box_pack_start (GTK_BOX (hbox), mt->timeline_table_header, TRUE, TRUE, 0);
-  gtk_box_pack_end (GTK_BOX (hbox), scrollbar, FALSE, FALSE, 10);
+  gtk_box_pack_end (GTK_BOX (hbox), scrollbar, FALSE, FALSE, widget_opts.packing_width);
 
-  mt->tl_hbox = gtk_hbox_new (FALSE, 0);
+  mt->tl_hbox = lives_hbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (mt->tl_hbox), 0);
     
   gtk_box_pack_start (GTK_BOX (tl_vbox), mt->tl_hbox, TRUE, TRUE, 0);
 
-  mt->vadjustment = (GObject *)gtk_adjustment_new (0.0,0.0,1.0,1.0,mt->max_disp_vtracks,1.0);
-  mt->scrollbar=gtk_vscrollbar_new(GTK_ADJUSTMENT(mt->vadjustment));
+  mt->vadjustment = (GObject *)lives_adjustment_new (0.0,0.0,1.0,1.0,mt->max_disp_vtracks,1.0);
+  mt->scrollbar=lives_vscrollbar_new(LIVES_ADJUSTMENT(mt->vadjustment));
 
-  g_signal_connect (GTK_OBJECT (mt->scrollbar), "value_changed",
-		    G_CALLBACK (scroll_track_by_scrollbar),
-		    (gpointer)mt);
+  g_signal_connect_after (GTK_OBJECT (mt->scrollbar), "value_changed",
+			  G_CALLBACK (scroll_track_by_scrollbar),
+			  (gpointer)mt);
 
   mt->tl_eventbox=gtk_event_box_new();
   gtk_box_pack_start (GTK_BOX (mt->tl_hbox), mt->tl_eventbox, TRUE, TRUE, 0);
 
   if (palette->style&STYLE_1) {
-    if (palette->style&STYLE_3) gtk_widget_modify_bg(mt->tl_eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    else gtk_widget_modify_bg(mt->tl_eventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(mt->tl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(mt->tl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   g_signal_connect (GTK_OBJECT (mt->tl_eventbox), "button_press_event",
@@ -7719,7 +8307,7 @@
 		    (gpointer)mt);
 
 
-  gtk_widget_add_events (mt->tl_eventbox, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK|GDK_SCROLL_MASK);
+  gtk_widget_add_events (mt->tl_eventbox, GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK| GDK_SCROLL_MASK);
   mt->mouse_mot2=g_signal_connect (GTK_OBJECT (mt->tl_eventbox), "motion_notify_event",
 				  G_CALLBACK (on_track_move),
 				  (gpointer)mt);
@@ -7731,22 +8319,28 @@
 		    G_CALLBACK (on_mt_timeline_scroll),
 		    (gpointer)mt);
 
-  gtk_box_pack_end (GTK_BOX (mt->tl_hbox), mt->scrollbar, FALSE, FALSE, 10);
+  gtk_box_pack_end (GTK_BOX (mt->tl_hbox), mt->scrollbar, FALSE, FALSE, widget_opts.packing_width);
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (tl_vbox), hbox, FALSE, FALSE, 4);
-  label=gtk_label_new(_("Scroll"));
+  eventbox = gtk_event_box_new ();
+  hbox=lives_hbox_new(FALSE,0);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+    if (palette->style&STYLE_3) lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    else lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
+  gtk_box_pack_start (GTK_BOX (tl_vbox), eventbox, FALSE, FALSE, 4.*widget_opts.scale);
+  gtk_container_add (GTK_CONTAINER (eventbox), hbox);
+
+  label=lives_standard_label_new(_("Scroll"));
+
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+
+  mt->hadjustment = (GObject *)lives_adjustment_new (0.0,0.0,1.,0.25,1.,1.);
+  mt->time_scrollbar=lives_hscrollbar_new(LIVES_ADJUSTMENT(mt->hadjustment));
 
-  mt->hadjustment = (GObject *)gtk_adjustment_new (0.0,0.0,1.,0.25,1.,1.);
-  mt->time_scrollbar=gtk_hscrollbar_new(GTK_ADJUSTMENT(mt->hadjustment));
-  gtk_box_pack_start (GTK_BOX (hbox), mt->time_scrollbar, TRUE, TRUE, 10);
+  gtk_box_pack_start (GTK_BOX (hbox), mt->time_scrollbar, TRUE, TRUE, widget_opts.packing_width);
 
   g_signal_connect (GTK_OBJECT (mt->time_scrollbar), "value_changed",
 		    G_CALLBACK (scroll_time_by_scrollbar),
@@ -7786,7 +8380,7 @@
 
   add_message_scroller(mt->vpaned);
 
-  gtk_widget_set_size_request (mt->window, scr_width-MT_BORDER_WIDTH, -1);
+  gtk_widget_set_size_request (mt->window, scr_width-widget_opts.border_width, -1);
 
   // add info bar
 
@@ -7796,31 +8390,26 @@
 		    G_CALLBACK (on_mt_delete_event),
 		    (gpointer)mt);
 
-  mainw->multitrack=mt;
-
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Page_Up, GDK_CONTROL_MASK, (GtkAccelFlags)0,
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Page_Up, LIVES_CONTROL_MASK, (GtkAccelFlags)0,
 			   g_cclosure_new (G_CALLBACK (mt_prevclip),mt,NULL));
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Page_Down, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Page_Down, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_nextclip),mt,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Left, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Left, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_tlback),mt,NULL));
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Right, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Right, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_tlfor),mt,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Left, GDK_SHIFT_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Left, LIVES_SHIFT_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_tlback_frame),mt,NULL));
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Right, GDK_SHIFT_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Right, LIVES_SHIFT_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_tlfor_frame),mt,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Up, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Up, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_trup),mt,NULL));
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Down, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Down, LIVES_CONTROL_MASK, (GtkAccelFlags)0, 
 			   g_cclosure_new (G_CALLBACK (mt_trdown),mt,NULL));
 
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mt->accel_group), GDK_Return, GDK_CONTROL_MASK, (GtkAccelFlags)0, 
-			   g_cclosure_new (G_CALLBACK (mt_selblock),mt,NULL));
-
   mt->last_direction=DIRECTION_POSITIVE;
 
   // set check menuitems
@@ -7843,14 +8432,14 @@
 }
 
 
-void delete_audio_track(lives_mt *mt, GtkWidget *eventbox, gboolean full) {
+void delete_audio_track(lives_mt *mt, GtkWidget *eventbox, boolean full) {
   // WARNING - does not yet delete events from event_list
   // only deletes visually
 
   track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks"),*blocknext;
 
   GtkWidget *label,*labelbox,*arrow,*ahbox,*xeventbox;
-  GdkPixbuf *bgimg,*st_image;
+  lives_painter_surface_t *bgimg;
 
   while (block!=NULL) {
     blocknext=block->next;
@@ -7859,12 +8448,8 @@
     block=blocknext;
   }
 
-  if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
-    gdk_pixbuf_unref(bgimg);
-  }
-
-  if ((st_image=(GdkPixbuf *)g_object_get_data(G_OBJECT(eventbox),"backup_image"))!=NULL) {
-    g_object_unref(st_image);
+  if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
+    lives_painter_surface_destroy(bgimg);
   }
 
   label=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "label");
@@ -7880,25 +8465,19 @@
 
   xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
   if (xeventbox!=NULL) {
-    if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
-      gdk_pixbuf_unref(bgimg);
+    if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
+      lives_painter_surface_destroy(bgimg);
     }
     
-    if ((st_image=(GdkPixbuf *)g_object_get_data(G_OBJECT(xeventbox),"backup_image"))!=NULL) {
-      g_object_unref(st_image);
-    }
     gtk_widget_destroy(xeventbox);
   }
   if (cfile->achans>1) {
     xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
     if (xeventbox!=NULL) {
-      if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
-	gdk_pixbuf_unref(bgimg);
+      if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
+	lives_painter_surface_destroy(bgimg);
       }
       
-      if ((st_image=(GdkPixbuf *)g_object_get_data(G_OBJECT(xeventbox),"backup_image"))!=NULL) {
-	g_object_unref(st_image);
-      }
       gtk_widget_destroy(xeventbox);
     }
   }
@@ -7913,12 +8492,17 @@
   // update our current layout map with the current layout
   // returns an int * of maximum frame used for each clip that exists, 0 means unused
   int *used_clips;
-  weed_plant_t *event=get_first_event(event_list);
+  weed_plant_t *event;
   int i;
 
   used_clips=(int *)g_malloc((MAX_FILES+1)*sizint);
   for (i=1;i<=MAX_FILES;i++) used_clips[i]=0;
 
+  if (event_list==NULL) return used_clips;
+
+  event=get_first_event(event_list);
+
+
   while (event!=NULL) {
     if (WEED_EVENT_IS_FRAME(event)) {
       int numtracks=weed_leaf_num_elements(event,"clips");
@@ -7944,19 +8528,19 @@
   // update our current layout map with the current layout
   // returns a double * of maximum audio in seconds used for each clip that exists, 0. means unused
   double *used_clips;
-  weed_plant_t *event=get_first_event(event_list);
+  weed_plant_t *event;
   int i;
 
   // TODO - use linked lists
-  double aseek[65536];
-  double avel[65536];
-  weed_timecode_t atc[65536];
-  int last_aclips[65536];
-
-  double neg_aseek[65536];
-  double neg_avel[65536];
-  weed_timecode_t neg_atc[65536];
-  int neg_last_aclips[65536];
+  double aseek[MAX_AUDIO_TRACKS];
+  double avel[MAX_AUDIO_TRACKS];
+  weed_timecode_t atc[MAX_AUDIO_TRACKS];
+  int last_aclips[MAX_AUDIO_TRACKS];
+
+  double neg_aseek[MAX_AUDIO_TRACKS];
+  double neg_avel[MAX_AUDIO_TRACKS];
+  weed_timecode_t neg_atc[MAX_AUDIO_TRACKS];
+  int neg_last_aclips[MAX_AUDIO_TRACKS];
 
   int atrack;
   double aval;
@@ -7966,10 +8550,15 @@
   used_clips=(double *)g_malloc((MAX_FILES+1)*sizdbl);
   for (i=1;i<=MAX_FILES;i++) used_clips[i]=0.;
 
-  for (i=0;i<65536;i++) {
+  if (event_list==NULL) return used_clips;
+
+  event=get_first_event(event_list);
+
+  for (i=0;i<MAX_AUDIO_TRACKS;i++) {
     avel[i]=neg_avel[i]=0.;
   }
 
+
   while (event!=NULL) {
     if (WEED_EVENT_IS_FRAME(event)) {
       if (weed_plant_has_leaf(event,"audio_clips")) {
@@ -7982,7 +8571,7 @@
 	    atrack=aclip_index[i];
 	    tc=get_event_timecode(event);
 	    if (atrack>=0) {
-	      if (atrack>65535) {
+	      if (atrack>=MAX_AUDIO_TRACKS) {
 		LIVES_ERROR("invalid atrack");
 	      }
 	      else {
@@ -7996,10 +8585,11 @@
 		atc[atrack]=tc;
 		last_aclips[atrack]=aclip_index[i+1];
 	      }
+
 	    }
 	    else {
 	      atrack=-atrack;
-	      if (atrack>65535) {
+	      if (atrack>MAX_AUDIO_TRACKS) {
 		LIVES_ERROR("invalid back atrack");
 	      }
 	      else {
@@ -8022,16 +8612,17 @@
     }
     event=get_next_event(event);
   }
+
   return used_clips;
 }
 
+ 
 
-
-gboolean used_in_current_layout(lives_mt *mt, gint file) {
+boolean used_in_current_layout(lives_mt *mt, int file) {
   // see if <file> is used in current layout
   int *layout_map;
   double *layout_map_audio;
-  gboolean retval=FALSE;
+  boolean retval=FALSE;
 
   if (mainw->stored_event_list!=NULL) {
     return (mainw->files[file]->stored_layout_frame>0||mainw->files[file]->stored_layout_audio>0.);
@@ -8056,23 +8647,36 @@
 
 
 
-gboolean multitrack_delete (lives_mt *mt, gboolean save_layout) {
+boolean multitrack_delete (lives_mt *mt, boolean save_layout) {
   // free lives_mt struct
-  int i;
-  gboolean transfer_focus=FALSE;
   int *layout_map;
-  double *layout_map_audio;
+  double *layout_map_audio=NULL;
+#ifdef ENABLE_OSC
   gchar *tmp;
+#endif
+
+  boolean transfer_focus=FALSE;
+  boolean needs_idlefunc=FALSE;
+
+  register int i;
 
   mainw->cancelled=CANCEL_NONE;
 
-  if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
-  mt->idlefunc=0;
+  if (mt->idlefunc>0) {
+    needs_idlefunc=TRUE;
+    g_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
+  }
+
+  if (mt->frame_pixbuf!=NULL&&mt->frame_pixbuf!=mainw->imframe) {
+    g_object_unref(mt->frame_pixbuf);
+    mt->frame_pixbuf=NULL;
+  }
 
   if (save_layout||mainw->scrap_file!=-1||mainw->ascrap_file!=-1) {
-    gint file_selected=mt->file_selected;
+    int file_selected=mt->file_selected;
     if (!check_for_layout_del(mt,TRUE)) {
-      mt->idlefunc=mt_idle_add(mt);
+      if (needs_idlefunc) mt->idlefunc=mt_idle_add(mt);
       return FALSE;
     }
     mt->file_selected=file_selected; // because init_clips will reset this
@@ -8081,16 +8685,17 @@
     if (mt->event_list!=NULL) {
       save_event_list_inner(mt,-1,mt->event_list,NULL); // set width, height, fps etc.
       add_markers(mt,mt->event_list);
+
       mainw->stored_event_list=mt->event_list;
+
       mt->event_list=NULL;
       mainw->stored_event_list_changed=mt->changed;
-      memcpy(mainw->stored_layout_name,mt->layout_name,(strlen(mt->layout_name)+1));
-      
+      mainw->stored_event_list_auto_changed=mt->auto_changed;
+      snprintf(mainw->stored_layout_name,256,"%s",mt->layout_name);
       mainw->stored_layout_undos=mt->undos;
       mainw->sl_undo_mem=mt->undo_mem;
       mainw->sl_undo_buffer_used=mt->undo_buffer_used;
       mainw->sl_undo_offset=mt->undo_offset;
-      
       mt->undos=NULL;
       mt->undo_mem=NULL;
 
@@ -8099,10 +8704,13 @@
       layout_map=update_layout_map(mainw->stored_event_list);
       layout_map_audio=update_layout_map_audio(mainw->stored_event_list);
       
-      for (i=0;i<MAX_FILES;i++) {
-	if (mainw->files[i]!=NULL&&(layout_map[i]!=0||layout_map_audio[i]!=0.)) {
+      for (i=1;i<MAX_FILES;i++) {
+	if (mainw->files[i]!=NULL&&(layout_map[i]!=0||(layout_map_audio!=NULL&&layout_map_audio[i]!=0.))) {
 	  mainw->files[i]->stored_layout_frame=layout_map[i];
-	  mainw->files[i]->stored_layout_audio=layout_map_audio[i];
+	  if (layout_map_audio!=NULL) 
+	    mainw->files[i]->stored_layout_audio=layout_map_audio[i];
+	  else
+	    mainw->files[i]->stored_layout_audio=0.;
 	  mainw->files[i]->stored_layout_fps=mainw->files[i]->fps;
 	  mainw->files[i]->stored_layout_idx=i;
 	}
@@ -8144,9 +8752,8 @@
   if (mt->event_list!=NULL) event_list_free(mt->event_list);
   mt->event_list=NULL;
 
-  if (mt->clip_selected>=0&&mainw->files[mt_file_from_clip(mt,mt->clip_selected)]!=NULL) mt_file_from_clip(mt,mt->clip_selected);
-
-  if (mt->cursor!=NULL) gdk_cursor_unref(mt->cursor);
+  if (mt->clip_selected>=0&&mainw->files[mt_file_from_clip(mt,mt->clip_selected)]!=NULL) 
+    mt_file_from_clip(mt,mt->clip_selected);
 
   if (mt->clip_labels!=NULL) g_list_free(mt->clip_labels);
 
@@ -8188,57 +8795,56 @@
   g_signal_handler_unblock(mainw->mute_audio,mainw->mute_audio_func);
 
 
-  gtk_widget_ref(mainw->m_sepwinbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_sepwinbutton->parent),mainw->m_sepwinbutton);
+  g_object_ref(mainw->m_sepwinbutton);
+  lives_widget_unparent(mainw->m_sepwinbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_sepwinbutton),0);
-  gtk_widget_unref(mainw->m_sepwinbutton);
+  g_object_unref(mainw->m_sepwinbutton);
 
-  gtk_widget_ref(mainw->m_rewindbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_rewindbutton->parent),mainw->m_rewindbutton);
+  g_object_ref(mainw->m_rewindbutton);
+  lives_widget_unparent(mainw->m_rewindbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_rewindbutton),1);
-  gtk_widget_unref(mainw->m_rewindbutton);
+  g_object_unref(mainw->m_rewindbutton);
 
-  gtk_widget_ref(mainw->m_playbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_playbutton->parent),mainw->m_playbutton);
+  g_object_ref(mainw->m_playbutton);
+  lives_widget_unparent(mainw->m_playbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_playbutton),2);
-  gtk_widget_unref(mainw->m_playbutton);
+  g_object_unref(mainw->m_playbutton);
 
-  gtk_widget_ref(mainw->m_stopbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_stopbutton->parent),mainw->m_stopbutton);
+  g_object_ref(mainw->m_stopbutton);
+  lives_widget_unparent(mainw->m_stopbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_stopbutton),3);
-  gtk_widget_unref(mainw->m_stopbutton);
+  g_object_unref(mainw->m_stopbutton);
 
-  /*  gtk_widget_ref(mainw->m_playselbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_playselbutton->parent),mainw->m_playselbutton);
+  /*  g_object_ref(mainw->m_playselbutton);
+  lives_widget_unparent(mainw->m_playselbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_playselbutton),4);
-  gtk_widget_unref(mainw->m_playselbutton);*/
+  g_object_unref(mainw->m_playselbutton);*/
 
-  gtk_widget_ref(mainw->m_loopbutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_loopbutton->parent),mainw->m_loopbutton);
+  g_object_ref(mainw->m_loopbutton);
+  lives_widget_unparent(mainw->m_loopbutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_loopbutton),5);
-  gtk_widget_unref(mainw->m_loopbutton);
+  g_object_unref(mainw->m_loopbutton);
 
-  gtk_widget_ref(mainw->m_mutebutton);
-  gtk_container_remove(GTK_CONTAINER(mainw->m_mutebutton->parent),mainw->m_mutebutton);
+  g_object_ref(mainw->m_mutebutton);
+  lives_widget_unparent(mainw->m_mutebutton);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->m_mutebutton),6);
-  gtk_widget_unref(mainw->m_mutebutton);
-
-#ifndef HAVE_GTK_NICE_VERSION
+  g_object_unref(mainw->m_mutebutton);
 
-  gtk_widget_ref(mainw->vol_label);
-  gtk_container_remove(GTK_CONTAINER(mainw->vol_label->parent),mainw->vol_label);
-  gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->vol_label),7);
-  gtk_widget_unref(mainw->vol_label);
-#else
-  gtk_scale_button_set_orientation (GTK_SCALE_BUTTON(mainw->volume_scale),GTK_ORIENTATION_HORIZONTAL);
-#endif
+  if (!lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(mainw->volume_scale),LIVES_ORIENTATION_HORIZONTAL)) {
+    if (mainw->vol_label!=NULL) {
+      g_object_ref(mainw->vol_label);
+      lives_widget_unparent(mainw->vol_label);
+      gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->vol_label),7);
+      g_object_unref(mainw->vol_label);
+    }
+  }
 
-  gtk_widget_ref(mainw->vol_toolitem);
-  gtk_container_remove(GTK_CONTAINER(mainw->vol_toolitem->parent),mainw->vol_toolitem);
+  g_object_ref(mainw->vol_toolitem);
+  lives_widget_unparent(mainw->vol_toolitem);
   gtk_toolbar_insert(GTK_TOOLBAR(mainw->btoolbar),GTK_TOOL_ITEM(mainw->vol_toolitem),-1);
-  gtk_widget_unref(mainw->vol_toolitem);
+  g_object_unref(mainw->vol_toolitem);
 
-  gtk_widget_ref(mainw->gens_menu);
+  g_object_ref(mainw->gens_menu);
   gtk_menu_detach(GTK_MENU(mainw->gens_menu));
 
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->gens_submenu), mainw->gens_menu);
@@ -8250,16 +8856,14 @@
       mainw->plug=NULL;
     }
 
-    mainw->playarea = gtk_hbox_new (FALSE,0);
+    mainw->playarea = lives_hbox_new (FALSE,0);
 
     gtk_container_add (GTK_CONTAINER (mainw->pl_eventbox), mainw->playarea);
-    gtk_widget_modify_bg (mainw->playframe, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     gtk_widget_show(mainw->playarea);
     gtk_widget_set_app_paintable(mainw->playarea,TRUE);
   }
 
-  if (mt->sepwin_pixbuf!=NULL&&mt->sepwin_pixbuf!=mainw->imframe) gdk_pixbuf_unref(mt->sepwin_pixbuf);
-  mt->sepwin_pixbuf=NULL;
 
   // free our track_rects
   if (cfile->achans>0) {
@@ -8303,14 +8907,14 @@
   reset_clip_menu();
   mainw->last_dprint_file=-1;
   
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   if (prefs->show_gui&&prefs->open_maximised) {
     gtk_window_maximize (GTK_WINDOW(mainw->LiVES));
   }
 
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   d_print (_ ("\n==============================\nSwitched to Clip Edit mode\n"));
 
   if (mt->file_selected!=-1) {
@@ -8363,8 +8967,8 @@
 
 
 
-static track_rect *add_block_start_point (GtkWidget *eventbox, weed_timecode_t tc, gint filenum, 
-					  weed_timecode_t offset_start, weed_plant_t *event, gboolean ordered) {
+static track_rect *add_block_start_point (GtkWidget *eventbox, weed_timecode_t tc, int filenum, 
+					  weed_timecode_t offset_start, weed_plant_t *event, boolean ordered) {
   // each mt->video_draw (eventbox) has a gulong data which points to a linked list of track_rect
   // here we create a new linked list item and set the start timecode in the timeline, 
   // offset in the source file, and start event
@@ -8423,23 +9027,17 @@
   return block;
 }
 
-static gboolean
-on_tlreg_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
-  GdkCursor *cursor;
+static boolean on_tlreg_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->cursor_style!=0) return FALSE;
-  cursor=gdk_cursor_new_for_display (mt->display, GDK_SB_H_DOUBLE_ARROW);
-  gdk_window_set_cursor (widget->window, cursor);
+  if (mt->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
+  lives_set_cursor_style(LIVES_CURSOR_SB_H_DOUBLE_ARROW,widget);
   return FALSE;
 }
 
-static gboolean
-on_tleb_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
-  GdkCursor *cursor;
+static boolean on_tleb_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->cursor_style!=0) return FALSE;
-  cursor=gdk_cursor_new_for_display (mt->display, GDK_CENTER_PTR);
-  gdk_window_set_cursor (widget->window, cursor);
+  if (mt->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
+  lives_set_cursor_style(LIVES_CURSOR_CENTER_PTR,widget);
   return FALSE;
 }
 
@@ -8463,10 +9061,12 @@
 
 
 
-void mt_init_tracks (lives_mt *mt, gboolean set_min_max) {
+void mt_init_tracks (lives_mt *mt, boolean set_min_max) {
   GtkWidget *label;
   GList *tlist;
 
+  mt->avol_init_event=NULL;
+
   tlist=mt->audio_draws;
 
   while (mt->audio_draws!=NULL) {
@@ -8486,14 +9086,12 @@
   g_list_free(tlist);
   mt->num_video_tracks=0;
 
+#ifndef ENABLE_GIW_3
   if (mt->timeline_table==NULL) {
-    label=gtk_label_new (_("Timeline (seconds)"));
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    label=lives_standard_label_new (_("Timeline (seconds)"));
     gtk_table_attach (GTK_TABLE (mt->timeline_table_header), label, 0, 7, 0, 2, GTK_FILL, (GtkAttachOptions)0, 0, 0);
   }
+#endif
 
   mt->current_track=0;
 
@@ -8513,9 +9111,15 @@
   mt->block_selected=NULL;
 
   if (mt->timeline_eb==NULL) {
-    mt->timeline = gtk_hruler_new();
+
+#ifdef ENABLE_GIW_3
+    mt->timeline=giw_timeline_new(GTK_ORIENTATION_HORIZONTAL);
+    giw_timeline_set_unit(GIW_TIMELINE(mt->timeline),GIW_TIME_UNIT_SMH);
+#else
+    mt->timeline=lives_standard_hruler_new();
+#endif
     mt->timeline_reg=gtk_event_box_new();
-    label=gtk_label_new (""); // dummy label
+    label=lives_standard_label_new (""); // dummy label
     gtk_container_add (GTK_CONTAINER (mt->timeline_reg), label);
 
     gtk_widget_show(mt->timeline_reg);
@@ -8525,26 +9129,28 @@
     
     if (palette->style&STYLE_1) {
       if (palette->style&STYLE_3) {
-	gtk_widget_modify_fg (mt->timeline, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_bg (mt->timeline, GTK_STATE_NORMAL, &palette->normal_back);
-	gtk_widget_modify_bg (mt->timeline_eb, GTK_STATE_NORMAL, &palette->menu_and_bars);
-	gtk_widget_modify_bg (mt->timeline_reg, GTK_STATE_NORMAL, &palette->menu_and_bars);
+	lives_widget_set_fg_color (mt->timeline, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+	lives_widget_set_bg_color (mt->timeline, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+	lives_widget_set_bg_color (mt->timeline_eb, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+	lives_widget_set_bg_color (mt->timeline_reg, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       }
     }
 
-    gtk_widget_add_events (mt->timeline_eb, GDK_POINTER_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
-    gtk_widget_add_events (mt->timeline_reg, GDK_POINTER_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
+    gtk_widget_add_events (mt->timeline_eb, GDK_POINTER_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | 
+			   GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
+    gtk_widget_add_events (mt->timeline_reg, GDK_POINTER_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | 
+			   GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
     g_signal_connect (GTK_OBJECT(mt->timeline_eb), "enter-notify-event",G_CALLBACK (on_tleb_enter),(gpointer)mt);
     g_signal_connect (GTK_OBJECT(mt->timeline_reg), "enter-notify-event",G_CALLBACK (on_tlreg_enter),(gpointer)mt);
     
     g_signal_connect (GTK_OBJECT (mt->timeline), "motion_notify_event",
 		      G_CALLBACK (return_true),
 		      NULL);
-    
+
     g_signal_connect (GTK_OBJECT (mt->timeline_eb), "motion_notify_event",
 		      G_CALLBACK (on_timeline_update),
 		      (gpointer)mt);
-    
+
     g_signal_connect (GTK_OBJECT (mt->timeline_eb), "button_release_event",
 		      G_CALLBACK (on_timeline_release),
 		      (gpointer)mt);
@@ -8552,7 +9158,7 @@
     g_signal_connect (GTK_OBJECT (mt->timeline_eb), "button_press_event",
 		      G_CALLBACK (on_timeline_press),
 		      (gpointer)mt);
-    
+
     g_signal_connect (GTK_OBJECT (mt->timeline_reg), "motion_notify_event",
 		      G_CALLBACK (on_timeline_update),
 		      (gpointer)mt);
@@ -8565,9 +9171,9 @@
 		      G_CALLBACK (on_timeline_press),
 		      (gpointer)mt);
     
-    g_signal_connect_after (GTK_OBJECT (mt->timeline_reg), "expose_event",
-			    G_CALLBACK (expose_timeline_reg_event),
-			    (gpointer)mt);
+    g_signal_connect (GTK_OBJECT (mt->timeline_reg), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		      G_CALLBACK (expose_timeline_reg_event),
+		      (gpointer)mt);
     
     gtk_container_add (GTK_CONTAINER (mt->timeline_eb), mt->timeline);
     
@@ -8581,29 +9187,30 @@
   }
 
   if (mt->event_list!=NULL) {
-    gint last_tracks=1; // number of video tracks on timeline
+    int last_tracks=1; // number of video tracks on timeline
     int *frame_index;
     int *clip_index,*new_clip_index,*new_frame_index;
     weed_plant_t *event,*last_event=NULL,*next_frame_event;
-    gint num_tracks;
-    int tracks[65536]; // TODO - use linked list
-    double avels[65536]; // ditto
+    int num_tracks;
+    int tracks[MAX_VIDEO_TRACKS]; // TODO - use linked list
+    double avels[MAX_AUDIO_TRACKS]; // ditto
     int j,error;
     weed_timecode_t tc,last_tc;
-    gint last_valid_frame;
+    int last_valid_frame;
     weed_timecode_t offset_start;
     weed_timecode_t block_marker_tc=-1;
     int block_marker_num_tracks=0;
     int *block_marker_tracks=NULL;
-    gboolean forced_end;
+    boolean forced_end;
     weed_timecode_t block_marker_uo_tc=-1;
     int block_marker_uo_num_tracks=0;
     int *block_marker_uo_tracks=NULL;
-    gboolean ordered;
+    boolean ordered;
     int num_aclips,i;
-    int *aclips;
+    int navs,maxval;
+    int *aclips,*navals;
     double *aseeks;
-    gboolean shown_audio_warn=FALSE;
+    boolean shown_audio_warn=FALSE;
 
     GtkWidget *audio_draw;
     
@@ -8611,13 +9218,30 @@
 
     track_rect *block;
 
-    if (mt->avol_fx!=-1) locate_avol_init_event(mt,mt->event_list,mt->avol_fx);
-
-    for (j=0;j<65536;j++) {
+    for (j=0;j<MAX_TRACKS;j++) {
       tracks[j]=0;
       avels[j]=0.;
     }
 
+    if (weed_plant_has_leaf(mt->event_list,"audio_volume_tracks")) {
+      navs=weed_leaf_num_elements(mt->event_list,"audio_volume_tracks");
+      navals=weed_get_int_array(mt->event_list,"audio_volume_tracks",&error);
+      maxval=mt->num_video_tracks-1;
+
+      for (j=0;j<navs;j++) {
+	if (navals[j]>maxval) maxval=navals[j];
+      }
+
+      num_tracks=maxval+1;
+
+      if (num_tracks>mt->num_video_tracks) {
+	for (j=mt->num_video_tracks;j<num_tracks;j++) {
+	  add_video_track_behind(NULL,mt);
+	}
+      }
+    }
+
+
     // draw coloured blocks to represent the FRAME events
     event=get_first_event(mt->event_list);
     while (event!=NULL) {
@@ -8635,6 +9259,26 @@
 	  block_marker_uo_tracks=weed_get_int_array(event,"tracks",&error);
 	}
       }
+      else if (WEED_EVENT_IS_FILTER_INIT(event)) {
+	if (weed_plant_has_leaf(event,"in_tracks")) {
+	  navs=weed_leaf_num_elements(event,"in_tracks");
+	  navals=weed_get_int_array(event,"in_tracks",&error);
+	  maxval=mt->num_video_tracks-1;
+
+	  for (j=0;j<navs;j++) {
+	    if (navals[j]>maxval) maxval=navals[j];
+	  }
+
+	  num_tracks=maxval+1;
+
+	  if (num_tracks>mt->num_video_tracks) {
+	    for (j=mt->num_video_tracks;j<num_tracks;j++) {
+	      add_video_track_behind(NULL,mt);
+	    }
+	  }
+	}
+      }
+
       else if (WEED_EVENT_IS_FRAME(event)) {
 	tc=get_event_timecode (event);
 	num_tracks=weed_leaf_num_elements (event,"clips");
@@ -8671,7 +9315,7 @@
 	    if (tc==block_marker_tc&&int_array_contains_value(block_marker_tracks,block_marker_num_tracks,j)) 
 	      forced_end=TRUE;
 	    if ((tracks[j]!=renumbered_clips[clip_index[j]])||forced_end) {
-	      // handling fro block end or split blocks
+	      // handling for block end or split blocks
 	      if (tracks[j]>0) {
 		add_block_end_point (GTK_WIDGET(g_list_nth_data(mt->video_draws,j)),last_event); // end of previous rectangle
 	      }
@@ -8765,7 +9409,6 @@
 	    if (aclips[i+1]>0) aclips[i+1]=renumbered_clips[aclips[i+1]];
 	  }
 	  weed_set_int_array(event,"audio_clips",num_aclips,aclips);
-	  weed_free(aclips);
 	  weed_free(aseeks);
 	}
 
@@ -8799,7 +9442,6 @@
 	  slist=mt->audio_draws;
 	  for (j=0;j<g_list_length(mt->audio_draws);j++) {
 	    if (cfile->achans>0&&avels[j]!=0.) add_block_end_point ((GtkWidget *)slist->data,event);
-
 	    slist=slist->next;
 	  }
 	}
@@ -8813,6 +9455,8 @@
 
     if (cfile->achans>0&&mt->opts.back_audio_tracks>0) gtk_widget_show (mt->view_audio);
 
+    if (mt->avol_fx!=-1) locate_avol_init_event(mt,mt->event_list,mt->avol_fx);
+
     if (!mt->was_undo_redo&&mt->avol_fx!=-1&&mt->audio_draws!=NULL) {
       apply_avol_filter(mt);
     }
@@ -8843,7 +9487,7 @@
 	draw_region(mt);
       }
     }
-    mt_tl_move(mt,-GTK_RULER (mt->timeline)->position);
+    mt_tl_move(mt,-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
   }
   else mt->was_undo_redo=FALSE;
 
@@ -8852,7 +9496,7 @@
 }
 
 
-void delete_video_track(lives_mt *mt, gint layer, gboolean full) {
+void delete_video_track(lives_mt *mt, int layer, boolean full) {
   // WARNING - does not yet delete events from event_list
   // only deletes visually
 
@@ -8861,7 +9505,7 @@
 
   GtkWidget *checkbutton;
   GtkWidget *label,*labelbox,*ahbox,*arrow;
-  GdkPixbuf *bgimg,*st_image;
+  lives_painter_surface_t *bgimg;
 
   while (block!=NULL) {
     blocknext=block->next;
@@ -8870,12 +9514,8 @@
     block=blocknext;
   }
 
-  if ((bgimg=(GdkPixbuf *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
-    gdk_pixbuf_unref(bgimg);
-  }
-
-  if ((st_image=(GdkPixbuf *)g_object_get_data(G_OBJECT(eventbox),"backup_image"))!=NULL) {
-    g_object_unref(st_image);
+  if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
+    lives_painter_surface_destroy(bgimg);
   }
 
   checkbutton=(GtkWidget *)g_object_get_data (G_OBJECT(eventbox), "checkbutton");
@@ -8900,7 +9540,7 @@
 }
 
 
-GtkWidget *add_audio_track (lives_mt *mt, gint track, gboolean behind) {
+GtkWidget *add_audio_track (lives_mt *mt, int track, boolean behind) {
   // add float or pertrack audio track to our timeline_table
   GObject *adj;
   GtkWidget *label;
@@ -8909,22 +9549,22 @@
   GtkWidget *vbox;
   GtkWidget *audio_draw=gtk_event_box_new();
   gchar *pname,*tname;
-  gint max_disp_vtracks=mt->max_disp_vtracks-1;
-  gint llen,vol=0;
-  gint nachans=0;
+  int max_disp_vtracks=mt->max_disp_vtracks-1;
+  int llen,vol=0;
+  int nachans=0;
   int i;
 
-  gtk_widget_ref(audio_draw);
+  g_object_ref(audio_draw);
 
   g_object_set_data (G_OBJECT(audio_draw), "blocks", (gpointer)NULL);
   g_object_set_data (G_OBJECT(audio_draw), "block_last", (gpointer)NULL);
   g_object_set_data (G_OBJECT(audio_draw), "hidden", GINT_TO_POINTER(0));
   g_object_set_data (G_OBJECT(audio_draw), "expanded",GINT_TO_POINTER(FALSE));
   g_object_set_data (G_OBJECT(audio_draw), "bgimg", NULL);
-  g_object_set_data (G_OBJECT(audio_draw), "backup_image", NULL);
 
-  GTK_ADJUSTMENT(mt->vadjustment)->upper=(gdouble)mt->num_video_tracks;
-  GTK_ADJUSTMENT(mt->vadjustment)->page_size=max_disp_vtracks>mt->num_video_tracks?(gdouble)mt->num_video_tracks:(gdouble)max_disp_vtracks;
+  lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),(double)mt->num_video_tracks);
+  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),(double)(max_disp_vtracks>mt->num_video_tracks?
+									    mt->num_video_tracks:max_disp_vtracks));
 
   if (track==-1) {
     label=gtk_label_new (_(" Backing audio"));
@@ -8934,16 +9574,16 @@
     label=gtk_label_new (tmp);
     g_free(tmp);
   }
-  gtk_widget_ref(label);
+  g_object_ref(label);
 
   arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
   gtk_widget_set_tooltip_text( arrow, _("Show/hide audio details"));
-  gtk_widget_ref(arrow);
+  g_object_ref(arrow);
 
   if (palette->style&STYLE_1) {
     if (!(palette->style&STYLE_3)) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->normal_back);
+      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
     }
   }
 
@@ -8959,14 +9599,14 @@
   // add channel subtracks
   for (i=0;i<cfile->achans;i++) {
     eventbox=gtk_event_box_new();
-    gtk_widget_ref(eventbox);
+    g_object_ref(eventbox);
     pname=g_strdup_printf("achan%d",i);
     g_object_set_data(G_OBJECT(audio_draw),pname,eventbox);
     g_free(pname);
     g_object_set_data(G_OBJECT(eventbox),"owner",audio_draw);
     g_object_set_data (G_OBJECT(eventbox), "hidden", GINT_TO_POINTER(0));
     g_object_set_data (G_OBJECT(eventbox), "bgimg", NULL);
-    g_object_set_data (G_OBJECT(eventbox), "backup_image", NULL);
+    g_object_set_data (G_OBJECT(eventbox), "channel", GINT_TO_POINTER(i));
   }
 
   gtk_widget_queue_draw (mt->vpaned);
@@ -9043,7 +9683,7 @@
       if (mt->amixer!=NULL) {
 	// if mixer is open add a new track at end
 	vbox=amixer_add_channel_slider(mt,nachans-1-mt->opts.back_audio_tracks);
-	gtk_box_pack_start (GTK_BOX (mt->amixer->main_hbox), vbox, FALSE, FALSE, 10);
+	gtk_box_pack_start (GTK_BOX (mt->amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
 	gtk_widget_show_all(vbox);
       }
 
@@ -9060,7 +9700,7 @@
 	vbox=amixer_add_channel_slider(mt,0);
 
 	// pack at posn 2
-	gtk_box_pack_start (GTK_BOX (mt->amixer->main_hbox), vbox, FALSE, FALSE, 10);
+	gtk_box_pack_start (GTK_BOX (mt->amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
 	gtk_box_reorder_child(GTK_BOX(mt->amixer->main_hbox), vbox, 2);
 	gtk_widget_show_all(vbox);
 
@@ -9085,8 +9725,16 @@
 }
 
 
+static void set_track_label(GtkEventBox *xeventbox, int tnum) {
+  GtkWidget *label=GTK_WIDGET(g_object_get_data(G_OBJECT(xeventbox),"label"));
+  const gchar *tname=(const gchar *)g_object_get_data(G_OBJECT(xeventbox),"track_name");
+  gchar *newtext=g_strdup_printf(_("%s (layer %d)"),tname,tnum);
+  gtk_label_set_text(GTK_LABEL(label),newtext);
+  g_free(newtext);
+}
 
-void add_video_track (lives_mt *mt, gboolean behind) {
+
+void add_video_track (lives_mt *mt, boolean behind) {
   // add another video track to our timeline_table
   GtkWidget *label;
   GtkWidget *checkbutton;
@@ -9095,10 +9743,11 @@
   GtkWidget *aeventbox; // each track has optionally an associated audio track, which we store in GList *audio_draws
   int i;
   GList *liste;
-  gint max_disp_vtracks=mt->max_disp_vtracks;
+  int max_disp_vtracks=mt->max_disp_vtracks;
   gchar *tmp;
 
-  if (mt->audio_draws!=NULL&&mt->audio_draws->data!=NULL&&mt->opts.back_audio_tracks>0&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
+  if (mt->audio_draws!=NULL&&mt->audio_draws->data!=NULL&&mt->opts.back_audio_tracks>0&&
+      GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
     max_disp_vtracks--;
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"expanded"))) max_disp_vtracks-=cfile->achans;
   }
@@ -9116,15 +9765,18 @@
     giw_led_enable_mouse(GIW_LED(checkbutton),TRUE);
   }
 #endif
-  gtk_widget_ref(checkbutton);
-  gtk_widget_set_tooltip_text( checkbutton, _("Select track"));
+  g_object_ref(checkbutton);
+
+  if (LIVES_IS_WIDGET(checkbutton)) {
+    gtk_widget_set_tooltip_text( checkbutton, _("Select track"));
+  }
 
   arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
   gtk_widget_set_tooltip_text( arrow, _("Show/hide audio"));
-  gtk_widget_ref(arrow);
+  g_object_ref(arrow);
 
   eventbox=gtk_event_box_new();
-  gtk_widget_ref(eventbox);
+  g_object_ref(eventbox);
 
   g_object_set_data (G_OBJECT(eventbox),"track_name",g_strdup_printf(_("Video %d"),mt->num_video_tracks));
   g_object_set_data (G_OBJECT(eventbox),"checkbutton",(gpointer)checkbutton);
@@ -9135,10 +9787,11 @@
   g_object_set_data (G_OBJECT(eventbox), "block_last", (gpointer)NULL);
   g_object_set_data (G_OBJECT(eventbox), "hidden", GINT_TO_POINTER(0));
   g_object_set_data (G_OBJECT(eventbox), "bgimg", NULL);
-  g_object_set_data (G_OBJECT(eventbox), "backup_image", NULL);
 
-  GTK_ADJUSTMENT(mt->vadjustment)->page_size=max_disp_vtracks>mt->num_video_tracks?(gdouble)mt->num_video_tracks:(gdouble)max_disp_vtracks;
-  GTK_ADJUSTMENT(mt->vadjustment)->upper=(gdouble)mt->num_video_tracks+GTK_ADJUSTMENT(mt->vadjustment)->page_size;
+  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),(double)(max_disp_vtracks>mt->num_video_tracks?
+									    mt->num_video_tracks:max_disp_vtracks));
+  lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),(double)(mt->num_video_tracks+
+									(int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))));
 
   if (!behind) {
     // track in front of (above) stack
@@ -9153,9 +9806,10 @@
       g_object_set_data (G_OBJECT(xeventbox),"layer_number",GINT_TO_POINTER(i+1));
       g_object_set_data (G_OBJECT(xcheckbutton),"layer_number",GINT_TO_POINTER(i+1));
       g_object_set_data (G_OBJECT(xarrow),"layer_number",GINT_TO_POINTER(i+1));
-      label=GTK_WIDGET(g_object_get_data(G_OBJECT(xeventbox),"label"));
-      newtext=g_strdup_printf(_("%s (layer %d)"),g_object_get_data(G_OBJECT(xeventbox),"track_name"),i+1);
-      gtk_label_set_text(GTK_LABEL(label),newtext);
+
+
+      set_track_label(GTK_EVENT_BOX(xeventbox),i+1);
+
       if (mt->opts.pertrack_audio) {
 	GtkWidget *aeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(xeventbox),"atrack");
 	g_object_set_data (G_OBJECT(aeventbox),"layer_number",GINT_TO_POINTER(i+1));
@@ -9190,14 +9844,15 @@
     mt->current_track=mt->num_video_tracks-1;
   }
 
-  label=gtk_label_new ((tmp=g_strdup_printf(_("%s (layer %d)"),g_object_get_data (G_OBJECT(eventbox),"track_name"),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number")))));
+  label=gtk_label_new ((tmp=g_strdup_printf(_("%s (layer %d)"),g_object_get_data (G_OBJECT(eventbox),"track_name"),
+					    GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number")))));
   g_free(tmp);
-  gtk_widget_ref(label);
+  g_object_ref(label);
 
   if (palette->style&STYLE_1) {
     if (!(palette->style&STYLE_3)) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->normal_back);
+      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
     }
   }
 
@@ -9209,8 +9864,12 @@
     aeventbox=add_audio_track(mt,mt->current_track,behind);
     g_object_set_data (G_OBJECT(aeventbox),"owner",eventbox);
     g_object_set_data (G_OBJECT(eventbox),"atrack",aeventbox);
-  }
 
+    if (mt->avol_init_event!=NULL) {
+      weed_plant_t *filter=get_weed_filter(mt->avol_fx);
+      add_track_to_avol_init(filter,mt->avol_init_event,mt->opts.back_audio_tracks,behind);
+    }
+  }
   if (!behind) scroll_track_on_screen(mt,0);
   else scroll_track_on_screen(mt,mt->num_video_tracks-1);
 
@@ -9242,12 +9901,21 @@
   gtk_widget_set_sensitive(mt->apply_fx_button,FALSE);
 }
 
-void mt_avol_quick(GtkMenuItem *menuitem, gpointer user_data) {
+static boolean mt_fx_edit_idle (gpointer user_data) {
+  on_mt_fx_edit_activate(NULL,user_data);
+  return FALSE;
+}
+
+static void mt_avol_quick(GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->selected_init_event=mt->avol_init_event;
   on_mt_fx_edit_activate(menuitem,user_data);
 }
 
+static void rdrw_cb(GtkMenuItem *menuitem, gpointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
+  redraw_all_event_boxes(mt);
+}
 
 void do_effect_context (lives_mt *mt, GdkEventButton *event) {
   // pop up a context menu when a selected block is right clicked on
@@ -9256,13 +9924,22 @@
   GtkWidget *delete_effect;
   GtkWidget *menu=gtk_menu_new();
 
+  weed_plant_t *filter;
+  gchar *fhash;
+
+  int error;
+
   gtk_menu_set_title (GTK_MENU(menu),_("LiVES: Selected effect"));
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
-  
-  if (weed_plant_has_leaf(mt->selected_init_event,"in_parameters")) {
+
+  fhash=weed_get_string_value(mt->selected_init_event,"filter",&error);
+  filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
+  weed_free(fhash);
+
+  if (num_in_params(filter,TRUE,TRUE)>0) {
     edit_effect = gtk_menu_item_new_with_mnemonic (_("_View/Edit this effect"));
   }
   else {
@@ -9291,7 +9968,7 @@
 
 
 
-static gboolean
+static boolean
 fx_ebox_pressed (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   GList *children;
@@ -9304,7 +9981,9 @@
   if (event->type==GDK_2BUTTON_PRESS) {
     // double click
     mt->moving_fx=NULL;
-    if (mainw->playing_file==-1) on_mt_fx_edit_activate(NULL,mt);
+    if (mainw->playing_file==-1) {
+      g_idle_add_full(G_PRIORITY_LOW,mt_fx_edit_idle,mt,NULL); // work around bug in gtk+
+    }
     return FALSE;
   }
 
@@ -9372,8 +10051,8 @@
   children=gtk_container_get_children(GTK_CONTAINER(mt->fx_list_vbox));
   while (children!=NULL) {
     GtkWidget *child=(GtkWidget *)children->data;
-    if (child!=eventbox) gtk_widget_set_state(child,GTK_STATE_NORMAL);
-    else gtk_widget_set_state(child,GTK_STATE_SELECTED);
+    if (child!=eventbox) lives_widget_set_state(child,LIVES_WIDGET_STATE_NORMAL);
+    else lives_widget_set_state(child,LIVES_WIDGET_STATE_PRELIGHT);
     children=children->next;
   }
 
@@ -9387,7 +10066,7 @@
 
 
 
-static void set_clip_labels_variable(lives_mt *mt, gint i) {
+static void set_clip_labels_variable(lives_mt *mt, int i) {
   gchar *tmp;
   GtkLabel *label1,*label2;
   file *sfile=mainw->files[i];
@@ -9464,13 +10143,16 @@
 
 
 
-void mt_delete_clips(lives_mt *mt, gint file) {
+void mt_delete_clips(lives_mt *mt, int file) {
   // close eventbox(es) for a given file
-  GList *list=GTK_BOX (mt->clip_inner_box)->children,*list_next;
-  GtkBoxChild *child;
+  GList *list=gtk_container_get_children(GTK_CONTAINER (mt->clip_inner_box)),*list_next;
+
+  GtkWidget *child;
   GtkWidget *label1,*label2;
-  gint neg=0,i=0;
-  gboolean removed=FALSE;
+
+  int neg=0,i=0;
+
+  boolean removed=FALSE;
 
   while (list!=NULL) {
     list_next=list->next;
@@ -9480,8 +10162,8 @@
       if (list->prev!=NULL) list->prev->next=list->next;
       if (list->next!=NULL) list->next->prev=list->prev;
 
-      child=(GtkBoxChild *)list->data;
-      gtk_widget_destroy(child->widget);
+      child=(GtkWidget *)list->data;
+      gtk_widget_destroy(child);
 
       label1=(GtkWidget *)g_list_nth_data(mt->clip_labels,i*2);
       label2=(GtkWidget *)g_list_nth_data(mt->clip_labels,i*2+1);
@@ -9489,12 +10171,7 @@
       mt->clip_labels=g_list_remove(mt->clip_labels,label1);
       mt->clip_labels=g_list_remove(mt->clip_labels,label2);
 
-      if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
-      while (g_main_context_iteration(NULL,FALSE));
-      if (mt->idlefunc>0) {
-	mt->idlefunc=0;
-	mt->idlefunc=mt_idle_add(mt);
-      }
+      lives_widget_context_update();
 
       neg++;
     }
@@ -9504,7 +10181,7 @@
   }
 
   if (mt->event_list!=NULL&&used_in_current_layout(mt,file)&&removed) {
-    gint current_file=mainw->current_file;
+    int current_file=mainw->current_file;
 
     if (!event_list_rectify(mt,mt->event_list)||get_first_event(mt->event_list)==NULL) {
       // delete the current layout
@@ -9532,7 +10209,7 @@
 
 
 
-void mt_init_clips (lives_mt *mt, gint orig_file, gboolean add) {
+void mt_init_clips (lives_mt *mt, int orig_file, boolean add) {
   // setup clip boxes in the poly window. if add is TRUE then we are just adding a new clip
   // orig_file is the file we want to select
 
@@ -9542,14 +10219,18 @@
   GtkWidget *thumb_image=NULL;
   GtkWidget *vbox, *label;
   GtkWidget *eventbox;
-  gchar clip_name[CLIP_LABEL_LENGTH];
+
   GdkPixbuf *thumbnail;
-  int i=1;
-  gint width=CLIP_THUMB_WIDTH,height=CLIP_THUMB_HEIGHT;
+
+  GList *cliplist=mainw->cliplist;
+
   gchar filename[PATH_MAX];
+  gchar clip_name[CLIP_LABEL_LENGTH];
   gchar *tmp;
+
+  int i=1;
+  int width=CLIP_THUMB_WIDTH,height=CLIP_THUMB_HEIGHT;
   int count=g_list_length(mt->clip_labels)/2;
-  GList *cliplist=mainw->cliplist;
 
   mt->clip_selected=-1;
 
@@ -9578,24 +10259,24 @@
       eventbox=gtk_event_box_new();
       if (palette->style&STYLE_1) {
 	if (palette->style&STYLE_3) {
-	  gtk_widget_modify_bg (eventbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
+	  lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
 	}
-	else gtk_widget_modify_bg (eventbox, GTK_STATE_SELECTED, &palette->normal_back);
+	else lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
       }
       gtk_widget_add_events (eventbox, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY);
       g_signal_connect (GTK_OBJECT(eventbox), "enter-notify-event",G_CALLBACK (on_clipbox_enter),(gpointer)mt);
 
       clips_to_files[count]=i;
 
-      vbox = gtk_vbox_new (FALSE, 6);
+      vbox = lives_vbox_new (FALSE, 6.*widget_opts.scale);
 
       thumb_image=gtk_image_new();
       gtk_image_set_from_pixbuf(GTK_IMAGE(thumb_image),thumbnail);
-      if (thumbnail!=NULL) gdk_pixbuf_unref(thumbnail);
+      if (thumbnail!=NULL) lives_object_unref(thumbnail);
       gtk_container_add (GTK_CONTAINER (eventbox), vbox);
       gtk_box_pack_start (GTK_BOX (mt->clip_inner_box), eventbox, FALSE, FALSE, 0);
       if (palette->style&STYLE_4) {
-	gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+	lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       }
 
       g_snprintf (filename,PATH_MAX,"%s",(tmp=g_path_get_basename(mainw->files[i]->name)));
@@ -9603,8 +10284,8 @@
       get_basename(filename);
       g_snprintf (clip_name,CLIP_LABEL_LENGTH,"  %s  ",filename);
       label=gtk_label_new (clip_name);
-      if (palette->style&STYLE_3) gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-      if (palette->style&STYLE_4) gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+      if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+      if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox), thumb_image, FALSE, FALSE, 0);
       
@@ -9612,40 +10293,40 @@
 	gchar *tmp;
 	label=gtk_label_new ((tmp=g_strdup_printf (_("%d frames"),mainw->files[i]->frames)));
 	g_free(tmp);
-	if (palette->style&STYLE_3) gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	if (palette->style&STYLE_4) gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
 	label=gtk_label_new ("");
 	mt->clip_labels=g_list_append(mt->clip_labels,label);
 
-	if (palette->style&STYLE_3) gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	if (palette->style&STYLE_4) gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
 	label=gtk_label_new ("");
 	mt->clip_labels=g_list_append(mt->clip_labels,label);
 
-	if (palette->style&STYLE_3) gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	if (palette->style&STYLE_4) gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
 	set_clip_labels_variable(mt,i);
       }
       else {
 	label=gtk_label_new (g_strdup (_("audio only")));
-	if (palette->style&STYLE_3) gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	if (palette->style&STYLE_4) gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 	mt->clip_labels=g_list_append(mt->clip_labels,label);
 
 	label=gtk_label_new (g_strdup_printf (_("%.2f sec."),mainw->files[i]->laudio_time));
-	if (palette->style&STYLE_3) gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
-	if (palette->style&STYLE_4) gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 	mt->clip_labels=g_list_append(mt->clip_labels,label);
       }
-      
+
       count++;
       
       g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
@@ -9665,13 +10346,54 @@
 }
 
 
-gboolean on_multitrack_activate (GtkMenuItem *menuitem, weed_plant_t *event_list) {
+static void set_audio_mixer_vols(lives_mt *mt, weed_plant_t *elist) {
+  int natracks,navols;
+  int *atracks;
+  double *avols;
+  int catracks=g_list_length(mt->audio_vols);
+  int error,i,xtrack,xavol;
+
+  if (!weed_plant_has_leaf(elist,"audio_volume_tracks")||!weed_plant_has_leaf(elist,"audio_volume_values")) return;
+
+  natracks=weed_leaf_num_elements(elist,"audio_volume_tracks");
+  navols=weed_leaf_num_elements(elist,"audio_volume_values");
+
+  atracks=weed_get_int_array(elist,"audio_volume_tracks",&error);
+  if (error!=WEED_NO_ERROR) return;
+
+  avols=weed_get_double_array(elist,"audio_volume_values",&error);
+  if (error!=WEED_NO_ERROR) {
+    weed_free(atracks);
+    return;
+  }
+
+  for (i=0;i<natracks;i++) {
+    xtrack=atracks[i];
+    if (xtrack<-mt->opts.back_audio_tracks) continue;
+    if (xtrack>=catracks-mt->opts.back_audio_tracks) continue;
+
+    xavol=i;
+    if (xavol>=navols) {
+      mt->opts.gang_audio=TRUE;
+      xavol=navols-1;
+    }
+    set_mixer_track_vol(mt,xtrack+mt->opts.back_audio_tracks,avols[xavol]);
+  }
+
+  weed_free(atracks);
+  weed_free(avols);
+}
+
+
+
+boolean on_multitrack_activate (GtkMenuItem *menuitem, weed_plant_t *event_list) {
   //returns TRUE if we go into mt mode
-  gint orig_file;
-  gboolean response;
-  gboolean transfer_focus=FALSE;
+  int orig_file;
+  boolean response;
+  boolean transfer_focus=FALSE;
+#ifdef ENABLE_OSC
   gchar *tmp;
-
+#endif
   lives_mt *multi;
 
   xachans=xarate=xasamps=xse=0;
@@ -9682,6 +10404,7 @@
   mainw->frame_layer=NULL;
 
   if (prefs->mt_enter_prompt&&mainw->stored_event_list==NULL&&prefs->show_gui&&!(mainw->recoverable_layout&&prefs->startup_interface==STARTUP_CE)) {
+    if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
     rdet=create_render_details(3);  // WARNING !! - rdet is global in events.h
     rdet->enc_changed=FALSE;
     gtk_widget_show_all(rdet->always_hbox);
@@ -9689,31 +10412,31 @@
       rdet->suggestion_followed=FALSE;
       if ((response=gtk_dialog_run(GTK_DIALOG(rdet->dialog)))==GTK_RESPONSE_OK) {
 	if (rdet->enc_changed) {
-	  check_encoder_restrictions(FALSE,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton)),TRUE);
+	  check_encoder_restrictions(FALSE,lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)),TRUE);
 	}
       }
     } while (rdet->suggestion_followed);
 
-    xarate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-    xachans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-    xasamps=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+    xarate=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+    xachans=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+    xasamps=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
     
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       xse=AFORM_UNSIGNED;;
     }
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
       xse|=AFORM_BIG_ENDIAN;
     }
 
-    if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton))) {
+    if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))) {
       xachans=0;
     }
 
-    ptaud=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rdet->pertrack_checkbutton));
-    btaud=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rdet->backaudio_checkbutton));
+    ptaud=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rdet->pertrack_checkbutton));
+    btaud=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton));
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rdet->always_checkbutton))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rdet->always_checkbutton))) {
       prefs->mt_enter_prompt=FALSE;
       set_boolean_pref("mt_enter_prompt",prefs->mt_enter_prompt);
       prefs->mt_def_width=rdet->width;
@@ -9760,7 +10483,7 @@
   }
 
   if (prefs->show_gui) {
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
   }
 
   // create new file for rendering to
@@ -9816,6 +10539,7 @@
 
   if (prefs->show_gui) block_expose();
 
+  if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
   multi=multitrack(event_list,orig_file,cfile->fps);
 
   if (mainw->stored_event_list!=NULL) {
@@ -9830,6 +10554,10 @@
       return FALSE;
     }
     remove_markers(multi->event_list);
+    set_audio_mixer_vols(multi,multi->event_list);
+    snprintf(multi->layout_name,256,"%s",mainw->stored_layout_name);
+    multi->changed=mainw->stored_event_list_changed;
+    multi->auto_changed=mainw->stored_event_list_auto_changed;
   }
 
   if (mainw->recoverable_layout&&multi->event_list==NULL&&prefs->startup_interface==STARTUP_CE) {
@@ -9853,7 +10581,6 @@
       gtk_widget_hide(mainw->custom_gens_menu);
       gtk_widget_hide(mainw->custom_gens_submenu);
     }
-    gtk_widget_hide (mainw->LiVES);
   }
 
   gtk_widget_hide(multi->aparam_separator); // no longer used
@@ -9872,7 +10599,7 @@
 
   if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
     gtk_widget_hide(mainw->vol_toolitem);
-    gtk_widget_hide(mainw->vol_label);
+    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
   }
 
   if (!multi->opts.show_ctx) {
@@ -9882,7 +10609,6 @@
   }
 
   if (!multi->opts.pertrack_audio) {
-    gtk_widget_hide(multi->insa_eventbox);
     gtk_widget_hide(multi->insa_checkbutton);
   }
 
@@ -9893,7 +10619,7 @@
   track_select(multi);
   mt_clip_select(multi,TRUE);  // call this again to scroll clip on screen
 
-  if (mainw->preview_box!=NULL&&mainw->preview_box->parent!=NULL) {
+  if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
     g_object_unref(mainw->preview_box);
     gtk_container_remove (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
     mainw->preview_box=NULL;
@@ -9901,10 +10627,7 @@
 
   if (mainw->play_window!=NULL) {
     gchar *title,*xtrabit;
-    g_signal_handlers_block_matched(mainw->play_window,(GSignalMatchType)(G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_UNBLOCKED),
-				    0,0,0,(gpointer)expose_play_window,NULL);
-    g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=FALSE;
+
     gtk_window_remove_accel_group (GTK_WINDOW (mainw->play_window), mainw->accel_group);
     gtk_window_add_accel_group (GTK_WINDOW (mainw->play_window), multi->accel_group);
 
@@ -9918,6 +10641,7 @@
 
 
   }
+
   d_print (_ ("\n==============================\nSwitched to Multitrack mode\n"));
 
 
@@ -9926,8 +10650,10 @@
   }
 
   if (prefs->gui_monitor!=0) {
-    gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-multi->window->allocation.width)/2;
-    gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-multi->window->allocation.height)/2;
+    int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
+						    lives_widget_get_allocation_width(multi->window))/2;
+    int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
+						    lives_widget_get_allocation_height(multi->window))/2;
     gtk_window_set_screen(GTK_WINDOW(multi->window),mainw->mgeom[prefs->gui_monitor-1].screen);
     gtk_window_move(GTK_WINDOW(multi->window),xcen,ycen);
   }
@@ -9943,10 +10669,6 @@
 
   if (transfer_focus) gtk_window_present(GTK_WINDOW(multi->window));
 
-  if (multi->idlefunc==0) {
-    multi->idlefunc=mt_idle_add(multi);
-  }
-
   mainw_was_ready=mainw->is_ready;
   mainw->is_ready=TRUE;
 
@@ -9955,11 +10677,26 @@
   g_free(tmp);
 #endif
 
+  multi->no_expose=FALSE;
+
+  if (prefs->show_gui)
+    gtk_widget_hide (mainw->LiVES);
+  
+  lives_widget_context_update();
+
+  redraw_all_event_boxes(multi);
+
+  // this must be done right at the end
+  // it slows down every single call to g_main_context_iteration - therefore it should be disabled before calling that
+  if (multi->idlefunc==0) {
+    multi->idlefunc=mt_idle_add(multi);
+  }
+
   return TRUE;
 }
 
 
-gboolean block_overlap (GtkWidget *eventbox, gdouble time_start, gdouble time_end) {
+boolean block_overlap (GtkWidget *eventbox, double time_start, double time_end) {
   weed_timecode_t tc_start=time_start*U_SECL;
   weed_timecode_t tc_end=time_end*U_SECL;
   track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
@@ -9975,7 +10712,7 @@
 
 
 
-static track_rect *get_block_before (GtkWidget *eventbox, gdouble time, gboolean allow_cur) {
+static track_rect *get_block_before (GtkWidget *eventbox, double time, boolean allow_cur) {
   // get the last block which ends before or at time
   // if allow_cur is TRUE, we may count blocks whose end is after "time" but whose start is 
   // before or at time
@@ -9991,7 +10728,7 @@
   return last_block;
 }
 
-static track_rect *get_block_after (GtkWidget *eventbox, gdouble time, gboolean allow_cur) {
+static track_rect *get_block_after (GtkWidget *eventbox, double time, boolean allow_cur) {
   // return the first block which starts at or after time
   // if allow_cur is TRUE, we may count blocks whose end is after "time" but whose start is 
   // before or at time
@@ -10007,12 +10744,12 @@
 }
 
 
-static track_rect *move_block (lives_mt *mt, track_rect *block, gdouble timesecs, gint old_track, gint new_track) {
+static track_rect *move_block (lives_mt *mt, track_rect *block, double timesecs, int old_track, int new_track) {
   weed_timecode_t new_start_tc,end_tc;
   weed_timecode_t start_tc=get_event_timecode(block->start_event);
   GtkWidget *eventbox,*oeventbox;
-  gint clip,current_track=-1;
-  gboolean did_backup=mt->did_backup;
+  int clip,current_track=-1;
+  boolean did_backup=mt->did_backup;
 
   if (!did_backup&&mt->idlefunc>0) {
     g_source_remove(mt->idlefunc);
@@ -10057,7 +10794,7 @@
   track_select(mt);
   mt->clip_selected=mt_clip_from_file(mt,clip);
   mt_clip_select(mt,TRUE);
-  mt_tl_move(mt,timesecs-GTK_RULER (mt->timeline)->position);
+  mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 
   if (new_track!=-1) insert_here_cb(NULL,(gpointer)mt);
   else {
@@ -10079,11 +10816,11 @@
   remove_end_blank_frames(mt->event_list);
 
   if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||(mt->opts.grav_mode==GRAV_MODE_RIGHT&&block->next!=NULL))&&!did_backup) {
-    gdouble oldr_start=mt->region_start;
-    gdouble oldr_end=mt->region_end;
+    double oldr_start=mt->region_start;
+    double oldr_end=mt->region_end;
     GList *tracks_sel=NULL;
     track_rect *lblock;
-    gdouble rtc=get_event_timecode(block->start_event)/U_SEC-1./mt->fps,rstart=0.,rend;
+    double rtc=get_event_timecode(block->start_event)/U_SEC-1./mt->fps,rstart=0.,rend;
 
     if (mt->opts.grav_mode==GRAV_MODE_LEFT) {
       // gravity left - move left until we hit another block or time 0
@@ -10130,15 +10867,18 @@
   block = (track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
 
   if (!did_backup) {
-    if (mt->avol_fx!=-1&&(block==NULL||block->next==NULL)&&mt->audio_draws!=NULL&&mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
+    if (mt->avol_fx!=-1&&(block==NULL||block->next==NULL)&&mt->audio_draws!=NULL&&
+	mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
       apply_avol_filter(mt);
     }
   }
 
   mt->did_backup=did_backup;
 
-  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
-    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
+  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
+      mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
+    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+
+				get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
@@ -10183,7 +10923,9 @@
   gtk_widget_set_sensitive(mt->view_in_out,FALSE);
   gtk_widget_set_sensitive (mt->delblock, FALSE);
   gtk_widget_set_sensitive (mt->fx_block, FALSE);
-  if (mt->poly_state!=POLY_FX_STACK) polymorph (mt,POLY_CLIPS);
+  gtk_widget_set_sensitive (mt->fx_blocka, FALSE);
+  gtk_widget_set_sensitive (mt->fx_blockv, FALSE);
+  if (!nb_ignore&&mt->poly_state!=POLY_FX_STACK) polymorph (mt,POLY_CLIPS);
 }
 
 
@@ -10199,17 +10941,17 @@
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mt->context_scroll), GTK_POLICY_AUTOMATIC, 
 				  GTK_POLICY_AUTOMATIC);
   
-  mt->context_box = gtk_vbox_new (FALSE, 4);
+  mt->context_box = lives_vbox_new (FALSE, 4);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mt->context_box, GTK_STATE_NORMAL, &palette->info_base);
+    lives_widget_set_bg_color(mt->context_box, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
   }
 
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (mt->context_scroll), mt->context_box);
 
   // Apply theme background to scrolled window
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(mt->context_scroll)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(mt->context_scroll)->child, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(lives_bin_get_child(LIVES_BIN(mt->context_scroll)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(mt->context_scroll)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
   if (mt->opts.show_ctx) gtk_widget_show_all (mt->context_frame);
@@ -10219,20 +10961,22 @@
 void add_context_label (lives_mt *mt, const gchar *text) {
   // WARNING - do not add > 8 lines of text (including newlines) - otherwise the window can get resized
 
-  GtkWidget *label=gtk_label_new (text);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+  GtkWidget *label;
+
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  widget_opts.line_wrap=TRUE;
+  label=lives_standard_label_new (text);
+  widget_opts.line_wrap=FALSE;
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
+
   gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (mt->context_box), label, FALSE, FALSE, 0);
 }
 
 
 
-gboolean resize_timeline (lives_mt *mt) {
-  gdouble end_secs;
+boolean resize_timeline (lives_mt *mt) {
+  double end_secs;
 
   if (mt->event_list==NULL||get_first_event(mt->event_list)==NULL||mt->tl_fixed_length>0.) return FALSE;
 
@@ -10254,19 +10998,19 @@
   track_rect *block=mt->block_selected;
   weed_timecode_t min_tc=0,max_tc=-1;
   weed_timecode_t offset_start=get_event_timecode(block->start_event);
-  gint filenum;
-  gdouble in_val=start_tc/U_SEC,out_val=end_tc/U_SEC,in_start_range=0.,out_start_range=in_val+1./mt->fps;
-  gdouble out_end_range,real_out_end_range;
-  gdouble in_end_range=out_val-1./mt->fps,real_in_start_range=in_start_range;
-  gdouble avel=1.;
+  int filenum;
+  double in_val=start_tc/U_SEC,out_val=end_tc/U_SEC,in_start_range=0.,out_start_range=in_val+1./mt->fps;
+  double out_end_range,real_out_end_range;
+  double in_end_range=out_val-1./mt->fps,real_in_start_range=in_start_range;
+  double avel=1.;
 
-  gint track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
 
   g_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
   g_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
 
-  if (block->prev!=NULL) min_tc=get_event_timecode(block->prev->end_event)+(gdouble)(track>=0)*U_SEC/mt->fps;
-  if (block->next!=NULL) max_tc=get_event_timecode(block->next->start_event)-(gdouble)(track>=0)*U_SEC/mt->fps;
+  if (block->prev!=NULL) min_tc=get_event_timecode(block->prev->end_event)+(double)(track>=0)*U_SEC/mt->fps;
+  if (block->next!=NULL) max_tc=get_event_timecode(block->next->start_event)-(double)(track>=0)*U_SEC/mt->fps;
 
   if (track>=0) {
     filenum=get_frame_event_clip(block->start_event,track);
@@ -10283,8 +11027,10 @@
   real_out_end_range=out_end_range;
 
   if (mt->opts.insert_mode!=INSERT_MODE_OVERWRITE) {
-    if (!block->end_anchored&&max_tc>-1&&(((max_tc-offset_start)/U_SEC*ABS(avel)+in_val)<out_end_range)) real_out_end_range=q_gint64((max_tc-offset_start)*ABS(avel)+in_val*U_SEC,mt->fps)/U_SEC;
-    if (!block->start_anchored&&min_tc>-1&&(((min_tc-offset_start)/U_SEC*ABS(avel)+in_val)>in_start_range)) real_in_start_range=q_gint64((min_tc-offset_start)*ABS(avel)+in_val*U_SEC,mt->fps)/U_SEC;
+    if (!block->end_anchored&&max_tc>-1&&(((max_tc-offset_start)/U_SEC*ABS(avel)+in_val)<out_end_range)) 
+      real_out_end_range=q_gint64((max_tc-offset_start)*ABS(avel)+in_val*U_SEC,mt->fps)/U_SEC;
+    if (!block->start_anchored&&min_tc>-1&&(((min_tc-offset_start)/U_SEC*ABS(avel)+in_val)>in_start_range)) 
+      real_in_start_range=q_gint64((min_tc-offset_start)*ABS(avel)+in_val*U_SEC,mt->fps)/U_SEC;
     if (!block->start_anchored) out_end_range=real_out_end_range; 
     if (!block->end_anchored) in_start_range=real_in_start_range; 
   }
@@ -10309,11 +11055,11 @@
 static void update_in_image(lives_mt *mt) {
   GdkPixbuf *thumb;
   track_rect *block=mt->block_selected;
-  gint track;
-  gint filenum;
-  gint frame_start;
-  gint width=cfile->hsize;
-  gint height=cfile->vsize;
+  int track;
+  int filenum;
+  int frame_start;
+  int width=cfile->hsize;
+  int height=cfile->vsize;
 
   if (block!=NULL) {
     track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
@@ -10325,23 +11071,23 @@
     frame_start=mainw->files[filenum]->start;
   }
 
-  calc_maxspect(mt->poly_box->allocation.width/2-IN_OUT_SEP,mt->poly_box->allocation.height-
-		((block==NULL||block->ordered)?mainw->spinbutton_start->allocation.height:0),&width,&height);
+  calc_maxspect(lives_widget_get_allocation_width(mt->poly_box)/2-widget_opts.packing_width,lives_widget_get_allocation_height(mt->poly_box)-
+		((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_start):0),&width,&height);
 
   thumb=make_thumb(mt,filenum,width,height,frame_start,FALSE);
   gtk_image_set_from_pixbuf (GTK_IMAGE(mt->in_image),thumb);
-  if (thumb!=NULL) gdk_pixbuf_unref(thumb);
+  if (thumb!=NULL) lives_object_unref(thumb);
 }
 
 
 static void update_out_image(lives_mt *mt, weed_timecode_t end_tc) {
   GdkPixbuf *thumb;
   track_rect *block=mt->block_selected;
-  gint track;
-  gint filenum;
-  gint frame_end;
-  gint width=cfile->hsize;
-  gint height=cfile->vsize;
+  int track;
+  int filenum;
+  int frame_end;
+  int width=cfile->hsize;
+  int height=cfile->vsize;
   
   if (block!=NULL) {
     track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
@@ -10353,34 +11099,33 @@
     frame_end=mainw->files[filenum]->end;
   }
 
-  calc_maxspect(mt->poly_box->allocation.width/2-IN_OUT_SEP,mt->poly_box->allocation.height-
-		((block==NULL||block->ordered)?mainw->spinbutton_start->allocation.height:0),&width,&height);
+  calc_maxspect(lives_widget_get_allocation_width(mt->poly_box)/2-widget_opts.packing_width,lives_widget_get_allocation_height(mt->poly_box)-
+		((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_end):0),&width,&height);
 
   thumb=make_thumb(mt,filenum,width,height,frame_end,FALSE);
   gtk_image_set_from_pixbuf (GTK_IMAGE(mt->out_image),thumb);
-  if (thumb!=NULL) gdk_pixbuf_unref(thumb);
+  if (thumb!=NULL) lives_object_unref(thumb);
 }
 
 
 
 
-void
-in_out_start_changed (GtkWidget *widget, gpointer user_data) {
+void in_out_start_changed (GtkWidget *widget, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected,*ablock=NULL;
-  gdouble new_start;
+  double new_start;
   weed_plant_t *event;
   weed_timecode_t new_start_tc,orig_start_tc,offset_end,tl_start;
-  gint track;
-  gint filenum;
+  int track;
+  int filenum;
   weed_plant_t *start_event=NULL,*event_next;
-  gboolean was_moved;
+  boolean was_moved;
   weed_timecode_t new_tl_tc;
 
   int aclip=0;
   double avel=1.,aseek=0.;
 
-  gboolean start_anchored;
+  boolean start_anchored;
 
   if (block==NULL) {
     file *sfile=mainw->files[mt->file_selected];
@@ -10388,7 +11133,7 @@
     set_clip_labels_variable(mt,mt->file_selected);
     update_in_image(mt);
 
-    if (sfile->end<sfile->start) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_out),(gdouble)sfile->start);
+    if (sfile->end<sfile->start) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_out),(double)sfile->start);
     return;
   }
 
@@ -10509,14 +11254,18 @@
 	remove_audio_for_track(ablock->start_event,track);
 
 	aseek+=(new_start_tc-ablock->offset_start)/U_SEC;
-	ablock->start_event=get_frame_event_at_or_before(mt->event_list,q_gint64(tl_start+(new_start_tc-ablock->offset_start)/avel,mt->fps),get_prev_frame_event(ablock->start_event));
+	ablock->start_event=get_frame_event_at_or_before(mt->event_list,
+							 q_gint64(tl_start+(new_start_tc-ablock->offset_start)/avel,mt->fps),
+							 get_prev_frame_event(ablock->start_event));
 	insert_audio_event_at(mt->event_list,ablock->start_event,track,aclip,aseek,avel);
 	ablock->offset_start=aseek*U_SEC;
       }
       if (block!=ablock) {
 	// do an insert from offset_start down
 	insert_frames (filenum,block->offset_start,new_start_tc,tl_start,DIRECTION_NEGATIVE,block->eventbox,mt,block);
-	block->start_event=get_frame_event_at_or_before(mt->event_list,q_gint64(tl_start+new_start_tc-block->offset_start,mt->fps),get_prev_frame_event(block->start_event));
+	block->start_event=get_frame_event_at_or_before(mt->event_list,
+							q_gint64(tl_start+new_start_tc-block->offset_start,mt->fps),
+							get_prev_frame_event(block->start_event));
 	block->offset_start=new_start_tc;
       }
 
@@ -10547,7 +11296,8 @@
   else {
     // start is anchored, do a re-insert from start to end
     lives_mt_insert_mode_t insert_mode=mt->opts.insert_mode;
-    offset_end=q_gint64((block->offset_start=new_start_tc)+(weed_timecode_t)(U_SEC/mt->fps)+(get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
+    offset_end=q_gint64((block->offset_start=new_start_tc)+(weed_timecode_t)(U_SEC/mt->fps)+
+			(get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
     mt->opts.insert_mode=INSERT_MODE_OVERWRITE;
     if (track>=0) insert_frames (filenum,new_start_tc,offset_end,tl_start,DIRECTION_POSITIVE,block->eventbox,mt,block);
     if (ablock!=NULL) {
@@ -10561,7 +11311,8 @@
   }
 
   new_start_tc=block->offset_start;
-  offset_end=(new_start_tc=block->offset_start)+(weed_timecode_t)((gdouble)(track>=0)*U_SEC/mt->fps)+avel*(get_event_timecode(block->end_event)-get_event_timecode(block->start_event));
+  offset_end=(new_start_tc=block->offset_start)+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
+    avel*(get_event_timecode(block->end_event)-get_event_timecode(block->start_event));
 
   if (mt->poly_state==POLY_IN_OUT) {
     g_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
@@ -10569,6 +11320,8 @@
     set_in_out_spin_ranges(mt,new_start_tc,offset_end);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_out),offset_end/U_SEC);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_in),new_start_tc/U_SEC);
+    gtk_spin_button_update(GTK_SPIN_BUTTON(mt->spinbutton_out));
+    gtk_spin_button_update(GTK_SPIN_BUTTON(mt->spinbutton_in));
     g_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
     g_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
 
@@ -10590,21 +11343,21 @@
 void in_out_end_changed (GtkWidget *widget, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected,*ablock=NULL;
-  gdouble new_end=gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
-  gdouble start_val;
+  double new_end=gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
+  double start_val;
   weed_timecode_t offset_end,orig_end_tc;
   weed_plant_t *event,*prevevent;
-  gint track;
-  gint filenum;
+  int track;
+  int filenum;
   weed_timecode_t new_end_tc,tl_end;
   weed_plant_t *start_event,*event_next,*init_event,*new_end_event;
-  gboolean was_moved;
+  boolean was_moved;
   weed_timecode_t new_tl_tc;
   int error;
   int aclip=0;
   double aseek,avel=1.;
 
-  gboolean end_anchored;
+  boolean end_anchored;
 
   if (block==NULL) {
     file *sfile=mainw->files[mt->file_selected];
@@ -10612,7 +11365,7 @@
     set_clip_labels_variable(mt,mt->file_selected);
     update_out_image(mt,0);
 
-    if (sfile->end<sfile->start) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_in),(gdouble)sfile->end);
+    if (sfile->end<sfile->start) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_in),(double)sfile->end);
     return;
   }
 
@@ -10646,8 +11399,8 @@
   }
 
   // offset_end is timecode of end event within source (scaled for velocity)
-  offset_end=q_gint64(block->offset_start+(weed_timecode_t)((gdouble)(track>=0)*U_SEC/mt->fps)+
-		      (weed_timecode_t)((gdouble)(get_event_timecode(block->end_event)-
+  offset_end=q_gint64(block->offset_start+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
+		      (weed_timecode_t)((double)(get_event_timecode(block->end_event)-
 						  get_event_timecode(block->start_event))*avel),mt->fps);
 
   if (track>=0&&new_end>mainw->files[filenum]->frames/mainw->files[filenum]->fps) new_end=mainw->files[filenum]->frames/
@@ -10672,7 +11425,7 @@
 
   if (!end_anchored) {
     new_tl_tc=q_gint64(get_event_timecode(block->start_event)+(new_end-start_val)*U_SEC/avel-
-		       (gdouble)(track>=0)*U_SEC/mt->fps,mt->fps);
+		       (double)(track>=0)*U_SEC/mt->fps,mt->fps);
     if (track<0) new_tl_tc-=(U_SEC/mt->fps);
 
 
@@ -10704,7 +11457,7 @@
 	if (new_end_event==NULL) {
 	  weed_plant_t *shortcut=ablock->end_event;
 	  mt->event_list=insert_blank_frame_event_at(mt->event_list,
-						     q_gint64(new_tl_tc+(weed_timecode_t)((gdouble)(track>=0)*
+						     q_gint64(new_tl_tc+(weed_timecode_t)((double)(track>=0)*
 											  U_SEC/mt->fps),mt->fps),
 						     &shortcut);
 	  ablock->end_event=shortcut;
@@ -10808,12 +11561,12 @@
     lives_mt_insert_mode_t insert_mode=mt->opts.insert_mode;
 
     offset_end=q_gint64((offset_start=block->offset_start+new_end_tc-orig_end_tc)+
-			(weed_timecode_t)((gdouble)(track>=0)*U_SEC/mt->fps)+
+			(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
 			(get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
 
     mt->opts.insert_mode=INSERT_MODE_OVERWRITE;
     if (track>=0) insert_frames (filenum,offset_end,offset_start,tl_end+
-				 (weed_timecode_t)((gdouble)(track>=0&&!mt->aud_track_selected)*U_SEC/mt->fps),
+				 (weed_timecode_t)((double)(track>=0&&!mt->aud_track_selected)*U_SEC/mt->fps),
 				 DIRECTION_NEGATIVE,block->eventbox,mt,block);
 
     block->offset_start=q_gint64(offset_start,mt->fps);
@@ -10831,7 +11584,7 @@
   }
 
   // get new offset_end
-  new_end_tc=(block->offset_start+(weed_timecode_t)((gdouble)(track>=0)*U_SEC/mt->fps)+
+  new_end_tc=(block->offset_start+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
 	      (get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*avel);
 
 #ifdef DEBUG_BL_MOVE
@@ -10875,13 +11628,13 @@
 void avel_reverse_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
-  gint track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
   double avel=-get_audio_frame_vel(block->start_event,track);
   double aseek=get_audio_frame_seek(block->start_event,track),aseek_end;
   int aclip=get_audio_frame_clip(block->start_event,track);
   
-  gdouble old_in_val=gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->spinbutton_in));
-  gdouble old_out_val=gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->spinbutton_out));
+  double old_in_val=gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->spinbutton_in));
+  double old_out_val=gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->spinbutton_out));
 
   // update avel and aseek
   aseek_end=aseek+(get_event_timecode(block->end_event)-get_event_timecode(block->start_event))/U_SEC*(-avel);
@@ -10925,16 +11678,16 @@
 void avel_spin_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
-  gint track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
   double new_avel=gtk_spin_button_get_value(spinbutton);
   double aseek=get_audio_frame_seek(block->start_event,track);
   int aclip=get_audio_frame_clip(block->start_event,track);
   weed_timecode_t new_end_tc,old_tl_tc,start_tc,new_tl_tc,min_tc;
   weed_plant_t *new_end_event,*new_start_event;
-  gdouble orig_end_val,orig_start_val;
-  gboolean was_adjusted=FALSE;
+  double orig_end_val,orig_start_val;
+  boolean was_adjusted=FALSE;
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mt->checkbutton_avel_reverse))) new_avel=-new_avel;
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse))) new_avel=-new_avel;
 
   start_tc=block->offset_start;
 
@@ -10942,7 +11695,9 @@
   old_tl_tc=get_event_timecode(block->end_event);
 
   if (!block->end_anchored) {
-    new_end_tc=q_gint64(start_tc+((orig_end_val=gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->spinbutton_out)))*U_SEC-start_tc)/new_avel,mt->fps);
+    new_end_tc=q_gint64(start_tc+((orig_end_val=
+				   gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->spinbutton_out)))*U_SEC-start_tc)
+			/new_avel,mt->fps);
 
     insert_audio_event_at(mt->event_list,block->start_event,track,aclip,aseek,new_avel);
 
@@ -10950,7 +11705,8 @@
 
     // move end point (if we can)
     if (block->next!=NULL&&new_tl_tc>=get_event_timecode(block->next->start_event)) {
-      new_end_tc=q_gint64((get_event_timecode(block->next->start_event)-get_event_timecode(block->start_event))*new_avel+block->offset_start,mt->fps);
+      new_end_tc=q_gint64((get_event_timecode(block->next->start_event)-
+			   get_event_timecode(block->start_event))*new_avel+block->offset_start,mt->fps);
       g_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
       g_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
       set_in_out_spin_ranges(mt,block->offset_start,new_end_tc);
@@ -10974,7 +11730,8 @@
 	add_blank_frames_up_to(mt->event_list,last_frame_event,new_tl_tc,mt->fps);
 	block->end_event=get_last_frame_event(mt->event_list);
       }
-      if (block->next==NULL||block->next->start_event!=block->end_event) insert_audio_event_at(mt->event_list,block->end_event,-1,aclip,0.,0.);
+      if (block->next==NULL||block->next->start_event!=block->end_event) 
+	insert_audio_event_at(mt->event_list,block->end_event,-1,aclip,0.,0.);
       
       gtk_widget_queue_draw((GtkWidget *)mt->audio_draws->data);
       new_end_tc=start_tc+(get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*new_avel;
@@ -11054,13 +11811,15 @@
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
   weed_timecode_t offset_end;
-  gdouble avel=1.;
+  double avel=1.;
 
   if (mt->current_track<0) {
     avel=get_audio_frame_vel(block->start_event,mt->current_track);
   }
 
-  offset_end=block->offset_start+(gdouble)(mt->current_track>=0&&!mt->aud_track_selected)*(weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-get_event_timecode(block->start_event)))*avel;
+  offset_end=block->offset_start+(double)(mt->current_track>=0&&!mt->aud_track_selected)*
+    (weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-
+				       get_event_timecode(block->start_event)))*avel;
 
   block->start_anchored=!block->start_anchored;
 
@@ -11102,13 +11861,15 @@
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
   weed_timecode_t offset_end;
-  gdouble avel=1.;
+  double avel=1.;
 
   if (mt->current_track<0) {
     avel=get_audio_frame_vel(block->start_event,mt->current_track);
   }
 
-  offset_end=block->offset_start+(gdouble)(mt->current_track>=0&&!mt->aud_track_selected)*(weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-get_event_timecode(block->start_event)))*avel;
+  offset_end=block->offset_start+(double)(mt->current_track>=0&&!mt->aud_track_selected)*
+    (weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-
+				       get_event_timecode(block->start_event)))*avel;
 
   block->end_anchored=!block->end_anchored;
 
@@ -11147,51 +11908,62 @@
 
 
 void polymorph (lives_mt *mt, lives_mt_poly_state_t poly) {
-  GdkPixbuf *thumb;
-  gint track;
-  gint frame_start,frame_end=0;
-  int filenum;
-  track_rect *block=mt->block_selected;
+  LiVESPixbuf *thumb;
+
   weed_timecode_t offset_end=0;
-  weed_plant_t *filter;
   weed_timecode_t tc;
-  int error;
-  GtkWidget *eventbox,*xeventbox,*yeventbox,*label,*vbox;
-  gdouble secs;
+
+  weed_plant_t *filter;
   weed_plant_t *frame_event,*filter_map;
-  gint num_fx=0;
-  void **init_events;
-  int i,j,fidx;
   weed_plant_t *init_event;
+  weed_plant_t *prev_fm_event,*next_fm_event,*shortcut;
+
+  track_rect *block=mt->block_selected;
+
+  void **init_events;
+
+  int *in_tracks,*out_tracks;
+
+  GtkWidget *bbox;
+  GtkWidget *eventbox,*xeventbox,*yeventbox,*label,*vbox;
+
+  double secs;
+  double out_end_range;
+  double avel=1.;
+
   gchar *fhash;
-  gint num_in_tracks,num_out_tracks;
-  gboolean is_input,is_output;
-  int *in_tracks,*out_tracks,def_out_track=0;
   gchar *fname,*otrackname,*txt;
-  gint olayer;
-  gboolean has_effect=FALSE;
-  gboolean has_params;
-  gboolean needs_idlefunc=FALSE;
-  gboolean tab_set=FALSE;
-  GtkWidget *bbox;
-  weed_plant_t *prev_fm_event,*next_fm_event,*shortcut;
-  gint fxcount=0;
-  gint nins=1;
 
-  gint width=cfile->hsize;
-  gint height=cfile->vsize;
+  boolean is_input,is_output;
+  boolean has_effect=FALSE;
+  boolean has_params;
+  boolean tab_set=FALSE;
+  boolean start_anchored,end_anchored;
+
+  int num_in_tracks,num_out_tracks;
+  int def_out_track=0;
+  int num_fx=0;
+  int fidx;
+  int olayer;
+  int fxcount=0;
+  int nins=1;
+  int width=cfile->hsize;
+  int height=cfile->vsize;
+  int error;
+  int track;
+  int frame_start,frame_end=0;
+  int filenum;
   
-  static gint xxwidth,xxheight;
+  static int xxwidth,xxheight;
 
-  gboolean start_anchored,end_anchored;
-
-  gdouble out_end_range;
-  gdouble avel=1.;
+  register int i,j;
 
   if (poly==mt->poly_state&&poly!=POLY_PARAMS&&poly!=POLY_FX_STACK) return;
 
-  if (mt->poly_box->allocation.width>1&&mt->poly_box->allocation.height>1) {
-    calc_maxspect(mt->poly_box->allocation.width/2-IN_OUT_SEP,mt->poly_box->allocation.height-((block==NULL||block->ordered)?mainw->spinbutton_start->allocation.height:0),&width,&height);
+  if (lives_widget_get_allocation_width(mt->poly_box)>1&&lives_widget_get_allocation_height(mt->poly_box)>1) {
+    calc_maxspect(lives_widget_get_allocation_width(mt->poly_box)/2-widget_opts.packing_width,
+		  lives_widget_get_allocation_height(mt->poly_box)-
+		  ((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_start):0),&width,&height);
     
     xxwidth=width;
     xxheight=height;
@@ -11208,13 +11980,12 @@
   case (POLY_IN_OUT) :
     g_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
     g_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-    if (mt->in_out_box->parent!=NULL) gtk_container_remove (GTK_CONTAINER(mt->poly_box),mt->in_out_box);
-    if (mt->avel_box->parent!=NULL) gtk_container_remove (GTK_CONTAINER(mt->poly_box),mt->avel_box);
+    if (lives_widget_get_parent(mt->in_out_box)!=NULL) lives_widget_unparent (mt->in_out_box);
+    if (lives_widget_get_parent(mt->avel_box)!=NULL) lives_widget_unparent (mt->avel_box);
 
     break;
   case (POLY_PARAMS) :
     mt->framedraw=NULL;
-    mt->fx_params_label=NULL;
     if (mt->current_rfx!=NULL) {
       rfx_free(mt->current_rfx);
       g_free(mt->current_rfx);
@@ -11224,14 +11995,13 @@
     if (mt->fx_box!=NULL) {
       gtk_widget_destroy(mt->fx_box);
       mt->fx_box=NULL;
-      
       gtk_container_remove (GTK_CONTAINER(mt->poly_box),mt->fx_base_box);
     }
 
     if (mt->mt_frame_preview) {
       // put blank back in preview window
-      gtk_widget_ref (mainw->playarea);
-      gtk_widget_modify_bg (mt->fd_frame, GTK_STATE_NORMAL, &palette->normal_back);
+      g_object_ref (mainw->playarea);
+      lives_widget_set_bg_color (mt->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     if (pchain!=NULL&&poly!=POLY_PARAMS) {
       g_free(pchain);
@@ -11239,24 +12009,16 @@
     }
     mouse_mode_context(mt); // reset context box text
     mt->last_fx_type=MT_LAST_FX_NONE;
-    mt->fx_box=NULL;
+
     gtk_widget_set_sensitive(mt->fx_edit,FALSE);
     gtk_widget_set_sensitive(mt->fx_delete,FALSE);
-    if (mt->idlefunc>0) {
-      g_source_remove(mt->idlefunc);
-      mt->idlefunc=0;
-      needs_idlefunc=TRUE;
-    }
     if (poly==POLY_PARAMS) { 
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
     }
     else {
       mt->init_event=NULL;
       mt_show_current_frame(mt, FALSE);
     }
-    if (needs_idlefunc) {
-      mt->idlefunc=mt_idle_add(mt);
-    }
 
     break;
   case POLY_FX_STACK:
@@ -11268,14 +12030,16 @@
   case POLY_EFFECTS:
   case POLY_TRANS:
   case POLY_COMP:
-    gtk_widget_destroy(mt->fx_list_box);
-    if (mt->nb_label!=NULL) gtk_widget_destroy(mt->nb_label);
-    mt->nb_label=NULL;
     break;
   default:
     break;
   }
 
+  if (mt->fx_list_box!=NULL) lives_widget_unparent(mt->fx_list_box);
+  mt->fx_list_box=NULL;
+  if (mt->nb_label!=NULL) gtk_widget_destroy(mt->nb_label);
+  mt->nb_label=NULL;
+
   mt->poly_state=poly;
 
   if (mt->poly_state==POLY_NONE) return; // transitional state
@@ -11297,7 +12061,7 @@
     if (block!=NULL) {
       track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
 
-      offset_end=block->offset_start+(weed_timecode_t)((gdouble)(track>=0)*U_SEC/mt->fps)+
+      offset_end=block->offset_start+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
 	((get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*ABS(avel));
 
       start_anchored=block->start_anchored;
@@ -11319,7 +12083,7 @@
       GtkWidget *oeventbox;
 
       if (block!=NULL) {
-	secs=GTK_RULER(mt->timeline)->position;
+	secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 	if (mt->context_time!=-1.&&mt->use_context) secs=mt->context_time;
 	if (is_audio_eventbox(mt,block->eventbox)&&(oeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(block->eventbox),
 										"owner"))!=NULL) {
@@ -11344,17 +12108,17 @@
       // start image
       thumb=make_thumb(mt,filenum,width,height,frame_start,FALSE);
       gtk_image_set_from_pixbuf (GTK_IMAGE(mt->in_image),thumb);
-      if (thumb!=NULL) gdk_pixbuf_unref(thumb);
+      if (thumb!=NULL) lives_object_unref(thumb);
     }
     else {
-      gtk_container_set_border_width (GTK_CONTAINER (mt->poly_box), 10);
+      gtk_container_set_border_width (GTK_CONTAINER (mt->poly_box), widget_opts.border_width);
       filenum=get_audio_frame_clip(block->start_event,track);
       gtk_widget_hide(mt->in_image);
       gtk_widget_hide(mt->out_image);
       gtk_box_pack_start(GTK_BOX(mt->poly_box),mt->avel_box,TRUE,TRUE,0);
       gtk_widget_show(mt->avel_box);
       avel=get_audio_frame_vel(block->start_event,track);
-      offset_end=block->offset_start+q_gint64((weed_timecode_t)((gdouble)(track>=0)*U_SEC/mt->fps)+
+      offset_end=block->offset_start+q_gint64((weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
 					      ((get_event_timecode(block->end_event)-
 						get_event_timecode(block->start_event))*ABS(avel)),mt->fps);
     }
@@ -11364,12 +12128,10 @@
       gtk_widget_hide(mt->checkbutton_end_anchored);
       gtk_spin_button_set_digits(GTK_SPIN_BUTTON(mt->spinbutton_in),0);
       gtk_spin_button_set_digits(GTK_SPIN_BUTTON(mt->spinbutton_out),0);
-      adjustment_configure(GTK_ADJUSTMENT(mt->spinbutton_in_adj),mainw->files[filenum]->start,1.,
-			   mainw->files[filenum]->frames,1.,100.,0.);
-      adjustment_configure(GTK_ADJUSTMENT(mt->spinbutton_out_adj),mainw->files[filenum]->end,1.,
-			   mainw->files[filenum]->frames,1.,100.,0.);
-      gtk_widget_hide(mt->in_eventbox);
-      gtk_widget_hide(mt->out_eventbox);
+      lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_in),mainw->files[filenum]->start,1.,
+				  mainw->files[filenum]->frames,1.,100.);
+      lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_out),mainw->files[filenum]->end,1.,
+				  mainw->files[filenum]->frames,1.,100.);
       gtk_widget_show(mt->start_in_label);
       gtk_widget_show(mt->end_out_label);
     }
@@ -11378,10 +12140,8 @@
       gtk_widget_show(mt->checkbutton_end_anchored);
       gtk_spin_button_set_digits(GTK_SPIN_BUTTON(mt->spinbutton_in),2);
       gtk_spin_button_set_digits(GTK_SPIN_BUTTON(mt->spinbutton_out),2);
-      adjustment_configure(GTK_ADJUSTMENT(mt->spinbutton_in_adj),0.,0.,0.,1./mt->fps,1.,0.);
-      adjustment_configure(GTK_ADJUSTMENT(mt->spinbutton_out_adj),0.,0.,0.,1./mt->fps,1.,0.);
-      gtk_widget_show(mt->in_eventbox);
-      gtk_widget_show(mt->out_eventbox);
+      lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_in),0.,0.,0.,1./mt->fps,1.);
+      lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_out),0.,0.,0.,1./mt->fps,1.);
       gtk_widget_hide(mt->start_in_label);
       gtk_widget_hide(mt->end_out_label);
     }
@@ -11398,8 +12158,8 @@
       }
       g_signal_handler_block (mt->checkbutton_start_anchored,mt->check_start_func);
       g_signal_handler_block (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mt->checkbutton_start_anchored),start_anchored);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),FALSE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_start_anchored),start_anchored);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),FALSE);
       g_signal_handler_unblock (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
       g_signal_handler_unblock (mt->checkbutton_start_anchored,mt->check_start_func);
     }
@@ -11408,8 +12168,8 @@
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_out),block->offset_start/U_SEC);
       g_signal_handler_block (mt->checkbutton_start_anchored,mt->check_start_func);
       g_signal_handler_block (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mt->checkbutton_start_anchored),start_anchored);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_start_anchored),start_anchored);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),TRUE);
       g_signal_handler_unblock (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
       g_signal_handler_unblock (mt->checkbutton_start_anchored,mt->check_start_func);
     }
@@ -11422,7 +12182,7 @@
       // end image
       thumb=make_thumb(mt,filenum,width,height,frame_end,FALSE);
       gtk_image_set_from_pixbuf (GTK_IMAGE(mt->out_image),thumb);
-      if (thumb!=NULL) gdk_pixbuf_unref(thumb);
+      if (thumb!=NULL) lives_object_unref(thumb);
       out_end_range=count_resampled_frames(mainw->files[filenum]->frames,mainw->files[filenum]->fps,mt->fps)/mt->fps;
     }
     else out_end_range=q_gint64(mainw->files[filenum]->laudio_time*U_SEC,mt->fps)/U_SEC;
@@ -11451,7 +12211,7 @@
     }
 
     g_signal_handler_block (mt->checkbutton_end_anchored,mt->check_end_func);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mt->checkbutton_end_anchored),end_anchored);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_end_anchored),end_anchored);
     g_signal_handler_unblock (mt->checkbutton_end_anchored,mt->check_end_func);
     gtk_box_pack_start(GTK_BOX(mt->poly_box),mt->in_out_box,TRUE,TRUE,0);
 
@@ -11490,28 +12250,16 @@
       on_paramwindow_cancel_clicked2(NULL,rfx);
     }
 
-    if (mt->fx_box!=NULL) gtk_widget_destroy(mt->fx_box);
-
-    mt->fx_box=NULL;
     get_track_index(mt,tc);
 
     mt->prev_fx_time=0; // force redraw in node_spin_val_changed
     has_params=add_mt_param_box(mt);
 
-    if (mainw->playing_file<0) {
-      if (mt->current_track>=0) {
-	if (mt->idlefunc>0) {
-	  g_source_remove(mt->idlefunc);
-	  mt->idlefunc=0;
-	  needs_idlefunc=TRUE;
-	}
-	mt->block_tl_move=TRUE;
-	on_node_spin_value_changed(GTK_SPIN_BUTTON(mt->node_spinbutton),mt); // force parameter interpolation
-	mt->block_tl_move=FALSE;
-	if (needs_idlefunc) {
-	  mt->idlefunc=mt_idle_add(mt);
-	}
-      }
+    if (has_params&&mainw->playing_file<0) {
+      lives_widget_context_update();
+      mt->block_tl_move=TRUE;
+      on_node_spin_value_changed(GTK_SPIN_BUTTON(mt->node_spinbutton),mt); // force parameter interpolation
+      mt->block_tl_move=FALSE;
     }
     clear_context(mt);
     if (has_params) {
@@ -11523,13 +12271,16 @@
     else {
       add_context_label(mt,_("Effect has no parameters.\n"));
     }
+    gtk_widget_show_all(mt->fx_box);
     break;
   case POLY_FX_STACK:
-    set_poly_tab(mt,POLY_FX_STACK);
     mt->init_event=NULL;
     if (mt->current_track>=0) eventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
     else eventbox=(GtkWidget *)mt->audio_draws->data;
-    secs=GTK_RULER(mt->timeline)->position;
+
+    if (eventbox==NULL) break; /// < can happen during mt exit
+
+    secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
     if (mt->context_time!=-1.&&mt->use_context) secs=mt->context_time;
 
     block=get_block_from_time(eventbox,secs,mt);
@@ -11545,14 +12296,16 @@
     frame_event=get_frame_event_at(mt->event_list,tc,shortcut,TRUE);
     filter_map=mt->fm_edit_event=get_filter_map_before(frame_event,-1000000,NULL);
 
-    mt->fx_list_box=gtk_vbox_new(FALSE,0);
+    mt->fx_list_box=lives_vbox_new(FALSE,0);
     mt->fx_list_scroll = gtk_scrolled_window_new (NULL, NULL);
+    lives_widget_set_hexpand(mt->fx_list_scroll,TRUE);
+
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mt->fx_list_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     gtk_box_pack_start (GTK_BOX (mt->fx_list_box), mt->fx_list_scroll, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(mt->poly_box),mt->fx_list_box,TRUE,TRUE,0);
 
-    mt->fx_list_vbox=gtk_vbox_new(FALSE,10);
-    gtk_container_set_border_width (GTK_CONTAINER (mt->fx_list_vbox), 10);
+    mt->fx_list_vbox=lives_vbox_new(FALSE,widget_opts.packing_height);
+    gtk_container_set_border_width (GTK_CONTAINER (mt->fx_list_vbox), widget_opts.border_width);
     gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (mt->fx_list_scroll), mt->fx_list_vbox);
 
     if (filter_map!=NULL) {
@@ -11595,6 +12348,8 @@
 	      }
 	    }
 
+	    if (!is_input&&!is_output) continue;
+
 	    has_effect=TRUE;
 
 	    fxcount++;
@@ -11626,29 +12381,29 @@
 	    gtk_widget_add_events (xeventbox, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK);
 	    if (palette->style&STYLE_1) {
 	      if (palette->style&STYLE_3) {
-		gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->normal_back);
-		gtk_widget_modify_bg(xeventbox, GTK_STATE_SELECTED, &palette->menu_and_bars);
+		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
 	      }
 	      else {
-		gtk_widget_modify_bg(xeventbox, GTK_STATE_NORMAL, &palette->menu_and_bars);
-		gtk_widget_modify_bg(xeventbox, GTK_STATE_SELECTED, &palette->normal_back);
+		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
 	      }
 	    }
 
-	    if (init_event==mt->selected_init_event) gtk_widget_set_state(xeventbox,GTK_STATE_SELECTED);
-	    vbox=gtk_vbox_new(FALSE,0);
+	    if (init_event==mt->selected_init_event) lives_widget_set_state(xeventbox,LIVES_WIDGET_STATE_PRELIGHT);
+	    vbox=lives_vbox_new(FALSE,0);
 
-	    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+	    gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width>>1);
 	    gtk_container_add (GTK_CONTAINER (xeventbox), vbox);
 	    label=gtk_label_new(txt);
 	    g_free(txt);
 	    g_free(fname);
 
 	    if (palette->style&STYLE_1) {
-	      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->info_text);
-	      gtk_widget_modify_fg (label, GTK_STATE_SELECTED, &palette->info_text);
+	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
+	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
 	    }
-	    gtk_container_set_border_width (GTK_CONTAINER (xeventbox), 5);
+	    gtk_container_set_border_width (GTK_CONTAINER (xeventbox), widget_opts.border_width>>1);
 	    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 	    gtk_box_pack_start (GTK_BOX (mt->fx_list_vbox), xeventbox, FALSE, FALSE, 0);
 
@@ -11661,7 +12416,7 @@
       }
     }
 
-    bbox=gtk_hbutton_box_new();
+    bbox=lives_hbutton_box_new();
     gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
     gtk_box_pack_end (GTK_BOX (mt->fx_list_box), bbox, FALSE, FALSE, 0);
 
@@ -11712,17 +12467,18 @@
 		      (gpointer)mt);
 
     if (has_effect) {
-      gtk_widget_show_all(mt->fx_list_box);
       do_fx_list_context(mt,fxcount);
     }
     else {
-      label=gtk_label_new(_("\n\nNo effects at current track,\ncurrent time.\n"));
+      widget_opts.justify=LIVES_JUSTIFY_CENTER;
+      label=lives_standard_label_new(_("\n\nNo effects at current track,\ncurrent time.\n"));
+      widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
       gtk_box_pack_start (GTK_BOX (mt->fx_list_box), label, TRUE, TRUE, 0);
-      gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_show(mt->fx_list_box);
-      gtk_widget_show(label);
     }
+
+    gtk_widget_show_all(mt->fx_list_box);
+    set_poly_tab(mt,POLY_FX_STACK);
+
     break;
 
   case POLY_COMP:
@@ -11745,14 +12501,15 @@
       clear_context(mt);
       add_context_label (mt,(_("Effects can be dragged\nonto blocks on the timeline.")));
     }
-    mt->fx_list_box=gtk_vbox_new(FALSE,0);
+    mt->fx_list_box=lives_vbox_new(FALSE,0);
     mt->fx_list_scroll = gtk_scrolled_window_new (NULL, NULL);
+    lives_widget_set_hexpand(mt->fx_list_scroll,TRUE);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mt->fx_list_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
     gtk_box_pack_start (GTK_BOX (mt->fx_list_box), mt->fx_list_scroll, TRUE, TRUE, 0);
     gtk_box_pack_start(GTK_BOX(mt->poly_box),mt->fx_list_box,TRUE,TRUE,0);
 
-    mt->fx_list_vbox=gtk_vbox_new(FALSE,10);
-    gtk_container_set_border_width (GTK_CONTAINER (mt->fx_list_vbox), 10);
+    mt->fx_list_vbox=lives_vbox_new(FALSE,widget_opts.packing_height);
+    gtk_container_set_border_width (GTK_CONTAINER (mt->fx_list_vbox), widget_opts.border_width);
     gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (mt->fx_list_scroll), mt->fx_list_vbox);
 
     if (mt->poly_state==POLY_COMP) nins=1000000;
@@ -11773,14 +12530,15 @@
 }
 
 
-static void mouse_select_start(GtkWidget *widget, lives_mt *mt) {
-  gdouble timesecs;
-  gint min_x;
+static void mouse_select_start(GtkWidget *widget, GdkEventButton *event, lives_mt *mt) {
+  double timesecs;
+  int min_x;
 
   gtk_widget_set_sensitive(mt->mm_menuitem,FALSE);
   gtk_widget_set_sensitive(mt->view_sel_events,FALSE);
   
-  gdk_window_get_pointer(GDK_WINDOW (mt->timeline->window), &mt->sel_x, &mt->sel_y, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mt->timeline, &mt->sel_x, &mt->sel_y);
   timesecs=get_time_from_x(mt,mt->sel_x);
   mt->region_start=mt->region_end=mt->region_init=timesecs;
 
@@ -11788,8 +12546,9 @@
   on_timeline_update(mt->timeline_eb,NULL,mt);
   mt->region_updating=FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (mt->tl_eventbox->window), &mt->sel_x, &mt->sel_y, NULL);
-  gdk_window_get_position(GDK_WINDOW (mt->timeline_eb->window), &min_x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mt->tl_eventbox, &mt->sel_x, &mt->sel_y);
+  gdk_window_get_position(lives_widget_get_xwindow(mt->timeline_eb), &min_x, NULL);
 
   if (mt->sel_x<min_x) mt->sel_x=min_x;
   if (mt->sel_y<0.) mt->sel_y=0.;
@@ -11801,35 +12560,42 @@
 
 }
 
-void mouse_select_end(GtkWidget *widget, lives_mt *mt) {
+static void mouse_select_end(GtkWidget *widget, GdkEventButton *event, lives_mt *mt) {
   mt->tl_selecting=FALSE;
-  gdk_window_get_pointer(GDK_WINDOW (mt->timeline->window), &mt->sel_x, &mt->sel_y, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mt->timeline, &mt->sel_x, &mt->sel_y);
   gtk_widget_set_sensitive(mt->mm_menuitem,TRUE);
   gtk_widget_queue_draw(mt->tl_eventbox);
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 
-static void mouse_select_move(GtkWidget *widget, lives_mt *mt) {
-  gint x,y;
-  gint start_x,start_y,width,height;
-  gint current_track=mt->current_track;
-  int i;
+static void mouse_select_move(GtkWidget *widget, GdkEventMotion *event, lives_mt *mt) {
+  lives_painter_t *cr;
+
   GtkWidget *xeventbox;
-  gint rel_x,rel_y,min_x;
-  gint offs_y_start,offs_y_end,xheight;
   GtkWidget *checkbutton;
 
+  int x,y;
+  int start_x,start_y,width,height;
+  int current_track=mt->current_track;
+
+  int rel_x,rel_y,min_x;
+  int offs_y_start,offs_y_end,xheight;
+
+  register int i;
+
   if (mt->block_selected!=NULL) unselect_all(mt);
 
-  gdk_window_get_pointer(GDK_WINDOW (mt->tl_eventbox->window), &x, &y, NULL);
-  gdk_window_get_position(GDK_WINDOW (mt->timeline_eb->window), &min_x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   mt->tl_eventbox, &x, &y);
+  gdk_window_get_position(lives_widget_get_xwindow(mt->timeline_eb), &min_x, NULL);
 
   if (x<min_x) x=min_x;
   if (y<0.) y=0.;
 
   gtk_widget_queue_draw(mt->tl_hbox);
-  gdk_window_process_updates(mt->tl_eventbox->window,FALSE);
+  gdk_window_process_updates(lives_widget_get_xwindow(mt->tl_eventbox),FALSE);
 
   if (x>=mt->sel_x) {
     start_x=mt->sel_x;
@@ -11851,21 +12617,24 @@
   if (start_x<0) start_x=0;
   if (start_y<0) start_y=0;
 
-  gdk_draw_rectangle (GDK_DRAWABLE(mt->tl_eventbox->window), mt->window->style->black_gc, TRUE, 
-		      start_x, start_y, width, height);
+  cr = lives_painter_create_from_widget (mt->tl_eventbox);
+  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	
+  lives_painter_rectangle(cr,start_x,start_y,width,height);
+  lives_painter_fill(cr);
 
   for (i=0;i<mt->num_video_tracks;i++) {
     xeventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,i);
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"hidden"))==0) {
-      xheight=xeventbox->allocation.height;
+      xheight=lives_widget_get_allocation_height(xeventbox);
       checkbutton=(GtkWidget *)g_object_get_data(G_OBJECT(xeventbox),"checkbutton");
-      gdk_window_get_position(xeventbox->window,&rel_x,&rel_y);
+      gdk_window_get_position(lives_widget_get_xwindow(xeventbox),&rel_x,&rel_y);
       if (start_y>(rel_y+xheight/2)||(start_y+height)<(rel_y+xheight/2)) {
 #ifdef ENABLE_GIW
 	if (!prefs->lamp_buttons) {
 #endif
-	  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton))) {
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),FALSE);
+	  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) {
+	    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
 	    mt->current_track=current_track;
 	    track_select(mt);
 	  }
@@ -11883,26 +12652,29 @@
       }
       offs_y_start=0;
       offs_y_end=xheight;
+
       if (start_y<rel_y+xheight) {
 	offs_y_start=start_y-rel_y;
-	gdk_draw_line (xeventbox->window, mt->window->style->black_gc, start_x-rel_x, offs_y_start, 
-		       start_x+width-rel_x-1, offs_y_start);
+	lives_painter_move_to(cr,start_x-rel_x,offs_y_start);
+	lives_painter_line_to(cr,start_x+width-rel_x-1, offs_y_start);
       }
       if (start_y+height<rel_y+xheight) {
 	offs_y_end=start_y-rel_y+height;
-	gdk_draw_line (xeventbox->window, mt->window->style->black_gc, start_x-rel_x, offs_y_end, 
-		       start_x+width-rel_x-1, offs_y_end);
+	lives_painter_move_to(cr,start_x-rel_x,offs_y_end);
+	lives_painter_line_to(cr,start_x+width-rel_x-1, offs_y_end);
       }
-      gdk_draw_line (xeventbox->window, mt->window->style->black_gc, start_x-rel_x, offs_y_start, start_x-rel_x, 
-		     offs_y_end);
-      gdk_draw_line (xeventbox->window, mt->window->style->black_gc, start_x+width-rel_x-1, offs_y_start, 
-		     start_x+width-rel_x-1, offs_y_end);
+
+      lives_painter_move_to(cr,start_x-rel_x,offs_y_start); 
+      lives_painter_line_to(cr,start_x-rel_x,offs_y_end);
+      lives_painter_move_to(cr,start_x-rel_x-1,offs_y_start); 
+      lives_painter_line_to(cr,start_x-rel_x-1,offs_y_end);
+      lives_painter_stroke(cr);
 
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton))) {
-	  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
+	if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) {
+	  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 	  mt->current_track=current_track;
 	  track_select(mt);
 	}
@@ -11919,11 +12691,14 @@
     }
   }
 
+  lives_painter_destroy (cr);
+
   if (widget!=mt->timeline_eb) {
     mt->region_updating=TRUE;
     on_timeline_update(mt->timeline_eb,NULL,mt);
     mt->region_updating=FALSE;
   }
+
   
 }
 
@@ -11941,6 +12716,7 @@
   GtkWidget *selblock;
   GtkWidget *avol;
   GtkWidget *menu=gtk_menu_new();
+
   int error;
 
   //mouse_select_end(NULL,mt);
@@ -11948,7 +12724,7 @@
   gtk_menu_set_title (GTK_MENU(menu),_("LiVES: Selected block/frame"));
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   
   selblock = gtk_menu_item_new_with_mnemonic (_("_Select this block"));
@@ -12009,15 +12785,15 @@
 }
 
 
-void do_track_context (lives_mt *mt, GdkEventButton *event, gdouble timesecs, gint track) {
+void do_track_context (lives_mt *mt, GdkEventButton *event, double timesecs, int track) {
   // pop up a context menu when track is right clicked on
 
   // unfinished...
 
   GtkWidget *insert_here,*avol;
   GtkWidget *menu=gtk_menu_new();
-  gboolean has_something=FALSE;
-  gboolean needs_idlefunc=FALSE;
+  boolean has_something=FALSE;
+  boolean needs_idlefunc=FALSE;
 
   if (mt->idlefunc>0) {
     g_source_remove(mt->idlefunc);
@@ -12025,12 +12801,12 @@
     needs_idlefunc=TRUE;
   }
 
-  mouse_select_end(NULL,mt);
+  mouse_select_end(NULL,event,mt);
 
   gtk_menu_set_title (GTK_MENU(menu),_("LiVES: Selected frame"));
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   if (mt->file_selected>0&&((track<0&&mainw->files[mt->file_selected]->achans>0&&
@@ -12076,6 +12852,13 @@
   if (has_something) {
     gtk_widget_show_all (menu);
     gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
+
+
+    g_signal_connect (GTK_OBJECT (menu), "unmap",
+		      G_CALLBACK (rdrw_cb),
+		      (gpointer)mt);
+
+
   }
   else gtk_widget_destroy(menu);
 
@@ -12087,22 +12870,28 @@
 }
 
 
-gboolean on_track_release (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
+boolean on_track_release (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gint x,y;
-  gdouble timesecs;
-  gint track=0;
+  weed_timecode_t tc,tcpp;
+
   GtkWidget *xeventbox;
   GtkWidget *oeventbox;
   GtkWidget *xlabelbox;
   GtkWidget *xahbox;
   GdkWindow *window;
-  gint win_x,win_y;
-  int i;
-  gint old_track=mt->current_track;
-  gboolean got_track=FALSE;
-  gboolean needs_idlefunc=FALSE;
-  weed_timecode_t tc,tcpp;
+
+  double timesecs;
+
+  boolean got_track=FALSE;
+  boolean needs_idlefunc=FALSE;
+
+  int x,y;
+  int track=0;
+
+  int win_x,win_y;
+  int old_track=mt->current_track;
+
+  register int i;
 
   if (mt->idlefunc>0) {
     g_source_remove(mt->idlefunc);
@@ -12110,13 +12899,17 @@
     needs_idlefunc=TRUE;
   }
 
-  set_cursor_style(mt,LIVES_CURSOR_BUSY,0,0,0,0,0);
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
-  gdk_window_get_pointer(GDK_WINDOW (eventbox->window), &x, &y, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   eventbox, &x, &y);
   timesecs=get_time_from_x(mt,x);
   tc=timesecs*U_SECL;
 
-  window=gdk_display_get_window_at_pointer (mt->display,&win_x,&win_y);
+
+  window=lives_display_get_window_at_pointer 
+    ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+     mt->display,&win_x,&win_y);
   
   if (cfile->achans>0) {
     for (i=0;i<g_list_length(mt->audio_draws);i++) {
@@ -12125,7 +12918,7 @@
       if (i>=mt->opts.back_audio_tracks&&!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(oeventbox),"expanded"))) continue;
       xlabelbox=(GtkWidget *)g_object_get_data(G_OBJECT(xeventbox),"labelbox");
       xahbox=(GtkWidget *)g_object_get_data(G_OBJECT(xeventbox),"ahbox");
-      if (xeventbox->window==window||xlabelbox->window==window||xahbox->window==window) {
+      if (lives_widget_get_xwindow(xeventbox)==window||lives_widget_get_xwindow(xlabelbox)==window||lives_widget_get_xwindow(xahbox)==window) {
 	track=i-1;
 	got_track=TRUE;
 	mt->aud_track_selected=TRUE;
@@ -12138,7 +12931,7 @@
       xeventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,i);
       xlabelbox=(GtkWidget *)g_object_get_data(G_OBJECT(xeventbox),"labelbox");
       xahbox=(GtkWidget *)g_object_get_data(G_OBJECT(xeventbox),"ahbox");
-      if (xeventbox->window==window||xlabelbox->window==window||xahbox->window==window) {
+      if (lives_widget_get_xwindow(xeventbox)==window||lives_widget_get_xwindow(xlabelbox)==window||lives_widget_get_xwindow(xahbox)==window) {
 	track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"layer_number"));
 	mt->aud_track_selected=FALSE;
 	got_track=TRUE;
@@ -12148,37 +12941,44 @@
   }
 
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
-    mouse_select_end(eventbox,mt);
+    mouse_select_end(eventbox,event,mt);
     g_signal_handler_block (mt->tl_eventbox,mt->mouse_mot2);
     mt->sel_y-=y+2;
   }
   else {
     if (mt->hotspot_x!=0||mt->hotspot_y!=0) {
       GdkScreen *screen;
-      gint abs_x,abs_y;
+      int abs_x,abs_y;
 
-      gint height=GTK_WIDGET(g_list_nth_data(mt->video_draws,0))->allocation.height;
-      gdk_display_get_pointer(mt->display,&screen,&abs_x,&abs_y,NULL);
-#if GLIB_CHECK_VERSION(2,8,0)
-      gdk_display_warp_pointer(mt->display,screen,abs_x+mt->hotspot_x,abs_y+mt->hotspot_y-height/2);
-
-      // we need to call this to warp the pointer, but gtk+ behaves like a PITA
-      if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
-      threaded_dialog_spin();
-      g_main_context_iteration(NULL,FALSE);
-      threaded_dialog_spin();
-#endif
+      int height=lives_widget_get_allocation_height(LIVES_WIDGET(g_list_nth_data(mt->video_draws,0)));
+      lives_display_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				mt->display,&screen,&abs_x,&abs_y,NULL);
+      lives_display_warp_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				 mt->display,screen,abs_x+mt->hotspot_x,abs_y+mt->hotspot_y-height/2);
+      // we need to call this to warp the pointer
+      lives_widget_context_update();
+    }
+
+    if (doubleclick) {
+      // this is a double-click
+      mt->putative_block=get_block_from_time(eventbox,timesecs,mt);
+      select_block(mt);
+      mt->putative_block=NULL;
+      doubleclick=FALSE;
+      goto track_rel_done;
     }
 
     if (got_track&&!mt->is_rendering&&mt->putative_block!=NULL&&mainw->playing_file==-1&&
-	event->button==1&&event->time!=dclick_time) {
+	event->button==1) {
       weed_timecode_t start_tc;
+
       mt_desensitise(mt);
 
       start_tc=get_event_timecode(mt->putative_block->start_event);
 
       // timecodes per pixel
-      tcpp=U_SEC*((mt->tl_max-mt->tl_min)/(gdouble)GTK_WIDGET(g_list_nth_data(mt->video_draws,0))->allocation.width);
+      tcpp=U_SEC*((mt->tl_max-mt->tl_min)/
+		  (double)lives_widget_get_allocation_width(LIVES_WIDGET(g_list_nth_data(mt->video_draws,0))));
 
       // need to move at least 1.5 pixels, or to another track
       if ((track!=mt->current_track||(tc-start_tc>(tcpp*3/2))||(start_tc-tc>(tcpp*3/2)))&&
@@ -12186,20 +12986,23 @@
 	move_block(mt,mt->putative_block,timesecs,old_track,track);
 	mt->putative_block=NULL;
 
-	gdk_window_get_pointer(GDK_WINDOW (eventbox->window), &x, &y, NULL);
+	lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				 eventbox, &x, &y);
 	timesecs=get_time_from_x(mt,x);
 
-	mt_tl_move(mt,timesecs-GTK_RULER(mt->timeline)->position);
+	mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
       }
     }
 
   }
+
+ track_rel_done:
   
   if (mainw->playing_file==-1) mt_sensitise(mt);
   mt->hotspot_x=mt->hotspot_y=0;
   mt->putative_block=NULL;
 
-  set_cursor_style(mt,LIVES_CURSOR_NORMAL,0,0,0,0,0);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
   gtk_widget_set_sensitive(mt->mm_menuitem,TRUE);
 
   if (needs_idlefunc) {
@@ -12212,37 +13015,37 @@
 
 
 
-gboolean on_track_header_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
+boolean on_track_header_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
-    mouse_select_start(widget,mt);
+    mouse_select_start(widget,event,mt);
     g_signal_handler_unblock (widget,mt->mouse_mot1);
   }
   return TRUE;
 }
 
-gboolean on_track_header_release (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
+boolean on_track_header_release (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
-    mouse_select_end(widget,mt);
+    mouse_select_end(widget,event,mt);
     g_signal_handler_block (widget,mt->mouse_mot1);
   }
   return TRUE;
 }
 
-gboolean on_track_between_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
+boolean on_track_between_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
-    mouse_select_start(widget,mt);
+    mouse_select_start(widget,event,mt);
     g_signal_handler_unblock (mt->tl_eventbox,mt->mouse_mot2);
   }
   return TRUE;
 }
 
-gboolean on_track_between_release (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
+boolean on_track_between_release (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
-    mouse_select_end(widget,mt);
+    mouse_select_end(widget,event,mt);
     g_signal_handler_block (mt->tl_eventbox,mt->mouse_mot2);
   }
   return TRUE;
@@ -12250,19 +13053,25 @@
 
 
 
-gboolean on_track_click (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
-  gint x,y;
-  track_rect *block;
+boolean on_track_click (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gdouble timesecs;
-  gint track;
+  track_rect *block;
+
+  double timesecs;
+
+  int x,y;
+  int track;
   int filenum=-1;
 
+  //doubleclick=FALSE;
+
   mt->aud_track_selected=is_audio_eventbox(mt,eventbox);
 
   gtk_widget_set_sensitive(mt->mm_menuitem,FALSE);
 
-  gdk_window_get_pointer(GDK_WINDOW (eventbox->window), &x, &y, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   eventbox, &x, &y);
+
   timesecs=get_time_from_x(mt,x+mt->hotspot_x);
 
   if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) 
@@ -12273,22 +13082,20 @@
   unselect_all(mt); // set all blocks unselected
 
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&event->type==GDK_BUTTON_PRESS) {
-    mouse_select_start(eventbox,mt);
+    mouse_select_start(eventbox,event,mt);
     g_signal_handler_unblock (mt->tl_eventbox,mt->mouse_mot2);
   }
   else {
-    if (event->type!=GDK_BUTTON_PRESS) {
-      // this is a double-click
-      dclick_time=gdk_event_get_time((GdkEvent *)event);
-      select_block(mt);
-      mt->putative_block=NULL;
+    if (gdk_event_get_time((GdkEvent *)event)-last_press_time<LIVES_DCLICK_TIME) {
+      doubleclick=TRUE;
+      return TRUE;
     }
     else {
       // single click, TODO - locate the frame for the track in event_list
 
       if (mainw->playing_file==-1) {
 	mt->fm_edit_event=NULL;
-	mt_tl_move(mt,timesecs-GTK_RULER (mt->timeline)->position);
+	mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
       }
 
       // for a double click, gdk normally sends 2 single click events, 
@@ -12301,7 +13108,7 @@
       if (event->time!=dclick_time) {
 	show_track_info(mt,eventbox,track,timesecs);
 	if (block!=NULL) {
-	  if (cfile->achans==0||mt->audio_draws==NULL||!is_audio_eventbox(mt,eventbox)) 
+	  if (!is_audio_eventbox(mt,eventbox)) 
 	    filenum=get_frame_event_clip(block->start_event,track);
 	  else filenum=get_audio_frame_clip(block->start_event,-1);
 	  if (filenum!=mainw->scrap_file&&filenum!=mainw->ascrap_file) {
@@ -12310,16 +13117,16 @@
 	  }
 
 	  if (event->button!=3&&!mt->is_rendering) {
-	    gdouble start_secs,end_secs;
+	    double start_secs,end_secs;
 	    
 	    GdkScreen *screen;
-	    gint abs_x,abs_y;
+	    int abs_x,abs_y;
 	    
-	    gint ebwidth=GTK_WIDGET(mt->timeline)->allocation.width;
+	    int ebwidth=lives_widget_get_allocation_width(mt->timeline);
 	    
-	    gdouble width=((end_secs=(get_event_timecode(block->end_event)/U_SEC))-
+	    double width=((end_secs=(get_event_timecode(block->end_event)/U_SEC))-
 			   (start_secs=(get_event_timecode(block->start_event)/U_SEC))+1./mt->fps);
-	    gint height;
+	    int height;
 	    
 	    // start point must be on timeline to move a block
 	    if (block!=NULL&&(mt->tl_min*U_SEC>get_event_timecode(block->start_event))) {
@@ -12327,23 +13134,22 @@
 	      return TRUE;
 	    }
 
-	    if (cfile->achans==0||!is_audio_eventbox(mt,eventbox)) 
-	      height=GTK_WIDGET(g_list_nth_data(mt->video_draws,0))->allocation.height;
-	    else height=GTK_WIDGET(mt->audio_draws->data)->allocation.height;
+	    if (!is_audio_eventbox(mt,eventbox)) 
+	      height=lives_widget_get_allocation_height(LIVES_WIDGET(g_list_nth_data(mt->video_draws,0)));
+	    else height=lives_widget_get_allocation_height(LIVES_WIDGET(mt->audio_draws->data));
 	    
-	    width=(width/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth);
+	    width=(width/(mt->tl_max-mt->tl_min)*(double)ebwidth);
 	    if (width>ebwidth) width=ebwidth;
 	    if (width<2) width=2;
 
-	    mt->hotspot_x=x-(int)((ebwidth*((gdouble)start_secs-mt->tl_min)/(mt->tl_max-mt->tl_min))+.5);
+	    mt->hotspot_x=x-(int)((ebwidth*((double)start_secs-mt->tl_min)/(mt->tl_max-mt->tl_min))+.5);
 	    mt->hotspot_y=y;
-	    //if (mt->hotspot_x>x) mt->hotspot_x=x;
-	    gdk_display_get_pointer(mt->display,&screen,&abs_x,&abs_y,NULL);
-#if GLIB_CHECK_VERSION(2,8,0)
-	    gdk_display_warp_pointer(mt->display,screen,abs_x-mt->hotspot_x,abs_y-y+height/2);
-#endif
-	    if (track>=0&&!mt->aud_track_selected) set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,filenum,0,height/2);
-	    else set_cursor_style(mt,LIVES_CURSOR_AUDIO_BLOCK,width,height,filenum,0,height/2);
+	    lives_display_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+				      mt->display,&screen,&abs_x,&abs_y,NULL);
+	    lives_display_warp_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+	      mt->display,screen,abs_x-mt->hotspot_x,abs_y-y+height/2);
+	    if (track>=0&&!mt->aud_track_selected) mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,filenum,0,height/2);
+  	    else mt_set_cursor_style(mt,LIVES_CURSOR_AUDIO_BLOCK,width,height,filenum,0,height/2);
 	  }
 	}
       }
@@ -12371,54 +13177,58 @@
     }
   }
 
+  last_press_time=gdk_event_get_time((GdkEvent *)event);
+
   return TRUE;
 }
 
-gboolean on_track_move (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
+boolean on_track_move (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
   // used for mouse mode SELECT
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_move(widget,mt);
+  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_move(widget,event,mt);
   return TRUE;
 }
 
-gboolean on_track_header_move (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
+boolean on_track_header_move (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
   // used for mouse mode SELECT
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_move(widget,mt);
+  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_move(widget,event,mt);
   return TRUE;
 }
 
 void unpaint_line(lives_mt *mt, GtkWidget *eventbox) {
-  GdkImage *st_image;
   guint64 bth,btl;
-  gdouble ocurrtime;
-  gint xoffset;
-  gint ebwidth;
+
+  double ocurrtime;
+
+  int xoffset;
+  int ebwidth;
 
   if (mt->redraw_block) return; // don't update during expose event, otherwise we might leave lines
-  if (!GTK_WIDGET_VISIBLE(eventbox)) return;
+  if (!lives_widget_is_visible(eventbox)) return;
 
-  ebwidth=GTK_WIDGET(mt->timeline)->allocation.width;
-  if ((st_image=(GdkImage *)g_object_get_data(G_OBJECT(eventbox),"backup_image"))!=NULL) {
-    // draw over old pointer value
-    bth=((guint64)((guint)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"backup_timepos_h")))))<<32;
-    btl=(guint64)((guint)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"backup_timepos_l"))));
-    ocurrtime=(bth+btl)/U_SEC;
-    xoffset=(ocurrtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
-    if (xoffset>=0&&xoffset<ebwidth) {
-      gdk_draw_image(GDK_DRAWABLE(eventbox->window),mt->window->style->black_gc, st_image, 0, 0, xoffset, 1, xoffset, 
-		     eventbox->allocation.height-2);
-    }
-    g_object_unref(st_image);
-    g_object_set_data(G_OBJECT(eventbox),"backup_image",NULL);
+  ebwidth=lives_widget_get_allocation_width(eventbox);
+
+  bth=((guint64)((guint)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"backup_timepos_h")))))<<32;
+  btl=(guint64)((guint)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"backup_timepos_l"))));
+  ocurrtime=(bth+btl)/U_SEC;
+  xoffset=(ocurrtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth+.5;
+  if (xoffset>=0&&xoffset<ebwidth) {
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_widget_queue_draw_area(eventbox,xoffset-4,0,9,lives_widget_get_allocation_height(eventbox));
+#else
+    gtk_widget_queue_draw(eventbox);
+#endif
+    gdk_window_process_updates(lives_widget_get_xwindow(eventbox),TRUE);
   }
 }
 
+
 void unpaint_lines(lives_mt *mt) {
-  gint len=g_list_length(mt->video_draws);
+  int len=g_list_length(mt->video_draws);
   int i;
   GtkWidget *eventbox,*xeventbox;
-  gboolean is_video=FALSE;
+  boolean is_video=FALSE;
 
   for (i=-1;i<len;i++) {
     if (i==-1) {
@@ -12452,16 +13262,30 @@
 
 void animate_multitrack (lives_mt *mt) {
   // update timeline pointer(s)
-  GdkImage *st_image;
+  lives_painter_t *cr;
+
   GtkWidget *eventbox=NULL,*aeventbox=NULL;
-  gint offset=-1;
-  int i;
-  gint len=g_list_length (mt->video_draws);
-  gdouble currtime=mainw->currticks/U_SEC;
-  gint ebwidth=GTK_WIDGET(mt->timeline)->allocation.width;
-  gboolean expanded=FALSE;
-  gdouble tl_page;
-  gboolean is_video=FALSE;
+
+  double currtime=mainw->currticks/U_SEC;
+  double tl_page;
+
+  boolean expanded=FALSE;
+  boolean is_video=FALSE;
+
+  int offset,offset_old;
+
+  int len=g_list_length (mt->video_draws);
+
+  int ebwidth=lives_widget_get_allocation_width(mt->timeline);
+
+  register int i;
+
+  time_to_string(mt,currtime,TIMECODE_LENGTH);
+
+  offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
+  offset_old=(lives_ruler_get_value(LIVES_RULER(mt->timeline))-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
+
+  if (offset==offset_old) return;
 
   if (mt->opts.follow_playback) {
     if (currtime>(mt->tl_min+((tl_page=mt->tl_max-mt->tl_min))*.85)&&event_list_get_end_secs(mt->event_list)>mt->tl_max) {
@@ -12472,9 +13296,7 @@
     }
   }
 
-  time_to_string(mt,currtime,TIMECODE_LENGTH);
-
-  GTK_RULER (mt->timeline)->position=currtime;
+  lives_ruler_set_value(LIVES_RULER (mt->timeline),currtime);
   gtk_widget_queue_draw (mt->timeline);
 
   if (mt->redraw_block) return; // don't update during expose event, otherwise we might leave lines
@@ -12488,82 +13310,111 @@
       is_video=TRUE;
     }
     expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
-    if (GTK_WIDGET_VISIBLE(eventbox)) {
+    if (lives_widget_is_visible(eventbox)) {
       unpaint_line(mt,eventbox);
-      if (offset==-1) {
-	offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
-      }
+
       if (offset>0&&offset<ebwidth) {
-	st_image=gdk_drawable_copy_to_image(GDK_DRAWABLE(eventbox->window),NULL,offset,1,0,0,1,
-					    eventbox->allocation.height-2);
-	g_object_set_data(G_OBJECT(eventbox),"backup_image",st_image);
+
 	g_object_set_data(G_OBJECT(eventbox),"backup_timepos_h",
-			  GINT_TO_POINTER((gint)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
+			  GINT_TO_POINTER((int)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
 	g_object_set_data(G_OBJECT(eventbox),"backup_timepos_l",
 			  GINT_TO_POINTER((guint)(((guint64)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-	gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset, 1, offset, 
-		       eventbox->allocation.height-2);
+
+	cr = lives_painter_create_from_widget (eventbox);
+
+
+	if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
+	  lives_painter_set_source_rgb(cr,1.,1.,1.);
+	else 
+	  lives_painter_set_source_rgb(cr,0.,0.,0.);
+
+	lives_painter_set_line_width(cr,1.);
+
+	lives_painter_move_to(cr,offset,0.);
+	lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
+	
+	lives_painter_stroke(cr);
+	lives_painter_destroy(cr);
       }
     }
     if (expanded) {
       if (is_video) {
 	aeventbox=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
 	expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(aeventbox),"expanded"));
-	if (GTK_WIDGET_VISIBLE(aeventbox)) {
+	if (lives_widget_is_visible(aeventbox)) {
 	  unpaint_line(mt,aeventbox);
-	  if (offset==-1) {
-	    offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
-	  }
+
 	  if (offset>0&&offset<ebwidth) {
-	    st_image=gdk_drawable_copy_to_image(GDK_DRAWABLE(aeventbox->window),NULL,offset,1,0,0,1,
-						aeventbox->allocation.height-2);
-	    g_object_set_data(G_OBJECT(aeventbox),"backup_image",st_image);
 	    g_object_set_data(G_OBJECT(aeventbox),"backup_timepos_h",
-			      GINT_TO_POINTER((gint)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
+			      GINT_TO_POINTER((int)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
 	    g_object_set_data(G_OBJECT(aeventbox),"backup_timepos_l",
 			      GINT_TO_POINTER((guint)(((guint64)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-	    gdk_draw_line (GDK_DRAWABLE(aeventbox->window), mt->window->style->black_gc, offset, 1, offset, 
-			   aeventbox->allocation.height-2);
+
+	    cr = lives_painter_create_from_widget (aeventbox);
+
+	    if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
+	      lives_painter_set_source_rgb(cr,1.,1.,1.);
+	    else 
+	      lives_painter_set_source_rgb(cr,0.,0.,0.);
+	    
+	    lives_painter_move_to(cr,offset,0.);
+	    lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(aeventbox));
+	    
+	    lives_painter_stroke(cr);
+	    lives_painter_destroy(cr);
 	  }
 	}
       }
       if (expanded) eventbox=(GtkWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan0");
       else continue;
-      if (GTK_WIDGET_VISIBLE(eventbox)) {
+      if (lives_widget_is_visible(eventbox)) {
 	unpaint_line(mt,eventbox);
-	if (offset==-1) {
-	  offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
-	}
+
 	if (offset>0&&offset<ebwidth) {
-	  st_image=gdk_drawable_copy_to_image(GDK_DRAWABLE(eventbox->window),NULL,offset,1,0,0,1,
-					      eventbox->allocation.height-2);
-	  g_object_set_data(G_OBJECT(eventbox),"backup_image",st_image);
 	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_h",
-			    GINT_TO_POINTER((gint)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
+			    GINT_TO_POINTER((int)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
 	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_l",
 			    GINT_TO_POINTER((guint)(((guint64)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-	  gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset, 1, offset, 
-			 eventbox->allocation.height-2);
+
+	  cr = lives_painter_create_from_widget (eventbox);
+
+	  if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
+	    lives_painter_set_source_rgb(cr,1.,1.,1.);
+	  else 
+	    lives_painter_set_source_rgb(cr,0.,0.,0.);
+	    
+	  lives_painter_move_to(cr,offset,0.);
+	  lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
+	
+	  lives_painter_stroke(cr);
+	  lives_painter_destroy(cr);
+
 	}
       }
       // expanded right audio
       if (cfile->achans>1) eventbox=(GtkWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan1");
       else continue;
-      if (GTK_WIDGET_VISIBLE(eventbox)) {
+      if (lives_widget_is_visible(eventbox)) {
 	unpaint_line(mt,eventbox);
-	if (offset==-1) {
-	  offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
-	}
+
 	if (offset>0&&offset<ebwidth) {
-	  st_image=gdk_drawable_copy_to_image(GDK_DRAWABLE(eventbox->window),NULL,offset,1,0,0,1,
-					      eventbox->allocation.height-2);
-	  g_object_set_data(G_OBJECT(eventbox),"backup_image",st_image);
 	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_h",
-			    GINT_TO_POINTER((gint)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
+			    GINT_TO_POINTER((int)(((guint64)(currtime*U_SEC))>>32))); // upper 4 bytes
 	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_l",
 			    GINT_TO_POINTER((guint)(((guint64)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-	  gdk_draw_line (GDK_DRAWABLE(eventbox->window), mt->window->style->black_gc, offset, 1, offset,
-			 eventbox->allocation.height-2);
+
+	  cr = lives_painter_create_from_widget (eventbox);
+
+	  if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
+	    lives_painter_set_source_rgb(cr,1.,1.,1.);
+	  else 
+	    lives_painter_set_source_rgb(cr,0.,0.,0.);
+
+	  lives_painter_move_to(cr,offset,0.);
+	  lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
+	
+	  lives_painter_stroke(cr);
+	  lives_painter_destroy(cr);
 	}
       }
     }
@@ -12579,7 +13430,7 @@
 // menuitem callbacks
 
 
-static gboolean multitrack_end (GtkMenuItem *menuitem, gpointer user_data) {
+static boolean multitrack_end (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   return multitrack_delete (mt,!(prefs->warning_mask&WARN_MASK_EXIT_MT)||menuitem==NULL);
 }
@@ -12620,7 +13471,7 @@
 
 void show_clipinfo_cb (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gint current_file=mainw->current_file;
+  int current_file=mainw->current_file;
   if (mt->file_selected!=-1) {
     mainw->current_file=mt->file_selected;
     on_show_file_info_activate(NULL,NULL);
@@ -12664,35 +13515,33 @@
 
 void tc_to_rs (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->region_start=GTK_RULER(mt->timeline)->position;
+  mt->region_start=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 void tc_to_re (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->region_end=GTK_RULER(mt->timeline)->position;
+  mt->region_end=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 
 void rs_to_tc (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_tl_move(mt,mt->region_start-GTK_RULER(mt->timeline)->position);
+  mt_tl_move(mt,mt->region_start-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 }
 
 void re_to_tc (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_tl_move(mt,mt->region_end-GTK_RULER(mt->timeline)->position);
+  mt_tl_move(mt,mt->region_end-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 }
 
 
-
 //////////////////////////////////////////////////
 
 
 
-void
-on_move_fx_changed (GtkMenuItem *menuitem, gpointer user_data) {
+void on_move_fx_changed (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->opts.move_effects=!mt->opts.move_effects;
 }
@@ -12717,14 +13566,14 @@
 
 void select_from_zero_time (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->region_start==0.&&mt->region_end==0.) mt->region_end=GTK_RULER (mt->timeline)->position;
+  if (mt->region_start==0.&&mt->region_end==0.) mt->region_end=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   mt->region_start=0.;
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 void select_to_end_time (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->region_start==0.&&mt->region_end==0.) mt->region_start=GTK_RULER (mt->timeline)->position;
+  if (mt->region_start==0.&&mt->region_end==0.) mt->region_start=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   mt->region_end=mt->end_secs;
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
@@ -12734,8 +13583,9 @@
 void select_all_vid (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   GtkWidget *eventbox,*checkbutton;
-  gint current_track=mt->current_track;
   GList *vdr=mt->video_draws;
+
+  int current_track=mt->current_track;
   int i=0;
 
   g_signal_handler_block(mt->select_track,mt->seltrack_func);
@@ -12750,8 +13600,8 @@
 #ifdef ENABLE_GIW
     if (!prefs->lamp_buttons) {
 #endif
-      if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton))) 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
+      if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) 
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 #ifdef ENABLE_GIW
     }
     else {
@@ -12770,8 +13620,9 @@
 void select_no_vid (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   GtkWidget *eventbox,*checkbutton;
-  gint current_track=mt->current_track;
   GList *vdr=mt->video_draws;
+
+  int current_track=mt->current_track;
   int i=0;
 
   g_signal_handler_block(mt->select_track,mt->seltrack_func);
@@ -12787,8 +13638,8 @@
 #ifdef ENABLE_GIW
     if (!prefs->lamp_buttons) {
 #endif
-      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton))) 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),FALSE);
+      if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) 
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
 #ifdef ENABLE_GIW
     }
     else {
@@ -12856,7 +13707,7 @@
 					      GINT_TO_POINTER(TRACK_I_HIDDEN_USER));
   else g_object_set_data(G_OBJECT(mt->audio_draws->data),"hidden",GINT_TO_POINTER(0));
 
-  scroll_tracks(mt,mt->top_track);
+  scroll_tracks(mt,mt->top_track,FALSE);
   track_select(mt);
 }
 
@@ -12867,16 +13718,16 @@
 
   lives_mt *mt=(lives_mt *)user_data;
   lives_mt_poly_state_t poly_state=mt->poly_state;
-  gboolean needs_idlefunc=FALSE;
+  boolean needs_idlefunc=FALSE;
 
   mt->opts.show_ctx=gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem));
 
   set_mt_play_sizes(mt,cfile->hsize,cfile->vsize);
   mt_show_current_frame(mt, FALSE);
 
-  gtk_widget_set_size_request (mt->fd_frame, mt->play_window_width, mt->play_window_height+2*BORD_HEIGHT);
+  gtk_widget_set_size_request (mt->fd_frame, mt->play_window_width, mt->play_window_height+2*widget_opts.border_width);
   gtk_widget_set_size_request (mt->play_box, mt->play_window_width, mt->play_window_height);
-  gtk_widget_set_size_request (mt->hbox, -1, mt->play_window_height+2*BORD_HEIGHT);
+  gtk_widget_set_size_request (mt->hbox, -1, mt->play_window_height+2*widget_opts.border_width);
 
   if (mt->opts.show_ctx) {
     // set text to expanded
@@ -12904,12 +13755,12 @@
   }
   if (poly_state!=POLY_PARAMS) {
     polymorph(mt,POLY_NONE);
-    if (poly_state==POLY_IN_OUT) while (g_main_context_iteration(NULL,FALSE));
+    if (poly_state==POLY_IN_OUT) lives_widget_context_update();
     polymorph(mt,poly_state);
   }
   else polymorph(mt,POLY_PARAMS);
 
-  if (poly_state!=POLY_IN_OUT) while (g_main_context_iteration(NULL,FALSE));
+  if (poly_state!=POLY_IN_OUT) lives_widget_context_update();
 
   //re-enable auto backup
   if (needs_idlefunc) {
@@ -12921,8 +13772,8 @@
     gtk_widget_queue_resize(mt->window);
   }
 
-  mt->play_window_width=mt->play_box->allocation.width;
-  mt->play_window_height=mt->play_box->allocation.height;
+  mt->play_window_width=lives_widget_get_allocation_width(mt->play_box);
+  mt->play_window_height=lives_widget_get_allocation_height(mt->play_box);
 }
 
 
@@ -12937,17 +13788,17 @@
 
 
 
-static void remove_gaps_inner (GtkMenuItem *menuitem, gpointer user_data, gboolean only_first) {
+static void remove_gaps_inner (GtkMenuItem *menuitem, gpointer user_data, boolean only_first) {
   lives_mt *mt=(lives_mt *)user_data;
   GList *vsel=mt->selected_tracks;
   track_rect *block=NULL;
-  gint track;
+  int track;
   GtkWidget *eventbox;
   weed_timecode_t tc,new_tc,tc_last,new_tc_last,tc_first,block_tc;
-  gint filenum;
-  gboolean did_backup=mt->did_backup;
+  int filenum;
+  boolean did_backup=mt->did_backup;
   GList *track_sel;
-  gboolean audio_done=FALSE;
+  boolean audio_done=FALSE;
   weed_timecode_t offset=0;
 
   if (!did_backup&&mt->idlefunc>0) {
@@ -12978,7 +13829,7 @@
       // adjust the region so it begins after any first partially contained block
       block=get_block_before(eventbox,tc/U_SEC,TRUE);
       if (block!=NULL) {
-	new_tc=q_gint64(get_event_timecode(block->end_event)+(gdouble)(track>-1)*U_SEC/mt->fps,mt->fps);
+	new_tc=q_gint64(get_event_timecode(block->end_event)+(double)(track>-1)*U_SEC/mt->fps,mt->fps);
 	if (new_tc>tc) tc=new_tc;
       }
     }
@@ -12986,7 +13837,7 @@
       // adjust the region so it ends before any last partially contained block
       block=get_block_after(eventbox,tc_last/U_SEC,TRUE);
       if (block!=NULL) {
-	new_tc_last=q_gint64(get_event_timecode(block->start_event)-(gdouble)(track>-1)*U_SEC/mt->fps,mt->fps);
+	new_tc_last=q_gint64(get_event_timecode(block->start_event)-(double)(track>-1)*U_SEC/mt->fps,mt->fps);
 	if (new_tc_last<tc_last) tc_last=new_tc_last;
       }
     }
@@ -13031,7 +13882,7 @@
 	  mt->selected_tracks=track_sel;
 	  if (only_first&&offset==0) offset=new_tc-tc;
 	}
-	tc=q_gint64(get_event_timecode(block->end_event)+(gdouble)(track>-1)*U_SEC/mt->fps,mt->fps);
+	tc=q_gint64(get_event_timecode(block->end_event)+(double)(track>-1)*U_SEC/mt->fps,mt->fps);
       }
       if (mt->current_track>-1) vsel=vsel->next;
       else audio_done=TRUE;
@@ -13054,7 +13905,7 @@
 	if (new_tc<tc_first) break;
 
 	// subtract the length of the block to get the start point
-	block_tc=new_tc-get_event_timecode(block->start_event)+(gdouble)(track>-1)*U_SEC/mt->fps;
+	block_tc=new_tc-get_event_timecode(block->start_event)+(double)(track>-1)*U_SEC/mt->fps;
 
 	if (tc>new_tc) {
 	  // move this block to tc
@@ -13073,7 +13924,7 @@
 	  mt->selected_tracks=track_sel;
 	  if (only_first&&offset==0) offset=tc-new_tc+block_tc;
 	}
-	tc=q_gint64(get_event_timecode(block->start_event)-(gdouble)(track>-1)*U_SEC/mt->fps,mt->fps);
+	tc=q_gint64(get_event_timecode(block->start_event)-(double)(track>-1)*U_SEC/mt->fps,mt->fps);
       }
       if (mt->current_track>-1) vsel=vsel->next;
       else audio_done=TRUE;
@@ -13081,13 +13932,15 @@
   }
   
   if (!did_backup) {
-    if (mt->avol_fx!=-1&&(block==NULL||block->next==NULL)&&mt->audio_draws!=NULL&&mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
+    if (mt->avol_fx!=-1&&(block==NULL||block->next==NULL)&&mt->audio_draws!=NULL&&
+	mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
       apply_avol_filter(mt);
     }
   }
 
   mt->did_backup=did_backup;
-  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
+  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
+      mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
@@ -13110,11 +13963,11 @@
 
 
 
-static void split_block(lives_mt *mt, track_rect *block, weed_timecode_t tc, gint track, gboolean no_recurse) {
+static void split_block(lives_mt *mt, track_rect *block, weed_timecode_t tc, int track, boolean no_recurse) {
   weed_plant_t *event=block->start_event;
   weed_plant_t *start_event=event;
   weed_plant_t *old_end_event=block->end_event;
-  gint frame=0,clip;
+  int frame=0,clip;
   GtkWidget *eventbox;
   track_rect *new_block;
   weed_timecode_t offset_start;
@@ -13133,7 +13986,7 @@
   if (!WEED_EVENT_IS_FRAME(event)) event=get_next_frame_event(event);
   eventbox=block->eventbox;
 
-  if (cfile->achans==0||mt->audio_draws==NULL||!is_audio_eventbox(mt,eventbox)) {
+  if (!is_audio_eventbox(mt,eventbox)) {
     if (!no_recurse) {
       // if we have an audio block, split it too
       GtkWidget *aeventbox=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
@@ -13159,7 +14012,7 @@
     insert_audio_event_at(mt->event_list,event,track,clip,new_seek,vel);
   }
 
-  if (block->ordered||(cfile->achans>0&&is_audio_eventbox(mt,eventbox))) offset_start=block->offset_start-get_event_timecode(start_event)+get_event_timecode(event);
+  if (block->ordered||(is_audio_eventbox(mt,eventbox))) offset_start=block->offset_start-get_event_timecode(start_event)+get_event_timecode(event);
   else offset_start=calc_time_from_frame(clip,frame)*U_SEC;
 
   new_block=add_block_start_point (GTK_WIDGET(eventbox),tc,clip,offset_start,event,block->ordered);
@@ -13174,7 +14027,7 @@
 
 
 
-static void insgap_inner (lives_mt *mt, gint tnum, gboolean is_sel, gint passnm) {
+static void insgap_inner (lives_mt *mt, int tnum, boolean is_sel, int passnm) {
   // insert a gap in track tnum
   
   // we will process in 2 passes
@@ -13195,7 +14048,7 @@
   GtkWidget *eventbox;
   weed_timecode_t tc,new_tc;
   weed_plant_t *event,*new_event=NULL,*last_frame_event;
-  gint xnumclips,numclips,naclips;
+  int xnumclips,numclips,naclips;
   int aclip=0,*audio_clips;
   double aseek=0.,avel=0.,*audio_seeks;
   int clip,frame,*clips,*frames,*new_clips,*new_frames;
@@ -13205,10 +14058,10 @@
   int nintracks,*in_tracks;
   weed_plant_t *init_event;
   GList *slist;
-  gboolean found;
-  gint notmatched;
+  boolean found;
+  int notmatched;
 
-  gdouble end_secs;
+  double end_secs;
 
   switch (passnm) {
   case 1:
@@ -13460,8 +14313,8 @@
 
   lives_mt *mt=(lives_mt *)user_data;
   GList *slist=mt->selected_tracks;
-  gint track;
-  gboolean did_backup=mt->did_backup;
+  int track;
+  boolean did_backup=mt->did_backup;
   gchar *msg;
 
   if (!did_backup&&mt->idlefunc>0) {
@@ -13497,7 +14350,7 @@
 void on_insgap_cur_activate (GtkMenuItem     *menuitem,
 			     gpointer         user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gboolean did_backup=mt->did_backup;
+  boolean did_backup=mt->did_backup;
   gchar *msg,*tname;
 
   if (!did_backup&&mt->idlefunc>0) {
@@ -13540,16 +14393,16 @@
   unsigned char *memblock,*mem_end;
   mt_undo *new_redo=NULL;
   int i;
-  gint current_track;
-  gint clip_sel;
-  gint avol_fx;
-  gint num_tracks;
-  gboolean block_is_selected=FALSE;
-  gboolean avoid_fx_list=FALSE;
+  int current_track;
+  int clip_sel;
+  int avol_fx;
+  int num_tracks;
+  boolean block_is_selected=FALSE;
+  boolean avoid_fx_list=FALSE;
   gchar *msg,*utxt,*tmp;
   gchar *txt;
 
-  gdouble end_secs;
+  double end_secs;
   GList *slist;
   GList *label_list=NULL;
   GList *vlist,*llist;
@@ -13567,7 +14420,7 @@
   mt_desensitise(mt);
 
   mt->was_undo_redo=TRUE;
-  mt->ptr_time=GTK_RULER(mt->timeline)->position;
+  mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   if (mt->block_selected!=NULL) block_is_selected=TRUE;
   
@@ -13606,7 +14459,7 @@
     while (vlist!=NULL) {
       eventbox=GTK_WIDGET(vlist->data);
       label=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      txt=g_strdup(gtk_label_get_text(GTK_LABEL(label)));
+      txt=g_strdup(lives_label_get_text(LIVES_LABEL(label)));
       label_list=g_list_append(label_list,txt);
       vlist=vlist->next;
     }
@@ -13615,6 +14468,8 @@
     avol_fx=mt->avol_fx;
     mt->avol_fx=-1;
 
+    mt->no_expose=TRUE;
+
     event_list_free(mt->event_list);
     last_undo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)-1-mt->undo_offset);
     memblock=(unsigned char *)(last_undo)+sizeof(mt_undo);
@@ -13668,8 +14523,7 @@
     while (vlist!=NULL) {
       eventbox=GTK_WIDGET(vlist->data);
       label=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      g_free(GTK_LABEL(label)->text);
-      GTK_LABEL(label)->text=(gchar *)llist->data;
+      gtk_label_set_text(GTK_LABEL(label),(const gchar *)llist->data);
       vlist=vlist->next;
       llist=llist->next;
     }
@@ -13677,7 +14531,7 @@
 
     if (mt->event_list!=NULL) remove_markers(mt->event_list);
 
-    mt->selected_tracks=g_list_copy(seltracks);
+     mt->selected_tracks=g_list_copy(seltracks);
     slist=mt->selected_tracks;
     while (slist!=NULL) {
       eventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,GPOINTER_TO_INT(slist->data));
@@ -13685,7 +14539,7 @@
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 #ifdef ENABLE_GIW
       }
       else {
@@ -13701,6 +14555,8 @@
     if (mt->end_secs!=end_secs&&event_list_get_end_secs(mt->event_list)<=end_secs) set_timeline_end_secs (mt, end_secs);
   }
 
+  mt->no_expose=FALSE;
+
   mt->undo_offset++;
 
   if (mt->undo_offset==g_list_length(mt->undos)) mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
@@ -13709,7 +14565,7 @@
     mt_set_undoable(mt,undo->action,undo->extra,TRUE);
   }
   mt_set_redoable(mt,last_undo->action,last_undo->extra,TRUE);
-  GTK_RULER(mt->timeline)->position=mt->ptr_time;
+  lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->ptr_time);
   gtk_widget_queue_draw(mt->timeline);
 
   utxt=g_utf8_strdown((tmp=get_undo_text(last_undo->action,last_undo->extra)),-1);
@@ -13720,7 +14576,7 @@
   g_free(utxt);
   g_free(msg);
 
-  if (last_undo->action<=1024&&block_is_selected) mt_selblock(NULL, NULL, 0, (GdkModifierType)0, (gpointer)mt);
+  if (last_undo->action<=1024&&block_is_selected) mt_selblock(NULL, (gpointer)mt);
 
   // TODO - make sure this is the effect which is now deleted/added...
   if (mt->poly_state==POLY_PARAMS) {
@@ -13749,20 +14605,20 @@
   mt_undo *last_redo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)+1-mt->undo_offset);
   unsigned char *memblock,*mem_end;
   int i;
-  gint current_track;
-  gdouble end_secs;
+  int current_track;
+  double end_secs;
   GList *slist;
-  gint num_tracks;
+  int num_tracks;
   GtkWidget *checkbutton,*eventbox,*label;
   GList *label_list=NULL;
   GList *vlist,*llist;
   gchar *txt;
   GList *seltracks=NULL;
-  gint clip_sel;
-  gboolean block_is_selected;
+  int clip_sel;
+  boolean block_is_selected;
   gchar *msg,*utxt,*tmp;
   GList *aparam_view_list;
-  gint avol_fx;
+  int avol_fx;
 
   if (mt->undo_mem==NULL) return;
 
@@ -13776,7 +14632,7 @@
   if (mt->block_selected!=NULL) block_is_selected=TRUE; // TODO *** - need to set track and time 
 
   mt->was_undo_redo=TRUE;
-  mt->ptr_time=GTK_RULER(mt->timeline)->position;
+  mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   if (last_redo->action!=MT_UNDO_NONE) {
     current_track=mt->current_track;
@@ -13790,7 +14646,7 @@
     while (vlist!=NULL) {
       eventbox=GTK_WIDGET(vlist->data);
       label=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      txt=g_strdup(gtk_label_get_text(GTK_LABEL(label)));
+      txt=g_strdup(lives_label_get_text(LIVES_LABEL(label)));
       label_list=g_list_append(label_list,txt);
       vlist=vlist->next;
     }
@@ -13799,6 +14655,8 @@
     avol_fx=mt->avol_fx;
     mt->avol_fx=-1;
 
+    mt->no_expose=TRUE;
+
     event_list_free(mt->event_list);
 
     memblock=(unsigned char *)(last_redo)+sizeof(mt_undo);
@@ -13852,8 +14710,7 @@
     while (vlist!=NULL) {
       eventbox=GTK_WIDGET(vlist->data);
       label=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      g_free(GTK_LABEL(label)->text);
-      GTK_LABEL(label)->text=(gchar *)llist->data;
+      gtk_label_set_text(GTK_LABEL(label),(const gchar *)llist->data);
       vlist=vlist->next;
       llist=llist->next;
     }
@@ -13869,7 +14726,7 @@
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),TRUE);
+	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 #ifdef ENABLE_GIW
       }
       else {
@@ -13885,6 +14742,8 @@
     if (mt->end_secs!=end_secs&&event_list_get_end_secs(mt->event_list)<=end_secs) set_timeline_end_secs (mt, end_secs);
   }
 
+  mt->no_expose=FALSE;
+
   mt->undo_offset--;
 
   if (mt->undo_offset<=1) mt_set_redoable(mt,MT_UNDO_NONE,NULL,FALSE);
@@ -13895,7 +14754,7 @@
   last_redo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)-1-mt->undo_offset);
   mt_set_undoable(mt,last_redo->action,last_redo->extra,TRUE);
 
-  GTK_RULER(mt->timeline)->position=mt->ptr_time;
+  lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->ptr_time);
   gtk_widget_queue_draw(mt->timeline);
 
 
@@ -13924,25 +14783,20 @@
 
 
 
-void
-multitrack_view_details            (GtkMenuItem     *menuitem,
-				    gpointer         user_data) {
+void multitrack_view_details (GtkMenuItem *menuitem, gpointer user_data) {
   char buff[512];
-  fileinfo *filew;
+  lives_clipinfo_t *filew;
   lives_mt *mt=(lives_mt *)user_data;
   file *rfile=mainw->files[mt->render_file];
   guint bsize=0;
-  gdouble time=0.;
-  gint num_events=0;
+  double time=0.;
+  int num_events=0;
 
-  filew = create_info_window (cfile->achans,TRUE);
+  filew = create_clip_info_window (cfile->achans,TRUE);
 
-  g_snprintf(buff,512,"LiVES - %s",_("Multitrack details"));
-  gtk_window_set_title (GTK_WINDOW (filew->info_window), buff);
-  
   // type
   g_snprintf(buff,512,"\n  Event List");
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview24)),buff, -1);
+  text_view_set_text (LIVES_TEXT_VIEW (filew->textview24),buff, -1);
 
   // fps
   if (mt->fps>0) {
@@ -13952,11 +14806,11 @@
     g_snprintf(buff,512,"%s",_ ("\n (variable)"));
   }
 
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview25)),buff, -1);
+  text_view_set_text (LIVES_TEXT_VIEW (filew->textview25),buff, -1);
 
   // image size
   g_snprintf(buff,512,"\n  %dx%d",rfile->hsize,rfile->vsize);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview26)),buff, -1);
+  text_view_set_text (LIVES_TEXT_VIEW (filew->textview26),buff, -1);
 
   // elist time
   if (mt->event_list!=NULL) {
@@ -13966,39 +14820,40 @@
 
   // events
   g_snprintf(buff,512,"\n  %d",num_events);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview27)),buff, -1);
+  text_view_set_text (LIVES_TEXT_VIEW (filew->textview27),buff, -1);
 
   g_snprintf(buff,512,"\n  %.3f sec",time);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview28)),buff, -1);
+  text_view_set_text (LIVES_TEXT_VIEW (filew->textview28),buff, -1);
 
   // byte size
   g_snprintf(buff,512,"\n  %d bytes",bsize);
-  gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview29)),buff, -1);
+  text_view_set_text (LIVES_TEXT_VIEW (filew->textview29),buff, -1);
 
   if (cfile->achans>0) {
     g_snprintf(buff,512,"\n  %d Hz %d bit",cfile->arate,cfile->asampsize);
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview_lrate)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview_lrate),buff, -1);
   }
   
   if (cfile->achans>1) {
     g_snprintf(buff,512,"\n  %d Hz %d bit",cfile->arate,cfile->asampsize);
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (filew->textview_rrate)),buff, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (filew->textview_rrate),buff, -1);
   }
-  gtk_widget_show (filew->info_window);
+
 }
 
 
 
-static void add_effect_inner(lives_mt *mt, int num_in_tracks, int *in_tracks, int num_out_tracks, int *out_tracks, weed_plant_t *start_event, weed_plant_t *end_event) {
+static void add_effect_inner(lives_mt *mt, int num_in_tracks, int *in_tracks, int num_out_tracks, int *out_tracks, 
+			     weed_plant_t *start_event, weed_plant_t *end_event) {
   int i;
   weed_plant_t *event;
   void **init_events;
   weed_plant_t *filter=get_weed_filter(mt->current_fx);
   weed_timecode_t start_tc=get_event_timecode(start_event);
   weed_timecode_t end_tc=get_event_timecode(end_event);
-  gboolean did_backup=mt->did_backup;
-  gboolean has_params;
-  gdouble timesecs=GTK_RULER (mt->timeline)->position;
+  boolean did_backup=mt->did_backup;
+  boolean has_params;
+  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   weed_timecode_t tc=q_gint64(timesecs*U_SEC,mt->fps);
   lives_rfx_t *rfx;
 
@@ -14017,7 +14872,7 @@
   }
 
   // add effect_init event
-  mt->event_list=append_filter_init_event(mt->event_list,start_tc,mt->current_fx,num_in_tracks);
+  mt->event_list=append_filter_init_event(mt->event_list,start_tc,mt->current_fx,num_in_tracks,-1,NULL);
   mt->init_event=get_last_event(mt->event_list);
   unlink_event(mt->event_list,mt->init_event);
   weed_set_int_array(mt->init_event,"in_tracks",num_in_tracks,in_tracks);
@@ -14029,7 +14884,8 @@
     pchain=NULL;
   }
 
-  if (weed_plant_has_leaf(filter,"in_parameter_templates")) pchain=filter_init_add_pchanges(mt->event_list,filter,mt->init_event,num_in_tracks);
+  if (num_in_params(filter,FALSE,FALSE)>0) 
+    pchain=filter_init_add_pchanges(mt->event_list,filter,mt->init_event,num_in_tracks,0);
 
   // add effect map event
   init_events=get_init_events_before(start_event,mt->init_event,TRUE);
@@ -14081,7 +14937,7 @@
   rfx_free(rfx);
   g_free(rfx);
 
-  mt_tl_move(mt,start_tc/U_SEC-GTK_RULER (mt->timeline)->position);
+  mt_tl_move(mt,start_tc/U_SEC-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 
   if (has_params) {
     polymorph(mt,POLY_PARAMS);
@@ -14090,14 +14946,14 @@
   else polymorph(mt,POLY_FX_STACK);
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
-
-  mt_show_current_frame(mt, FALSE);
+  
+  //mt_show_current_frame(mt, FALSE);
 }
 
 
 
 
-weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, gdouble fps) {
+weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps) {
   // add blank frames from FRAME event (or NULL) start_event up to and including (quantised) end_tc
   // returns updated event_list
   weed_timecode_t tc;
@@ -14118,23 +14974,25 @@
 
 void mt_add_region_effect (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+
+  GList *llist;
+
   weed_plant_t *start_event;
   weed_plant_t *end_event;
+  weed_plant_t *last_frame_event=NULL;
 
   weed_timecode_t start_tc=q_gint64(mt->region_start*U_SEC,mt->fps);
   weed_timecode_t end_tc=q_gint64(mt->region_end*U_SEC-U_SEC/mt->fps,mt->fps);
+  weed_timecode_t last_frame_tc=0;
 
   gchar *filter_name;
   gchar *text,*tname,*track_desc;
-  gint numtracks=g_list_length(mt->selected_tracks);
-  int *tracks=(int *)g_malloc(numtracks*sizint);
-  gint tcount=0,tlast=-1000000,tsmall=-1,ctrack;
-  GList *llist;
+  gchar *tmp,*tmp1;
 
-  weed_plant_t *last_frame_event=NULL;
-  weed_timecode_t last_frame_tc=0;
+  int numtracks=g_list_length(mt->selected_tracks);
+  int tcount=0,tlast=-1000000,tsmall=-1,ctrack;
 
-  gchar *tmp,*tmp1;
+  int *tracks=(int *)g_malloc(numtracks*sizint);
 
   // sort selected tracks into ascending order
   while (tcount<numtracks) {
@@ -14150,7 +15008,7 @@
 
   // add blank frames up to region end (if necessary)
   if (mt->event_list!=NULL&&((last_frame_event=get_last_frame_event(mt->event_list))!=NULL)) last_frame_tc=get_event_timecode(last_frame_event);
-  if (end_tc>last_frame_tc) mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,end_tc-(gdouble)(tracks[0]<0)*U_SEC/mt->fps,mt->fps);
+  if (end_tc>last_frame_tc) mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,end_tc-(double)(tracks[0]<0)*U_SEC/mt->fps,mt->fps);
 
   if (menuitem!=NULL) mt->current_fx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"idx"));
 
@@ -14158,6 +15016,7 @@
   end_event=get_frame_event_at(mt->event_list,end_tc,start_event,TRUE);
 
   add_effect_inner(mt,numtracks,tracks,1,&tracks[0],start_event,end_event);
+
   if (menuitem==NULL&&!mt->is_atrans) {
     g_free(tracks);
     return;
@@ -14184,8 +15043,7 @@
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,FALSE); // compositor
     track_desc=g_strdup(_("selected tracks"));
     break;
-  }
-  g_free(tracks);
+  }  g_free(tracks);
   text=g_strdup_printf(_("Added %s %s to %s from %.4f to %.4f\n"),tname,filter_name,track_desc,start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,mt->fps)/U_SEC);
   d_print(text);
   g_free(text);
@@ -14194,6 +15052,11 @@
   g_free(track_desc);
 }
 
+static boolean mt_add_region_effect_idle (gpointer user_data) {
+  mt_add_region_effect(GTK_MENU_ITEM(dummy_menuitem),user_data);
+  gtk_widget_destroy(dummy_menuitem);
+  return FALSE;
+}
 
 
 void mt_add_block_effect (GtkMenuItem *menuitem, gpointer user_data) {
@@ -14215,14 +15078,20 @@
   add_effect_inner(mt,1,&selected_track,1,&selected_track,start_event,end_event);
 
   filter_name=weed_filter_get_name(mt->current_fx);
-  text=g_strdup_printf(_("Added effect %s to track %s from %.4f to %.4f\n"),filter_name,(tmp=get_track_name(mt,selected_track,mt->aud_track_selected)),start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,mt->fps)/U_SEC);
+  text=g_strdup_printf(_("Added effect %s to track %s from %.4f to %.4f\n"),filter_name,
+		       (tmp=get_track_name(mt,selected_track,mt->aud_track_selected)),
+		       start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,mt->fps)/U_SEC);
   g_free(tmp);
   d_print(text);
   g_free(text);
   g_free(filter_name);
 }
   
-
+static boolean mt_add_block_effect_idle (gpointer user_data) {
+  mt_add_block_effect(GTK_MENU_ITEM(dummy_menuitem),user_data);
+  gtk_widget_destroy(dummy_menuitem);
+  return FALSE;
+}
 
 void on_mt_list_fx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   // list effects at current frame/track
@@ -14230,12 +15099,23 @@
   polymorph(mt,POLY_FX_STACK);
 }
 
+
 void on_mt_delfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gboolean did_backup=mt->did_backup;
-  int error;
 
-  gchar *fhash;
+  weed_timecode_t start_tc,end_tc;
+
+  weed_plant_t *deinit_event,*init_event=mt->selected_init_event;
+
+  int *tracks;
+
+  gchar *fhash,*filter_name,*text;
+  gchar *tname,*track_desc;
+  gchar *tmp,*tmp1;
+
+  boolean did_backup=mt->did_backup;
+  int numtracks;
+  int error;
 
   if (mt->selected_init_event==NULL) return;
 
@@ -14246,14 +15126,49 @@
     mt->idlefunc=0;
   }
 
-  fhash=weed_get_string_value(mt->selected_init_event,"filter",&error);
+  fhash=weed_get_string_value(init_event,"filter",&error);
   mt->current_fx=weed_get_idx_for_hashname(fhash,TRUE);
   weed_free(fhash);
 
+  deinit_event=(weed_plant_t *)weed_get_voidptr_value(init_event,"deinit_event",&error);
+  filter_name=weed_filter_get_name(mt->current_fx);
+  start_tc=get_event_timecode(init_event);
+  end_tc=get_event_timecode(deinit_event)+U_SEC/mt->fps;
+
+  numtracks=weed_leaf_num_elements(init_event,"in_tracks");
+  tracks=weed_get_int_array(init_event,"in_tracks",&error);
+
+  numtracks=enabled_in_channels(get_weed_filter(mt->current_fx),TRUE);  // count repeated channels
+  switch (numtracks) {
+  case 1:
+    tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE); // effect
+    track_desc=g_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
+    g_free(tmp);
+    break;
+  case 2:
+    tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,FALSE); // transition
+    track_desc=g_strdup_printf(_("tracks %s and %s"),(tmp1=get_track_name(mt,tracks[0],FALSE)),(tmp=get_track_name(mt,tracks[1],FALSE)));
+    g_free(tmp);
+    g_free(tmp1);
+    break;
+  default:
+    tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,FALSE); // compositor
+    track_desc=g_strdup(_("selected tracks"));
+    break;
+  }  
+
+  weed_free(tracks);
+
+  text=g_strdup_printf(_("Deleted %s %s from %s from %.4f to %.4f\n"),tname,filter_name,track_desc,start_tc/U_SEC,end_tc/U_SEC);
+  g_free(filter_name); g_free(track_desc);
+
   if (!did_backup) mt_backup(mt,MT_UNDO_DELETE_FILTER,0);
 
   remove_filter_from_event_list(mt->event_list,mt->selected_init_event);
   remove_end_blank_frames(mt->event_list);
+
+  d_print(text);
+  g_free(text);
   
   mt->selected_init_event=NULL;
   mt->current_fx=-1;
@@ -14269,11 +15184,11 @@
 
 static void mt_jumpto (lives_mt *mt, lives_direction_t dir) {
   GtkWidget *eventbox;
-  weed_timecode_t tc=q_gint64(GTK_RULER (mt->timeline)->position*U_SEC,mt->fps);
-  gdouble secs=tc/U_SEC;
+  weed_timecode_t tc=q_gint64(lives_ruler_get_value(LIVES_RULER(mt->timeline))*U_SEC,mt->fps);
+  double secs=tc/U_SEC;
   track_rect *block;
   weed_timecode_t start_tc,end_tc;
-  gdouble offs=1.;
+  double offs=1.;
 
   if (mt->current_track>-1&&!mt->aud_track_selected) eventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
   else {
@@ -14319,7 +15234,7 @@
   if (secs<0.) secs=0.;
   if (secs>mt->end_secs) set_timeline_end_secs (mt, secs);
   mt->fm_edit_event=NULL;
-  mt_tl_move(mt,secs-GTK_RULER(mt->timeline)->position);
+  mt_tl_move(mt,secs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 }
 
 
@@ -14334,6 +15249,44 @@
 }
 
 
+
+static void on_rename_track_activate (GtkMenuItem *menuitem, gpointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
+  _entryw *rnentry;
+  GtkWidget *xeventbox;
+
+  gchar *cname;
+
+  int response;
+
+  if (mt->current_track<0) return;
+
+  xeventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+
+  cname=(gchar *)g_object_get_data(G_OBJECT(xeventbox),"track_name");
+
+  rnentry=create_rename_dialog(7);
+
+  response=gtk_dialog_run(GTK_DIALOG(rnentry->dialog));
+  
+  if (response==GTK_RESPONSE_CANCEL) return; // destroyed and freed in a callback
+
+  g_free(cname);
+
+  cname=g_strdup(gtk_entry_get_text(GTK_ENTRY(rnentry->entry)));
+
+  gtk_widget_destroy(rnentry->dialog);
+  g_free(rnentry);
+
+  g_object_set_data (G_OBJECT(xeventbox),"track_name",cname);
+
+  set_track_label(GTK_EVENT_BOX(xeventbox),mt->current_track);
+
+
+}  
+
+
+
 void on_cback_audio_activate (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->current_track=-1;
@@ -14346,17 +15299,17 @@
   lives_mt *mt=(lives_mt *)user_data;
 
   // save these values, because reget_afilesize() can reset them
-  gint arate=cfile->arate;
-  gint arps=cfile->arps;
-  gint asampsize=cfile->asampsize;
-  gint achans=cfile->achans;
-  gint signed_endian=cfile->signed_endian;
-  gint orig_file;
+  int arate=cfile->arate;
+  int arps=cfile->arps;
+  int asampsize=cfile->asampsize;
+  int achans=cfile->achans;
+  int signed_endian=cfile->signed_endian;
+  int orig_file;
   int i;
   gchar *com,*tmp;
-  gboolean had_audio=FALSE;
-  gboolean post_reset_ba=FALSE;
-  gboolean post_reset_ca=FALSE;
+  boolean had_audio=FALSE;
+  boolean post_reset_ba=FALSE;
+  boolean post_reset_ca=FALSE;
 
   if (mt->idlefunc>0) {
     g_source_remove(mt->idlefunc);
@@ -14370,7 +15323,7 @@
       unlink(cfile->info_file);
       mainw->error=FALSE;
       mainw->cancelled=CANCEL_NONE;
-      com=g_strdup_printf("smogrify backup_audio \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,FALSE);
       g_free(com);
       check_backend_return(cfile);
@@ -14404,8 +15357,8 @@
     // - although this would be time consuming when clicking or activating "render" in mt
 
     // auto-adjust mixer levels:
-    gboolean has_backing_audio=FALSE;
-    gboolean has_channel_audio=FALSE;
+    boolean has_backing_audio=FALSE;
+    boolean has_channel_audio=FALSE;
 
     // -> if we have either but not both: backing audio or channel audio
 
@@ -14580,11 +15533,11 @@
     mt_init_clips(mt,orig_file,TRUE);
     if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
     mt->idlefunc=0;
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     mt_clip_select(mt,TRUE);
   }
   else {
-    gboolean render_audio=prefs->render_audio;
+    boolean render_audio=prefs->render_audio;
     gchar *curtmpdir;
     // rendering failed - clean up
 
@@ -14593,7 +15546,7 @@
     prefs->render_audio=TRUE;
     mainw->event_list=NULL;
     if (mt->pr_audio) {
-      com=g_strdup_printf("smogrify undo_audio \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,FALSE);
       g_free(com);
       mt->has_audio_file=had_audio;
@@ -14602,7 +15555,14 @@
       // remove subdir
       do_threaded_dialog(_("Cleaning up..."),FALSE);
       curtmpdir=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/rm -rf \"%s/\"*",curtmpdir);
+#else
+      com=g_strdup_printf("DEL /q \"%s/\"*",curtmpdir);
+      lives_system(com,TRUE);
+      g_free(com);
+      com=g_strdup_printf("RMDIR \"%s/\"*",curtmpdir);
+#endif
       lives_system(com,TRUE);
       g_free(com);
       end_threaded_dialog();
@@ -14635,11 +15595,11 @@
 			  int track, weed_timecode_t new_start_tc, int new_track) {
   // move/remove filter_inits param_change and filter_deinits after deleting/moving a block
   weed_plant_t *event,*event_next;
-  gboolean was_moved;
+  boolean was_moved;
   int error;
   weed_plant_t *init_event,*deinit_event;
   GList *moved_events=NULL;
-  gboolean leave_event;
+  boolean leave_event;
   int i;
 
   if (first_event==NULL) event=get_first_event(mt->event_list);
@@ -14736,8 +15696,8 @@
 void on_split_activate (GtkMenuItem *menuitem, gpointer user_data) {
   // split current block at current time
   lives_mt *mt=(lives_mt *)user_data;
-  gdouble timesecs=GTK_RULER (mt->timeline)->position;
-  gboolean did_backup=mt->did_backup;
+  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  boolean did_backup=mt->did_backup;
   weed_timecode_t tc;
 
   if (mt->putative_block==NULL) return;
@@ -14771,8 +15731,8 @@
 void on_split_curr_activate (GtkMenuItem *menuitem, gpointer user_data) {
   // split current track at current time
   lives_mt *mt=(lives_mt *)user_data;
-  gdouble timesecs=GTK_RULER (mt->timeline)->position;
-  gboolean did_backup=mt->did_backup;
+  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  boolean did_backup=mt->did_backup;
   weed_timecode_t tc;
   GtkWidget *eventbox;
   track_rect *block;
@@ -14808,10 +15768,10 @@
   lives_mt *mt=(lives_mt *)user_data;
   GList *selt=mt->selected_tracks;
   GtkWidget *eventbox;
-  gint track;
+  int track;
   track_rect *block;
-  gdouble timesecs=GTK_RULER (mt->timeline)->position;
-  gboolean did_backup=mt->did_backup;
+  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  boolean did_backup=mt->did_backup;
 
   if (mt->selected_tracks==NULL) return;
 
@@ -14842,11 +15802,11 @@
   track_rect *block,*blockprev,*blocknext;
   weed_plant_t *event,*prevevent;
   GtkWidget *eventbox,*aeventbox;
-  gint track;
-  gboolean done=FALSE;
+  int track;
+  boolean done=FALSE;
   weed_timecode_t start_tc,end_tc;
   weed_plant_t *first_event;
-  gboolean did_backup=mt->did_backup;
+  boolean did_backup=mt->did_backup;
 
   if (mt->is_rendering) return;
 
@@ -14870,7 +15830,7 @@
   else track=-1;
 
   if ((aeventbox=GTK_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack")))!=NULL) {
-    gint current_track=mt->current_track;
+    int current_track=mt->current_track;
     mt->current_track=track;
     mt->block_selected=get_block_from_time(aeventbox,get_event_timecode(block->start_event)/U_SEC,mt);
     if (mt->block_selected!=NULL) on_delblock_activate(NULL,user_data);
@@ -14923,7 +15883,8 @@
   g_free(block);
 
   gtk_widget_queue_draw (eventbox);
-  if (cfile->achans>0&&mt->audio_draws!=NULL&&mt->opts.back_audio_tracks>0&&eventbox==mt->audio_draws->data&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
+  if (cfile->achans>0&&mt->audio_draws!=NULL&&mt->opts.back_audio_tracks>0&&eventbox==mt->audio_draws->data&&
+      GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
     GtkWidget *xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
     if (xeventbox!=NULL) gtk_widget_queue_draw (xeventbox);
     xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
@@ -14945,8 +15906,8 @@
     // gravity right - remove last gap from 0 to old block end time
 
 
-    gdouble oldr_start=mt->region_start;
-    gdouble oldr_end=mt->region_end;
+    double oldr_start=mt->region_start;
+    double oldr_end=mt->region_end;
     GList *tracks_sel=NULL;
     if (mt->current_track!=-1) {
       tracks_sel=g_list_copy(mt->selected_tracks);
@@ -14977,13 +15938,16 @@
 
   remove_end_blank_frames(mt->event_list);
 
-  if ((!mt->moving_block||get_first_frame_event(mt->event_list)==NULL)&&mt->avol_fx!=-1&&blocknext==NULL&&mt->audio_draws!=NULL&&get_first_event(mt->event_list)!=NULL) {
+  if ((!mt->moving_block||get_first_frame_event(mt->event_list)==NULL)&&mt->avol_fx!=-1&&blocknext==NULL&&
+      mt->audio_draws!=NULL&&get_first_event(mt->event_list)!=NULL) {
     apply_avol_filter(mt);
   }
 
   mt->did_backup=did_backup;
-  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
-    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
+  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
+      mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
+    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+
+				get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
@@ -15001,14 +15965,13 @@
   lives_mt *mt=(lives_mt *)user_data;
   GtkWidget *eventbox;
   GtkWidget *checkbutton;
-  gulong seltrack_func;
-  gboolean mi_state;
+  boolean mi_state;
 
   if (mt->current_track==-1) return;
 
   eventbox=(GtkWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
   checkbutton=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"checkbutton");
-  seltrack_func=(gulong)g_object_get_data(G_OBJECT(checkbutton),"tfunc");
+
   mi_state=gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem));
 
   if (mi_state) {
@@ -15025,18 +15988,18 @@
 #ifdef ENABLE_GIW
   if (!prefs->lamp_buttons) {
 #endif
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbutton))!=mi_state) {
-      g_signal_handler_block(checkbutton,seltrack_func);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),mi_state);
-      g_signal_handler_unblock(checkbutton,seltrack_func);
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))!=mi_state) {
+      g_signal_handlers_block_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),mi_state);
+      g_signal_handlers_unblock_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
     }
 #ifdef ENABLE_GIW
   }
   else {
     if (giw_led_get_mode(GIW_LED(checkbutton))!=mi_state) {
-      g_signal_handler_block(checkbutton,seltrack_func);
+      g_signal_handlers_block_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
       giw_led_set_mode(GIW_LED(checkbutton),mi_state);
-      g_signal_handler_unblock(checkbutton,seltrack_func);
+      g_signal_handlers_unblock_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
     }
   }
 #endif
@@ -15048,6 +16011,8 @@
   gtk_widget_set_sensitive (mt->remove_first_gaps, FALSE);
   gtk_widget_set_sensitive(mt->split_sel,FALSE);
   gtk_widget_set_sensitive(mt->fx_region_1,FALSE);
+  gtk_widget_set_sensitive(mt->fx_region_1a,FALSE);
+  gtk_widget_set_sensitive(mt->fx_region_1v,FALSE);
   gtk_widget_set_sensitive(mt->fx_region_2,FALSE);
   
   if (mt->selected_tracks!=NULL&&mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
@@ -15060,6 +16025,8 @@
       switch (g_list_length(mt->selected_tracks)) {
       case 1:
 	gtk_widget_set_sensitive(mt->fx_region_1,TRUE);
+	gtk_widget_set_sensitive(mt->fx_region_1v,TRUE);
+	if (cfile->achans>0) gtk_widget_set_sensitive(mt->fx_region_1a,TRUE);
 	break;
       case 2:
 	gtk_widget_set_sensitive(mt->fx_region_2,TRUE);
@@ -15080,7 +16047,7 @@
 
 
 void on_seltrack_toggled (GtkWidget *checkbutton, gpointer user_data) {
-  gint track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(checkbutton),"layer_number"));
+  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(checkbutton),"layer_number"));
   lives_mt *mt=(lives_mt *)user_data;
 
   mt->current_track=track;
@@ -15098,7 +16065,7 @@
 
 
 void mt_desensitise (lives_mt *mt) {
-  gdouble val;
+  double val;
   gtk_widget_set_sensitive (mt->clipedit,FALSE);
   gtk_widget_set_sensitive (mt->insert,FALSE);
   gtk_widget_set_sensitive (mt->audio_insert,FALSE);
@@ -15195,7 +16162,7 @@
   gtk_widget_set_sensitive (mt->checkbutton_avel_reverse,TRUE);
 
   if (mt->block_selected!=NULL&&(!mt->block_selected->start_anchored||
-				 !mt->block_selected->end_anchored)&&!gtk_toggle_button_get_active
+				 !mt->block_selected->end_anchored)&&!lives_toggle_button_get_active
       (GTK_TOGGLE_BUTTON(mt->checkbutton_avel_reverse))) {
     gtk_widget_set_sensitive (mt->spinbutton_avel,TRUE);
     gtk_widget_set_sensitive(mt->avel_scale,TRUE);
@@ -15236,7 +16203,7 @@
     }
   }
   else if (mt->poly_state==POLY_IN_OUT) {
-    gint filenum=mt_file_from_clip(mt,mt->clip_selected);
+    int filenum=mt_file_from_clip(mt,mt->clip_selected);
     g_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
     g_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(mt->spinbutton_in),1., mainw->files[filenum]->frames);
@@ -15266,18 +16233,18 @@
 }
 
 
-void mt_swap_play_pause (lives_mt *mt, gboolean put_pause) {
+void mt_swap_play_pause (lives_mt *mt, boolean put_pause) {
   GtkWidget *tmp_img;
 
   if (put_pause) {
-    tmp_img = gtk_image_new_from_stock ("gtk-media-pause", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+    tmp_img = lives_image_new_from_stock ("gtk-media-pause", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
     set_menu_text(mt->playall,_("_Pause"),TRUE);
     gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->m_playbutton),_("Pause (p)"));
     gtk_widget_set_sensitive(mt->playall,TRUE);
     gtk_widget_set_sensitive(mainw->m_playbutton,TRUE);
   }
   else {
-    tmp_img = gtk_image_new_from_stock ("gtk-media-play", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
+    tmp_img = lives_image_new_from_stock ("gtk-media-play", gtk_toolbar_get_icon_size (GTK_TOOLBAR (mainw->btoolbar)));
     set_menu_text(mt->playall,_("_Play from Timeline Position"),TRUE);
     gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(mainw->m_playbutton),_("Play all (p)"));
   }
@@ -15305,17 +16272,18 @@
 
   pb_loop_event=mt->pb_loop_event;
   pb_filter_map=mainw->filter_map; // keep a copy of this, in case we are rendering
-  pb_audio_needs_prerender=GTK_WIDGET_SENSITIVE(mt->prerender_aud);
+  pb_afilter_map=mainw->afilter_map; // keep a copy of this, in case we are rendering
+  pb_audio_needs_prerender=lives_widget_is_sensitive(mt->prerender_aud);
 
   mt_desensitise(mt);
 
   if (mt->mt_frame_preview) {
     // put blank back in preview window
-    if (mt->framedraw!=NULL) gtk_widget_modify_bg (mt->fd_frame, GTK_STATE_NORMAL, &palette->normal_back);
+    if (mt->framedraw!=NULL) lives_widget_set_bg_color (mt->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     
   }
   else {
-    gtk_widget_ref(mt->play_blank);
+    g_object_ref(mt->play_blank);
     gtk_container_remove (GTK_CONTAINER(mt->play_box),mt->play_blank);
   }
 
@@ -15323,7 +16291,7 @@
   gtk_widget_set_sensitive (mt->rewind,FALSE);
   gtk_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
 
-  if (!mt->is_paused&&!mt->playing_sel) mt->ptr_time=GTK_RULER(mt->timeline)->position;
+  if (!mt->is_paused&&!mt->playing_sel) mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   mainw->must_resize=TRUE;
 
@@ -15344,17 +16312,18 @@
 void mt_post_playback(lives_mt *mt) {
   // called from on_preview_clicked
 
-  unhide_cursor(mainw->playarea->window);
+  unhide_cursor(lives_widget_get_xwindow(mainw->playarea));
     
   mainw->must_resize=FALSE;
 
-  if (mainw->cancelled!=CANCEL_USER_PAUSED&&!((mainw->cancelled==CANCEL_NONE||mainw->cancelled==CANCEL_NO_MORE_PREVIEW)&&mt->is_paused)) {
+  if (mainw->cancelled!=CANCEL_USER_PAUSED&&!((mainw->cancelled==CANCEL_NONE||mainw->cancelled==CANCEL_NO_MORE_PREVIEW)&&
+					      mt->is_paused)) {
     gtk_widget_set_sensitive (mt->stop,FALSE);
-    mt_tl_move(mt,mt->ptr_time-GTK_RULER (mt->timeline)->position);
+    mt_tl_move(mt,mt->ptr_time-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
   }
   else {
     mt->is_paused=TRUE;
-    if (GTK_RULER(mt->timeline)->position>0.) {
+    if (lives_ruler_get_value(LIVES_RULER(mt->timeline))>0.) {
       gtk_widget_set_sensitive (mt->rewind,TRUE);
       gtk_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
     }
@@ -15367,7 +16336,8 @@
   if (!mt->is_rendering) {
     if (mt->poly_state==POLY_PARAMS) {
       if (mt->init_event!=NULL) {
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->node_spinbutton),(GTK_RULER(mt->timeline)->position-get_event_timecode(mt->init_event)/U_SEC));
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->node_spinbutton),
+				  (lives_ruler_get_value(LIVES_RULER(mt->timeline))-get_event_timecode(mt->init_event)/U_SEC));
 	gtk_widget_set_sensitive(mt->apply_fx_button,FALSE);
       }
     }
@@ -15376,18 +16346,13 @@
     }
   }
 
-  if (mainw->play_window!=NULL) {
-    g_signal_handlers_block_matched(mainw->play_window,(GSignalMatchType)(G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_UNBLOCKED),
-				    0,0,0,(gpointer)expose_play_window,NULL);
-    g_signal_handler_unblock(mainw->play_window,mainw->pw_exp_func);
-    mainw->pw_exp_is_blocked=FALSE;
-  }
   if (mt->ptr_time>0.) {
     gtk_widget_set_sensitive (mt->rewind,TRUE);
     gtk_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
   }
 
   mainw->filter_map=pb_filter_map;
+  mainw->afilter_map=pb_afilter_map;
 
   if (mt->is_paused) mt->pb_loop_event=pb_loop_event;
   gtk_widget_set_sensitive (mainw->m_playbutton, TRUE);
@@ -15409,7 +16374,7 @@
     mt->idlefunc=0;
   }
 
-  gtk_widget_ref(mt->context_scroll); // this allows us to get our old messages back
+  g_object_ref(mt->context_scroll); // this allows us to get our old messages back
   gtk_container_remove (GTK_CONTAINER (mt->context_frame), mt->context_scroll);
   mt->context_scroll=NULL;
   clear_context(mt);
@@ -15418,9 +16383,9 @@
   add_context_label(mt,_("to make a mark on the timeline"));
 
   if (mt->opts.follow_playback) {
-    gdouble currtime=GTK_RULER(mt->timeline)->position;
+    double currtime=lives_ruler_get_value(LIVES_RULER(mt->timeline));
     if (currtime>mt->tl_max||currtime<mt->tl_min) {
-      gdouble page=mt->tl_max-mt->tl_min;
+      double page=mt->tl_max-mt->tl_min;
       mt->tl_min=currtime-page*.25;
       mt->tl_max=currtime+page*.75;
       mt_zoom(mt,-1.);
@@ -15429,7 +16394,7 @@
 
   if (mt->is_rendering) {
     // preview during rendering
-    gboolean had_audio=mt->has_audio_file;
+    boolean had_audio=mt->has_audio_file;
     mt->pb_start_event=NULL;
     mt->has_audio_file=TRUE;
     on_preview_clicked(GTK_BUTTON(cfile->proc_ptr->preview_button),NULL);
@@ -15442,7 +16407,8 @@
       if (mainw->cancelled!=CANCEL_VID_END) {
 	// otherwise jack transport set us out of range
 
-	if (mt->playing_sel) mt->pb_loop_event=get_frame_event_at(mt->event_list,q_gint64(mt->region_start*U_SEC,mt->fps),NULL,TRUE);
+	if (mt->playing_sel) 
+	  mt->pb_loop_event=get_frame_event_at(mt->event_list,q_gint64(mt->region_start*U_SEC,mt->fps),NULL,TRUE);
 	else if (mt->is_paused) mt->pb_loop_event=pb_loop_event;
 	
 	on_preview_clicked (NULL,GINT_TO_POINTER(1));
@@ -15461,12 +16427,15 @@
 
   if (mt->opts.show_ctx) gtk_widget_show_all(mt->context_frame);
 
-  gtk_widget_unref(mt->context_scroll);
+  g_object_unref(mt->context_scroll);
+
+  if (!mt->is_rendering) {
+    mt_sensitise(mt);
+    mt->idlefunc=mt_idle_add(mt);
+  }
 
-  if (!mt->is_rendering) mt_sensitise(mt);
   if (!pb_audio_needs_prerender) gtk_widget_set_sensitive(mt->prerender_aud,FALSE);
 
-  mt->idlefunc=mt_idle_add(mt);
 
 }
 
@@ -15474,14 +16443,14 @@
 
 void multitrack_play_sel (GtkMenuItem *menuitem, gpointer user_data) {
   // get current pointer time; if it is outside the time region jump to start
-  gdouble ptr_time;
+  double ptr_time;
   lives_mt *mt=(lives_mt *)user_data;
 
-  ptr_time=GTK_RULER(mt->timeline)->position;
+  ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   if (!mt->is_paused) mt->ptr_time=ptr_time;
 
   if (ptr_time<mt->region_start||ptr_time>=mt->region_end) {
-    GTK_RULER(mt->timeline)->position=mt->region_start;
+    lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->region_start);
   }
 
   // set loop start point to region start, and pb_start to current position
@@ -15511,11 +16480,11 @@
 void multitrack_insert (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   file *sfile=mainw->files[mt->file_selected];
-  gdouble secs=GTK_RULER (mt->timeline)->position;
+  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   GtkWidget *eventbox;
   weed_timecode_t ins_start=(sfile->start-1.)/sfile->fps*U_SEC;
-  weed_timecode_t ins_end=(gdouble)(sfile->end)/sfile->fps*U_SEC;
-  gboolean did_backup=mt->did_backup;
+  weed_timecode_t ins_end=(double)(sfile->end)/sfile->fps*U_SEC;
+  boolean did_backup=mt->did_backup;
   track_rect *block;
 
   if (mt->current_track==-1) {
@@ -15542,7 +16511,7 @@
   if (mt->opts.ign_ins_sel) {
     // ignore selection limits
     ins_start=0;
-    ins_end=(gdouble)(sfile->frames)/sfile->fps*U_SEC;
+    ins_end=(double)(sfile->frames)/sfile->fps*U_SEC;
   }
 
   if (mt->insert_start!=-1) {
@@ -15555,9 +16524,10 @@
 
   block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
 
-  if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||(block->next!=NULL&&mt->opts.grav_mode==GRAV_MODE_RIGHT))&&!(did_backup||mt->moving_block)) {
-    gdouble oldr_start=mt->region_start;
-    gdouble oldr_end=mt->region_end;
+  if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||(block->next!=NULL&&mt->opts.grav_mode==GRAV_MODE_RIGHT))&&
+      !(did_backup||mt->moving_block)) {
+    double oldr_start=mt->region_start;
+    double oldr_end=mt->region_end;
     GList *tracks_sel;
     track_rect *selblock=NULL;
     if (mt->block_selected!=block) selblock=mt->block_selected;
@@ -15589,22 +16559,27 @@
   // get this again because it could have moved
   block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
 
+  if (prefs->atrans_fx!=-1) mt_do_autotransition(mt, block);
+
+  mt->did_backup=did_backup;
+
+  if (!resize_timeline(mt)&&!did_backup) {
+    lives_painter_surface_t *bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
+    draw_block(mt,NULL,bgimage,block,0,lives_widget_get_allocation_width(eventbox));
+    gtk_widget_queue_draw(eventbox);
+  }
+
   if (!did_backup) {
     if (mt->avol_fx!=-1&&block!=NULL&&block->next==NULL&&get_first_event(mt->event_list)!=NULL) {
       apply_avol_filter(mt);
     }
   }
 
-  if (prefs->atrans_fx!=-1) mt_do_autotransition(mt, block);
-
-  mt->did_backup=did_backup;
-
-  if (!resize_timeline(mt)) {
-    redraw_eventbox(mt,eventbox);
-  }
 
-  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
-    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
+  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&
+      weed_plant_has_leaf(mt->init_event,"in_tracks")) {
+    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*
+				U_SEC+get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
@@ -15619,11 +16594,11 @@
 void multitrack_audio_insert (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   file *sfile=mainw->files[mt->file_selected];
-  gdouble secs=GTK_RULER (mt->timeline)->position;
+  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   GtkWidget *eventbox=(GtkWidget *)mt->audio_draws->data;
   weed_timecode_t ins_start=q_gint64((sfile->start-1.)/sfile->fps*U_SEC,mt->fps);
-  weed_timecode_t ins_end=q_gint64((gdouble)sfile->end/sfile->fps*U_SEC,mt->fps);
-  gboolean did_backup=mt->did_backup;
+  weed_timecode_t ins_end=q_gint64((double)sfile->end/sfile->fps*U_SEC,mt->fps);
+  boolean did_backup=mt->did_backup;
   track_rect *block;
   gchar *text,*tmp;
   lives_direction_t dir;
@@ -15645,11 +16620,6 @@
     ins_start=0;
     ins_end=q_gint64(sfile->laudio_time*U_SEC,mt->fps);
   }
-  else {
-    if (ins_end>q_gint64((gdouble)(sfile->frames-.5)/sfile->fps*U_SEC,mt->fps)) {
-      q_gint64(((gdouble)sfile->end-.5)/sfile->fps*U_SEC,mt->fps);
-    }
-  }
 
   if (ins_start>q_gint64(sfile->laudio_time*U_SEC,mt->fps)) {
     return;
@@ -15673,9 +16643,11 @@
 
   block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
 
-  if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||(mt->opts.grav_mode==GRAV_MODE_RIGHT&&block->next!=NULL))&&!(did_backup||mt->moving_block)) {
-    gdouble oldr_start=mt->region_start;
-    gdouble oldr_end=mt->region_end;
+  if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||
+		    (mt->opts.grav_mode==GRAV_MODE_RIGHT&&block->next!=NULL))
+      &&!(did_backup||mt->moving_block)) {
+    double oldr_start=mt->region_start;
+    double oldr_end=mt->region_end;
     GList *tracks_sel;
     track_rect *selblock=NULL;
     if (mt->block_selected!=block) selblock=mt->block_selected;
@@ -15705,13 +16677,17 @@
 
   mt->did_backup=did_backup;
   
-  text=g_strdup_printf(_("Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f to %.4f\n"),ins_start/U_SEC,ins_end/U_SEC,(tmp=g_path_get_basename(sfile->name)),secs,secs+(ins_end-ins_start)/U_SEC);
+  text=g_strdup_printf(_("Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f to %.4f\n"),
+		       ins_start/U_SEC,ins_end/U_SEC,(tmp=g_path_get_basename(sfile->name)),secs,secs+(ins_end-ins_start)/U_SEC);
   d_print(text);
   g_free(tmp);
   g_free(text);
 
-  if (!resize_timeline(mt)) {
-    redraw_eventbox(mt,eventbox);
+  if (!resize_timeline(mt)&&!did_backup) {
+    lives_painter_surface_t *bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
+    draw_block(mt,NULL,bgimage,block,0,lives_widget_get_allocation_width(eventbox));
+    gtk_widget_queue_draw(eventbox);
+
     if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
       GtkWidget *xeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
       if (xeventbox!=NULL) gtk_widget_queue_draw (xeventbox);
@@ -15731,8 +16707,10 @@
 
   mt_tl_move(mt,0.);
 
-  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
-    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
+  if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
+      mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
+    weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*
+				U_SEC+get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
@@ -15741,7 +16719,8 @@
 }
 
  
-void insert_frames (gint filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, lives_direction_t direction, GtkWidget *eventbox, lives_mt *mt, track_rect *in_block) {
+void insert_frames (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, 
+		    lives_direction_t direction, GtkWidget *eventbox, lives_mt *mt, track_rect *in_block) {
   // insert the selected frames from mainw->files[filenum] from source file filenum into mt->event_list starting at timeline timecode tc
   // if in_block is non-NULL, then we extend (existing) in_block with the new frames; otherwise we create a new block and insert it into eventbox
 
@@ -15760,26 +16739,27 @@
   // TODO - handle case where frames are overwritten
 
   int numframes,i;
-  gint render_file=mainw->current_file;
-  gboolean isfirst=TRUE;
+  int render_file=mainw->current_file;
+  boolean isfirst=TRUE;
   file *sfile=mainw->files[filenum];
-  gint track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
   weed_timecode_t last_tc=0,offset_start_tc,start_tc,last_offset;
   int *clips=NULL,*frames=NULL,*rep_clips,*rep_frames,error;
   weed_plant_t *last_frame_event=NULL;
   weed_plant_t *event,*shortcut1=NULL,*shortcut2=NULL;
-  int frame=((gdouble)(offset_start/U_SEC)*mt->fps+1.4999);
+  int frame=((double)(offset_start/U_SEC)*mt->fps+1.4999);
   track_rect *new_block=NULL;
   gchar *text;
   weed_timecode_t orig_st=offset_start,orig_end=offset_end;
   GtkWidget *aeventbox=NULL;
-  gdouble aseek;
-  gdouble end_secs;
+  double aseek;
+  double end_secs;
 
   mt_desensitise(mt);
 
   g_object_set_data (G_OBJECT(eventbox),"block_last",(gpointer)NULL);
-  if ((aeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"atrack"))!=NULL) g_object_set_data (G_OBJECT(aeventbox),"block_last",(gpointer)NULL);
+  if ((aeventbox=(GtkWidget *)g_object_get_data(G_OBJECT(eventbox),"atrack"))!=NULL) 
+    g_object_set_data (G_OBJECT(aeventbox),"block_last",(gpointer)NULL);
 
   last_offset=offset_start_tc=q_gint64(offset_start,mt->fps);
   offset_end=q_gint64(offset_end,mt->fps);
@@ -15803,7 +16783,8 @@
 
   mainw->current_file=render_file;
 
-  while (((direction==DIRECTION_POSITIVE&&(offset_start=q_gint64(last_tc-start_tc+offset_start_tc,mt->fps))<offset_end)||(direction==DIRECTION_NEGATIVE&&(offset_start=q_gint64(last_tc+offset_start_tc-start_tc,mt->fps))>=offset_end))) {
+  while (((direction==DIRECTION_POSITIVE&&(offset_start=q_gint64(last_tc-start_tc+offset_start_tc,mt->fps))<offset_end)
+	  ||(direction==DIRECTION_NEGATIVE&&(offset_start=q_gint64(last_tc+offset_start_tc-start_tc,mt->fps))>=offset_end))) {
     numframes=0;
     clips=rep_clips=NULL;
     frames=rep_frames=NULL;
@@ -15883,7 +16864,7 @@
 	  if (cfile->achans>0&&sfile->achans>0&&mt->opts.insert_audio) {
 	    // insert audio start or end
 	    if (direction==DIRECTION_POSITIVE) {
-	      aseek=(gdouble)(frame-1.)/sfile->fps;
+	      aseek=(double)(frame-1.)/sfile->fps;
 
 	      insert_audio_event_at(mt->event_list,shortcut1,track,filenum,aseek,1.);
 	      add_block_start_point (aeventbox,last_tc,filenum,offset_start,shortcut1,TRUE);
@@ -15905,13 +16886,17 @@
     if (clips!=NULL) weed_free(clips);
     if (frames!=NULL) weed_free(frames);
     
-    if (direction==DIRECTION_POSITIVE) last_tc+=U_SEC/mt->fps;
+    if (direction==DIRECTION_POSITIVE) {
+      last_tc+=U_SEC/mt->fps;
+      last_tc=q_gint64(last_tc,mt->fps);
+    }
     else {
       if (last_tc<U_SEC/mt->fps) break;
       last_tc-=U_SEC/mt->fps;
+      last_tc=q_gint64(last_tc,mt->fps);
     }
-    last_tc=q_gint64(last_tc,mt->fps);
-    if (sfile->event_list==NULL) if ((direction==DIRECTION_POSITIVE&&(++frame>sfile->frames))||(direction==DIRECTION_NEGATIVE&&(--frame<1))) {
+    if (sfile->event_list==NULL) if ((direction==DIRECTION_POSITIVE&&(++frame>sfile->frames))||
+				     (direction==DIRECTION_NEGATIVE&&(--frame<1))) {
       break;
     }
   }
@@ -15952,7 +16937,10 @@
 
   if (in_block==NULL) {
     gchar *tmp,*tmp1;
-    text=g_strdup_printf(_("Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"),sfile->start,sfile->end,(tmp1=g_path_get_basename(sfile->name)),(tmp=get_track_name(mt,mt->current_track,mt->aud_track_selected)),(orig_st+start_tc)/U_SEC,(orig_end+start_tc)/U_SEC);
+    text=g_strdup_printf(_("Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"),
+			 sfile->start,sfile->end,(tmp1=g_path_get_basename(sfile->name)),
+			 (tmp=get_track_name(mt,mt->current_track,mt->aud_track_selected)),
+			 (orig_st+start_tc)/U_SEC,(orig_end+start_tc)/U_SEC);
     g_free(tmp);
     g_free(tmp1);
     d_print(text);
@@ -15967,7 +16955,9 @@
 }
 
 
-void insert_audio (gint filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, gdouble avel, lives_direction_t direction, GtkWidget *eventbox, lives_mt *mt, track_rect *in_block) {
+void insert_audio (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, 
+		   double avel, lives_direction_t direction, GtkWidget *eventbox, 
+		   lives_mt *mt, track_rect *in_block) {
   // insert the selected audio from mainw->files[filenum] from source file filenum into mt->event_list starting at timeline timecode tc
   // if in_block is non-NULL, then we extend (existing) in_block with the new frames; otherwise we create a new block and insert it into eventbox
   weed_timecode_t start_tc=q_gint64(tc,mt->fps);
@@ -15977,7 +16967,7 @@
   weed_plant_t *shortcut=NULL;
   weed_plant_t *frame_event;
 
-  gdouble end_secs;
+  double end_secs;
 
   g_object_set_data (G_OBJECT(eventbox),"block_last",(gpointer)NULL);
 
@@ -16035,7 +17025,10 @@
 void multitrack_view_events (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   GtkWidget *elist_dialog;
-  if ((prefs->event_window_show_frame_events&&count_events(mt->event_list,TRUE,0,0)>1000)||(!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,0,0)-count_events(mt->event_list,FALSE,0,0))>1000))) if (!do_event_list_warning()) return;
+  if ((prefs->event_window_show_frame_events&&count_events(mt->event_list,TRUE,0,0)>1000)||
+      (!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,0,0)
+						 -count_events(mt->event_list,FALSE,0,0))>1000))) 
+    if (!do_event_list_warning()) return;
   elist_dialog=create_event_list_dialog(mt->event_list,0,0);
   gtk_dialog_run(GTK_DIALOG(elist_dialog));
   gtk_widget_destroy(elist_dialog);
@@ -16049,7 +17042,10 @@
   weed_timecode_t tc_start=q_gint64(mt->region_start*U_SECL,mt->fps);
   weed_timecode_t tc_end=q_gint64(mt->region_end*U_SECL,mt->fps);
 
-  if ((prefs->event_window_show_frame_events&&count_events(mt->event_list,TRUE,tc_start,tc_end)>1000)||(!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,tc_start,tc_end)-count_events(mt->event_list,FALSE,tc_start,tc_end))>1000))) if (!do_event_list_warning()) return;
+  if ((prefs->event_window_show_frame_events&&count_events(mt->event_list,TRUE,tc_start,tc_end)>1000)||
+      (!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,tc_start,tc_end)
+						 -count_events(mt->event_list,FALSE,tc_start,tc_end))>1000))) 
+    if (!do_event_list_warning()) return;
   elist_dialog=create_event_list_dialog(mt->event_list,tc_start,tc_end);
   gtk_dialog_run(GTK_DIALOG(elist_dialog));
   gtk_widget_destroy(elist_dialog);
@@ -16060,7 +17056,9 @@
 // region functions
 
 void draw_region (lives_mt *mt) {
-  gdouble start,end;
+  lives_painter_t *cr;
+
+  double start,end;
   if (mt->region_start==mt->region_end) return;
 
 
@@ -16082,46 +17080,80 @@
     gtk_widget_set_sensitive(mt->re_to_tc,TRUE);
   }
 
-  gdk_draw_rectangle (GDK_DRAWABLE(mt->timeline_reg->window), mt->window->style->black_gc, TRUE, (start-mt->tl_min)*mt->timeline->allocation.width/(mt->tl_max-mt->tl_min), 0, (end-start)*mt->timeline->allocation.width/(mt->tl_max-mt->tl_min),mt->timeline_reg->allocation.height-2);
+  cr = lives_painter_create_from_widget (mt->timeline_reg);
+  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+  lives_painter_rectangle(cr,(start-mt->tl_min)*lives_widget_get_allocation_width(mt->timeline)/(mt->tl_max-mt->tl_min), 
+			  0, 
+			  (end-start)*lives_widget_get_allocation_width(mt->timeline)/(mt->tl_max-mt->tl_min), 
+			  lives_widget_get_allocation_height(mt->timeline_reg)-2);
+  lives_painter_fill(cr);
+  lives_painter_destroy(cr);
 }
 
-gint expose_timeline_reg_event (GtkWidget *timeline, GdkEventExpose *event, gpointer user_data) {
+
+#if GTK_CHECK_VERSION(3,0,0)
+static boolean expose_timeline_reg_event (GtkWidget *timeline, lives_painter_t *cairo, gpointer user_data) {
+  GdkEventExpose *event=NULL;
+#else
+static boolean expose_timeline_reg_event (GtkWidget *timeline, GdkEventExpose *event, gpointer user_data) {
+  lives_painter_t *cairo=NULL;
+#endif
+
+  lives_painter_t *cr=cairo;
+
   lives_mt *mt=(lives_mt *)user_data;
   GList *tl_marks=mt->tl_marks;
-  gint ebwidth;
-  gdouble time;
-  gint offset;
 
-  if (event->count>0) return FALSE;
+  double time;
+
+  int ebwidth;
+  int offset;
+
+  if (event!=NULL&&event->count>0) return FALSE;
   if (mainw->playing_file>-1||mt->is_rendering) return FALSE;
   draw_region (mt);
 
-  set_fg_colour(0,0,255);
+  if (cairo==NULL) cr=lives_painter_create_from_widget(timeline);
+
+  lives_painter_set_source_rgb(cr,0.,0.,1.);
 
   while (tl_marks!=NULL) {
     time=strtod((char *)tl_marks->data,NULL);
-    ebwidth=GTK_WIDGET(mt->timeline)->allocation.width;
-    offset=(time-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)ebwidth;
-    gdk_draw_line (GDK_DRAWABLE(mt->timeline_reg->window), mainw->general_gc, offset, 1, offset, 
-		   mt->timeline_reg->allocation.height-2);
+    ebwidth=lives_widget_get_allocation_width(mt->timeline);
+    offset=(time-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
+
+    lives_painter_move_to(cr,offset,1);
+    lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(mt->timeline_reg)-2);
+    lives_painter_stroke(cr);
+
     tl_marks=tl_marks->next;
   }
 
+  if (cairo==NULL) lives_painter_destroy(cr);
 
-  return FALSE;
+  return TRUE;
 }
 
 
-static float get_float_audio_val_at_time(gint fnum, gdouble secs, gint chnum, gint chans) {
+static float get_float_audio_val_at_time(int fnum, double secs, int chnum, int chans) {
   file *afile=mainw->files[fnum];
-  long bytes=secs*afile->arate*afile->achans*afile->asampsize/8;
-  long apos=((long)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8); // quantise
-  gchar *filename;
+  int64_t bytes;
+  int64_t apos;
+
   uint8_t val8;
   uint8_t val8b;
+
   uint16_t val16;
+
   float val;
 
+  gchar *filename;
+
+  bytes=secs*afile->arate*afile->achans*afile->asampsize/8;
+  if (bytes==0) return 0.;
+
+  apos=((int64_t)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8); // quantise
+
   if (fnum!=aofile) {
     if (afd!=-1) close(afd);
     filename=g_build_filename(prefs->tmpdir,afile->handle,"audio",NULL);
@@ -16135,6 +17167,10 @@
     return 0.;
   }
 
+#ifdef IS_MINGW
+  setmode(afd,O_BINARY);
+#endif
+
   apos+=afile->asampsize/8*chnum;
 
   lseek(afd,apos,SEEK_SET);
@@ -16161,27 +17197,25 @@
 
 
 
-static void draw_soundwave(GtkWidget *ebox, gint start, gint width, gint chnum, lives_mt *mt) {
+static void draw_soundwave(GtkWidget *ebox, lives_painter_surface_t *surf, int chnum, lives_mt *mt) {
   weed_plant_t *event;
   weed_timecode_t tc;
-  gdouble offset_startd,offset_endd; // time values
-  gint offset_start,offset_end;  // pixel values
-  gdouble tl_span=mt->tl_max-mt->tl_min;
-
-  gdouble start_secs=(gdouble)start/ebox->allocation.width*tl_span+mt->tl_min;
-  gdouble end_secs=(gdouble)(start+width)/ebox->allocation.width*tl_span+mt->tl_min;
-
-  gdouble secs;
-  int i;
-  gdouble ypos;
-
-  gint fnum;
-  gdouble seek,vel;
-
+  lives_painter_t *cr = lives_painter_create(surf);
   GtkWidget *eventbox=(GtkWidget *)g_object_get_data(G_OBJECT(ebox),"owner");
-  gint track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
   track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
 
+  double offset_startd,offset_endd; // time values
+  double tl_span=mt->tl_max-mt->tl_min;
+  double secs;
+  double ypos;
+  double seek,vel;
+
+  int offset_start,offset_end;  // pixel values
+  int fnum;
+  int width=lives_widget_get_allocation_width(ebox);
+  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+
+  register int i;
 
   aofile=-1;
   afd=-1;
@@ -16193,21 +17227,21 @@
     tc=get_event_timecode(event);
 
     offset_startd=tc/U_SEC;
-    if (offset_startd>end_secs) {
+    if (offset_startd>mt->tl_max) {
       if (afd!=-1) close(afd);
       return;
     }
 
-    offset_start=(int)((offset_startd-mt->tl_min)/tl_span*ebox->allocation.width+.5);
-    if ((start>0||width>0)&&offset_start>(start+width)) {
+    offset_start=(int)((offset_startd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(ebox)+.5);
+    if (width>0&&offset_start>width) {
       if (afd!=-1) close(afd);
       return;
     }
 
-    offset_endd=get_event_timecode(block->end_event)/U_SEC;
-    offset_end=(offset_endd-mt->tl_min)/tl_span*ebox->allocation.width;
+    offset_endd=get_event_timecode(block->end_event)/U_SEC+1./cfile->fps;
+    offset_end=(offset_endd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(ebox);
 
-    if (offset_end<start_secs) {
+    if (offset_end<mt->tl_max) {
       block=block->next;
       continue;
     }
@@ -16216,30 +17250,22 @@
     seek=get_audio_frame_seek(block->start_event,track);
     vel=get_audio_frame_vel(block->start_event,track);
 
-    gdk_draw_line(GDK_DRAWABLE(ebox->window),mt->window->style->fg_gc[0],offset_start,0,offset_start,
-		  ebox->allocation.height);
-    gdk_draw_line(GDK_DRAWABLE(ebox->window),mt->window->style->fg_gc[0],offset_start,0,offset_end,0);
-    gdk_draw_line(GDK_DRAWABLE(ebox->window),mt->window->style->fg_gc[0],offset_end,0,offset_end,
-		  ebox->allocation.height);
-    gdk_draw_line(GDK_DRAWABLE(ebox->window),mt->window->style->fg_gc[0],offset_end,ebox->allocation.height-1,
-		  offset_start,ebox->allocation.height-1);
+    lives_painter_set_source_rgb(cr,0.,0.,0.);
+    lives_painter_set_line_width(cr,1.);
+    lives_painter_rectangle(cr,offset_start,0,offset_end-offset_start,lives_widget_get_allocation_height(ebox)-1);
+    lives_painter_stroke(cr);
+
+    lives_painter_set_source_rgb(cr,0.5,0.5,0.5);
 
-    set_fg_colour(128,128,128); // mid grey
     for (i=offset_start;i<=offset_end;i++) {
-      secs=((gdouble)i/ebox->allocation.width*tl_span+mt->tl_min-offset_startd)*vel;
+      secs=((double)i/lives_widget_get_allocation_width(ebox)*tl_span+mt->tl_min-offset_startd)*vel;
       secs+=seek;
-      ypos=ABS(get_float_audio_val_at_time(fnum,secs,chnum,cfile->achans));
-      if (chnum==0)
-	gdk_draw_line(GDK_DRAWABLE(ebox->window),mainw->general_gc,i,
-		      ebox->allocation.height,i,(1.-ypos)*ebox->allocation.height);
-      else if (chnum==1)
-	gdk_draw_line(GDK_DRAWABLE(ebox->window),mainw->general_gc,i,
-		      0,i,ypos*ebox->allocation.height);
-      else
-	gdk_draw_line(GDK_DRAWABLE(ebox->window),mainw->general_gc,i,
-		      (1.-ypos)/2.*ebox->allocation.height,i,(1.+ypos)/2.*ebox->allocation.height);
-
+      if (secs>mainw->files[fnum]->laudio_time) break;
+      ypos=get_float_audio_val_at_time(fnum,secs,chnum,cfile->achans)*.5;
 
+      lives_painter_move_to(cr,i,(float)lives_widget_get_allocation_height(ebox)/2.);
+      lives_painter_line_to(cr,i,(.5-ypos)*(float)lives_widget_get_allocation_height(ebox));
+      lives_painter_stroke(cr);
     }
     block=block->next;
 
@@ -16250,6 +17276,8 @@
     }
   }
 
+  lives_painter_destroy(cr);
+
   if (afd!=-1) close(afd);
 
 
@@ -16259,140 +17287,99 @@
 
 
 
-gint mt_expose_laudtrack_event (GtkWidget *ebox, GdkEventExpose *event, gpointer user_data) {
-  lives_mt *mt=(lives_mt *)user_data;
-  GdkRegion *reg=event->region;
-  GdkRectangle rect;
-  GdkPixbuf *bgimage;
-
-  gint startx,width;
-  gint hidden;
-
-  if (mt->no_expose) return TRUE;
-
-  gdk_region_get_clipbox(reg,&rect);
-  startx=rect.x;
-  width=rect.width;
-
-  if (event!=NULL&&event->count>0) {
-    return TRUE;
-  }
-
-  hidden=(gint)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "hidden"));
-  if (hidden!=0) {
-    return FALSE;
-  }
-
-  if (width>ebox->allocation.width-startx) width=ebox->allocation.width-startx;
-
-  if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "drawn"))) {
-    bgimage=(GdkPixbuf *)g_object_get_data (G_OBJECT(ebox), "bgimg");
-    if (bgimage!=NULL&&lives_pixbuf_get_width(bgimage)>0) {
-      cairo_t *cr = gdk_cairo_create (ebox->window);
-      gdk_cairo_set_source_pixbuf (cr, bgimage, startx, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-      return FALSE;
-    }
-  }
-
-  gdk_window_clear_area (ebox->window, startx, 0, width, ebox->allocation.height);
-  draw_soundwave(ebox,startx,width,0,mt);
-
-
 #if GTK_CHECK_VERSION(3,0,0)
-  {
-    int xwidth,xheight;
-    gdk_window_get_size(ebox->window,&xwidth,&xheight);
-    if ((bgimage=gdk_pixbuf_get_from_window (ebox->window,
-					     0,0,
-					     xwidth,
-					     xheight
-					     ))!=NULL) {
+static boolean mt_expose_audtrack_event (GtkWidget *ebox, lives_painter_t *cairo, gpointer user_data) {
 #else
-  bgimage=gdk_pixbuf_get_from_drawable(NULL,GDK_DRAWABLE(ebox->window),NULL,0,0,0,0,ebox->allocation.width,
-				       ebox->allocation.height);
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
-    }
+static boolean mt_expose_audtrack_event (GtkWidget *ebox, GdkEventExpose *event, gpointer user_data) {
+  lives_painter_t *cairo=NULL;
 #endif
 
-  if (lives_pixbuf_get_width(bgimage)>0) {
-    g_object_set_data (G_OBJECT(ebox), "drawn",GINT_TO_POINTER(TRUE));
-    g_object_set_data (G_OBJECT(ebox), "bgimg",bgimage);
-  }
+  lives_painter_t *cr=cairo;
 
-  return FALSE;
-}
-
-
-gint mt_expose_raudtrack_event (GtkWidget *ebox, GdkEventExpose *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  GdkRegion *reg=event->region;
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  GdkRegion *reg;
   GdkRectangle rect;
-  GdkPixbuf *bgimage;
+#endif
 
-  gint startx,width;
-  gint hidden;
+  lives_painter_surface_t *bgimage;
+
+  int startx,starty,width,height;
+  int hidden;
+  int channum;
 
   if (mt->no_expose) return TRUE;
 
+#if !GTK_CHECK_VERSION(3,0,0)
+  reg=event->region;
   gdk_region_get_clipbox(reg,&rect);
   startx=rect.x;
+  starty=rect.y;
   width=rect.width;
+  height=rect.height;
 
   if (event!=NULL&&event->count>0) {
     return TRUE;
   }
+#else
+  startx=starty=0;
+  width=lives_widget_get_allocation_width(ebox);
+  height=lives_widget_get_allocation_height(ebox);
+#endif
+
+  if (width==0) return FALSE;
 
-  hidden=(gint)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "hidden"));
+  hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "hidden"));
   if (hidden!=0) {
     return FALSE;
   }
 
-  if (width>ebox->allocation.width-startx) width=ebox->allocation.width-startx;
+  if (width>lives_widget_get_allocation_width(ebox)-startx) width=lives_widget_get_allocation_width(ebox)-startx;
+
+  if (cairo==NULL) cr = lives_painter_create_from_widget (ebox);
+  bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(ebox), "bgimg");
 
   if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "drawn"))) {
-    bgimage=(GdkPixbuf *)g_object_get_data (G_OBJECT(ebox), "bgimg");
-    if (bgimage!=NULL&&lives_pixbuf_get_width(bgimage)>0) {
-      cairo_t *cr = gdk_cairo_create (ebox->window);
-      gdk_cairo_set_source_pixbuf (cr, bgimage, startx, 0);
-      cairo_paint (cr);
-      cairo_destroy (cr);
-      return FALSE;
+
+    if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
+      lives_painter_set_source_surface (cr, bgimage, startx, starty);
+      lives_painter_rectangle(cr,startx,starty,width,height);
+      lives_painter_paint (cr);
+      if (cairo==NULL) lives_painter_destroy(cr);
+      return TRUE;
     }
   }
 
-  gdk_window_clear_area (ebox->window, startx, 0, width, ebox->allocation.height);
-  draw_soundwave(ebox,startx,width,1,mt);
+#if !GTK_CHECK_VERSION(3,0,0)
+  width=lives_widget_get_allocation_width(ebox);
+  height=lives_widget_get_allocation_height(ebox);
+#endif
 
-#if GTK_CHECK_VERSION(3,0,0)
-  {
-    int xwidth,xheight;
-    gdk_window_get_size(ebox->window,&xwidth,&xheight);
-    if ((bgimage=gdk_pixbuf_get_from_window (ebox->window,
-					     0,0,
-					     xwidth,
-					     xheight
-					     ))!=NULL) {
-#else
-  bgimage=gdk_pixbuf_get_from_drawable(NULL,GDK_DRAWABLE(ebox->window),NULL,0,0,0,0,ebox->allocation.width,
-				       ebox->allocation.height);
+  if (bgimage!=NULL) lives_painter_surface_destroy(bgimage);
 
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
-    }
-#endif
+  bgimage=lives_painter_image_surface_create(LIVES_PAINTER_FORMAT_ARGB32,
+					     width,
+					     height);
 
-  if (lives_pixbuf_get_width(bgimage)>0) {
-    g_object_set_data (G_OBJECT(ebox), "drawn",GINT_TO_POINTER(TRUE));
-    g_object_set_data (G_OBJECT(ebox), "bgimg",bgimage);
+  channum=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(ebox),"channel"));
+
+  if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
+    draw_soundwave(ebox,bgimage,channum,mt);
+    g_object_set_data (G_OBJECT(ebox),"drawn",GINT_TO_POINTER(TRUE));
+    gtk_widget_queue_draw(ebox);
+  }
+  else if (bgimage!=NULL) {
+    lives_painter_surface_destroy(bgimage);
+    bgimage=NULL;
   }
 
-  return FALSE;
-}
+  g_object_set_data (G_OBJECT(ebox),"bgimg",bgimage);
 
+  if (cairo==NULL) lives_painter_destroy (cr);
 
+  return TRUE;
+}
 
 
 ////////////////////////////////////////////////////
@@ -16400,21 +17387,21 @@
 // functions for moving and clicking on the timeline
 
 
-gboolean
-on_timeline_update (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
+boolean on_timeline_update (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gint x;
-  gdouble pos;
+  int x;
+  double pos;
 
   if (mainw->playing_file>-1) return TRUE;
 
-  gdk_window_get_pointer(GDK_WINDOW (widget->window), &x, NULL, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   widget, &x, NULL);
   pos=get_time_from_x(mt,x);
 
   if (!mt->region_updating) {
     if (mt->tl_mouse) {
       mt->fm_edit_event=NULL;
-      mt_tl_move(mt,pos-GTK_RULER (mt->timeline)->position);
+      mt_tl_move(mt,pos-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
     }
     return TRUE;
   }
@@ -16431,14 +17418,14 @@
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_start),mt->region_start);
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_end),mt->region_end);
 
-  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&mt->tl_selecting&&event!=NULL) mouse_select_move(widget,mt);
+  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&mt->tl_selecting&&event!=NULL) mouse_select_move(widget,event,mt);
 
   return TRUE;
 }
 
 
 
-gboolean all_present (weed_plant_t *event, GList *sel) {
+boolean all_present (weed_plant_t *event, GList *sel) {
   int *clips;
   int *frames;
   int error,numclips,layer;
@@ -16541,7 +17528,7 @@
 }
 
 
-void do_fx_list_context (lives_mt *mt, gint fxcount) {
+void do_fx_list_context (lives_mt *mt, int fxcount) {
   clear_context(mt);
   add_context_label (mt,(_("Single click on an effect\nto select it.")));
   add_context_label (mt,(_("Double click on an effect\nto edit it.")));
@@ -16560,11 +17547,11 @@
 
 
 
-gboolean
+boolean
 on_timeline_release (GtkWidget *eventbox, GdkEventButton *event, gpointer user_data) {
   //button release
   lives_mt *mt=(lives_mt *)user_data;
-  gdouble pos=mt->region_end;
+  double pos=mt->region_end;
 
   if (mainw->playing_file>-1) return FALSE;
 
@@ -16588,11 +17575,9 @@
     g_signal_handler_unblock(mt->spinbutton_start,mt->spin_start_func);
     g_signal_handler_unblock(mt->spinbutton_end,mt->spin_end_func);
     gtk_widget_queue_draw(mt->timeline_reg);
-    gdk_window_process_updates(mt->timeline_reg->window,FALSE);
+    gdk_window_process_updates(lives_widget_get_xwindow(mt->timeline_reg),FALSE);
     draw_region(mt);
-    clear_context(mt);
-    add_context_label(mt,_("You can click and drag\nbelow the timeline"));
-    add_context_label(mt,_("to select a time region.\n"));
+    no_time_selected(mt);
   }
 
   if ((mt->region_end!=mt->region_start)&&eventbox==mt->timeline_reg) {
@@ -16627,26 +17612,27 @@
     if (mt->region_start==mt->region_end) gtk_widget_queue_draw (mt->timeline);
   }
   else {
-    if (eventbox!=mt->timeline_reg) mt_tl_move(mt,pos-GTK_RULER (mt->timeline)->position);
+    if (eventbox!=mt->timeline_reg) mt_tl_move(mt,pos-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
     gtk_widget_set_sensitive (mt->fx_region, FALSE);
     gtk_widget_set_sensitive (mt->ins_gap_cur, FALSE);
     gtk_widget_set_sensitive (mt->ins_gap_sel, FALSE);
     gtk_widget_set_sensitive (mt->playsel,FALSE);
     gtk_widget_set_sensitive (mt->remove_gaps, FALSE);
     gtk_widget_set_sensitive (mt->remove_first_gaps, FALSE);
-    if (mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS) gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->node_spinbutton),pos-get_event_timecode(mt->init_event)/U_SEC);
+    if (mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS) 
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->node_spinbutton),pos-get_event_timecode(mt->init_event)/U_SEC);
   }
 
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_start),mt->region_start);
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(mt->spinbutton_end),mt->region_end);
 
-  pos=GTK_RULER(mt->timeline)->position;
+  pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   if (pos>mt->region_end-1./mt->fps) gtk_widget_set_sensitive(mt->tc_to_rs,FALSE);
   else gtk_widget_set_sensitive(mt->tc_to_rs,TRUE);
   if (pos<mt->region_start+1./mt->fps) gtk_widget_set_sensitive(mt->tc_to_re,FALSE);
   else gtk_widget_set_sensitive(mt->tc_to_re,TRUE);
 
-  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&event!=NULL) mouse_select_end(eventbox,mt);
+  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&event!=NULL) mouse_select_end(eventbox,event,mt);
 
   gtk_widget_set_sensitive(mt->fx_region_1,FALSE);
   gtk_widget_set_sensitive(mt->fx_region_2,FALSE);
@@ -16655,6 +17641,8 @@
     switch (g_list_length(mt->selected_tracks)) {
     case 1:
       gtk_widget_set_sensitive(mt->fx_region_1,TRUE);
+      gtk_widget_set_sensitive(mt->fx_region_1v,TRUE);
+      if (cfile->achans>0) gtk_widget_set_sensitive(mt->fx_region_1a,TRUE);
       break;
     case 2:
       gtk_widget_set_sensitive(mt->fx_region_2,TRUE);
@@ -16674,15 +17662,15 @@
 }
 
 
-gboolean
-on_timeline_press (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
+boolean on_timeline_press (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gint x;
-  gdouble pos;
+  int x;
+  double pos;
 
   if (mainw->playing_file>-1) return FALSE;
 
-  gdk_window_get_pointer(GDK_WINDOW (widget->window), &x, NULL, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
+			   widget, &x, NULL);
   pos=get_time_from_x(mt,x);
   if (widget==mt->timeline_reg) {
     mt->region_start=mt->region_end=mt->region_init=pos;
@@ -16692,17 +17680,17 @@
 
   if (widget==mt->timeline_eb) {
     mt->fm_edit_event=NULL;
-    mt_tl_move(mt,pos-GTK_RULER(mt->timeline)->position);
+    mt_tl_move(mt,pos-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
     mt->tl_mouse=TRUE;
   }
 
-  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_start(widget,mt);
+  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_start(widget,event,mt);
 
   return TRUE;
 }
 
 
-weed_plant_t *get_prev_fm (lives_mt *mt, gint current_track, weed_plant_t *event) {
+weed_plant_t *get_prev_fm (lives_mt *mt, int current_track, weed_plant_t *event) {
   weed_plant_t *event2,*event3,*eventx;
 
   if (event==NULL) return NULL;
@@ -16758,7 +17746,7 @@
 }
 
 
-weed_plant_t *get_next_fm (lives_mt *mt, gint current_track, weed_plant_t *event) {
+weed_plant_t *get_next_fm (lives_mt *mt, int current_track, weed_plant_t *event) {
   weed_plant_t *event2,*event3;
 
   if (event==NULL) return NULL;
@@ -16792,27 +17780,37 @@
 
 
 
-static void add_mark_at(lives_mt *mt, gdouble time) {
-  gchar *tstring=g_strdup_printf("%.6f",time);
-  gint offset;
+static void add_mark_at(lives_mt *mt, double time) {
+  lives_painter_t *cr;
 
-  set_fg_colour(0,0,255);
+  gchar *tstring=g_strdup_printf("%.6f",time);
+  int offset;
 
   gtk_widget_set_sensitive(mt->clear_marks,TRUE);
   mt->tl_marks=g_list_append(mt->tl_marks,tstring);
-  offset=(time-mt->tl_min)/(mt->tl_max-mt->tl_min)*(gdouble)mt->timeline->allocation.width;
-  gdk_draw_line (GDK_DRAWABLE(mt->timeline_reg->window), mainw->general_gc, offset, 1, offset, mt->timeline_reg->allocation.height-2);
+  offset=(time-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)lives_widget_get_allocation_width(mt->timeline);
+
+  cr = lives_painter_create_from_widget (mt->timeline_reg);
+
+  lives_painter_set_source_rgb(cr,0.,0.,1.);
+
+  lives_painter_move_to(cr,offset,1);
+  lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(mt->timeline_reg)-2);
+  lives_painter_stroke(cr);
+
+  lives_painter_destroy(cr);
+
 }
 
 
 
-gboolean mt_mark_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
+boolean mt_mark_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gdouble cur_time;
+  double cur_time;
 
   if (mainw->playing_file==-1) return TRUE;
 
-  cur_time=GTK_RULER (mt->timeline)->position;
+  cur_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   add_mark_at(mt, cur_time);
   return TRUE;
@@ -16849,7 +17847,7 @@
 void on_prev_fm_clicked  (GtkWidget *button, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t tc;
-  gdouble secs=GTK_RULER(mt->timeline)->position;
+  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   tc=q_gint64(secs*U_SEC,mt->fps);
   weed_plant_t *event;
 
@@ -16859,7 +17857,7 @@
 
   if (event!=NULL) tc=get_event_timecode(event);
 
-  mt_tl_move(mt,tc/U_SEC-GTK_RULER(mt->timeline)->position);
+  mt_tl_move(mt,tc/U_SEC-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 }
 
 
@@ -16867,7 +17865,7 @@
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t tc;
   weed_plant_t *event;
-  gdouble secs=GTK_RULER(mt->timeline)->position;
+  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
   tc=q_gint64(secs*U_SEC,mt->fps);
 
   event=get_frame_event_at(mt->event_list,tc,mt->fm_edit_event,TRUE);
@@ -16876,14 +17874,14 @@
 
   if (event!=NULL) tc=get_event_timecode(event);
 
-  mt_tl_move(mt,tc/U_SEC-GTK_RULER(mt->timeline)->position);
+  mt_tl_move(mt,tc/U_SEC-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
 
 }
 
 
 
 static weed_timecode_t get_prev_node_tc(lives_mt *mt, weed_timecode_t tc) {
-  int num_params=weed_leaf_num_elements(get_weed_filter(mt->current_fx),"in_parameter_templates");
+  int num_params=num_in_params(get_weed_filter(mt->current_fx),FALSE,FALSE);
   int i,error;
   weed_timecode_t prev_tc=-1;
   weed_plant_t *event;
@@ -16903,7 +17901,7 @@
 
 
 static weed_timecode_t get_next_node_tc(lives_mt *mt, weed_timecode_t tc) {
-  int num_params=weed_leaf_num_elements(get_weed_filter(mt->current_fx),"in_parameter_templates");
+  int num_params=num_in_params(get_weed_filter(mt->current_fx),FALSE,FALSE);
   int i,error;
   weed_timecode_t next_tc=-1;
   weed_plant_t *event;
@@ -16923,8 +17921,8 @@
 }
 
 
-static gboolean is_node_tc(lives_mt *mt, weed_timecode_t tc) {
-  int num_params=weed_leaf_num_elements(get_weed_filter(mt->current_fx),"in_parameter_templates");
+static boolean is_node_tc(lives_mt *mt, weed_timecode_t tc) {
+  int num_params=num_in_params(get_weed_filter(mt->current_fx),FALSE,FALSE);
   int i,error;
   weed_plant_t *event;
   weed_timecode_t ev_tc;
@@ -16941,22 +17939,20 @@
 
 
 // apply the param changes and update widgets
-void
-on_node_spin_value_changed           (GtkSpinButton   *spinbutton,
-				      gpointer         user_data) {
+void on_node_spin_value_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t init_tc=get_event_timecode(mt->init_event);
   weed_timecode_t otc=gtk_spin_button_get_value(spinbutton)*U_SEC+init_tc;
   weed_timecode_t tc=q_gint64(otc,mt->fps);
-  gdouble timesecs;
-  gboolean auto_prev=mt->opts.fx_auto_preview;
+  double timesecs;
+  boolean auto_prev=mt->opts.fx_auto_preview;
 
-  g_object_freeze_notify(G_OBJECT(spinbutton));
+  g_signal_handlers_block_by_func(spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
 
   if (!mt->block_tl_move) {
     timesecs=otc/U_SEC;
     mt->block_node_spin=TRUE;
-    mt_tl_move(mt,timesecs-GTK_RULER (mt->timeline)->position);
+    mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
     mt->block_node_spin=FALSE;
   }
 
@@ -16995,7 +17991,7 @@
     if (mt->opts.fx_auto_preview||mainw->play_window!=NULL) mt_show_current_frame(mt, FALSE);
   }
 
-  g_object_thaw_notify(G_OBJECT(spinbutton));
+  g_signal_handlers_unblock_by_func(spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
 }
 
 // node buttons
@@ -17029,7 +18025,7 @@
   weed_timecode_t tc=q_gint64(gtk_spin_button_get_value(GTK_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
   weed_plant_t *prev_pchange,*next_pchange;
   gchar *filter_name,*text;
-  int num_params=weed_leaf_num_elements((weed_plant_t *)mt->current_rfx->source,"in_parameters");
+  int num_params=num_in_params((weed_plant_t *)mt->current_rfx->source,FALSE,FALSE);
   weed_plant_t **in_params=weed_get_plantptr_array((weed_plant_t *)mt->current_rfx->source,"in_parameters",&error);
 
   for (i=0;i<num_params;i++) {
@@ -17055,8 +18051,7 @@
 	else weed_leaf_copy(event,"value",paramtmpl,"default");
 	if (is_perchannel_multiw(param)) {
 	  int num_in_tracks=weed_leaf_num_elements(mt->init_event,"in_tracks");
-	  int param_hint=weed_get_int_value(paramtmpl,"hint",&error);
-	  fill_param_vals_to(paramtmpl,event,i,param_hint,num_in_tracks-1);
+	  fill_param_vals_to(event,paramtmpl,num_in_tracks-1);
 	}
       }
     }
@@ -17096,17 +18091,29 @@
 
   if (mt==NULL) return;
 
-  if (mt->fm_edit_event==old_event) mt->fm_edit_event=new_event;
-  if (mt->init_event==old_event) mt->init_event=new_event;
+  if (mt->fm_edit_event==old_event) {
+    //g_print("fme event\n");
+    mt->fm_edit_event=new_event;
+  }
+  if (mt->init_event==old_event) {
+    //g_print("ie event\n");
+    mt->init_event=new_event;
+  }
   if (mt->selected_init_event==old_event) {
+    //g_print("se event\n");
     mt->selected_init_event=new_event;
   }
-  if (mt->avol_init_event==old_event) mt->avol_init_event=new_event;
-  if (mt->specific_event==old_event) mt->specific_event=new_event;
+  if (mt->avol_init_event==old_event) {
+    //g_print("aie event\n");
+    mt->avol_init_event=new_event;
+  }
+  if (mt->specific_event==old_event) {
+    //g_print("spec event\n");
+    mt->specific_event=new_event;
+  }
 }
 
 
-
 static void combine_ign (weed_plant_t *xnew, weed_plant_t *xold) {
   int num,numo,*nign,*oign,i,error;
 
@@ -17186,8 +18193,8 @@
   int numtracks;
   int *tracks;
   int *ign;
-  gboolean has_multi=FALSE;
-  gboolean was_changed=FALSE;
+  boolean has_multi=FALSE;
+  boolean was_changed=FALSE;
   gchar *tmp,*tmp2;
 
   if (mt->idlefunc>0) {
@@ -17197,7 +18204,7 @@
 
   gtk_widget_set_sensitive(mt->apply_fx_button,FALSE);
 
-  for (i=0;((param=weed_inst_in_param(inst,i,FALSE))!=NULL);i++) {
+  for (i=0;((param=weed_inst_in_param(inst,i,FALSE,FALSE))!=NULL);i++) {
     if (!mt->current_rfx->params[i].changed) continue; // set only user changed parameters
     pchange=weed_plant_new(WEED_PLANT_EVENT);
     weed_set_int_value(pchange,"hint",WEED_EVENT_HINT_PARAM_CHANGE);
@@ -17319,7 +18326,7 @@
   gchar **array;
   GList *lmap=NULL;
   layout_map *lmap_entry;
-  gint64 unique_id;
+  guint64 unique_id;
   ssize_t bytes;
 
   gchar *lmap_name=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
@@ -17332,7 +18339,7 @@
   int fd;
   int retval;
 
-  gboolean err=FALSE;
+  boolean err=FALSE;
 
   if (!g_file_test(lmap_name,G_FILE_TEST_EXISTS)) {
     g_free(lmap_name);
@@ -17461,28 +18468,24 @@
   int fd;
   int len;
   int retval;
-  gint max_frame;
-  gboolean written=FALSE;
+  int max_frame;
+  boolean written=FALSE;
 
   guint size=0;
 
-  gdouble max_atime;
+  double max_atime;
 
   if (dir==NULL&&strlen(mainw->set_name)==0) return;
 
-  // TODO - dirsep
-
   if (file!=NULL&&(mainw->current_layouts_map==NULL||
 		   !g_list_find(mainw->current_layouts_map,file))) 
     mainw->current_layouts_map=g_list_append(mainw->current_layouts_map,g_strdup(file));
-  if (dir==NULL) ldir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts/",NULL);
+  if (dir==NULL) ldir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
   else ldir=g_strdup(dir);
 
   map_name=g_build_filename(ldir,"layout.map",NULL);
 
-  com=g_strdup_printf("/bin/mkdir -p \"%s\" 2>/dev/null",ldir);
-  lives_system(com,FALSE);
-  g_free(com);
+  g_mkdir_with_parents(ldir,S_IRWXU);
 
   do {
     retval=0;
@@ -17528,8 +18531,8 @@
 	    else max_atime=0.;
 	    
 	    new_entry=g_strdup_printf("%s|%d|%d|%.8f|%.8f|%.8f",file,i,max_frame,mainw->files[i]->fps,
-				      max_atime,(gdouble)((gint)((gdouble)(mainw->files[i]->arps)/
-								 (gdouble)mainw->files[i]->arate*10000.+.5))/10000.);
+				      max_atime,(double)((int)((double)(mainw->files[i]->arps)/
+								 (double)mainw->files[i]->arate*10000.+.5))/10000.);
 	    mainw->files[i]->layout_map=g_list_prepend(mainw->files[i]->layout_map,new_entry);
 	  }
 
@@ -17577,7 +18580,11 @@
 
     LIVES_DEBUG("Removing layout dir: ");
     LIVES_DEBUG(ldir);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",ldir);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",ldir);
+#endif
     lives_system(com,TRUE);
     g_free(com);
   }
@@ -17605,7 +18612,7 @@
   weed_timecode_t tc;
   GtkWidget *eventbox;
   weed_plant_t *event;
-  gint track;
+  int track;
 
   while (tlist!=NULL) {
     eventbox=(GtkWidget *)tlist->data;
@@ -17667,19 +18674,17 @@
   gchar *esave_dir;
   gchar *esave_file;
   gchar *msg;
-  gboolean response;
-  gboolean retval=TRUE;
+  boolean response;
+  boolean retval=TRUE;
   gchar *filt[]={"*.lay",NULL};
-  gboolean was_set=mainw->was_set;
+  boolean was_set=mainw->was_set;
   gchar *com;
   int *layout_map;
   int retval2;
   double *layout_map_audio;
   GtkWidget *ar_checkbutton;
-  GtkWidget *eventbox;
-  GtkWidget *label;
   GtkWidget *hbox;
-  gboolean orig_ar_layout=prefs->ar_layout,ar_layout;
+  boolean orig_ar_layout=prefs->ar_layout,ar_layout;
   weed_plant_t *event_list;
   gchar *layout_name;
   gchar xlayout_name[PATH_MAX];
@@ -17748,47 +18753,27 @@
       g_snprintf(new_set_name,128,"%s",gtk_entry_get_text (GTK_ENTRY (renamew->entry)));
       gtk_widget_destroy(renamew->dialog);
       g_free(renamew);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
     } while (!is_legal_set_name(new_set_name,FALSE));
     g_snprintf(mainw->set_name,128,"%s",new_set_name);
   }
   
-  esave_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts/",NULL);
-  com=g_strdup_printf ("/bin/mkdir -p \"%s\"",esave_dir);
-  lives_system (com,FALSE);
-  g_free (com);
+  esave_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",G_DIR_SEPARATOR_S,NULL);
+  g_mkdir_with_parents(esave_dir,S_IRWXU);
 
-  ar_checkbutton = gtk_check_button_new ();
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic (_("_Autoreload each time"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),ar_checkbutton);
+  hbox = lives_hbox_new (FALSE, 0);
 
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    ar_checkbutton);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  ar_checkbutton = lives_standard_check_button_new (_("_Autoreload each time"),TRUE,LIVES_BOX(hbox),NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-
-  gtk_box_pack_start (GTK_BOX (hbox), ar_checkbutton, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  GTK_WIDGET_SET_FLAGS (ar_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ar_checkbutton),prefs->ar_layout);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(ar_checkbutton),prefs->ar_layout);
   g_signal_connect (GTK_OBJECT (ar_checkbutton), "toggled",
 		    G_CALLBACK (on_autoreload_toggled),
 		    GINT_TO_POINTER(2));
 
   gtk_widget_show_all(hbox);
 
-  if (!strlen(layout_name)) esave_file=choose_file(esave_dir,NULL,filt,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,hbox);
-  else esave_file=choose_file(esave_dir,layout_name,filt,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,hbox);
+  if (!strlen(layout_name)) esave_file=choose_file(esave_dir,NULL,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,hbox);
+  else esave_file=choose_file(esave_dir,layout_name,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,hbox);
 
   ar_layout=prefs->ar_layout;
   prefs->ar_layout=orig_ar_layout;
@@ -17800,12 +18785,20 @@
 
   if (esave_file==NULL||!check_storage_space(NULL,FALSE)) {
     gchar *cdir;
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",esave_dir);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",esave_dir);
+#endif
     lives_system(com,TRUE);
     g_free(com);
 
     cdir=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",cdir);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",cdir);
+#endif
     lives_system(com,TRUE);
     g_free(com);
 
@@ -17839,6 +18832,9 @@
     fd=creat(esave_file,DEF_FILE_PERMS);
 
     if (fd>=0) {
+#ifdef IS_MINGW
+      setmode(fd,O_BINARY);
+#endif
       retval=save_event_list_inner(mt,fd,event_list,NULL);
       close(fd);
     }
@@ -17911,7 +18907,7 @@
     else xnew=g_strdup_printf("%s %d at timecode %"PRId64"\n",msg,num,tc);
   }
   tmp=g_strconcat (ebuf,xnew,NULL);
-#define SILENT_EVENT_LIST_LOAD
+  //#define SILENT_EVENT_LIST_LOAD
 #ifndef SILENT_EVENT_LIST_LOAD
   g_printerr("Rec error: %s",xnew);
 #endif
@@ -17926,16 +18922,18 @@
 static int get_next_tt_key(ttable *trans_table) {
   int i;
   for (i=free_tt_key;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
-    if (trans_table[i].in==NULL) return i;
+    if (trans_table[i].in==0) return i;
   }
   return -1;
 }
 
-static void *find_init_event_in_ttable(ttable *trans_table, weed_plant_t *in, gboolean normal) {
+static void *find_init_event_in_ttable(ttable *trans_table, uint64_t in, boolean normal) {
   int i;
   for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
     if (normal&&trans_table[i].in==in) return trans_table[i].out;
-    if (!normal&&trans_table[i].out==in) return trans_table[i].in; // reverse lookup for past filter_map check
+
+    /// reverse lookup for past filter_map check
+    if (!normal&&(uint64_t)trans_table[i].out==in) return (void *)trans_table[i].in;
     if (trans_table[i].out==NULL) return NULL;
   }
   return NULL;
@@ -17973,14 +18971,14 @@
 
 
 void move_init_in_filter_map(lives_mt *mt, weed_plant_t *event_list, weed_plant_t *event, weed_plant_t *ifrom, 
-			     weed_plant_t *ito, gint track, gboolean after) {
+			     weed_plant_t *ito, int track, boolean after) {
   int error,i,j;
   weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value(ifrom,"deinit_event",&error);
   void **events_before=NULL;
   void **events_after=NULL;
-  gint num_before=0,j1;
-  gint num_after=0,j2;
-  gboolean got_after;
+  int num_before=0,j1;
+  int num_after=0,j2;
+  boolean got_after;
   void **init_events,**new_init_events;
   int num_inits;
 
@@ -18067,7 +19065,7 @@
 
 
 
-gboolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2, gint ctrack) {
+boolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2, int ctrack) {
   // return TRUE if the maps match exactly; if ctrack is !=-1000000, 
   // then we only compare filter maps where ctrack is an in_track or out_track
   int i1,i2,error,num_events1,num_events2;
@@ -18181,18 +19179,29 @@
 static gchar *filter_map_check(ttable *trans_table,weed_plant_t *filter_map, weed_timecode_t deinit_tc, 
 			       weed_timecode_t fm_tc, gchar *ebuf) {
   int num_init_events;
-  void **init_events;
-  void **copy_events;
+  void **copy_events,**pinit_events;
   int error,i;
+  uint64_t* init_events;
 
   if (!weed_plant_has_leaf(filter_map,"init_events")) return ebuf;
   // check no deinited events are active
   num_init_events=weed_leaf_num_elements(filter_map,"init_events");
-  if (num_init_events==1&&weed_get_voidptr_value(filter_map,"init_events",&error)==NULL) return ebuf;
-  init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
+
+  if (weed_leaf_seed_type(filter_map,"init_events")==WEED_SEED_INT64) {
+    if (num_init_events==1&&weed_get_int64_value(filter_map,"init_events",&error)==0) return ebuf;
+    init_events=(uint64_t *)(weed_get_int64_array(filter_map,"init_events",&error));
+  }
+  else {
+    if (num_init_events==1&&weed_get_voidptr_value(filter_map,"init_events",&error)==NULL) return ebuf;
+    pinit_events=weed_get_voidptr_array(filter_map,"init_events",&error);
+    init_events=(uint64_t *)weed_malloc(num_init_events*sizeof(uint64_t));
+    for (i=0;i<num_init_events;i++) init_events[i]=(uint64_t)pinit_events[i];
+    weed_free(pinit_events);
+  }
+
   copy_events=(void **)g_malloc(num_init_events*sizeof(weed_plant_t *));
   for (i=0;i<num_init_events;i++) {
-    if (find_init_event_in_ttable(trans_table,(weed_plant_t *)init_events[i],FALSE)!=NULL) copy_events[i]=init_events[i];
+    if (find_init_event_in_ttable(trans_table,init_events[i],FALSE)!=NULL) copy_events[i]=(void *)init_events[i]; // !!
     else {
       copy_events[i]=NULL;
       ebuf=rec_error_add(ebuf,"Filter_map points to invalid filter_init",-1,fm_tc);
@@ -18211,20 +19220,20 @@
   // add filter deinit events for any remaining active filters
   int i,j,error,num_params;
   gchar *filter_hash;
-  gint idx;
+  int idx;
   weed_plant_t *filter,*init_event,*event;
   void **in_pchanges;
 
   for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
     if (trans_table[i].out==NULL) continue;
-    if (trans_table[i].in!=NULL) {
+    if (trans_table[i].in!=0) {
       event_list=append_filter_deinit_event(event_list,tc,(init_event=(weed_plant_t *)trans_table[i].out),pchains[i]);
       event=get_last_event(event_list);
 
       filter_hash=weed_get_string_value(init_event,"filter",&error);
       if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
 	filter=get_weed_filter(idx);
-	if ((num_params=num_in_params(filter,TRUE,TRUE))>0) {
+	if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
 	  in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
 	  for (j=0;j<num_params;j++) {
 	    if (!WEED_EVENT_IS_FILTER_INIT((weed_plant_t *)pchains[i][j])) 
@@ -18326,7 +19335,7 @@
 }
 
 
-static void add_missing_atrack_closers(weed_plant_t *event_list, gdouble fps, gchar *ebuf) {
+static gchar *add_missing_atrack_closers(weed_plant_t *event_list, double fps, gchar *ebuf) {
   GList *alist=atrack_list;
   gchar *entry;
   gchar **array;
@@ -18339,7 +19348,7 @@
   int num_atracks;
   weed_timecode_t tc;
 
-  if (atrack_list==NULL) return;
+  if (atrack_list==NULL) return ebuf;
 
   num_atracks=g_list_length(atrack_list)*2;
 
@@ -18377,12 +19386,13 @@
   g_list_free_strings(atrack_list);
   g_list_free(atrack_list);
   atrack_list=NULL;
+  return ebuf;
 }
 
 
 
 
-gboolean event_list_rectify(lives_mt *mt, weed_plant_t *event_list) {
+boolean event_list_rectify(lives_mt *mt, weed_plant_t *event_list) {
   // check and reassemble a newly loaded event_list
   // reassemply consists of matching init_event(s) to event_id's
   // we also rebuild our param_change chains ("in_parameters" in filter_init and filter_deinit, 
@@ -18397,7 +19407,6 @@
   weed_plant_t *event=get_first_event(event_list),*event_next;
   weed_plant_t *shortcut=NULL;
   weed_plant_t *last_frame_event;
-  weed_plant_t *event_id;
   weed_plant_t *last_filter_map=NULL;
   weed_plant_t *filter=NULL;
   weed_plant_t *last_event;
@@ -18430,26 +19439,33 @@
   int marker_type;
   int ev_count=0;
 
-  gboolean check_filter_map=FALSE;
-  gboolean was_deleted=FALSE;
-  gboolean was_moved;
-  gboolean missing_clips=FALSE,missing_frames=FALSE;
+  boolean check_filter_map=FALSE;
+  boolean was_deleted=FALSE;
+  boolean was_moved;
+  boolean missing_clips=FALSE,missing_frames=FALSE;
 
   void *init_event;
-  void **init_events,**new_init_events;
-  void **in_pchanges,**orig_pchanges;
+  void **new_init_events;
+  void **in_pchanges;
   void **pchains[FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL]; // parameter chains
 
-  gdouble fps=weed_get_double_value(event_list,"fps",&error);
+  double fps=weed_get_double_value(event_list,"fps",&error);
   double *aseek_index,*new_aseek_index;
 
   GtkWidget *transient;
 
-  if (mt!=NULL) mt->layout_prompt=FALSE;
+  uint64_t event_id;
+
+  uint64_t *init_events;
 
   ttable trans_table[FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL]; // translation table for init_events
 
-  for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) trans_table[i].in=trans_table[i].out=NULL;
+  if (mt!=NULL) mt->layout_prompt=FALSE;
+
+  for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
+    trans_table[i].in=0;
+    trans_table[i].out=NULL;
+  }
 
   free_tt_key=0;
 
@@ -18496,6 +19512,10 @@
 
     switch (hint) {
     case WEED_EVENT_HINT_FILTER_INIT:
+      //#define DEBUG_TTABLE
+#ifdef DEBUG_TTABLE
+      g_print("\n\ngot filter init %p\n",event);
+#endif
       // set in table
       if (!weed_plant_has_leaf(event,"event_id")) {
 	ebuf=rec_error_add(ebuf,"Filter_init missing event_id",-1,tc);
@@ -18578,7 +19598,7 @@
 			  }
 			  else {
 			    if (weed_plant_has_leaf(event,"in_tracks")) {
-			      gint ntracks=weed_leaf_num_elements(event,"in_tracks");
+			      int ntracks=weed_leaf_num_elements(event,"in_tracks");
 			      int *trax=weed_get_int_array(event,"in_tracks",&error);
 			      for (i=0;i<ntracks;i++) {
 				if (trax>=0&&!has_video_chans_in(filter,FALSE)) {
@@ -18661,12 +19681,21 @@
 	    host_tag_s=g_strdup_printf("%d",host_tag);
 	    weed_set_string_value(event,"host_tag",host_tag_s);
 	    g_free(host_tag_s);
-	    event_id=(weed_plant_t *)weed_get_voidptr_value(event,"event_id",&error);
+
+	    if (weed_leaf_seed_type(event,"event_id")==WEED_SEED_INT64)
+	      event_id=(uint64_t)(weed_get_int64_value(event,"event_id",&error));
+	    else
+	      event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"event_id",&error));
+
 	    trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=event_id;
 	    trans_table[idx].out=event;
+#ifdef DEBUG_TTABLE
+	    g_print("adding lookup %"PRIu64" -> %p\n",event_id,event);
+#endif
 	    
 	    // use pchain array
-	    if ((num_params=num_in_params(filter,TRUE,TRUE))>0) {
+	    if (weed_plant_has_leaf(event,"in_parameters")) {
+	      num_params=weed_leaf_num_elements(event,"in_parameters");
 	      pchains[idx]=(void **)g_malloc(num_params*sizeof(void *));
 	      in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
 	      for (i=0;i<num_params;i++) {
@@ -18674,6 +19703,7 @@
 		in_pchanges[i]=NULL;
 	      }
 	      // set all to NULL, we will re-fill as we go along
+	      weed_leaf_delete(event,"in_parameters");
 	      weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges);
 	      g_free(in_pchanges);
 	    }
@@ -18690,20 +19720,31 @@
 	was_deleted=TRUE;
       }
       else {
-	event_id=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+	if (weed_leaf_seed_type(event,"init_event")==WEED_SEED_INT64)
+	  event_id=(uint64_t)(weed_get_int64_value(event,"init_event",&error));
+	else
+	  event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error));
+
+#ifdef DEBUG_TTABLE
+	g_print("looking for %"PRIu64" in ttable\n",event_id);
+#endif
 	init_event=find_init_event_in_ttable(trans_table,event_id,TRUE);
+
 	if (init_event==NULL) {
 	  ebuf=rec_error_add(ebuf,"Filter_deinit has invalid init_event",-1,tc);
 	  delete_event(event_list,event);
 	  was_deleted=TRUE;
 	}
 	else {
+	  weed_leaf_delete((weed_plant_t *)init_event,"deinit_event");
 	  weed_set_voidptr_value((weed_plant_t *)init_event,"deinit_event",event);
+
 	  host_tag_s=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&error);
 	  host_tag=atoi(host_tag_s);
 	  weed_free(host_tag_s);
-	  trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=NULL;
+	  trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=0;
 	  if (idx<free_tt_key) free_tt_key=idx;
+	  weed_leaf_delete(event,"init_event");
 	  weed_set_voidptr_value(event,"init_event",init_event);
 	  check_filter_map=TRUE;
 	  last_deinit_tc=tc;
@@ -18711,13 +19752,14 @@
 	  filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
 	  if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
 	    filter=get_weed_filter(filter_idx);
-	    if ((num_params=num_in_params(filter,TRUE,TRUE))>0) {
+	    if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
 	      in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
 	      for (i=0;i<num_params;i++) {
 		if (!WEED_EVENT_IS_FILTER_INIT((weed_plant_t *)pchains[idx][i])) 
 		  in_pchanges[i]=(weed_plant_t *)pchains[idx][i];
 		else in_pchanges[i]=NULL;
 	      }
+	      weed_leaf_delete(event,"in_parameters");
 	      weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set array to last param_changes
 	      g_free(in_pchanges);
 	      g_free(pchains[idx]);
@@ -18731,12 +19773,24 @@
 	// update "init_events" from table
       if (weed_plant_has_leaf(event,"init_events")) {
 	num_init_events=weed_leaf_num_elements(event,"init_events");
-	init_events=weed_get_voidptr_array(event,"init_events",&error);
+	if (weed_leaf_seed_type(event,"init_events")==WEED_SEED_INT64)
+	  init_events=(uint64_t *)weed_get_int64_array(event,"init_events",&error);
+	else  {
+	  void **pinit_events=weed_get_voidptr_array(event,"init_events",&error);
+	  init_events=(uint64_t *)weed_malloc(num_init_events*sizeof(uint64_t));
+	  for (i=0;i<num_init_events;i++) init_events[i]=(uint64_t)pinit_events[i];
+	  weed_free(pinit_events);
+	}
+
 	new_init_events=(void **)g_malloc(num_init_events*sizeof(void *));
 	for (i=0;i<num_init_events;i++) {
-	  event_id=(weed_plant_t *)init_events[i];
-	  if (event_id!=NULL) {
+	  event_id=(uint64_t)init_events[i];
+	  if (event_id!=0) {
+
 	    init_event=find_init_event_in_ttable(trans_table,event_id,TRUE);
+#ifdef DEBUG_TTABLE
+	    g_print("looking for %"PRIu64" in ttable, got %p\n",event_id,init_event);
+#endif
 	    if (init_event==NULL) {
 	      ebuf=rec_error_add(ebuf,"Filter_map has invalid init_event",-1,tc);
 	      new_init_events[i]=NULL;
@@ -18747,6 +19801,8 @@
 	}
 	new_init_events=remove_nulls_from_filter_map(new_init_events,&num_init_events);
 
+	weed_leaf_delete(event,"init_events");
+
 	if (new_init_events==NULL) weed_set_voidptr_value(event,"init_events",NULL);
 	else {
 	  weed_set_voidptr_array(event,"init_events",num_init_events,new_init_events);
@@ -18797,7 +19853,10 @@
 	    was_deleted=TRUE;
 	  }
 	  else {
-	    event_id=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+	    if (weed_leaf_seed_type(event,"init_event")==WEED_SEED_INT64)
+	      event_id=(uint64_t)(weed_get_int64_value(event,"init_event",&error));
+	    else
+	      event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error));
 	    if ((init_event=find_init_event_in_ttable(trans_table,event_id,TRUE))==NULL) {
 	      ebuf=rec_error_add(ebuf,"Param_change has invalid init_event",-1,tc);
 	      delete_event(event_list,event);
@@ -18808,7 +19867,7 @@
 	      if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
 		filter=get_weed_filter(filter_idx);
 		pnum=weed_get_int_value(event,"index",&error);
-		if (pnum<0||pnum>=(num_params=num_in_params(filter,TRUE,TRUE))) {
+		if (pnum<0||pnum>=(num_params=num_in_params(filter,FALSE,FALSE))) {
 		  ebuf=rec_error_add(ebuf,"Param_change has invalid index",pnum,tc);
 		  delete_event(event_list,event);
 		  was_deleted=TRUE;
@@ -18842,22 +19901,55 @@
 			weed_free(host_tag_s);
 			idx=host_tag-FX_KEYS_MAX_VIRTUAL-1;
 			if (pchains[idx][pnum]==init_event) {
-			  orig_pchanges=weed_get_voidptr_array((weed_plant_t *)init_event,"in_parameters",&error);
-			  in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
-			  for (i=0;i<num_params;i++) {
-			    if (orig_pchanges[i]==NULL&&i==pnum) in_pchanges[i]=(void *)event;
-			    else in_pchanges[i]=orig_pchanges[i];
+			  if (weed_leaf_seed_type((weed_plant_t *)init_event,"in_parameters")==WEED_SEED_INT64) {
+			    // leave as int64_t and we will change afterwards
+			    uint64_t *orig_pchanges=(uint64_t *)weed_get_int64_array((weed_plant_t *)init_event,
+									   "in_parameters",&error);
+
+			    uint64_t *pin_pchanges=(uint64_t *)g_malloc(num_params*sizeof(uint64_t));
+			    
+			    for (i=0;i<num_params;i++) {
+			      if (orig_pchanges[i]==0&&i==pnum) pin_pchanges[i]=(uint64_t)event;
+			      else pin_pchanges[i]=(uint64_t)orig_pchanges[i];
+			    }
+
+			    weed_leaf_delete((weed_plant_t *)init_event,"in_parameters");
+			    weed_set_int64_array((weed_plant_t *)init_event,"in_parameters",num_params,
+						 (int64_t*)pin_pchanges);
+
+			    g_free(pin_pchanges);
+			    weed_free(orig_pchanges);
+
+			  }
+			  else {
+			    void **orig_pchanges=weed_get_voidptr_array((weed_plant_t *)init_event,
+									 "in_parameters",&error);
+			    void **pin_pchanges=(void **)g_malloc(num_params*sizeof(void *));
+			    
+			    for (i=0;i<num_params;i++) {
+			      if (orig_pchanges[i]==NULL&&i==pnum) pin_pchanges[i]=(void *)event;
+			      else pin_pchanges[i]=(void *)orig_pchanges[i];
+			    }
+			    weed_leaf_delete((weed_plant_t *)init_event,"in_parameters");
+			    weed_set_voidptr_array((weed_plant_t *)init_event,"in_parameters",num_params,pin_pchanges);
+
+			    g_free(pin_pchanges);
+			    weed_free(orig_pchanges);
+
 			  }
-			  weed_set_voidptr_array((weed_plant_t *)init_event,"in_parameters",num_params,in_pchanges);
-			  g_free(in_pchanges);
-			  g_free(orig_pchanges);
+
+			  weed_leaf_delete(event,"prev_change");
 			  weed_set_voidptr_value(event,"prev_change",NULL);
 			}
 			else {
+			  weed_leaf_delete(event,"next_change");
 			  weed_set_voidptr_value((weed_plant_t *)pchains[idx][pnum],"next_change",event);
+			  weed_leaf_delete(event,"prev_change");
 			  weed_set_voidptr_value(event,"prev_change",pchains[idx][pnum]);
 			}
+			weed_leaf_delete(event,"next_change");
 			weed_set_voidptr_value(event,"next_change",NULL);
+			weed_leaf_delete(event,"init_event");
 			weed_set_voidptr_value(event,"init_event",init_event);
 			pchains[idx][pnum]=event;
 		      }}}
@@ -18896,6 +19988,7 @@
 	  if (clip_index[i]>0&&(clip_index[i]>MAX_FILES||renumbered_clips[clip_index[i]]<1||
 				mainw->files[renumbered_clips[clip_index[i]]]==NULL)) {
 	    // clip has probably been closed, so we remove its frames
+
 	    new_clip_index[i]=-1;
 	    new_frame_index[i]=0;
 	    ebuf=rec_error_add(ebuf,"Invalid clip number",clip_index[i],tc);
@@ -19128,6 +20221,34 @@
     hint=get_event_hint(event);
     switch (hint) {
     case WEED_EVENT_HINT_FILTER_INIT:
+      // if our in_parameters are int64, convert to void *
+      if (weed_plant_has_leaf(event,"in_parameters")) {
+	uint64_t *pin_params;
+	void **nin_params;
+	num_params=weed_leaf_num_elements(event,"in_parameters");
+
+	if (weed_leaf_seed_type(event,"in_parameters")==WEED_SEED_INT64) {
+	  pin_params=(uint64_t *)weed_get_int64_array(event,"in_parameters",&error);
+	  nin_params=(void **)g_malloc(num_params*sizeof(void *));
+	  for (i=0;i<num_params;i++) {
+	    nin_params[i]=(void *)pin_params[i];
+	  }
+	  weed_free(pin_params);
+	  weed_leaf_delete(event,"in_parameters");
+	  weed_set_voidptr_array(event,"in_parameters",num_params,nin_params);
+	  g_free(nin_params);
+	}
+
+	filter_hash=weed_get_string_value(event,"filter",&error);
+	if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
+	  void **pchain;
+	  filter=get_weed_filter(filter_idx);
+	  // fill in any newly added params
+	  num_tracks=weed_leaf_num_elements(event,"in_tracks");
+	  pchain=filter_init_add_pchanges(event_list,filter,event,num_tracks,num_params-1);
+	  g_free(pchain);
+	}
+      }
       if (mt!=NULL&&event!=mt->avol_init_event) {
 	if (!move_event_right(event_list,event,last_frame_tc!=tc,fps)) was_moved=TRUE;
       }
@@ -19162,7 +20283,7 @@
     else event=event_next;
   }
 
-  add_missing_atrack_closers(event_list,fps,ebuf);
+  ebuf=add_missing_atrack_closers(event_list,fps,ebuf);
 
   if (mt==NULL) transient=mainw->LiVES;
   else transient=mt->window;
@@ -19210,8 +20331,10 @@
   // load (deserialise) a serialised event_list
   // after loading we perform sophisticated checks on it to detect
   // and try to repair any errors in it
+  weed_plant_t *event_list=NULL;
 
-  int fd;
+  GtkWidget *ar_checkbutton;
+  GtkWidget *hbox;
 
   gchar *filt[]={"*.lay",NULL};
   gchar *startdir=NULL;
@@ -19219,44 +20342,33 @@
   gchar *msg;
   gchar *com;
   gchar *eload_name;
-  gboolean free_eload_file=TRUE;
-  gint old_avol_fx=mt->avol_fx;
 
-  weed_plant_t *event_list=NULL;
+  boolean free_eload_file=TRUE;
+  boolean orig_ar_layout=prefs->ar_layout,ar_layout;
+  boolean retval=TRUE;
 
   int num_events=0;
   int retval2;
-  gboolean orig_ar_layout=prefs->ar_layout,ar_layout;
-  gboolean retval=TRUE;
+  int old_avol_fx=mt->avol_fx;
+  int fd;
 
-  GtkWidget *ar_checkbutton;
-  GtkWidget *eventbox;
-  GtkWidget *label;
-  GtkWidget *hbox;
+  if (mt->idlefunc>0) {
+    g_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
+  }
 
   if (eload_file==NULL) {
     if (!strlen(mainw->set_name)) {
       LIVES_ERROR("Loading event list for unknown set");
+      mt->idlefunc=mt_idle_add(mt);
       return NULL;
     }
 
-    eload_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts/",NULL);
+    eload_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",G_DIR_SEPARATOR_S,NULL);
 
     mainw->com_failed=FALSE;
-    com=g_strdup_printf ("/bin/mkdir -p \"%s\"",eload_dir);
-    lives_system (com,FALSE);
-    g_free (com);
-    
-    if (mainw->com_failed) {
-      g_free(eload_dir);
-      return NULL;
-    }
-    
-    if (mt->idlefunc>0) {
-      g_source_remove(mt->idlefunc);
-      mt->idlefunc=0;
-    }
-    
+    g_mkdir_with_parents(eload_dir,S_IRWXU);
+
     if (!mainw->recoverable_layout&&!g_file_test(eload_dir,G_FILE_TEST_IS_DIR)) {
       g_free(eload_dir);
       mt->idlefunc=mt_idle_add(mt);
@@ -19265,37 +20377,17 @@
 
     startdir=g_strdup(eload_dir);
 
-    ar_checkbutton = gtk_check_button_new ();
-    gtk_widget_show(ar_checkbutton);
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    label=gtk_label_new_with_mnemonic (_("_Autoreload each time"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),ar_checkbutton);
-    
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      ar_checkbutton);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    
-    gtk_box_pack_start (GTK_BOX (hbox), ar_checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (ar_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    hbox = lives_hbox_new (FALSE, 0);
+
+    ar_checkbutton = lives_standard_check_button_new (_("_Autoreload each time"),TRUE,LIVES_BOX(hbox),NULL);
+
+    gtk_widget_show_all(hbox);
     
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ar_checkbutton),prefs->ar_layout);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(ar_checkbutton),prefs->ar_layout);
     g_signal_connect (GTK_OBJECT (ar_checkbutton), "toggled",
 		      G_CALLBACK (on_autoreload_toggled),
 		      GINT_TO_POINTER(2));
-    eload_file=choose_file(startdir,NULL,filt,GTK_FILE_CHOOSER_ACTION_OPEN,NULL,hbox);
+    eload_file=choose_file(startdir,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,hbox);
 
     g_free(startdir);
   }
@@ -19309,12 +20401,20 @@
     // this will fail if there are any files in the directories
 
     gchar *cdir;
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",eload_dir);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",eload_dir);
+#endif
     lives_system(com,TRUE);
     g_free(com);
 
     cdir=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",cdir);
+#else
+    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",cdir);
+#endif
     lives_system(com,TRUE);
     g_free(com);
 
@@ -19333,9 +20433,15 @@
     do_error_dialog_with_check_transient(msg,TRUE,0,GTK_WINDOW(mt->window));
     g_free(msg);
     g_free(eload_name);
+    mt->idlefunc=mt_idle_add(mt);
     return NULL;
   }
 
+#ifdef IS_MINGW
+  setmode(fd, O_BINARY);
+#endif
+
+
   event_list_free_undos(mt);
 
   if (mainw->event_list!=NULL) {
@@ -19367,6 +20473,7 @@
       if (retval!=LIVES_RETRY) {
 	if (mt->is_ready) mt_sensitise(mt);
 	g_free(eload_name);
+	mt->idlefunc=mt_idle_add(mt);
 	return NULL;
       }
     }
@@ -19383,9 +20490,7 @@
 
   mt->auto_changed=mt->changed=mainw->recoverable_layout;
 
-  if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
-  while (g_main_context_iteration(NULL,FALSE));
-  if (!mainw->recoverable_layout) mt->idlefunc=mt_idle_add(mt);
+  lives_widget_context_update();
 
   cfile->progress_start=1;
   cfile->progress_end=num_events;
@@ -19431,6 +20536,9 @@
 	  // resave with corrections/updates
 	  fd=creat(eload_file,DEF_FILE_PERMS);
 	  if (fd>=0) {
+#ifdef IS_MINGW
+	    setmode(fd,O_BINARY);
+#endif
 	    retval=save_event_list_inner(NULL,fd,event_list,NULL);
 	    close(fd);
 	  }
@@ -19461,7 +20569,7 @@
 
   if (event_list!=NULL) {
     if (!mainw->recoverable_layout) {
-      g_snprintf(mt->layout_name,256,"%s",eload_file);
+      g_snprintf(mt->layout_name,PATH_MAX,"%s",eload_file);
       get_basename(mt->layout_name);
     }
 
@@ -19478,9 +20586,11 @@
       memset(prefs->ar_layout_name,0,1);
     }
     else {
-      prefs->ar_layout=TRUE;
-      set_pref("ar_layout",mt->layout_name);
-      g_snprintf(prefs->ar_layout_name,128,"%s",mt->layout_name);
+      if (!mainw->recoverable_layout) {
+	prefs->ar_layout=TRUE;
+	set_pref("ar_layout",mt->layout_name);
+	g_snprintf(prefs->ar_layout_name,128,"%s",mt->layout_name);
+      }
     }
 
   }
@@ -19493,7 +20603,6 @@
 
   if (free_eload_file) g_free(eload_file);
 
-  mt->idlefunc=0;
   if (!mainw->recoverable_layout) mt->idlefunc=mt_idle_add(mt);
 
   return (event_list);
@@ -19561,8 +20670,8 @@
 void on_clear_event_list_activate (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   _entryw *cdsw;
-  gint resp=2;
-  gboolean rev_resp=FALSE;
+  int resp=2;
+  boolean rev_resp=FALSE;
 
   if (mt->idlefunc>0) {
     g_source_remove(mt->idlefunc);
@@ -19622,46 +20731,6 @@
 
 
 
-static void set_audio_mixer_vols(lives_mt *mt, weed_plant_t *elist) {
-  gint natracks,navols;
-  int *atracks;
-  double *avols;
-  gint catracks=g_list_length(mt->audio_vols);
-  int error,i,xtrack,xavol;
-
-  if (!weed_plant_has_leaf(elist,"audio_volume_tracks")||!weed_plant_has_leaf(elist,"audio_volume_values")) return;
-
-  natracks=weed_leaf_num_elements(elist,"audio_volume_tracks");
-  navols=weed_leaf_num_elements(elist,"audio_volume_values");
-
-  atracks=weed_get_int_array(elist,"audio_volume_tracks",&error);
-  if (error!=WEED_NO_ERROR) return;
-
-  avols=weed_get_double_array(elist,"audio_volume_values",&error);
-  if (error!=WEED_NO_ERROR) {
-    weed_free(atracks);
-    return;
-  }
-
-  for (i=0;i<natracks;i++) {
-    xtrack=atracks[i];
-    if (xtrack<-mt->opts.back_audio_tracks) continue;
-    if (xtrack>=catracks-mt->opts.back_audio_tracks) continue;
-
-    xavol=i;
-    if (xavol>=navols) {
-      mt->opts.gang_audio=TRUE;
-      xavol=navols-1;
-    }
-    set_mixer_track_vol(mt,xtrack+mt->opts.back_audio_tracks,avols[xavol]);
-  }
-
-  weed_free(atracks);
-  weed_free(avols);
-}
-
-
-
 
 void on_load_event_list_activate (GtkMenuItem *menuitem, gpointer user_data) {
   int i;
@@ -19755,7 +20824,7 @@
   int retval2=0;
   weed_plant_t *event_list;
   gchar *tmp;
-  gboolean retval=TRUE;
+  boolean retval=TRUE;
 
   gchar *changefrom=NULL;
   size_t chlen;
@@ -19784,7 +20853,12 @@
 	    do {
 	      retval2=0;
 	      fd=creat((char *)map->data,DEF_FILE_PERMS);
-	      if (fd>=0) retval=save_event_list_inner(NULL,fd,event_list,NULL);
+	      if (fd>=0) {
+#ifdef IS_MINGW
+		setmode(fd,O_BINARY);
+#endif
+		retval=save_event_list_inner(NULL,fd,event_list,NULL);
+	      }
 	      if (fd<0||!retval) {
 		if (fd>0) close(fd);
 		retval2=do_write_failed_error_s_with_retry((char *)map->data,(fd<0)?g_strerror(errno):NULL,NULL);
@@ -19809,8 +20883,13 @@
 	gchar *com;
 	// prevent duplication of layouts
 	g_free(tmp);
+#ifndef IS_MINGW
 	tmp=g_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
 	com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",(gchar *)map->data,tmp);
+#else
+	tmp=g_strdup_printf("%s\\%s\\layouts\\%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
+	com=g_strdup_printf("mv.exe \"%s\" \"%s\"",(gchar *)map->data,tmp);
+#endif
 	lives_system(com,FALSE);
 	g_free(com);
       }
@@ -19856,7 +20935,7 @@
   while (map!=NULL) {
     if ((old_set_name!=NULL&&!strncmp((char *)map->data,changefrom,chlen))||
 	(old_set_name==NULL&&(strstr((char *)map->data,new_set_name)==NULL))) {
-      if (strcmp(mainw->cl_string,(char *)map->data+chlen)) {
+      if (strcmp(mainw->string_constants[LIVES_STRING_CONSTANT_CL],(char *)map->data+chlen)) {
 	tmp=g_build_filename(prefs->tmpdir,new_set_name,"layouts",(char *)map->data+chlen,NULL);
 	if (g_file_test(tmp,G_FILE_TEST_EXISTS)) {
 	  g_free(tmp);
@@ -19873,19 +20952,19 @@
 
 
 
-GList *layout_frame_is_affected(gint clipno, gint frame) {
+GList *layout_frame_is_affected(int clipno, int frame) {
   // return list of names of layouts which are affected, or NULL
   // list and list->data should be freed after use
 
   gchar **array;
   GList *lmap=mainw->files[clipno]->layout_map;
-  gdouble orig_fps;
-  gint resampled_frame;
+  double orig_fps;
+  int resampled_frame;
 
   if (mainw->stored_event_list!=NULL&&mainw->files[clipno]->stored_layout_frame!=0) {
     // see if it affects the current layout
     resampled_frame=count_resampled_frames(mainw->files[clipno]->stored_layout_frame,mainw->files[clipno]->stored_layout_fps,mainw->files[clipno]->fps);
-    if (frame<=resampled_frame) mainw->xlays=g_list_append_unique(mainw->xlays,mainw->cl_string);
+    if (frame<=resampled_frame) mainw->xlays=g_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
   }
 
   while (lmap!=NULL) {
@@ -19907,10 +20986,10 @@
 
 
 
-GList *layout_audio_is_affected(gint clipno, gdouble time) {
+GList *layout_audio_is_affected(int clipno, double time) {
   gchar **array;
   GList *lmap=mainw->files[clipno]->layout_map;
-  gdouble max_time;
+  double max_time;
 
   if (mainw->files[clipno]->arate==0) return mainw->xlays;
 
@@ -19919,7 +20998,8 @@
 
   if (mainw->stored_event_list!=NULL) {
     // see if it affects the current layout
-    if (mainw->files[clipno]->stored_layout_audio>0.&&time<=mainw->files[clipno]->stored_layout_audio) mainw->xlays=g_list_append_unique(mainw->xlays,mainw->cl_string);
+    if (mainw->files[clipno]->stored_layout_audio>0.&&time<=mainw->files[clipno]->stored_layout_audio) 
+      mainw->xlays=g_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
   }
 
   while (lmap!=NULL) {
@@ -19937,13 +21017,11 @@
 }
 
 
-void mt_change_disp_tracks_ok                (GtkButton     *button,
-					      gpointer         user_data) {
-  
+void mt_change_disp_tracks_ok (GtkButton *button, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
   mt->max_disp_vtracks=mainw->fx1_val;
-  scroll_tracks(mt,mt->top_track);
+  scroll_tracks(mt,mt->top_track,FALSE);
 }
 
 
@@ -19971,7 +21049,7 @@
 
 void mt_change_vals_activate (GtkMenuItem *menuitem, gpointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  gboolean response;
+  boolean response;
   gchar *msg;
 
   rdet=create_render_details(4);  // WARNING !! - rdet is global in events.h
@@ -19986,19 +21064,19 @@
     }
   } while (rdet->suggestion_followed);
   
-  xarate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-  xachans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-  xasamps=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+  xarate=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+  xachans=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+  xasamps=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
   
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
     xse=AFORM_UNSIGNED;;
   }
   else cfile->signed_endian=0;
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
     xse|=AFORM_BIG_ENDIAN;
   }
   
-  if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton))) {
+  if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))) {
     xachans=0;
   }
 
@@ -20030,7 +21108,7 @@
     }
   }
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rdet->always_checkbutton))) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rdet->always_checkbutton))) {
     prefs->mt_enter_prompt=FALSE;
     set_boolean_pref("mt_enter_prompt",prefs->mt_enter_prompt);
     prefs->mt_def_width=rdet->width;
@@ -20105,7 +21183,7 @@
     gtk_widget_show(mt->normalise_aud);
     gtk_widget_show(mt->view_audio);
   }
-  scroll_tracks(mt,mt->top_track);
+  scroll_tracks(mt,mt->top_track,FALSE);
 }
 
 
@@ -20157,9 +21235,9 @@
 void on_amixer_close_clicked (GtkButton *button, lives_mt *mt) {
   lives_amixer_t *amixer=mt->amixer;
   int i;
-  gdouble val;
+  double val;
 
-  mt->opts.gang_audio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(amixer->gang_checkbutton));
+  mt->opts.gang_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton));
 
   // set vols from slider vals
 
@@ -20177,7 +21255,7 @@
     set_mixer_track_vol(mt,i,val);
   }
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
   g_free(amixer->ch_sliders);
   g_free(amixer->ch_slider_fns);
   g_free(amixer);
@@ -20192,8 +21270,8 @@
   lives_amixer_t *amixer=mt->amixer;
   int i;
 
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(amixer->inv_checkbutton),FALSE);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(amixer->gang_checkbutton),mt->opts.gang_audio);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton),FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),mt->opts.gang_audio);
 
   // copy vols to slider vals
 
@@ -20202,14 +21280,14 @@
 #if ENABLE_GIW
     if (prefs->lamp_buttons) {
       g_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-      giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),(gdouble)GPOINTER_TO_INT
+      giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),(double)GPOINTER_TO_INT
 			    (g_list_nth_data(mt->audio_vols_back,i))/LIVES_AVOL_SCALE);
       g_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
     }
     else {
 #endif
       g_signal_handler_block(gtk_range_get_adjustment(GTK_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-      gtk_range_set_value(GTK_RANGE(amixer->ch_sliders[i]),(gdouble)GPOINTER_TO_INT
+      gtk_range_set_value(GTK_RANGE(amixer->ch_sliders[i]),(double)GPOINTER_TO_INT
 			  (g_list_nth_data(mt->audio_vols_back,i))/LIVES_AVOL_SCALE);
       g_signal_handler_unblock(gtk_range_get_adjustment(GTK_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
 #if ENABLE_GIW
@@ -20221,28 +21299,28 @@
 
 
 static void after_amixer_gang_toggled (GtkToggleButton *toggle, lives_amixer_t *amixer) {
-  gtk_widget_set_sensitive(amixer->inv_checkbutton,(gtk_toggle_button_get_active(toggle)));
+  gtk_widget_set_sensitive(amixer->inv_checkbutton,(lives_toggle_button_get_active(toggle)));
   if (prefs->lamp_buttons) {
-    if (gtk_toggle_button_get_active(toggle)) gtk_widget_modify_bg(GTK_WIDGET(toggle), GTK_STATE_PRELIGHT, &palette->light_green);
-    else gtk_widget_modify_bg(GTK_WIDGET(toggle), GTK_STATE_PRELIGHT, &palette->dark_red);
+    if (lives_toggle_button_get_active(toggle)) lives_widget_set_bg_color(GTK_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
+    else lives_widget_set_bg_color(GTK_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->dark_red);
   }
 }
 
 
 static void after_amixer_inv_toggled (GtkToggleButton *toggle, lives_amixer_t *amixer) {
   if (prefs->lamp_buttons) {
-    if (gtk_toggle_button_get_active(toggle)) gtk_widget_modify_bg(GTK_WIDGET(toggle), GTK_STATE_PRELIGHT, &palette->light_green);
-    else gtk_widget_modify_bg(GTK_WIDGET(toggle), GTK_STATE_PRELIGHT, &palette->dark_red);
+    if (lives_toggle_button_get_active(toggle)) lives_widget_set_bg_color(GTK_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
+    else lives_widget_set_bg_color(GTK_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->dark_red);
   }
 }
 
 
 void on_amixer_slider_changed (GtkAdjustment *adj, lives_mt *mt) {
   lives_amixer_t *amixer=mt->amixer;
-  gint layer=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(adj),"layer"));
-  gboolean gang=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(amixer->gang_checkbutton));
-  gboolean inv=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(amixer->inv_checkbutton));
-  gdouble val;
+  int layer=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(adj),"layer"));
+  boolean gang=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton));
+  boolean inv=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton));
+  double val;
   int i;
 
 #if ENABLE_GIW
@@ -20329,7 +21407,7 @@
 
 
 
-GtkWidget * amixer_add_channel_slider (lives_mt *mt, gint i) {
+GtkWidget * amixer_add_channel_slider (lives_mt *mt, int i) {
   // add a slider to audio mixer for layer i; i<0 are backing audio tracks 
   // automatically sets the track name and layer number
 
@@ -20342,7 +21420,7 @@
 
   i+=mt->opts.back_audio_tracks;
 
-  adj = (GObject *)gtk_adjustment_new (0.5, 0., 4., 0.01, 0.1, 0.);
+  adj = (GObject *)lives_adjustment_new (0.5, 0., 4., 0.01, 0.1, 0.);
     
   spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.1, 3);
 
@@ -20353,12 +21431,12 @@
     giw_vslider_set_major_ticks_number(GIW_VSLIDER(amixer->ch_sliders[i]),5);
     giw_vslider_set_minor_ticks_number(GIW_VSLIDER(amixer->ch_sliders[i]),4);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(amixer->ch_sliders[i], GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(amixer->ch_sliders[i], LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
   }
   else {
 #endif
-    amixer->ch_sliders[i]=gtk_vscale_new(GTK_ADJUSTMENT(adj));
+    amixer->ch_sliders[i]=lives_vscale_new(LIVES_ADJUSTMENT(adj));
     gtk_range_set_inverted(GTK_RANGE(amixer->ch_sliders[i]),TRUE);
     gtk_scale_set_digits(GTK_SCALE(amixer->ch_sliders[i]),2);
     gtk_scale_set_value_pos(GTK_SCALE(amixer->ch_sliders[i]),GTK_POS_BOTTOM);
@@ -20374,23 +21452,19 @@
 						   (gpointer)mt);
   
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(amixer->ch_sliders[i], GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(amixer->ch_sliders[i], LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
   
   tname=get_track_name(mt,i-mt->opts.back_audio_tracks,TRUE);
-  label=gtk_label_new(tname);
+  label=lives_standard_label_new(tname);
   g_free(tname);
 
   g_object_set_data(G_OBJECT(amixer->ch_sliders[i]),"label",label);
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  vbox = gtk_vbox_new (FALSE, 15);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (vbox), amixer->ch_sliders[i], TRUE, TRUE, 50);
-  gtk_box_pack_start (GTK_BOX (vbox), spinbutton, FALSE, FALSE, 10);
+  vbox = lives_vbox_new (FALSE, widget_opts.packing_height*1.5);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  gtk_box_pack_start (GTK_BOX (vbox), amixer->ch_sliders[i], TRUE, TRUE, widget_opts.packing_height*5);
+  gtk_box_pack_start (GTK_BOX (vbox), spinbutton, FALSE, FALSE, widget_opts.packing_height);
 
   amixer->nchans++;
 
@@ -20454,21 +21528,20 @@
   winsize_v=scr_height*2/3;
 
   amixerw = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_modify_bg(amixerw, GTK_STATE_NORMAL, &palette->menu_and_bars);
+  lives_widget_set_bg_color(amixerw, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   gtk_window_set_title (GTK_WINDOW (amixerw), _("LiVES: Multitrack audio mixer"));
 
-  top_vbox = gtk_vbox_new (FALSE, 15);
+  top_vbox = lives_vbox_new (FALSE, 0);
 
-  amixer->main_hbox = gtk_hbox_new (FALSE, 20);
+  amixer->main_hbox = lives_hbox_new (FALSE, widget_opts.packing_width*2);
 
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), amixer->main_hbox);
+  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, amixer->main_hbox);
   
   if (prefs->gui_monitor!=0) {
-    gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-amixerw->allocation.width)/2;
-    gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-amixerw->allocation.height)/2;
+    int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
+						    lives_widget_get_allocation_width(amixerw))/2;
+    int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
+						    lives_widget_get_allocation_height(amixerw))/2;
     gtk_window_set_screen(GTK_WINDOW(amixerw),mainw->mgeom[prefs->gui_monitor-1].screen);
     gtk_window_move(GTK_WINDOW(amixerw),xcen,ycen);
   }
@@ -20478,54 +21551,60 @@
   }
   else gtk_window_set_default_size (GTK_WINDOW (amixerw), winsize_h, winsize_v);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(gtk_bin_get_child (GTK_BIN (scrolledwindow)), GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolledwindow))),GTK_SHADOW_IN);
-
-  gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
   gtk_container_add (GTK_CONTAINER (amixerw), top_vbox);
 
-  hbuttonbox = gtk_hbutton_box_new ();
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbuttonbox, FALSE, TRUE, 20);
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
+  hbuttonbox = lives_hbutton_box_new ();
+  gtk_box_pack_start (GTK_BOX (top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height*2);
+
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
 
   reset_button = gtk_button_new_with_mnemonic (_("_Reset values"));
   gtk_container_add (GTK_CONTAINER (hbuttonbox), reset_button);
-  GTK_WIDGET_SET_FLAGS (reset_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (reset_button);
 
   close_button = gtk_button_new_with_mnemonic (_("_Close mixer"));
   gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
-  GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (close_button);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
+#else
+  gtk_widget_set_size_request(reset_button,DEF_BUTTON_WIDTH*4,-1);
+  gtk_widget_set_size_request(close_button,DEF_BUTTON_WIDTH*4,-1);
+#endif
 
 
   gtk_widget_add_accelerator (close_button, "clicked", accel_group,
-                              GDK_m, GDK_CONTROL_MASK,
+                              LIVES_KEY_m, LIVES_CONTROL_MASK,
                               (GtkAccelFlags)0);
 
   gtk_window_add_accel_group (GTK_WINDOW (amixerw), accel_group);
 
   if (mt->opts.back_audio_tracks>0) {
     vbox=amixer_add_channel_slider(mt,-1);
-    gtk_box_pack_start (GTK_BOX (amixer->main_hbox), vbox, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
   }
 
-  vbox2 = gtk_vbox_new (FALSE, 15);
-  gtk_box_pack_start (GTK_BOX (amixer->main_hbox), vbox2, FALSE, FALSE, 10);
+  vbox2 = lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (amixer->main_hbox), vbox2, FALSE, FALSE, widget_opts.packing_width);
 
   add_fill_to_box(GTK_BOX(vbox2));
 
-  vbox = gtk_vbox_new (FALSE, 15);
-  gtk_box_pack_start (GTK_BOX (vbox2), vbox, TRUE, TRUE, 10);
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), vbox, TRUE, TRUE, widget_opts.packing_height);
   
     
   if (prefs->lamp_buttons) {
     amixer->inv_checkbutton = gtk_check_button_new_with_label (" ");
     gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(amixer->inv_checkbutton),FALSE);
-    gtk_widget_modify_bg(amixer->inv_checkbutton, GTK_STATE_ACTIVE, &palette->light_green);
-    gtk_widget_modify_bg(amixer->inv_checkbutton, GTK_STATE_NORMAL, &palette->dark_red);
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_connect (GTK_OBJECT (amixer->inv_checkbutton), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (draw_cool_toggle),
+		    NULL);
+#endif
+    lives_widget_set_bg_color(amixer->inv_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
+    lives_widget_set_bg_color(amixer->inv_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
 
     g_signal_connect_after (GTK_OBJECT (amixer->inv_checkbutton), "toggled",
 			    G_CALLBACK (after_amixer_inv_toggled),
@@ -20538,15 +21617,11 @@
 
 
   if (mt->opts.back_audio_tracks>0&&mt->opts.pertrack_audio) {
-    label=gtk_label_new_with_mnemonic(_("_Invert backing audio\nand layer volumes"));
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    label=lives_standard_label_new_with_mnemonic(_("_Invert backing audio\nand layer volumes"),amixer->inv_checkbutton);
     
-    gtk_widget_set_tooltip_text( amixer->inv_checkbutton, _("Adjust backing and layer audio values so that they sum to 1.0"));
+    gtk_widget_set_tooltip_text(amixer->inv_checkbutton, _("Adjust backing and layer audio values so that they sum to 1.0"));
     eventbox=gtk_event_box_new();
-    gtk_tooltips_copy(eventbox,amixer->inv_checkbutton);
+    lives_tooltips_copy(eventbox,amixer->inv_checkbutton);
     gtk_label_set_mnemonic_widget (GTK_LABEL (label),amixer->inv_checkbutton);
     
     gtk_container_add(GTK_CONTAINER(eventbox),label);
@@ -20555,19 +21630,18 @@
 		      amixer->inv_checkbutton);
     
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     
-    gtk_box_pack_start (GTK_BOX (vbox), eventbox, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (vbox), eventbox, FALSE, FALSE, widget_opts.packing_height);
     
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     add_fill_to_box(GTK_BOX(hbox));
     
     gtk_box_pack_start (GTK_BOX (hbox), amixer->inv_checkbutton, FALSE, FALSE, 0);
-    GTK_WIDGET_SET_FLAGS (amixer->inv_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    lives_widget_set_can_focus_and_default (amixer->inv_checkbutton);
 
     add_fill_to_box(GTK_BOX(hbox));
   }
@@ -20576,53 +21650,52 @@
   if (prefs->lamp_buttons) {
     amixer->gang_checkbutton = gtk_check_button_new_with_label (" ");
     gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(amixer->gang_checkbutton),FALSE);
-    gtk_widget_modify_bg(amixer->gang_checkbutton, GTK_STATE_ACTIVE, &palette->light_green);
-    gtk_widget_modify_bg(amixer->gang_checkbutton, GTK_STATE_NORMAL, &palette->dark_red);
+#if GTK_CHECK_VERSION(3,0,0)
+  g_signal_connect (GTK_OBJECT (amixer->gang_checkbutton), LIVES_WIDGET_EVENT_EXPOSE_EVENT,
+		    G_CALLBACK (draw_cool_toggle),
+		    NULL);
+#endif
+    lives_widget_set_bg_color(amixer->gang_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
+    lives_widget_set_bg_color(amixer->gang_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
   }
   else amixer->gang_checkbutton = gtk_check_button_new ();
 
 
   if (mt->opts.pertrack_audio) {
-    label=gtk_label_new_with_mnemonic(_("_Gang layer audio"));
+    label=lives_standard_label_new_with_mnemonic(_("_Gang layer audio"),amixer->gang_checkbutton);
     
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
     gtk_widget_set_tooltip_text( amixer->gang_checkbutton, _("Adjust all layer audio values to the same value"));
     eventbox=gtk_event_box_new();
-    gtk_tooltips_copy(eventbox,amixer->gang_checkbutton);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),amixer->gang_checkbutton);
+    lives_tooltips_copy(eventbox,amixer->gang_checkbutton);
     
     gtk_container_add(GTK_CONTAINER(eventbox),label);
     g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
 		      G_CALLBACK (label_act_toggle),
 		      amixer->gang_checkbutton);
     
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(amixer->gang_checkbutton),mt->opts.gang_audio);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),mt->opts.gang_audio);
     
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     add_fill_to_box(GTK_BOX(hbox));
     
-    gtk_box_pack_start (GTK_BOX (hbox), amixer->gang_checkbutton, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (hbox), amixer->gang_checkbutton, FALSE, FALSE, widget_opts.packing_width);
     add_fill_to_box(GTK_BOX(hbox));
 
-    gtk_box_pack_end (GTK_BOX (vbox), eventbox, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (amixer->gang_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    gtk_box_pack_end (GTK_BOX (vbox), eventbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_widget_set_can_focus_and_default (amixer->gang_checkbutton);
   }
 
   add_fill_to_box(GTK_BOX(vbox2));
 
   for (i=0;i<nachans-mt->opts.back_audio_tracks;i++) {
     vbox=amixer_add_channel_slider(mt,i);
-    gtk_box_pack_start (GTK_BOX (amixer->main_hbox), vbox, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
   }
 
   g_signal_connect (GTK_OBJECT (close_button), "clicked",
@@ -20634,7 +21707,7 @@
 		    (gpointer)mt);
 
   gtk_widget_add_accelerator (close_button, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
 
 
@@ -20689,24 +21762,24 @@
 
 // remote API helpers
 
-gboolean mt_track_is_video(lives_mt *mt, int ntrack) {
+boolean mt_track_is_video(lives_mt *mt, int ntrack) {
   if (ntrack>=0&&mt->video_draws!=NULL&&ntrack<g_list_length(mt->video_draws)) return TRUE;
   return FALSE;
 }
 
 
-gboolean mt_track_is_audio(lives_mt *mt, int ntrack) {
+boolean mt_track_is_audio(lives_mt *mt, int ntrack) {
   if (ntrack<=0&&mt->audio_draws!=NULL&&ntrack>=-(g_list_length(mt->audio_draws))) return TRUE;
   return FALSE;
 }
 
 /*
-gboolean mt_track_is_valid(lives_mt *mt, int itrack) {
+boolean mt_track_is_valid(lives_mt *mt, int itrack) {
   if (!mt_track_is_video(itrack)&&!mt_track_is_audio(itrack)) return FALSE;
   return TRUE;
   }*/
 
-gint mt_get_last_block_number(lives_mt *mt, int ntrack) {
+int mt_get_last_block_number(lives_mt *mt, int ntrack) {
   int count=0;
   track_rect *block,*lastblock;
   GtkWidget *eventbox=get_eventbox_for_track(mt,ntrack);
@@ -20725,7 +21798,7 @@
 
 
 
-gint mt_get_block_count(lives_mt *mt, int ntrack) {
+int mt_get_block_count(lives_mt *mt, int ntrack) {
   int count=0;
   track_rect *block,*lastblock;
   GtkWidget *eventbox=get_eventbox_for_track(mt,ntrack);
@@ -20744,18 +21817,18 @@
 
 
 /// return time in seconds of first frame event in block
-gdouble mt_get_block_sttime(lives_mt *mt, int ntrack, int iblock) {
+double mt_get_block_sttime(lives_mt *mt, int ntrack, int iblock) {
   track_rect *block=get_nth_block_for_track(mt,ntrack,iblock);
   if (block==NULL) return -1; ///< invalid track or block number
-  return (gdouble)get_event_timecode(block->start_event)/U_SEC;
+  return (double)get_event_timecode(block->start_event)/U_SEC;
 }
 
 
 /// return time in seconds of last frame event in block, + event duration
-gdouble mt_get_block_entime(lives_mt *mt, int ntrack, int iblock) {
+double mt_get_block_entime(lives_mt *mt, int ntrack, int iblock) {
   track_rect *block=get_nth_block_for_track(mt,ntrack,iblock);
   if (block==NULL) return -1; ///< invalid track or block number
-  return (gdouble)get_event_timecode(block->end_event)/U_SEC+1./mt->fps;
+  return (double)get_event_timecode(block->end_event)/U_SEC+1./mt->fps;
 }
 
 
@@ -20771,35 +21844,39 @@
 
   track_rect *oblock=NULL;
   weed_timecode_t sttc,endtc=0;
-  int nvids=g_list_length(mt->video_draws);
 
-  gdouble region_start=mt->region_start;
-  gdouble region_end=mt->region_end;
-  GList *slist;
-  int current_fx=mt->current_fx;
-  weed_plant_t *old_mt_init=mt->init_event;
-  gboolean did_backup=mt->did_backup;
+  weed_plant_t **ptmpls;
+  weed_plant_t **oparams;
 
-  //weed_plant_t *deinit_event;
   weed_plant_t *stevent,*enevent;
   weed_plant_t *filter;
-  weed_plant_t **ptmpls;
   weed_plant_t *ptm;
-  weed_plant_t **oparams;
+  weed_plant_t *old_mt_init=mt->init_event;
+
+  GList *slist;
+
+  double region_start=mt->region_start;
+  double region_end=mt->region_end;
+
+  boolean did_backup=mt->did_backup;
+
+  int nvids=g_list_length(mt->video_draws);
+  int current_fx=mt->current_fx;
 
   int error;
   int tparam;
   int nparams;
   int param_hint;
   int track;
-  int i;
+
+  register int i;
 
   if (block==NULL) return;  ///<invalid block
 
   filter=get_weed_filter(prefs->atrans_fx);
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return; ///<filter has no in parameters
+  if (num_in_params(filter,TRUE,TRUE)==0) return; ///<filter has no (visible) in parameters
 
-  tparam=get_transition_param(filter);
+  tparam=get_transition_param(filter,FALSE);
   if (tparam==-1) return; ///< filter has no transition parameter
 
   ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
@@ -20824,7 +21901,7 @@
   for (i=0;i<nvids;i++) {
     if (i==track) continue; ///< cannot transition with self !
     oblock=get_block_from_time((GtkWidget *)g_list_nth_data(mt->video_draws,i),
-			       (gdouble)sttc/U_SEC+0.5/mt->fps,mt);
+			       (double)sttc/U_SEC+0.5/mt->fps,mt);
     
     if (oblock!=NULL) {
       if (get_event_timecode(oblock->end_event)<=get_event_timecode(block->end_event)) {
@@ -20904,7 +21981,7 @@
   for (i=0;i<nvids;i++) {
     if (i==track) continue; ///< cannot transition with self !
     oblock=get_block_from_time((GtkWidget *)g_list_nth_data(mt->video_draws,i),
-			       (gdouble)endtc/U_SEC+0.5/mt->fps,mt);
+			       (double)endtc/U_SEC+0.5/mt->fps,mt);
 
     if (oblock!=NULL) {
       sttc=get_event_timecode(oblock->start_event);

LiVES-1.6.1.tar.bz2/src/multitrack.h -> LiVES-2.0.3.tar.bz2/src/multitrack.h Changed

@@ -1,6 +1,6 @@
 // multitrack.h
 // LiVES
-// (c) G. Finch 2005 - 2010 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2005 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -9,37 +9,40 @@
 #ifndef HAS_LIVES_MULTITRACK_H
 #define HAS_LIVES_MULTITRACK_H
 
-#define CLIP_THUMB_WIDTH 72
-#define CLIP_THUMB_HEIGHT 72
 
-#define CLIP_LABEL_LENGTH 20
+////////////////////// GUI constants ///////////////////////
 
-#define BLOCK_THUMB_WIDTH 40
 
-#define BLOCK_DRAW_SIMPLE 1
-#define BLOCK_DRAW_THUMB 2
-#define BLOCK_DRAW_TYPE BLOCK_DRAW_THUMB
+#define CLIP_THUMB_WIDTH ((int)(72.*widget_opts.scale))
+#define CLIP_THUMB_HEIGHT ((int)(72.*widget_opts.scale))
+
+#define CLIP_LABEL_LENGTH ((int)(20.*widget_opts.scale))
+
+#define BLOCK_THUMB_WIDTH ((int)(40.*widget_opts.scale))
 
-#define MT_PLAY_WIDTH_SMALL 320
-#define MT_PLAY_HEIGHT_SMALL 216
+#define MT_PLAY_WIDTH_SMALL ((int)(320.*widget_opts.scale))
+#define MT_PLAY_HEIGHT_SMALL ((int)(216.*widget_opts.scale))
 
-#define MT_PLAY_WIDTH_EXP 432
-#define MT_PLAY_HEIGHT_EXP 324
+#define MT_PLAY_WIDTH_EXP ((int)(432.*widget_opts.scale))
+#define MT_PLAY_HEIGHT_EXP ((int)(324.*widget_opts.scale))
 
-#define MT_CTX_WIDTH 320
-#define MT_CTX_HEIGHT 220
+#define MT_CTX_WIDTH ((int)(320.*widget_opts.scale))
+#define MT_CTX_HEIGHT ((int)(220.*widget_opts.scale))
 
-#define FX_BLOCK_WIDTH 80
-#define FX_BLOCK_HEIGHT 20
+#define FX_BLOCK_WIDTH ((int)(80.*widget_opts.scale))
+#define FX_BLOCK_HEIGHT ((int)(20.*widget_opts.scale))
 
+#define MT_TRACK_HEIGHT ((int)(25.*widget_opts.scale))
 
 #define TIMECODE_LENGTH 14 ///< length of timecode text entry, must be >12
 
-#define DEF_TIME 120 ///< default seconds when there is no event_list
+////////////////////////////////////////////////////////////////////////////////
 
-#define MT_BORDER_WIDTH 20 ///< width border for window
+#define BLOCK_DRAW_SIMPLE 1
+#define BLOCK_DRAW_THUMB 2
+#define BLOCK_DRAW_TYPE BLOCK_DRAW_THUMB
 
-#define IN_OUT_SEP 10 ///< min pixel separation for in/out images in poly_box (per image) 
+#define DEF_TIME 120 ///< default seconds when there is no event_list
 
 typedef struct _mt lives_mt;
 
@@ -153,22 +156,22 @@
 
 
 struct _mt_opts {
-  gboolean set; ///< have we set opts (in mainw) ?
-  gboolean move_effects; ///< should we move effects attached to a block ?
-  gboolean fx_auto_preview;
-  gboolean snap_over; ///< snap to overlap
+  boolean set; ///< have we set opts (in mainw) ?
+  boolean move_effects; ///< should we move effects attached to a block ?
+  boolean fx_auto_preview;
+  boolean snap_over; ///< snap to overlap
   lives_mt_grav_mode_t grav_mode;
   lives_mt_mouse_mode_t mouse_mode;
   lives_mt_insert_mode_t insert_mode;
-  gboolean show_audio;
-  gboolean show_ctx;
-  gboolean ign_ins_sel;
-  gboolean follow_playback;
-  gboolean insert_audio;  ///< do we insert audio with video ?
-  gboolean pertrack_audio; ///< do we want pertrack audio ?
-  gboolean audio_bleedthru; ///< should we allow all audio to bleed thru ?
-  gboolean gang_audio; ///< gang layer audio volume levels
-  gint back_audio_tracks; ///< number of backing audio tracks (currently 0 or 1)
+  boolean show_audio;
+  boolean show_ctx;
+  boolean ign_ins_sel;
+  boolean follow_playback;
+  boolean insert_audio;  ///< do we insert audio with video ?
+  boolean pertrack_audio; ///< do we want pertrack audio ?
+  boolean audio_bleedthru; ///< should we allow all audio to bleed thru ?
+  boolean gang_audio; ///< gang layer audio volume levels
+  int back_audio_tracks; ///< number of backing audio tracks (currently 0 or 1)
 };
 
 
@@ -216,10 +219,14 @@
   GtkWidget *render;
   GtkWidget *prerender_aud;
   GtkWidget *fx_block;
+  GtkWidget *fx_blockv;
+  GtkWidget *fx_blocka;
   GtkWidget *fx_delete;
   GtkWidget *fx_edit;
   GtkWidget *fx_region;
   GtkWidget *fx_region_1;
+  GtkWidget *fx_region_1v;
+  GtkWidget *fx_region_1a;
   GtkWidget *fx_region_2;
   GtkWidget *fx_region_2av;
   GtkWidget *fx_region_2v;
@@ -238,6 +245,7 @@
   GtkWidget *grav_left;
   GtkWidget *grav_right;
   GtkWidget *select_track;
+  GtkWidget *seldesel_menuitem;
   GtkWidget *view_events;
   GtkWidget *view_clips;
   GtkWidget *view_in_out;
@@ -291,6 +299,7 @@
   GtkWidget *prev_fm_button;
   GtkWidget *fx_ibefore_button;
   GtkWidget *fx_iafter_button;
+  GtkWidget *rename_track;
   GtkWidget *cback_audio;
   GtkWidget *aload_subs;
   GtkWidget *load_vals;
@@ -317,8 +326,6 @@
   GtkWidget *amixer_button;
   GtkWidget *view_sel_events;
   GtkWidget *adjust_start_end;
-  GtkWidget *in_eventbox;
-  GtkWidget *out_eventbox;
   GtkWidget *start_in_label;
   GtkWidget *end_out_label;
   GtkWidget *context_frame;
@@ -345,15 +352,12 @@
   GtkWidget *gens_submenu;
   GtkWidget *capture;
 
-  GtkWidget *insa_eventbox;
   GtkWidget *insa_checkbutton;
   GtkWidget *snapo_checkbutton;
 
   GObject *spinbutton_in_adj;
   GObject *spinbutton_out_adj;
 
-  GdkCursor *cursor;
-
   GObject *hadjustment;
   GObject *node_adj;
 
@@ -370,7 +374,7 @@
 
   GList *aparam_view_list;
 
-  GdkPixbuf *sepwin_pixbuf;
+  GdkPixbuf *frame_pixbuf;
 
   gulong spin_in_func;
   gulong spin_out_func;
@@ -396,105 +400,103 @@
 
   gulong tc_func;
 
-  gulong node_adj_func;
-
   weed_plant_t *event_list;
 
   weed_plant_t *init_event;   ///< current editable values
   weed_plant_t *selected_init_event;  ///< currently selected in list
   ///////////////////////
-  gint num_video_tracks;
-  gdouble end_secs;  ///< max display time of timeline in seconds
+  int num_video_tracks;
+  double end_secs;  ///< max display time of timeline in seconds
 
   // timeline min and max display values
-  gdouble tl_min;
-  gdouble tl_max;
+  double tl_min;
+  double tl_max;
 
-  gint clip_selected; ///< clip in clip window
-  gint file_selected; ///< actual LiVES file struct number which clip_selected matches
-  gint current_track; ///< starts at 0
+  int clip_selected; ///< clip in clip window
+  int file_selected; ///< actual LiVES file struct number which clip_selected matches
+  int current_track; ///< starts at 0
 
   GList *selected_tracks;
 
   lives_mt_poly_state_t poly_state;  ///< state of polymorph window
 
-  gint render_file;
+  int render_file;
 
   lives_direction_t last_direction; ///< last direction timeline cursor was moved in
 
   track_rect *block_selected; ///< pointer to current selected block, or NULL
   track_rect *putative_block; ///< putative block to move or copy, or NULL
 
-  gdouble ptr_time; ///< stored timeline cursor position before playback
+  double ptr_time; ///< stored timeline cursor position before playback
 
-  gdouble tl_fixed_length; ///< length of timeline can be fixed (secs) : TODO
+  double tl_fixed_length; ///< length of timeline can be fixed (secs) : TODO
 
-  gdouble fps; ///< fps of this timeline
+  double fps; ///< fps of this timeline
 
-  gdouble region_start; ///< start of time region in seconds (or 0.)
-  gdouble region_end; ///< end of time region in seconds (or 0.)
-  gdouble region_init; ///< point where user pressed the mouse
-  gboolean region_updating;
+  double region_start; ///< start of time region in seconds (or 0.)
+  double region_end; ///< end of time region in seconds (or 0.)
+  double region_init; ///< point where user pressed the mouse
+  boolean region_updating;
 
-  gboolean is_rendering; ///< TRUE if we are in the process of rendering/pre-rendering to a clip, cf. mainw->is_rendering
-  gboolean pr_audio; ///< TRUE if we are in the process of prerendering audio to a clip
+  boolean is_rendering; ///< TRUE if we are in the process of rendering/pre-rendering to a clip, cf. mainw->is_rendering
+  boolean pr_audio; ///< TRUE if we are in the process of prerendering audio to a clip
 
-  gint max_disp_vtracks;
-  gint current_fx;
+  int max_disp_vtracks;
+  int current_fx;
 
-  gboolean mt_frame_preview;
+  boolean mt_frame_preview;
 
   lives_rfx_t *current_rfx;
 
-  gchar layout_name[256];
+  gchar layout_name[PATH_MAX];
 
   // cursor warping for mouse move mode
-  gdouble hotspot_x;
-  gint hotspot_y;
+  double hotspot_x;
+  int hotspot_y;
 
-  gboolean moving_block; ///< moving block flag
+  boolean moving_block; ///< moving block flag
 
   //////////////////////////////
 
-  gint sel_x;
-  gint sel_y;
+  int sel_x;
+  int sel_y;
 
   gulong mouse_mot1;
   gulong mouse_mot2;
 
-  gboolean tl_selecting; ///< for mouse select mode
+  boolean tl_selecting; ///< for mouse select mode
 
   /* start and end offset overrides for inserting (used during block move) */
   weed_timecode_t insert_start;
   weed_timecode_t insert_end;
 
   /// override for avel used during audio insert
-  gdouble insert_avel;
+  double insert_avel;
 
   GList *undos;
   size_t undo_buffer_used;
   unsigned char *undo_mem;
-  gint undo_offset;
-  gboolean did_backup;
+  int undo_offset;
+  boolean did_backup;
 
   gchar undo_text[32];
   gchar redo_text[32];
 
-  gboolean undoable;
-  gboolean redoable;
+  boolean undoable;
+  boolean redoable;
 
-  gboolean changed; ///< changed since last saved
-  gboolean auto_changed; ///< changed since last auto-saved
+  boolean changed; ///< changed since last saved
+  boolean auto_changed; ///< changed since last auto-saved
 
   int64_t auto_back_time;
 
   // stuff to do with framedraw "special" widgets
-  gint inwidth;
-  gint inheight;
-  gint outwidth;
-  gint outheight;
+  int inwidth;
+  int inheight;
+  int outwidth;
+  int outheight;
   lives_special_framedraw_rect_t *framedraw;
-  gint track_index;
+  int track_index;
 
   lives_mt_last_fx_type_t last_fx_type;
 
@@ -502,7 +504,7 @@
 
   mt_opts opts;
 
-  gboolean auto_reloading;
+  boolean auto_reloading;
 
   weed_plant_t *fm_edit_event;
   weed_plant_t *moving_fx;
@@ -513,23 +515,23 @@
   gulong spin_start_func;
   gulong spin_end_func;
 
-  gboolean layout_prompt; ///< on occasion, prompt user if they want to correct layout on disk or not
-  gboolean layout_set_properties;
-  gboolean ignore_load_vals;
+  boolean layout_prompt; ///< on occasion, prompt user if they want to correct layout on disk or not
+  boolean layout_set_properties;
+  boolean ignore_load_vals;
 
-  gdouble user_fps;
-  gint user_width;
-  gint user_height;
-  gint user_arate;
-  gint user_achans;
-  gint user_asamps;
-  gint user_signed_endian;
+  double user_fps;
+  int user_width;
+  int user_height;
+  int user_arate;
+  int user_achans;
+  int user_asamps;
+  int user_signed_endian;
 
-  gboolean render_vidp;
-  gboolean render_audp;
-  gboolean normalise_audp;
+  boolean render_vidp;
+  boolean render_audp;
+  boolean normalise_audp;
 
-  gint exact_preview;
+  int exact_preview;
 
 
   GList *tl_marks;
@@ -539,40 +541,40 @@
 
   weed_plant_t *specific_event; ///< a pointer to some generally interesting event
 
-  gdouble context_time; ///< this is set when the user right clicks on a track, otherwise -1.
-  gboolean use_context;
+  double context_time; ///< this is set when the user right clicks on a track, otherwise -1.
+  boolean use_context;
 
-  gint cursor_style;
+  lives_cursor_t cursor_style;
 
-  gboolean is_paused;
+  boolean is_paused;
 
   /* current size of frame inside playback/preview area */
-  gint play_width;
-  gint play_height;
+  int play_width;
+  int play_height;
 
   /* current size of playback/preview area */
-  gint play_window_width;
-  gint play_window_height;
+  int play_window_width;
+  int play_window_height;
 
-  gint selected_filter; ///< filter selected in poly window tab
+  int selected_filter; ///< filter selected in poly window tab
 
-  gint top_track; ///< top (video) track in scrolled window
+  int top_track; ///< top (video) track in scrolled window
 
-  gboolean redraw_block; ///< block drawing of playback cursor during track redraws
+  boolean redraw_block; ///< block drawing of playback cursor during track redraws
 
-  gboolean was_undo_redo;
+  boolean was_undo_redo;
 
-  gboolean no_expose; ///< block timeline expose while we are exiting
+  boolean no_expose; ///< block timeline expose while we are exiting
 
-  gboolean is_ready;
+  boolean is_ready;
 
-  gboolean aud_track_selected;
+  boolean aud_track_selected;
 
-  gboolean has_audio_file;
+  boolean has_audio_file;
 
-  gboolean tl_mouse;
+  boolean tl_mouse;
 
-  gboolean playing_sel; ///< are we playing just the time selection ?
+  boolean playing_sel; ///< are we playing just the time selection ?
 
   guint idlefunc; ///< autobackup function 
 
@@ -580,12 +582,12 @@
 
   lives_amixer_t *amixer;
 
-  gdouble prev_fx_time;
+  double prev_fx_time;
 
-  gboolean block_tl_move; ///< set to TRUE to block moving timeline (prevents loops with the node spinbutton)
-  gboolean block_node_spin; ///< set to TRUE to block moving node spinner (prevents loops with the timeline)
+  boolean block_tl_move; ///< set to TRUE to block moving timeline (prevents loops with the node spinbutton)
+  boolean block_node_spin; ///< set to TRUE to block moving node spinner (prevents loops with the timeline)
 
-  gboolean is_atrans; /// < force some visual changes when applying autotrans
+  boolean is_atrans; /// < force some visual changes when applying autotrans
 
 };  // lives_mt
 
@@ -606,7 +608,7 @@
   GtkWidget *gang_checkbutton;
   GtkWidget *inv_checkbutton;
   gulong *ch_slider_fns;
-  gint nchans;
+  int nchans;
   lives_mt *mt;
 };
 
@@ -628,9 +630,9 @@
   weed_timecode_t offset_start; ///< offset in sourcefile of first frame
 
   lives_mt_block_state_t state;
-  gboolean start_anchored;
-  gboolean end_anchored;
-  gboolean ordered; ///< are frames in sequential order ?
+  boolean start_anchored;
+  boolean end_anchored;
+  boolean ordered; ///< are frames in sequential order ?
   
   GtkWidget *eventbox; ///< pointer to eventbox widget which contains this block; we can use its "layer_number" to get the track/layer number
 
@@ -639,7 +641,7 @@
 
 /* translation table for matching event_id to init_event */
 typedef struct {
-  void *in;
+  uint64_t in;
   void *out;
 } ttable;
 
@@ -647,7 +649,7 @@
 /* clip->layout use mapping, from layout.map file */
 typedef struct {
   gchar *handle;
-  gint64 unique_id;
+  int64_t unique_id;
   gchar *name;
   GList *list;
 } layout_map;
@@ -660,12 +662,12 @@
 
 // setup functions
 
-lives_mt *multitrack (weed_plant_t *, gint orig_file, gdouble fps); ///< create and return lives_mt struct
-void mt_init_tracks (lives_mt *, gboolean set_min_max);  ///< add basic tracks, or set tracks from mt->event_list
-gboolean on_multitrack_activate (GtkMenuItem *menuitem, weed_plant_t *event_list); ///< menuitem callback
+lives_mt *multitrack (weed_plant_t *, int orig_file, double fps); ///< create and return lives_mt struct
+void mt_init_tracks (lives_mt *, boolean set_min_max);  ///< add basic tracks, or set tracks from mt->event_list
+boolean on_multitrack_activate (GtkMenuItem *menuitem, weed_plant_t *event_list); ///< menuitem callback
 
 // delete function
-gboolean multitrack_delete (lives_mt *, gboolean save);
+boolean multitrack_delete (lives_mt *, boolean save);
 
 // morph the poly window
 void polymorph (lives_mt *, lives_mt_poly_state_t poly);
@@ -736,47 +738,47 @@
 void mt_change_max_disp_tracks (GtkMenuItem *, gpointer mt);
 
 // event_list functions
-weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, gdouble fps);
+weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps);
 
 // track functions
 void on_cback_audio_activate (GtkMenuItem *, gpointer mt);
-GtkWidget *add_audio_track (lives_mt *, gint trackno, gboolean behind);
+GtkWidget *add_audio_track (lives_mt *, int trackno, boolean behind);
 void add_video_track_behind (GtkMenuItem *, gpointer mt);
 void add_video_track_front (GtkMenuItem *, gpointer mt);
-void delete_video_track(lives_mt *, gint layer, gboolean full);
-void delete_audio_track(lives_mt *, GtkWidget *eventbox, gboolean full);
-void delete_audio_tracks(lives_mt *, GList *list, gboolean full);
+void delete_video_track(lives_mt *, int layer, boolean full);
+void delete_audio_track(lives_mt *, GtkWidget *eventbox, boolean full);
+void delete_audio_tracks(lives_mt *, GList *list, boolean full);
 void remove_gaps (GtkMenuItem *, gpointer mt);
 void remove_first_gaps (GtkMenuItem *, gpointer mt);
 void on_insgap_sel_activate (GtkMenuItem *, gpointer mt);
 void on_insgap_cur_activate (GtkMenuItem *, gpointer mt);
 void on_split_activate (GtkMenuItem *, gpointer mt);
-void scroll_tracks (lives_mt *, gint top_track);
-gboolean track_arrow_pressed (GtkWidget *ahbox, GdkEventButton *, gpointer mt);
+void scroll_tracks (lives_mt *, int top_track, boolean set_value);
+boolean track_arrow_pressed (GtkWidget *ahbox, GdkEventButton *, gpointer mt);
 void track_select (lives_mt *); ///< must call after setting mt->current_track
-gboolean mt_track_is_audio(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid backing audio track
-gboolean mt_track_is_video(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid video track
+boolean mt_track_is_audio(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid backing audio track
+boolean mt_track_is_video(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid video track
 
 void mt_do_autotransition(lives_mt *, track_rect *block); ///< call this on a block to apply autotransition on it
 
 
 // track mouse movement
-gboolean on_track_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
-gboolean on_atrack_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
-gboolean on_track_header_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
-gboolean on_track_between_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
-gboolean on_track_release (GtkWidget *eventbox, GdkEventButton *event, gpointer mt);
-gboolean on_atrack_release (GtkWidget *eventbox, GdkEventButton *event, gpointer mt);
-gboolean on_track_header_release (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
-gboolean on_track_between_release (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
-gboolean on_track_move (GtkWidget *widget, GdkEventMotion *event, gpointer mt);
-gboolean on_track_header_move (GtkWidget *widget, GdkEventMotion *event, gpointer mt);
+boolean on_track_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
+boolean on_atrack_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
+boolean on_track_header_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
+boolean on_track_between_click (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
+boolean on_track_release (GtkWidget *eventbox, GdkEventButton *event, gpointer mt);
+boolean on_atrack_release (GtkWidget *eventbox, GdkEventButton *event, gpointer mt);
+boolean on_track_header_release (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
+boolean on_track_between_release (GtkWidget *eventbox, GdkEventButton *, gpointer mt);
+boolean on_track_move (GtkWidget *widget, GdkEventMotion *event, gpointer mt);
+boolean on_track_header_move (GtkWidget *widget, GdkEventMotion *event, gpointer mt);
 
 void unselect_all (lives_mt *); ///< unselect all blocks
-void insert_frames (gint filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, lives_direction_t direction, GtkWidget *eventbox, lives_mt *, track_rect *in_block);
-void insert_audio (gint filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, gdouble avel, lives_direction_t direction, GtkWidget *eventbox, lives_mt *, track_rect *in_block);
+void insert_frames (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, lives_direction_t direction, GtkWidget *eventbox, lives_mt *, track_rect *in_block);
+void insert_audio (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, double avel, lives_direction_t direction, GtkWidget *eventbox, lives_mt *, track_rect *in_block);
 void on_seltrack_toggled (GtkWidget *, gpointer mt);
-void scroll_track_by_scrollbar (GtkVScrollbar *sbar, gpointer mt);
+void scroll_track_by_scrollbar (GtkScrollbar *sbar, gpointer mt);
 
 // block functions
 void in_out_start_changed (GtkWidget *, gpointer mt);
@@ -787,29 +789,26 @@
 void avel_spin_changed (GtkSpinButton *, gpointer mt);
 
 // block API functions
-gint mt_get_last_block_number(lives_mt *, int ntrack); ///< get index of last inserted (wallclock time) block for track
-gint mt_get_block_count(lives_mt *, int ntrack); ///< count blocks in track
-gdouble mt_get_block_sttime(lives_mt *, int ntrack, int iblock); /// get timeline start time of block
-gdouble mt_get_block_entime(lives_mt *, int ntrack, int iblock); /// get timeline end time of block
+int mt_get_last_block_number(lives_mt *, int ntrack); ///< get index of last inserted (wallclock time) block for track
+int mt_get_block_count(lives_mt *, int ntrack); ///< count blocks in track
+double mt_get_block_sttime(lives_mt *, int ntrack, int iblock); /// get timeline start time of block
+double mt_get_block_entime(lives_mt *, int ntrack, int iblock); /// get timeline end time of block
 
 
 // timeline functions
-void mt_tl_move(lives_mt *, gdouble pos_rel);
-void set_timeline_end_secs (lives_mt *, gdouble secs);
-gboolean on_timeline_press (GtkWidget *, GdkEventButton *, gpointer mt);
-gboolean on_timeline_release (GtkWidget *, GdkEventButton *, gpointer mt);
-gboolean on_timeline_update (GtkWidget *, GdkEventMotion *, gpointer mt);
-gint expose_timeline_reg_event (GtkWidget *, GdkEventExpose *, gpointer mt);
-gint mt_expose_laudtrack_event (GtkWidget *ebox, GdkEventExpose *, gpointer mt);
-gint mt_expose_raudtrack_event (GtkWidget *ebox, GdkEventExpose *, gpointer mt);
+void mt_tl_move(lives_mt *, double pos_rel);
+void set_timeline_end_secs (lives_mt *, double secs);
+boolean on_timeline_press (GtkWidget *, GdkEventButton *, gpointer mt);
+boolean on_timeline_release (GtkWidget *, GdkEventButton *, gpointer mt);
+boolean on_timeline_update (GtkWidget *, GdkEventMotion *, gpointer mt);
 void draw_region (lives_mt *mt);
 void tc_to_rs (GtkMenuItem *, gpointer mt);
 void tc_to_re (GtkMenuItem *, gpointer mt);
 void rs_to_tc (GtkMenuItem *, gpointer mt);
 void re_to_tc (GtkMenuItem *, gpointer mt);
-gboolean mt_mark_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
+boolean mt_mark_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
 void multitrack_clear_marks (GtkMenuItem *, gpointer mt);
-void mt_show_current_frame(lives_mt *, gboolean return_layer);  ///< preview the current frame
+void mt_show_current_frame(lives_mt *, boolean return_layer);  ///< preview the current frame
 void mt_clear_timeline(lives_mt *mt);
 
 
@@ -818,7 +817,7 @@
 void add_context_label (lives_mt *, const gchar *text);
 void mouse_mode_context(lives_mt *);
 void do_sel_context (lives_mt *);
-void do_fx_list_context (lives_mt *, gint fxcount);
+void do_fx_list_context (lives_mt *, int fxcount);
 void do_fx_move_context(lives_mt *mt);
 
 // playback / animation
@@ -837,32 +836,34 @@
 void on_prev_node_clicked  (GtkWidget *, gpointer mt);
 void on_del_node_clicked  (GtkWidget *, gpointer mt);
 void on_node_spin_value_changed (GtkSpinButton *, gpointer mt);
-gdouble mt_get_effect_time(lives_mt *);
+double mt_get_effect_time(lives_mt *);
 
 void on_frame_preview_clicked (GtkButton *, gpointer mt);
 void show_preview (lives_mt *, weed_timecode_t tc);
 
+boolean add_mt_param_box(lives_mt *);
+
 // filter list controls
-weed_plant_t *get_prev_fm (lives_mt *, gint current_track, weed_plant_t *frame);
-weed_plant_t *get_next_fm (lives_mt *, gint current_track, weed_plant_t *frame);
+weed_plant_t *get_prev_fm (lives_mt *, int current_track, weed_plant_t *frame);
+weed_plant_t *get_next_fm (lives_mt *, int current_track, weed_plant_t *frame);
 
-void on_prev_fm_clicked  (GtkWidget *button, gpointer user_data);
-void on_next_fm_clicked  (GtkWidget *button, gpointer user_data);
-void on_fx_insb_clicked  (GtkWidget *button, gpointer user_data);
-void on_fx_insa_clicked  (GtkWidget *button, gpointer user_data);
+void on_prev_fm_clicked  (GtkWidget *button, gpointer mt);
+void on_next_fm_clicked  (GtkWidget *button, gpointer mt);
+void on_fx_insb_clicked  (GtkWidget *button, gpointer mt);
+void on_fx_insa_clicked  (GtkWidget *button, gpointer mt);
 
 // utils
-guint event_list_get_byte_size(lives_mt *mt, weed_plant_t *event_list, int *num_events);  ///< returns bytes and sets num_events
-gboolean event_list_rectify(lives_mt *, weed_plant_t *event_listy);
-gboolean make_backup_space (lives_mt *, size_t space_needed);
+guint event_list_get_byte_size(lives_mt *, weed_plant_t *event_list, int *num_events);  ///< returns bytes and sets num_events
+boolean event_list_rectify(lives_mt *, weed_plant_t *event_listy);
+boolean make_backup_space (lives_mt *, size_t space_needed);
 void activate_mt_preview(lives_mt *); ///< sensitize Show Preview and Apply buttons
 void **mt_get_pchain(void);
 void event_list_free_undos(lives_mt *);
-gboolean used_in_current_layout(lives_mt *, gint file);
+boolean used_in_current_layout(lives_mt *, int file);
 
 // event_list utilities
-gboolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2, gint ctrack); ///< ctrack can be -1 to compare all events, else we cf for ctrack
-void move_init_in_filter_map(lives_mt *mt, weed_plant_t *event_list, weed_plant_t *fmap, weed_plant_t *ifrom, weed_plant_t *ito, gint track, gboolean after);
+boolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2, int ctrack); ///< ctrack can be -1 to compare all events, else we cf for ctrack
+void move_init_in_filter_map(lives_mt *, weed_plant_t *event_list, weed_plant_t *fmap, weed_plant_t *ifrom, weed_plant_t *ito, int track, boolean after);
 void update_filter_events(lives_mt *, weed_plant_t *first_event, weed_timecode_t start_tc, weed_timecode_t end_tc, int track, weed_timecode_t new_start_tc, int new_track);
 void mt_fixup_events(lives_mt *, weed_plant_t *old_event, weed_plant_t *new_event);
 
@@ -880,12 +881,12 @@
 
 void migrate_layouts (const gchar *old_set_name, const gchar *new_set_name);
 
-GList *layout_frame_is_affected(gint clipno, gint frame);
-GList *layout_audio_is_affected(gint clipno, gdouble time);
+GList *layout_frame_is_affected(int clipno, int frame);
+GList *layout_audio_is_affected(int clipno, double time);
 
-gboolean check_for_layout_del (lives_mt *, gboolean exiting);
+boolean check_for_layout_del (lives_mt *, boolean exiting);
 
-void stored_event_list_free_all(gboolean wiped);
+void stored_event_list_free_all(boolean wiped);
 void stored_event_list_free_undos(void);
 void remove_current_from_affected_layouts(lives_mt *);
 
@@ -894,33 +895,29 @@
 guint mt_idle_add(lives_mt *);
 void recover_layout(GtkButton *, gpointer);
 void recover_layout_cancelled(GtkButton *, gpointer user_data);
-gboolean write_backup_layout_numbering(lives_mt *);
-
-
-// internal functions
-void mouse_select_end(GtkWidget *, lives_mt *);
+boolean write_backup_layout_numbering(lives_mt *);
 
 
 // amixer funcs
 void amixer_show (GtkButton *, gpointer mt);
 void on_amixer_close_clicked (GtkButton *, lives_mt *mt);
-GtkWidget * amixer_add_channel_slider (lives_mt *, gint i);
+GtkWidget * amixer_add_channel_slider (lives_mt *, int i);
 
 
 // misc
-void mt_change_disp_tracks_ok (GtkButton *, gpointer user_data);
-void mt_swap_play_pause (lives_mt *, gboolean put_pause);
-gchar *set_values_from_defs(lives_mt *, gboolean from_prefs);
+void mt_change_disp_tracks_ok (GtkButton *, gpointer mt);
+void mt_swap_play_pause (lives_mt *, boolean put_pause);
+gchar *set_values_from_defs(lives_mt *, boolean from_prefs);
 
 
 // clip boxes
-void mt_clip_select (lives_mt *, gboolean scroll);
-void mt_delete_clips(lives_mt *, gint file);
-void mt_init_clips (lives_mt *, gint orig_file, gboolean add);
+void mt_clip_select (lives_mt *, boolean scroll);
+void mt_delete_clips(lives_mt *, int file);
+void mt_init_clips (lives_mt *, int orig_file, boolean add);
 
 // key shortcuts
-gboolean mt_prevclip (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
-gboolean mt_nextclip (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer user_data);
+boolean mt_prevclip (GtkAccelGroup *, GObject *, guint keyval, GdkModifierType mod, gpointer);
+boolean mt_nextclip (GtkAccelGroup *, GObject *, guint keyval, GdkModifierType mod, gpointer);
 
 typedef enum {
   /* default to warn about */
@@ -939,4 +936,18 @@
   LMAP_INFO_SETNAME_CHANGED=1024
 } lives_lmap_error_t;
 
+
+
+// array max: TODO - use dynamic arrays to bypass track limits
+
+#ifdef IS_MINGW
+#define MAX_TRACKS 32768
+#define MAX_VIDEO_TRACKS 32768
+#define MAX_AUDIO_TRACKS 32768
+#else
+#define MAX_TRACKS 65536
+#define MAX_VIDEO_TRACKS 65536
+#define MAX_AUDIO_TRACKS 65536
+#endif
+
 #endif

LiVES-1.6.1.tar.bz2/src/omc-learn.c -> LiVES-2.0.3.tar.bz2/src/omc-learn.c Changed

@@ -1,9 +1,12 @@
 // omc-learn.c
 // LiVES (lives-exe)
-// (c) G. Finch 2008 - 2012
+// (c) G. Finch 2008 - 2013
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
+
+#ifdef ENABLE_OSC
+
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-host.h>
@@ -61,7 +64,7 @@
 static gchar byarr[OSC_BUF_SIZE];
 static lives_omc_macro_t omc_macros[N_OMC_MACROS];
 static GSList *omc_node_list;
-static gboolean omc_macros_inited=FALSE;
+static boolean omc_macros_inited=FALSE;
 
 //////////////////////////////////////////////////////////////
 
@@ -90,7 +93,7 @@
 
 
 
-static void remove_all_nodes(gboolean every, omclearn_w *omclw) {
+static void remove_all_nodes(boolean every, omclearn_w *omclw) {
   lives_omc_match_node_t *mnode;
   GSList *slist_last=NULL,*slist_next;
   GSList *slist=omc_node_list;
@@ -145,7 +148,7 @@
 
 
 
-
+#ifndef IS_MINGW
 const gchar * get_js_filename(void) {
   gchar *js_fname;
 
@@ -168,10 +171,10 @@
   }
   return js_fname;
 }
+#endif
 
 
-
-gboolean js_open(void) {
+boolean js_open(void) {
   gchar *msg;
 
   if (!(prefs->omc_dev_opts&OMC_DEV_JS)) return TRUE;
@@ -246,6 +249,8 @@
 
 static int midi_fd;
 
+#ifndef IS_MINGW
+
 
 const gchar *get_midi_filename(void) {
 gchar *midi_fname;
@@ -267,10 +272,14 @@
   return midi_fname;
 }
 
+#endif
+
 
-gboolean midi_open(void) {
+boolean midi_open(void) {
 
+#ifndef IS_MINGW  
   gchar *msg;
+#endif
 
   if (!(prefs->omc_dev_opts&OMC_DEV_MIDI)) return TRUE;
 
@@ -299,7 +308,8 @@
   else {
 
 #endif
-  
+
+#ifndef IS_MINGW  
   if (prefs->omc_midi_fname!=NULL) {
     midi_fd = open(prefs->omc_midi_fname, O_RDONLY|O_NONBLOCK);
     if (midi_fd < 0) return FALSE;
@@ -315,6 +325,7 @@
   msg=g_strdup_printf(_("Responding to MIDI events from %s\n"),prefs->omc_midi_fname);
   d_print(msg);
   g_free(msg);
+#endif
 
 #ifdef ALSA_MIDI
   }
@@ -399,7 +410,7 @@
   ssize_t bytes,tot=0,allowed=prefs->midi_rpt;
   unsigned char midbuf[4],xbuf[4];
   gint target=1,mtype=0,idx;
-  gboolean got_target=FALSE;
+  boolean got_target=FALSE;
   gchar *str;
 
 #ifdef ALSA_MIDI
@@ -407,7 +418,7 @@
   struct pollfd *pfd=NULL;
   snd_seq_event_t *ev;
   int typeNumber;
-  gboolean hasmore=FALSE;
+  boolean hasmore=FALSE;
 
   if (mainw->seq_handle!=NULL) {
 
@@ -697,7 +708,7 @@
   mnode->treev2 = gtk_tree_view_new_with_model (GTK_TREE_MODEL (mnode->gtkstore2));
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_base(mnode->treev2, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_base_color(mnode->treev2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   renderer = gtk_cell_renderer_text_new ();
@@ -788,15 +799,17 @@
 
 
 
-static void on_omc_combo_entry_changed (GtkEntry *macro_entry, gpointer ptr) {
-  const gchar *macro_text=gtk_entry_get_text(macro_entry);
+static void on_omc_combo_entry_changed (GtkComboBox *combo, gpointer ptr) {
+  char *macro_text;
 
   int i;
     
   lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)ptr;
 
-  gint row=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(macro_entry),"row"));
-  omclearn_w *omclw=(omclearn_w *)g_object_get_data(G_OBJECT(macro_entry),"omclw");
+  gint row=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"row"));
+  omclearn_w *omclw=(omclearn_w *)g_object_get_data(G_OBJECT(combo),"omclw");
+
+  macro_text=lives_combo_get_active_text(LIVES_COMBO(combo));
 
   if (mnode->treev2!=NULL) {
     // remove old mapping
@@ -814,12 +827,17 @@
 
   }
 
-  if (!strcmp(macro_text,mainw->none_string)) return;
+  if (!strcmp(macro_text,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
+    g_free(macro_text);
+    return;
+  }
 
   for (i=0;i<=N_OMC_MACROS;i++) {
     if (!strcmp(macro_text,omc_macros[i].macro_text)) break;
   }
 
+  g_free(macro_text);
+
   mnode->macro=i;
   omc_learn_link_params(mnode);
   omc_macro_row_add_params(mnode,row,omclw);
@@ -927,34 +945,27 @@
 
 
 static GtkWidget *create_omc_macro_combo(lives_omc_match_node_t *mnode, gint row, omclearn_w *omclw) {
-  GList *macro_list=NULL;
   int i;
-  gulong omc_combo_fn;
-
-  GtkWidget *combo = gtk_combo_new ();
-
-  macro_list=g_list_append(macro_list,mainw->none_string);
 
+  GtkWidget *combo;
+  
+  combo=lives_combo_new();
+  
   for (i=0;i<N_OMC_MACROS;i++) {
     if (omc_macros[i].msg==NULL) break;
-    macro_list=g_list_append(macro_list,omc_macros[i].macro_text);
-  }
 
-  combo_set_popdown_strings (GTK_COMBO (combo), macro_list);
+    lives_combo_append_text(LIVES_COMBO(combo),omc_macros[i].macro_text);
 
-  g_list_free(macro_list);
+  }
 
-  gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO(combo))->entry),FALSE);
-  omc_combo_fn=g_signal_connect_after (G_OBJECT (GTK_COMBO(combo)->entry), "changed", G_CALLBACK (on_omc_combo_entry_changed), mnode);
-  
   if (mnode->macro!=-1) {
-    g_signal_handler_block(GTK_COMBO(combo)->entry,omc_combo_fn);
-    gtk_entry_set_text (GTK_ENTRY((GTK_COMBO(combo))->entry),omc_macros[mnode->macro].macro_text);
-    g_signal_handler_unblock(GTK_COMBO(combo)->entry,omc_combo_fn);
+    gtk_combo_box_set_active (GTK_COMBO_BOX(combo),mnode->macro);
   }
 
-  g_object_set_data(G_OBJECT((GTK_COMBO(combo))->entry),"row",GINT_TO_POINTER(row));
-  g_object_set_data(G_OBJECT((GTK_COMBO(combo))->entry),"omclw",(gpointer)omclw);
+  g_signal_connect_after (G_OBJECT (combo), "changed", G_CALLBACK (on_omc_combo_entry_changed), mnode);
+
+  g_object_set_data(G_OBJECT(combo),"row",GINT_TO_POINTER(row));
+  g_object_set_data(G_OBJECT(combo),"omclw",(gpointer)omclw);
 
   return combo;
 }
@@ -1020,7 +1031,8 @@
        else valstr=g_strdup("-");
      }
 
-     gtk_tree_store_set (mnode->gtkstore, &iter2, TITLE_COLUMN, vname, VALUE_COLUMN, valstr, FILTER_COLUMN, mnode->matchp[i], RANGE_COLUMN, strval, OFFS1_COLUMN, strval2, SCALE_COLUMN, strval3, OFFS2_COLUMN, strval4, -1);
+     gtk_tree_store_set (mnode->gtkstore, &iter2, TITLE_COLUMN, vname, VALUE_COLUMN, valstr, FILTER_COLUMN, mnode->matchp[i], 
+			 RANGE_COLUMN, strval, OFFS1_COLUMN, strval2, SCALE_COLUMN, strval3, OFFS2_COLUMN, strval4, -1);
 
      g_free (strval);
      g_free (strval2);
@@ -1063,13 +1075,9 @@
      break;
    }
 
-   label = gtk_label_new (labelt);
+   label = lives_standard_label_new (labelt);
    gtk_widget_show (label);
    
-   if (palette->style&STYLE_1) {
-     gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-   }
-
    if (labelt!=NULL) g_free(labelt);
      
    omclw->tbl_currow++;
@@ -1079,7 +1087,7 @@
 
    // properties
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_base(mnode->treev1, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_base_color(mnode->treev1, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
    renderer = gtk_cell_renderer_text_new ();
@@ -1299,48 +1307,27 @@
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
   
-  winsize_h=scr_width-100;
-  winsize_v=scr_height-100;
+  winsize_h=scr_width-SCR_WIDTH_SAFETY;
+  winsize_v=scr_height-SCR_HEIGHT_SAFETY*2;
   
-  omclw->dialog = gtk_dialog_new ();
+  omclw->dialog = lives_standard_dialog_new (_("LiVES: OMC learner"),FALSE);
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(omclw->dialog, GTK_STATE_NORMAL, &palette->menu_and_bars);
-  }
-
-  gtk_window_set_title (GTK_WINDOW (omclw->dialog), _("LiVES: OMC learner"));
-  gtk_window_add_accel_group (GTK_WINDOW (omclw->dialog), mainw->accel_group);
   omclw->top_vbox = lives_dialog_get_content_area(GTK_DIALOG(omclw->dialog));
 
   omclw->table = gtk_table_new (omclw->tbl_rows, 4, FALSE);
-  gtk_widget_show (omclw->table);
 
-  gtk_table_set_col_spacings(GTK_TABLE(omclw->table),20);
+  gtk_table_set_col_spacings(GTK_TABLE(omclw->table),widget_opts.packing_width*2);
+
+  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, omclw->table);
 
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow);
   gtk_box_pack_start (GTK_BOX (omclw->top_vbox), scrolledwindow, TRUE, TRUE, 0);
-  
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), omclw->table);
-  gtk_widget_set_size_request (scrolledwindow, winsize_h, winsize_v);
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(gtk_bin_get_child (GTK_BIN (scrolledwindow)), GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolledwindow))),GTK_SHADOW_IN);
-  
-  hbuttonbox = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox);
-  
-  gtk_box_pack_start (GTK_BOX (omclw->top_vbox), hbuttonbox, TRUE, TRUE, 0);
-  
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
+
+
+
+  hbuttonbox = lives_dialog_get_action_area(LIVES_DIALOG(omclw->dialog));
   
   omclw->clear_button = gtk_button_new_with_mnemonic (_("Clear _unmatched"));
-  gtk_widget_show (omclw->clear_button);
+
   gtk_container_add (GTK_CONTAINER (hbuttonbox), omclw->clear_button);
   
 
@@ -1351,7 +1338,7 @@
   gtk_widget_set_sensitive(omclw->clear_button,FALSE);
 
   omclw->del_all_button = gtk_button_new_with_mnemonic (_("_Delete all"));
-  gtk_widget_show (omclw->del_all_button);
+
   gtk_container_add (GTK_CONTAINER (hbuttonbox), omclw->del_all_button);
   
 
@@ -1363,19 +1350,32 @@
 
 
   ok_button = gtk_button_new_with_mnemonic (_("Close _window"));
-  gtk_widget_show (ok_button);
+
   gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
   
-  GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (ok_button);
+
   gtk_widget_grab_default (ok_button);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
+#else
+  gtk_widget_set_size_request(ok_button,DEF_BUTTON_WIDTH*4,-1);
+  gtk_widget_set_size_request(omclw->clear_button,DEF_BUTTON_WIDTH*4,-1);
+  gtk_widget_set_size_request(omclw->del_all_button,DEF_BUTTON_WIDTH*4,-1);
+#endif
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
+  
   
   g_signal_connect (GTK_OBJECT (ok_button), "clicked",
 		    G_CALLBACK (close_learner_dialog),
 		    NULL);
   
   if (prefs->gui_monitor!=0) {
-    gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-omclw->dialog->allocation.width)/2;
-    gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-omclw->dialog->allocation.height)/2;
+    gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width
+						    -lives_widget_get_allocation_width(omclw->dialog))/2;
+    gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height
+						    -lives_widget_get_allocation_height(omclw->dialog))/2;
     gtk_window_set_screen(GTK_WINDOW(omclw->dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
     gtk_window_move(GTK_WINDOW(omclw->dialog),xcen,ycen);
   }
@@ -1383,6 +1383,9 @@
   if (prefs->open_maximised) {
     gtk_window_maximize (GTK_WINDOW(omclw->dialog));
   }
+
+  if (prefs->show_gui)
+    gtk_widget_show_all(omclw->dialog);
   
   return omclw;
 }
@@ -1499,8 +1502,10 @@
   omc_macros[24].macro_text=g_strdup(_("Cycle to previous mode for effect key <key>"));
   omc_macros[24].nparams=1;
 
-
-
+  omc_macros[25].msg=g_strdup("/video/play/parameter/value/set");
+  omc_macros[25].macro_text=g_strdup(_("Set playback plugin parameter value <pnum> = <value>"));
+  omc_macros[25].info_text=g_strdup(_("Set <value> of pth parameter for the playback plugin."));
+  omc_macros[25].nparams=2;
 
 
   for (i=0;i<N_OMC_MACROS;i++) {
@@ -1615,6 +1620,23 @@
   // TRANSLATORS: as in keyboard key
   omc_macros[24].pname[0]=g_strdup(_("key"));
 
+
+  // param
+  omc_macros[25].ptypes[0]=OMC_PARAM_INT;
+  omc_macros[25].mini[0]=0;
+  omc_macros[25].maxi[0]=128;
+  omc_macros[25].vali[0]=0;
+  // TRANSLATORS: short form of "parameter number"
+  omc_macros[25].pname[0]=g_strdup(_("pnum"));
+
+  // value (this will get special handling)
+  // type conversion and auto offset/scaling will be done
+  omc_macros[25].ptypes[1]=OMC_PARAM_SPECIAL;
+  omc_macros[25].mind[1]=0.;
+  omc_macros[25].maxd[1]=0.;
+  omc_macros[25].vald[1]=0.;
+  omc_macros[25].pname[1]=g_strdup(_("value"));
+
 }
 
 
@@ -1648,7 +1670,7 @@
 
 
 
-static gboolean match_filtered_params(lives_omc_match_node_t *mnode, const gchar *sig, int nfixed) {
+static boolean match_filtered_params(lives_omc_match_node_t *mnode, const gchar *sig, int nfixed) {
   int i;
   gchar **array=g_strsplit(sig," ",-1);
 
@@ -1788,7 +1810,7 @@
     mnode->offs1=(gint *)g_malloc(mnode->nvars*sizint);
     mnode->min=(gint *)g_malloc(mnode->nvars*sizint);
     mnode->max=(gint *)g_malloc(mnode->nvars*sizint);
-    mnode->matchp=(gboolean *)g_malloc(mnode->nvars*sizeof(gboolean));
+    mnode->matchp=(boolean *)g_malloc(mnode->nvars*sizeof(boolean));
     mnode->matchi=(gint *)g_malloc(mnode->nvars*sizint);
   }
 
@@ -2004,13 +2026,13 @@
 
 // in playback mode, we match the string with our database, and then convert/append the variables
 
-gboolean omc_process_string(gint supertype, const gchar *string, gboolean learn, omclearn_w *omclw) {
+boolean omc_process_string(gint supertype, const gchar *string, boolean learn, omclearn_w *omclw) {
   // only need to set omclw if learn is TRUE
   
   // returns TRUE if we learn new, or if we carry out an action
   // retruns FALSE otherwise
 
-  gboolean ret=FALSE;
+  boolean ret=FALSE;
   int type=0,idx=-1;
   lives_omc_match_node_t *mnode;
 
@@ -2112,6 +2134,10 @@
 
 #ifdef OMC_MIDI_IMPL
       if (mainw->ext_cntl[EXT_CNTL_MIDI]) string=midi_mangle();
+      //#define TEST_OMC_LEARN
+#ifdef TEST_OMC_LEARN
+      string=g_strdup("176 10 0 1");
+#endif
       if (string!=NULL) {
 	omc_process_string(OMC_MIDI,string,TRUE,omclw);
 	g_free(string);
@@ -2125,7 +2151,7 @@
 
     g_usleep(prefs->sleep_time);
 
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
   }
 
   remove_all_nodes(FALSE,omclw);
@@ -2171,8 +2197,10 @@
 	ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
 	for (k=0;k<ntmpls;k++) {
 	  ptmpl=ptmpls[k];
+	  if (weed_plant_has_leaf(ptmpl,"host_internal_connection")) continue;
 	  hint=weed_get_int_value(ptmpl,"hint",&error);
 	  flags=weed_get_int_value(ptmpl,"flags",&error);
+	  if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS) flags^=WEED_PARAMETER_VARIABLE_ELEMENTS;
 	  if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
 	    if (oval1==0) {
 	      if (hint==WEED_HINT_INTEGER) {
@@ -2190,6 +2218,7 @@
 	weed_free(ptmpls);
       }
       else {
+	// playback plugin params
 	if (omacro->ptypes[i]==OMC_PARAM_INT) {
 	  int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
 	  if (i==0) oval0=oval;
@@ -2221,8 +2250,9 @@
   lives_omc_match_node_t *mnode;
   lives_omc_macro_t omacro;
   int oval0=1,oval1=0;
+  int error,ntmpls,hint,flags;
 
-  int i,j,k;
+  register int i,j,k;
 
   int *vals;
 
@@ -2269,62 +2299,92 @@
       j=mnode->map[i];
 
       if (j>-1) {
-	if (macro==18&&i==2) {
-	  // auto scale for fx param
-	  int error,ntmpls,hint,flags;
-	  gint mode=rte_key_getmode(oval0);
-	  weed_plant_t *filter;
-	  weed_plant_t **ptmpls;
-	  weed_plant_t *ptmpl;
-
-	  if (mode==-1) return NULL;
-
-	  filter=rte_keymode_get_filter(oval0,mode);
-
-	  ntmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
-
-	  ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-	  for (k=0;k<ntmpls;k++) {
-	    ptmpl=ptmpls[k];
-	    hint=weed_get_int_value(ptmpl,"hint",&error);
-	    flags=weed_get_int_value(ptmpl,"flags",&error);
-	    if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
-	      if (oval1==0) {
-		if (hint==WEED_HINT_INTEGER) {
-		  int omin=mnode->min[j];
-		  int omax=mnode->max[j];
-		  int mini=weed_get_int_value(ptmpl,"min",&error);
-		  int maxi=weed_get_int_value(ptmpl,"max",&error);
-
-		  int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
-		  OSC_writeIntArg(&obuf,oval);
-		}
-		else {
-		  // float
-		  int omin=mnode->min[j];
-		  int omax=mnode->max[j];
-		  double minf=weed_get_double_value(ptmpl,"min",&error);
-		  double maxf=weed_get_double_value(ptmpl,"max",&error);
-
-		  double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
-		  OSC_writeFloatArg(&obuf,(float)oval);
-		} // end float
-	      }
-	      oval1--;
+
+	if (macro==25 && i==1 && mainw->vpp!=NULL && mainw->vpp->play_params!=NULL && oval0<mainw->vpp->num_play_params) {
+	  // auto scale for playback plugin params
+
+	  weed_plant_t *ptmpl=weed_get_plantptr_value((weed_plant_t *)pp_get_param(mainw->vpp->play_params,oval0),"template",&error);
+	  hint=weed_get_int_value(ptmpl,"hint",&error);
+	  if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&weed_leaf_num_elements(ptmpl,"default")==1) {
+	    if (hint==WEED_HINT_INTEGER) {
+	      int omin=mnode->min[j];
+	      int omax=mnode->max[j];
+	      int mini=weed_get_int_value(ptmpl,"min",&error);
+	      int maxi=weed_get_int_value(ptmpl,"max",&error);
+	      
+	      int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
+	      OSC_writeIntArg(&obuf,oval);
 	    }
+	    else {
+	      // float
+	      int omin=mnode->min[j];
+	      int omax=mnode->max[j];
+	      double minf=weed_get_double_value(ptmpl,"min",&error);
+	      double maxf=weed_get_double_value(ptmpl,"max",&error);
+	      
+	      double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
+	      OSC_writeFloatArg(&obuf,(float)oval);
+	    } // end float
 	  }
-	  weed_free(ptmpls);
 	}
-	else {
-	  if (omacro.ptypes[i]==OMC_PARAM_INT) {
-	    int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
-	    if (i==0) oval0=oval;
-	    if (i==1) oval1=oval;
-	    OSC_writeIntArg(&obuf,oval);
+	else { 
+	  if (macro==18&&i==2) {
+	    // auto scale for fx param
+	    gint mode=rte_key_getmode(oval0);
+	    weed_plant_t *filter;
+	    weed_plant_t **ptmpls;
+	    weed_plant_t *ptmpl;
+
+	    if (mode==-1) return NULL;
+
+	    filter=rte_keymode_get_filter(oval0,mode);
+
+	    ntmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+	    ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+	    for (k=0;k<ntmpls;k++) {
+	      ptmpl=ptmpls[k];
+	      if (weed_plant_has_leaf(ptmpl,"host_internal_connection")) continue;
+	      hint=weed_get_int_value(ptmpl,"hint",&error);
+	      flags=weed_get_int_value(ptmpl,"flags",&error);
+	      if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
+		if (oval1==0) {
+		  if (hint==WEED_HINT_INTEGER) {
+		    int omin=mnode->min[j];
+		    int omax=mnode->max[j];
+		    int mini=weed_get_int_value(ptmpl,"min",&error);
+		    int maxi=weed_get_int_value(ptmpl,"max",&error);
+
+		    int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
+		    OSC_writeIntArg(&obuf,oval);
+		  }
+		  else {
+		    // float
+		    int omin=mnode->min[j];
+		    int omax=mnode->max[j];
+		    double minf=weed_get_double_value(ptmpl,"min",&error);
+		    double maxf=weed_get_double_value(ptmpl,"max",&error);
+
+		    double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
+		    OSC_writeFloatArg(&obuf,(float)oval);
+		  } // end float
+		}
+		oval1--;
+	      }
+	    }
+	    weed_free(ptmpls);
 	  }
 	  else {
-	    double oval=(double)(vals[j]+mnode->offs0[j])*mnode->scale[j]+(double)mnode->offs1[j];
-	    OSC_writeFloatArg(&obuf,oval);
+	    if (omacro.ptypes[i]==OMC_PARAM_INT) {
+	      int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
+	      if (i==0) oval0=oval;
+	      if (i==1) oval1=oval;
+	      OSC_writeIntArg(&obuf,oval);
+	    }
+	    else {
+	      double oval=(double)(vals[j]+mnode->offs0[j])*mnode->scale[j]+(double)mnode->offs1[j];
+	      OSC_writeFloatArg(&obuf,oval);
+	    }
 	  }
 	}
       }
@@ -2339,7 +2399,6 @@
 	}
       }
     }
-
     g_free(vals);
   }
 
@@ -2358,7 +2417,7 @@
 
 
 void on_midi_save_activate (GtkMenuItem *menuitem, gpointer user_data) {
-  gchar *save_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
+  gchar *save_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
   int fd;
   GSList *slist=omc_node_list;
   size_t srchlen;
@@ -2486,7 +2545,7 @@
   gchar *tmp;
 #endif 
 
-  if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
+  if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
   else load_file=g_strdup((gchar *)user_data);
 
   if (load_file==NULL) return;
@@ -2692,3 +2751,6 @@
 #endif
 
 }
+
+
+#endif

LiVES-1.6.1.tar.bz2/src/omc-learn.h -> LiVES-2.0.3.tar.bz2/src/omc-learn.h Changed

@@ -1,9 +1,10 @@
 // omc-learn.h
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2009
+// (c) G. Finch 2003 - 2012
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
+
 #ifndef HAS_LIVES_OMC_LEARN_H
 #define HAS_LIVES_OMC_LEARN_H
 
@@ -23,7 +24,7 @@
 
 #ifdef OMC_JS_IMPL
 gchar *js_mangle(void);
-gboolean js_open(void);
+boolean js_open(void);
 void js_close(void);
 const gchar *get_js_filename(void);
 #endif
@@ -31,7 +32,7 @@
 #ifdef OMC_MIDI_IMPL
 gchar *midi_mangle(void);
 const gchar *get_midi_filename(void);
-gboolean midi_open(void);
+boolean midi_open(void);
 void midi_close(void);
 #endif
 
@@ -78,7 +79,7 @@
   gint *min; ///< min values of params
   gint *max; ///< max values of params
 
-  gboolean *matchp; ///< do we need to match this pval ?
+  boolean *matchp; ///< do we need to match this pval ?
   gint *matchi; ///< match value
 
   // enumerated by number of params in target macro
@@ -150,7 +151,7 @@
 
 /// process a string (i.e. convert to an OSC message and pass to OSC subsys)
 /// only need to set omclw if learn is TRUE
-gboolean omc_process_string(gint supertype, const gchar *string, gboolean learn, omclearn_w *omclw);
+boolean omc_process_string(gint supertype, const gchar *string, boolean learn, omclearn_w *omclw);
 
 
 
@@ -162,6 +163,7 @@
 
 #include "osc.h"
 
+
 #define OSC_BUF_SIZE 1024
 #define OSC_MAX_TYPETAGS 64 
 
@@ -171,3 +173,5 @@
 
 #endif // HAS_LIVES_OMC_LEARN_H
 
+
+

LiVES-1.6.1.tar.bz2/src/osc.c -> LiVES-2.0.3.tar.bz2/src/osc.c Changed

@@ -4,10 +4,10 @@
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
-#include "main.h"
 
-#ifdef ENABLE_OSC
+#ifndef IS_MINGW
 #include <netinet/in.h>
+#endif
 
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
@@ -21,6 +21,10 @@
 #include "../libweed/weed-host.h"
 #endif
 
+#include "main.h"
+
+#ifdef ENABLE_OSC
+
 #include "osc.h"
 #include "htmsocket.h"
 #include "callbacks.h"
@@ -28,13 +32,16 @@
 #include "support.h"
 #include "rte_window.h"
 #include "resample.h"
-
+#include "paramwindow.h"
 
 void *status_socket;
 void *notify_socket;
 
 static lives_osc *livesOSC=NULL;
 
+#define CONSTLEN 8
+
+static char constval[CONSTLEN];
 
 static gboolean via_shortcut=FALSE;
 
@@ -193,7 +200,7 @@
 
 /* unused */
 /*
-void lives_osc_notify_cancel (void) {
+  void lives_osc_notify_cancel (void) {
   if (prefs->omc_noisy);
   lives_osc_notify(LIVES_OSC_NOTIFY_CANCELLED,NULL);
   }*/
@@ -211,48 +218,105 @@
 }
 
 
-static const gchar *get_omc_const(const gchar *cname) {
 
+static LIVES_INLINE const char *get_value_of(const int what) {
+  snprintf(constval,CONSTLEN,"%d",what);
+  return (const char *)&constval;
+}
+
+
+
+
+
+static const char *get_omc_const(const gchar *cname) {
+
+  // looping modes
   if (!strcmp(cname,"LIVES_LOOP_NONE")) return "0";
   if (!strcmp(cname,"LIVES_LOOP_FIT")) return "2";
   if (!strcmp(cname,"LIVES_LOOP_CONT")) return "1";
 
+  // interface modes
   if (!strcmp(cname,"LIVES_MODE_CLIPEDIT")) return "0";
   if (!strcmp(cname,"LIVES_MODE_MULTITRACK")) return "1";
 
+  // parameter types
   if (!strcmp(cname,"LIVES_PARAM_TYPE_INTEGER")) 
-    return QUOTEME(WEED_HINT_INTEGER);
+    return get_value_of((const int)WEED_HINT_INTEGER);
   if (!strcmp(cname,"LIVES_PARAM_TYPE_FLOAT")) 
-    return QUOTEME(WEED_HINT_FLOAT);
+    return get_value_of((const int)WEED_HINT_FLOAT);
   if (!strcmp(cname,"LIVES_PARAM_TYPE_BOOL")) 
-    return QUOTEME(WEED_HINT_SWITCH);
+    return get_value_of((const int)WEED_HINT_SWITCH);
   if (!strcmp(cname,"LIVES_PARAM_TYPE_STRING")) 
-    return QUOTEME(WEED_HINT_TEXT);
+    return get_value_of((const int)WEED_HINT_TEXT);
   if (!strcmp(cname,"LIVES_PARAM_TYPE_COLOR")) 
-    return QUOTEME(WEED_HINT_COLOR);
-
-  if (!strcmp(cname,"LIVES_COLORSPACE_RGB")) 
-    return QUOTEME(WEED_COLORSPACE_RGB);
-  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA")) 
-    return QUOTEME(WEED_COLORSPACE_RGBA);
+    return get_value_of((const int)WEED_HINT_COLOR);
 
-  if (!strcmp(cname,"TRUE")) return QUOTEME(TRUE);
-  if (!strcmp(cname,"FALSE")) return QUOTEME(FALSE);
+  // colorspaces
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGB_INT")) 
+    return "1";
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA_INT")) 
+    return "2";
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGB_FLOAT")) 
+    return "3";
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA_FLOAT")) 
+    return "4";
+
+  // boolean values
+  if (!strcmp(cname,"LIVES_TRUE")) return "1";
+  if (!strcmp(cname,"LIVES_FALSE")) return "0";
 
+  // parameter flags
   if (!strcmp(cname,"LIVES_PARAM_FLAGS_REINIT_ON_VALUE_CHANGE")) 
-    return QUOTEME(WEED_PARAMETER_FLAGS_REINIT_ON_VALUE_CHANGE);
+    return get_value_of((const int)WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
   if (!strcmp(cname,"LIVES_PARAM_FLAGS_VARIABLE_ELEMENTS"))
-    return QUOTEME(WEED_PARAMETER_FLAGS_VARIABLE_ELEMENTS);
+    return get_value_of((const int)WEED_PARAMETER_VARIABLE_ELEMENTS);
   if (!strcmp(cname,"LIVES_PARAM_FLAGS_ELEMENT_PER_CHANNEL"))
-    return QUOTEME(WEED_PARAMETER_FLAGS_ELEMENT_PER_CHANNEL);
+    return get_value_of((const int)WEED_PARAMETER_ELEMENT_PER_CHANNEL);
 
+  // notification types
   if (!strcmp(cname,"LIVES_OSC_NOTIFY_SUCCESS")) 
-    return QUOTEME(LIVES_OSC_NOTIFY_SUCCESS);
+    return get_value_of((const int)LIVES_OSC_NOTIFY_SUCCESS);
   if (!strcmp(cname,"LIVES_OSC_NOTIFY_FAILED")) 
-    return QUOTEME(LIVES_OSC_NOTIFY_FAILED);
+    return get_value_of((const int)LIVES_OSC_NOTIFY_FAILED);
+
+  // notification events
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_FRAME_SYNCH")) 
+    return get_value_of((const int)LIVES_OSC_NOTIFY_FRAME_SYNCH);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_PLAYBACK_STARTED")) 
+    return get_value_of((const int)LIVES_OSC_NOTIFY_PLAYBACK_STARTED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_PLAYBACK_STOPPED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_PLAYBACK_STOPPED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_PLAYBACK_STOPPED_RD"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_PLAYBACK_STOPPED_RD);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_RECORD_STARTED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_RECORD_STARTED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_RECORD_STOPPED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_RECORD_STOPPED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_QUIT"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_QUIT);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIP_OPENED")) 
+    return get_value_of((const int)LIVES_OSC_NOTIFY_CLIP_OPENED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIP_CLOSED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_CLIP_CLOSED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIPSET_OPENED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_CLIPSET_OPENED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIPSET_SAVED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_CLIPSET_SAVED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_SUCCESS"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_SUCCESS);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_FAILED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_FAILED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CANCELLED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_CANCELLED);
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_MODE_CHANGED"))
+    return get_value_of((const int)LIVES_OSC_NOTIFY_MODE_CHANGED);
 
+  // generic constants
   if (!strcmp(cname,"LIVES_FPS_MAX")) 
-    return QUOTEME(FPS_MAX);
+    return get_value_of((const int)FPS_MAX);
+
+  if (!strcmp(cname,"LIVES_DEFAULT_OVERRIDDEN")) 
+    return "2";
 
   lives_osc_notify_failure();
 
@@ -266,6 +330,8 @@
 
   gchar *retval=NULL,*tmp;
 
+  if (end==-1) end=weed_leaf_num_elements(plant,key);
+
   if (end<=st) return g_strdup("");
 
   stype=weed_leaf_seed_type(plant,key);
@@ -349,7 +415,7 @@
 
 void lives_osc_cb_test(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int val=lives_osc_get_num_arguments (vargs);
-  g_print("got %d\n",val);
+  g_printerr("got %d\n",val);
 }
 
 /* /video/play */
@@ -394,7 +460,18 @@
 
   }
 
+  // re - add the timer, as we will hang here, and we want to receive messages still during playback
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_timeout_remove (mainw->kb_timer);
+  mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+  mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#endif  
   on_playall_activate(NULL,NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+    mainw->kb_timer_end=TRUE;
+#endif
+
   mainw->osc_auto=FALSE;
 }
 
@@ -402,8 +479,20 @@
   if (mainw->go_away) return lives_osc_notify_failure();
   if (mainw->playing_file==-1&&mainw->current_file>0) {
     mainw->osc_auto=TRUE; ///< request early notifiction of success
+
+    // re - add the timer, as we will hang here, and we want to receive messages still during playback
+#if !GTK_CHECK_VERSION(3,0,0)
+    gtk_timeout_remove (mainw->kb_timer);
+    mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+    mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#endif
+
     if (mainw->multitrack==NULL) on_playsel_activate(NULL,NULL);
     else multitrack_play_sel(NULL, mainw->multitrack);
+#if GTK_CHECK_VERSION(3,0,0)
+    mainw->kb_timer_end=TRUE;
+#endif
     mainw->osc_auto=FALSE; ///< request early notifiction of success
   }
 }
@@ -439,7 +528,20 @@
 
   if (mainw->playing_file==-1&&mainw->current_file>0) {
     mainw->osc_auto=TRUE; ///< request early notifiction of success
+
+    // re - add the timer, as we will hang here, and we want to receive messages still during playback
+#if !GTK_CHECK_VERSION(3,0,0)
+    gtk_timeout_remove (mainw->kb_timer);
+    mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+    mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#endif
+
     on_playall_activate(NULL,NULL);
+
+#if GTK_CHECK_VERSION(3,0,0)
+    mainw->kb_timer_end=TRUE;
+#endif
     mainw->osc_auto=FALSE;
   }
   else if (mainw->current_file>0) {
@@ -460,7 +562,21 @@
 
   if (mainw->playing_file==-1&&mainw->current_file>0) {
     mainw->reverse_pb=TRUE;
+
+    // re - add the timer, as we will hang here, and we want to receive messages still during playback
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_timeout_remove (mainw->kb_timer);
+  mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+  mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#endif  
+    mainw->osc_auto=TRUE; ///< request early notifiction of success
+
     on_playall_activate(NULL,NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+    mainw->kb_timer_end=TRUE;
+#endif
+    mainw->osc_auto=FALSE;
   }
   else if (mainw->current_file>0) {
     if (cfile->pb_fps>0||(cfile->play_paused&&cfile->freeze_fps>0)) dirchange_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(TRUE));
@@ -629,8 +745,8 @@
 
 
 void lives_osc_cb_get_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  if (mainw->ping_pong) lives_status_send("1");
-  else lives_status_send("0");
+  if (mainw->ping_pong) lives_status_send(get_omc_const("LIVES_TRUE"));
+  else lives_status_send(get_omc_const("LIVES_FALSE"));
 }
 
 
@@ -750,7 +866,9 @@
 
 void lives_osc_cb_fx_enable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // if via_shortcut and not playing, we ignore unless a generator starts (which starts playback)
-
+#if GTK_CHECK_VERSION(3,0,0)
+  boolean new_timer_added=FALSE;
+#endif
   int count;
   int effect_key;
   gint grab=mainw->last_grabable_effect;
@@ -759,15 +877,34 @@
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (!(mainw->rte&(GU641<<(effect_key-1)))) {
-    if (mainw->playing_file==-1&&via_shortcut) {
-      weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
-      if (filter==NULL) return lives_osc_notify_failure();
-      count=enabled_in_channels(filter, FALSE);
-      if (count!=0) return lives_osc_notify_failure(); // is no generator
+    weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+    if (filter==NULL) return lives_osc_notify_failure();
+    count=enabled_in_channels(filter, FALSE);
+    if (mainw->playing_file==-1&&via_shortcut&&count!=0) return lives_osc_notify_failure(); // is no generator
+    
+    if (!mainw->osc_block) {
+      if (mainw->playing_file==-1&&count==0) {
+	// re - add the timer, as we hang here if a generator is started, and we want to receive messages still during playback
+#if !GTK_CHECK_VERSION(3,0,0)
+	gtk_timeout_remove (mainw->kb_timer);
+	mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+	mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+	new_timer_added=TRUE;
+#endif
+      }
+      // TODO ***
+      //mainw->osc_auto=TRUE; ///< request early notifiction of success
+      rte_on_off_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(effect_key));
+      mainw->osc_auto=FALSE;
+#if GTK_CHECK_VERSION(3,0,0)
+      if (new_timer_added)
+	mainw->kb_timer_end=TRUE;
+#endif
     }
-    if (!mainw->osc_block) rte_on_off_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(effect_key));
   }
   mainw->last_grabable_effect=grab;
+
   if (prefs->omc_noisy) lives_osc_notify_success(NULL);
 }
 
@@ -787,19 +924,35 @@
 void lives_osc_cb_fx_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // if not playing and via_shortcut, see if fx key points to generator
 
-  int count;
+  int count=0;
   int effect_key;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
-  if (!(mainw->rte&(GU641<<(effect_key-1)))&&mainw->playing_file==-1&&via_shortcut) {
+  if (!(mainw->rte&(GU641<<(effect_key-1)))&&mainw->playing_file==-1) {
     weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
     if (filter==NULL) return lives_osc_notify_failure();
     count=enabled_in_channels(filter, FALSE);
-    if (count!=0) return lives_osc_notify_failure(); // is no generator
+    if (via_shortcut&&count!=0) return lives_osc_notify_failure(); // is no generator
+  }
+  if (!mainw->osc_block) {
+    if (!(mainw->rte&(GU641<<(effect_key-1)))&&mainw->playing_file==-1&&count==0&&via_shortcut) {
+      // re - add the timer, as we hang here if a generator is started, and we want to receive messages still during playback
+#if !GTK_CHECK_VERSION(3,0,0)
+      gtk_timeout_remove (mainw->kb_timer);
+      mainw->kb_timer=gtk_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#else
+      mainw->kb_timer=g_timeout_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
+#endif
+    }
+    // TODO ***
+    //mainw->osc_auto=TRUE; ///< request early notifiction of success
+    rte_on_off_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(effect_key));
+#if GTK_CHECK_VERSION(3,0,0)
+    mainw->kb_timer_end=TRUE;
+#endif
   }
-  if (!mainw->osc_block) rte_on_off_callback(NULL,NULL,0,(GdkModifierType)0,GINT_TO_POINTER(effect_key));
   if (prefs->omc_noisy) lives_osc_notify_success(NULL);
 }
 
@@ -1626,7 +1779,7 @@
 
 void lives_osc_cb_clip_getfps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
-  if (status_socket==NULL) return;
+
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
   if (mainw->current_file<0) lives_status_send ((tmp=g_strdup_printf ("%.3f",0.)));
@@ -1641,8 +1794,6 @@
   file *sfile;
   int clip=mainw->current_file;
 
-  if (status_socket==NULL) return;
-
   if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
     lives_osc_check_arguments (arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
@@ -1659,7 +1810,7 @@
 
 void lives_osc_cb_get_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
-  if (status_socket==NULL) return;
+
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
   if (mainw->current_file<0) lives_status_send ((tmp=g_strdup_printf ("%.4f",0.)));
@@ -1671,7 +1822,7 @@
 
 void lives_osc_cb_bgget_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
-  if (status_socket==NULL) return;
+
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
   if (mainw->current_file<0||mainw->blend_file<0||mainw->files[mainw->blend_file]==NULL) 
@@ -1685,7 +1836,7 @@
 
 void lives_osc_cb_bgclip_getframe(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
-  if (status_socket==NULL) return;
+
   if (mainw->current_file<1||mainw->preview||mainw->playing_file<1||mainw->blend_file<0||
       mainw->files[mainw->blend_file]==NULL) lives_status_send ("0");
   else {
@@ -1697,7 +1848,7 @@
 
 void lives_osc_cb_bgclip_getfps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
-  if (status_socket==NULL) return;
+
   if (mainw->current_file<1) return lives_osc_notify_failure();
   if (mainw->blend_file<0||mainw->files[mainw->blend_file]==NULL) lives_status_send ((tmp=g_strdup_printf ("%.3f",0.)));
   else if (mainw->preview||mainw->playing_file<1) lives_status_send ((tmp=g_strdup_printf ("%.3f",mainw->files[mainw->blend_file]->fps)));
@@ -1817,9 +1968,9 @@
   if (time<0.) return lives_osc_notify_failure();
 
   time=q_dbl(time,mainw->multitrack->fps)/U_SEC;
-  mt_tl_move(mainw->multitrack,time-GTK_RULER(mainw->multitrack->timeline)->position);
+  mt_tl_move(mainw->multitrack,time-lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
 
-  msg=g_strdup_printf("%.8f",GTK_RULER(mainw->multitrack->timeline)->position);
+  msg=g_strdup_printf("%.8f",lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
   lives_osc_notify_success(msg);
   g_free(msg);
 }
@@ -1829,7 +1980,7 @@
 
   if (mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  msg=g_strdup_printf("%.8f",GTK_RULER(mainw->multitrack->timeline)->position);
+  msg=g_strdup_printf("%.8f",lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
   lives_status_send(msg);
   g_free(msg);
 }
@@ -1931,7 +2082,7 @@
 
 void lives_osc_cb_get_playtime(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
-  if (status_socket==NULL) return;
+
   if (mainw->current_file<1||mainw->preview||mainw->playing_file<1) return lives_osc_notify_failure();
 
   lives_status_send ((tmp=g_strdup_printf ("%.8f",(double)mainw->currticks/U_SEC)));
@@ -1970,7 +2121,6 @@
 void lives_osc_cb_bgclip_get_current(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   gchar *tmp;
 
-  if (status_socket==NULL) return;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   lives_status_send ((tmp=g_strdup_printf ("%d",mainw->blend_file<0?0:mainw->blend_file)));
   g_free(tmp);
@@ -2285,13 +2435,13 @@
 void lives_osc_cb_clip_isvalid(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int clip;
-  if (status_socket==NULL) return;
 
   if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&clip);
 
-  if (clip>0&&clip<MAX_FILES&&mainw->files[clip]!=NULL&&!(mainw->multitrack!=NULL&&clip==mainw->multitrack->render_file)&&clip!=mainw->scrap_file) lives_status_send ("1");
-  else lives_status_send ("0");
+  if (clip>0&&clip<MAX_FILES&&mainw->files[clip]!=NULL&&!(mainw->multitrack!=NULL&&clip==mainw->multitrack->render_file)&&clip!=mainw->scrap_file) 
+    lives_status_send (get_omc_const("LIVES_TRUE"));
+  else lives_status_send (get_omc_const("LIVES_FALSE"));
 
 }
 
@@ -2415,7 +2565,7 @@
   }
   else return lives_osc_notify_failure();
 
-  retval=make_weed_hashname(fidx, FALSE);
+  retval=make_weed_hashname(fidx, FALSE, FALSE);
 
   lives_status_send(retval);
 
@@ -2518,47 +2668,46 @@
 ///////////////////////////////////////////////////////////////
 
 
-static gboolean setfx (gint effect_key, gint pnum, int nargs, const void *vargs) {
+static gboolean setfx (weed_plant_t *plant, weed_plant_t *tparam, int pnum, int nargs, const void *vargs, int skip) {
+  // set value of "value" leaf for tparam, or "host_default" for a template
+  // set it to vargs (length nargs)
+
   int valuei;
   float valuef;
   int error,i;
-  weed_plant_t *inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
-  weed_plant_t **in_params;
-  weed_plant_t *tparam;
-  weed_plant_t *tparamtmpl;
-  int hint,cspace;
-  int nparams;
+  weed_plant_t *ptmpl,*inst=NULL;
+  int hint,cspace=-1;
   int x=0;
+  int copyto=-1;
+  int defargs;
   int maxi_r=255,maxi_g=255,maxi_b=255,maxi_a=255,mini_r=0,mini_g=0,mini_b=0,mini_a=0,mini,maxi;
+
   double maxd_r=1.,maxd_g=1.,maxd_b=1.,maxd_a=1.,mind_r=0.,mind_g=0.,mind_b=0.,mind_a=0.,mind,maxd;
   gchar values[OSC_STRING_SIZE];
-  char *pattern;
-  
+  const char *pattern;
+
   if (nargs<=0) return FALSE; // must set at least one value
 
-  if (inst==NULL) return FALSE; // error: effect is not active
+  if (WEED_PLANT_IS_FILTER_CLASS(plant)) {
+    ptmpl=tparam;
+  }
+  else {
+    ptmpl=weed_get_plantptr_value(tparam,"template",&error);
+    inst=plant;
+  }
 
-  if (!weed_plant_has_leaf(inst,"in_parameters")) return FALSE;
-  nparams=weed_leaf_num_elements(inst,"in_parameters");
-  if (pnum>=nparams) return FALSE;
-  
-  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-  
-  tparam=in_params[pnum];
-  tparamtmpl=weed_get_plantptr_value(tparam,"template",&error);
-  hint=weed_get_int_value(tparamtmpl,"hint",&error);
-
-  if (!(weed_parameter_has_variable_elements_strict(inst,tparamtmpl))) {
-    if (nargs>weed_leaf_num_elements(tparamtmpl,"default")) {
-      // error: parameter does not have variable elements, and the user sent too many values
-      weed_free(in_params);
-      return FALSE;
+  hint=weed_get_int_value(ptmpl,"hint",&error);
+  if (hint==WEED_HINT_COLOR) cspace=weed_get_int_value(ptmpl,"colorspace",&error);
+
+  if (!(weed_parameter_has_variable_elements_strict(inst,ptmpl))) {
+    if (nargs>(defargs=weed_leaf_num_elements(ptmpl,"default"))) {
+      if (!(hint==WEED_HINT_COLOR&&defargs==1&&((cspace==WEED_COLORSPACE_RGB&&(nargs%3==0))||(cspace==WEED_COLORSPACE_RGBA&&(nargs%4==0)))))
+	// error: parameter does not have variable elements, and the user sent too many values
+	return FALSE;
     }
   }
 
-
-  /* get header pattern (type tags) */
-  pattern=g_strdup(((char *)vargs)+3); // skip comma,int,int
+  pattern=(char *)vargs+skip; // skip comma,int,(int)
 
   switch (hint) {
   case WEED_HINT_INTEGER:
@@ -2579,27 +2728,39 @@
 	  g_free(valuesi);
 	  return FALSE;
 	}
-	mini=weed_get_int_value(tparamtmpl,"min",&error);
-	maxi=weed_get_int_value(tparamtmpl,"max",&error);
+	mini=weed_get_int_value(ptmpl,"min",&error);
+	maxi=weed_get_int_value(ptmpl,"max",&error);
       
 	if (valuesi[x]<mini) valuesi[x]=mini;
 	if (valuesi[x]>maxi) valuesi[x]=maxi;
 	x++;
       }
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
+      if (inst!=NULL) {
+	copyto=set_copy_to(inst,pnum,FALSE);
+	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	  // if we are recording, add this change to our event_list
+	  rec_param_change(inst,pnum);
+	  if (copyto!=-1) rec_param_change(inst,copyto);
+	}
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_int_array(tparam,"value",nargs,valuesi);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	set_copy_to(inst,pnum,TRUE);
+
+	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	  // if we are recording, add this change to our event_list
+	  rec_param_change(inst,pnum);
+	  if (copyto!=-1) rec_param_change(inst,copyto);
+	}
+      }
+      else {
+	weed_set_int_array(tparam,"host_default",nargs,valuesi);
       }
 
-      weed_set_int_array(tparam,"value",nargs,valuesi);
       g_free(valuesi);
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
-      }
-      
       break;
     }
 
@@ -2619,18 +2780,25 @@
 	x++;
       }
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
+      if (inst!=NULL) {
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_boolean_array(tparam,"value",nargs,valuesb);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	copyto=set_copy_to(inst,pnum,TRUE);
+
+	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	  // if we are recording, add this change to our event_list
+	  rec_param_change(inst,pnum);
+	  if (copyto!=-1) rec_param_change(inst,copyto);
+	}
+      }
+      else {
+	weed_set_boolean_array(tparam,"host_default",nargs,valuesb);
       }
 
-      weed_set_boolean_array(tparam,"value",nargs,valuesb);
       g_free(valuesb);
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
-      }
       break;
 
     }
@@ -2654,26 +2822,41 @@
 	  g_free(valuesd);
 	  return FALSE;
 	}
-	mind=weed_get_double_value(tparamtmpl,"min",&error);
-	maxd=weed_get_double_value(tparamtmpl,"max",&error);
+	mind=weed_get_double_value(ptmpl,"min",&error);
+	maxd=weed_get_double_value(ptmpl,"max",&error);
       
 	if (valuesd[x]<mind) valuesd[x]=mind;
 	if (valuesd[x]>maxd) valuesd[x]=maxd;
 	x++;
       }
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
+
+      if (inst!=NULL) {
+	copyto=set_copy_to(inst,pnum,FALSE);
+
+	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	  // if we are recording, add this change to our event_list
+	  rec_param_change(inst,pnum);
+	  if (copyto!=-1) rec_param_change(inst,copyto);
+	}
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_double_array(tparam,"value",nargs,valuesd);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	set_copy_to(inst,pnum,TRUE);
+
+	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	  // if we are recording, add this change to our event_list
+	  rec_param_change(inst,pnum);
+	  if (copyto!=-1) rec_param_change(inst,copyto);
+	}
+      }
+      else {
+	weed_set_double_array(tparam,"host_default",nargs,valuesd);
       }
 
-      weed_set_double_array(tparam,"value",nargs,valuesd);
       g_free(valuesd);
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
-      }
       break;
 
     }
@@ -2709,19 +2892,27 @@
 	x++;
       }
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
+
+      if (inst!=NULL) {
+	pthread_mutex_lock(&mainw->data_mutex);
+	weed_set_string_array(tparam,"value",nargs,valuess);
+	pthread_mutex_unlock(&mainw->data_mutex);
+
+	copyto=set_copy_to(inst,pnum,TRUE);
+	
+	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	  // if we are recording, add this change to our event_list
+	  rec_param_change(inst,pnum);
+	  if (copyto!=-1) rec_param_change(inst,copyto);
+	}
+      }
+      else {
+	weed_set_string_array(tparam,"host_default",nargs,valuess);
       }
 
-      weed_set_string_array(tparam,"value",nargs,valuess);
       for (i=0;i<x;i++) g_free(valuess[i]);
       g_free(valuess);
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,pnum);
-      }
       break;
 
     }
@@ -2730,25 +2921,24 @@
     // an int or a float type. Also min and max can have 1,n or N values.
 
   case WEED_HINT_COLOR:
-    cspace=weed_get_int_value(tparamtmpl,"colorspace",&error);
     switch (cspace) {
     case WEED_COLORSPACE_RGB:
       if (nargs%3 != 0) return FALSE; //nargs must be a multiple of 3
 
-      if (weed_leaf_seed_type(tparamtmpl,"default")==WEED_SEED_INT) {
+      if (weed_leaf_seed_type(ptmpl,"default")==WEED_SEED_INT) {
 	// RGB, int type
 	int *valuesi=(int *)g_malloc(nargs*sizint);
-	int nmins=weed_leaf_num_elements(tparamtmpl,"min");
-	int nmaxs=weed_leaf_num_elements(tparamtmpl,"max");
+	int nmins=weed_leaf_num_elements(ptmpl,"min");
+	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
 	int *minis=NULL,*maxis=NULL;
 
 	// get min and max values - 3 possibilities: 1 value, 3 values or N values
 
 	if (nmins==1) {
-	  mini_r=mini_g=mini_b=weed_get_int_value(tparamtmpl,"min",&error);
+	  mini_r=mini_g=mini_b=weed_get_int_value(ptmpl,"min",&error);
 	}
 	else {
-	  minis=weed_get_int_array(tparamtmpl,"min",&error);
+	  minis=weed_get_int_array(ptmpl,"min",&error);
 	  if (nmins==3) {
 	    mini_r=minis[0];
 	    mini_g=minis[1];
@@ -2758,10 +2948,10 @@
 	}
 
 	if (nmaxs==1) {
-	  maxi_r=maxi_g=maxi_b=weed_get_int_value(tparamtmpl,"max",&error);
+	  maxi_r=maxi_g=maxi_b=weed_get_int_value(ptmpl,"max",&error);
 	}
 	else {
-	  maxis=weed_get_int_array(tparamtmpl,"max",&error);
+	  maxis=weed_get_int_array(ptmpl,"max",&error);
 	  if (nmaxs==3) {
 	    maxi_r=maxis[0];
 	    maxi_g=maxis[1];
@@ -2809,35 +2999,49 @@
 	  x+=3;
 	}
 
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	}
+	if (inst!=NULL) {
+	  copyto=set_copy_to(inst,pnum,FALSE);
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
 	
-	weed_set_int_array(tparam,"value",nargs,valuesi);
-	g_free(valuesi);
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_int_array(tparam,"value",nargs,valuesi);
+	  pthread_mutex_unlock(&mainw->data_mutex);
 	
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
+	  set_copy_to(inst,pnum,TRUE);
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
 	}
-	
+	else {
+	  weed_set_int_array(tparam,"host_default",nargs,valuesi);
+	}
+
+	g_free(valuesi);
+
 	if (nmins>3) g_free(minis);
 	if (nmaxs>3) g_free(maxis);
       }
       else {
 	// RGB, float type
 	double *valuesd=(double *)g_malloc(nargs*sizeof(double));
-	int nmins=weed_leaf_num_elements(tparamtmpl,"min");
-	int nmaxs=weed_leaf_num_elements(tparamtmpl,"max");
+	int nmins=weed_leaf_num_elements(ptmpl,"min");
+	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
 	double *minds=NULL,*maxds=NULL;
 	// get min and max values - 3 possibilities: 1 value, 3 values or N values
 
 	if (nmins==1) {
-	  mind_r=mind_g=mind_b=weed_get_double_value(tparamtmpl,"min",&error);
+	  mind_r=mind_g=mind_b=weed_get_double_value(ptmpl,"min",&error);
 	}
 	else {
-	  minds=weed_get_double_array(tparamtmpl,"min",&error);
+	  minds=weed_get_double_array(ptmpl,"min",&error);
 	  if (nmins==3) {
 	    mind_r=minds[0];
 	    mind_g=minds[1];
@@ -2847,10 +3051,10 @@
 	}
 
 	if (nmaxs==1) {
-	  maxd_r=maxd_g=maxd_b=weed_get_double_value(tparamtmpl,"max",&error);
+	  maxd_r=maxd_g=maxd_b=weed_get_double_value(ptmpl,"max",&error);
 	}
 	else {
-	  maxds=weed_get_double_array(tparamtmpl,"max",&error);
+	  maxds=weed_get_double_array(ptmpl,"max",&error);
 	  if (nmaxs==3) {
 	    maxd_r=maxds[0];
 	    maxd_g=maxds[1];
@@ -2899,17 +3103,32 @@
 	  x+=3;
 	}
 
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	}
-	weed_set_double_array(tparam,"value",nargs,valuesd);
-	g_free(valuesd);
+	if (inst!=NULL) {
+	  copyto=set_copy_to(inst,pnum,FALSE);
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_double_array(tparam,"value",nargs,valuesd);
+	  pthread_mutex_unlock(&mainw->data_mutex);
 	
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
+	  set_copy_to(inst,pnum,TRUE);
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
 	}
+	else {
+	  weed_set_double_array(tparam,"host_default",nargs,valuesd);
+	}
+
+	g_free(valuesd);
 
 	if (nmins>3) g_free(minds);
 	if (nmaxs>3) g_free(maxds);
@@ -2924,20 +3143,20 @@
     case WEED_COLORSPACE_RGBA:
       if (nargs%4 != 0) return FALSE; //nargs must be a multiple of 4
 
-      if (weed_leaf_seed_type(tparamtmpl,"default")==WEED_SEED_INT) {
+      if (weed_leaf_seed_type(ptmpl,"default")==WEED_SEED_INT) {
 	// RGBA, int type
 	int *valuesi=(int *)g_malloc(nargs*sizint);
-	int nmins=weed_leaf_num_elements(tparamtmpl,"min");
-	int nmaxs=weed_leaf_num_elements(tparamtmpl,"max");
+	int nmins=weed_leaf_num_elements(ptmpl,"min");
+	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
 	int *minis=NULL,*maxis=NULL;
 
 	// get min and max values - 3 possibilities: 1 value, 4 values or N values
 
 	if (nmins==1) {
-	  mini_r=mini_g=mini_b=mini_a=weed_get_int_value(tparamtmpl,"min",&error);
+	  mini_r=mini_g=mini_b=mini_a=weed_get_int_value(ptmpl,"min",&error);
 	}
 	else {
-	  minis=weed_get_int_array(tparamtmpl,"min",&error);
+	  minis=weed_get_int_array(ptmpl,"min",&error);
 	  if (nmins==4) {
 	    mini_r=minis[0];
 	    mini_g=minis[1];
@@ -2948,10 +3167,10 @@
 	}
 
 	if (nmaxs==1) {
-	  maxi_r=maxi_g=maxi_b=maxi_a=weed_get_int_value(tparamtmpl,"max",&error);
+	  maxi_r=maxi_g=maxi_b=maxi_a=weed_get_int_value(ptmpl,"max",&error);
 	}
 	else {
-	  maxis=weed_get_int_array(tparamtmpl,"max",&error);
+	  maxis=weed_get_int_array(ptmpl,"max",&error);
 	  if (nmaxs==4) {
 	    maxi_r=maxis[0];
 	    maxi_g=maxis[1];
@@ -3004,37 +3223,51 @@
 	  x+=4;
 	}
 
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	}
-	
-	weed_set_int_array(tparam,"value",nargs,valuesi);
-	g_free(valuesi);
+	if (inst!=NULL) {
+	  copyto=set_copy_to(inst,pnum,FALSE);
 
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+	
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_int_array(tparam,"value",nargs,valuesi);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	  
+	  set_copy_to(inst,pnum,TRUE);
+	  
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+	}
+	else {
+	  weed_set_int_array(tparam,"host_default",nargs,valuesi);
 	}
+
+	g_free(valuesi);
 	
 	if (nmins>4) g_free(minis);
 	if (nmaxs>4) g_free(maxis);
-
+	  
       }
       else {
 	// RGBA, float type
 	double *valuesd=(double *)g_malloc(nargs*sizdbl);
-	int nmins=weed_leaf_num_elements(tparamtmpl,"min");
-	int nmaxs=weed_leaf_num_elements(tparamtmpl,"max");
+	int nmins=weed_leaf_num_elements(ptmpl,"min");
+	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
 	double *minds=NULL,*maxds=NULL;
 
 	// get min and max values - 3 possibilities: 1 value, 3 values or N values
 
 	if (nmins==1) {
-	  mind_r=mind_g=mind_b=mind_a=weed_get_double_value(tparamtmpl,"min",&error);
+	  mind_r=mind_g=mind_b=mind_a=weed_get_double_value(ptmpl,"min",&error);
 	}
 	else {
-	  minds=weed_get_double_array(tparamtmpl,"min",&error);
+	  minds=weed_get_double_array(ptmpl,"min",&error);
 	  if (nmins==4) {
 	    mind_r=minds[0];
 	    mind_g=minds[1];
@@ -3045,10 +3278,10 @@
 	}
 
 	if (nmaxs==1) {
-	  maxd_r=maxd_g=maxd_b=mind_a=weed_get_double_value(tparamtmpl,"max",&error);
+	  maxd_r=maxd_g=maxd_b=mind_a=weed_get_double_value(ptmpl,"max",&error);
 	}
 	else {
-	  maxds=weed_get_double_array(tparamtmpl,"max",&error);
+	  maxds=weed_get_double_array(ptmpl,"max",&error);
 	  if (nmaxs==4) {
 	    maxd_r=maxds[0];
 	    maxd_g=maxds[1];
@@ -3102,18 +3335,32 @@
 	  x+=4;
 	}
 
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
+	if (inst!=NULL) {
+	  copyto=set_copy_to(inst,pnum,FALSE);
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+	    
+	  pthread_mutex_lock(&mainw->data_mutex);
+	  weed_set_double_array(tparam,"value",nargs,valuesd);
+	  pthread_mutex_unlock(&mainw->data_mutex);
+	    
+	  set_copy_to(inst,pnum,TRUE);
+
+	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	    // if we are recording, add this change to our event_list
+	    rec_param_change(inst,pnum);
+	    if (copyto!=-1) rec_param_change(inst,copyto);
+	  }
+	}
+	else {
+	  weed_set_double_array(tparam,"host_default",nargs,valuesd);
 	}
 
-	weed_set_double_array(tparam,"value",nargs,valuesd);
 	g_free(valuesd);
-	
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	}
 
 	if (nmins>4) g_free(minds);
 	if (nmaxs>4) g_free(maxds);
@@ -3124,68 +3371,158 @@
 
     default:
       // invalid colorspace
-      weed_free(in_params);
       return FALSE;
+      
     }
-    break;
-
-
-
+    
   default:
     // invalid param hint
-    weed_free(in_params);
     return FALSE;
   }
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
-
-  if (fx_dialog[1]!=NULL) {
-    lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
-    if (!rfx->is_template) {
-      gint keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-      gint modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
-      if (keyw==effect_key&&modew==rte_key_getmode(effect_key))
-	update_visual_params(rfx,FALSE);
-    }
-  }
-  weed_free(in_params);
   return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+void lives_osc_cb_rte_getparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
-  weed_plant_t *tparamtmpl;
+  weed_plant_t *ptmpl;
   int hint,error;
   int nparams;
   int effect_key;
+  int mode;
   int pnum;
 
   const gchar *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  // TODO - handle compound fx
 
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
 
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+  
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
   
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
   
-  tparamtmpl=in_ptmpls[pnum];
-  hint=weed_get_int_value(tparamtmpl,"hint",&error);
-  weed_free(in_ptmpls);
+  hint=weed_get_int_value(ptmpl,"hint",&error);
+
+  switch (hint) {
+  case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
+  case WEED_HINT_FLOAT: retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT"); break;
+  case WEED_HINT_TEXT: retval=get_omc_const("LIVES_PARAM_TYPE_STRING"); break;
+  case WEED_HINT_SWITCH: retval=get_omc_const("LIVES_PARAM_TYPE_BOOL"); break;
+  case WEED_HINT_COLOR: retval=get_omc_const("LIVES_PARAM_TYPE_COLOR"); break;
+  default: return lives_osc_notify_failure();
+  }
+
+  lives_status_send (retval);
+}
+
+
+void lives_osc_cb_rte_getoparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
+  weed_plant_t *filter;
+  weed_plant_t **out_ptmpls;
+  weed_plant_t *ptmpl;
+  int hint,error;
+  int nparams;
+  int effect_key;
+  int mode;
+  int pnum;
+
+  const gchar *retval;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+  
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+  
+  ptmpl=out_ptmpls[pnum];
+  hint=weed_get_int_value(ptmpl,"hint",&error);
+  weed_free(out_ptmpls);
+
+  switch (hint) {
+  case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
+  case WEED_HINT_FLOAT: retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT"); break;
+  case WEED_HINT_TEXT: retval=get_omc_const("LIVES_PARAM_TYPE_STRING"); break;
+  case WEED_HINT_SWITCH: retval=get_omc_const("LIVES_PARAM_TYPE_BOOL"); break;
+  case WEED_HINT_COLOR: retval=get_omc_const("LIVES_PARAM_TYPE_COLOR"); break;
+  default: return lives_osc_notify_failure();
+  }
+
+  lives_status_send (retval);
+}
+
+
+
+void lives_osc_cb_rte_getpparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
+  // playback plugin params
+  weed_plant_t *ptmpl,*param;
+  int hint,error;
+  int pnum;
+
+  const gchar *retval;
+
+  if (mainw->vpp==NULL||mainw->vpp->num_play_params==0) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  hint=weed_get_int_value(ptmpl,"hint",&error);
 
   switch (hint) {
   case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
@@ -3201,10 +3538,11 @@
 
 
 
-void lives_osc_cb_rte_getnparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_getnparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **in_ptmpls;
-  weed_plant_t *tparamtmpl;
+  weed_plant_t *ptmpl;
   int hint,error;
   int effect_key;
   int pnum,i;
@@ -3220,13 +3558,14 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
   i=get_nth_simple_param(filter,pnum);
   if (i==-1) return lives_osc_notify_failure();
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  tparamtmpl=in_ptmpls[i];
+  ptmpl=in_ptmpls[i];
 
-  hint=weed_get_int_value(tparamtmpl,"hint",&error);
+  hint=weed_get_int_value(ptmpl,"hint",&error);
   weed_free(in_ptmpls);
 
   switch (hint) {
@@ -3240,131 +3579,254 @@
 
 
 
-void lives_osc_cb_rte_getparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_getparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				     NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
-  weed_plant_t *tparamtmpl;
+  weed_plant_t *ptmpl;
   int hint,error;
   int nparams;
   int effect_key;
+  int mode;
   int pnum,cspace;
+  int stype;
 
   const gchar *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
-
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  tparamtmpl=in_ptmpls[pnum];
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
-  hint=weed_get_int_value(tparamtmpl,"hint",&error);
+  hint=weed_get_int_value(ptmpl,"hint",&error);
 
   if (hint!=WEED_HINT_COLOR) {
-    weed_free(in_ptmpls);
     return lives_osc_notify_failure();
   }
-  cspace=weed_get_int_value(tparamtmpl,"colorspace",&error);
+  cspace=weed_get_int_value(ptmpl,"colorspace",&error);
 
-  if (cspace==WEED_COLORSPACE_RGB) retval=get_omc_const("LIVES_COLORSPACE_RGB");
-  else retval=get_omc_const("LIVES_COLORSPACE_RGBA");
+  stype=weed_leaf_seed_type(ptmpl,"default");
+
+  if (cspace==WEED_COLORSPACE_RGB) {
+    if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGB_INT");
+    else retval=get_omc_const("LIVES_COLORSPACE_RGB_FLOAT");
+  }
+  else {
+    if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGBA_INT");
+    else retval=get_omc_const("LIVES_COLORSPACE_RGBA_FLOAT");
+  }
 
   lives_status_send (retval);
-  weed_free(in_ptmpls);
 
 }
 
 
-void lives_osc_cb_rte_countparamvals(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  weed_plant_t *inst;
-  weed_plant_t **in_params;
-  weed_plant_t *tparam;
-  weed_plant_t *tparamtmpl;
+void lives_osc_cb_rte_getoparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				     NetworkReturnAddressPtr ra) {
+  weed_plant_t *filter;
+  weed_plant_t **out_ptmpls;
+  weed_plant_t *ptmpl;
   int hint,error;
   int nparams;
   int effect_key;
-  int pnum,cspace,nvals;
-
-  gchar *retval;
+  int mode;
+  int pnum,cspace;
+  int stype;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  const gchar *retval;
 
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
-  if (inst==NULL) return lives_osc_notify_failure();
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(inst,"in_parameters")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(inst,"in_parameters");
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
 
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+  ptmpl=out_ptmpls[pnum];
 
-  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-  
-  tparam=in_params[pnum];
-  tparamtmpl=weed_get_plantptr_value(tparam,"template",&error);
-  hint=weed_get_int_value(tparamtmpl,"hint",&error);
-  weed_free(in_params);
+  hint=weed_get_int_value(ptmpl,"hint",&error);
 
-  nvals=weed_leaf_num_elements(tparam,"value");
+  if (hint!=WEED_HINT_COLOR) {
+    weed_free(out_ptmpls);
+    return lives_osc_notify_failure();
+  }
+  cspace=weed_get_int_value(ptmpl,"colorspace",&error);
 
-  if (hint==WEED_HINT_COLOR) {
-    cspace=weed_get_int_value(tparamtmpl,"colorspace",&error);
-    if (cspace==WEED_COLORSPACE_RGB) nvals/=3;
-    else nvals/=4;
+  stype=weed_leaf_seed_type(ptmpl,"default");
+
+  if (cspace==WEED_COLORSPACE_RGB) {
+    if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGB_INT");
+    else retval=get_omc_const("LIVES_COLORSPACE_RGB_FLOAT");
+  }
+  else {
+    if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGBA_INT");
+    else retval=get_omc_const("LIVES_COLORSPACE_RGBA_FLOAT");
   }
-  retval=g_strdup_printf("%d",nvals);
+
   lives_status_send (retval);
-  g_free(retval);
+  weed_free(out_ptmpls);
+
 }
 
 
-void lives_osc_cb_rte_getparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+
+void lives_osc_cb_rte_getpparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				      NetworkReturnAddressPtr ra) {
+  // playback plugin params
+  weed_plant_t *ptmpl,*param;
+  int hint,error;
+  int pnum,cspace;
+  int stype;
+
+  const gchar *retval;
+
+  if (mainw->vpp==NULL||mainw->vpp->num_play_params==0) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  hint=weed_get_int_value(ptmpl,"hint",&error);
+
+  if (hint!=WEED_HINT_COLOR) {
+    return lives_osc_notify_failure();
+  }
+  cspace=weed_get_int_value(ptmpl,"colorspace",&error);
+
+  stype=weed_leaf_seed_type(ptmpl,"default");
+
+  if (cspace==WEED_COLORSPACE_RGB) {
+    if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGB_INT");
+    else retval=get_omc_const("LIVES_COLORSPACE_RGB_FLOAT");
+  }
+  else {
+    if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGBA_INT");
+    else retval=get_omc_const("LIVES_COLORSPACE_RGBA_FLOAT");
+  }
+
+  lives_status_send (retval);
+
+}
+
+
+
+void lives_osc_cb_rte_getparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
-  weed_plant_t *tparamtmpl;
+  weed_plant_t *ptmpl;
   int error;
   int nparams;
   int effect_key;
+  int mode;
   int pnum,flags=0;
 
   gchar *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
-
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  tparamtmpl=in_ptmpls[pnum];
+  if (weed_plant_has_leaf(ptmpl,"flags"))
+    flags=weed_get_int_value(ptmpl,"flags",&error);
 
-  if (weed_plant_has_leaf(tparamtmpl,"flags"))
-    flags=weed_get_int_value(tparamtmpl,"flags",&error);
+  retval=g_strdup_printf("%d",flags);
+  lives_status_send (retval);
+  g_free(retval);
+}
 
-  weed_free(in_ptmpls);
+
+
+void lives_osc_cb_rte_getpparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				     NetworkReturnAddressPtr ra) {
+  weed_plant_t *ptmpl,*param;
+  int error;
+  int pnum,flags=0;
+
+  gchar *retval;
+
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  if (weed_plant_has_leaf(ptmpl,"flags"))
+    flags=weed_get_int_value(ptmpl,"flags",&error);
 
   retval=g_strdup_printf("%d",flags);
   lives_status_send (retval);
@@ -3372,48 +3834,141 @@
 }
 
 
-void lives_osc_cb_rte_getparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_getparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
-  weed_plant_t *tparamtmpl;
+  weed_plant_t *ptmpl;
   int error;
   int nparams;
   int effect_key;
+  int mode;
   int pnum;
 
   gchar *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  retval=weed_get_string_value(ptmpl,"name",&error);
+
+  lives_status_send (retval);
+
+  weed_free(retval);
+
+}
+
+
+void lives_osc_cb_rte_getoparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+  weed_plant_t *filter;
+  weed_plant_t **out_ptmpls;
+  weed_plant_t *ptmpl;
+  int error;
+  int nparams;
+  int effect_key;
+  int mode;
+  int pnum;
+
+  gchar *retval;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
 
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  tparamtmpl=in_ptmpls[pnum];
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+  ptmpl=out_ptmpls[pnum];
 
-  retval=weed_get_string_value(tparamtmpl,"name",&error);
+  retval=weed_get_string_value(ptmpl,"name",&error);
 
   lives_status_send (retval);
 
   weed_free(retval);
-  weed_free(in_ptmpls);
+  weed_free(out_ptmpls);
 
 }
 
 
-void lives_osc_cb_rte_getnparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+void lives_osc_cb_rte_getpparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
+  weed_plant_t *ptmpl,*param;
+  int error;
+  int pnum;
+
+  gchar *retval;
+
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  retval=weed_get_string_value(ptmpl,"name",&error);
+
+  lives_status_send (retval);
+
+  weed_free(retval);
+
+}
+
+
+
+void lives_osc_cb_rte_getnparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **in_ptmpls;
-  weed_plant_t *tparamtmpl;
+  weed_plant_t *ptmpl;
   int error;
   int effect_key;
   int pnum,i;
@@ -3429,15 +3984,16 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
 
   i=get_nth_simple_param(filter,pnum);
   if (i==-1) return lives_osc_notify_failure();
 
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  tparamtmpl=in_ptmpls[i];
+  ptmpl=in_ptmpls[i];
 
-  retval=weed_get_string_value(tparamtmpl,"name",&error);
+  retval=weed_get_string_value(ptmpl,"name",&error);
 
   lives_status_send (retval);
 
@@ -3448,7 +4004,12 @@
 
 
 
-void lives_osc_cb_rte_setparam(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_setparam(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+			       NetworkReturnAddressPtr ra) {
+
+  weed_plant_t *inst,*filter;
+  weed_plant_t *tparam;
+  int nparams;
 
   int effect_key;
   int pnum,nargs;
@@ -3466,24 +4027,141 @@
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
+  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
+
+  if (inst==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  tparam=weed_inst_in_param(inst,pnum,FALSE,TRUE);
+
   if (!mainw->osc_block) {
-    if (!setfx(effect_key,pnum,nargs-2,vargs)) return lives_osc_notify_failure();
+    if (!setfx(inst,tparam,pnum,nargs-2,vargs,3)) {
+      return lives_osc_notify_failure();
+    }
   }
-  else lives_osc_notify_failure();
+  else {
+    return lives_osc_notify_failure();
+  }
+
+  if (fx_dialog[1]!=NULL) {
+    lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
+    if (!rfx->is_template) {
+      gint keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
+      gint modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+      if (keyw==effect_key&&modew==rte_key_getmode(effect_key))
+	mainw->vrfx_update=rfx;
+    }
+  }
+
+  lives_osc_notify_success(NULL);
+
+}
+
+
+void lives_osc_cb_rte_setparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				  NetworkReturnAddressPtr ra) {
+
+  weed_plant_t *filter;
+  weed_plant_t *tptmpl;
+  int nparams;
+
+  int effect_key;
+  int mode;
+  int pnum,nargs,skip;
+
+  nargs=lives_osc_get_num_arguments(vargs);
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    if (nargs<3) return lives_osc_notify_failure();
+    osc_header_len=pad4(nargs+1); // add comma
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+    skip=3;
+  }
+  else {
+    if (nargs<4) return lives_osc_notify_failure();
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    osc_header_len=pad4(nargs+1); // add comma
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&pnum);
+    skip=4;
+  }
+
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  tptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (!setfx(filter,tptmpl,pnum,nargs-2,vargs,skip)) {
+    return lives_osc_notify_failure();
+  }
+
+  lives_osc_notify_success(NULL);
+
+}
+
+
+
+void lives_osc_cb_rte_setpparam(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				NetworkReturnAddressPtr ra) {
+  // set playback plugin param
+  weed_plant_t *param;
+  int pnum,nargs;
+
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  nargs=lives_osc_get_num_arguments(vargs);
+  if (nargs<2) return lives_osc_notify_failure();
+
+  osc_header_len=pad4(nargs+1); // add comma
+
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
 
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  if (!mainw->osc_block) {
+    if (!setfx(NULL,param,pnum,nargs-1,vargs,2)) return lives_osc_notify_failure();
+  }
+  else return lives_osc_notify_failure();
+  
+  lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_rte_setnparam(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_setnparam(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,i,nargs;
+  int error;
 
   // pick pnum which is numeric single valued, non-reinit
   // i.e. simple numeric parameter
 
-  weed_plant_t *inst;
+  weed_plant_t *inst,*param;
+  weed_plant_t **in_params;
   
   if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
@@ -3501,34 +4179,145 @@
   inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
   if (inst==NULL) return lives_osc_notify_failure();
 
+  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
   i=get_nth_simple_param(inst,pnum);
 
+  param=in_params[i];
+
   if (i!=-1 && !mainw->osc_block) {
-    if (!setfx(effect_key,i,nargs-2,vargs)) return lives_osc_notify_failure();
+    if (!setfx(inst,param,pnum,nargs-2,vargs,3)) return lives_osc_notify_failure();
   }
   else lives_osc_notify_failure();
 
+  lives_osc_notify_success(NULL);
+
 }
 
 
 
-void lives_osc_cb_rte_paramcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+void lives_osc_cb_rte_setnparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				  NetworkReturnAddressPtr ra) {
+
+  weed_plant_t *filter;
+  weed_plant_t *tptmpl;
+  int nparams;
 
   int effect_key;
+  int mode;
+  int pnum,nargs,skip;
+
+  nargs=lives_osc_get_num_arguments(vargs);
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    if (nargs<3) return lives_osc_notify_failure();
+    osc_header_len=pad4(nargs+1); // add comma
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+    skip=3;
+  }
+  else {
+    if (nargs<4) return lives_osc_notify_failure();
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    osc_header_len=pad4(nargs+1); // add comma
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&pnum);
+    skip=4;
+  }
+
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  tptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (!setfx(filter,tptmpl,pnum,nargs-2,vargs,skip)) {
+    return lives_osc_notify_failure();
+  }
+
+  lives_osc_notify_success(NULL);
+
+}
+
+
+
+void lives_osc_cb_rte_paramcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+  int effect_key,mode;
+    
   int count=0;
   weed_plant_t *filter;
   gchar *msg;
   
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
-  lives_osc_parse_int_argument(vargs,&effect_key);
+  if (!lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+
+  count=num_in_params(filter,FALSE,TRUE);
+
+  msg=g_strdup_printf("%d",count);
+  lives_status_send(msg);
+  g_free(msg);
+}
+
+
+void lives_osc_cb_rte_oparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+  int effect_key,mode;
+  int count=0;
+  weed_plant_t *filter;
+  gchar *msg;
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
-  if (weed_plant_has_leaf(filter,"in_parameter_templates")) {
-    count=weed_leaf_num_elements(filter,"in_parameter_templates");
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (weed_plant_has_leaf(filter,"out_parameter_templates")) {
+    count=weed_leaf_num_elements(filter,"out_parameter_templates");
   }
 
   msg=g_strdup_printf("%d",count);
@@ -3538,7 +4327,157 @@
 
 
 
-void lives_osc_cb_rte_nparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_getinpal(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+  int effect_key,mode,cnum,count,error;
+  weed_plant_t **ctmpls;
+  weed_plant_t *filter,*inst,*ctmpl,*chan=NULL;
+  gchar *msg;
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&cnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&cnum);
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  inst=rte_keymode_get_instance(effect_key,mode);
+
+  if (inst!=NULL) {
+    chan=get_enabled_channel(inst,cnum,TRUE);
+    ctmpl=weed_get_plantptr_value(chan,"template",&error);
+  }
+  else {
+    filter=rte_keymode_get_filter(effect_key,mode);
+    if (filter==NULL) return lives_osc_notify_failure();
+
+    if (!weed_plant_has_leaf(filter,"in_channel_templates")) return lives_osc_notify_failure();
+    count=weed_leaf_num_elements(filter,"in_channel_templates");
+    if (cnum>=count) return lives_osc_notify_failure();
+    ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+    ctmpl=ctmpls[cnum];
+    weed_free(ctmpls);
+  }
+
+  if (weed_plant_has_leaf(ctmpl,"is_audio")) {
+      msg=g_strdup_printf("%d",WEED_PALETTE_END);
+      lives_status_send(msg);
+      g_free(msg);
+      return;
+  }
+
+  if (inst!=NULL) {
+    msg=g_strdup_printf("%d",weed_get_int_value(chan,"current_palette",&error));
+    lives_status_send(msg);
+    g_free(msg);
+    return;
+  }
+
+  msg=lives_osc_format_result(ctmpl,"palette_list",0,-1);
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+void lives_osc_cb_rte_getoutpal(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+  int effect_key,mode,cnum,count,error;
+  weed_plant_t **ctmpls;
+  weed_plant_t *filter,*inst,*ctmpl,*chan=NULL;
+  gchar *msg;
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&cnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&cnum);
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  inst=rte_keymode_get_instance(effect_key,mode);
+
+  if (inst!=NULL) {
+    chan=get_enabled_channel(inst,cnum,FALSE);
+    ctmpl=weed_get_plantptr_value(chan,"template",&error);
+  }
+  else {
+    filter=rte_keymode_get_filter(effect_key,mode);
+    if (filter==NULL) return lives_osc_notify_failure();
+
+    if (!weed_plant_has_leaf(filter,"out_channel_templates")) return lives_osc_notify_failure();
+    count=weed_leaf_num_elements(filter,"out_channel_templates");
+    if (cnum>=count) return lives_osc_notify_failure();
+    ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+    ctmpl=ctmpls[cnum];
+    weed_free(ctmpls);
+  }
+
+  if (weed_plant_has_leaf(ctmpl,"is_audio")) {
+      msg=g_strdup_printf("%d",WEED_PALETTE_END);
+      lives_status_send(msg);
+      g_free(msg);
+      return;
+  }
+
+  if (inst!=NULL) {
+    msg=g_strdup_printf("%d",weed_get_int_value(chan,"current_palette",&error));
+    lives_status_send(msg);
+    g_free(msg);
+    return;
+  }
+
+  msg=lives_osc_format_result(ctmpl,"palette_list",0,-1);
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+
+void lives_osc_cb_rte_pparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when,
+				  NetworkReturnAddressPtr ra) {
+  // return num playback plugin params
+  int count=0;
+  gchar *msg;
+
+  if (mainw->vpp==NULL) {
+    lives_status_send("0");
+    return;
+  }
+
+  count=mainw->vpp->num_play_params;
+
+  msg=g_strdup_printf("%d",count);
+  lives_status_send(msg);
+  g_free(msg);
+}
+
+
+
+void lives_osc_cb_rte_nparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				  NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int count=-1,i;
@@ -3557,6 +4496,7 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
 
   do {
     i=get_nth_simple_param(filter,++count);
@@ -3568,12 +4508,50 @@
 }
 
 
-void lives_osc_cb_rte_getnchannels(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+void lives_osc_cb_rte_getnchannels(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+
+  int effect_key,mode;
+  int count;
+
+  weed_plant_t *plant;
+
+  gchar *msg;
+  
+ if (!lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  plant=rte_keymode_get_instance(effect_key,mode);
+  if (plant==NULL) plant=rte_keymode_get_filter(effect_key,mode);
+  if (plant==NULL) return lives_osc_notify_failure();
+
+  count=enabled_in_channels(plant, FALSE);
+
+  msg=g_strdup_printf("%d",count);
+  lives_status_send(msg);
+  g_free(msg);
+}
+
+
+void lives_osc_cb_rte_getnochannels(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				    NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int count;
+  int error;
 
-  weed_plant_t *inst;
+  weed_plant_t *plant;
 
   gchar *msg;
   
@@ -3582,154 +4560,677 @@
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
-  inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
-  if (inst==NULL) return lives_osc_notify_failure();
+  plant=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
+
+  // handle compound fx
+  if (plant!=NULL) while (weed_plant_has_leaf(plant,"host_next_instance")) plant=weed_get_plantptr_value(plant,"host_next_instance",&error);
+  else plant=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (plant==NULL) return lives_osc_notify_failure();
 
-  count=enabled_in_channels(inst, TRUE);
+  count=enabled_out_channels(plant, FALSE);
 
   msg=g_strdup_printf("%d",count);
   lives_status_send(msg);
   g_free(msg);
 }
 
-void lives_osc_cb_rte_getparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+
+void lives_osc_cb_rte_getparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				  NetworkReturnAddressPtr ra) {
 
   int effect_key;
-  int pnum,nvals;
+  int mode;
+  int pnum;
+
+  int nparams;
+  weed_plant_t *filter;
+  weed_plant_t *ptmpl;
+
+  gchar *msg;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (!weed_plant_has_leaf(ptmpl,"min")) {
+    return lives_osc_notify_failure();
+  }
+
+  msg=lives_osc_format_result(ptmpl,"min",0,-1);
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+void lives_osc_cb_rte_getoparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum;
 
   int error,nparams;
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
+  weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
 
   gchar *msg;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
 
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
-  ptmpl=in_ptmpls[pnum];
+  ptmpl=out_ptmpls[pnum];
 
-  nvals=weed_leaf_num_elements(ptmpl,"min");
+  if (!weed_plant_has_leaf(ptmpl,"min")) {
+    weed_free(out_ptmpls);
+    return lives_osc_notify_failure();
+  }
 
-  msg=lives_osc_format_result(ptmpl,"min",0,nvals);
+  msg=lives_osc_format_result(ptmpl,"min",0,-1);
 
   lives_status_send(msg);
   g_free(msg);
-  weed_free(in_ptmpls);
+  weed_free(out_ptmpls);
 
 }
 
+
+void lives_osc_cb_rte_getohasparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				      NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum;
+
+  int error,nparams;
+  weed_plant_t *filter;
+  weed_plant_t **out_ptmpls;
+  weed_plant_t *ptmpl;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+
+  ptmpl=out_ptmpls[pnum];
+  weed_free(out_ptmpls);
+
+  if (!weed_plant_has_leaf(ptmpl,"min")) lives_status_send(get_omc_const("LIVES_FALSE"));
+  else lives_status_send(get_omc_const("LIVES_TRUE"));
+
+}
+
+
+void lives_osc_cb_rte_getpparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+
+  int pnum;
+
+  int error;
+  weed_plant_t *ptmpl,*param;
+
+  gchar *msg;
+
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  if (!weed_plant_has_leaf(ptmpl,"min")) {
+    return lives_osc_notify_failure();
+  }
+
+  msg=lives_osc_format_result(ptmpl,"min",0,-1);
+
+  lives_status_send(msg);
+  g_free(msg);
+}
+
+
 void lives_osc_cb_rte_getparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
-  int pnum,nvals;
+  int mode;
+  int pnum;
+
+  int nparams;
+  weed_plant_t *filter;
+  weed_plant_t *ptmpl;
+
+  gchar *msg;
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (!weed_plant_has_leaf(ptmpl,"max")) {
+    return lives_osc_notify_failure();
+  }
+
+  msg=lives_osc_format_result(ptmpl,"max",0,-1);
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+void lives_osc_cb_rte_getoparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum;
 
   int error,nparams;
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
+  weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
 
   gchar *msg;
   
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
-  ptmpl=in_ptmpls[pnum];
+  ptmpl=out_ptmpls[pnum];
 
-  nvals=weed_leaf_num_elements(ptmpl,"max");
+  if (!weed_plant_has_leaf(ptmpl,"max")) {
+    weed_free(out_ptmpls);
+    return lives_osc_notify_failure();
+  }
 
-  msg=lives_osc_format_result(ptmpl,"max",0,nvals);
+  msg=lives_osc_format_result(ptmpl,"max",0,-1);
 
   lives_status_send(msg);
   g_free(msg);
-  weed_free(in_ptmpls);
+  weed_free(out_ptmpls);
 
 }
 
-void lives_osc_cb_rte_getparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+void lives_osc_cb_rte_getohasparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
-  int pnum,nvals;
+  int mode;
+  int pnum;
 
   int error,nparams;
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
+  weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
 
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+
+  ptmpl=out_ptmpls[pnum];
+  weed_free(out_ptmpls);
+
+  if (!weed_plant_has_leaf(ptmpl,"max")) lives_status_send(get_omc_const("LIVES_FALSE"));
+  else lives_status_send(get_omc_const("LIVES_TRUE"));
+
+}
+
+
+
+void lives_osc_cb_rte_getpparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+  // playback plugin param max
+
+  int pnum;
+
+  int error;
+  weed_plant_t *ptmpl,*param;
+
   gchar *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
-  lives_osc_parse_int_argument(vargs,&effect_key);
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&pnum);
 
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  if (!weed_plant_has_leaf(ptmpl,"max")) {
+    return lives_osc_notify_failure();
+  }
+
+  msg=lives_osc_format_result(ptmpl,"max",0,-1);
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+void lives_osc_cb_rte_getparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				  NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum,nvals;
+
+  int nparams;
+  weed_plant_t *filter;
+  weed_plant_t *ptmpl;
+
+  gchar *msg;
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  if (weed_plant_has_leaf(ptmpl,"host_default")) {
+    msg=lives_osc_format_result(ptmpl,"host_default",0,-1);
+  }
+  else {
+    nvals=weed_leaf_num_elements(ptmpl,"default");
+    if (nvals>0)
+      msg=lives_osc_format_result(ptmpl,"default",0,nvals);
+    else {
+      // default can have 0 values if param has variable elements; in this case we use "new_default"
+      msg=lives_osc_format_result(ptmpl,"new_default",0,-1);
+    }
+  }
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+void lives_osc_cb_rte_getoparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum,nvals;
+
+  int error,nparams;
+  weed_plant_t *filter;
+  weed_plant_t **out_ptmpls;
+  weed_plant_t *ptmpl;
+
+  gchar *msg;
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  ptmpl=in_ptmpls[pnum];
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+
+  ptmpl=out_ptmpls[pnum];
 
   if (weed_plant_has_leaf(ptmpl,"host_default")) {
-    nvals=weed_leaf_num_elements(ptmpl,"host_default");
-    msg=lives_osc_format_result(ptmpl,"host_default",0,nvals);
+    msg=lives_osc_format_result(ptmpl,"host_default",0,-1);
   }
   else {
+    if (!weed_plant_has_leaf(ptmpl,"default")) {
+      weed_free(out_ptmpls);
+      return lives_osc_notify_failure();
+    }
+
     nvals=weed_leaf_num_elements(ptmpl,"default");
     if (nvals>0)
       msg=lives_osc_format_result(ptmpl,"default",0,nvals);
     else {
       // default can have 0 values if param has variable elements; in this case we use "new_default"
-      nvals=weed_leaf_num_elements(ptmpl,"new_default");
-      msg=lives_osc_format_result(ptmpl,"new_default",0,nvals);
+      msg=lives_osc_format_result(ptmpl,"new_default",0,-1);
     }
   }
 
   lives_status_send(msg);
   g_free(msg);
-  weed_free(in_ptmpls);
+  weed_free(out_ptmpls);
+
+}
+
+
+void lives_osc_cb_rte_gethasparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				      NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum;
+
+  int nparams;
+  weed_plant_t *filter;
+  weed_plant_t *ptmpl;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (weed_plant_has_leaf(ptmpl,"host_default")) {
+    if (weed_leaf_num_elements(ptmpl,"host_default")==0) lives_status_send(get_omc_const("LIVES_FALSE"));
+    lives_status_send(get_omc_const("LIVES_DEFAULT_OVERRIDDEN"));
+    return;
+  }
+  if (!weed_plant_has_leaf(ptmpl,"default")||weed_leaf_num_elements(ptmpl,"default")==0) lives_status_send(get_omc_const("LIVES_FALSE"));
+  else lives_status_send(get_omc_const("LIVES_TRUE"));
+
+}
+
+
+void lives_osc_cb_rte_getohasparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				      NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int mode;
+  int pnum;
+
+  int error,nparams;
+  weed_plant_t *filter;
+  weed_plant_t **out_ptmpls;
+  weed_plant_t *ptmpl;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+
+  ptmpl=out_ptmpls[pnum];
+  weed_free(out_ptmpls);
+
+  if (!weed_plant_has_leaf(ptmpl,"host_default")&&!weed_plant_has_leaf(ptmpl,"default")) lives_status_send(get_omc_const("LIVES_FALSE"));
+  else lives_status_send(get_omc_const("LIVES_TRUE"));
+
+}
+
+
+
+
+void lives_osc_cb_rte_getpparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+  // default for playback plugin param
+
+  int pnum,nvals;
+
+  int error;
+  weed_plant_t *param;
+  weed_plant_t *ptmpl;
+
+  gchar *msg;
+
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+  
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  lives_osc_parse_int_argument(vargs,&pnum);
+
+
+  if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  nvals=weed_leaf_num_elements(ptmpl,"default");
+  if (nvals>0)
+    msg=lives_osc_format_result(ptmpl,"default",0,nvals);
+  else {
+    // default can have 0 values if param has variable elements; in this case we use "new_default"
+    msg=lives_osc_format_result(ptmpl,"new_default",0,-1);
+  }
+
+  lives_status_send(msg);
+  g_free(msg);
 
 }
 
-void lives_osc_cb_rte_getparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+
+
+void lives_osc_cb_rte_getparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				  NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,st=0,end=1,hint,cspace;
 
   int error,nparams;
   weed_plant_t *inst,*filter;
-  weed_plant_t **in_params,**in_ptmpls;
   weed_plant_t *param,*ptmpl;
   gchar *msg;
   
@@ -3750,21 +5251,133 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
+  
+  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
+  if (inst==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+  
+  param=weed_inst_in_param(inst,pnum,FALSE,TRUE);
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
+
+  hint=weed_get_int_value(ptmpl,"hint",&error);
+  if (hint==WEED_HINT_COLOR) {
+    int valsize=4;
+    cspace=weed_get_int_value(ptmpl,"colorspace",&error);
+    if (cspace==WEED_COLORSPACE_RGB) valsize=3;
+    st*=valsize;
+    end=st+valsize;
+  }
+
+  if (end>weed_leaf_num_elements(param,"value")) return lives_osc_notify_failure();
+
+  msg=lives_osc_format_result(param,"value",st,end);
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+void lives_osc_cb_rte_getoparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+
+  int effect_key;
+  int pnum,st=0,end=1,hint,cspace;
+
+  int error,nparams;
+  weed_plant_t *inst,*filter;
+  weed_plant_t **out_params,**out_ptmpls;
+  weed_plant_t *param,*ptmpl;
+  gchar *msg;
+  
+  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+  }
+  else {
+    if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    lives_osc_parse_int_argument(vargs,&st);
+    end=st+1;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
+  nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
 
   inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
   if (inst==NULL) return lives_osc_notify_failure();
 
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
-  ptmpl=in_ptmpls[pnum];
+  ptmpl=out_ptmpls[pnum];
 
-  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
 
-  param=in_params[pnum];
+  param=out_params[pnum];
+
+  weed_free(out_ptmpls);
+  weed_free(out_params);
+
+  hint=weed_get_int_value(ptmpl,"hint",&error);
+  if (hint==WEED_HINT_COLOR) {
+    int valsize=4;
+    cspace=weed_get_int_value(ptmpl,"colorspace",&error);
+    if (cspace==WEED_COLORSPACE_RGB) valsize=3;
+    st*=valsize;
+    end=st+valsize;
+  }
+
+  if (end>weed_leaf_num_elements(param,"value")) return lives_osc_notify_failure();
+
+  msg=lives_osc_format_result(param,"value",st,end);
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+
+
+void lives_osc_cb_rte_getpparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, 
+				   NetworkReturnAddressPtr ra) {
+  // playback plugin param value
+  int pnum,st=0,end=1,hint,cspace;
+
+  int error;
+  weed_plant_t *param,*ptmpl;
+  gchar *msg;
+
+  if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
+  
+  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+    lives_osc_parse_int_argument(vargs,&pnum);
+  }
+  else {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&pnum);
+    lives_osc_parse_int_argument(vargs,&st);
+    end=st+1;
+  }
+
+  param=(weed_plant_t *)pp_get_param(mainw->vpp->play_params,pnum);
+
+  ptmpl=weed_get_plantptr_value(param,"template",&error);
 
   hint=weed_get_int_value(ptmpl,"hint",&error);
   if (hint==WEED_HINT_COLOR) {
@@ -3781,8 +5394,6 @@
 
   lives_status_send(msg);
   g_free(msg);
-  weed_free(in_ptmpls);
-  weed_free(in_params);
 
 }
 
@@ -3815,6 +5426,7 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
 
   i=get_nth_simple_param(filter,pnum);
 
@@ -3869,6 +5481,7 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
 
   i=get_nth_simple_param(filter,pnum);
 
@@ -3923,7 +5536,8 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
- 
+  if (filter==NULL) return lives_osc_notify_failure();
+
   i=get_nth_simple_param(filter,pnum);
 
   if (i==-1) return lives_osc_notify_failure();
@@ -3975,6 +5589,7 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
 
   i=get_nth_simple_param(filter,pnum);
 
@@ -4005,19 +5620,15 @@
 void lives_osc_cb_rte_getnparamtrans(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
-  int pnum,i;
+  int pnum;
 
   // pick pnum which is numeric single valued, non-reinit
   // i.e. simple numeric parameter
 
-  int error;
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
-  weed_plant_t *ptmpl;
-  int hint,flags;
   int nparams;
 
-  gboolean res=FALSE;
+  boolean res=FALSE;
 
   gchar *msg;
   
@@ -4030,30 +5641,18 @@
   //g_print("key %d pnum %d",effect_key,pnum);
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
-  
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  if (pnum==get_transition_param(filter,TRUE)) res=TRUE;
+
+  msg=g_strdup_printf("%d",res);
+  lives_status_send(msg);
+  g_free(msg);
   
-  for (i=0;i<nparams;i++) {
-    ptmpl=in_ptmpls[i];
-    hint=weed_get_int_value(ptmpl,"hint",&error);
-    flags=weed_get_int_value(ptmpl,"flags",&error);
-    if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1&&
-	!is_hidden_param(filter,i)) { // c.f effects-weed.c, get_nth_simple_param()
-      if (pnum==0) {
-	if (weed_plant_has_leaf(ptmpl,"transition")&&weed_get_boolean_value(ptmpl,"transition",&error)==WEED_TRUE) res=TRUE;
-	msg=g_strdup_printf("%d",res);
-	lives_status_send(msg);
-	g_free(msg);
-	weed_free(in_ptmpls);
-	return;
-      }
-      pnum--;
-    }
-  }
+
 }
 
 
@@ -4061,11 +5660,11 @@
 void lives_osc_cb_rte_getparamtrans(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
+  int mode;
   int pnum;
 
   int error;
   weed_plant_t *filter;
-  weed_plant_t **in_ptmpls;
   weed_plant_t *ptmpl;
   int nparams;
 
@@ -4073,29 +5672,37 @@
 
   gchar *msg;
   
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
-
-  lives_osc_parse_int_argument(vargs,&effect_key);
-  lives_osc_parse_int_argument(vargs,&pnum);
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  }
+  else {
+    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
-  filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
 
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return lives_osc_notify_failure();
-  nparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (pnum>=nparams) return lives_osc_notify_failure();
-  
-  in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
   
-  ptmpl=in_ptmpls[pnum];
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (weed_plant_has_leaf(ptmpl,"transition")&&weed_get_boolean_value(ptmpl,"transition",&error)==WEED_TRUE) res=TRUE;
   msg=g_strdup_printf("%d",res);
   lives_status_send(msg);
   g_free(msg);
-  weed_free(in_ptmpls);
 
 }
 
@@ -4104,7 +5711,6 @@
   gchar *tmp;
 
   int effect_key;
-  if (status_socket==NULL) return;
 
   if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
@@ -4114,20 +5720,33 @@
     return;
   }
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",rte_key_getmode (effect_key))));
+  lives_status_send ((tmp=g_strdup_printf ("%d",rte_key_getmode (effect_key)+1)));
   g_free(tmp);
 
 }
 
 
+void lives_osc_cb_rte_getstate(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int effect_key;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&effect_key);
+
+  if (effect_key<1||effect_key>FX_KEYS_MAX_VIRTUAL) {
+    lives_status_send (get_omc_const("LIVES_FALSE"));
+    return;
+  }
+  if (rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key))==NULL) lives_status_send(get_omc_const("LIVES_FALSE"));
+  else lives_status_send(get_omc_const("LIVES_TRUE"));
+}
+
+
 
 void lives_osc_cb_rte_get_keyfxname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
   int mode;
   gchar *tmp;
 
-  if (status_socket==NULL) return;
-
   if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&mode);
@@ -4142,8 +5761,6 @@
   int effect_key;
   gchar *tmp;
 
-  if (status_socket==NULL) return;
-
   if (!lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
     if (lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
       lives_status_send ((tmp=g_strdup_printf ("%d",rte_getmodespk ())));
@@ -4155,42 +5772,188 @@
   lives_osc_check_arguments (arglen,vargs,"i",TRUE);
   lives_osc_parse_int_argument(vargs,&effect_key);
 
-  if (effect_key>FX_MAX||effect_key<1) {
+  if (effect_key>FX_KEYS_MAX_VIRTUAL||effect_key<1) {
     lives_status_send ("0");
     return;
   }
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",rte_getmodespk ())));
+  lives_status_send ((tmp=g_strdup_printf ("%d",rte_key_getmaxmode (effect_key)+1)));
   g_free(tmp);
 
 }
 
 
 
-// deprecated - do not use
-void lives_osc_cb_rte_getusermode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  int nmode;
-  int effect_key;
-  gchar *tmp;
+void lives_osc_cb_rte_addpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int key0,mode0,pnum0;
+  int key1,mode1,pnum1;
+  int autoscale;
+  weed_plant_t *filter;
 
-  if (status_socket==NULL) return;
+  if (!lives_osc_check_arguments (arglen,vargs,"iiiiiii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&key0);
+  lives_osc_parse_int_argument(vargs,&mode0);
+  lives_osc_parse_int_argument(vargs,&pnum0);
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) {
-    return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&autoscale);
+
+  lives_osc_parse_int_argument(vargs,&key1);
+  lives_osc_parse_int_argument(vargs,&mode1);
+  lives_osc_parse_int_argument(vargs,&pnum1);
+
+  if (key0<1||key0>=FX_KEYS_MAX_VIRTUAL||mode0<1||mode0>rte_getmodespk()) return lives_osc_notify_failure();
+  if (key1<-2||key1==0||key1>=FX_KEYS_MAX_VIRTUAL||mode1<1||mode1>rte_getmodespk()) return lives_osc_notify_failure();
+
+  if (key0==key1) lives_osc_notify_failure();
+
+  if (autoscale!=TRUE&&autoscale!=FALSE) lives_osc_notify_failure();
+
+  filter=rte_keymode_get_filter(key0,--mode0);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (pnum0>=num_out_params(filter)) return lives_osc_notify_failure();
+
+  if (key1==-1) {
+    // connecting to the playback plugin
+    if (mode1>1||mainw->vpp==NULL||pnum1>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
+  }
+  else if (key1==-2) {
+    // connecting to subtitler
+    if (mode1>1||pnum1>0) return lives_osc_notify_failure();
+  }
+  else {
+    filter=rte_keymode_get_filter(key1,--mode1);
+    if (filter==NULL) return lives_osc_notify_failure();
+    
+    if (pnum1>=num_in_params(filter,FALSE,TRUE)) return lives_osc_notify_failure();
   }
 
-  lives_osc_parse_int_argument(vargs,&effect_key);
+  pconx_add_connection(--key0,mode0,pnum0,--key1,mode1,pnum1,autoscale);
+  lives_osc_notify_success(NULL);
+}
 
-  if (effect_key>FX_MAX||effect_key<1) {
-    lives_status_send ("0");
-    return;
+void lives_osc_cb_rte_delpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int key0,mode0,pnum0;
+  int key1,mode1,pnum1;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&key0);
+  lives_osc_parse_int_argument(vargs,&mode0);
+  lives_osc_parse_int_argument(vargs,&pnum0);
+  lives_osc_parse_int_argument(vargs,&key1);
+  lives_osc_parse_int_argument(vargs,&mode1);
+  lives_osc_parse_int_argument(vargs,&pnum1);
+
+  if (key0<0||key0>=FX_KEYS_MAX_VIRTUAL||mode0<1||mode0>rte_getmodespk()) return lives_osc_notify_failure();
+  if (key1<-2||key1>=FX_KEYS_MAX_VIRTUAL||mode1<1||mode1>rte_getmodespk()) return lives_osc_notify_failure();
+
+  pconx_delete(--key0,--mode0,pnum0,--key1,--mode1,pnum1);
+  lives_osc_notify_success(NULL);
+
+}
+
+void lives_osc_cb_rte_listpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int okey,omode,opnum;
+  gchar *msg;
+ 
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&okey);
+  lives_osc_parse_int_argument(vargs,&omode);
+  lives_osc_parse_int_argument(vargs,&opnum);
+
+  if (okey<1||okey>=FX_KEYS_MAX_VIRTUAL||omode<1||omode>rte_getmodespk()) return lives_osc_notify_failure();
+
+  msg=pconx_list(okey,omode,opnum);
+
+  if (strlen(msg)==0) {
+    g_free(msg);
+    msg=g_strdup("0 0 0 0");
+  }
+
+  lives_status_send(msg);
+  g_free(msg);
+
+}
+
+void lives_osc_cb_rte_addcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int key0,mode0,cnum0;
+  int key1,mode1,cnum1;
+  weed_plant_t *filter;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&key0);
+  lives_osc_parse_int_argument(vargs,&mode0);
+  lives_osc_parse_int_argument(vargs,&cnum0);
+  lives_osc_parse_int_argument(vargs,&key1);
+  lives_osc_parse_int_argument(vargs,&mode1);
+  lives_osc_parse_int_argument(vargs,&cnum1);
+
+  if (key0<1||key0>=FX_KEYS_MAX_VIRTUAL||mode0<1||mode0>rte_getmodespk()) return lives_osc_notify_failure();
+  if (key1<-1||key1==0||key1>=FX_KEYS_MAX_VIRTUAL||mode1<1||mode1>rte_getmodespk()) return lives_osc_notify_failure();
+
+  if (key0==key1) lives_osc_notify_failure();
+
+  filter=rte_keymode_get_filter(key0,--mode0);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  if (cnum0>=enabled_out_channels(filter,FALSE)) return lives_osc_notify_failure();
+
+  if (key1==-1) {
+    // connecting to the playback plugin
+    if (mode1>1||mainw->vpp==NULL||cnum1>=mainw->vpp->num_alpha_chans) return lives_osc_notify_failure();
   }
+  else {
+    filter=rte_keymode_get_filter(key1,--mode1);
+    if (filter==NULL) return lives_osc_notify_failure();
 
-  nmode=rte_key_getmaxmode(effect_key);
+    if (cnum1>=enabled_in_channels(filter,FALSE)) return lives_osc_notify_failure();
+  }
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",nmode)));
-  g_free(tmp);
+  cconx_add_connection(--key0,mode0,cnum0,--key1,mode1,cnum1);
+  lives_osc_notify_success(NULL);
+
+}
+
+void lives_osc_cb_rte_delcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int key0,mode0,cnum0;
+  int key1,mode1,cnum1;
+
+  if (!lives_osc_check_arguments (arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&key0);
+  lives_osc_parse_int_argument(vargs,&mode0);
+  lives_osc_parse_int_argument(vargs,&cnum0);
+  lives_osc_parse_int_argument(vargs,&key1);
+  lives_osc_parse_int_argument(vargs,&mode1);
+  lives_osc_parse_int_argument(vargs,&cnum1);
+
+  if (key0<0||key0>=FX_KEYS_MAX_VIRTUAL||mode0<1||mode0>rte_getmodespk()) return lives_osc_notify_failure();
+  if (key1<-2||key1>=FX_KEYS_MAX_VIRTUAL||mode1<1||mode1>rte_getmodespk()) return lives_osc_notify_failure();
+
+  cconx_delete(--key0,--mode0,cnum0,--key1,--mode1,cnum1);
+
+  lives_osc_notify_success(NULL);
+}
+
+void lives_osc_cb_rte_listcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int okey,omode,ocnum;
+  gchar *msg;
 
+  if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&okey);
+  lives_osc_parse_int_argument(vargs,&omode);
+  lives_osc_parse_int_argument(vargs,&ocnum);
+
+  if (okey<1||okey>=FX_KEYS_MAX_VIRTUAL||omode<1||omode>rte_getmodespk()) return lives_osc_notify_failure();
+
+  msg=cconx_list(okey,omode,ocnum);
+
+  if (strlen(msg)==0) {
+    g_free(msg);
+    msg=g_strdup("0 0 0");
+  }
+
+  lives_status_send(msg);
+  g_free(msg);
 }
 
 
@@ -4357,6 +6120,16 @@
     { "/clip/foreground/fps/slower",		"slower",		lives_osc_cb_play_slower,			61	},	
     { "/clip/background/fps/slower",		"slower",		lives_osc_cb_bgplay_slower,			63	},	
     { "/video/play/reset",		"reset",		lives_osc_cb_play_reset,			36	},	
+    { "/video/play/parameter/count",		"set",		lives_osc_cb_rte_pparamcount,			140	},
+    { "/video/play/parameter/value/set",		"set",		lives_osc_cb_rte_setpparam,			140	},
+    { "/video/play/parameter/flags/get",		"get",	lives_osc_cb_rte_getpparamflags,        141	},
+    { "/video/play/parameter/min/get",		"get",	lives_osc_cb_rte_getpparammin,		        142	},
+    { "/video/play/parameter/max/get",		"get",	lives_osc_cb_rte_getpparammax,		        143	},
+    { "/video/play/parameter/type/get",		"get",	lives_osc_cb_rte_getpparamtype,		        144	},
+    { "/video/play/parameter/name/get",		"get",	lives_osc_cb_rte_getpparamname,		        145	},
+    { "/video/play/parameter/colorspace/get",		"get",	lives_osc_cb_rte_getpparamcspace,      	        146	},
+    { "/video/play/parameter/default/get",		"get",	lives_osc_cb_rte_getpparamdef,		        147	},
+    { "/video/play/parameter/value/get",		"get",	lives_osc_cb_rte_getpparamval,		        140	},
     { "/clip/foreground/fps/reset",		"reset",		lives_osc_cb_play_reset,			61	},	
     { "/clip/background/fps/reset",		"reset",		lives_osc_cb_bgplay_reset,			63	},	
     { "/video/stop",		"stop",	        lives_osc_cb_stop,				5	},
@@ -4390,34 +6163,56 @@
     { "/effect_key/toggle",		"toggle",	lives_osc_cb_fx_toggle,		        25	},
     { "/effect_key/count",		"count",	lives_osc_cb_rte_count,		        25	},
     { "/effect_key/parameter/value/set",		"set",	lives_osc_cb_rte_setparam,		        42	},
-    { "/effect_key/parameter/value/count",		"count",	lives_osc_cb_rte_countparamvals,		        42	},
     { "/effect_key/parameter/type/get",		"get",	lives_osc_cb_rte_getparamtype,		        68	},
+    { "/effect_key/outparameter/type/get",		"get",	lives_osc_cb_rte_getoparamtype,		        153	},
     { "/effect_key/nparameter/type/get",		"get",	lives_osc_cb_rte_getnparamtype,		        116	},
     { "/effect_key/parameter/name/get",		"get",	lives_osc_cb_rte_getparamname,		        71	},
+    { "/effect_key/outparameter/name/get",		"get",	lives_osc_cb_rte_getoparamname,		        152	},
     { "/effect_key/nparameter/name/get",		"get",	lives_osc_cb_rte_getnparamname,		        72	},
     { "/effect_key/parameter/colorspace/get",		"get",	lives_osc_cb_rte_getparamcspace,		        73	},
+    { "/effect_key/outparameter/colorspace/get",		"get",	lives_osc_cb_rte_getoparamcspace,		        154	},
     { "/effect_key/parameter/flags/get",		"get",	lives_osc_cb_rte_getparamflags,		        74	},
     { "/effect_key/parameter/min/get",		"get",	lives_osc_cb_rte_getparammin,		        75	},
     { "/effect_key/parameter/max/get",		"get",	lives_osc_cb_rte_getparammax,		        76	},
     { "/effect_key/parameter/default/get",		"get",	lives_osc_cb_rte_getparamdef,		        77	},
+    { "/effect_key/parameter/default/set",		"set",	lives_osc_cb_rte_setparamdef,		        77	},
+    { "/effect_key/outparameter/min/get",		"get",	lives_osc_cb_rte_getoparammin,		        156	},
+    { "/effect_key/outparameter/max/get",		"get",	lives_osc_cb_rte_getoparammax,		        157	},
+    { "/effect_key/outparameter/default/get",		"get",	lives_osc_cb_rte_getoparamdef,		        158	},
+    { "/effect_key/outparameter/has_min",		"has_min",	lives_osc_cb_rte_getohasparammin,		        150	},
+    { "/effect_key/outparameter/has_max",		"has_max",	lives_osc_cb_rte_getohasparammax,		        150	},
+    { "/effect_key/outparameter/has_default",		"has_default",	lives_osc_cb_rte_getohasparamdef,		        150	},
+    { "/effect_key/parameter/has_default",		"has_default",	lives_osc_cb_rte_gethasparamdef,		        41	},
     { "/effect_key/parameter/value/get",		"get",	lives_osc_cb_rte_getparamval,		        42	},
+    { "/effect_key/outparameter/value/get",		"get",	lives_osc_cb_rte_getoparamval,		        155	},
     { "/effect_key/nparameter/count",		"count",	lives_osc_cb_rte_nparamcount,		        91	},
     { "/effect_key/parameter/count",		"count",	lives_osc_cb_rte_paramcount,		        41	},
+    { "/effect_key/outparameter/count",		"count",	lives_osc_cb_rte_oparamcount,		        150	},
     { "/effect_key/nparameter/value/set",		"set",	lives_osc_cb_rte_setnparam,		        92	},
     { "/effect_key/nparameter/value/get",		"get",	lives_osc_cb_rte_getnparam,		        92	},
     { "/effect_key/nparameter/min/get",		"get",	lives_osc_cb_rte_getnparammin,		        93	},
     { "/effect_key/nparameter/max/get",		"get",	lives_osc_cb_rte_getnparammax,		        94	},
     { "/effect_key/nparameter/default/get",		"get",	lives_osc_cb_rte_getnparamdef,		        95	},
-    { "/effect_key/nparameter/is_transition/get",		"get",	lives_osc_cb_rte_getnparamtrans,		        96	},
-    { "/effect_key/parameter/is_transition/get",		"get",	lives_osc_cb_rte_getparamtrans,		        78	},
-    { "/effect_key/inchannels/active/get",		"get",	lives_osc_cb_rte_getnchannels,		        131	},
+    { "/effect_key/nparameter/default/set",		"set",	lives_osc_cb_rte_setnparamdef,		        95	},
+    { "/effect_key/nparameter/is_transition",		"is_transition",	lives_osc_cb_rte_getnparamtrans,		        91	},
+    { "/effect_key/parameter/is_transition",		"is_transition",	lives_osc_cb_rte_getparamtrans,		        41	},
+    { "/effect_key/inchannel/active/count",		"count",	lives_osc_cb_rte_getnchannels,		        131	},
+    { "/effect_key/inchannel/palette/get",		"get",	lives_osc_cb_rte_getinpal,		        132	},
+    { "/effect_key/outchannel/active/count",		"count",	lives_osc_cb_rte_getnochannels,		        171	},
+    { "/effect_key/outchannel/palette/get",		"get",	lives_osc_cb_rte_getoutpal,		        162	},
     { "/effect_key/mode/set",		"set",	lives_osc_cb_rte_setmode,		        43	},
     { "/effect_key/mode/get",		"get",	lives_osc_cb_rte_getmode,		        43	},
     { "/effect_key/mode/next",		"next",	lives_osc_cb_rte_nextmode,		        43	},
     { "/effect_key/mode/previous",		"previous",	lives_osc_cb_rte_prevmode,		        43	},
     { "/effect_key/name/get",		"get",	lives_osc_cb_rte_get_keyfxname,		        44	},
     { "/effect_key/maxmode/get",		"get",	lives_osc_cb_rte_getmodespk,		        45	},
-    { "/effect_key/usermode/get",		"get",	lives_osc_cb_rte_getusermode,		        56	},
+    { "/effect_key/state/get",		"get",	lives_osc_cb_rte_getstate,		        56	},
+    { "/effect_key/outparameter/connection/add",		"add",	lives_osc_cb_rte_addpconnection,		        151	},
+    { "/effect_key/outparameter/connection/delete",		"delete",	lives_osc_cb_rte_delpconnection,		        151	},
+    { "/effect_key/outparameter/connection/list",		"list",	lives_osc_cb_rte_listpconnection,		        151	},
+    { "/effect_key/outchannel/connection/add",		        "add",	lives_osc_cb_rte_addcconnection,		        161	},
+    { "/effect_key/outchannel/connection/delete",		"delete",	lives_osc_cb_rte_delcconnection,		        161	},
+    { "/effect_key/outchannel/connection/list",		"list",	lives_osc_cb_rte_listcconnection,		        161	},
     { "/clip/encode_as",		"encode_as",	lives_osc_cb_clip_encodeas,			1	},
     { "/clip/select",		"select",	lives_osc_cb_fgclip_select,			1	},
     { "/clip/close",		"close",	lives_osc_cb_clip_close,	  		        1	},
@@ -4521,6 +6316,15 @@
     {	"/video/fps/ratio/",	 	"ratio",	 65, 40,0   	},
     {	"/video/play/ start video playback",	 	"play",	         36, 5,0   	},
     {	"/video/play/time",	 	"time",	         67, 36,0   	},
+    {	"/video/play/parameter",	 	"parameter",	         69, 36,0   	},
+    {	"/video/play/parameter/value",	 	"value",	         140, 69,0   	},
+    {	"/video/play/parameter/flags",	 	"flags",	         141, 69,0   	},
+    {	"/video/play/parameter/min",	 	"min",	         142, 69,0   	},
+    {	"/video/play/parameter/max",	 	"max",	         143, 69,0   	},
+    {	"/video/play/parameter/type",	 	"type",	         144, 69,0   	},
+    {	"/video/play/parameter/name",	 	"name",	         145, 69,0   	},
+    {	"/video/play/parameter/colorspace",	 	"colorspace",	 146, 69,0   	},
+    {	"/video/play/parameter/default",	"default",	 147, 69,0   	},
     {	"/video/freeze/",	"freeze",        37, 5,0   	},
     {	"/video/loop/",	"loop",        38, 5,0   	},
     {	"/video/pingpong/",	"pingpong",        39, 5,0   	},
@@ -4552,8 +6356,9 @@
     {	"/effect/realtime/" , 		"realtime",	 114, 4,0	},
     {	"/effect/realtime/name/" , 		"name",	 115, 114,0	},
     {	"/effect_key/" , 		"effect_key",	 25, -1,0	},
-    {	"/effect_key/inchannels/" , 	"inchannels",	 130, 25,0	},
-    {	"/effect_key/inchannels/active/" , 	"active",	 131, 130,0	},
+    {	"/effect_key/inchannel/" , 	"inchannel",	 130, 25,0	},
+    {	"/effect_key/inchannel/active/" , 	"active",	 131, 130,0	},
+    {	"/effect_key/inchannel/palette/" , 	"palette",	 132, 130,0	},
     {	"/effect_key/parameter/" , 	"parameter",	 41, 25,0	},
     {	"/effect_key/parameter/value/" ,"value",	 42, 41,0	},
     {	"/effect_key/parameter/type/" ,"type",	 68, 41,0	},
@@ -4563,7 +6368,6 @@
     {	"/effect_key/parameter/min/" ,"min",	 75, 41,0	},
     {	"/effect_key/parameter/max/" ,"max",	 76, 41,0	},
     {	"/effect_key/parameter/default/" ,"default",	 77, 41,0	},
-    {	"/effect_key/parameter/is_transition/" ,"is_transition", 78, 41,0  },
     {	"/effect_key/nparameter/" , 	"nparameter",	 91, 25,0	},
     {	"/effect_key/nparameter/name/" ,"name",	 72, 91,0	},
     {	"/effect_key/nparameter/value/" ,"value",	 92, 91,0	},
@@ -4571,12 +6375,24 @@
     {	"/effect_key/nparameter/min/" ,"min",	 93, 91,0	},
     {	"/effect_key/nparameter/max/" ,"max",	 94, 91,0	},
     {	"/effect_key/nparameter/default/" ,"default",	 95, 91,0	},
-    {	"/effect_key/nparameter/is_transition/" ,"is_transition", 96, 91,0  },
     {	"/effect_key/map/" , 		"map",	 32, 25,0	},
     {	"/effect_key/mode/" , 		"mode",	 43, 25,0	},
     {	"/effect_key/name/" , 		"name",	 44, 25,0	},
     {	"/effect_key/maxmode/" , 	"maxmode",	 45, 25,0	},
-    {	"/effect_key/usermode/" , 	"usermode",	 56, 25,0	},
+    {	"/effect_key/state/" , 	"state",	 56, 25,0	},
+    {	"/effect_key/outchannel/" , 	"outchannel",	 160, 25,0	},
+    {	"/effect_key/outchannel/connection/" , 	"connection",	 161, 160,0	},
+    {	"/effect_key/outchannel/palette/" , 	"palette",	 162, 160,0	},
+    {	"/effect_key/outchannel/active/" , 	"active",	 171, 160,0	},
+    {	"/effect_key/outparameter/" , 	"outparameter",	 150, 25,0	},
+    {	"/effect_key/outparameter/connection/" , 	"connection",	 151, 150,0	},
+    {	"/effect_key/outparameter/name/" , 	"name",	 152, 150,0	},
+    {	"/effect_key/outparameter/type/" , 	"type",	 153, 150,0	},
+    {	"/effect_key/outparameter/colorspace/" , 	"colorspace",	 154, 150,0	},
+    {	"/effect_key/outparameter/value/" , 	"value",	 155, 150,0	},
+    {	"/effect_key/outparameter/min/" , 	"min",	 156, 150,0	},
+    {	"/effect_key/outparameter/max/" , 	"max",	 157, 150,0	},
+    {	"/effect_key/outparameter/default/" , 	"default",	 158, 150,0	},
     {	"/lives/" , 		"lives",	 21, -1,0	},
     {	"/lives/version" , 		"version",	 24, 21,0	},
     {	"/lives/mode" , 		"mode",	 103, 21,0	},
@@ -4777,6 +6593,10 @@
     if(NetworkReceivePacket(o->packet)) {
       /* OSC must accept this packet (OSC will auto-invoke it, see source !) */
       OSCAcceptPacket(o->packet);
+
+#ifdef DEBUG_OSC
+      g_print("got osc msg %s\n",OSCPacketBufferGetBuffer((OSCPacketBuffer)o->packet));
+#endif
       /* Is this really productive ? */
       OSCBeProductiveWhileWaiting();
       // here we call the callbacks
@@ -4862,9 +6682,7 @@
     if (livesOSC==NULL) return FALSE;
     status_socket=NULL;
     notify_socket=NULL;
-    if (udp_port!=0) gtk_timeout_add(KEY_RPT_INTERVAL,&lives_osc_poll,NULL);
   }
-
   return TRUE;
 }

LiVES-1.6.1.tar.bz2/src/osc.h -> LiVES-2.0.3.tar.bz2/src/osc.h Changed

LiVES-1.6.1.tar.bz2/src/pangotext.c -> LiVES-2.0.3.tar.bz2/src/pangotext.c Changed

@@ -1,7 +1,7 @@
 // pangotext.c
 // text handling code
 // (c) A. Penkov 2010
-// (c) G. Finch 2010 - 2012
+// (c) G. Finch 2010 - 2013
 // pieces of code taken and modified from scribbler.c
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
@@ -11,10 +11,6 @@
 
 #include <pango/pangocairo.h>
 
-#include "support.h"
-#include "main.h"
-#include "pangotext.h"
-
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
@@ -27,6 +23,11 @@
 #include "../libweed/weed-host.h"
 #endif
 
+#include "support.h"
+#include "main.h"
+#include "pangotext.h"
+
+
 static int font_cmp(const void *p1, const void *p2); 
 
 //
@@ -58,9 +59,9 @@
     *py = d;
 }
 
-static void fill_bckg(cairo_t *cr, double x, double y, double dx, double dy) {
-  cairo_rectangle(cr, x, y, dx, dy);
-  cairo_fill(cr);
+static void fill_bckg(lives_painter_t *cr, double x, double y, double dx, double dy) {
+  lives_painter_rectangle(cr, x, y, dx, dy);
+  lives_painter_fill(cr);
 }
 
 
@@ -91,13 +92,17 @@
   return font_list;
 }
 
-int font_cmp(const void *p1, const void *p2) {  
+static int font_cmp(const void *p1, const void *p2) {  
   const char *s1 = (const char *)(*(char **)p1);
   const char *s2 = (const char *)(*(char **)p2);
-  return(strcasecmp(s1, s2));
+  char *u1 = g_utf8_casefold(s1, -1);
+  char *u2 = g_utf8_casefold(s2, -1);
+  int ret = strcmp(u1, u2);
+  g_free(u1);
+  g_free(u2);
+  return ret;
 }
 
-
 weed_plant_t *render_text_to_layer(weed_plant_t *layer, const char *text, const char *fontname,
   double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col,
   gboolean center, gboolean rising, double top) {
@@ -116,8 +121,8 @@
   double b_alpha=(double)bg_col->alpha/255.;
   double f_alpha=(double)fg_col->alpha/255.;
 
-  cairo_t *cairo;
-  cairo_surface_t *surface;
+  lives_painter_t *lives_painter;
+  lives_painter_surface_t *surface;
   void *src;
 
   PangoLayout *layout;
@@ -132,12 +137,12 @@
   cent = center ? 1 : 0;
   rise = rising ? 1 : 0;
 
-  // do cairo and pango things
+  // do lives_painter and pango things
 
-  cairo=layer_to_cairo(layer); ///< layer is destroyed (unless error, then cairo is NULL)
-  if (cairo==NULL) return layer; ///< error occured
+  lives_painter=layer_to_lives_painter(layer);
+  if (lives_painter==NULL) return layer; ///< error occured
   
-  layout = pango_cairo_create_layout(cairo);
+  layout = pango_cairo_create_layout(lives_painter);
   
   if (layout) { 
     PangoFontDescription *font;
@@ -160,43 +165,43 @@
     if (cent) pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
     else pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
     
-    cairo_move_to(cairo, x_text, y_text);
+    lives_painter_move_to(lives_painter, x_text, y_text);
 
     switch(mode) {
     case LIVES_TEXT_MODE_FOREGROUND_AND_BACKGROUND:
-      cairo_set_source_rgba(cairo,bg->red, bg->green, bg->blue, b_alpha);
-      fill_bckg(cairo, x_pos, y_pos, dwidth, dheight);
-      cairo_move_to(cairo, x_text, y_text);
-      cairo_set_source_rgba(cairo,fg->red, fg->green, fg->blue, f_alpha);
+      lives_painter_set_source_rgba(lives_painter,bg->red, bg->green, bg->blue, b_alpha);
+      fill_bckg(lives_painter, x_pos, y_pos, dwidth, dheight);
+      lives_painter_move_to(lives_painter, x_text, y_text);
+      lives_painter_set_source_rgba(lives_painter,fg->red, fg->green, fg->blue, f_alpha);
       break;
     case LIVES_TEXT_MODE_BACKGROUND_ONLY:
-      cairo_set_source_rgba(cairo,bg->red, bg->green, bg->blue, b_alpha);
-      fill_bckg(cairo, x_pos, y_pos, dwidth, dheight);
-      cairo_move_to(cairo, x_pos, y_pos);
-      cairo_set_source_rgba(cairo,fg->red, fg->green, fg->blue, f_alpha);
+      lives_painter_set_source_rgba(lives_painter,bg->red, bg->green, bg->blue, b_alpha);
+      fill_bckg(lives_painter, x_pos, y_pos, dwidth, dheight);
+      lives_painter_move_to(lives_painter, x_pos, y_pos);
+      lives_painter_set_source_rgba(lives_painter,fg->red, fg->green, fg->blue, f_alpha);
       pango_layout_set_text(layout, "", -1);
       break;
     case LIVES_TEXT_MODE_FOREGROUND_ONLY:
     default:
-      cairo_set_source_rgba(cairo,fg->red, fg->green, fg->blue, f_alpha);
+      lives_painter_set_source_rgba(lives_painter,fg->red, fg->green, fg->blue, f_alpha);
       break;
     }
     
-    pango_cairo_show_layout(cairo, layout);
+    pango_cairo_show_layout(lives_painter, layout);
     
     // do not !!
-    //cairo_paint(cairo);
+    //lives_painter_paint(lives_painter);
     
-    cairo_to_layer(cairo,layer);
+    lives_painter_to_layer(lives_painter,layer);
 
     g_object_unref(layout);
     pango_font_description_free(font);
   }
 
-  surface=cairo_get_target(cairo);
-  src=cairo_image_surface_get_data (surface);
+  surface=lives_painter_get_target(lives_painter);
+  src=lives_painter_image_surface_get_data (surface);
   g_free(src);
-  cairo_destroy(cairo);
+  lives_painter_destroy(lives_painter);
   return layer;
 }
 
@@ -217,7 +222,7 @@
   char data[32768];
   size_t curlen;
 
-  long curpos;
+  int64_t curpos;
 
   if(!pf || !title)
     return(FALSE);
@@ -273,7 +278,7 @@
   char data[32768];
   size_t curlen;
 
-  long curpos;
+  int64_t curpos;
 
   if(!pf || !title)
     return(FALSE);
@@ -713,7 +718,7 @@
 
 gboolean save_srt_subtitles(file *sfile, double start_time, double end_time, double offset_time, const char *filename) {
   lives_subtitles_t *subt=NULL;
-  long savepos = 0;
+  int64_t savepos = 0;
   FILE *pf;
   int num_saves;
   lives_subtitle_t *ptr = NULL;
@@ -780,7 +785,7 @@
 
 gboolean save_sub_subtitles(file *sfile, double start_time, double end_time, double offset_time, const char *filename) {
   lives_subtitles_t *subt=NULL;
-  long savepos = 0;
+  int64_t savepos = 0;
   FILE *pf;
   int num_saves;
   lives_subtitle_t *ptr = NULL;

LiVES-1.6.1.tar.bz2/src/paramspecial.c -> LiVES-2.0.3.tar.bz2/src/paramspecial.c Changed

@@ -1,6 +1,6 @@
 // paramspecial.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -22,6 +22,7 @@
 #include "effects.h"
 #include "support.h"
 #include "paramwindow.h"
+#include "framedraw.h"
 
 static lives_special_aspect_t aspect;
 static lives_special_framedraw_rect_t framedraw;
@@ -31,148 +32,137 @@
 // TODO - rewrite all of this more sensibly
 
 
-void 
-init_special (void) {
-  aspect.width_param=aspect.height_param=-1;
-  aspect.width_widget=aspect.height_widget=NULL;
-  framedraw.type=FD_NONE;
-  framedraw.xstart_param=framedraw.ystart_param=framedraw.xend_param=framedraw.yend_param=-1;
+void init_special (void) {
+  framedraw.type=LIVES_PARAM_SPECIAL_TYPE_NONE;
+  aspect.width_param=aspect.height_param=NULL;
+  aspect.checkbutton=NULL;
+  framedraw.xstart_param=framedraw.ystart_param=framedraw.xend_param=framedraw.yend_param=NULL;
+  framedraw.stdwidgets=0;
   framedraw.extra_params=NULL;
   framedraw.num_extra=0;
-  framedraw.xstart_widget=framedraw.ystart_widget=framedraw.xend_widget=framedraw.yend_widget=NULL;
   framedraw.added=FALSE;
-  mergealign.start_param=mergealign.end_param=-1;
-  mergealign.start_widget=mergealign.end_widget=NULL;
+  mergealign.start_param=mergealign.end_param=NULL;
   passwd_widgets=NULL;
   fileread=NULL;
 }
 
 
-gint 
-add_to_special (const gchar *sp_string, lives_rfx_t *rfx) {
+
+
+
+void add_to_special (const gchar *sp_string, lives_rfx_t *rfx) {
   gchar **array=g_strsplit (sp_string,"|",-1);
   int num_widgets=get_token_count(sp_string,'|')-2;
-  int i,pnum;
-  int *ign;
+  int pnum;
 
-  weed_plant_t *param,*paramtmpl,*init_event=NULL;
-  int hint,num_in_tracks=0,error;
-
-  void **pchains=NULL,*pchange;
+  register int i;
 
   // TODO - make sure only one of each of these
 
-  // returns extra width in pixels
-  gint extra_width=0;
 
   if (!strcmp (array[0],"aspect")) {
-    // aspect button
-    if (fx_dialog[1]!=NULL) {
-      g_strfreev(array);
-      return extra_width;
-    }
-    aspect.width_param=atoi (array[1]);
-    aspect.height_param=atoi (array[2]);
+    aspect.width_param=&rfx->params[atoi(array[1])];
+    aspect.height_param=&rfx->params[atoi(array[2])];
   }
   else if (!strcmp (array[0],"mergealign")) {
     // align start/end
-    if (fx_dialog[1]!=NULL) {
+    /*    if (fx_dialog[1]!=NULL) {
       g_strfreev(array);
-      return extra_width;
-    }
-    mergealign.start_param=atoi (array[1]);
-    mergealign.end_param=atoi (array[2]);
+      return;
+      }*/
+    mergealign.start_param=&rfx->params[atoi(array[1])];
+    mergealign.end_param=&rfx->params[atoi(array[2])];
     mergealign.rfx=rfx;
   }
   else if (!strcmp (array[0],"framedraw")) {
-    gint stdwidgets=0;
     if (fx_dialog[1]!=NULL) {
       g_strfreev(array);
-      return extra_width;
+      return;
     }
     framedraw.rfx=rfx;
     if (!strcmp (array[1],"rectdemask")) {
-      framedraw.type=FD_RECT_DEMASK;
-      framedraw.xstart_param=atoi (array[2]);
-      framedraw.ystart_param=atoi (array[3]);
-      framedraw.xend_param=atoi (array[4]);
-      framedraw.yend_param=atoi (array[5]);
-      stdwidgets=4;
+      framedraw.type=LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK;
+      framedraw.xstart_param=&rfx->params[atoi (array[2])];
+      framedraw.ystart_param=&rfx->params[atoi (array[3])];
+      framedraw.xend_param=&rfx->params[atoi (array[4])];
+      framedraw.yend_param=&rfx->params[atoi (array[5])];
+      framedraw.stdwidgets=4;
     }
     else if (!strcmp (array[1],"multrect")) {
-      framedraw.type=FD_RECT_MULTRECT;
-      framedraw.xstart_param=atoi (array[2]);
-      framedraw.ystart_param=atoi (array[3]);
-      framedraw.xend_param=atoi (array[4]);
-      framedraw.yend_param=atoi (array[5]);
-      stdwidgets=4;
+      framedraw.type=LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT;
+      framedraw.xstart_param=&rfx->params[atoi (array[2])];
+      framedraw.ystart_param=&rfx->params[atoi (array[3])];
+      framedraw.xend_param=&rfx->params[atoi (array[4])];
+      framedraw.yend_param=&rfx->params[atoi (array[5])];
+      framedraw.stdwidgets=4;
+    }
+    else if (!strcmp (array[1],"multirect")) {
+      framedraw.type=LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT;
+      framedraw.xstart_param=&rfx->params[atoi (array[2])];
+      framedraw.ystart_param=&rfx->params[atoi (array[3])];
+      framedraw.xend_param=&rfx->params[atoi (array[4])];
+      framedraw.yend_param=&rfx->params[atoi (array[5])];
+      framedraw.stdwidgets=4;
     }
     else if (!strcmp (array[1],"singlepoint")) {
-      framedraw.type=FD_SINGLEPOINT;
-      framedraw.xstart_param=framedraw.xend_param=atoi (array[2]);
-      framedraw.ystart_param=framedraw.yend_param=atoi (array[3]);
-      stdwidgets=2;
+      framedraw.type=LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT;
+      framedraw.xstart_param=&rfx->params[atoi (array[2])];
+      framedraw.ystart_param=&rfx->params[atoi (array[3])];
+      framedraw.stdwidgets=2;
     }
 
-    if (num_widgets>stdwidgets) framedraw.extra_params=
-				  (gint *)g_malloc(((framedraw.num_extra=(num_widgets-stdwidgets)))*sizint);
-    if (rfx->status==RFX_STATUS_WEED&&mainw->multitrack!=NULL&&(init_event=mainw->multitrack->init_event)!=NULL) {
-      num_in_tracks=weed_leaf_num_elements(init_event,"in_tracks");
-      pchains=weed_get_voidptr_array(init_event,"in_parameters",&error);
-    }
-    ign=(int *)g_malloc(num_in_tracks*sizint);
-    for (i=0;i<num_in_tracks;i++) ign[i]=WEED_FALSE;
+    if (num_widgets>framedraw.stdwidgets) framedraw.extra_params=
+				  (gint *)g_malloc(((framedraw.num_extra=(num_widgets-framedraw.stdwidgets)))*sizint);
+
     for (i=0;i<num_widgets;i++) {
       pnum=atoi(array[i+2]);
       if (rfx->status==RFX_STATUS_WEED) {
 	if (mainw->multitrack!=NULL) {
-	  if (rfx->params[pnum].hidden&HIDDEN_MULTI&&mainw->multitrack->track_index!=-1) {
-	    rfx->params[pnum].hidden^=HIDDEN_MULTI; // multivalues allowed
+	  if (rfx->params[pnum].multi==PVAL_MULTI_PER_CHANNEL) {
+	    if ((rfx->params[pnum].hidden&HIDDEN_MULTI)==HIDDEN_MULTI) {
+	      if (mainw->multitrack->track_index!=-1) {
+		rfx->params[pnum].hidden^=HIDDEN_MULTI; // multivalues allowed
+	      }
+	      else {
+		rfx->params[pnum].hidden|=HIDDEN_MULTI; // multivalues hidden
+	      }
+	    }
 	  }
-	  else if (mainw->multitrack->track_index==-1) {
-	    rfx->params[pnum].hidden|=HIDDEN_MULTI; // multivalues hidden
-	  }
-	}
-	if (init_event!=NULL) {
-	  param=weed_inst_in_param((weed_plant_t *)rfx->source,pnum,FALSE);
-	  pchange=pchains[pnum];
-	  paramtmpl=weed_get_plantptr_value(param,"template",&error);
-	  hint=weed_get_int_value(paramtmpl,"hint",&error);
-	  fill_param_vals_to (paramtmpl, (weed_plant_t *)pchange, pnum, hint, num_in_tracks-1);
-	  weed_set_boolean_array((weed_plant_t *)pchange,"ignore",num_in_tracks,ign);
 	}
       }
-      if (i>=stdwidgets) framedraw.extra_params[i-stdwidgets]=pnum;
+      if (i>=framedraw.stdwidgets) framedraw.extra_params[i-framedraw.stdwidgets]=pnum;
     }
-    if (rfx->status==RFX_STATUS_WEED) {
-      weed_free(pchains);
-    }
-    if (mainw->multitrack==NULL) extra_width=RFX_EXTRA_WIDTH;
-    else {
+
+    if (mainw->multitrack!=NULL) {
       mainw->multitrack->framedraw=&framedraw;
-      gtk_widget_modify_bg (mainw->multitrack->fd_frame, GTK_STATE_NORMAL, &palette->light_red);
+      lives_widget_set_bg_color (mainw->multitrack->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
     }
-    g_free(ign);
   }
+
+  // can be multiple of each of these
+
   else if (!strcmp (array[0],"fileread")) {
-    fileread=g_list_append(fileread,GINT_TO_POINTER(atoi(array[1])));
+    int idx=atoi(array[1]);
+    fileread=g_list_append(fileread,(gpointer)&rfx->params[idx]);
+
+    // ensure we get an entry and not a text_view
+    if ((gint)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(gdouble)RFX_TEXT_MAGIC;
   }
   else if (!strcmp (array[0],"password")) {
     int idx=atoi(array[1]);
-    passwd_widgets=g_list_append(passwd_widgets,GINT_TO_POINTER(idx));
+    passwd_widgets=g_list_append(passwd_widgets,(gpointer)&rfx->params[idx]);
 
     // ensure we get an entry and not a text_view
     if ((gint)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(gdouble)RFX_TEXT_MAGIC;
   }
 
   g_strfreev (array);
-  return extra_width;
 }
 
 
 void fd_tweak(lives_rfx_t *rfx) {
   if (rfx->props&RFX_PROPS_MAY_RESIZE) {
-    if (framedraw.type!=FD_NONE) {
+    if (framedraw.type!=LIVES_PARAM_SPECIAL_TYPE_NONE) {
       // for effects which can resize, and have a special framedraw, we will use original sized image
       gtk_widget_hide(mainw->framedraw_preview);
       gtk_widget_set_sensitive(mainw->framedraw_spinbutton,TRUE);
@@ -188,132 +178,116 @@
 
 
 static void passwd_toggle_vis(GtkToggleButton *b, gpointer entry) {
-  gtk_entry_set_visibility(GTK_ENTRY(entry),gtk_toggle_button_get_active(b));
+  gtk_entry_set_visibility(GTK_ENTRY(entry),lives_toggle_button_get_active(b));
 }
 
 
-void check_for_special (lives_param_t *param, gint num, GtkBox *pbox, lives_rfx_t *rfx) {
+void check_for_special (lives_rfx_t *rfx, lives_param_t *param, LiVESBox *pbox) {
   GtkWidget *checkbutton;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
   GtkWidget *box;
   GtkWidget *buttond;
-  GtkWidget *label;
   GList *slist;
+
+
+  gchar *tmp,*tmp2;
+
   // check if this parameter is part of a special window
   // as we are drawing the paramwindow
 
-  if (num==framedraw.xstart_param) {
-    framedraw.xstart_widget=param->widgets[0];
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
+  if (param==framedraw.xstart_param) {
+    param->special_type=framedraw.type;
+    param->special_type_index=0;
+    if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
     g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
   }
-  if (num==framedraw.ystart_param) {
-    framedraw.ystart_widget=param->widgets[0];
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
+  if (param==framedraw.ystart_param) {
+    param->special_type=framedraw.type;
+    param->special_type_index=1;
+    if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),0.);
     g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
   }
   if (mainw->current_file>-1) {
-    if (num==framedraw.xend_param) {
-      framedraw.xend_widget=param->widgets[0];
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
+    if (param==framedraw.xend_param) {
+      param->special_type=framedraw.type;
+      param->special_type_index=2;
+      if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
       g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
     }
-    if (num==framedraw.yend_param) {
-      framedraw.yend_widget=param->widgets[0];
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
+    if (param==framedraw.yend_param) {
+      param->special_type=framedraw.type;
+      param->special_type_index=3;
+      if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
       g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed", G_CALLBACK (after_framedraw_widget_changed), &framedraw);
-  }
-    if (framedraw.xstart_widget!=NULL&&framedraw.ystart_widget!=NULL&&framedraw.xend_widget!=NULL&&framedraw.yend_widget!=NULL&&!framedraw.added) {
-      if (mainw->multitrack==NULL) {
-	framedraw_connect(&framedraw,cfile->hsize,cfile->vsize,rfx); // turn passive preview->active
-	framedraw_add_reset(GTK_VBOX(GTK_WIDGET(pbox)),&framedraw);
-      }
-      else {
-	mainw->framedraw_image=mainw->image274;
-	
-	// create a blank bitmap mask
-	if (mainw->framedraw_bitmap!=NULL) {
-	  gdk_pixmap_unref (mainw->framedraw_bitmap);
-	}
-	
-	mainw->framedraw_bitmap = gdk_pixmap_new (NULL, cfile->hsize, cfile->vsize, 1);
-	framedraw_add_label(GTK_VBOX(GTK_WIDGET(pbox)));
-	
-	if (mainw->framedraw_bitmapgc!=NULL) {
-	  g_object_unref (mainw->framedraw_bitmapgc);
+    }
+
+
+    if (framedraw.stdwidgets>0&&!framedraw.added) {
+      if (framedraw.xstart_param!=NULL&&framedraw.xstart_param->widgets[0]!=NULL&&
+	  framedraw.ystart_param!=NULL&&framedraw.ystart_param->widgets[0]!=NULL) {
+	if (framedraw.stdwidgets==2||(framedraw.xend_param!=NULL&&framedraw.xend_param->widgets[0]!=NULL&&
+			    framedraw.yend_param!=NULL&&framedraw.yend_param->widgets[0]!=NULL)) {
+	  if (mainw->multitrack==NULL) {
+	    framedraw_connect(&framedraw,cfile->hsize,cfile->vsize,rfx); // turn passive preview->active
+	    framedraw_add_reset(GTK_VBOX(GTK_WIDGET(pbox)),&framedraw);
+	  }
+	  else {
+	    mainw->framedraw=mainw->image274;
+	  }
+	  framedraw.added=TRUE;
 	}
-	
-	if (mainw->framedraw_bitmap!=NULL) mainw->framedraw_bitmapgc=gdk_gc_new (mainw->framedraw_bitmap);
-	
       }
-      framedraw.added=TRUE;
     }
     
-    
-    if (num==aspect.width_param) {
+    if (param==aspect.width_param) {
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->hsize);
       aspect.width_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
 						G_CALLBACK (after_aspect_width_changed),
 						NULL);
-      aspect.width_widget=param->widgets[0];
     }
-    if (num==aspect.height_param) {
+    if (param==aspect.height_param) {
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)cfile->vsize);
       aspect.height_func=g_signal_connect_after (GTK_OBJECT (param->widgets[0]), "value_changed",
 						 G_CALLBACK (after_aspect_height_changed),
 						 NULL);
       
-      box = gtk_hbox_new (FALSE, 10);
-      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (pbox)), box, TRUE, FALSE, 0);
-      
-      
-      
+      box = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (pbox)), box, FALSE, FALSE, widget_opts.packing_height*2);
       
-      checkbutton = gtk_check_button_new ();
-      gtk_widget_set_tooltip_text( checkbutton, (_("Maintain aspect ratio of original frame")));
-      eventbox=gtk_event_box_new();
-      gtk_tooltips_copy(eventbox,checkbutton);
-      label=gtk_label_new_with_mnemonic (_("Maintain _Aspect Ratio"));
       
+      add_fill_to_box(GTK_BOX(box));
       
-      gtk_container_add(GTK_CONTAINER(eventbox),label);
-      g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-			G_CALLBACK (label_act_toggle),
-			checkbutton);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-      }
-      
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-      
-      hbox = gtk_hbox_new (FALSE, 10);
-      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
-      add_fill_to_box(GTK_BOX(hbox));
-      gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-      add_fill_to_box(GTK_BOX(hbox));
-      GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
+      checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Maintain _Aspect Ratio"))),TRUE,
+						     LIVES_BOX(box),(tmp2=g_strdup(_("Maintain aspect ratio of original frame"))));
+
+      g_free(tmp); g_free(tmp2);
+
+      add_fill_to_box(GTK_BOX(box));
+
+      gtk_widget_show_all(box);
+
       aspect.checkbutton=checkbutton;
-      aspect.height_widget=param->widgets[0];
     }
-    if (num==mergealign.start_param) mergealign.start_widget=param->widgets[0];
-    if (num==mergealign.end_param) mergealign.end_widget=param->widgets[0];
   }
 
   slist=fileread;
   while (slist!=NULL) {
-    if (num==GPOINTER_TO_INT(slist->data)) {
+    if (param==(lives_param_t *)(slist->data)) {
       GList *clist;
       gint epos;
 
-      box=(GTK_WIDGET(param->widgets[0])->parent);
+      param->special_type=LIVES_PARAM_SPECIAL_TYPE_FILEREAD;
+
+      if (param->widgets[0]==NULL) continue;
+
+      box=lives_widget_get_parent(param->widgets[0]);
 
-      while (box !=NULL&&!GTK_IS_BOX(box)) {
-	box=box->parent;
+      while (box!=NULL&&!LIVES_IS_HBOX(box)) {
+	box=lives_widget_get_parent(box);
       }
 
       if (box==NULL) return;
@@ -322,14 +296,21 @@
       epos=g_list_index(clist,param->widgets[0]);
       g_list_free(clist);
 
-      buttond = gtk_file_chooser_button_new(_("LiVES: Select file"),GTK_FILE_CHOOSER_ACTION_OPEN);
-      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(buttond),g_get_current_dir());
-      gtk_box_pack_start(GTK_BOX(box),buttond,FALSE,FALSE,10);
+      buttond = lives_standard_file_button_new (FALSE,g_get_current_dir());
+      gtk_box_pack_start(GTK_BOX(box),buttond,FALSE,FALSE,widget_opts.packing_width);
       gtk_box_reorder_child(GTK_BOX(box),buttond,epos); // insert after label, before textbox
+      g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)param->widgets[0]);
 
-      if (!GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(param->widgets[0]))) gtk_widget_set_sensitive(buttond,FALSE);
+      if (!lives_widget_is_sensitive(param->widgets[0])) gtk_widget_set_sensitive(buttond,FALSE);
 
-      g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),(gpointer)param->widgets[0]);
+      if (GTK_IS_ENTRY(param->widgets[0])) {
+	lives_entry_set_editable(LIVES_ENTRY(param->widgets[0]),FALSE);
+	if (param->widgets[1]!=NULL&&
+	    GTK_IS_LABEL(param->widgets[1])&&
+	    gtk_label_get_mnemonic_widget(GTK_LABEL(param->widgets[1]))!=NULL) 
+	  gtk_label_set_mnemonic_widget (GTK_LABEL(param->widgets[1]),buttond);
+	gtk_entry_set_max_length(GTK_ENTRY (param->widgets[0]),PATH_MAX);
+      }
     }
 
     slist=slist->next;
@@ -340,37 +321,26 @@
 
   slist=passwd_widgets;
   while (slist!=NULL) {
-    if (num==GPOINTER_TO_INT(slist->data)) {
-      box=(GTK_WIDGET(param->widgets[0])->parent);
+    if (param==(lives_param_t *)(slist->data)) {
+      if (param->widgets[0]==NULL) continue;
+
+      box=lives_widget_get_parent(param->widgets[0]);
 
-      while (!GTK_IS_VBOX(box)) {
-	box=box->parent;
+      param->special_type=LIVES_PARAM_SPECIAL_TYPE_PASSWORD;
+
+      while (!LIVES_IS_VBOX(box)) {
+	box=lives_widget_get_parent(box);
 	if (box==NULL) continue;
       }
 
-      hbox = gtk_hbox_new (FALSE, 10);
-      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (box)), hbox, FALSE, FALSE, 10);
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (box)), hbox, FALSE, FALSE, widget_opts.packing_height);
       
-      eventbox=gtk_event_box_new();
-      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (hbox)), eventbox, FALSE, FALSE, 10);
-      label=gtk_label_new (_("Display Password"));
+      checkbutton = lives_standard_check_button_new (_("Display Password"),FALSE,LIVES_BOX(hbox),NULL);
 
-      checkbutton = gtk_check_button_new ();
-      gtk_box_pack_start (GTK_BOX (GTK_WIDGET (hbox)), checkbutton, FALSE, FALSE, 10);
       gtk_button_set_focus_on_click (GTK_BUTTON(checkbutton),FALSE);
 
-      gtk_container_add(GTK_CONTAINER(eventbox),label);
-      g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-			G_CALLBACK (label_act_toggle),
-			checkbutton);
-
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-      }
-
-      if (!GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(param->widgets[0]))) gtk_widget_set_sensitive(checkbutton,FALSE);
+      if (!lives_widget_is_sensitive(param->widgets[0])) gtk_widget_set_sensitive(checkbutton,FALSE);
       gtk_widget_show_all(hbox);
 
       g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
@@ -389,11 +359,11 @@
 
 
 void after_aspect_width_changed (GtkSpinButton *spinbutton, gpointer user_data) {
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aspect.checkbutton))) {
-    gboolean keepeven=FALSE;
+  if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) {
+    boolean keepeven=FALSE;
     gint width=gtk_spin_button_get_value_as_int (spinbutton);
-    gint height=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.height_widget));
-    g_signal_handler_block (aspect.height_widget,aspect.height_func);
+    gint height=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.height_param->widgets[0]));
+    g_signal_handler_block (aspect.height_param->widgets[0],aspect.height_func);
 
     if (((cfile->hsize>>1)<<1)==cfile->hsize&&((cfile->vsize>>1)<<1)==cfile->vsize) {
       // try to keep even
@@ -411,19 +381,19 @@
       }
     }
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (aspect.height_widget), (gdouble)height);
-    g_signal_handler_unblock (aspect.height_widget,aspect.height_func);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (aspect.height_param->widgets[0]), (gdouble)height);
+    g_signal_handler_unblock (aspect.height_param->widgets[0],aspect.height_func);
   }
 }
 
 
 void after_aspect_height_changed (GtkToggleButton *spinbutton, gpointer user_data){
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aspect.checkbutton))) {
-    gboolean keepeven=FALSE;
+  if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) {
+    boolean keepeven=FALSE;
     gint height=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spinbutton));
-    gint width=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.width_widget));
+    gint width=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (aspect.width_param->widgets[0]));
 
-    g_signal_handler_block (aspect.width_widget,aspect.width_func);
+    g_signal_handler_block (aspect.width_param->widgets[0],aspect.width_func);
 
     if (((cfile->hsize>>1)<<1)==cfile->hsize&&((cfile->vsize>>1)<<1)==cfile->vsize) {
       // try to keep even
@@ -442,35 +412,24 @@
       }
     }
 
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (aspect.width_widget), (gdouble)width);
-    g_signal_handler_unblock (aspect.width_widget,aspect.width_func);
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (aspect.width_param->widgets[0]), (gdouble)width);
+    g_signal_handler_unblock (aspect.width_param->widgets[0],aspect.width_func);
   }
 }
 
 
 void special_cleanup (void) {
   // free some memory now
-  if (!(mainw->framedraw_copy_pixmap==NULL)) {
-    gdk_pixmap_unref (mainw->framedraw_copy_pixmap);
-    mainw->framedraw_copy_pixmap=NULL;
-  }
 
-  if (!(mainw->framedraw_bitmap==NULL)) {
-    gdk_pixmap_unref (mainw->framedraw_bitmap);
-    mainw->framedraw_bitmap=NULL;
-  }
+  mainw->framedraw=mainw->framedraw_reset=NULL;
+  mainw->framedraw_spinbutton=NULL;
 
-  if (!(mainw->framedraw_bitmapgc==NULL)) {
-    g_object_unref (mainw->framedraw_bitmapgc);
-    mainw->framedraw_bitmapgc=NULL;
-  }
 
-  if (mainw->framedraw_colourgc!=NULL) {
-    g_object_unref (mainw->framedraw_colourgc);
-    mainw->framedraw_colourgc=NULL;
-  }
-  mainw->framedraw_image=mainw->framedraw_reset=NULL;
-  mainw->framedraw_spinbutton=NULL;
+  if (mainw->fd_layer!=NULL) weed_layer_free(mainw->fd_layer);
+  mainw->fd_layer=NULL;
+
+  if (mainw->fd_layer_orig!=NULL) weed_layer_free(mainw->fd_layer_orig);
+  mainw->fd_layer_orig=NULL;
 
   mainw->framedraw_preview=NULL;
 
@@ -483,63 +442,75 @@
 }
 
 
+void set_aspect_ratio_widgets (lives_param_t *w, lives_param_t *h) {
+  aspect.width_param=w;
+  aspect.height_param=h;
+}
+
 
 void setmergealign (void) {
   lives_param_t *param;
   gint cb_frames=clipboard->frames;
 
-  // TODO - tidy
-
   if (prefs->ins_resample&&clipboard->fps!=cfile->fps) {
     cb_frames=count_resampled_frames(clipboard->frames,clipboard->fps,cfile->fps);
   }
 
-  if (cfile->end-cfile->start+1>(cb_frames*gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (merge_opts->spinbutton_loops)))&&!merge_opts->loop_to_fit) {
+  if (cfile->end-cfile->start+1>(cb_frames*((merge_opts!=NULL&&merge_opts->spinbutton_loops!=NULL)?
+					    gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (merge_opts->spinbutton_loops)):1))
+      &&!merge_opts->loop_to_fit) {
     // set special transalign widgets to their default values
-    if (mergealign.start_widget!=NULL&&GTK_IS_SPIN_BUTTON (mergealign.start_widget)&&(param=&(mergealign.rfx->params[mergealign.start_param]))->type==LIVES_PARAM_NUM) {
+    if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON
+	(mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
       if (param->dp) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.start_widget),get_double_param (param->def));
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
       }
       else {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.start_widget),(gdouble)get_int_param (param->def));
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param (param->def));
       }
     }
-    if (mergealign.end_widget!=NULL&&GTK_IS_SPIN_BUTTON (mergealign.end_widget)&&(param=&(mergealign.rfx->params[mergealign.end_param]))->type==LIVES_PARAM_NUM) {
+    if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
+	(mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
       if (param->dp) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.end_widget),get_double_param (param->def));
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
       }
       else {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.end_widget),(gdouble)get_int_param (param->def));
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param (param->def));
       }
     }
   }
   else {
     if (merge_opts->align_start) {
       // set special transalign widgets to min/max values
-      if (mergealign.start_widget!=NULL&&GTK_IS_SPIN_BUTTON (mergealign.start_widget)&&(param=&(mergealign.rfx->params[mergealign.start_param]))->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.start_widget),(gdouble)param->min);
+      if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
+	  (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->min);
       }
-      if (mergealign.end_widget!=NULL&&GTK_IS_SPIN_BUTTON (mergealign.end_widget)&&(param=&(mergealign.rfx->params[mergealign.end_param]))->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.end_widget),(gdouble)param->max);
+      if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
+	  (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->max);
       }
     }
     else {
       // set special transalign widgets to max/min values
-      if (mergealign.start_widget!=NULL&&GTK_IS_SPIN_BUTTON (mergealign.start_widget)&&(param=&(mergealign.rfx->params[mergealign.start_param]))->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.start_widget),(gdouble)param->max);
+      if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
+	  (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->max);
       }
-      if (mergealign.end_widget!=NULL&&GTK_IS_SPIN_BUTTON (mergealign.end_widget)&&(param=&(mergealign.rfx->params[mergealign.end_param]))->type==LIVES_PARAM_NUM) {
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (mergealign.end_widget),(gdouble)param->min);
+      if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&GTK_IS_SPIN_BUTTON 
+	  (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->min);
       }
     }
   }
 }
 
 
-gboolean mt_framedraw(lives_mt *mt, GdkPixbuf *pixbuf) {
+LiVESPixbuf *mt_framedraw(lives_mt *mt, LiVESPixbuf *pixbuf) {
   if (framedraw.added) {
     switch (framedraw.type) {
-    case FD_RECT_MULTRECT:
+    case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT:
+    case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
       if (mt->track_index==-1) {
 	// TODO - hide widgets
       }
@@ -547,16 +518,25 @@
 	//
       }
       break;
+
+    default:
+      break;
+
     }
 
     framedraw_redraw(&framedraw,TRUE,pixbuf);
-    return TRUE;
+    pixbuf=layer_to_pixbuf(mainw->fd_layer);
+
+    weed_plant_free(mainw->fd_layer);
+    mainw->fd_layer=NULL;
+
+    return pixbuf;
   }
-  return FALSE;
+  return pixbuf;
 }
 
 
-gboolean is_perchannel_multi(lives_rfx_t *rfx, gint i) {
+boolean is_perchannel_multi(lives_rfx_t *rfx, int i) {
   // updated for weed spec 1.1
   if (rfx->params[i].multi==PVAL_MULTI_PER_CHANNEL) return TRUE;
   return FALSE;

LiVES-1.6.1.tar.bz2/src/paramspecial.h -> LiVES-2.0.3.tar.bz2/src/paramspecial.h Changed

@@ -1,6 +1,6 @@
 // paramspecial.h
 // LiVES
-// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -8,55 +8,49 @@
 // dynamic window generation from parameter arrays :-)
 // special widgets
 
-// TODO - refactor all of this using lives_param_special_t
-
-typedef struct {
-  gint height_param;
-  gint width_param;
-  GtkWidget *height_widget;
-  GtkWidget *width_widget;
-  GtkWidget *checkbutton;
-  gulong width_func;
-  gulong height_func;
-} lives_special_aspect_t;
+// TODO - refactor all of this using lives_special_t, use a union
 
+#ifndef HAS_LIVES_PARAMSPECIAL_H
+#define HAS_LIVES_PARAMSPECIAL_H
 
 typedef struct {
   lives_rfx_t *rfx;
-  gboolean added;
-  gint type;
-  gint xstart_param;
-  gint ystart_param;
-  gint xend_param;
-  gint yend_param;
-  gint *extra_params;
-  gint num_extra;
-  GtkWidget *xstart_widget;
-  GtkWidget *ystart_widget;
-  GtkWidget *xend_widget;
-  GtkWidget *yend_widget;
-  GtkWidget **extra_widgets;
+  boolean added;
+  lives_param_special_t type;
+  lives_param_t *xstart_param;
+  lives_param_t *ystart_param;
+  lives_param_t *xend_param;
+  lives_param_t *yend_param;
+
+  int stdwidgets; // 2 for singlepoint, 4 for demask, multrect
+  int *extra_params;
+  int num_extra;
+  LiVESWidget **extra_widgets;
 } lives_special_framedraw_rect_t;
 
-#define FD_NONE 0
-#define FD_RECT_DEMASK 1
-#define FD_RECT_MULTRECT 2
-#define FD_SINGLEPOINT 3
+
+
+typedef struct {
+  lives_param_t *height_param;
+  lives_param_t *width_param;
+  LiVESWidget *checkbutton;
+  gulong width_func;
+  gulong height_func;
+} lives_special_aspect_t;
+
 
 typedef struct {
   lives_rfx_t *rfx;
-  gint start_param;
-  gint end_param;
-  GtkWidget *start_widget;
-  GtkWidget *end_widget;
+  lives_param_t *start_param;
+  lives_param_t *end_param;
 } lives_special_mergealign_t;
 ////////////////////////////////
 
 void init_special (void);
 
-gint add_to_special (const gchar *special_string, lives_rfx_t *);
+void add_to_special (const gchar *special_string, lives_rfx_t *);
 
-void check_for_special (lives_param_t *, gint num, GtkBox *, lives_rfx_t *);
+void check_for_special (lives_rfx_t *, lives_param_t *param, GtkBox *);
 
 void fd_connect_spinbutton(lives_rfx_t *);
 
@@ -68,11 +62,15 @@
 
 void special_cleanup (void);
 
-lives_special_mergealign_t mergealign;
 void setmergealign (void);
 
-gboolean is_perchannel_multi(lives_rfx_t *rfx, gint i);
+void set_aspect_ratio_widgets (lives_param_t *w, lives_param_t *h);
+
+boolean is_perchannel_multi(lives_rfx_t *rfx, int pnum);
+
+
+lives_special_mergealign_t mergealign;
+
 
-#include "framedraw.h"
+#endif
 
-#define RFX_EXTRA_WIDTH 200 /* extra width in pixels for framedraw */

LiVES-1.6.1.tar.bz2/src/paramwindow.c -> LiVES-2.0.3.tar.bz2/src/paramwindow.c Changed

@@ -1,6 +1,6 @@
 // paramwindow.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -38,9 +38,13 @@
 #include "giw/giwknob.h"
 #endif
 
-extern gboolean do_effect (lives_rfx_t *, gboolean is_preview); //effects.c in LiVES
+extern boolean do_effect (lives_rfx_t *, boolean is_preview); //effects.c in LiVES
 extern void on_realfx_activate (GtkMenuItem *, gpointer rfx); // effects.c in LiVES
 
+
+static void after_param_text_buffer_changed (GtkTextBuffer *textbuffer, lives_rfx_t *rfx);
+
+
 GtkWidget *fx_dialog[2];
 
 // TODO -
@@ -48,13 +52,15 @@
 // right now this is single threaded because of this
 static GSList *usrgrp_to_livesgrp[2]={NULL,NULL}; // ordered list of lives_widget_group_t
 
-static void do_onchange_init(lives_rfx_t *rfx) {
+GList *do_onchange_init(lives_rfx_t *rfx) {
   GList *onchange=NULL;
+  GList *retvals=NULL;
   gchar **array;
   gchar *type;
-  int i;
 
-  if (rfx->status==RFX_STATUS_WEED) return;
+  register int i;
+
+  if (rfx->status==RFX_STATUS_WEED) return NULL;
 
   switch (rfx->status) {
   case RFX_STATUS_BUILTIN:
@@ -75,8 +81,10 @@
 	// create dummy object with data
 	GtkWidget *dummy_widget=gtk_label_new(NULL);
 	g_object_set_data (G_OBJECT (dummy_widget),"param_number",GINT_TO_POINTER (-1));
-	do_onchange (G_OBJECT (dummy_widget),rfx);
+	retvals=do_onchange (G_OBJECT (dummy_widget),rfx);
 	gtk_widget_destroy (dummy_widget);
+	g_strfreev (array);
+	break;
       }
       g_strfreev (array);
     }
@@ -84,6 +92,8 @@
     g_list_free (onchange);
   }
   g_free (type);
+
+  return retvals;
 }
 
 
@@ -106,9 +116,32 @@
     }
 
     if (!mainw->keep_pre) {
-      gchar *com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+      gchar *com;
+#ifndef IS_MINGW
+      com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE); // try to stop any current previews / processing
+#else
+      // get pid from backend
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+      int pid;
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+      
+      lives_win32_kill_subprocesses(pid,TRUE);
+#endif
       g_free(com);
+      
+      if (cfile->start==0) {
+	cfile->start=1;
+	cfile->end=cfile->frames;
+      }
+
       do_rfx_cleanup(rfx);
     }
     mainw->did_rfx_preview=FALSE;
@@ -116,7 +149,7 @@
   }
 
   if (button!=NULL) {
-    gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+    lives_general_button_clicked(button,NULL);
   }
 
   if (usrgrp_to_livesgrp[0]!=NULL) g_slist_free (usrgrp_to_livesgrp[0]);
@@ -160,11 +193,34 @@
 void on_paramwindow_cancel_clicked (GtkButton *button, lives_rfx_t *rfx) {
   mainw->block_param_updates=TRUE;
   if (mainw->did_rfx_preview) {
-    gchar *com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+    gchar *com;
+#ifndef IS_MINGW
+    com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
     lives_system(com,TRUE); // try to stop processing
+#else
+    // get pid from backend
+    FILE *rfile;
+    ssize_t rlen;
+    char val[16];
+    int pid;
+    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    rfile=popen(com,"r");
+    rlen=fread(val,1,16,rfile);
+    pclose(rfile);
+    memset(val+rlen,0,1);
+    pid=atoi(val);
+    
+    lives_win32_kill_subprocesses(pid,TRUE);
+#endif
     g_free(com);
     mainw->did_rfx_preview=FALSE;
     mainw->show_procd=TRUE;
+
+    if (cfile->start==0) {
+      cfile->start=1;
+      cfile->end=cfile->frames;
+    }
+
     do_rfx_cleanup(rfx);
   }
 
@@ -179,7 +235,7 @@
   }
 
   if (button!=NULL) {
-    gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+    lives_general_button_clicked(button,NULL);
   }
   if (rfx==NULL) {
     if (usrgrp_to_livesgrp[1]!=NULL) g_slist_free (usrgrp_to_livesgrp[1]);
@@ -204,8 +260,12 @@
 
 }
 
-
+/**
+   get a (radiobutton) list from an index 
+*/
 static lives_widget_group_t *get_group(lives_rfx_t *rfx, lives_param_t *param) {
+
+
   if (rfx->status==RFX_STATUS_WEED) {
     return livesgrp_from_usrgrp (usrgrp_to_livesgrp[1], param->group);
   }
@@ -217,7 +277,7 @@
 
 
 void on_render_fx_activate (GtkMenuItem *menuitem, lives_rfx_t *rfx) {
-  gboolean has_lmap_error=FALSE;
+  boolean has_lmap_error=FALSE;
 
   if (menuitem!=NULL&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&rfx->num_in_channels>0&&
       (mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
@@ -237,7 +297,11 @@
 
   // do onchange|init
   if (menuitem!=NULL) {
-    do_onchange_init(rfx);
+    GList *retvals=do_onchange_init(rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
   }
   if (rfx->min_frames>-1) {
     do_effect(rfx,FALSE);
@@ -291,16 +355,32 @@
 
 
 
-static void trans_in_out_pressed(lives_rfx_t *rfx, gboolean in) {
-  int error;
+static void trans_in_out_pressed(lives_rfx_t *rfx, boolean in) {
+  weed_plant_t **in_params;
+
   weed_plant_t *inst=(weed_plant_t *)rfx->source;
-  weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
-  int trans=get_transition_param(filter);
-  weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-  weed_plant_t *tparam=in_params[trans];
-  weed_plant_t *tparamtmpl=weed_get_plantptr_value(tparam,"template",&error);
-  int hint=weed_get_int_value(tparamtmpl,"hint",&error);
+  weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
+  weed_plant_t *tparam;
+  weed_plant_t *tparamtmpl;
+
+  int hint,error,nparams;
+  int trans=get_transition_param(filter,FALSE);
+
+  do {
+    // handle compound fx
+    if (weed_plant_has_leaf(inst,"in_parameters")) {
+      nparams=weed_leaf_num_elements(inst,"in_parameters");
+      if (trans<nparams) break;
+      trans-=nparams;
+    }
+  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 
+  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+  tparam=in_params[trans];
+  tparamtmpl=weed_get_plantptr_value(tparam,"template",&error);
+  hint=weed_get_int_value(tparamtmpl,"hint",&error);
+
+  pthread_mutex_lock(&mainw->data_mutex);
   if (hint==WEED_HINT_INTEGER) {
     if (in) weed_set_int_value(tparam,"value",weed_get_int_value(tparamtmpl,"min",&error));
     else weed_set_int_value(tparam,"value",weed_get_int_value(tparamtmpl,"max",&error));
@@ -309,6 +389,8 @@
     if (in) weed_set_double_value(tparam,"value",weed_get_double_value(tparamtmpl,"min",&error));
     else weed_set_double_value(tparam,"value",weed_get_double_value(tparamtmpl,"max",&error));
   }
+  pthread_mutex_unlock(&mainw->data_mutex);
+  set_copy_to(inst,trans,TRUE);
   update_visual_params(rfx,FALSE);
   weed_free(in_params);
 }
@@ -325,7 +407,7 @@
 static void after_transaudio_toggled(GtkToggleButton *togglebutton, gpointer rfx) {
   weed_plant_t *init_event=mainw->multitrack->init_event;
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(togglebutton))) 
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(togglebutton))) 
     weed_set_boolean_value(init_event,"host_audio_transition",WEED_TRUE);
   else weed_set_boolean_value(init_event,"host_audio_transition",WEED_FALSE);
 
@@ -338,42 +420,22 @@
 
 
 
-void transition_add_in_out(GtkBox *vbox, lives_rfx_t *rfx, gboolean add_audio_check) {
+void transition_add_in_out(GtkBox *vbox, lives_rfx_t *rfx, boolean add_audio_check) {
   // add in/out radios for multitrack transitions
   GtkWidget *radiobutton_in;
   GtkWidget *radiobutton_out;
   GtkWidget *hbox,*hbox2;
-  GtkWidget *label;
-  GtkWidget *eventbox;
   GtkWidget *hseparator;
   GSList *radiobutton_group = NULL;
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
+  gchar *tmp,*tmp2;
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
+
+  radiobutton_in=lives_standard_radio_button_new(_ ("Transition _In"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_in));
 
-  radiobutton_in=gtk_radio_button_new(NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_in), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_in));
-
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton_in, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Transition _In"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton_in);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Transition in"));
-  gtk_tooltips_copy(radiobutton_in,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton_in);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  
   g_signal_connect_after (GTK_OBJECT (radiobutton_in), "toggled",
 			  G_CALLBACK (transition_in_pressed),
 			  (gpointer)rfx);
@@ -382,38 +444,24 @@
 
   if (add_audio_check) {
     int error;
-    weed_plant_t *filter=weed_get_plantptr_value((weed_plant_t *)rfx->source,"filter_class",&error);
-    GtkWidget *checkbutton = gtk_check_button_new ();
+    weed_plant_t *filter=weed_instance_get_filter((weed_plant_t *)rfx->source,FALSE);
 
-    if (weed_plant_has_leaf(mainw->multitrack->init_event,"host_audio_transition")&&
-	weed_get_boolean_value(mainw->multitrack->init_event,"host_audio_transition",&error)==WEED_FALSE) 
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),FALSE);
-    else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
+    GtkWidget *checkbutton;
 
-    gtk_widget_set_tooltip_text( checkbutton, _("Check the box to make audio transition with the video"));
-    eventbox=gtk_event_box_new();
-    gtk_tooltips_copy(eventbox,checkbutton);
-    label=gtk_label_new_with_mnemonic (_("Crossfade audio"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      checkbutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-    hbox2 = gtk_hbox_new (FALSE, 0);
+    hbox2 = lives_hbox_new (FALSE, 0);
 
     if (has_video_chans_in(filter,FALSE)) 
-      gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
-    gtk_box_pack_start (GTK_BOX (hbox2), checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Crossfade audio"))),FALSE,LIVES_BOX(hbox2),
+						   (tmp2=g_strdup(_("Check the box to make audio transition with the video"))));
+
+    g_free(tmp); g_free(tmp2);
+
+    if (weed_plant_has_leaf(mainw->multitrack->init_event,"host_audio_transition")&&
+	weed_get_boolean_value(mainw->multitrack->init_event,"host_audio_transition",&error)==WEED_FALSE) 
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
+    else lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), TRUE);
 
     g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			    G_CALLBACK (after_transaudio_toggled),
@@ -423,36 +471,19 @@
     
   }
 
-  radiobutton_out=gtk_radio_button_new(radiobutton_group);
-
-  gtk_box_pack_end (GTK_BOX (hbox), radiobutton_out, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Transition _Out"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton_out);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Transition out"));
-  gtk_tooltips_copy(radiobutton_out,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton_out);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_end (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  widget_opts.pack_end=TRUE;
+  radiobutton_out=lives_standard_radio_button_new(_ ("Transition _Out"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  widget_opts.pack_end=FALSE;
   
   g_signal_connect_after (GTK_OBJECT (radiobutton_out), "toggled",
 			  G_CALLBACK (transition_out_pressed),
 			  (gpointer)rfx);
   
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(hbox, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  hseparator = gtk_hseparator_new ();
+  hseparator = lives_hseparator_new ();
   gtk_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
 
 }
@@ -462,51 +493,52 @@
 
 
 
-static gboolean add_sizes(GtkBox *vbox, gboolean add_fps, lives_rfx_t *rfx) {
+static boolean add_sizes(GtkBox *vbox, boolean add_fps, lives_rfx_t *rfx) {
   // add size settings for generators and resize effects
-  int i,error;
-  weed_plant_t *filter=weed_get_plantptr_value((weed_plant_t *)rfx->source,"filter_class",&error);
-  int num_chans=weed_leaf_num_elements(filter,"out_channel_templates");
-  weed_plant_t **ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error),*tmpl;
-  gchar *cname,*ltxt;
-  GtkWidget *label,*hbox,*hseparator;
+  static lives_param_t aspect_width,aspect_height;
+
+  GtkWidget *label,*hbox;
   GtkWidget *spinbuttonh=NULL,*spinbuttonw=NULL;
   GtkWidget *spinbuttonf;
-  GObject *spinbutton_adj;
+
+  int error;
+
+  weed_plant_t *filter=weed_instance_get_filter((weed_plant_t *)rfx->source,TRUE),*tmpl;
+
+  weed_plant_t **ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+
+  double def_fps=0.;
+
+  gchar *cname,*ltxt;
+
+  boolean added=add_fps;
+  boolean chk_params=(vbox==NULL);
+
+  int num_chans=weed_leaf_num_elements(filter,"out_channel_templates");
+
   int def_width=0,max_width,width_step;
   int def_height=0,max_height,height_step;
 
-  gdouble def_fps=0.;
-
-  gboolean added=add_fps;
-  gboolean chk_params=(vbox==NULL);
+  register int i;
 
   // add fps
 
 
   if (add_fps) {
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 20);
+
+    add_hsep_to_box(vbox);
+
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
     
     add_fill_to_box(GTK_BOX(hbox));
     
-    label=gtk_label_new_with_mnemonic(_("Target _FPS (plugin may override this)"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    
     if (weed_plant_has_leaf(filter,"host_fps")) def_fps=weed_get_double_value(filter,"host_fps",&error);
     else if (weed_plant_has_leaf(filter,"target_fps")) def_fps=weed_get_double_value(filter,"target_fps",&error);
     
     if (def_fps==0.) def_fps=prefs->default_fps;
-    
-    spinbutton_adj = (GObject *)gtk_adjustment_new (def_fps, 1., FPS_MAX, 1., 10., 0.);
-    spinbuttonf = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1., 3);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbuttonf)->entry)), TRUE);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),spinbuttonf);
-    gtk_box_pack_start (GTK_BOX (hbox), spinbuttonf, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spinbuttonf),GTK_UPDATE_IF_VALID);
+
+    spinbuttonf = lives_standard_spin_button_new (_("Target _FPS (plugin may override this)"),TRUE,def_fps,1.,FPS_MAX,1.,10.,3,LIVES_BOX(hbox),NULL);
     
     g_signal_connect_after (GTK_OBJECT (spinbuttonf), "value_changed",
 			    G_CALLBACK (gen_fps_changed),
@@ -514,12 +546,12 @@
     
     add_fill_to_box(GTK_BOX(hbox));
   }
-
-
   
   for (i=0;i<num_chans;i++) {
     tmpl=ctmpls[i];
-    if (weed_plant_has_leaf(tmpl,"disabled")&&weed_get_boolean_value(tmpl,"disabled",&error)==WEED_TRUE) continue;
+
+    // TODO *** - "host_disabled" should be for inst, not template !
+    if (weed_plant_has_leaf(tmpl,"host_disabled")&&weed_get_boolean_value(tmpl,"host_disabled",&error)==WEED_TRUE) continue;
     if (weed_plant_has_leaf(tmpl,"width")&&weed_get_int_value(tmpl,"width",&error)!=0) continue;
     if (weed_plant_has_leaf(tmpl,"height")&&weed_get_int_value(tmpl,"height",&error)!=0) continue;
    
@@ -536,20 +568,13 @@
       ltxt=g_strdup(_("New size (pixels)"));
     }
 
-    label=gtk_label_new(ltxt);
+    label=lives_standard_label_new(ltxt);
     g_free(ltxt);
 
-    gtk_box_pack_start (vbox, label, FALSE, FALSE, 10);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-    label=gtk_label_new_with_mnemonic(_("_Width"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+
 
     if (weed_plant_has_leaf(tmpl,"host_width")) def_width=weed_get_int_value(tmpl,"host_width",&error);
     if (def_width==0) def_width=DEF_GEN_WIDTH;
@@ -559,13 +584,9 @@
     width_step=1;
     if (weed_plant_has_leaf(tmpl,"hstep")) width_step=weed_get_int_value(tmpl,"hstep",&error);
 
-    spinbutton_adj = (GObject *)gtk_adjustment_new (def_width, 1., max_width, width_step==1?4:width_step, 
-					 width_step==1?16:width_step*4, 0.);
-    spinbuttonw = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), width_step, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbuttonw)->entry)), TRUE);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),spinbuttonw);
-    gtk_box_pack_start (GTK_BOX (hbox), spinbuttonw, FALSE, FALSE, 10);
-    gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spinbuttonw),GTK_UPDATE_IF_VALID);
+    spinbuttonw = lives_standard_spin_button_new (_("_Width"),TRUE,def_width,4.,max_width,width_step==1?4:width_step,
+						  width_step==1?16:width_step*4,0,
+						  LIVES_BOX(hbox),NULL);
 
     g_signal_connect_after (GTK_OBJECT (spinbuttonw), "value_changed",
 			    G_CALLBACK (gen_width_changed),
@@ -573,11 +594,6 @@
     weed_leaf_delete(tmpl,"host_width"); // force a reset
     gen_width_changed(GTK_SPIN_BUTTON(spinbuttonw),tmpl);
 
-    label=gtk_label_new_with_mnemonic(_("_Height"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
     if (weed_plant_has_leaf(tmpl,"host_height")) def_height=weed_get_int_value(tmpl,"host_height",&error);
     if (def_height==0) def_height=DEF_GEN_HEIGHT;
     max_height=INT_MAX;
@@ -586,14 +602,11 @@
     height_step=1;
     if (weed_plant_has_leaf(tmpl,"vstep")) height_step=weed_get_int_value(tmpl,"vstep",&error);
 
-    spinbutton_adj = (GObject *)gtk_adjustment_new (def_height, 1., max_height, height_step==1?4:height_step, 
-					 height_step==1?16:height_step*4, 0.);
-    spinbuttonh = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), height_step, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbuttonh)->entry)), TRUE);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),spinbuttonh);
-    gtk_box_pack_end (GTK_BOX (hbox), spinbuttonh, FALSE, FALSE, 10);
-    gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spinbuttonh),GTK_UPDATE_IF_VALID);
+
+    spinbuttonh = lives_standard_spin_button_new (_("_Height"),TRUE,def_height,4.,max_height,height_step==1?4:height_step,
+						  height_step==1?16:height_step*4,0,
+						  LIVES_BOX(hbox),NULL);
+
     g_signal_connect_after (GTK_OBJECT (spinbuttonh), "value_changed",
 			    G_CALLBACK (gen_height_changed),
 			    tmpl);
@@ -603,21 +616,19 @@
   }
 
 
-
   if (!chk_params) {
-    hseparator = gtk_hseparator_new ();
-    if (added) gtk_box_pack_start (vbox, hseparator, TRUE, TRUE, 0);
-    
     if (!rfx->is_template) {
-      lives_param_t param;
       // add "aspectratio" widget
       init_special();
-      add_to_special("aspect|-100|-101|",rfx); // use virtual parameter numbers -100 and -101
-      param.widgets[0]=spinbuttonw;
-      check_for_special (&param,-100,vbox,rfx);
-    param.widgets[0]=spinbuttonh;
-    check_for_special (&param,-101,vbox,rfx);
+
+      aspect_width.widgets[0]=spinbuttonw;
+      aspect_height.widgets[0]=spinbuttonh;
+
+      set_aspect_ratio_widgets(&aspect_width,&aspect_height);
+      check_for_special (rfx,&aspect_width,vbox);
+      check_for_special (rfx,&aspect_height,vbox);
     }
+
   }
 
   return added;
@@ -629,78 +640,42 @@
 
 static void add_gen_to(GtkBox *vbox, lives_rfx_t *rfx) {
   // add "generate to clipboard/new clip" for rendered generators
+  LiVESSList *radiobutton_group = NULL;
 
   GtkWidget *radiobutton;
-  GtkWidget *label;
-  GtkWidget *eventbox;
   GtkWidget *hseparator;
 
-  GSList *radiobutton_group = NULL;
+  GtkWidget *hbox = lives_hbox_new (FALSE, 0);
 
-  GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
-  
-  radiobutton = gtk_radio_button_new (NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
-
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
-
-  label=gtk_label_new_with_mnemonic (_ ("Generate to _Clipboard"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Generate frames to the clipboard"));
-  gtk_tooltips_copy(radiobutton,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  
-  radiobutton=gtk_radio_button_new(radiobutton_group);
+  gchar *tmp,*tmp2;
 
-  gtk_box_pack_end (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  
+  radiobutton = lives_standard_radio_button_new ((tmp=g_strdup(_ ("Generate to _Clipboard"))),
+						 TRUE,radiobutton_group,LIVES_BOX(hbox),
+						 (tmp2=g_strdup(_("Generate frames to the clipboard"))));
 
-  label=gtk_label_new_with_mnemonic (_ ("Generate to _New Clip"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
+  g_free(tmp); g_free(tmp2);
 
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Generate frames to a new clip"));
-  gtk_tooltips_copy(radiobutton,eventbox);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_end (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(hbox, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  widget_opts.pack_end=TRUE;
+  radiobutton=lives_standard_radio_button_new((tmp=g_strdup(_("Generate to _New Clip"))),
+					      TRUE,radiobutton_group,LIVES_BOX(hbox),
+					      (tmp2=g_strdup(_("Generate frames to a new clip"))));
+  widget_opts.pack_end=FALSE;
 
-  hseparator = gtk_hseparator_new ();
+  g_free(tmp); g_free(tmp2);
+
+  hseparator = lives_hseparator_new ();
   gtk_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton), !mainw->gen_to_clipboard);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton), !mainw->gen_to_clipboard);
 
   g_signal_connect_after (GTK_OBJECT (radiobutton), "toggled",
 			  G_CALLBACK (gen_cb_toggled),
 			  (gpointer)rfx);
 
-
-
-
-
 }
 
 
@@ -713,19 +688,23 @@
   GtkWidget *okbutton;
   GtkWidget *resetbutton=NULL;
   GtkWidget *pbox;
+
   GtkAccelGroup *fxw_accel_group;
 
+  GList *retvals=NULL;
+
   gchar *txt;
-  gboolean no_process=FALSE;
 
-  gboolean is_realtime=FALSE;
-  gboolean is_defaults=FALSE;
+  boolean no_process=FALSE;
+
+  boolean is_realtime=FALSE;
+  boolean is_defaults=FALSE;
 
   int n=0;
 
-  gboolean has_lmap_error=FALSE;
+  boolean has_lmap_error=FALSE;
 
-  gboolean has_param;
+  boolean has_param;
 
   if (!check_storage_space((mainw->current_file>-1)?cfile:NULL,FALSE)) return;
 
@@ -737,15 +716,9 @@
       if (!do_layout_alter_frames_warning()) {
 	g_list_free_strings(mainw->xlays);
 	g_list_free(mainw->xlays);
+	
 	mainw->xlays=NULL;
-	return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_frame>0);
-      has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
-      mainw->xlays=NULL;
     }
   }
 
@@ -763,7 +736,7 @@
     n=1;
   }
   else if (rfx->status!=RFX_STATUS_WEED) {
-    do_onchange_init(rfx);
+    retvals=do_onchange_init(rfx);
   }
 
   if (rfx->min_frames<0) no_process=TRUE;
@@ -780,6 +753,11 @@
 	mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
       }
 
+      if (retvals!=NULL) {
+	g_list_free_strings (retvals);
+	g_list_free (retvals);
+      }
+
       return;
     }
     
@@ -793,8 +771,18 @@
 
   if (!no_process&&rfx->num_in_channels>0) {
     // check we have a real clip open
-    if (mainw->current_file<=0) return;
+    if (mainw->current_file<=0) {
+      if (retvals!=NULL) {
+	g_list_free_strings (retvals);
+	g_list_free (retvals);
+      }
+      return;
+    }
     if (cfile->end-cfile->start+1<rfx->min_frames) {
+      if (retvals!=NULL) {
+	g_list_free_strings (retvals);
+	g_list_free (retvals);
+      }
       txt=g_strdup_printf (_("\nYou must select at least %d frames to use this effect.\n\n"),rfx->min_frames);
       do_blocking_error_dialog (txt);
       g_free (txt);
@@ -810,45 +798,46 @@
     }
   }
 
-  fx_dialog[n] = gtk_dialog_new ();
+
   txt=g_strdup_printf ("LiVES: - %s",_(rfx->menu_text));
-  gtk_window_set_title (GTK_WINDOW (fx_dialog[n]), txt);
+  if (menuitem==NULL) widget_opts.non_modal=TRUE;
+  fx_dialog[n] = lives_standard_dialog_new (txt,FALSE);
+  if (menuitem==NULL) widget_opts.non_modal=FALSE;
   g_free (txt);
 
-  if (prefs->gui_monitor!=0) {
-    gtk_window_set_screen(GTK_WINDOW(fx_dialog[n]),mainw->mgeom[prefs->gui_monitor-1].screen);
-  }
-
   if (rfx->status==RFX_STATUS_WEED&&rfx->is_template) is_defaults=TRUE;
 
-  gtk_container_set_border_width (GTK_CONTAINER (fx_dialog[n]), 20);
-  gtk_window_set_position (GTK_WINDOW (fx_dialog[n]), GTK_WIN_POS_CENTER_ALWAYS);
-
   if (menuitem!=NULL) {
     // activated from the menu for a rendered effect
     if (prefs->show_gui) {
       if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(fx_dialog[n]),GTK_WINDOW(mainw->LiVES));
       else gtk_window_set_transient_for(GTK_WINDOW(fx_dialog[n]),GTK_WINDOW(mainw->multitrack->window));
     }
-    gtk_window_set_modal (GTK_WINDOW (fx_dialog[n]), TRUE);
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(fx_dialog[n], GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(fx_dialog[n]),FALSE);
-  }
+  pbox = top_dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[n]));
+
+  lives_widget_set_hexpand(pbox,TRUE);
+  lives_widget_set_vexpand(pbox,TRUE);
 
-  pbox = top_dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(fx_dialog[n]));
 
   g_object_set_data(G_OBJECT(fx_dialog[n]),"rfx",rfx);
 
   if (rfx->status!=RFX_STATUS_WEED&&!no_process) {
     // rendered fx preview
 
-    GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+    GtkWidget *hbox = lives_hbox_new (FALSE, 0);
     gtk_box_pack_start (GTK_BOX (top_dialog_vbox), hbox, FALSE, FALSE, 0);
-    pbox = gtk_vbox_new (FALSE, 0);
+
+    lives_widget_set_hexpand(hbox,TRUE);
+    lives_widget_set_vexpand(hbox,TRUE);
+
+
+    pbox = lives_vbox_new (FALSE, 0);
     gtk_box_pack_start (GTK_BOX (hbox), pbox, FALSE, FALSE, 0);
+
+    lives_widget_set_hexpand(pbox,TRUE);
+    lives_widget_set_vexpand(pbox,TRUE);
     
     // add preview window
     if (rfx->num_in_channels>0) {
@@ -871,21 +860,22 @@
 
   has_param=make_param_box(GTK_VBOX (pbox), rfx);
 
-  dialog_action_area = GTK_DIALOG (fx_dialog[n])->action_area;
-  gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area), 80);
-  gtk_box_set_spacing (GTK_BOX (dialog_action_area),10);
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (dialog_action_area), DEF_BUTTON_WIDTH, -1);
+  // update widgets from onchange_init here
+
+
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
     
   fxw_accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (fx_dialog[n]), fxw_accel_group);
 
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (fx_dialog[n]));
+
   if (!no_process||is_defaults||rfx->status==RFX_STATUS_SCRAP) {
     gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
     gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), cancelbutton, GTK_RESPONSE_CANCEL);
     gtk_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group,
-				GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+				LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
     if (is_defaults) {
       okbutton = gtk_button_new_with_mnemonic (_("Set as default"));
@@ -901,6 +891,9 @@
     okbutton = gtk_button_new_with_mnemonic (_("Set as default"));
     if (!has_param) gtk_widget_set_sensitive(okbutton,FALSE);
     cancelbutton = gtk_button_new_with_mnemonic (_("Close _window"));
+    if (no_process) {
+      set_button_width(dialog_action_area,okbutton,DEF_BUTTON_WIDTH);
+    }
     if (rfx->status==RFX_STATUS_WEED) {
       resetbutton = gtk_button_new_with_mnemonic (_("Reset"));
       gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), resetbutton, LIVES_RESET);
@@ -908,14 +901,14 @@
     }
     gtk_dialog_add_action_widget (GTK_DIALOG (fx_dialog[n]), cancelbutton, GTK_RESPONSE_CANCEL);
     gtk_widget_add_accelerator (cancelbutton, "activate", fxw_accel_group,
-				GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+				LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   }
 
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus (cancelbutton,TRUE);
 
-  if (okbutton->parent!=NULL) {
-    GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  if (lives_widget_get_parent(okbutton)!=NULL) {
+    lives_widget_set_can_focus_and_default (okbutton);
     gtk_widget_grab_default (okbutton);
   }
 
@@ -923,7 +916,7 @@
 
   if (no_process&&!is_defaults) {
     if (!is_realtime) {
-      if (okbutton->parent!=NULL)
+      if (lives_widget_get_parent(okbutton)!=NULL)
 	g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 			  G_CALLBACK (on_paramwindow_cancel_clicked),
 			  rfx);
@@ -989,13 +982,17 @@
 			rfx);
     }
   }
-  g_signal_connect (GTK_OBJECT (fx_dialog[n]), "delete_event",
-                      G_CALLBACK (return_true),
-                      NULL);
 
   // tweak some things to do with framedraw preview
   if (mainw->framedraw!=NULL) fd_tweak(rfx);
 
+  if (retvals!=NULL) {
+    // now apply visually anything we got from onchange_init
+    param_demarshall (rfx,retvals,TRUE,TRUE);
+    g_list_free_strings (retvals);
+    g_list_free (retvals);
+  }
+
 
 }
 
@@ -1004,7 +1001,7 @@
   int error;
   weed_plant_t *wtmpl,*gui;
 
-  if (param->reinit&&(weed_get_int_value(inst,"refs",&error)==2||
+  if (param->reinit&&(weed_get_int_value(inst,"host_refs",&error)==2||
 		      (mainw->multitrack!=NULL&&mainw->multitrack->fx_box!=NULL&&
 		       mt_get_effect_time(mainw->multitrack)>0.))) {
     // effect is running and user is editing the params (or in multitrack at not at fx time 0.)
@@ -1026,40 +1023,58 @@
 }
 
 
+static int num_in_params_for_nth_instance(weed_plant_t *inst, int idx) {
+  // get number of params for nth instance in a compound effect - gives an offset for param number within the compound
 
-gboolean make_param_box(GtkVBox *top_vbox, lives_rfx_t *rfx) {
+  int error;
+  while (--idx>0) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+  return weed_leaf_num_elements(inst,"in_parameters");
+}
+
+
+
+
+boolean make_param_box(GtkVBox *top_vbox, lives_rfx_t *rfx) {
   // make a dynamic parameter window
 
   // returns TRUE if we added any parameters
+  lives_param_t *param=NULL;
 
   GtkWidget *param_vbox=NULL;
   GtkWidget *top_hbox=NULL;
   GtkWidget *hbox=NULL;
 
-  gchar **array;
-  gboolean used[rfx->num_params];
-  gboolean has_box=FALSE;
-  gchar *line;
-  gchar *type=NULL;
+  // put whole thing in scrolled window
+  GtkWidget *scrolledwindow;
+
   GList *hints=NULL;
   GList *onchange=NULL;
   GList *layout=NULL;
-  int i,j,k,pnum,error;
-  int length;
-  lives_param_t *param=NULL;
 
-  gint num_tok;
+  gchar **array;
   gchar label_text[256]; // max length of a label in layout hints
 
-  // put whole thing in scrolled window
-  GtkWidget *scrolledwindow;
+  gchar *line;
+  gchar *type=NULL;
+
+  boolean used[rfx->num_params];
+  boolean has_box=FALSE;
+  boolean internal=FALSE;
+  boolean noslid;
+  boolean has_param=FALSE;
+  boolean chk_params=FALSE;
+  boolean needs_sizes=FALSE;
+
+  int pnum;
+  int length;
+  int poffset=0,inum=0;
 
-  gboolean internal=FALSE;
-  gboolean noslid;
-  gboolean has_param=FALSE;
-  gboolean chk_params=FALSE;
+  int num_tok;
+
+  register int i,j,k;
 
   if (top_vbox==NULL) {
+    // just check how many non-hidden params without displaying
     chk_params=TRUE;
   }
   else {
@@ -1073,12 +1088,13 @@
 
     // paramwindow start, everything goes in top_hbox
     
-    top_hbox = gtk_hbox_new (FALSE, 10);
+    top_hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
     
     // param_vbox holds the dynamic parameters
-    param_vbox = gtk_vbox_new (FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (top_hbox), param_vbox, TRUE, TRUE, 10);
-    gtk_box_set_spacing (GTK_BOX (param_vbox), 5);
+    param_vbox = lives_vbox_new (FALSE, widget_opts.packing_height);
+
+    gtk_box_pack_start (GTK_BOX (top_hbox), param_vbox, TRUE, TRUE, widget_opts.packing_width);
+    lives_box_set_spacing (GTK_BOX (param_vbox), widget_opts.packing_height/2);
   }
 
   switch (rfx->status) {
@@ -1101,8 +1117,8 @@
   
   // extras for multitrack
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED&&!chk_params) {
-    weed_plant_t *filter=weed_get_plantptr_value((weed_plant_t *)rfx->source,"filter_class",&error);
-    if (enabled_in_channels(filter,FALSE)==2&&get_transition_param(filter)!=-1) {
+    weed_plant_t *filter=weed_instance_get_filter((weed_plant_t *)rfx->source,TRUE);
+    if (enabled_in_channels(filter,FALSE)==2&&get_transition_param(filter,FALSE)!=-1) {
       // add in/out for multitrack transition
       transition_add_in_out(GTK_BOX(param_vbox),rfx,(mainw->multitrack->opts.pertrack_audio));
       //trans_in_out_pressed(rfx,TRUE);
@@ -1145,10 +1161,14 @@
   if (hints!=NULL) {
     gchar *lstring=g_strconcat("layout",rfx->delim,NULL);
     gchar *sstring=g_strconcat("special",rfx->delim,NULL);
+    gchar *istring=g_strconcat("internal",rfx->delim,NULL);
     for (i=0;i<g_list_length (hints);i++) {
       if (!strncmp ((gchar *)g_list_nth_data (hints,i),lstring,7)) {
 	layout=g_list_append (layout,g_strdup((gchar *)g_list_nth_data (hints,i)+7));
       }
+      else if (!strncmp ((gchar *)g_list_nth_data (hints,i),istring,9)) {
+	layout=g_list_append (layout,g_strdup((gchar *)g_list_nth_data (hints,i)+9));
+      }
       else if (!strncmp ((gchar *)g_list_nth_data (hints,i),sstring,8)) {
 	add_to_special((gchar *)g_list_nth_data (hints,i)+8,rfx);
       }
@@ -1176,15 +1196,22 @@
     array=g_strsplit (line,rfx->delim,num_tok);
     if (!strlen(array[num_tok-1])) num_tok--;
     for (j=0;j<num_tok;j++) {
-      if (!strncmp (array[j],"p",1)&&(pnum=atoi ((gchar *)(array[j]+1)))>=0&&pnum<rfx->num_params&&!used[pnum]) {
+      if (!strcmp(array[j],"nextfilter")) {
+	// handling for compound fx - add an offset to the param number
+	poffset+=num_in_params_for_nth_instance((weed_plant_t *)rfx->source,inum);
+	inum++;
+	continue;
+      }
+
+      if (!strncmp (array[j],"p",1)&&(pnum=atoi ((gchar *)(array[j]+1)))>=0&&(pnum=pnum+poffset)<rfx->num_params&&!used[pnum]) {
 	param=&rfx->params[pnum];
 	if (rfx->source_type==LIVES_RFX_SOURCE_WEED) check_hidden_gui((weed_plant_t *)rfx->source,param);
 	if ((param->hidden&&param->hidden!=HIDDEN_NEEDS_REINIT)||
 	    param->type==LIVES_PARAM_UNDISPLAYABLE) continue;
 	// parameter, eg. p1
 	if (!has_box) {
-	  hbox = gtk_hbox_new (TRUE, 0);
-	  gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, 10);
+	  hbox = lives_hbox_new (FALSE, 0);
+	  gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 	  has_box=TRUE;
 	  has_param=TRUE;
 	}
@@ -1193,17 +1220,15 @@
 	has_param=TRUE;
       }
       else if (!j&&!strcmp (array[j],"hseparator")&&has_param) {
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, 10);
-	add_hsep_to_box (GTK_BOX (hbox));
+	add_hsep_to_box (LIVES_BOX (param_vbox));
 	j=num_tok;  // ignore anything after hseparator
       }
       else if (!strncmp (array[j],"fill",4)) {
 	// can be filln
 	if (strlen (array[j])==4||!(length=atoi (array[j]+4))) length=1;
 	if (!has_box) {
-	  hbox = gtk_hbox_new (FALSE, 0);
-	  gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, 10);
+	  hbox = lives_hbox_new (FALSE, 0);
+	  gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 	  has_box=TRUE;
 	}
 	for (k=0;k<length;k++) {
@@ -1213,8 +1238,8 @@
       else if (!strncmp (array[j],"\"",1)) {
 	// label
 	if (!has_box) {
-	  hbox = gtk_hbox_new (FALSE, 0);
-	  gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, 10);
+	  hbox = lives_hbox_new (FALSE, 0);
+	  gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 	  has_box=TRUE;
 	}
 	g_snprintf (label_text,256,"%s",array[j]+1);
@@ -1225,7 +1250,7 @@
 	  if (!strcmp (label_text+strlen (label_text)-1,"\"")) {
 	    memset (label_text+strlen (label_text)-1,0,1);
 	  }
-	  add_label_to_box (GTK_BOX (hbox),TRUE,label_text);
+	  add_param_label_to_box (GTK_BOX (hbox),TRUE,label_text);
 	}}}
     g_strfreev (array);
   }
@@ -1241,59 +1266,68 @@
     if ((rfx->params[i].hidden&&rfx->params[i].hidden!=HIDDEN_NEEDS_REINIT)||
 	rfx->params[i].type==LIVES_PARAM_UNDISPLAYABLE) continue;
     if (!used[i]) {
-      if (!chk_params) add_param_to_box (GTK_BOX (param_vbox),rfx,i,TRUE);
+      if (!chk_params) {
+	add_param_to_box (GTK_BOX (param_vbox),rfx,i,TRUE);
+      }
       has_param=TRUE;
     }
   }
 
+
+
+  if (mainw->multitrack==NULL&&rfx->status==RFX_STATUS_WEED&&rfx->is_template) {
+    weed_plant_t *filter=weed_instance_get_filter((weed_plant_t *)rfx->source,TRUE);
+    if (enabled_in_channels(filter,FALSE)==0&&enabled_out_channels(filter,FALSE)>0&&has_video_chans_out(filter,TRUE)) {
+      // out channel size(s) and target_fps for generators
+      if (!chk_params) {
+	needs_sizes=TRUE;
+	if (mainw->overflow_height<900) mainw->overflow_height=900;
+      }
+      has_param=TRUE;
+    }
+  }
+
+
   if (!chk_params) {
     if (!has_param) {
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, 20);
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
       add_fill_to_box(GTK_BOX(hbox));
-      add_label_to_box(GTK_BOX(hbox),FALSE,_("No parameters"));
+      add_param_label_to_box(GTK_BOX(hbox),FALSE,_("No parameters"));
       add_fill_to_box(GTK_BOX(hbox));
     }
     
-    scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-    gtk_widget_show (scrolledwindow);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    
-    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), top_hbox);
-    gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
-    if (mainw->multitrack==NULL||rfx->status!=RFX_STATUS_WEED) 
-      gtk_widget_set_size_request (scrolledwindow, RFX_WINSIZE_H, RFX_WINSIZE_V);
-    
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(gtk_bin_get_child (GTK_BIN (scrolledwindow)), GTK_STATE_NORMAL, &palette->normal_back);
+    if (mainw->multitrack==NULL||rfx->status!=RFX_STATUS_WEED) {
+      if (mainw->scr_height>=mainw->overflow_height)
+	scrolledwindow=lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V,top_hbox);
+      else 
+	scrolledwindow=lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V>>1,top_hbox);
     }
-    gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolledwindow))),GTK_SHADOW_IN);
-  }
+    else 
+      scrolledwindow=lives_standard_scrolled_window_new(-1,-1,top_hbox);
+
+    gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
 
-  if (mainw->multitrack==NULL&&rfx->status==RFX_STATUS_WEED&&rfx->is_template) {
-    weed_plant_t *filter=weed_get_plantptr_value((weed_plant_t *)rfx->source,"filter_class",&error);
-    if (enabled_in_channels(filter,FALSE)==0&&enabled_out_channels(filter,FALSE)>0) {
-      // out channel size(s) and target_fps for generators
-      if (!chk_params) add_sizes(GTK_BOX(top_vbox),TRUE,rfx);
-      has_param=TRUE;
-    }
   }
 
+  if (needs_sizes) add_sizes(GTK_BOX(top_vbox),TRUE,rfx);
+
   mainw->block_param_updates=FALSE;
+  mainw->overflow_height=0;
 
   return has_param;
 }
 
 
 
-#define GIW_KNOB_WIDTH 40
-#define GIW_KNOB_HEIGHT 40
+#define GIW_KNOB_WIDTH (40.*widget_opts.scale)
+#define GIW_KNOB_HEIGHT (40.*widget_opts.scale)
 
 
 
 
 
-gboolean add_param_to_box (GtkBox *box, lives_rfx_t *rfx, gint pnum, gboolean add_slider) {
+boolean add_param_to_box (GtkBox *box, lives_rfx_t *rfx, gint pnum, boolean add_slider) {
   // box here is vbox inside top_hbox inside top_dialog
 
   // add paramter pnum for rfx to box
@@ -1314,6 +1348,7 @@
   GtkWidget *dlabel=NULL;
   GtkWidget *textview=NULL;
   GtkWidget *scrolledwindow;
+
   GtkAdjustment *spinbutton_adj;
 
   GtkTextBuffer *textbuffer=NULL;
@@ -1321,18 +1356,21 @@
   lives_param_t *param;
   lives_widget_group_t *group;
   GSList *rbgroup;
-  gulong spinfunc,blockfunc;
-  gchar *name;
-  gchar *txt;
-  gboolean use_mnemonic;
 
   lives_colRGB24_t rgb;
   GdkColor colr;
+
+  gchar *name;
+  gchar *txt,*tmp,*tmp2;
   char *disp_string;
-  gboolean was_num=FALSE;
+
+  boolean use_mnemonic;
+  boolean was_num=FALSE;
+
+  int def_packing_width=widget_opts.packing_width;
 
   if (pnum>=rfx->num_params) {
-    add_label_to_box (box,FALSE,(_("Invalid parameter")));
+    add_param_label_to_box (box,FALSE,(_("Invalid parameter")));
     return FALSE;
   }
 
@@ -1340,29 +1378,34 @@
 
   name=g_strdup_printf ("%s",param->label);
   use_mnemonic=param->use_mnemonic;
+
+  // reinit can cause the window to be redrawn, which invalidates the slider adjustment...and bang !
+  // so dont add sliders for such params
+  if (param->reinit) add_slider=FALSE;
+
+  if (LIVES_IS_HBOX(LIVES_WIDGET(box))) {
+    hbox=GTK_WIDGET(box);
+  }
+  else {
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+  }
+
   switch (param->type) {
   case LIVES_PARAM_BOOL :
     if (!param->group) {
-
-      if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
-      else {
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
-      }
       
       if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-	dlabel=gtk_label_new (g_strdup_printf("(%s)",_ (disp_string)));
-	if (palette->style&STYLE_1) {
-	  gtk_widget_modify_fg(dlabel, GTK_STATE_NORMAL, &palette->normal_fore);
-	}
+	dlabel=lives_standard_label_new ((tmp=g_strdup_printf("(%s)",_ (disp_string))));
+	g_free(tmp);
 	weed_free(disp_string);
-	gtk_box_pack_start (GTK_BOX (hbox), dlabel, FALSE, FALSE, 10);
+	gtk_box_pack_start (GTK_BOX (hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
 	param->widgets[1]=dlabel;
       }
 
 
       checkbutton=lives_standard_check_button_new(name,use_mnemonic,(LiVESBox *)hbox,param->desc);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), get_bool_param(param->value));
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), get_bool_param(param->value));
       g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			      G_CALLBACK (after_boolean_param_toggled),
 			      (gpointer)rfx);
@@ -1375,36 +1418,34 @@
     else {
       group=get_group(rfx,param);
 
-      if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+      if (LIVES_IS_HBOX(LIVES_WIDGET(box))) hbox=GTK_WIDGET(box);
       else {
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
+	hbox = lives_hbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
       }
       
       if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-	dlabel=gtk_label_new (g_strdup_printf("(%s)",_ (disp_string)));
-	if (palette->style&STYLE_1) {
-	  gtk_widget_modify_fg(dlabel, GTK_STATE_NORMAL, &palette->normal_fore);
-	}
+	dlabel=lives_standard_label_new ((tmp=g_strdup_printf("(%s)",_ (disp_string))));
+	g_free(tmp);
 	weed_free(disp_string);
-	gtk_box_pack_start (GTK_BOX (hbox), dlabel, FALSE, FALSE, 10);
+	gtk_box_pack_start (GTK_BOX (hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
 	param->widgets[1]=dlabel;
       }
 
       if (group!=NULL) rbgroup=group->rbgroup;
       else rbgroup=NULL;
 
-      radiobutton=lives_standard_radio_button_new(name,use_mnemonic,rbgroup,(LiVESBox *)hbox,param->desc);
+      radiobutton=lives_standard_radio_button_new(name,use_mnemonic,rbgroup,LIVES_BOX(hbox),param->desc);
 
       if (group==NULL) {
 	if (rfx->status==RFX_STATUS_WEED) {
 	  usrgrp_to_livesgrp[1]=add_usrgrp_to_livesgrp (usrgrp_to_livesgrp[1], 
-							gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton)), 
+							lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)), 
 							param->group);
 	}
 	else {
 	  usrgrp_to_livesgrp[0]=add_usrgrp_to_livesgrp (usrgrp_to_livesgrp[0], 
-							gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton)), 
+							lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)), 
 							param->group);
 	}
       }
@@ -1412,7 +1453,7 @@
       group=get_group(rfx,param);
 
       if (group!=NULL) {
-	group->rbgroup=gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
+	group->rbgroup=lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 	if (get_bool_param(param->value)) {
 	  group->active_param=pnum+1;
 	}
@@ -1423,27 +1464,22 @@
 			      G_CALLBACK (after_boolean_param_toggled),
 			      (gpointer)rfx);
 
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton), get_bool_param(param->value));
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton), get_bool_param(param->value));
 
       // store parameter so we know whose trigger to use
       g_object_set_data (G_OBJECT (radiobutton),"param_number",GINT_TO_POINTER (pnum));
       param->widgets[0]=radiobutton;
       if (param->hidden) gtk_widget_set_sensitive(radiobutton,FALSE);
-      }
+    }
     break;
   case LIVES_PARAM_NUM :
     was_num=TRUE;
 
-    if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
-    else {
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
-    }
-
     if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-      dlabel=gtk_label_new (g_strdup_printf("%s",_ (disp_string)));
+      dlabel=lives_standard_label_new ((tmp=g_strdup_printf("%s",_ (disp_string))));
+      g_free(tmp);
       weed_free(disp_string);
-      gtk_box_pack_start (GTK_BOX (hbox), dlabel, FALSE, FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
       param->widgets[1]=dlabel;
     }
 
@@ -1461,24 +1497,23 @@
 
     gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spinbutton),param->wrap);
 
-    spinfunc=g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
+    g_signal_connect_after (GTK_OBJECT (spinbutton), "value_changed",
 			    G_CALLBACK (after_param_value_changed),
 			    (gpointer)rfx);
-    g_object_set_data(G_OBJECT(spinbutton),"spinfunc",(gpointer)spinfunc);
     
     // store parameter so we know whose trigger to use
     g_object_set_data (G_OBJECT (spinbutton),"param_number",GINT_TO_POINTER (pnum));
     param->widgets[0]=spinbutton;
+    g_object_set_data (G_OBJECT (param->widgets[0]),"rfx",rfx);
     if (param->hidden) gtk_widget_set_sensitive(spinbutton,FALSE);
 
 
     if (add_slider) {
       spinbutton_adj=gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spinbutton));
-
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	scale=gtk_hscale_new(GTK_ADJUSTMENT(spinbutton_adj));
+	scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
 	gtk_scale_set_draw_value(GTK_SCALE(scale),FALSE);
 	gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
 #ifdef ENABLE_GIW
@@ -1487,27 +1522,28 @@
 	scale=giw_knob_new(GTK_ADJUSTMENT(spinbutton_adj));
 	gtk_widget_set_size_request(scale,GIW_KNOB_WIDTH,GIW_KNOB_HEIGHT);
 	giw_knob_set_legends_digits(GIW_KNOB(scale),0);
-	if (palette->style&STYLE_1) {
-	  gtk_widget_modify_text(scale, GTK_STATE_NORMAL, &palette->normal_back);
-	  gtk_widget_modify_fg(scale, GTK_STATE_NORMAL, &palette->normal_fore);
-	  gtk_widget_modify_bg (scale, GTK_STATE_NORMAL, &palette->normal_back);
-	}
 	gtk_box_pack_start (GTK_BOX (hbox), scale, FALSE, FALSE, 0);
-	add_fill_to_box (GTK_BOX (hbox));
+	add_fill_to_box(LIVES_BOX(hbox));
+	lives_widget_set_fg_color(scale,LIVES_WIDGET_STATE_NORMAL,&palette->black);
+	lives_widget_set_fg_color(scale,LIVES_WIDGET_STATE_PRELIGHT,&palette->dark_orange);
+	if (!LIVES_IS_HBOX(LIVES_WIDGET(box))) add_fill_to_box (GTK_BOX (hbox));
       }
 #endif
-      if (param->desc!=NULL) gtk_widget_set_tooltip_text( scale, param->desc);
+      if (palette->style&STYLE_1) {
+	lives_widget_set_bg_color (scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+	lives_widget_set_text_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+	lives_widget_set_fg_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      }
+      if (param->desc!=NULL) gtk_widget_set_tooltip_text(scale, param->desc);
     }
     break;
     
   case LIVES_PARAM_COLRGB24 :
     get_colRGB24_param(param->value,&rgb);
 
-    if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
-    else {
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
-    }
+    lives_widget_set_hexpand(hbox,FALSE);
+
+    lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
 
     // colsel button
 
@@ -1515,34 +1551,40 @@
     colr.green=rgb.green<<8;
     colr.blue=rgb.blue<<8;
 
-    cbutton = gtk_color_button_new_with_color(&colr);
+    cbutton = gtk_color_button_new_with_color(&colr); // TODO ***
     gtk_color_button_set_title (GTK_COLOR_BUTTON(cbutton),_("LiVES: - Select Colour"));
+    gtk_color_button_set_color(GTK_COLOR_BUTTON(cbutton),&colr);
 
     g_object_set_data (G_OBJECT (cbutton),"param_number",GINT_TO_POINTER (pnum));
     if (param->desc!=NULL) gtk_widget_set_tooltip_text( cbutton, param->desc);
     else gtk_widget_set_tooltip_text( cbutton, (_("Click to set the colour")));
 
     if (use_mnemonic) {
-      labelcname=gtk_label_new_with_mnemonic (_(name));
-      gtk_label_set_mnemonic_widget (GTK_LABEL (labelcname),cbutton);
+      labelcname=lives_standard_label_new_with_mnemonic (_(name),cbutton);
     }
-    else labelcname=gtk_label_new (_(name));
-    if (param->desc!=NULL) gtk_widget_set_tooltip_text( labelcname, param->desc);
+    else labelcname=lives_standard_label_new (_(name));
+    if (param->desc!=NULL) gtk_widget_set_tooltip_text(labelcname, param->desc);
 
-    gtk_label_set_justify (GTK_LABEL (labelcname), GTK_JUSTIFY_LEFT);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(labelcname, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), labelcname, FALSE, FALSE, 10);
-
-    spinbutton_red = lives_standard_spin_button_new(_("_Red"), TRUE, rgb.red, 0., 255., 1., 1., 0, 
-						    (LiVESBox *)hbox, (_("The red value (0 - 255)")));
-    spinbutton_green = lives_standard_spin_button_new(_("_Green"), TRUE, rgb.green, 0., 255., 1., 1., 0, 
-						    (LiVESBox *)hbox, (_("The green value (0 - 255)")));
-    spinbutton_blue = lives_standard_spin_button_new(_("_Blue"), TRUE, rgb.blue, 0., 255., 1., 1., 0, 
-						    (LiVESBox *)hbox, (_("The blue value (0 - 255)")));
-    
-    gtk_box_pack_start (GTK_BOX (hbox), cbutton, TRUE, TRUE, 20);
+    gtk_box_pack_start (GTK_BOX (hbox), labelcname, FALSE, FALSE, widget_opts.packing_width);
+
+    widget_opts.packing_width=4;
+
+    spinbutton_red = lives_standard_spin_button_new((tmp=g_strdup(_("_Red"))), TRUE, rgb.red, 0., 255., 1., 1., 0, 
+						    (LiVESBox *)hbox, (tmp2=g_strdup(_("The red value (0 - 255)"))));
+    g_free(tmp);
+    g_free(tmp2);
+    spinbutton_green = lives_standard_spin_button_new((tmp=g_strdup(_("_Green"))), TRUE, rgb.green, 0., 255., 1., 1., 0, 
+						      (LiVESBox *)hbox, (tmp2=g_strdup(_("The green value (0 - 255)"))));
+    g_free(tmp);
+    g_free(tmp2);
+    spinbutton_blue = lives_standard_spin_button_new((tmp=g_strdup(_("_Blue"))), TRUE, rgb.blue, 0., 255., 1., 1., 0, 
+						     (LiVESBox *)hbox, (tmp2=g_strdup(_("The blue value (0 - 255)"))));
+    g_free(tmp);
+    g_free(tmp2);
+
+    widget_opts.packing_width=def_packing_width;
+
+    gtk_box_pack_start (GTK_BOX (hbox), cbutton, TRUE, TRUE, widget_opts.packing_width);
 
     g_signal_connect (GTK_OBJECT (cbutton), "color-set",
 		      G_CALLBACK (on_pwcolsel),
@@ -1576,14 +1618,12 @@
       //gtk_widget_set_sensitive(spinbutton_alpha,FALSE);
       gtk_widget_set_sensitive(cbutton,FALSE);
     }
+
+
     break;
 
   case LIVES_PARAM_STRING:
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
-    gtk_box_set_homogeneous(GTK_BOX(box),FALSE);
-
     if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
       if (param->max==0.) txt=g_strdup (disp_string);
       else txt=g_strndup (disp_string,(gint)param->max);
@@ -1594,154 +1634,139 @@
       else txt=g_strndup ((gchar *)param->value,(gint)param->max);
     }
 
-    if ((gint)param->max>RFX_TEXT_MAGIC||param->max==0.) {
+
+
+    if (((gint)param->max>RFX_TEXT_MAGIC||param->max==0.)&&
+	param->special_type!=LIVES_PARAM_SPECIAL_TYPE_FILEREAD) {
+      GtkWidget *vbox;
+
+      boolean woat;
+
+      widget_opts.justify=LIVES_JUSTIFY_CENTER;
+      if (use_mnemonic) label = lives_standard_label_new_with_mnemonic (_(name),NULL);
+      else label = lives_standard_label_new (_(name));
+      widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
+
+      vbox=lives_vbox_new(FALSE,0);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, widget_opts.packing_width);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height>>1);
+
+      hbox=lives_hbox_new(FALSE,0);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
       param->widgets[0] = textview = gtk_text_view_new ();
-      if (param->hidden) gtk_widget_set_sensitive(textview,FALSE);
       if (param->desc!=NULL) gtk_widget_set_tooltip_text( textview, param->desc);
       textbuffer=gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
-      g_object_set_data(G_OBJECT(textview),"textbuffer",(gpointer)textbuffer);
 
+      g_signal_connect_after (G_OBJECT (textbuffer), "changed", G_CALLBACK (after_param_text_buffer_changed), 
+			      (gpointer) rfx);
 
       gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), TRUE);
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD);
       gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview), TRUE);
 
       gtk_text_buffer_set_text (textbuffer, txt, -1);
-    }
-    else {
-      param->widgets[0]=entry=gtk_entry_new();
-      if (param->hidden) gtk_widget_set_sensitive(entry,FALSE);
-      if (param->desc!=NULL) gtk_widget_set_tooltip_text( entry, param->desc);
-      gtk_entry_set_text (GTK_ENTRY (entry),txt);
-      gtk_entry_set_max_length(GTK_ENTRY (entry),(gint)param->max);
-      gtk_entry_set_width_chars (GTK_ENTRY (entry),(gint)param->max);
-      gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-    }
-    g_free (txt);
 
-    if (use_mnemonic) label = gtk_label_new_with_mnemonic (_(name));
-    else label = gtk_label_new (_(name));
-    if (param->desc!=NULL) gtk_widget_set_tooltip_text( label, param->desc);
+      woat=widget_opts.apply_theme;
+      widget_opts.apply_theme=FALSE;
+      scrolledwindow = lives_standard_scrolled_window_new (-1, RFX_TEXT_SCROLL_HEIGHT, textview);
+      widget_opts.apply_theme=woat;
 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (hbox), scrolledwindow, TRUE, TRUE, 0);
 
+      g_object_set_data(G_OBJECT(textbuffer),"textview",textview);
 
-    if ((gint)param->max>RFX_TEXT_MAGIC||param->max==0.) {
-      scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-      
-      gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
-      if (use_mnemonic) gtk_label_set_mnemonic_widget (GTK_LABEL (label),textview);
-      gtk_box_pack_start (GTK_BOX (hbox), scrolledwindow, TRUE, TRUE, 10);
-      g_object_set_data(G_OBJECT(hbox),"textwidget",(gpointer)textbuffer);
-
-      if (rfx->status!=RFX_STATUS_WEED) {
-	blockfunc=g_signal_connect_after (G_OBJECT (hbox), "set-focus-child", G_CALLBACK (after_param_text_focus_changed), 
-					  (gpointer) rfx);
-      }
-      else {
-	if (mainw->multitrack!=NULL)
-	  g_signal_connect_after (G_OBJECT (hbox), "set-focus-child", G_CALLBACK (after_param_text_focus_changed), 
-				  (gpointer) rfx);
-	blockfunc=g_signal_connect_after (G_OBJECT (textbuffer),"changed", G_CALLBACK (after_param_text_changed), 
-					  (gpointer) rfx);
-      }
-      g_object_set_data(G_OBJECT(textbuffer),"blockfunc",(gpointer)blockfunc);
-
-      // store parameter so we know whose trigger to use
-      g_object_set_data (G_OBJECT (textbuffer),"param_number",GINT_TO_POINTER (pnum));
-      g_object_set_data (G_OBJECT (textbuffer),"rfx",rfx);
     }
     else {
-      if (use_mnemonic) gtk_label_set_mnemonic_widget (GTK_LABEL (label),entry);
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 10);
-      g_object_set_data(G_OBJECT(hbox),"textwidget",(gpointer)entry);
-      if (rfx->status!=RFX_STATUS_WEED) {
-	blockfunc=g_signal_connect_after (G_OBJECT (hbox), "set-focus-child", G_CALLBACK (after_param_text_focus_changed), 
-					  (gpointer) rfx);
-      }
-      else {
-	if (mainw->multitrack!=NULL)
-	  g_signal_connect_after (G_OBJECT (hbox), "set-focus-child", G_CALLBACK (after_param_text_focus_changed), 
-				  (gpointer) rfx);
-	blockfunc=g_signal_connect_after (G_OBJECT (entry),"changed", G_CALLBACK (after_param_text_changed), 
-					  (gpointer) rfx);
+      if (use_mnemonic) label = lives_standard_label_new_with_mnemonic (_(name),NULL);
+      else label = lives_standard_label_new (_(name));
+
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+      param->widgets[0]=entry=lives_standard_entry_new(NULL,FALSE,txt,(int)param->max,(int)param->max,LIVES_BOX(hbox),param->desc);
+
+      if (rfx->status==RFX_STATUS_WEED&&param->special_type!=LIVES_PARAM_SPECIAL_TYPE_FILEREAD) {
+	g_signal_connect_after (G_OBJECT (entry), "changed", G_CALLBACK (after_param_text_changed), 
+				(gpointer) rfx);
       }
-      g_object_set_data(G_OBJECT(entry),"blockfunc",(gpointer)blockfunc);
-      
-      // store parameter so we know whose trigger to use
-      g_object_set_data (G_OBJECT (entry),"param_number",GINT_TO_POINTER (pnum));
-      g_object_set_data (G_OBJECT (entry),"rfx",rfx);
+
     }
 
+    if (param->desc!=NULL) gtk_widget_set_tooltip_text(label, param->desc);
+
+    g_signal_connect_after (G_OBJECT (hbox), "set-focus-child", G_CALLBACK (after_param_text_focus_changed), 
+			    (gpointer) rfx);
+
+    if (param->hidden) gtk_widget_set_sensitive(param->widgets[0],FALSE);
+    if (use_mnemonic) gtk_label_set_mnemonic_widget (GTK_LABEL (label),param->widgets[0]);
+
+    g_free (txt);
+
+    g_object_set_data(G_OBJECT(hbox),"textwidget",(gpointer)param->widgets[0]);
+    g_object_set_data (G_OBJECT (param->widgets[0]),"param_number",GINT_TO_POINTER (pnum));
+    g_object_set_data (G_OBJECT (param->widgets[0]),"rfx",rfx);
+
+    param->widgets[1]=label;
+
     break;
 
   case LIVES_PARAM_STRING_LIST:
 
-    combo=lives_standard_combo_new(name, use_mnemonic, param->list, (LiVESBox *)box, param->desc);
+    widget_opts.expand=LIVES_EXPAND_EXTRA;
+    combo=lives_standard_combo_new(name, use_mnemonic, param->list, (LiVESBox *)hbox, param->desc);
+    widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
     if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-      gtk_entry_set_text (GTK_ENTRY((GTK_COMBO(combo))->entry),disp_string);
+      lives_combo_set_active_string (LIVES_COMBO(combo),disp_string);
       weed_free(disp_string);
     }
     else if (param->list!=NULL) {
-      gtk_entry_set_text (GTK_ENTRY((GTK_COMBO(combo))->entry), 
-			  (gchar *)g_list_nth_data (param->list,get_int_param (param->value)));
+      lives_combo_set_active_string (LIVES_COMBO(combo), 
+				     (gchar *)g_list_nth_data (param->list,get_int_param (param->value)));
     }
 
-    blockfunc=g_signal_connect_after (G_OBJECT (GTK_COMBO(combo)->entry), "changed", 
-				      G_CALLBACK (after_string_list_changed), (gpointer) rfx);
-    g_object_set_data(G_OBJECT(GTK_COMBO(combo)->entry),"blockfunc",(gpointer)blockfunc);
- 
+    g_signal_connect_after (G_OBJECT (combo), "changed", 
+			    G_CALLBACK (after_string_list_changed), (gpointer) rfx);
+
     // store parameter so we know whose trigger to use
-    g_object_set_data (G_OBJECT (GTK_COMBO(combo)->entry),"param_number",GINT_TO_POINTER (pnum));
+    g_object_set_data (G_OBJECT (combo),"param_number",GINT_TO_POINTER (pnum));
     param->widgets[0]=combo;
     if (param->hidden) gtk_widget_set_sensitive(combo,FALSE);
-
     break;
 
   default:
     break;
 
   }
+
   
   // see if there were any 'special' hints
   //mainw->block_param_updates=FALSE; // need to keep blocked until last param widget has been created
-  check_for_special (param,pnum,GTK_BOX(GTK_WIDGET(box)->parent),rfx);
+  check_for_special (rfx,param,GTK_BOX(lives_widget_get_parent(LIVES_WIDGET(box))));
   //mainw->block_param_updates=TRUE;
 
   g_free (name);
   return was_num;
 }
 
-void add_hsep_to_box (GtkBox *box) {
-  GtkWidget *hseparator = gtk_hseparator_new ();
-  gtk_box_pack_start (box, hseparator, TRUE, TRUE, 0);
-  gtk_widget_show(hseparator);
-}
-
-void add_fill_to_box (GtkBox *box) {
-  GtkWidget *blank_label = gtk_label_new ("");
-  gtk_box_pack_start (box, blank_label, TRUE, TRUE, 0);
-  gtk_widget_show(blank_label);
-}
 
-void add_label_to_box (GtkBox *box, gboolean do_trans, const gchar *text) {
+void add_param_label_to_box (GtkBox *box, boolean do_trans, const gchar *text) {
   GtkWidget *label;
 
-  gtk_box_set_homogeneous(GTK_BOX(box),FALSE);
-
-  if (do_trans) label = gtk_label_new_with_mnemonic (_ (text));
-  else label = gtk_label_new_with_mnemonic (text);
+  lives_box_set_homogeneous(GTK_BOX(box),FALSE);
 
-  gtk_box_pack_start (box, label, FALSE, FALSE, 10);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  if (do_trans) {
+    char *markup;
+    markup=g_markup_printf_escaped("<span weight=\"bold\" style=\"italic\"> %s </span>",_(text));
+    label = lives_standard_label_new(NULL);
+    gtk_label_set_markup_with_mnemonic (GTK_LABEL(label),markup);
+    g_free(markup);
+  }
+  else label = lives_standard_label_new_with_mnemonic (text,NULL);
+
+  if (LIVES_IS_HBOX(LIVES_WIDGET(box)))
+    gtk_box_pack_start (box, label, FALSE, FALSE, widget_opts.packing_width);
+  else
+    gtk_box_pack_start (box, label, FALSE, FALSE, widget_opts.packing_height);
   gtk_widget_show(label);
 }
 
@@ -1780,12 +1805,15 @@
 				    lives_rfx_t *         rfx)
 {
   gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (togglebutton),"param_number"));
+  GList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
-  gboolean old_bool=get_bool_param(param->value),new_bool;
+  boolean old_bool=get_bool_param(param->value),new_bool;
+  boolean was_reinited=FALSE;
+  int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
-  set_bool_param(param->value,(new_bool=gtk_toggle_button_get_active (togglebutton)));
+  set_bool_param(param->value,(new_bool=lives_toggle_button_get_active (togglebutton)));
 
   if (mainw->framedraw_preview!=NULL) gtk_widget_set_sensitive(mainw->framedraw_preview,TRUE);
 
@@ -1794,50 +1822,62 @@
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
     if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
       char *disp_string;
-      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE);
+      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE,FALSE);
       int index=0,numvals;
       int *valis;
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-      }
-
-      if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multi(rfx,param_number)) 
+      if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
 	index=mainw->multitrack->track_index;
+      }
       numvals=weed_leaf_num_elements(wparam,"value");
 
       if (index>=numvals) {
 	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(paramtmpl,wparam,param_number,WEED_HINT_SWITCH,index);
+	fill_param_vals_to(wparam,paramtmpl,index);
 	numvals=index+1;
       }
 
       valis=weed_get_boolean_array(wparam,"value",&error);
       valis[index]=new_bool;
+      pthread_mutex_lock(&mainw->data_mutex);
       weed_set_boolean_array(wparam,"value",numvals,valis);
-      if (param->copy_to!=-1) weed_set_boolean_array(weed_inst_in_param(inst,param->copy_to,FALSE),"value",numvals,valis);
+      pthread_mutex_unlock(&mainw->data_mutex);
+      copyto=set_copy_to(inst,param_number,TRUE);
+
       weed_free(valis);
 
-      if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-	weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	// if we are recording, add this change to our event_list
+	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
       }
+
       disp_string=get_weed_display_string(inst,param_number);
       if (disp_string!=NULL) {
 	gtk_label_set_text(GTK_LABEL(param->widgets[1]),disp_string);
 	weed_free(disp_string);
       }
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
 
     }
+
+
   }
   if (get_bool_param(param->value)!=old_bool&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (togglebutton), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (togglebutton), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
-  if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
+  if (mainw->multitrack!=NULL) {
     activate_mt_preview(mainw->multitrack);
   }
   param->changed=TRUE;
@@ -1850,8 +1890,11 @@
 				     lives_rfx_t *rfx) {
   gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
   lives_param_t *param=&rfx->params[param_number];
-  gdouble new_double,old_double=0.;
-  gint new_int,old_int=0;
+  GList *retvals=NULL;
+  gdouble new_double=0.,old_double=0.;
+  gint new_int=0,old_int=0;
+  boolean was_reinited=FALSE;
+  int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -1862,6 +1905,8 @@
     // if we are recording, add this (pre)change to our event_list
     // however, we need to use the actual instance and not the one generated for the rte_window
     rec_param_change((weed_plant_t *)rfx->source,param_number);
+    copyto=set_copy_to((weed_plant_t *)rfx->source,param_number,FALSE);
+    if (copyto!=-1) rec_param_change((weed_plant_t *)rfx->source,copyto);
   }
 
   if (param->dp>0) {
@@ -1873,115 +1918,107 @@
 
   if (param->dp>0) {
     set_double_param(param->value,(new_double=gtk_spin_button_get_value(GTK_SPIN_BUTTON(spinbutton))));
+  }
+  else {
+    set_int_param(param->value,(new_int=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinbutton))));
+  }
 
-    if (rfx->status==RFX_STATUS_WEED) {
-      int error;
-      weed_plant_t *inst=(weed_plant_t *)rfx->source;
-      if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
-	weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE);
-	int index=0,numvals;
-	double *valds;
 
-	if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multi(rfx,param_number)) 
-	  index=mainw->multitrack->track_index;
-	numvals=weed_leaf_num_elements(wparam,"value");
-	if (index>=numvals) {
-	  weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	  fill_param_vals_to(paramtmpl,wparam,param_number,WEED_HINT_FLOAT,index);
-	  numvals=index+1;
-	}
-	
+  if (rfx->status==RFX_STATUS_WEED) {
+    int error;
+    weed_plant_t *inst=(weed_plant_t *)rfx->source;
+    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
+      char *disp_string;
+
+      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE,FALSE);
+      int index=0,numvals;
+      double *valds;
+      int *valis;
+
+      if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
+	index=mainw->multitrack->track_index;
+      }
+      numvals=weed_leaf_num_elements(wparam,"value");
+      if (index>=numvals) {
+	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
+	fill_param_vals_to(wparam,paramtmpl,index);
+	numvals=index+1;
+      }
+
+      if (weed_leaf_seed_type(wparam,"value")==WEED_SEED_DOUBLE) {
 	valds=weed_get_double_array(wparam,"value",&error);
-	valds[index]=new_double;
+	if (param->dp>0) valds[index]=new_double;
+	else valds[index]=(double)new_int;
+	pthread_mutex_lock(&mainw->data_mutex);
 	weed_set_double_array(wparam,"value",numvals,valds);
-	if (param->copy_to!=-1) weed_set_double_array(weed_inst_in_param(inst,param->copy_to,FALSE),"value",numvals,valds);
-	
+	pthread_mutex_unlock(&mainw->data_mutex);
+	copyto=set_copy_to(inst,param_number,TRUE);
 	weed_free(valds);
-
       }
-    }
-  }
-  else {
-    set_int_param(param->value,(new_int=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinbutton))));
-
-    if (rfx->status==RFX_STATUS_WEED) {
-      int error;
-      weed_plant_t *inst=(weed_plant_t *)rfx->source;
-      if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
-	weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE);
-	int index=0,numvals;
-	int *valis;
-	
-	if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multi(rfx,param_number)) 
-	  index=mainw->multitrack->track_index;
-	numvals=weed_leaf_num_elements(wparam,"value");
-	if (index>=numvals) {
-	  weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	  fill_param_vals_to(paramtmpl,wparam,param_number,WEED_HINT_INTEGER,index);
-	  numvals=index+1;
-	}
-	
+      else {
 	valis=weed_get_int_array(wparam,"value",&error);
 	valis[index]=new_int;
+	pthread_mutex_lock(&mainw->data_mutex);
 	weed_set_int_array(wparam,"value",numvals,valis);
-	if (param->copy_to!=-1) weed_set_int_array(weed_inst_in_param(inst,param->copy_to,FALSE),"value",numvals,valis);
+	pthread_mutex_unlock(&mainw->data_mutex);
+	copyto=set_copy_to(inst,param_number,TRUE);
 	weed_free(valis);
       }
-    }
-  }
-
-  if (rfx->status==RFX_STATUS_WEED) {
-    int error;
-    weed_plant_t *inst=(weed_plant_t *)rfx->source;
-    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
-      char *disp_string;
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
 	// if we are recording, add this change to our event_list
 	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
       }
 
-      if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-	weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
-      }
       disp_string=get_weed_display_string(inst,param_number);
       if (disp_string!=NULL) {
 	gtk_label_set_text(GTK_LABEL(param->widgets[1]),disp_string);
 	weed_free(disp_string);
       }
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
 
     }
   }
-    
+
   if (((param->dp>0&&(get_double_param(param->value)!=old_double))||(param->dp==0&&
 								     (get_int_param(param->value)!=old_int)))&&
       param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (spinbutton), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
+    if (was_reinited) add_mt_param_box(mainw->multitrack);
     activate_mt_preview(mainw->multitrack);
   }
   param->changed=TRUE;
 }
 
 
-void update_weed_color_value(weed_plant_t *param, int pnum, weed_plant_t *copy_param, int c1, int c2, int c3, int c4) {
+void update_weed_color_value(weed_plant_t *inst, int pnum, int c1, int c2, int c3, int c4) {
   int error;
   int cols[4]={c1,c2,c3,c4};
   double colds[4];
   weed_plant_t *ptmpl;
+  weed_plant_t *param=weed_inst_in_param(inst,pnum,FALSE,FALSE);
   int cspace;
   int rmax,rmin,gmax,gmin,bmax,bmin;
   int *maxs=NULL,*mins=NULL;
   double rmaxd,rmind,gmaxd,gmind,bmaxd,bmind;
   double *maxds=NULL,*minds=NULL;
-  gboolean is_default=(weed_get_int_value(param,"type",&error)==WEED_PLANT_PARAMETER_TEMPLATE);
+  boolean is_default=(weed_get_int_value(param,"type",&error)==WEED_PLANT_PARAMETER_TEMPLATE);
 
-  gboolean is_int;
+  boolean is_int;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -2021,12 +2058,13 @@
 	int index=0,numvals;
 	int *valis;
 	
-	if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multiw(param)) 
+	if (mainw->multitrack!=NULL&&is_perchannel_multiw(ptmpl)) {
 	  index=mainw->multitrack->track_index;
+	}
 	numvals=weed_leaf_num_elements(param,"value");
 	if (index*3>=numvals) {
 	  weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
-	  fill_param_vals_to(paramtmpl,param,pnum,WEED_HINT_COLOR,index);
+	  fill_param_vals_to(param,paramtmpl,index);
 	  numvals=(index+1)*3;
 	}
 	
@@ -2035,7 +2073,6 @@
 	valis[index*3+1]=cols[1];
 	valis[index*3+2]=cols[2];
 	weed_set_int_array(param,"value",numvals,valis);
-	if (copy_param!=NULL) weed_set_int_array(copy_param,"value",numvals,valis);
 	weed_free(valis);
       }
       break;
@@ -2066,12 +2103,13 @@
 	int index=0,numvals;
 	double *valds;
 	
-	if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multiw(param)) 
+	if (mainw->multitrack!=NULL&&is_perchannel_multiw(ptmpl)) {
 	  index=mainw->multitrack->track_index;
+	}
 	numvals=weed_leaf_num_elements(param,"value");
 	if (index*3>=numvals) {
 	  weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
-	  fill_param_vals_to(paramtmpl,param,pnum,WEED_HINT_COLOR,index);
+	  fill_param_vals_to(param,paramtmpl,index);
 	  numvals=(index+1)*3;
 	}
 	
@@ -2080,12 +2118,12 @@
 	valds[index*3+1]=colds[1];
 	valds[index*3+2]=colds[2];
 	weed_set_double_array(param,"value",numvals,valds);
-	if (copy_param!=NULL) weed_set_double_array(copy_param,"value",numvals,valds);
 	weed_free(valds);
       }
     }
     break;
   }
+
 }
 
 
@@ -2093,12 +2131,14 @@
 after_param_red_changed           (GtkSpinButton   *spinbutton,
 				   lives_rfx_t *rfx) {
   gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  GList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
   lives_colRGB24_t old_value;
   gint new_red;
   GdkColor colr;
   GtkWidget *cbutton;
-  weed_plant_t *copy_param=NULL;
+  boolean was_reinited=FALSE;
+  int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -2106,6 +2146,8 @@
       (prefs->rec_opts&REC_EFFECTS)) {
     // if we are recording, add this change to our event_list
     rec_param_change((weed_plant_t *)rfx->source,param_number);
+    copyto=set_copy_to((weed_plant_t *)rfx->source,param_number,FALSE);
+    if (copyto!=-1) rec_param_change((weed_plant_t *)rfx->source,copyto);
   }
 
   get_colRGB24_param(param->value,&old_value);
@@ -2125,27 +2167,35 @@
     int error;
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
 
-    if (param->copy_to!=-1) copy_param=weed_inst_in_param(inst,param->copy_to,FALSE);
-    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) 
-      update_weed_color_value(weed_inst_in_param(inst,param_number,FALSE),param_number,
-			      copy_param,new_red,old_value.green,old_value.blue,0);
+    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE)  {
+      update_weed_color_value(inst,param_number,
+			      new_red,old_value.green,old_value.blue,0);
+      copyto=set_copy_to(inst,param_number,TRUE);
 
-    if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-      // if we are recording, add this change to our event_list
-      rec_param_change(inst,param_number);
-    }
-
-    if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-      weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	// if we are recording, add this change to our event_list
+	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
+      }
+      
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
     }
   }
+
   if (new_red!=old_value.red&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (spinbutton), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
     activate_mt_preview(mainw->multitrack);
   }
@@ -2157,12 +2207,14 @@
 after_param_green_changed           (GtkSpinButton   *spinbutton,
 				     lives_rfx_t *rfx) {
   gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  GList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
   lives_colRGB24_t old_value;
   gint new_green;
   GdkColor colr;
   GtkWidget *cbutton;
-  weed_plant_t *copy_param=NULL;
+  boolean was_reinited=FALSE;
+  int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -2170,6 +2222,8 @@
       (prefs->rec_opts&REC_EFFECTS)) {
     // if we are recording, add this change to our event_list
     rec_param_change((weed_plant_t *)rfx->source,param_number);
+    copyto=set_copy_to((weed_plant_t *)rfx->source,param_number,FALSE);
+    if (copyto!=-1) rec_param_change((weed_plant_t *)rfx->source,copyto);
   }
 
   get_colRGB24_param(param->value,&old_value);
@@ -2188,27 +2242,36 @@
     int error;
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
 
-    if (param->copy_to!=-1) copy_param=weed_inst_in_param(inst,param->copy_to,FALSE);
-    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) 
-      update_weed_color_value(weed_inst_in_param(inst,param_number,FALSE),
-			      param_number,copy_param,old_value.red,new_green,old_value.blue,0);
+    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
+      update_weed_color_value(weed_inst_in_param(inst,param_number,FALSE,FALSE),
+			      param_number,old_value.red,new_green,old_value.blue,0);
 
-    if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-      // if we are recording, add this change to our event_list
-      rec_param_change(inst,param_number);
-    }
+      copyto=set_copy_to(inst,param_number,TRUE);
 
-    if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-      weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	// if we are recording, add this change to our event_list
+	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
+      }
+      
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
     }
   }
+
   if (new_green!=old_value.green&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (spinbutton), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
     activate_mt_preview(mainw->multitrack);
   }
@@ -2219,12 +2282,14 @@
 after_param_blue_changed           (GtkSpinButton   *spinbutton,
 				    lives_rfx_t *rfx) {
   gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  GList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
   lives_colRGB24_t old_value;
   gint new_blue;
   GdkColor colr;
   GtkWidget *cbutton;
-  weed_plant_t *copy_param=NULL;
+  boolean was_reinited=FALSE;
+  int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -2232,6 +2297,8 @@
       (prefs->rec_opts&REC_EFFECTS)) {
     // if we are recording, add this change to our event_list
     rec_param_change((weed_plant_t *)rfx->source,param_number);
+    copyto=set_copy_to((weed_plant_t *)rfx->source,param_number,FALSE);
+    if (copyto!=-1) rec_param_change((weed_plant_t *)rfx->source,copyto);
   }
 
   get_colRGB24_param(param->value,&old_value);
@@ -2251,27 +2318,35 @@
     int error;
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
 
-    if (param->copy_to!=-1) copy_param=weed_inst_in_param(inst,param->copy_to,FALSE);
-    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) 
-      update_weed_color_value(weed_inst_in_param(inst,param_number,FALSE),param_number,copy_param,
+    if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
+      update_weed_color_value(weed_inst_in_param(inst,param_number,FALSE,FALSE),param_number,
 			      old_value.red,old_value.green,new_blue,0);
+      copyto=set_copy_to(inst,param_number,TRUE);
 
-    if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-      // if we are recording, add this change to our event_list
-      rec_param_change(inst,param_number);
-    }
-
-    if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-      weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+	// if we are recording, add this change to our event_list
+	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
+      }
+      
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
     }
   }
+
   if (new_blue!=old_value.blue&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (spinbutton), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
     activate_mt_preview(mainw->multitrack);
   }
@@ -2284,9 +2359,12 @@
 				     lives_rfx_t *rfx) {
   // not used yet
   gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  GList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
   lives_colRGBA32_t old_value;
   gint new_alpha=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spinbutton));
+  //boolean was_reinited=FALSE;
+  int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -2294,6 +2372,8 @@
       (prefs->rec_opts&REC_EFFECTS)) {
     // if we are recording, add this change to our event_list
     rec_param_change((weed_plant_t *)rfx->source,param_number);
+    copyto=set_copy_to((weed_plant_t *)rfx->source,param_number,FALSE);
+    if (copyto!=-1) rec_param_change((weed_plant_t *)rfx->source,copyto);
   }
 
   get_colRGBA32_param(param->value,&old_value);
@@ -2307,13 +2387,18 @@
       (prefs->rec_opts&REC_EFFECTS)) {
     // if we are recording, add this change to our event_list
     rec_param_change((weed_plant_t *)rfx->source,param_number);
+    if (copyto!=-1) rec_param_change((weed_plant_t *)rfx->source,copyto);
   }
 
 
   if (new_alpha!=old_value.alpha&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (spinbutton), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
@@ -2323,55 +2408,56 @@
 }
 
 
-gboolean after_param_text_focus_changed (GtkWidget *hbox, GtkWidget *child, lives_rfx_t *rfx) {
+boolean after_param_text_focus_changed (GtkWidget *hbox, GtkWidget *child, lives_rfx_t *rfx) {
   // for non realtime effects
   // we don't usually want to run the trigger every single time the user presses a key in a text widget
   // so we only update when the user clicks OK or focusses out of the widget
 
   GtkWidget *textwidget;
 
+  if (rfx==NULL) return FALSE;
+
   if (mainw->multitrack!=NULL) {
     if (child!=NULL)
       gtk_window_remove_accel_group(GTK_WINDOW(mainw->multitrack->window),mainw->multitrack->accel_group);
     else
       gtk_window_add_accel_group(GTK_WINDOW(mainw->multitrack->window),mainw->multitrack->accel_group);
 
-    // effects and generators make their own arrangements to be updated in multitrack
-    // rfx scraps don't  (for example vpp advanced in prefs)
-    if (rfx->status!=RFX_STATUS_SCRAP) return FALSE;
+  }
+  
+  if (mainw->textwidget_focus!=NULL) {
+    textwidget=(GtkWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    after_param_text_changed(textwidget,rfx);
   }
 
   if (hbox!=NULL) {
-    if (mainw->textwidget_focus!=NULL) {
-      textwidget=(GtkWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
-      after_param_text_changed(textwidget,rfx);
-    }
     mainw->textwidget_focus=hbox;
-    return FALSE;
   }
 
-  // for non-realtime, function is only called when focus leaves the textwidget
-  textwidget=(GtkWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
-  after_param_text_changed(textwidget,rfx);
   return FALSE;
 }
 
-void 
-after_param_text_changed (GtkWidget *textwidget, lives_rfx_t *rfx) {
-  gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (textwidget),"param_number"));
-  lives_param_t *param=&rfx->params[param_number];
-  gchar *old_text=(gchar *)param->value;
+void after_param_text_changed (GtkWidget *textwidget, lives_rfx_t *rfx) {
+  GtkTextBuffer *textbuffer=NULL;
+  GList *retvals=NULL;
+  gint param_number;
+  lives_param_t *param;
+  gchar *old_text;
+  boolean was_reinited=FALSE;
+  int copyto=-1;
 
-  if (mainw->block_param_updates) return; // updates are blocked when we update visually
+  if (rfx==NULL||rfx->params==NULL||textwidget==NULL) return;
 
+  param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (textwidget),"param_number"));
 
-  if ((gint)param->max>RFX_TEXT_MAGIC||param->max==0.) {
-    GtkTextIter start_iter,end_iter;
- 
-    gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(textwidget),&start_iter);
-    gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(textwidget),&end_iter);
-    
-    param->value=gtk_text_buffer_get_text (GTK_TEXT_BUFFER(textwidget),&start_iter,&end_iter,FALSE);
+  param=&rfx->params[param_number];
+
+  old_text=(gchar *)param->value;
+
+  if (mainw->block_param_updates) return; // updates are blocked when we update visually
+
+  if (GTK_IS_TEXT_VIEW(textwidget)) {
+    param->value=g_strdup(text_view_get_text (LIVES_TEXT_VIEW(textwidget)));
   }
   else {
     param->value=g_strdup (gtk_entry_get_text (GTK_ENTRY (textwidget)));
@@ -2384,71 +2470,90 @@
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
     if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
       char *disp_string=get_weed_display_string(inst,param_number);
-      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE);
+      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE,FALSE);
       int index=0,numvals;
       char **valss;
 
-      if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multi(rfx,param_number)) 
+      if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
 	index=mainw->multitrack->track_index;
+      }
       numvals=weed_leaf_num_elements(wparam,"value");
       if (index>=numvals) {
 	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(paramtmpl,wparam,param_number,WEED_HINT_INTEGER,index);
+	fill_param_vals_to(wparam,paramtmpl,index);
 	numvals=index+1;
       }
       
       valss=weed_get_string_array(wparam,"value",&error);
       valss[index]=g_strdup((gchar *)param->value);
+      pthread_mutex_lock(&mainw->data_mutex);
       weed_set_string_array(wparam,"value",numvals,valss);
-      if (param->copy_to!=-1) weed_set_string_array(weed_inst_in_param(inst,param->copy_to,FALSE),"value",numvals,valss);
+      pthread_mutex_unlock(&mainw->data_mutex);
+      copyto=set_copy_to(inst,param_number,TRUE);
       for (i=0;i<numvals;i++) weed_free(valss[i]);
       weed_free(valss);
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
 	// if we are recording, add this change to our event_list
 	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
       }
 
-      if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-	weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
-      }
       if (disp_string!=NULL) {
-	gulong blockfunc=(gulong)g_object_get_data(G_OBJECT(textwidget),"blockfunc");
-	g_signal_handler_block(textwidget,blockfunc);
 	if ((gint)param->max>RFX_TEXT_MAGIC||param->max==0.) {
-	  gtk_text_buffer_set_text (GTK_TEXT_BUFFER (textwidget), (gchar *)param->value, -1);
+	  gtk_text_buffer_set_text (GTK_TEXT_BUFFER (textbuffer), (gchar *)param->value, -1);
 	}
 	else {
 	  gtk_entry_set_text(GTK_ENTRY(textwidget),disp_string);
 	}
-	g_signal_handler_unblock(textwidget,blockfunc);
 	weed_free(disp_string);
       }
 
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
+
     }
   }
-  
+
   if (strcmp (old_text,(gchar *)param->value)&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange (G_OBJECT (textwidget), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange (G_OBJECT (textwidget), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
   g_free (old_text);
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
     activate_mt_preview(mainw->multitrack);
   }
   param->changed=TRUE;
+
+}
+
+static void after_param_text_buffer_changed (GtkTextBuffer *textbuffer, lives_rfx_t *rfx) {
+  GtkWidget *textview=(GtkWidget *)g_object_get_data(G_OBJECT(textbuffer),"textview");
+  after_param_text_changed(textview,rfx);
 }
 
 
 void 
-after_string_list_changed (GtkEntry *entry, lives_rfx_t *rfx) {
-  gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry),"param_number"));
+after_string_list_changed (GtkComboBox *combo, lives_rfx_t *rfx) {
+  gint param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo),"param_number"));
+  GList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
   gint old_index=get_int_param(param->value);
-  gint new_index=lives_list_index(param->list,gtk_entry_get_text(entry));
+  char *txt=lives_combo_get_active_text(combo);
+  gint new_index=lives_list_index(param->list,txt);
+  boolean was_reinited=FALSE;
+  int copyto=-1;
+
+  g_free(txt);
 
   if (mainw->block_param_updates) return; // updates are blocked when we update visually
 
@@ -2463,51 +2568,60 @@
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
     if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
       char *disp_string=get_weed_display_string(inst,param_number);
-      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE);
+      weed_plant_t *wparam=weed_inst_in_param(inst,param_number,FALSE,FALSE);
       int index=0,numvals;
       int *valis;
 
-      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-      // if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-      }
-    
-      if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multi(rfx,param_number)) 
+      if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
 	index=mainw->multitrack->track_index;
+      }
       numvals=weed_leaf_num_elements(wparam,"value");
       if (index>=numvals) {
 	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(paramtmpl,wparam,param_number,WEED_HINT_INTEGER,index);
+	fill_param_vals_to(wparam,paramtmpl,index);
 	numvals=index+1;
       }
       
       valis=weed_get_int_array(wparam,"value",&error);
       valis[index]=new_index;
+      pthread_mutex_lock(&mainw->data_mutex);
       weed_set_int_array(wparam,"value",numvals,valis);
-      if (param->copy_to!=-1) weed_set_int_array(weed_inst_in_param(inst,param->copy_to,FALSE),"value",numvals,valis);
+      pthread_mutex_unlock(&mainw->data_mutex);
+      copyto=set_copy_to(inst,param_number,TRUE);
       weed_free(valis);
-      
-      if (param->reinit||(param->copy_to!=-1&&rfx->params[param->copy_to].reinit)) {
-	weed_reinit_effect((weed_plant_t *)rfx->source,FALSE);
-      }
 
+     if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+      // if we are recording, add this change to our event_list
+	rec_param_change(inst,param_number);
+	if (copyto!=-1) rec_param_change(inst,copyto);
+      }
+    
       if (disp_string!=NULL) {
-	gulong blockfunc=(gulong)g_object_get_data(G_OBJECT(entry),"blockfunc");
-	g_signal_handler_block(entry,blockfunc);
-	gtk_entry_set_text(entry,disp_string);
-	g_signal_handler_unblock(entry,blockfunc);
+	g_signal_handlers_block_by_func(combo,(gpointer)after_string_list_changed,(gpointer)rfx);
+	lives_combo_set_active_string (LIVES_COMBO(combo),disp_string);
+	g_signal_handlers_unblock_by_func(combo,(gpointer)after_string_list_changed,(gpointer)rfx);
 	weed_free(disp_string);
       } 
+      
+      if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
+	weed_reinit_effect(inst,FALSE);
+	was_reinited=TRUE;
+      }
+
     }
   }
 
   if (old_index!=new_index&&param->onchange) {
     param->change_blocked=TRUE;
-    do_onchange(G_OBJECT(entry), rfx);
-    while (g_main_context_iteration(NULL,FALSE));
+    retvals=do_onchange(G_OBJECT(combo), rfx);
+    if (retvals!=NULL) {
+      g_list_free_strings (retvals);
+      g_list_free (retvals);
+    }
+    lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  if (param->copy_to!=-1) update_visual_params(rfx,FALSE);
+  if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
     activate_mt_preview(mainw->multitrack);
   }
@@ -2567,7 +2681,7 @@
 
 
 
-gchar *param_marshall (lives_rfx_t *rfx, gboolean with_min_max) {
+gchar *param_marshall (lives_rfx_t *rfx, boolean with_min_max) {
   // this function will marshall all parameters into a space separated string
   // in case of string parameters, these will be surrounded by " and all 
   // quotes will be escaped \"
@@ -2661,7 +2775,8 @@
 	cb_frames=count_resampled_frames(clipboard->frames,clipboard->fps,cfile->fps);
       }
 
-      if (cfile->end-cfile->start+1>(cb_frames*(ttl=gtk_spin_button_get_value_as_int
+      if (merge_opts->spinbutton_loops!=NULL&&
+	  cfile->end-cfile->start+1>(cb_frames*(ttl=gtk_spin_button_get_value_as_int
 						(GTK_SPIN_BUTTON (merge_opts->spinbutton_loops))))&&
 	  !merge_opts->loop_to_fit) {
 	end=cb_frames*ttl;
@@ -2694,7 +2809,7 @@
 
   gchar *word=NULL;
   int i;
-  gboolean lastword=FALSE;
+  boolean lastword=FALSE;
   gchar *ret=g_strdup (""),*ret2;
 
   gchar *tmp;
@@ -2738,7 +2853,7 @@
 }
 
 
-void param_demarshall (lives_rfx_t *rfx, GList *plist, gboolean with_min_max, gboolean upd) {
+void param_demarshall (lives_rfx_t *rfx, GList *plist, boolean with_min_max, boolean upd) {
   int i;
   gint pnum=0;
   lives_param_t *param;
@@ -2782,17 +2897,19 @@
 
 
 
-gint set_param_from_list(GList *plist, lives_param_t *param, gint pnum, gboolean with_min_max, gboolean upd) {
+int set_param_from_list(GList *plist, lives_param_t *param, gint pnum, boolean with_min_max, boolean upd) {
   // update values for param using values in plist
-  // if upd is TRUE, the widgets for that param also are updated
+  // if upd is TRUE, the widgets for that param also are updated;
+  // otherwise, we do not update the widgets, but we do update the default
 
   // for LIVES_PARAM_NUM, setting pnum negative avoids having to send min,max
+  // (other types dont have a min/max anyway)
+  char *tmp; // work around some weirdness in glib
 
-  gint red,green,blue;
-  gint offs=0;
+  int red,green,blue;
+  int offs=0;
   gint maxlen=g_list_length(plist)-1;
 
-
   if (ABS(pnum)>maxlen) return 0;
 
   switch (param->type) {
@@ -2801,12 +2918,15 @@
       pnum++;
       break;
     }
-    set_bool_param(param->value,(atoi ((gchar *)g_list_nth_data (plist,pnum++))));
+    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+    set_bool_param(param->value,(atoi (tmp)));
     if (upd) {
       if (param->widgets[0]&&GTK_IS_TOGGLE_BUTTON (param->widgets[0])) {
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (param->widgets[0]),get_bool_param(param->value));
+	lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (param->widgets[0]),get_bool_param(param->value));
       }
     }
+    else set_bool_param(param->def,(atoi (tmp)));
+    g_free(tmp);
     break;
   case LIVES_PARAM_NUM:
     if (param->change_blocked) {
@@ -2815,36 +2935,51 @@
       break;
     }
     if (param->dp) {
-      gdouble double_val=g_strtod ((gchar *)g_list_nth_data (plist,pnum++),NULL);
+      double double_val;
+      tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+      double_val=g_strtod (tmp,NULL);
+      g_free(tmp);
       if (with_min_max) {
 	if (ABS(pnum)>maxlen) return 1;
-	param->min=g_strtod ((gchar *)g_list_nth_data (plist,pnum++),NULL);
+	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+	param->min=g_strtod (tmp,NULL);
+	g_free(tmp);
 	if (ABS(pnum)>maxlen) return 2;
-	param->max=g_strtod ((gchar *)g_list_nth_data (plist,pnum++),NULL);
+	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+	param->max=g_strtod (tmp,NULL);
+	g_free(tmp);
 	if (double_val<param->min) double_val=param->min;
 	if (double_val>param->max) double_val=param->max;
       }
       set_double_param(param->value,double_val);
       if (upd) {
 	if (param->widgets[0]&&GTK_IS_SPIN_BUTTON (param->widgets[0])) {
-	  gulong spinfunc=(gulong)g_object_get_data(G_OBJECT(param->widgets[0]),"spinfunc");
-	  g_signal_handler_block(param->widgets[0],spinfunc);
+	  lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(param->widgets[0]),"rfx");
+	  g_signal_handlers_block_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
 	  gtk_spin_button_set_range (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->min,(gdouble)param->max);
 	  gtk_spin_button_update(GTK_SPIN_BUTTON(param->widgets[0]));
-	  g_signal_handler_unblock(param->widgets[0],spinfunc);
+	  g_signal_handlers_unblock_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
 	  gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),get_double_param(param->value));
 	  gtk_spin_button_update(GTK_SPIN_BUTTON(param->widgets[0]));
 	}
       }
+      else set_double_param(param->def,double_val);
     }
     else {
-      gint int_value=atoi ((gchar *)g_list_nth_data (plist,pnum++));
+      gint int_value;
+      tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+      int_value=atoi (tmp);
+      g_free(tmp);
       if (with_min_max) {
 	gint int_min,int_max;
 	if (ABS(pnum)>maxlen) return 1;
-	int_min=atoi ((gchar *)g_list_nth_data (plist,pnum++));
+	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+	int_min=atoi (tmp);
+	g_free(tmp);
 	if (ABS(pnum)>maxlen) return 2;
-	int_max=atoi ((gchar *)g_list_nth_data (plist,pnum++));
+	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+	int_max=atoi (tmp);
+	g_free(tmp);
 	if (int_value<int_min) int_value=int_min;
 	if (int_value>int_max) int_value=int_max;
 	param->min=(gdouble)int_min;
@@ -2854,23 +2989,30 @@
       
       if (upd) {
 	if (param->widgets[0]&&GTK_IS_SPIN_BUTTON (param->widgets[0])) {
-	  gulong spinfunc=(gulong)g_object_get_data(G_OBJECT(param->widgets[0]),"spinfunc");
-	  g_signal_handler_block(param->widgets[0],spinfunc);
+	  lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(param->widgets[0]),"rfx");
+	  g_signal_handlers_block_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
 	  gtk_spin_button_set_range (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)param->min,(gdouble)param->max);
 	  gtk_spin_button_update(GTK_SPIN_BUTTON(param->widgets[0]));
-	  g_signal_handler_unblock(param->widgets[0],spinfunc);
+	  g_signal_handlers_unblock_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
 	  gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[0]),(gdouble)get_int_param(param->value));
 	  gtk_spin_button_update(GTK_SPIN_BUTTON(param->widgets[0]));
 	}
       }
+      else set_int_param(param->def,int_value);
     }
     break;
   case LIVES_PARAM_COLRGB24:
-    red=atoi ((gchar *)g_list_nth_data (plist,pnum++)); // red
+    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+    red=atoi (tmp);
+    g_free(tmp);
     if (ABS(pnum)>maxlen) return 1;
-    green=atoi ((gchar *)g_list_nth_data (plist,pnum++)); // green
+    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+    green=atoi (tmp);
+    g_free(tmp);
     if (ABS(pnum)>maxlen) return 2;
-    blue=atoi ((gchar *)g_list_nth_data (plist,pnum++)); // blue
+    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+    blue=atoi (tmp);
+    g_free(tmp);
     if (param->change_blocked) break;
     set_colRGB24_param(param->value,red,green,blue);
 
@@ -2885,29 +3027,38 @@
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (param->widgets[2]),(gdouble)blue);
       }
     }
+    else set_colRGB24_param(param->def,red,green,blue);
     break;
   case LIVES_PARAM_STRING:
+    if (param->value!=NULL) g_free(param->value);
     param->value=reconstruct_string (plist,pnum,&offs);
     if (upd) {
       if (param->widgets[0]!=NULL) {
-	if ((gint)param->max>RFX_TEXT_MAGIC||param->max==0.) {
-	  GtkTextBuffer *textbuffer=GTK_TEXT_BUFFER (g_object_get_data(G_OBJECT(param->widgets[0]),"textbuffer"));
-	  gtk_text_buffer_set_text (textbuffer, (gchar *)param->value, -1);
+	if (GTK_IS_TEXT_VIEW(param->widgets[0])) {
+	  gchar *string=g_strdup((gchar *)param->value); // work around bug in glib ???
+	  text_view_set_text (LIVES_TEXT_VIEW(param->widgets[0]), string, -1);
+	  g_free(string);
 	}
 	else {
 	  gtk_entry_set_text (GTK_ENTRY (param->widgets[0]),(gchar *)param->value);
 	}
       }
     }
+    else param->def=(void *)g_strdup((gchar *)param->value);
     pnum+=offs;
     break;
   case LIVES_PARAM_STRING_LIST:
     {
-      gint int_value=atoi ((gchar *)g_list_nth_data (plist,pnum++));
+      gint int_value;
+      tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
+      int_value=atoi (tmp);
+      g_free(tmp);
       if (param->change_blocked) break;
       set_int_param(param->value,int_value);
-      if (upd&&param->widgets[0]!=NULL&&GTK_IS_COMBO(param->widgets[0])&&int_value<g_list_length(param->list))
-	gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(param->widgets[0])->entry),(gchar *)g_list_nth_data(param->list,int_value));
+      if (upd&&param->widgets[0]!=NULL&&LIVES_IS_COMBO(param->widgets[0])&&int_value<g_list_length(param->list))
+	lives_combo_set_active_string(LIVES_COMBO(param->widgets[0]),(gchar *)g_list_nth_data(param->list,int_value));
+      if (!upd) set_int_param(param->def,int_value);
+
       break;
     }
   default:
@@ -2917,28 +3068,29 @@
 }
 
 
-void do_onchange (GObject *object, lives_rfx_t *rfx) {
+GList *do_onchange (GObject *object, lives_rfx_t *rfx) {
   gint which=GPOINTER_TO_INT (g_object_get_data (object,"param_number"));
   gchar *com,*tmp;
   GList *retvals;
-  gint width=0,height=0;
+  int width=0,height=0;
   gchar *plugdir;
 
   const gchar *handle="";
 
-  if (rfx->status==RFX_STATUS_WEED) return;
+  // weed plugins do not have triggers
+  if (rfx->status==RFX_STATUS_WEED) return NULL;
 
   if (which<0) {
     // init
     switch (rfx->status) {
     case RFX_STATUS_BUILTIN:
-      plugdir=g_strdup_printf ("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN);
+      plugdir=g_build_filename (prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,NULL);
       break;
     case RFX_STATUS_CUSTOM:
-      plugdir=g_strdup_printf ("%s/%s%s",capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM);
+      plugdir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM,NULL);
       break;
     case RFX_STATUS_TEST:
-      plugdir=g_strdup_printf ("%s/%s%s",capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST);
+      plugdir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST,NULL);
       break;
     default:
       plugdir=g_strdup_printf ("%s",prefs->tmpdir);
@@ -2950,7 +3102,7 @@
       handle=cfile->handle;
     }
 
-    com=g_strdup_printf ("smogrify \"fxinit_%s\" \"%s\" \"%s\" %d %d %s",rfx->name,handle,plugdir,
+    com=g_strdup_printf ("%s \"fxinit_%s\" \"%s\" \"%s\" %d %d %s",prefs->backend_sync,rfx->name,handle,plugdir,
 			 width,height,(tmp=param_marshall (rfx,TRUE)));
     retvals=plugin_request_by_space (NULL,NULL,com);
 
@@ -2976,8 +3128,6 @@
 
   if (retvals!=NULL) {
     param_demarshall (rfx,retvals,TRUE,which>=0);
-    g_list_free_strings (retvals);
-    g_list_free (retvals);
   }
   else {
     if (which<=0&&mainw->error) {
@@ -2987,19 +3137,24 @@
   }
   g_free (com);
 
+  return retvals;
+
 }
 
 
 
-void
-on_pwcolsel (GtkButton *button, lives_rfx_t *rfx)
-{
+void on_pwcolsel (GtkButton *button, lives_rfx_t *rfx) {
   GdkColor selected;
   gint pnum=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),"param_number"));
   lives_param_t *param=&rfx->params[pnum];
 
   gtk_color_button_get_color(GTK_COLOR_BUTTON(button),&selected);
 
+  set_colRGB24_param(param->value,
+		     (gint)((selected.red+128)/257),
+		     (gint)((selected.green+128)/257),
+		     (gint)((selected.blue+128)/257));
+
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(param->widgets[0]),(gdouble)(gint)((selected.red+128)/257));
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(param->widgets[1]),(gdouble)(gint)((selected.green+128)/257));
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(param->widgets[2]),(gdouble)(gint)((selected.blue+128)/257));
@@ -3009,30 +3164,42 @@
 
 
 
-void update_visual_params(lives_rfx_t *rfx, gboolean update_hidden) {
+void update_visual_params(lives_rfx_t *rfx, boolean update_hidden) {
   // update parameters visually from an rfx object
-  int i,j,error;
-  weed_plant_t *inst=(weed_plant_t *)rfx->source;
+  GList *list;
+
   weed_plant_t **in_params,*in_param;
-  int num_params=0;
+  weed_plant_t *inst=(weed_plant_t *)rfx->source;
   weed_plant_t *paramtmpl;
-  int param_hint;
-  int *valis,vali,mini,maxi;
-  gchar *vals,**valss;
-  double *valds,vald,mind,maxd;
-  int cspace;
-  GList *list;
-  int *colsi,*colsis;
-  double *colsd,*colsds;
-  int red_max,green_max,blue_max;
-  int red_min,green_min,blue_min;
+
+
+  int *colsi,*colsis,*valis;
   int *maxis=NULL,*minis=NULL;
+
+  double *colsd,*colsds,*valds;
   double *maxds=NULL,*minds=NULL;
+
   double red_maxd,green_maxd,blue_maxd;
   double red_mind,green_mind,blue_mind;
-  int index,numvals;
-  gchar *pattern;
+  double vald,mind,maxd;
+
+  gchar **valss;
+
+  gchar *vals,*pattern;
   gchar *tmp,*tmp2;
+
+  int cspace;
+  int error;
+  int num_params=0;
+  int param_hint;
+  int vali,mini,maxi;
+
+  int red_max,green_max,blue_max;
+  int red_min,green_min,blue_min;
+
+  int index,numvals;
+
+  register int i,j;
     
   if (weed_plant_has_leaf(inst,"in_parameters")) num_params=weed_leaf_num_elements(inst,"in_parameters");
   if (num_params==0) return;
@@ -3040,6 +3207,7 @@
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   for (i=0;i<num_params;i++) {
     if (!is_hidden_param(inst,i)||update_hidden) {
+      // by default we dont update hidden or reinit params
 
       in_param=in_params[i];
       paramtmpl=weed_get_plantptr_value(in_param,"template",&error);
@@ -3050,13 +3218,16 @@
       // most of the time this will be ok, as other such multivalued parameters should be hidden
       index=0;
 
-      if (mainw->multitrack!=NULL&&mainw->multitrack->track_index!=-1&&is_perchannel_multi(rfx,i)) 
+      if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,i)) {
 	index=mainw->multitrack->track_index;
+      }
+
+      pthread_mutex_lock(&mainw->data_mutex);
 
       numvals=weed_leaf_num_elements(in_param,"value");
 
       if (param_hint!=WEED_HINT_COLOR&&index>=numvals) {
-	fill_param_vals_to(paramtmpl,in_param,i,param_hint,index);
+	fill_param_vals_to(in_param,paramtmpl,index);
 	numvals=index+1;
       }
 
@@ -3095,7 +3266,7 @@
 	    pattern=g_strdup_printf("%%.%df",dp);
 	  }
 	}
-	
+
 	list=g_list_append(list,g_strdup_printf(pattern,vald));
 	list=g_list_append(list,g_strdup_printf(pattern,mind));
 	list=g_list_append(list,g_strdup_printf(pattern,maxd));
@@ -3138,7 +3309,7 @@
 	switch (cspace) {
 	case WEED_COLORSPACE_RGB:
 	  numvals=weed_leaf_num_elements(in_param,"value");
-	  if (index*3>=numvals) fill_param_vals_to(paramtmpl,in_param,i,param_hint,index);
+	  if (index*3>=numvals) fill_param_vals_to(in_param,paramtmpl,index);
 
 	  if (weed_leaf_seed_type(paramtmpl,"default")==WEED_SEED_INT) {
 	    colsis=weed_get_int_array(in_param,"value",&error);
@@ -3235,6 +3406,7 @@
 	break;
       } // hint
     }
+    pthread_mutex_unlock(&mainw->data_mutex);
   }
   weed_free(in_params);
 }

LiVES-1.6.1.tar.bz2/src/paramwindow.h -> LiVES-2.0.3.tar.bz2/src/paramwindow.h Changed

@@ -1,6 +1,6 @@
 // paramwindow.h
 // LiVES
-// (c) G. Finch 2004 - 2011 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for licensing details
 
@@ -14,13 +14,9 @@
 } lives_widget_group_t;
 
 
-#define RFX_TEXT_MAGIC 80
-#define RFX_DEF_NUM_MAX 1000000.
+#define RFX_TEXT_MAGIC 80 ///< length at which entry turns into textview
+#define RFX_DEF_NUM_MAX 1000000. ///< default param max when not defined
 
-#define RFX_WINSIZE_H 600
-#define RFX_WINSIZE_V 400
-
-#define DEF_BUTTON_WIDTH 80
 
 void on_paramwindow_ok_clicked (GtkButton *, lives_rfx_t *);
 void on_paramwindow_cancel_clicked (GtkButton *, lives_rfx_t *);
@@ -29,12 +25,10 @@
 void on_render_fx_pre_activate (GtkMenuItem *, lives_rfx_t *);
 void on_render_fx_activate (GtkMenuItem *, lives_rfx_t *);
 
-gboolean make_param_box(GtkVBox *, lives_rfx_t *);
+boolean make_param_box(GtkVBox *, lives_rfx_t *);
 
-gboolean add_param_to_box (GtkBox *, lives_rfx_t *, gint param_number, gboolean add_slider);
-void add_hsep_to_box (GtkBox *);
-void add_fill_to_box (GtkBox *);
-void add_label_to_box (GtkBox *box, gboolean do_trans, const gchar *text);
+boolean add_param_to_box (GtkBox *, lives_rfx_t *, gint param_number, boolean add_slider);
+void add_param_label_to_box (GtkBox *box, boolean do_trans, const gchar *text);
 
 GSList *add_usrgrp_to_livesgrp (GSList *u2l, GSList *rbgroup, gint usr_number);
 lives_widget_group_t *livesgrp_from_usrgrp (GSList *u2l, gint usrgrp);
@@ -45,25 +39,30 @@
 void after_param_green_changed (GtkSpinButton *, lives_rfx_t * rfx);
 void after_param_blue_changed (GtkSpinButton *, lives_rfx_t * rfx);
 void after_param_alpha_changed (GtkSpinButton *, lives_rfx_t * rfx);
-gboolean after_param_text_focus_changed (GtkWidget *, GtkWidget *, lives_rfx_t *rfx);
+boolean after_param_text_focus_changed (GtkWidget *, GtkWidget *, lives_rfx_t *rfx);
 void after_param_text_changed (GtkWidget *, lives_rfx_t *rfx);
-void after_string_list_changed (GtkEntry *, lives_rfx_t *rfx);
+void after_string_list_changed (GtkComboBox *, lives_rfx_t *rfx);
 
 void on_pwcolsel (GtkButton *button, lives_rfx_t *);
 
-gchar *param_marshall (lives_rfx_t *rfx, gboolean with_min_max);
+gchar *param_marshall (lives_rfx_t *rfx, boolean with_min_max);
 gchar **param_marshall_to_argv (lives_rfx_t *rfx);
-void param_demarshall (lives_rfx_t *rfx, GList *plist, gboolean with_min_max, gboolean update_widgets);
-gint set_param_from_list(GList *plist, lives_param_t *param, gint pnum, gboolean with_min_max, gboolean upd);
+void param_demarshall (lives_rfx_t *rfx, GList *plist, boolean with_min_max, boolean update_widgets);
+int set_param_from_list(GList *plist, lives_param_t *param, gint pnum, boolean with_min_max, boolean upd);
 GList *argv_to_marshalled_list (lives_rfx_t *rfx, gint argc, gchar **argv);
 
 /// object should have g_set_object_data "param_number" set to parameter number
 ///
 /// (0 based, -ve for init onchanges)
-void do_onchange (GObject *object, lives_rfx_t *);
+GList *do_onchange (GObject *object, lives_rfx_t *) WARN_UNUSED;
+GList *do_onchange_init(lives_rfx_t *rfx) WARN_UNUSED;
+
+
+
+void update_weed_color_value(weed_plant_t *inst, int pnum, int c1, int c2, int c3, int c4);
 
+void update_visual_params(lives_rfx_t *rfx, boolean update_hidden);
 
-void update_weed_color_value(weed_plant_t *param, int pnum, weed_plant_t *copy_to, int c1, int c2, int c3, int c4);
 
 
 #endif

LiVES-1.6.1.tar.bz2/src/plugins.c -> LiVES-2.0.3.tar.bz2/src/plugins.c Changed

@@ -1,6 +1,6 @@
 // plugins.c
 // LiVES
-// (c) G. Finch 2003 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2003 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -31,14 +31,14 @@
 
 const char *anames[AUDIO_CODEC_MAX]={"mp3","pcm","mp2","vorbis","AC3","AAC","AMR_NB","raw","wma2",""};
 
-static gboolean list_plugins;
+static boolean list_plugins;
 
 
 ///////////////////////
 // command-line plugins
 
 
-static GList *get_plugin_result (const gchar *command, const gchar *delim, gboolean allow_blanks) {
+static GList *get_plugin_result (const gchar *command, const gchar *delim, boolean allow_blanks) {
 
   GList *list=NULL;
   gchar **array;
@@ -48,7 +48,7 @@
   int retval;
   int alarm_handle;
   gint error;
-  gboolean timeout;
+  boolean timeout;
 
   gchar *msg,*buf;
 
@@ -58,7 +58,12 @@
 
   threaded_dialog_spin();
 
+#ifndef IS_MINGW
   outfile=g_strdup_printf ("%s/.smogplugin.%d",prefs->tmpdir,getpid());
+#else
+  outfile=g_strdup_printf ("%s/smogplugin.%d",prefs->tmpdir,getpid());
+#endif
+
   unlink(outfile);
 
   com=g_strconcat (command," > \"",outfile,"\"",NULL);
@@ -80,6 +85,7 @@
 	msg=g_strdup_printf (_("\nPlugin error: %s failed with code %d"),command,error/256);
 	if (bytes) {
 	  msg2=g_strconcat (msg,g_strdup_printf (_ (" : message was %s\n"),buffer),NULL);
+	  g_snprintf(mainw->msg,512,"%s",buffer);
 	}
 	else {
 	  msg2=g_strconcat (msg,"\n",NULL);
@@ -91,6 +97,7 @@
     }
     g_free (outfile);
     threaded_dialog_spin();
+    unlink(outfile);
     return list;
   }
   g_free (com);
@@ -125,6 +132,7 @@
       bytes=read (outfile_fd,&buffer,65535);
       close (outfile_fd);
       unlink (outfile);
+
       if (bytes<0) {
 	retval=do_read_failed_error_s_with_retry(outfile,NULL,NULL);
       }
@@ -135,6 +143,7 @@
     }
   } while (retval==LIVES_RETRY);
 
+  unlink (outfile);
   g_free (outfile);
 
   if (retval==LIVES_CANCEL) {
@@ -142,9 +151,9 @@
     return list;
   }
 
-
+  //#define DEBUG_PLUGINS
 #ifdef DEBUG_PLUGINS
-  g_print("plugin msg: %s %d\n",buffer,error);
+  g_printerr("plugin msg: %s %d\n",buffer,error);
 #endif
   
   if (error==256) {
@@ -157,7 +166,7 @@
   array=g_strsplit(buffer,delim,pieces);
   for (i=0;i<pieces;i++) {
     if (array[i]!=NULL) {
-      buf=g_strdup(g_strchomp (g_strchug(array[i])));
+      buf=g_strdup(g_strstrip(array[i]));
       if (strlen (buf)||allow_blanks) {
 	list=g_list_append (list, buf);
       }
@@ -190,12 +199,20 @@
 
 
 GList * plugin_request_common (const gchar *plugin_type, const gchar *plugin_name, const gchar *request, 
-			       const gchar *delim, gboolean allow_blanks) {
+			       const gchar *delim, boolean allow_blanks) {
   // returns a GList of responses to -request, or NULL on error
   // by_line says whether we split on '\n' or on '|'
+
+  // NOTE: request must not be quoted here, since it contains a list of parameters
+  // instead, caller should ensure that any strings in *request are suitably escaped and quoted
+  // e.g. by calling param_marshall()
+
   GList *reslist=NULL;
   gchar *com,*comfile;
 
+#ifdef IS_MINGW
+  gchar *ext,*cmd;
+#endif
 
   if (plugin_type!=NULL) {
 
@@ -214,11 +231,44 @@
     else {
       comfile=g_build_filename (prefs->lib_dir,PLUGIN_EXEC_DIR,plugin_type,plugin_name,NULL);
     }
+
+#ifndef IS_MINGW
+    //#define DEBUG_PLUGINS
 #ifdef DEBUG_PLUGINS
-    com=g_strdup_printf ("\"%s\" \"%s\"",comfile,request);
+    com=g_strdup_printf ("\"%s\" %s",comfile,request);
+    g_printerr("will run: %s\n",com);
 #else
-    com=g_strdup_printf ("\"%s\" \"%s\" 2>/dev/null",comfile,request);
+    com=g_strdup_printf ("\"%s\" %s 2>/dev/null",comfile,request);
 #endif
+
+#else
+    // check by file extension
+
+    ext=get_extension(comfile);
+    if (!strcmp(ext,"py")) {
+      if (!capable->has_python) {
+	g_free(ext);
+	g_free(comfile);
+	return reslist;
+      }
+      cmd=g_strdup("python");
+    }
+
+    else cmd=g_strdup("perl");
+
+    //#define DEBUG_PLUGINS
+#ifdef DEBUG_PLUGINS
+    com=g_strdup_printf ("%s \"%s\" %s",cmd,comfile,request);
+    g_printerr("will run: %s\n",com);
+#else
+    com=g_strdup_printf ("%s \"%s\" %s 2>NUL",cmd,comfile,request);
+#endif
+
+    g_free(ext);
+    g_free(cmd);
+
+#endif
+
     g_free(comfile);
   }
   else com=g_strdup (request);
@@ -233,7 +283,7 @@
 //////////////////
 // get list of plugins of various types
 
-GList *get_plugin_list (const gchar *plugin_type, gboolean allow_nonex, const gchar *plugdir, const gchar *filter_ext) {
+GList *get_plugin_list (const gchar *plugin_type, boolean allow_nonex, const gchar *plugdir, const gchar *filter_ext) {
   // returns a GList * of plugins of type plugin_type
   // returns empty list if there are no plugins of that type
 
@@ -248,34 +298,44 @@
   const gchar *ext=(filter_ext==NULL)?"":filter_ext;
 
   if (!strcmp(plugin_type,PLUGIN_THEMES)) {
-    com=g_strdup_printf ("smogrify list_plugins 0 1 \"%s%s\" \"\"",prefs->prefix_dir,THEME_DIR);
+    com=g_strdup_printf ("%s list_plugins 0 1 \"%s%s\" \"\"",prefs->backend_sync,prefs->prefix_dir,THEME_DIR);
   }
   else if (!strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS)||
 	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS)||
-	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM)||!strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_TEST)) {
+	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM)||
+	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_TEST)||
+	   !strcmp (plugin_type,PLUGIN_COMPOUND_EFFECTS_CUSTOM)
+	   ) {
     // look in home
-    com=g_strdup_printf ("smogrify list_plugins %d 0 \"%s/%s%s\" \"%s\"",allow_nonex,capable->home_dir,
+    com=g_strdup_printf ("%s list_plugins %d 0 \"%s/%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,capable->home_dir,
 			 LIVES_CONFIG_DIR,plugin_type,ext);
   }
   else if (!strcmp(plugin_type,PLUGIN_EFFECTS_WEED)) {
-    com=g_strdup_printf ("smogrify list_plugins 1 1 \"%s\" \"%s\"",
+    com=g_strdup_printf ("%s list_plugins 1 1 \"%s\" \"%s\"",prefs->backend_sync,
 			 (tmp=g_filename_from_utf8(plugdir,-1,NULL,NULL,NULL)),ext);
     g_free(tmp);
   }
   else if (!strcmp(plugin_type,PLUGIN_DECODERS)) {
-    com=g_strdup_printf ("smogrify list_plugins 1 0 \"%s\" \"%s\"",
+    com=g_strdup_printf ("%s list_plugins 1 0 \"%s\" \"%s\"",prefs->backend_sync,
 			 (tmp=g_filename_from_utf8(plugdir,-1,NULL,NULL,NULL)),ext);
     g_free(tmp);
   }
   else if (!strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS)) {
-    com=g_strdup_printf ("smogrify list_plugins %d 0 \"%s%s%s\" \"%s\"",allow_nonex,prefs->prefix_dir,
+    com=g_strdup_printf ("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->prefix_dir,
 			 PLUGIN_SCRIPTS_DIR,plugin_type,ext);
   }
+  else if (!strcmp(plugin_type,PLUGIN_COMPOUND_EFFECTS_BUILTIN)) {
+    com=g_strdup_printf ("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->prefix_dir,
+			 PLUGIN_COMPOUND_DIR,plugin_type,ext);
+  }
   else {
-    com=g_strdup_printf ("smogrify list_plugins %d 0 \"%s%s%s\" \"%s\"",allow_nonex,prefs->lib_dir,
+    com=g_strdup_printf ("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->lib_dir,
 			 PLUGIN_EXEC_DIR,plugin_type,ext);
   }
   list_plugins=TRUE;
+
+  //g_print("\n\n\nLIST CMD: %s\n",com);
+
   pluglist=get_plugin_result (com,"|",FALSE);
   g_free(com);
   threaded_dialog_spin();
@@ -331,6 +391,10 @@
     return;
   }
 
+#ifdef IS_MINGW
+  setmode(fd, O_BINARY);
+#endif
+
   msg=g_strdup_printf(_("Updating video playback plugin defaults in %s\n"),vpp_file);
   LIVES_INFO(msg);
   g_free(msg);
@@ -401,6 +465,11 @@
     }
     else {
       do {
+
+#ifdef IS_MINGW
+  setmode(fd, O_BINARY);
+#endif
+
 	mainw->read_failed=FALSE;
 	msg=g_strdup("LiVES vpp defaults file version 2\n");
 	len=lives_read(fd,buf,strlen(msg),FALSE);
@@ -512,7 +581,7 @@
   _vid_playback_plugin *vpp=vppw->plugin;
 
   gtk_widget_destroy(vppw->dialog);
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_widget_context_update();
   if (vpp!=NULL&&vpp!=mainw->vpp) {
     // close the temp current vpp
     close_vid_playback_plugin(vpp);
@@ -527,7 +596,7 @@
 
   if (prefsw!=NULL) {
     gtk_window_present(GTK_WINDOW(prefsw->prefs_dialog));
-    gdk_window_raise(prefsw->prefs_dialog->window);
+    gdk_window_raise(lives_widget_get_xwindow(prefsw->prefs_dialog));
   }
 }
 
@@ -539,7 +608,7 @@
   const gchar *tmp;
   int *pal_list,i=0;
 
-  unsigned long xwinid=0;
+  uint64_t xwinid=0;
 
   _vid_playback_plugin *vpp=vppw->plugin;
 
@@ -624,23 +693,24 @@
 
 	      }
 
-	      if (vpp->set_yuv_palette_clamping!=NULL) (*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
+
+	      if (prefs->play_monitor!=0) {
+		if (mainw->play_window!=NULL) {
+		  xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
+		  if (xwinid==-1) return;
+		}
+	      }
 
 #ifdef RT_AUDIO
+	      if (vpp->set_yuv_palette_clamping!=NULL) (*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
+	      
 	      if (mainw->vpp->audio_codec!=AUDIO_CODEC_NONE&&prefs->stream_audio_out) {
 		start_audio_stream();
 	      }
-#endif
 
-	      if (prefs->play_monitor!=0) {
-#ifdef USE_X11
-		if (mainw->play_window!=NULL)
-		  xwinid=(unsigned long)GDK_WINDOW_XWINDOW(mainw->play_window->window);
-#else
-		LIVES_WARN("Tried to get XID for non X11 Window !");
 #endif
-	      }
 
+	      
 	      if (vpp->init_screen!=NULL) {
 		(*vpp->init_screen)(mainw->pwidth,mainw->pheight,TRUE,xwinid,vpp->extra_argc,vpp->extra_argv);
 	      }
@@ -775,7 +845,7 @@
   }
 
   // get filename
-  save_file=choose_file(NULL,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
+  save_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
   if (save_file==NULL) return;
 
   // save
@@ -800,24 +870,27 @@
   GtkWidget *cancelbutton;
   GtkWidget *okbutton;
   GtkWidget *savebutton;
-  GObject *spinbutton_adj;
 
-  gchar *title;
+  GtkAccelGroup *accel_group;
+
+  _vppaw *vppa;
+
+  _vid_playback_plugin *tmpvpp;
 
-  const gchar *pversion;
-  const gchar *desc;
-  const char *fps_list;
   int *pal_list;
+
   GList *fps_list_strings=NULL;
   GList *pal_list_strings=NULL;
 
   const gchar *string;
+  const gchar *pversion;
+  const gchar *desc;
+  const char *fps_list;
 
-  gchar *ctext=NULL;
-
-  _vppaw *vppa;
+  gchar *title;
+  gchar *tmp,*tmp2;
 
-  _vid_playback_plugin *tmpvpp;
+  gchar *ctext=NULL;
 
   gchar *com;
   
@@ -837,9 +910,16 @@
   vppa->spinbuttonh=vppa->spinbuttonw=NULL;
   vppa->pal_entry=vppa->fps_entry=NULL;
 
-  vppa->dialog = gtk_dialog_new ();
+  pversion=(tmpvpp->version)();
+
+  title=g_strdup_printf("LiVES: - %s",pversion);
+
+  vppa->dialog = lives_standard_dialog_new (title,FALSE);
+  g_free(title);
+
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (vppa->dialog), accel_group);
 
-  gtk_window_set_position (GTK_WINDOW (vppa->dialog), GTK_WIN_POS_CENTER_ALWAYS);
   if (prefs->show_gui) {
     if (prefsw!=NULL) gtk_window_set_transient_for(GTK_WINDOW(vppa->dialog),GTK_WINDOW(prefsw->prefs_dialog));
     else {
@@ -848,72 +928,22 @@
     }
   }
 
-  if (prefs->gui_monitor!=0) {
-    gtk_window_set_screen(GTK_WINDOW(vppa->dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
-  }
-
-  gtk_window_set_modal (GTK_WINDOW (vppa->dialog), TRUE);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(vppa->dialog),FALSE);
-    gtk_widget_modify_bg (vppa->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_window_set_default_size (GTK_WINDOW (vppa->dialog), 600, 400);
-
-  gtk_container_set_border_width (GTK_CONTAINER (vppa->dialog), 10);
-
-  pversion=(tmpvpp->version)();
-  title=g_strdup_printf("LiVES: - %s",pversion);
-  gtk_window_set_title (GTK_WINDOW (vppa->dialog), title);
-  g_free(title);
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(vppa->dialog));
-  gtk_widget_show (dialog_vbox);
-
 
   // the filling...
   if (tmpvpp->get_description!=NULL) {
     desc=(tmpvpp->get_description)();
     if (desc!=NULL) {
-      label = gtk_label_new (desc);
-      
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
-      
-      gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 10);
+      label = lives_standard_label_new (desc);
+      gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
     }
   }
 
-  // fps
-  combo = gtk_combo_new ();
 
   if (tmpvpp->get_fps_list!=NULL&&(fps_list=(*tmpvpp->get_fps_list)(tmpvpp->palette))!=NULL) {
     int nfps,i;
     gchar **array=g_strsplit (fps_list,"|",-1);
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    add_fill_to_box(GTK_BOX(hbox));
-
-    gtk_widget_set_tooltip_text( combo, _("Fixed framerate for plugin.\n"));
-    
-    label = gtk_label_new_with_mnemonic (_("_FPS"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),GTK_COMBO(combo)->entry);
-  
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 10);
-    add_fill_to_box(GTK_BOX(hbox));
-
-    vppa->fps_entry=(GTK_COMBO(combo))->entry;
 
-    gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO (combo))->entry),FALSE);
-    
     nfps=get_token_count((gchar *)fps_list,'|');
     for (i=0;i<nfps;i++) {
       if (strlen(array[i])&&strcmp(array[i],"\n")) {
@@ -924,7 +954,16 @@
       }
     }
 
-    combo_set_popdown_strings (GTK_COMBO (combo), fps_list_strings);
+    // fps
+    combo = lives_standard_combo_new ((tmp=g_strdup(_("_FPS"))),TRUE,fps_list_strings,
+				      LIVES_BOX(dialog_vbox),(tmp2=g_strdup(_("Fixed framerate for plugin.\n"))));
+
+    g_free(tmp);
+    g_free(tmp2);
+    vppa->fps_entry=lives_combo_get_entry(LIVES_COMBO(combo));
+    gtk_entry_set_width_chars (GTK_ENTRY (lives_combo_get_entry(LIVES_COMBO(combo))), 14);
+
+
     g_list_free_strings(fps_list_strings);
     g_list_free(fps_list_strings);
     fps_list_strings=NULL;
@@ -946,69 +985,30 @@
   // frame size
 
   if (!(tmpvpp->capabilities&VPP_LOCAL_DISPLAY)) {
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     
     add_fill_to_box(GTK_BOX(hbox));
-    label=gtk_label_new_with_mnemonic(_("_Width"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    
-    spinbutton_adj = (GObject *)gtk_adjustment_new (tmpvpp->fwidth>0?tmpvpp->fwidth:DEF_VPP_HSIZE, 4., 100000, 4, 4, 0.);
-    vppa->spinbuttonw = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 4, 0);
 
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),vppa->spinbuttonw);
-    gtk_box_pack_start (GTK_BOX (hbox), vppa->spinbuttonw, FALSE, FALSE, 10);
-    gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (vppa->spinbuttonw),GTK_UPDATE_IF_VALID);
-    
+    vppa->spinbuttonw = lives_standard_spin_button_new (_("_Width"),TRUE,
+							tmpvpp->fwidth>0?tmpvpp->fwidth:DEF_VPP_HSIZE, 
+							4., MAX_FRAME_WIDTH, 4., 4., 0, LIVES_BOX(hbox),NULL);
+
     add_fill_to_box(GTK_BOX(hbox));
     
-    label=gtk_label_new_with_mnemonic(_("_Height"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    
-    spinbutton_adj = (GObject *)gtk_adjustment_new (tmpvpp->fheight>0?tmpvpp->fheight:DEF_VPP_VSIZE, 4., 100000, 4, 4, 0.);
-    vppa->spinbuttonh = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 4, 0);
+    vppa->spinbuttonh = lives_standard_spin_button_new (_("_Height"),TRUE,
+							tmpvpp->fheight>0?tmpvpp->fheight:DEF_VPP_VSIZE, 
+							4., MAX_FRAME_HEIGHT, 4., 4., 0, LIVES_BOX(hbox),NULL);
 
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),vppa->spinbuttonh);
-    gtk_box_pack_start (GTK_BOX (hbox), vppa->spinbuttonh, FALSE, FALSE, 10);
-    gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (vppa->spinbuttonh),GTK_UPDATE_IF_VALID);
     add_fill_to_box(GTK_BOX(hbox));
   }
 
   
   // palette
 
-  combo = gtk_combo_new ();
   if (tmpvpp->get_palette_list!=NULL&&(pal_list=(*tmpvpp->get_palette_list)())!=NULL) {
     int i;
     
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    add_fill_to_box(GTK_BOX(hbox));
-    
-    gtk_widget_set_tooltip_text( combo, _("Colourspace input to the plugin.\n"));
-    
-    label = gtk_label_new_with_mnemonic (_("_Colourspace"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),GTK_COMBO(combo)->entry);
-  
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 10);
-    add_fill_to_box(GTK_BOX(hbox));
-
-    vppa->pal_entry=(GTK_COMBO(combo))->entry;
-
-    gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO (combo))->entry),FALSE);
-    gtk_entry_set_activates_default(GTK_ENTRY((GTK_COMBO(combo))->entry),TRUE);
-    
     for (i=0;pal_list[i]!=WEED_PALETTE_END;i++) {
       int j=0;
       string=weed_palette_get_name(pal_list[i]);
@@ -1024,7 +1024,12 @@
 	pal_list_strings=g_list_append (pal_list_strings, g_strdup(string));
       }
     }
-    combo_set_popdown_strings (GTK_COMBO (combo), pal_list_strings);
+
+    combo = lives_standard_combo_new ((tmp=g_strdup(_("_Colourspace"))),TRUE,pal_list_strings,
+				      LIVES_BOX(dialog_vbox),tmp2=g_strdup(_("Colourspace input to the plugin.\n")));
+    g_free(tmp);
+    g_free(tmp2);
+    vppa->pal_entry=lives_combo_get_entry(LIVES_COMBO(combo));
 
     if (tmpvpp->get_yuv_palette_clamping!=NULL&&weed_palette_is_yuv_palette(tmpvpp->palette)) {
       int *clampings=tmpvpp->get_yuv_palette_clamping(tmpvpp->palette);
@@ -1041,20 +1046,16 @@
 
   // extra params
 
-  if (tmpvpp->get_rfx!=NULL) {
-    GtkWidget *vbox=gtk_vbox_new (FALSE, 0);
-    GtkWidget *scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-    gtk_widget_set_size_request (scrolledwindow, RFX_WINSIZE_H, RFX_WINSIZE_V/2);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_widget_show (scrolledwindow);
-    
+  if (tmpvpp->get_init_rfx!=NULL) {
+    GtkWidget *vbox=lives_vbox_new (FALSE, 0);
+    GtkWidget *scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V/2, vbox);
     gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
-    gtk_widget_show (vbox);
-    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), vbox);
-
-    com=g_strdup_printf("/bin/echo -e \"%s\"",(*tmpvpp->get_rfx)());
-
+#ifndef IS_MINGW
+    com=g_strdup_printf("/bin/echo -e \"%s\"",(*tmpvpp->get_init_rfx)());
+#else
+    com=g_strdup_printf("echo.exe -e \"%s\"",(*tmpvpp->get_init_rfx)());
+#endif
     plugin_run_param_window(com,GTK_VBOX(vbox),&(vppa->rfx));
     g_free(com);
     if (tmpvpp->extra_argv!=NULL&&tmpvpp->extra_argc>0) {
@@ -1071,19 +1072,21 @@
 
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_widget_set_can_focus (cancelbutton,TRUE);
+
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
 
   savebutton = gtk_button_new_from_stock ("gtk-save-as");
-  gtk_widget_show (savebutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), savebutton, 1);
-  GTK_WIDGET_SET_FLAGS (savebutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus (savebutton,TRUE);
   gtk_widget_set_tooltip_text( savebutton, _("Save settings to an alternate file.\n"));
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (vppa->dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		    G_CALLBACK (on_vppa_cancel_clicked),
@@ -1101,26 +1104,28 @@
 
   gtk_widget_show_all(vppa->dialog);
   gtk_window_present (GTK_WINDOW (vppa->dialog));
-  gdk_window_raise(vppa->dialog->window);
+  gdk_window_raise(lives_widget_get_xwindow(vppa->dialog));
 
   return vppa;
 }
 
 
 void close_vid_playback_plugin(_vid_playback_plugin *vpp) {
-  int i;
+  register int i;
 
   if (vpp!=NULL) {
     if (vpp==mainw->vpp) {
       mainw->ext_keyboard=FALSE;
-      if (mainw->ext_playback&&mainw->vpp->exit_screen!=NULL) 
-	(*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+      if (mainw->ext_playback) {
+	if (mainw->vpp->exit_screen!=NULL) 
+	  (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
 #ifdef RT_AUDIO
-      stop_audio_stream();
+	stop_audio_stream();
 #endif
-      if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) 
-	if (mainw->play_window!=NULL&&prefs->play_monitor==0)
-	  gtk_window_set_keep_below(GTK_WINDOW(mainw->play_window),FALSE);
+	if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) 
+	  if (mainw->play_window!=NULL&&prefs->play_monitor==0)
+	    gtk_window_set_keep_below(GTK_WINDOW(mainw->play_window),FALSE);
+      }
       mainw->stream_ticks=-1;
       mainw->vpp=NULL;
     }
@@ -1134,12 +1139,43 @@
       g_free(vpp->extra_argv);
     }
 
+    for (i=0;i<vpp->num_play_params+vpp->num_alpha_chans;i++) {
+      weed_plant_free(vpp->play_params[i]);
+    }
+
+    if (vpp->play_params!=NULL) g_free(vpp->play_params);
+
     g_free (vpp);
   }
 }
 
 
-_vid_playback_plugin *open_vid_playback_plugin (const gchar *name, gboolean in_use) {
+const weed_plant_t *pp_get_param(weed_plant_t **pparams, int idx) {
+  register int i=0;
+  while (pparams[i]!=NULL) {
+    if (WEED_PLANT_IS_PARAMETER(pparams[i])) {
+      if (--idx<0) return pparams[i];
+    }
+    i++;
+  }
+  return NULL;
+}
+
+
+const weed_plant_t *pp_get_chan(weed_plant_t **pparams, int idx) {
+  register int i=0;
+  while (pparams[i]!=NULL) {
+    if (WEED_PLANT_IS_CHANNEL(pparams[i])) {
+      if (--idx<0) return pparams[i];
+    }
+    i++;
+  }
+  return NULL;
+}
+
+
+
+_vid_playback_plugin *open_vid_playback_plugin (const gchar *name, boolean in_use) {
   // this is called on startup or when the user selects a new playback plugin
 
   // if in_use is TRUE, it is our active vpp
@@ -1147,9 +1183,13 @@
   // TODO - if in_use, get fixed_fps,fwidth,fheight,palette,argc and argv from a file
   // TODO - dirsep
 
+#ifndef IS_MINGW
   gchar *plugname=g_strdup_printf ("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_VID_PLAYBACK,name);
+#else
+  gchar *plugname=g_strdup_printf ("%s%s%s/%s.dll",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_VID_PLAYBACK,name);
+#endif
   void *handle=dlopen(plugname,RTLD_LAZY);
-  gboolean OK=TRUE;
+  boolean OK=TRUE;
   gchar *msg,*tmp;
   gchar **array;
   const gchar *fps_list;
@@ -1161,15 +1201,22 @@
   if (handle==NULL) {
     gchar *msg=g_strdup_printf (_("\n\nFailed to open playback plugin %s\nError was %s\n"),plugname,dlerror());
     if (prefsw!=NULL) do_error_dialog_with_check_transient(msg,TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):
-							   GTK_WINDOW(mainw->LiVES->window));
+							   GTK_WINDOW(mainw->LiVES));
     else do_error_dialog(msg);
     g_free (msg);
     g_free(plugname);
     return NULL;
   }
 
+
   vpp=(_vid_playback_plugin *) g_malloc (sizeof(_vid_playback_plugin));
 
+  vpp->play_paramtmpls=NULL;
+  vpp->play_params=NULL;
+  vpp->alpha_chans=NULL;
+  vpp->num_play_params=vpp->num_alpha_chans=0;
+  vpp->extra_argv=NULL;
+
   if ((vpp->module_check_init=(const char* (*)())dlsym (handle,"module_check_init"))==NULL) {
     OK=FALSE;
   }
@@ -1179,26 +1226,30 @@
   if ((vpp->get_palette_list=(gint* (*)())dlsym (handle,"get_palette_list"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->set_palette=(gboolean (*)(int))dlsym (handle,"set_palette"))==NULL) {
+  if ((vpp->set_palette=(boolean (*)(int))dlsym (handle,"set_palette"))==NULL) {
     OK=FALSE;
   }
   if ((vpp->get_capabilities=(guint64 (*)(int))dlsym (handle,"get_capabilities"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->render_frame=(gboolean (*)(int, int, int64_t, void*, void*))dlsym (handle,"render_frame"))==NULL) {
+  if ((vpp->render_frame=(boolean (*)(int, int, int64_t, void**, void**, weed_plant_t **)) 
+       dlsym (handle,"render_frame"))==NULL) {
     OK=FALSE;
   }
   if ((vpp->get_fps_list=(const gchar* (*)(int))dlsym (handle,"get_fps_list"))!=NULL) {
-    if ((vpp->set_fps=(gboolean (*)(gdouble))dlsym (handle,"set_fps"))==NULL) {
+    if ((vpp->set_fps=(boolean (*)(gdouble))dlsym (handle,"set_fps"))==NULL) {
       OK=FALSE;
     }
   }
 
-  if ((pl_error=(*vpp->module_check_init)())!=NULL) {
-    msg=g_strdup_printf(_("Video playback plugin failed to initialise.\nError was: %s\n"),pl_error);
+
+  if (!OK) {
+    gchar *msg=g_strdup_printf 
+      (_("\n\nPlayback module %s\nis missing a mandatory function.\nUnable to use it.\n"),plugname);
+    set_pref ("vid_playback_plugin","none");
     do_error_dialog_with_check_transient(msg,TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):
-					 GTK_WINDOW(mainw->LiVES->window));
-    g_free(msg);
+					 GTK_WINDOW(mainw->LiVES));
+    g_free (msg);
     dlclose (handle);
     g_free (vpp);
     vpp=NULL;
@@ -1206,26 +1257,29 @@
     return NULL;
   }
 
-  if (!OK) {
-    gchar *msg=g_strdup_printf 
-      (_("\n\nPlayback module %s\nis missing a mandatory function.\nUnable to use it.\n"),plugname);
-    set_pref ("vid_playback_plugin","none");
+  if ((pl_error=(*vpp->module_check_init)())!=NULL) {
+    msg=g_strdup_printf(_("Video playback plugin failed to initialise.\nError was: %s\n"),pl_error);
     do_error_dialog_with_check_transient(msg,TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):
-					 GTK_WINDOW(mainw->LiVES->window));
-    g_free (msg);
-    close_vid_playback_plugin(vpp);
+					 GTK_WINDOW(mainw->LiVES));
+    g_free(msg);
+    dlclose (handle);
+    g_free (vpp);
+    vpp=NULL;
     g_free(plugname);
     return NULL;
   }
 
   // now check for optional functions
   vpp->get_description=(const char* (*)())dlsym (handle,"get_description");
-  vpp->get_rfx=(const char* (*)())dlsym (handle,"get_rfx");
+  vpp->get_init_rfx=(const char* (*)())dlsym (handle,"get_init_rfx");
+
+  vpp->get_play_params=(const weed_plant_t ** (*)(weed_bootstrap_f))dlsym (handle,"get_play_params");
+
   vpp->get_yuv_palette_clamping=(int* (*)(int))dlsym (handle,"get_yuv_palette_clamping");
   vpp->set_yuv_palette_clamping=(int (*)(int))dlsym (handle,"set_yuv_palette_clamping");
-  vpp->send_keycodes=(gboolean (*)(plugin_keyfunc))dlsym (handle,"send_keycodes");
+  vpp->send_keycodes=(boolean (*)(plugin_keyfunc))dlsym (handle,"send_keycodes");
   vpp->get_audio_fmts=(int* (*)())dlsym (handle,"get_audio_fmts");
-  vpp->init_screen=(gboolean (*)(int, int, gboolean, uint64_t, int, gchar**))dlsym (handle,"init_screen");
+  vpp->init_screen=(boolean (*)(int, int, boolean, uint64_t, int, gchar**))dlsym (handle,"init_screen");
   vpp->exit_screen=(void (*)(guint16, guint16))dlsym (handle,"exit_screen");
   vpp->module_unload=(void (*)())dlsym (handle,"module_unload");
 
@@ -1334,7 +1388,10 @@
   }
 
   if (vpp->get_audio_fmts!=NULL&&mainw->is_ready) vpp->audio_codec=get_best_audio(vpp);
-  if (prefsw!=NULL) prefsw_set_astream_settings(vpp);
+  if (prefsw!=NULL) {
+    prefsw_set_astream_settings(vpp);
+    prefsw_set_rec_after_settings(vpp);
+  }
 
   if (!in_use) return vpp;
 
@@ -1368,6 +1425,32 @@
     }
   }
 
+  // get the play parameters (and alpha channels) if any and convert to weed params
+  if (vpp->get_play_params!=NULL) {
+    vpp->play_paramtmpls=(*vpp->get_play_params)(weed_bootstrap_func);
+  }
+
+  // create vpp->play_params
+  if (vpp->play_paramtmpls!=NULL) {
+    weed_plant_t *ptmpl;
+    for (i=0;(ptmpl=(weed_plant_t *)vpp->play_paramtmpls[i])!=NULL;i++) {
+      vpp->play_params=(weed_plant_t **)g_realloc(vpp->play_params,(i+2)*sizeof(weed_plant_t *));
+      if (WEED_PLANT_IS_PARAMETER_TEMPLATE(ptmpl)) {
+	// is param template, create a param
+	vpp->play_params[i]=weed_plant_new(WEED_PLANT_PARAMETER);
+	weed_leaf_copy(vpp->play_params[i],"value",ptmpl,"default");
+	weed_set_plantptr_value(vpp->play_params[i],"template",ptmpl);
+	vpp->num_play_params++;
+      }
+      else {
+	// must be an alpha channel
+	vpp->play_params[i]=weed_plant_new(WEED_PLANT_CHANNEL);
+	weed_set_plantptr_value(vpp->play_params[i],"template",ptmpl);
+	vpp->num_alpha_chans++;
+      }
+    }
+    vpp->play_params[i]=NULL;
+  }
 
   if (vpp->send_keycodes==NULL&&vpp->capabilities&VPP_LOCAL_DISPLAY) {
     d_print
@@ -1448,7 +1531,7 @@
 
     nfmts=get_token_count(buf,'|');
     array=g_strsplit(buf,"|",nfmts);
-    sfmts=g_malloc(nfmts*sizint);
+    sfmts=(int *)g_malloc(nfmts*sizint);
 
     for (i=0;i<nfmts;i++) {
       if (array[i]!=NULL&&strlen(array[i])>0) sfmts[j++]=atoi(array[i]);
@@ -1522,12 +1605,12 @@
 
 
 
-void 
-do_plugin_encoder_error(const gchar *plugin_name) {
-  gchar *msg;
+void do_plugin_encoder_error(const gchar *plugin_name) {
+  gchar *msg,*tmp;
 
   if (plugin_name==NULL) {
-    msg=g_strdup_printf(_("LiVES was unable to find its encoder plugins. Please make sure you have the plugins installed in\n%s%s%s\nor change the value of <lib_dir> in ~/.lives\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS);
+    msg=g_strdup_printf(_("LiVES was unable to find its encoder plugins. Please make sure you have the plugins installed in\n%s%s%s\nor change the value of <lib_dir> in %s\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+    g_free(tmp);
     if (rdet!=NULL) do_error_dialog_with_check_transient(msg,FALSE,0,GTK_WINDOW(rdet->dialog));
     else do_error_dialog(msg);
     g_free(msg);
@@ -1540,17 +1623,17 @@
 }
 
 
-gboolean check_encoder_restrictions (gboolean get_extension, gboolean user_audio, gboolean save_all) {
+boolean check_encoder_restrictions (boolean get_extension, boolean user_audio, boolean save_all) {
   gchar **checks;
   gchar **array=NULL;
   gchar **array2;
   gint pieces,numtok;
-  gboolean calc_aspect=FALSE;
+  boolean calc_aspect=FALSE;
   gchar aspect_buffer[512];
   gint hblock=2,vblock=2;
   int i,r,val;
   GList *ofmt_all=NULL;
-  gboolean sizer=FALSE;
+  boolean sizer=FALSE;
 
   // for auto resizing/resampling
   gdouble best_fps=0.;
@@ -1560,13 +1643,13 @@
 
   gdouble best_fps_delta=0.;
   gint best_arate_delta=0;
-  gboolean allow_aspect_override=FALSE;
+  boolean allow_aspect_override=FALSE;
 
   gint best_fps_num=0,best_fps_denom=0;
   gdouble fps;
   gint arate,achans,asampsize,asigned=0;
 
-  gboolean swap_endian=FALSE;
+  boolean swap_endian=FALSE;
 
   if (rdet==NULL) {
     width=owidth=cfile->hsize;
@@ -1649,10 +1732,10 @@
 
   // audio endianness check - what should we do for big-endian machines ?
   if (((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||resaudw->aud_checkbutton==NULL||
-					      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton))))
+					      lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))))
       &&prefs->encoder.audio_codec!=AUDIO_CODEC_NONE&&(arate*achans*asampsize)) {
     if (rdet!=NULL&&!rdet->is_encoding) {
-      if (mainw->endian!=AFORM_BIG_ENDIAN && (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend)))) 
+      if (mainw->endian!=AFORM_BIG_ENDIAN && (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend)))) 
 	swap_endian=TRUE;
     }
     else {
@@ -1791,8 +1874,8 @@
       if (!strncmp (checks[r],"asigned=",8)&&
 	  ((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||
 						  resaudw->aud_checkbutton==NULL||
-						  gtk_toggle_button_get_active
-						  (GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton))))&&
+						  lives_toggle_button_get_active
+						  (LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))))&&
 	  prefs->encoder.audio_codec!=AUDIO_CODEC_NONE
 	  &&(arate*achans*asampsize)) {
 	array=g_strsplit(checks[r],"=",2);
@@ -1806,7 +1889,7 @@
 	
 	g_strfreev(array);
       
-	if (asigned!=0&&!capable->has_sox) {
+	if (asigned!=0&&!capable->has_sox_sox) {
 	  do_encoder_sox_error();
 	  g_strfreev(checks);
 	  return FALSE;
@@ -1817,8 +1900,8 @@
       
       if (!strncmp (checks[r],"arate=",6)&&((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||
 										   resaudw->aud_checkbutton==NULL||
-										   gtk_toggle_button_get_active
-										   (GTK_TOGGLE_BUTTON
+										   lives_toggle_button_get_active
+										   (LIVES_TOGGLE_BUTTON
 										    (resaudw->aud_checkbutton))))&&
 	  prefs->encoder.audio_codec!=AUDIO_CODEC_NONE&&(arate*achans*asampsize)) {
 	// we only perform this test if we are encoding with audio
@@ -1843,7 +1926,7 @@
 	g_strfreev(array2);
 	g_strfreev(array);
 	
-	if (!capable->has_sox) {
+	if (!capable->has_sox_sox) {
 	  do_encoder_sox_error();
 	  g_strfreev(checks);
 	  return FALSE;
@@ -1933,7 +2016,7 @@
 
   if (((width!=owidth||height!=oheight)&&width*height>0)||(best_fps_delta>0.)||(best_arate_delta>0&&best_arate>0)||
       best_arate<0||asigned!=0||swap_endian) {
-    gboolean ofx1_bool=mainw->fx1_bool;
+    boolean ofx1_bool=mainw->fx1_bool;
     mainw->fx1_bool=FALSE;
     if ((width!=owidth||height!=oheight)&&width*height>0) {
       if (!capable->has_convert&&rdet==NULL&&mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1) {
@@ -1951,8 +2034,8 @@
       rdet->arate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
       rdet->achans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
       rdet->asamps=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
-      rdet->aendian=get_signed_endian(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned)),
-				      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_littleend)));
+      rdet->aendian=get_signed_endian(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned)),
+				      lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend)));
 
       if (swap_endian||width!=rdet->width||height!=rdet->height||best_fps_delta!=0.||best_arate!=rdet->arate||
 	  ((asigned==1&&(rdet->aendian&AFORM_UNSIGNED))||(asigned==2&&!(rdet->aendian&AFORM_SIGNED)))) {
@@ -1963,15 +2046,15 @@
 	  rdet->width=width;
 	  rdet->height=height;
 	  if (best_arate!=-1) rdet->arate=best_arate;
-	  else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton),FALSE);
+	  else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton),FALSE);
 
-	  if (asigned==1) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
-	  else if (asigned==2) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
+	  if (asigned==1) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
+	  else if (asigned==2) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
 
 	  if (swap_endian) {
-	    if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) 
-	      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend),TRUE);
-	    else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->rb_littleend),TRUE);
+	    if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) 
+	      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend),TRUE);
+	    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend),TRUE);
 	  }
 
 	  if (best_fps_delta>0.) {
@@ -2022,6 +2105,9 @@
   GList *encoder_capabilities=NULL;
   GList *list=encoders,*listnext;
   int caps;
+
+  register int i;
+
   char *blacklist[]={
     NULL,
     NULL
@@ -2031,8 +2117,8 @@
   if (capable->python_version<3000000) blacklist[0]=g_strdup("multi_encoder3");
 
   while (list!=NULL) {
-    gboolean skip=FALSE;
-    int i=0;
+    boolean skip=FALSE;
+    i=0;
 
     listnext=list->next;
 
@@ -2051,7 +2137,10 @@
       continue;
     }
 
-    if (!strcmp(img_ext,"jpg")) continue;
+    if (!strcmp(img_ext,"jpg")) {
+      list=listnext;
+      continue;
+    }
 
     if ((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,(gchar *)list->data,"get_capabilities"))==NULL) {
       g_free(list->data);
@@ -2059,7 +2148,6 @@
     }
     else {
       caps=atoi ((char *)g_list_nth_data (encoder_capabilities,0));
-      
       if (!(caps&CAN_ENCODE_PNG)&&!strcmp(img_ext,"png")) {
 	g_free(list->data);
 	encoders=g_list_delete_link(encoders,list);
@@ -2073,6 +2161,8 @@
     list=listnext;
   }
 
+  for (i=0;blacklist[i]!=NULL;i++) g_free(blacklist[i]);
+
   return encoders;
 
 }
@@ -2083,7 +2173,7 @@
 // decoder plugins
 
 
-LIVES_INLINE gboolean decplugin_supports_palette (const lives_decoder_t *dplug, int palette) {
+LIVES_INLINE boolean decplugin_supports_palette (const lives_decoder_t *dplug, int palette) {
   register int i=0;
   int cpal;
   while ((cpal=dplug->cdata->palettes[i++])!=WEED_PALETTE_END) if (cpal==palette) return TRUE;
@@ -2096,9 +2186,15 @@
   lives_decoder_sys_t *dplug;
   gchar *decplugdir=g_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS);
   GList *dlist=NULL;
-  GList *decoder_plugins_o=get_plugin_list (PLUGIN_DECODERS,TRUE,decplugdir,"-so"),*decoder_plugins=decoder_plugins_o;
+#ifndef IS_MINGW
+  GList *decoder_plugins_o=get_plugin_list (PLUGIN_DECODERS,TRUE,decplugdir,"-so");
+#else
+  GList *decoder_plugins_o=get_plugin_list (PLUGIN_DECODERS,TRUE,decplugdir,"-dll");
+#endif
+  GList *decoder_plugins=decoder_plugins_o;
   g_free(decplugdir);
 
+
   while (decoder_plugins!=NULL) {
     dplug=open_decoder_plugin((gchar *)decoder_plugins->data);
     g_free(decoder_plugins->data);
@@ -2113,6 +2209,17 @@
 
 
 
+static boolean sanity_check_cdata(lives_clip_data_t *cdata) {
+  if (cdata->nframes<=0 || cdata->nframes >= INT_MAX) {
+    return FALSE;
+  }
+
+  // all checks passed - OK
+  return TRUE;
+
+}
+
+
 
 
 
@@ -2162,6 +2269,7 @@
     lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data;
 
     if (lives_list_index(disabled,dpsys->name)!=-1) {
+      // check if (user) disabled this decoder
       decoder_plugin=decoder_plugin->next;
       continue;
     }
@@ -2173,6 +2281,16 @@
     if ((dplug->cdata=(dpsys->get_clip_data)((tmp=(char *)g_filename_from_utf8 (sfile->file_name,-1,NULL,NULL,NULL)),
 					     NULL))!=NULL) {
       g_free(tmp);
+
+      // check for sanity
+
+      if (!sanity_check_cdata(dplug->cdata)) {
+	decoder_plugin=decoder_plugin->next;
+	continue;
+      }
+
+      //////////////////////
+
       dplug->decoder=dpsys;
       sfile->ext_src=dplug;
       if (strncmp(dpsys->name,"libzz",5)) {
@@ -2249,7 +2367,7 @@
   lives_decoder_sys_t *dplug;
 
   gchar *plugname;
-  gboolean OK=TRUE;
+  boolean OK=TRUE;
   const gchar *err;
 
   if (!strcmp(plname,"ogg_theora_decoder")) {
@@ -2261,7 +2379,12 @@
 
   dplug->name=NULL;
 
+#ifndef IS_MINGW
   plugname=g_strdup_printf ("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname);
+#else
+  plugname=g_strdup_printf ("%s%s%s/%s.dll",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname);
+#endif
+
   dplug->handle=dlopen(plugname,RTLD_LAZY);
   g_free (plugname);
 
@@ -2280,7 +2403,7 @@
        dlsym (dplug->handle,"get_clip_data"))==NULL) {
     OK=FALSE;
   }
-  if ((dplug->get_frame=(gboolean (*)(const lives_clip_data_t*, int64_t, int*, int, void**))
+  if ((dplug->get_frame=(boolean (*)(const lives_clip_data_t*, int64_t, int*, int, void**))
        dlsym (dplug->handle,"get_frame"))==NULL) {
     OK=FALSE;
   }
@@ -2337,21 +2460,24 @@
     g_free(vidname);
   }
 
-  if (cdata->audio_name==NULL||!strlen(cdata->audio_name)) return;
-
-  audname=g_strdup_printf("/%s",cdata->audio_name);
+  if (cdata->audio_name==NULL||!strlen(cdata->audio_name)) {
+    if (cfile->achans==0) return;
+    audname=g_strdup_printf("/%s",_("unknown"));
+  }
+  else 
+    audname=g_strdup_printf("/%s",cdata->audio_name);
   g_strappend(text,40,audname);
   g_free(audname);
 }
 
 
 
-static void dpa_ok_clicked (GtkWidget *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(button));
+static void dpa_ok_clicked (GtkButton *button, gpointer user_data) {
+  lives_general_button_clicked(button,NULL);
 
   if (prefsw!=NULL) {
     gtk_window_present(GTK_WINDOW(prefsw->prefs_dialog));
-    gdk_window_raise(prefsw->prefs_dialog->window);
+    gdk_window_raise(lives_widget_get_xwindow(prefsw->prefs_dialog));
     if (string_lists_differ(future_prefs->disabled_decoders,future_prefs->disabled_decoders_new))
       apply_button_set_enabled(NULL,NULL);
   }
@@ -2366,12 +2492,12 @@
 }
 
 
-static void dpa_cancel_clicked (GtkWidget *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(button));
+static void dpa_cancel_clicked (GtkButton *button, gpointer user_data) {
+  lives_general_button_clicked(button,NULL);
 
   if (prefsw!=NULL) {
     gtk_window_present(GTK_WINDOW(prefsw->prefs_dialog));
-    gdk_window_raise(prefsw->prefs_dialog->window);
+    gdk_window_raise(lives_widget_get_xwindow(prefsw->prefs_dialog));
   }
 
   if (future_prefs->disabled_decoders_new!=NULL) {
@@ -2383,7 +2509,7 @@
 }
 
 static void on_dpa_cb_toggled(GtkToggleButton *button, gchar *decname) {
-  if (!gtk_toggle_button_get_active(button))
+  if (!lives_toggle_button_get_active(button))
     // unchecked is disabled
     future_prefs->disabled_decoders_new=g_list_append(future_prefs->disabled_decoders_new,g_strdup(decname));
   else 
@@ -2392,10 +2518,11 @@
 
 
 void on_decplug_advanced_clicked (GtkButton *button, gpointer user_data) {
+  GList *decoder_plugin;
+
   GtkWidget *hbox;
   GtkWidget *vbox;
   GtkWidget *checkbutton;
-  GtkWidget *eventbox;
   GtkWidget *scrolledwindow;
   GtkWidget *label;
   GtkWidget *dialog;
@@ -2403,13 +2530,9 @@
   GtkWidget *cancelbutton;
   GtkWidget *okbutton;
 
-  gchar *title,*ltext;
-
-  GList *decoder_plugin;
-
+  gchar *ltext;
   gchar *decplugdir=g_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS);
 
-
   if (!mainw->decoders_loaded) {
     mainw->decoder_list=load_decoders();
     mainw->decoders_loaded=TRUE;
@@ -2417,9 +2540,8 @@
 
   decoder_plugin=mainw->decoder_list;
 
-  dialog = gtk_dialog_new ();
+  dialog = lives_standard_dialog_new (_("LiVES: - Decoder Plugins"),FALSE);
 
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
   if (prefs->show_gui) {
     if (prefsw!=NULL) gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(prefsw->prefs_dialog));
     else {
@@ -2428,92 +2550,44 @@
     }
   }
 
-  if (prefs->gui_monitor!=0) {
-    gtk_window_set_screen(GTK_WINDOW(dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
-  }
-
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-    gtk_widget_modify_bg (dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
-
-  title=g_strdup(_("LiVES: - Decoder Plugins"));
-  gtk_window_set_title (GTK_WINDOW (dialog), title);
-  g_free(title);
-
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
 
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
-  gtk_widget_show (scrolledwindow);
+  vbox = lives_vbox_new (FALSE, 0);
+
+  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V, vbox);
 
   gtk_container_add (GTK_CONTAINER(dialog_vbox), scrolledwindow);
 
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), vbox);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(scrolledwindow)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(scrolledwindow)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  
-  label=gtk_label_new(_("Enabled Video Decoders (uncheck to disable)"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 10);
+  label=lives_standard_label_new(_("Enabled Video Decoders (uncheck to disable)"));
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   while (decoder_plugin!=NULL) {
     lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data;
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    ltext=g_strdup_printf("%s   (%s)",dpsys->name,(*dpsys->version)());
 
-    checkbutton=gtk_check_button_new();
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton),
+    checkbutton=lives_standard_check_button_new(ltext,FALSE,LIVES_BOX(hbox),NULL);
+
+    g_free(ltext);
+
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),
 				 lives_list_index(future_prefs->disabled_decoders,dpsys->name)==-1);
 
     g_signal_connect_after (GTK_OBJECT (checkbutton), "toggled",
 			    G_CALLBACK (on_dpa_cb_toggled),
 			    dpsys->name);
 
-
-    eventbox = gtk_event_box_new();
-    ltext=g_strdup_printf("%s   (%s)",dpsys->name,(*dpsys->version)());
-    label=gtk_label_new(ltext);
-    g_free(ltext);
-
-    gtk_label_set_mnemonic_widget(GTK_LABEL(label), checkbutton);
-    gtk_container_add(GTK_CONTAINER(eventbox), label);
-    g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", 
-		     G_CALLBACK(label_act_toggle), checkbutton);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
     decoder_plugin=decoder_plugin->next;
   }
 
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		    G_CALLBACK (dpa_cancel_clicked),
@@ -2525,7 +2599,7 @@
 
   gtk_widget_show_all(dialog);
   gtk_window_present (GTK_WINDOW (dialog));
-  gdk_window_raise(dialog->window);
+  gdk_window_raise(lives_widget_get_xwindow(dialog));
 
   future_prefs->disabled_decoders_new=g_list_copy_strings(future_prefs->disabled_decoders);
 
@@ -2537,7 +2611,7 @@
 
 
 
-gboolean check_rfx_for_lives (lives_rfx_t *rfx) {
+boolean check_rfx_for_lives (lives_rfx_t *rfx) {
   // check that an RFX is suitable for loading (cf. check_for_lives in effects-weed.c)
   if (rfx->num_in_channels==2&&rfx->props&RFX_PROPS_MAY_RESIZE) {
     gchar *tmp;
@@ -2552,20 +2626,25 @@
   gchar *com;
   gchar *dir=NULL;
 
+  if (rfx==&mainw->rendered_fx[0]) return;
+
   switch (rfx->status) {
   case RFX_STATUS_BUILTIN:
     dir=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,NULL);
-    com=g_strdup_printf("smogrify plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",cfile->handle,cfile->start,cfile->end,dir,
+    com=g_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
+			cfile->handle,cfile->start,cfile->end,dir,
 			PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name);
     break;
   case RFX_STATUS_CUSTOM:
     dir=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
-    com=g_strdup_printf("smogrify plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",cfile->handle,cfile->start,cfile->end,dir,
+    com=g_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
+			cfile->handle,cfile->start,cfile->end,dir,
 			PLUGIN_RENDERED_EFFECTS_CUSTOM,rfx->name);
     break;
   case RFX_STATUS_TEST:
     dir=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
-    com=g_strdup_printf("smogrify plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",cfile->handle,cfile->start,cfile->end,dir,
+    com=g_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
+			cfile->handle,cfile->start,cfile->end,dir,
 			PLUGIN_RENDERED_EFFECTS_TEST,rfx->name);
     break;
   default:
@@ -2576,6 +2655,7 @@
 
   // if the command fails we just give a warning
   lives_system(com,FALSE);
+
   g_free(com);
 }
 
@@ -2637,7 +2717,6 @@
     cparam->wrap=FALSE;
     cparam->transition=FALSE;
     cparam->step_size=1.;
-    cparam->copy_to=-1;
     cparam->group=0;
     cparam->max=0.;
     cparam->reinit=FALSE;
@@ -2645,6 +2724,8 @@
     cparam->change_blocked=FALSE;
     cparam->source=NULL;
     cparam->source_type=LIVES_RFX_SOURCE_RFX;
+    cparam->special_type=LIVES_PARAM_SPECIAL_TYPE_NONE;
+    cparam->special_type_index=0;
 
 #ifdef DEBUG_RENDER_FX_P
     g_printerr("Got parameter %s\n",cparam->name);
@@ -2790,7 +2871,7 @@
   // sort rfx array into UTF-8 order by menu entry
   register int i;
   int start=1,min_val=0;
-  gboolean used[num];
+  boolean used[num];
   gint sorted=1;
   gchar *min_string=NULL;
   lives_rfx_t *rfx;
@@ -2818,13 +2899,13 @@
     for (i=start;i<=num;i++) {
       if (!used[i-1]) {
 	if (min_string==NULL) {
-	  min_string=g_utf8_collate_key (in[i].menu_text,strlen (in[i].menu_text));
+	  min_string=g_utf8_collate_key (in[i].menu_text,-1);
 	  min_val=i;
 	}
 	else {
-	  if (strcmp (min_string,(tmp=g_utf8_collate_key(in[i].menu_text,strlen (in[i].menu_text))))==1) {
+	  if (strcmp (min_string,(tmp=g_utf8_collate_key(in[i].menu_text,-1)))==1) {
 	    g_free (min_string);
-	    min_string=g_utf8_collate_key (in[i].menu_text,strlen (in[i].menu_text));
+	    min_string=g_utf8_collate_key (in[i].menu_text,-1);
 	    min_val=i;
 	  }
 	  g_free(tmp);
@@ -2842,7 +2923,7 @@
 }
 
 
-void rfx_copy (lives_rfx_t *src, lives_rfx_t *dest, gboolean full) {
+void rfx_copy (lives_rfx_t *src, lives_rfx_t *dest, boolean full) {
   // Warning, does not copy all fields (full will do that)
   dest->name=g_strdup (src->name);
   dest->menu_text=g_strdup (src->menu_text);
@@ -2906,7 +2987,7 @@
 }
 
 
-void param_copy (lives_param_t *src, lives_param_t *dest, gboolean full) {
+void param_copy (lives_param_t *src, lives_param_t *dest, boolean full) {
   // rfxbuilder.c uses this to copy params to a temporary copy and back again
 
   dest->name=g_strdup (src->name);
@@ -2957,8 +3038,8 @@
 
 }
 
-gboolean get_bool_param(void *value) {
-  gboolean ret;
+boolean get_bool_param(void *value) {
+  boolean ret;
   lives_memcpy(&ret,value,4);
   return ret;
 }
@@ -2983,7 +3064,7 @@
   lives_memcpy(rgba,value,sizeof(lives_colRGBA32_t));
 }
 
-void set_bool_param(void *value, gboolean _const) {
+void set_bool_param(void *value, boolean _const) {
   set_int_param(value,!!_const);
 }
 
@@ -3039,7 +3120,7 @@
 
 
 
-lives_param_t *weed_params_to_rfx(gint npar, weed_plant_t *plant, gboolean show_reinits) {
+lives_param_t *weed_params_to_rfx(gint npar, weed_plant_t *inst, boolean show_reinits) {
   int i,j;
   lives_param_t *rpar=(lives_param_t *)g_malloc(npar*sizeof(lives_param_t));
   int param_hint;
@@ -3055,17 +3136,32 @@
   double *colsd;
   double red_mind=0.,red_maxd=1.,green_mind=0.,green_maxd=1.,blue_mind=0.,blue_maxd=1.,*maxd=NULL,*mind=NULL;
   int flags=0;
-  gboolean col_int;
+  int nwpars=0,poffset=0;
+  boolean col_int;
 
   weed_plant_t *wtmpl;
   weed_plant_t **wpars=NULL,*wpar=NULL;
 
   weed_plant_t *chann,*ctmpl;
 
-  wpars=weed_get_plantptr_array(plant,"in_parameters",&error);
+  if (weed_plant_has_leaf(inst,"in_parameters")) nwpars=weed_leaf_num_elements(inst,"in_parameters");
+  if (nwpars>0) wpars=weed_get_plantptr_array(inst,"in_parameters",&error);
 
   for (i=0;i<npar;i++) {
-    wpar=wpars[i];
+    if (i-poffset>=nwpars) {
+      // handling for compound fx
+      poffset+=nwpars;
+      if (wpars!=NULL) weed_free(wpars);
+      inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+      if (weed_plant_has_leaf(inst,"in_parameters")) nwpars=weed_leaf_num_elements(inst,"in_parameters");
+      else nwpars=0;
+      if (nwpars>0) wpars=weed_get_plantptr_array(inst,"in_parameters",&error);
+      else wpars=NULL;
+      i--;
+      continue;
+    }
+
+    wpar=wpars[i-poffset];
     wtmpl=weed_get_plantptr_value(wpar,"template",&error);
 
     if (weed_plant_has_leaf(wtmpl,"flags")) flags=weed_get_int_value(wtmpl,"flags",&error);
@@ -3083,13 +3179,14 @@
     rpar[i].interp_func=rpar[i].display_func=NULL;
     rpar[i].hidden=0;
     rpar[i].step_size=1.;
-    rpar[i].copy_to=-1;
     rpar[i].transition=FALSE;
     rpar[i].wrap=FALSE;
     rpar[i].reinit=FALSE;
     rpar[i].change_blocked=FALSE;
     rpar[i].source=wtmpl;
     rpar[i].source_type=LIVES_RFX_SOURCE_WEED;
+    rpar[i].special_type=LIVES_PARAM_SPECIAL_TYPE_NONE;
+    rpar[i].special_type_index=0;
 
     if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS&&!(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL)) {
       rpar[i].hidden|=HIDDEN_MULTI;
@@ -3101,7 +3198,7 @@
     }
     else rpar[i].multi=PVAL_MULTI_NONE;
 
-    chann=get_enabled_channel(plant,0,TRUE);
+    chann=get_enabled_channel(inst,0,TRUE);
     ctmpl=weed_get_plantptr_value(chann,"template",&error);
 
     if (weed_plant_has_leaf(ctmpl,"is_audio")&&weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
@@ -3109,27 +3206,6 @@
       rpar[i].hidden=0;
     }
 
-    param_hint=weed_get_int_value(wtmpl,"hint",&error);
-
-    if (gui!=NULL) {
-      if (weed_plant_has_leaf(gui,"copy_value_to")) {
-	int copyto=weed_get_int_value(gui,"copy_value_to",&error);
-	int param_hint2,flags2=0;
-	weed_plant_t *wtmpl2;
-	if (copyto==i||copyto<0) copyto=-1;
-	if (copyto>-1) {
-	  wtmpl2=weed_get_plantptr_value(wpars[copyto],"template",&error);
-	  if (weed_plant_has_leaf(wtmpl2,"flags")) flags2=weed_get_int_value(wtmpl2,"flags",&error);
-	  param_hint2=weed_get_int_value(wtmpl2,"hint",&error);
-	  if (param_hint==param_hint2&&((flags2&WEED_PARAMETER_VARIABLE_ELEMENTS)||
-					(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL&&
-					 flags2&WEED_PARAMETER_ELEMENT_PER_CHANNEL)||
-					weed_leaf_num_elements(wtmpl,"default")==
-					weed_leaf_num_elements(wtmpl2,"default"))) rpar[i].copy_to=copyto;
-	}
-      }
-    }
-
     rpar[i].dp=0;
     rpar[i].min=0.;
     rpar[i].max=0.;
@@ -3141,7 +3217,11 @@
     }
     else rpar[i].reinit=FALSE;
 
+    // hide internally connected params for compound fx
+    if (weed_plant_has_leaf(wpar,"host_internal_connection")) rpar[i].hidden|=HIDDEN_COMPOUND_INTERNAL;
+
     ///////////////////////////////
+    param_hint=weed_get_int_value(wtmpl,"hint",&error);
 
     switch (param_hint) {
     case WEED_HINT_SWITCH:
@@ -3213,12 +3293,15 @@
       rpar[i].max=weed_get_double_value(wtmpl,"max",&error);
       if (weed_plant_has_leaf(wtmpl,"wrap")&&weed_get_boolean_value(wtmpl,"wrap",&error)==WEED_TRUE) rpar[i].wrap=TRUE;
       rpar[i].step_size=0.;
+      rpar[i].dp=2;
       if (gui!=NULL) {
 	if (weed_plant_has_leaf(gui,"step_size")) rpar[i].step_size=weed_get_double_value(gui,"step_size",&error);
 	if (weed_plant_has_leaf(gui,"decimals")) rpar[i].dp=weed_get_int_value(gui,"decimals",&error);
       }
-      if (rpar[i].dp==0) rpar[i].dp=2;
-      if (rpar[i].step_size==0.) rpar[i].step_size=1./(double)lives_10pow(rpar[i].dp);
+      if (rpar[i].step_size==0.) {
+	if (rpar[i].max-rpar[i].min>1.) rpar[i].step_size=1.;
+	else rpar[i].step_size=1./(double)lives_10pow(rpar[i].dp);
+      }
       break;
     case WEED_HINT_TEXT:
       if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
@@ -3232,7 +3315,6 @@
       weed_free(string);
       string=weed_get_string_value(wpar,"value",&error);
       rpar[i].value=g_strdup(string);
-
       weed_free(string);
       rpar[i].max=0.;
       if (gui!=NULL&&weed_plant_has_leaf(gui,"maxchars")) {
@@ -3404,11 +3486,6 @@
     rpar[i].onchange=FALSE;
   }
 
-  for (i=0;i<npar;i++) {
-    if (rpar[i].copy_to!=-1) weed_leaf_copy(weed_inst_in_param(plant,rpar[i].copy_to,FALSE),"value",
-					    weed_inst_in_param(plant,i,FALSE),"value");
-  }
-
   weed_free(wpars);
 
   return rpar;
@@ -3416,21 +3493,23 @@
 
 
 
-lives_rfx_t *weed_to_rfx (weed_plant_t *plant, gboolean show_reinits) {
-  // return an RFX for a weed effect; set rfx->source to an INSTANCE of the filter
+lives_rfx_t *weed_to_rfx (weed_plant_t *plant, boolean show_reinits) {
+  // return an RFX for a weed effect; set rfx->source to an INSTANCE of the filter (first instance for compound fx)
   int error;
-  weed_plant_t *filter;
+  weed_plant_t *filter,*inst;
 
   gchar *string;
   lives_rfx_t *rfx=(lives_rfx_t *)g_malloc(sizeof(lives_rfx_t));
   rfx->is_template=FALSE;
-  if (weed_get_int_value(plant,"type",&error)==WEED_PLANT_FILTER_INSTANCE) 
-    filter=weed_get_plantptr_value(plant,"filter_class",&error);
+  if (weed_get_int_value(plant,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
+    filter=weed_instance_get_filter(plant,TRUE);
+    inst=plant;
+  }
   else {
     filter=plant;
-    plant=weed_instance_from_filter(filter);
+    inst=weed_instance_from_filter(filter);
     // init and deinit the effect to allow the plugin to hide parameters, etc.
-    weed_reinit_effect(plant,FALSE);
+    weed_reinit_effect(inst,TRUE);
     rfx->is_template=TRUE;
   }
 
@@ -3440,16 +3519,16 @@
   weed_free(string);
   rfx->action_desc=g_strdup("no action");
   rfx->min_frames=-1;
-  rfx->num_in_channels=enabled_in_channels(plant,FALSE);
+  rfx->num_in_channels=enabled_in_channels(filter,FALSE);
   rfx->status=RFX_STATUS_WEED;
   rfx->props=0;
   rfx->menuitem=NULL;
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")||
       weed_get_plantptr_value(filter,"in_parameter_templates",&error)==NULL) rfx->num_params=0;
   else rfx->num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (rfx->num_params>0) rfx->params=weed_params_to_rfx(rfx->num_params,plant,show_reinits);
+  if (rfx->num_params>0) rfx->params=weed_params_to_rfx(rfx->num_params,inst,show_reinits);
   else rfx->params=NULL;
-  rfx->source=(void *)plant;
+  rfx->source=(void *)inst;
   rfx->source_type=LIVES_RFX_SOURCE_WEED;
   rfx->extra=NULL;
   return rfx;
@@ -3461,43 +3540,65 @@
   GList *hints=NULL;
 
   if (rfx->status==RFX_STATUS_WEED) {
-    int i,error;
+    int nfilters,error;
     int num_hints;
     weed_plant_t *gui;
     weed_plant_t *inst=(weed_plant_t *)rfx->source;
-    weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
+    weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
+    int *filters=NULL;
     char *string,**rfx_strings,*delim;
-   
-    if (!weed_plant_has_leaf(filter,"gui")) return NULL;
-    gui=weed_get_plantptr_value(filter,"gui",&error);
 
-    if (!weed_plant_has_leaf(gui,"layout_scheme")) return NULL;
+    register int i;
 
-    string=weed_get_string_value(gui,"layout_scheme",&error);
-    if (strcmp(string,"RFX")) {
-      weed_free(string);
-      return NULL;
+    if ((nfilters=num_compound_fx(filter))>1) {
+      // handle compound fx
+      filters=weed_get_int_array(filter,"host_filter_list",&error);
     }
-    weed_free(string);
 
-    if (!weed_plant_has_leaf(gui,"rfx_delim")) return NULL;
-    delim=weed_get_string_value(gui,"rfx_delim",&error);
-    g_snprintf(rfx->delim,2,"%s",delim);
-    weed_free(delim);
+    for (i=0;i<nfilters;i++) {
+
+      if (filters!=NULL) {
+	filter=get_weed_filter(filters[i]);
+      }
 
-    if (!weed_plant_has_leaf(gui,"rfx_strings")) return NULL;
+      if (!weed_plant_has_leaf(filter,"gui")) continue;
+      gui=weed_get_plantptr_value(filter,"gui",&error);
 
-    num_hints=weed_leaf_num_elements(gui,"rfx_strings");
+      if (!weed_plant_has_leaf(gui,"layout_scheme")) continue;
 
-    if (num_hints==0) return NULL;
-    rfx_strings=weed_get_string_array(gui,"rfx_strings",&error);
+      string=weed_get_string_value(gui,"layout_scheme",&error);
+      if (strcmp(string,"RFX")) {
+	weed_free(string);
+	continue;
+      }
+      weed_free(string);
+
+      if (!weed_plant_has_leaf(gui,"rfx_delim")) continue;
+      delim=weed_get_string_value(gui,"rfx_delim",&error);
+      g_snprintf(rfx->delim,2,"%s",delim);
+      weed_free(delim);
+      
+      if (!weed_plant_has_leaf(gui,"rfx_strings")) continue;
+      
+      num_hints=weed_leaf_num_elements(gui,"rfx_strings");
+      
+      if (num_hints==0) continue;
+      rfx_strings=weed_get_string_array(gui,"rfx_strings",&error);
+      
+      for (i=0;i<num_hints;i++) {
+	hints=g_list_append(hints,g_strdup(rfx_strings[i]));
+	weed_free(rfx_strings[i]);
+      }
+      weed_free(rfx_strings);
+
+      if (filters!=NULL) hints=g_list_append(hints,g_strdup("internal|nextfilter"));
 
-    for (i=0;i<num_hints;i++) {
-      hints=g_list_append(hints,g_strdup(rfx_strings[i]));
-      weed_free(rfx_strings[i]);
     }
-    weed_free(rfx_strings);
+
+    if (filters!=NULL) weed_free(filters);
+
   }
+
   return hints;
 }
 
@@ -3575,7 +3676,11 @@
   // OK, we should now have an RFX fragment in a file, we can compile it, then build a parameter window from it
     
   // call RFX_BUILDER program to compile the script, passing parameters input_filename and output_directory
+#ifndef IS_MINGW
   com=g_strdup_printf("\"%s\" \"%s\" \"%s\" >/dev/null",RFX_BUILDER,rfxfile,prefs->tmpdir);
+#else
+  com=g_strdup_printf("\"%s\" \"%s\" \"%s\" >NUL",RFX_BUILDER,rfxfile,prefs->tmpdir);
+#endif
   res=system(com);
   g_free(com);

LiVES-1.6.1.tar.bz2/src/plugins.h -> LiVES-2.0.3.tar.bz2/src/plugins.h Changed

@@ -1,6 +1,6 @@
 // plugins.h
 // LiVES
-// (c) G. Finch 2003-2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2003-2012 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -16,7 +16,7 @@
 
 // generic plugins
 
-GList *get_plugin_list (const gchar *plugin_type, gboolean allow_nonex, const gchar *plugdir, const gchar *filter_ext);
+GList *get_plugin_list (const gchar *plugin_type, boolean allow_nonex, const gchar *plugdir, const gchar *filter_ext);
 #define PLUGIN_ENCODERS "encoders"
 #define PLUGIN_DECODERS "decoders"
 #define PLUGIN_VID_PLAYBACK "playback/video"
@@ -34,11 +34,15 @@
 GList *plugin_request_with_blanks (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
 GList *plugin_request_by_line (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
 GList *plugin_request_by_space (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
-GList *plugin_request_common (const gchar *plugin_type, const gchar *plugin_name, const gchar *request, const gchar *delim, gboolean allow_blanks);
+GList *plugin_request_common (const gchar *plugin_type, const gchar *plugin_name, const gchar *request, const gchar *delim, boolean allow_blanks);
 
+#ifndef  __WEED_EFFECTS_H__
+typedef weed_plant_t *(*weed_bootstrap_f) (weed_default_getter_f *value, int num_versions, int *plugin_versions);
+#endif
 
 /// video playback plugins
-typedef gboolean (*plugin_keyfunc) (gboolean down, guint16 unicode, guint16 keymod);
+typedef boolean (*plugin_keyfunc) (boolean down, guint16 unicode, guint16 keymod);
+
 
 typedef struct {
   // playback
@@ -49,21 +53,28 @@
   const char *(*module_check_init)(void);
   const char *(*version) (void);
   const char *(*get_description) (void);
-  const char *(*get_rfx) (void);
+
   gint *(*get_palette_list) (void);
-  gboolean (*set_palette) (int palette);
+  boolean (*set_palette) (int palette);
   guint64 (*get_capabilities) (int palette);
-  gboolean (*render_frame) (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data);
+
+  boolean (*render_frame) (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data,
+			    weed_plant_t **play_params);
 
   // optional
-  gboolean (*init_screen) (int width, int height, gboolean fullscreen, uint64_t window_id, int argc, gchar **argv);
+  boolean (*init_screen) (int width, int height, boolean fullscreen, uint64_t window_id, int argc, gchar **argv);
   void (*exit_screen) (guint16 mouse_x, guint16 mouse_y);
   void (*module_unload) (void);
   const gchar *(*get_fps_list) (int palette);
-  gboolean (*set_fps) (gdouble fps);
+  boolean (*set_fps) (gdouble fps);
+  
+  const char *(*get_init_rfx) (void);
 
+  ///< optional (but should return a weed plantptr array of paramtmpl and chantmpl, NULL terminated)
+  const weed_plant_t **(*get_play_params) (weed_bootstrap_f f); 
+  
   // only for display plugins
-  gboolean (*send_keycodes) (plugin_keyfunc);
+  boolean (*send_keycodes) (plugin_keyfunc);
 
   // optional for YUV palettes
   int *(*get_yuv_palette_sampling) (int palette);
@@ -100,6 +111,11 @@
   int extra_argc;
   gchar **extra_argv;
 
+  const weed_plant_t **play_paramtmpls;
+  weed_plant_t **play_params;
+  weed_plant_t **alpha_chans;
+  int num_play_params;
+  int num_alpha_chans;
 
 } _vid_playback_plugin;
 
@@ -107,7 +123,7 @@
 #define DEF_VPP_HSIZE 320.
 #define DEF_VPP_VSIZE 240.
 
-_vid_playback_plugin *open_vid_playback_plugin (const gchar *name, gboolean in_use);
+_vid_playback_plugin *open_vid_playback_plugin (const gchar *name, boolean in_use);
 void vid_playback_plugin_exit (void);
 void close_vid_playback_plugin(_vid_playback_plugin *);
 gint64 get_best_audio(_vid_playback_plugin *);
@@ -115,6 +131,9 @@
 void load_vpp_defaults(_vid_playback_plugin *, gchar *file);
 
 
+const weed_plant_t *pp_get_param(weed_plant_t **pparams, int idx);
+const weed_plant_t *pp_get_chan(weed_plant_t **pparams, int idx);
+
 // encoder plugins
 
 void do_plugin_encoder_error(const gchar *plugin_name_or_null);
@@ -137,6 +156,7 @@
 #define AUDIO_CODEC_RAW 7       // reserved
 #define AUDIO_CODEC_WMA2 8
 
+
 #define AUDIO_CODEC_MAX 31
   //
 #define AUDIO_CODEC_NONE 32
@@ -176,6 +196,8 @@
 #define LIVES_SEEK_QUALITY_LOSS (1<<2)
 
 
+// must be exactly the same as in decplugin.h
+
 typedef struct {
   gchar *URI; ///< the URI of this cdata
 
@@ -198,9 +220,9 @@
   gint frame_width; // frame width and height are the size of the outer frame
   gint frame_height;
 
-  gfloat par; ///< pixel aspect ratio
+  float par; ///< pixel aspect ratio
 
-  gfloat fps;
+  float fps;
 
   int *palettes;
 
@@ -216,12 +238,17 @@
   gint arate;
   gint achans;
   gint asamps;
-  gboolean asigned;
-  gboolean ainterleaf;
+  boolean asigned;
+  boolean ainterleaf;
   gchar audio_name[512]; ///< name of audio codec, e.g. "vorbis" or NULL
 
   int seek_flag;
 
+#define SYNC_HINT_AUDIO_TRIM_START 1
+
+  int sync_hint;
+
+
   void *priv; ///< private data for demuxer/decoder - host should not touch this
 
 } lives_clip_data_t;
@@ -245,7 +272,7 @@
   lives_clip_data_t *(*get_clip_data)(char *URI, lives_clip_data_t *cdata);
 
   /// frame starts at 0 in these functions; height is height of primary plane
-  gboolean (*get_frame)(const lives_clip_data_t *, int64_t frame, int *rowstrides, int height, void **pixel_data);
+  boolean (*get_frame)(const lives_clip_data_t *, int64_t frame, int *rowstrides, int height, void **pixel_data);
 
   /// call this for each cdata before unloading the module
   void (*clip_data_free)(lives_clip_data_t *);
@@ -278,7 +305,7 @@
 void get_mime_type(gchar *text, int maxlen, const lives_clip_data_t *);
 void unload_decoder_plugins(void);
 
-gboolean decplugin_supports_palette (const lives_decoder_t *dplug, int palette);
+boolean decplugin_supports_palette (const lives_decoder_t *dplug, int palette);
 
 
 
@@ -331,7 +358,24 @@
 } lives_rfx_source_t;
 
 
+typedef enum {
+  LIVES_PARAM_SPECIAL_TYPE_NONE=0, // normal parameter type
+
+  // framedraw types
+  LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK,  ///< type may be used in framedraw
+  LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT,  ///< type may be used in framedraw
+  LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT,  ///< type may be used in framedraw
+  LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT,  ///< type may be used in framedraw
+
+  // text widget types
+  LIVES_PARAM_SPECIAL_TYPE_FILEREAD,
+  LIVES_PARAM_SPECIAL_TYPE_PASSWORD,
 
+  // misc types
+  LIVES_PARAM_SPECIAL_TYPE_MERGEALIGN,
+  LIVES_PARAM_SPECIAL_TYPE_ASPECT_RATIO
+
+} lives_param_special_t;
 
 
 typedef struct {
@@ -341,7 +385,7 @@
 
   gchar *label;
   gint flags;
-  gboolean use_mnemonic;
+  boolean use_mnemonic;
   fn_ptr interp_func;
   fn_ptr display_func;
   gint hidden;
@@ -350,13 +394,14 @@
 #define HIDDEN_GUI (1<<0)
 #define HIDDEN_MULTI (1<<1)
 #define HIDDEN_NEEDS_REINIT (1<<2)
+#define HIDDEN_COMPOUND_INTERNAL (1<<3)
 
   gdouble step_size;
-  gint copy_to;
-  gboolean transition;
-  gboolean reinit;
+  //gint copy_to;
+  boolean transition;
+  boolean reinit;
 
-  gboolean wrap;
+  boolean wrap;
   gint group;
   lives_param_type_t type;
 
@@ -380,16 +425,20 @@
 
   /// TODO - change to GtkWidget **widgets, terminated with a NULL
   GtkWidget *widgets[MAX_PARAM_WIDGETS]; ///< widgets which hold value/RGBA settings
-  gboolean onchange; ///< is there a trigger ?
+  boolean onchange; ///< is there a trigger ?
 
-  gboolean changed;
+  boolean changed;
 
-  gboolean change_blocked;
+  boolean change_blocked;
 
   void *source;
 
   lives_rfx_source_t source_type;
 
+  // this may change
+  lives_param_special_t special_type; // the visual modification type (see paramspecial.h)
+  int special_type_index; // index within special_type (e.g for DEMASK, 0==left, 1==top, 2==width, 3==height)
+
 } lives_param_t;
 
 
@@ -436,12 +485,12 @@
   void *source;  ///< points to the source (e.g. a weed_plant_t)
   void *extra;  ///< for future use
   gchar delim[2];
-  gboolean is_template;
+  boolean is_template;
 
 } lives_rfx_t;
 
 
-gboolean check_rfx_for_lives (lives_rfx_t *);
+boolean check_rfx_for_lives (lives_rfx_t *);
 
 void do_rfx_cleanup(lives_rfx_t *);
 
@@ -451,7 +500,7 @@
 
 gint find_rfx_plugin_by_name (const gchar *name, gshort status);
 
-void rfx_copy (lives_rfx_t *src, lives_rfx_t *dest, gboolean full);
+void rfx_copy (lives_rfx_t *src, lives_rfx_t *dest, boolean full);
 
 void rfx_params_free(lives_rfx_t *rfx);
 
@@ -459,7 +508,7 @@
 
 void rfx_free_all (void);
 
-void param_copy (lives_param_t *src, lives_param_t *dest, gboolean full);
+void param_copy (lives_param_t *src, lives_param_t *dest, boolean full);
 
 
 typedef struct {
@@ -480,13 +529,13 @@
 
 
 
-gboolean get_bool_param(void *value);
+boolean get_bool_param(void *value);
 gint get_int_param(void *value);
 gdouble get_double_param(void *value);
 void get_colRGB24_param(void *value, lives_colRGB24_t *rgb);
 void get_colRGBA32_param(void *value, lives_colRGBA32_t *rgba);
 
-void set_bool_param(void *value, gboolean );
+void set_bool_param(void *value, boolean );
 void set_int_param(void *value, gint );
 void set_double_param(void *value, gdouble );
 void set_colRGB24_param(void *value, gshort red, gshort green, gshort blue);
@@ -499,8 +548,8 @@
 
 GList *array_to_string_list (gchar **array, gint offset, gint len);
 
-lives_rfx_t *weed_to_rfx (weed_plant_t *plant, gboolean show_reinits);
-lives_param_t *weed_params_to_rfx(gint npar, weed_plant_t *plant, gboolean show_reinits);
+lives_rfx_t *weed_to_rfx (weed_plant_t *plant, boolean show_reinits);
+lives_param_t *weed_params_to_rfx(gint npar, weed_plant_t *instance, boolean show_reinits);
 
 gchar *plugin_run_param_window(const gchar *get_com, GtkVBox *vbox, lives_rfx_t **ret_rfx);

LiVES-1.6.1.tar.bz2/src/preferences.c -> LiVES-2.0.3.tar.bz2/src/preferences.c Changed

@@ -1,6 +1,6 @@
 // preferences.c
 // LiVES (lives-exe)
-// (c) G. Finch 2004 - 2012
+// (c) G. Finch 2004 - 2013
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -25,24 +25,30 @@
 #include "omc-learn.h"
 #endif
 
+static guint prefs_current_page;
+
+static void select_pref_list_row(guint selected_idx);
+
+#ifdef ENABLE_OSC
 static void on_osc_enable_toggled (GtkToggleButton *t1, gpointer t2) {
   if (prefs->osc_udp_started) return;
-  gtk_widget_set_sensitive (prefsw->spinbutton_osc_udp,gtk_toggle_button_get_active (t1)||
-			    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (t2)));
+  gtk_widget_set_sensitive (prefsw->spinbutton_osc_udp,lives_toggle_button_get_active (t1)||
+			    lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (t2)));
 }
+#endif
 
 static void instopen_toggled (GtkToggleButton *t1, GtkWidget *button) {
-  gtk_widget_set_sensitive (button,gtk_toggle_button_get_active (t1));
+  gtk_widget_set_sensitive (button,lives_toggle_button_get_active (t1));
 }
 
 
-void get_pref(const gchar *key, gchar *val, gint maxlen) {
+void get_pref(const gchar *key, gchar *val, int maxlen) {
   FILE *valfile;
   gchar *vfile;
   gchar *com;
   int retval;
   int alarm_handle;
-  gboolean timeout;
+  boolean timeout;
 
   memset(val,0,maxlen);
 
@@ -55,7 +61,7 @@
     return;
   }
 
-  com=g_strdup_printf("smogrify get_pref \"%s\" %d %d",key,getuid(),getpid());
+  com=g_strdup_printf("%s get_pref \"%s\" %d %d",prefs->backend_sync,key,lives_getuid(),lives_getpid());
 
   if (system(com)) {
     tempdir_warning();
@@ -63,28 +69,33 @@
     return;
   }
 
-  vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,getuid(),getpid());
+#ifndef IS_MINGW
+  vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),lives_getpid());
+#else
+  vfile=g_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),lives_getpid());
+#endif
 
   do {
     retval=0;
+    alarm_handle=lives_alarm_set(LIVES_PREFS_TIMEOUT);
     timeout=FALSE;
     mainw->read_failed=FALSE;
 
-    alarm_handle=lives_alarm_set(LIVES_PREFS_TIMEOUT);
-
     do {
+
       if (!((valfile=fopen(vfile,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
 	if (!timeout) {
 	  if (!(mainw==NULL)) {
 	    weed_plant_t *frame_layer=mainw->frame_layer;
 	    mainw->frame_layer=NULL;
-	    while (g_main_context_iteration(NULL,FALSE));
+	    lives_widget_context_update();
 	    mainw->frame_layer=frame_layer;
 	  }
 	  g_usleep(prefs->sleep_time);
 	}
 	else break;
       }
+      else break;
     } while (!valfile);
 
     lives_alarm_clear(alarm_handle);
@@ -109,7 +120,7 @@
 
 
 
-void get_pref_utf8(const gchar *key, gchar *val, gint maxlen) {
+void get_pref_utf8(const gchar *key, gchar *val, int maxlen) {
   // get a pref in locale encoding, then convert it to utf8
   gchar *tmp;
   get_pref(key,val,maxlen);
@@ -146,14 +157,14 @@
 
 
 
-void get_pref_default(const gchar *key, gchar *val, gint maxlen) {
+void get_pref_default(const gchar *key, gchar *val, int maxlen) {
   FILE *valfile;
   gchar *vfile;
-  gchar *com=g_strdup_printf("smogrify get_pref_default \"%s\"",key);
+  gchar *com=g_strdup_printf("%s get_pref_default \"%s\"",prefs->backend_sync,key);
 
   int retval;
   int alarm_handle;
-  gboolean timeout;
+  boolean timeout;
 
   memset(val,0,1);
 
@@ -163,7 +174,11 @@
     return;
   }
 
-  vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,getuid(),getpid());
+#ifndef IS_MINGW
+  vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),lives_getpid());
+#else
+  vfile=g_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),lives_getpid());
+#endif
 
   do {
     retval=0;
@@ -178,13 +193,14 @@
 	  if (!(mainw==NULL)) {
 	    weed_plant_t *frame_layer=mainw->frame_layer;
 	    mainw->frame_layer=NULL;
-	    while (g_main_context_iteration(NULL,FALSE));
+	    lives_widget_context_update();
 	    mainw->frame_layer=frame_layer;
 	  }
 	  g_usleep(prefs->sleep_time);
 	}
 	else break;
       }
+      else break;
     } while (!valfile);
 
     lives_alarm_clear(alarm_handle);
@@ -203,47 +219,44 @@
     }
   } while (retval==LIVES_RETRY);
 
+  if (!strcmp(val,"NULL")) memset(val,0,1);
+
   g_free(vfile);
   g_free(com);
 }
 
 
-gboolean
-get_boolean_pref(const gchar *key) {
+boolean get_boolean_pref(const gchar *key) {
   gchar buffer[16];
   get_pref(key,buffer,16);
   if (!strcmp(buffer,"true")) return TRUE;
   return FALSE;
 }
 
-gint
-get_int_pref(const gchar *key) {
+int get_int_pref(const gchar *key) {
   gchar buffer[64];
   get_pref(key,buffer,64);
   if (strlen(buffer)==0) return 0;
   return atoi(buffer);
 }
 
-gdouble
-get_double_pref(const gchar *key) {
+double get_double_pref(const gchar *key) {
   gchar buffer[64];
   get_pref(key,buffer,64);
   if (strlen(buffer)==0) return 0.;
   return strtod(buffer,NULL);
 }
 
-void
-delete_pref(const gchar *key) {
-  gchar *com=g_strdup_printf("smogrify delete_pref \"%s\"",key);
+void delete_pref(const gchar *key) {
+  gchar *com=g_strdup_printf("%s delete_pref \"%s\"",prefs->backend_sync,key);
   if (system(com)) {
     tempdir_warning();
   }
   g_free(com);
 }
 
-void
-set_pref(const gchar *key, const gchar *value) {
-  gchar *com=g_strdup_printf("smogrify set_pref \"%s\" \"%s\"",key,value);
+void set_pref(const gchar *key, const gchar *value) {
+  gchar *com=g_strdup_printf("%s set_pref \"%s\" \"%s\"",prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
@@ -251,9 +264,8 @@
 }
 
 
-void
-set_int_pref(const gchar *key, gint value) {
-  gchar *com=g_strdup_printf("smogrify set_pref \"%s\" %d",key,value);
+void set_int_pref(const gchar *key, int value) {
+  gchar *com=g_strdup_printf("%s set_pref \"%s\" %d",prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
@@ -261,9 +273,8 @@
 }
 
 
-void
-set_int64_pref(const gchar *key, gint64 value) {
-  gchar *com=g_strdup_printf("smogrify set_pref \"%s\" %"PRId64,key,value);
+void set_int64_pref(const gchar *key, int64_t value) {
+  gchar *com=g_strdup_printf("%s set_pref \"%s\" %"PRId64,prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
@@ -271,9 +282,8 @@
 }
 
 
-void
-set_double_pref(const gchar *key, gdouble value) {
-  gchar *com=g_strdup_printf("smogrify set_pref \"%s\" %.3f",key,value);
+void set_double_pref(const gchar *key, double value) {
+  gchar *com=g_strdup_printf("%s set_pref \"%s\" %.3f",prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
@@ -281,15 +291,14 @@
 }
 
 
-void
-set_boolean_pref(const gchar *key, gboolean value) {
+void set_boolean_pref(const gchar *key, boolean value) {
   gchar *com;
 
   if (value) {
-    com=g_strdup_printf("smogrify set_pref \"%s\" true",key);
+    com=g_strdup_printf("%s set_pref \"%s\" true",prefs->backend_sync,key);
   }
   else {
-    com=g_strdup_printf("smogrify set_pref \"%s\" false",key);
+    com=g_strdup_printf("%s set_pref \"%s\" false",prefs->backend_sync,key);
   }
   if (system(com)) {
     tempdir_warning();
@@ -325,11 +334,11 @@
 
 
 
-void set_vpp(gboolean set_in_prefs) {
+void set_vpp(boolean set_in_prefs) {
   // Video Playback Plugin
 
   if (strlen (future_prefs->vpp_name)) {
-    if (!g_strcasecmp(future_prefs->vpp_name,mainw->none_string)) {
+    if (!g_ascii_strcasecmp(future_prefs->vpp_name,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
       if (mainw->vpp!=NULL) {
 	if (mainw->ext_playback) vid_playback_plugin_exit();
 	close_vid_playback_plugin(mainw->vpp);
@@ -346,7 +355,7 @@
 	  if (!mainw->ext_playback) 
 	    do_error_dialog_with_check_transient 
 	      (_ ("\n\nVideo playback plugins are only activated in\nfull screen, separate window (fs) mode\n"),
-	       TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES->window));
+	       TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES));
 	}
       }
     }
@@ -402,7 +411,7 @@
     g_free(free_ds);
   }
 
-  tmpx1=g_strdup(_("The temp directory is LiVES working directory where opened clips and sets are stored.\nIt should be in a partition with plenty of free disk space.\n\nTip: avoid setting it inside /tmp, since frequently /tmp is cleared on system shutdown."));
+  tmpx1=g_strdup(_("The temp directory is LiVES working directory where opened clips and sets are stored.\nIt should be in a partition with plenty of free disk space.\n"));
 
   markup = g_markup_printf_escaped ("<span background=\"white\" foreground=\"red\"><b>%s</b></span>%s",tmpx1,tmpx2);
   gtk_label_set_markup (GTK_LABEL (label), markup);
@@ -414,11 +423,8 @@
 
 
 
-gboolean apply_prefs(gboolean skip_warn) {
+boolean apply_prefs(boolean skip_warn) {
   // set current prefs from prefs dialog
-  int idx;
-
-  gboolean needs_restart=FALSE;
   const gchar *video_open_command=gtk_entry_get_text(GTK_ENTRY(prefsw->video_open_entry));
   const gchar *audio_play_command=gtk_entry_get_text(GTK_ENTRY(prefsw->audio_command_entry));
   const gchar *def_vid_load_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->vid_load_dir_entry));
@@ -426,111 +432,146 @@
   const gchar *def_audio_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->audio_dir_entry));
   const gchar *def_image_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->image_dir_entry));
   const gchar *def_proj_dir=gtk_entry_get_text(GTK_ENTRY(prefsw->proj_dir_entry));
+  const gchar *wp_path=gtk_entry_get_text(GTK_ENTRY(prefsw->wpp_entry));
+  const gchar *frei0r_path=gtk_entry_get_text(GTK_ENTRY(prefsw->frei0r_entry));
+  const gchar *ladspa_path=gtk_entry_get_text(GTK_ENTRY(prefsw->ladspa_entry));
+
   gchar tmpdir[PATH_MAX];
-  const gchar *theme = gtk_combo_box_get_active_text( GTK_COMBO_BOX(prefsw->theme_combo) );
-  const gchar *audp = gtk_combo_box_get_active_text( GTK_COMBO_BOX(prefsw->audp_combo) );
-  const gchar *audio_codec = gtk_combo_box_get_active_text( GTK_COMBO_BOX(prefsw->acodec_combo) );
-  const gchar *pb_quality = gtk_combo_box_get_active_text( GTK_COMBO_BOX(prefsw->pbq_combo) );
-
-  gint pbq=PB_QUALITY_MED;
-
-  gdouble default_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_def_fps));
-  gboolean pause_xmms=FALSE;
-  gboolean antialias=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_antialias));
-  gboolean fx_threads=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_threads));
-  gint nfx_threads=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_nfx_threads));
-  gboolean stop_screensaver=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->stop_screensaver_check));
-  gboolean open_maximised=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->open_maximised_check));
-  gboolean fs_maximised=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->fs_max_check));
-  gboolean show_recent=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->recent_check));
-  gboolean stream_audio_out=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio));
+  gchar *theme = lives_combo_get_active_text( LIVES_COMBO(prefsw->theme_combo) );
+  gchar *audp = lives_combo_get_active_text( LIVES_COMBO(prefsw->audp_combo) );
+  gchar *audio_codec=NULL;
+  gchar *pb_quality = lives_combo_get_active_text( LIVES_COMBO(prefsw->pbq_combo) );
+
+  int pbq=PB_QUALITY_MED;
+  int idx;
+
+  boolean needs_restart=FALSE;
+
+  double default_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_def_fps));
+
+  boolean antialias=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_antialias));
+  boolean fx_threads=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_threads));
+
+  int nfx_threads=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_nfx_threads));
+
+  boolean stop_screensaver=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->stop_screensaver_check));
+  boolean open_maximised=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->open_maximised_check));
+  boolean fs_maximised=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->fs_max_check));
+  boolean show_recent=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->recent_check));
+  boolean stream_audio_out=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio));
+  boolean rec_after_pb=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb));
 
   guint64 ds_warn_level=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_ds))*1000000;
   guint64 ds_crit_level=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_crit_ds))*1000000;
 
-  gboolean warn_fps=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_fps));
-  gboolean warn_save_set=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_save_set));
-  gboolean warn_fsize=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_fsize));
-  gboolean warn_mplayer=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_mplayer));
-  gboolean warn_rendered_fx=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_rendered_fx));
-  gboolean warn_encoders=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_encoders));
-  gboolean warn_duplicate_set=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_dup_set));
-  gboolean warn_layout_missing_clips=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_clips));
-  gboolean warn_layout_close=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_close));
-  gboolean warn_layout_delete=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_delete));
-  gboolean warn_layout_shift=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_shift));
-  gboolean warn_layout_alter=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_alter));
-  gboolean warn_discard_layout=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_discard_layout));
-  gboolean warn_after_dvgrab=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_dvgrab));
-  gboolean warn_mt_achans=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_achans));
-  gboolean warn_mt_no_jack=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_no_jack));
-  gboolean warn_yuv4m_open=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_yuv4m_open));
-
-  gboolean warn_layout_adel=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_adel));
-  gboolean warn_layout_ashift=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_ashift));
-  gboolean warn_layout_aalt=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_aalt));
-  gboolean warn_layout_popup=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_popup));
-  gboolean warn_mt_backup_space=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_backup_space));
-  gboolean warn_after_crash=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_crash));
-  gboolean warn_no_pulse=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_warn_no_pulse));
-
-  gboolean midisynch=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->check_midi));
-  gboolean instant_open=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_instant_open));
-  gboolean auto_deint=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_auto_deint));
-  gboolean auto_nobord=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_nobord));
-  gboolean concat_images=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_concat_images));
-  gboolean ins_speed=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->ins_speed));
-  gboolean show_player_stats=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_show_stats));
-  gboolean ext_jpeg=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->jpeg));
-  gboolean show_tool=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->show_tool));
-  gboolean mouse_scroll=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->mouse_scroll));
-  gboolean ce_maxspect=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_ce_maxspect));
-  gint fsize_to_warn=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_fsize));
-  gint dl_bwidth=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_bwidth));
-  gint ocp=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_ocp));
-  gboolean rec_frames=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->rframes));
-  gboolean rec_fps=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->rfps));
-  gboolean rec_effects=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->reffects));
-  gboolean rec_clips=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->rclips));
-  gboolean rec_audio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->raudio));
-  gboolean rec_ext_audio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->rextaudio));
+  boolean warn_fps=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_fps));
+  boolean warn_save_set=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_save_set));
+  boolean warn_fsize=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_fsize));
+  boolean warn_mplayer=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mplayer));
+  boolean warn_rendered_fx=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_rendered_fx));
+  boolean warn_encoders=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_encoders));
+  boolean warn_duplicate_set=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_dup_set));
+  boolean warn_layout_missing_clips=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_clips));
+  boolean warn_layout_close=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_close));
+  boolean warn_layout_delete=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_delete));
+  boolean warn_layout_shift=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_shift));
+  boolean warn_layout_alter=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_alter));
+  boolean warn_discard_layout=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_discard_layout));
+  boolean warn_after_dvgrab=
+#ifdef HAVE_LDVGRAB
+lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_dvgrab));
+#else
+  !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB);
+#endif
+  boolean warn_mt_achans=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_achans));
+  boolean warn_mt_no_jack=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_no_jack));
+  boolean warn_yuv4m_open=
+#ifdef HAVE_YUV4MPEG
+lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_yuv4m_open));
+#else
+  !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M);
+#endif
+
+  boolean warn_layout_adel=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_adel));
+  boolean warn_layout_ashift=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_ashift));
+  boolean warn_layout_aalt=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_aalt));
+  boolean warn_layout_popup=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_popup));
+  boolean warn_mt_backup_space=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_backup_space));
+  boolean warn_after_crash=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_crash));
+  boolean warn_no_pulse=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_no_pulse));
+
+  boolean midisynch=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->check_midi));
+  boolean instant_open=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_instant_open));
+  boolean auto_deint=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_auto_deint));
+  boolean auto_nobord=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_nobord));
+  boolean concat_images=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_concat_images));
+  boolean ins_speed=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->ins_speed));
+  boolean show_player_stats=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_show_stats));
+  boolean ext_jpeg=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->jpeg));
+  boolean show_tool=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->show_tool));
+  boolean mouse_scroll=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mouse_scroll));
+  boolean ce_maxspect=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_ce_maxspect));
+
+  int fsize_to_warn=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_warn_fsize));
+  int dl_bwidth=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_bwidth));
+  int ocp=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_ocp));
+
+  boolean rec_frames=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rframes));
+  boolean rec_fps=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rfps));
+  boolean rec_effects=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->reffects));
+  boolean rec_clips=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rclips));
+  boolean rec_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->raudio));
+  boolean rec_ext_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio));
 #ifdef RT_AUDIO
-  gboolean rec_desk_audio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->rdesk_audio));
+  boolean rec_desk_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rdesk_audio));
 #endif
 
-  gboolean mt_enter_prompt=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->mt_enter_prompt));
-  gboolean render_prompt=!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_render_prompt));
-  gint mt_def_width=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_width));
-  gint mt_def_height=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_height));
-  gint mt_def_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_fps));
-  gint mt_def_arate=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-  gint mt_def_achans=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-  gint mt_def_asamps=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
-  gint mt_def_signed_endian=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))*
-    AFORM_UNSIGNED+gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))*AFORM_BIG_ENDIAN;
-  gint mt_undo_buf=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_undo_buf));
-  gboolean mt_exit_render=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_mt_exit_render));
-  gboolean mt_enable_audio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton));
-  gboolean mt_pertrack_audio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->pertrack_checkbutton));
-  gboolean mt_backaudio=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->backaudio_checkbutton));
-
-  gboolean mt_autoback_always=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->mt_autoback_always));
-  gboolean mt_autoback_never=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->mt_autoback_never));
-  gint mt_autoback_time=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time));
-
-  gint gui_monitor=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_gmoni));
-  gint play_monitor=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_pmoni));
-  gboolean forcesmon=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->forcesmon));
-  gboolean startup_ce=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->rb_startup_ce));
+  boolean mt_enter_prompt=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_enter_prompt));
+  boolean render_prompt=!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_render_prompt));
+
+  int mt_def_width=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_width));
+  int mt_def_height=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_height));
+  int mt_def_fps=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_def_fps));
+  int mt_def_arate=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+  int mt_def_achans=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+  int mt_def_asamps=atoi(gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+  int mt_def_signed_endian=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))*
+    AFORM_UNSIGNED+lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))*AFORM_BIG_ENDIAN;
+  int mt_undo_buf=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_undo_buf));
+
+  boolean mt_exit_render=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_mt_exit_render));
+  boolean mt_enable_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton));
+  boolean mt_pertrack_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->pertrack_checkbutton));
+  boolean mt_backaudio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->backaudio_checkbutton));
+
+  boolean mt_autoback_always=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_always));
+  boolean mt_autoback_never=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_never));
+
+  int mt_autoback_time=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time));
+  int gui_monitor=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_gmoni));
+  int play_monitor=gtk_spin_button_get_value(GTK_SPIN_BUTTON(prefsw->spinbutton_pmoni));
+
+  boolean forcesmon=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->forcesmon));
+  boolean startup_ce=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->rb_startup_ce));
+
+
+#ifdef ENABLE_JACK_TRANSPORT
+  boolean jack_tstart=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_tjack));
+  boolean jack_master=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_master));
+  boolean jack_client=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client));
+  boolean jack_tb_start=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start));
+  boolean jack_tb_client=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client));
+#else
+  boolean jack_tstart=FALSE;
+  boolean jack_master=FALSE;
+  boolean jack_client=FALSE;
+  boolean jack_tb_start=FALSE;
+  boolean jack_tb_client=FALSE;
+#endif
 
 #ifdef ENABLE_JACK
-  gboolean jack_tstart=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_start_tjack));
-  gboolean jack_astart=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack));
-  gboolean jack_master=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_master));
-  gboolean jack_client=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_client));
-  gboolean jack_tb_start=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start));
-  gboolean jack_tb_client=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client));
-  gboolean jack_pwp=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_pwp));
+  boolean jack_astart=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack));
+  boolean jack_pwp=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_pwp));
   guint jack_opts=(JACK_OPTS_TRANSPORT_CLIENT*jack_client+JACK_OPTS_TRANSPORT_MASTER*jack_master+
 		   JACK_OPTS_START_TSERVER*jack_tstart+JACK_OPTS_START_ASERVER*jack_astart+
 		   JACK_OPTS_NOPLAY_WHEN_PAUSED*!jack_pwp+JACK_OPTS_TIMEBASE_START*jack_tb_start+
@@ -538,45 +579,44 @@
 #endif
 
 #ifdef RT_AUDIO
-  gboolean audio_follow_fps=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_afollow));
-  gboolean audio_follow_clips=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_aclips));
+  boolean audio_follow_fps=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_afollow));
+  boolean audio_follow_clips=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_aclips));
   guint audio_opts=(AUDIO_OPTS_FOLLOW_FPS*audio_follow_fps+AUDIO_OPTS_FOLLOW_CLIPS*audio_follow_clips);
 #endif
 
 #ifdef ENABLE_OSC
   guint osc_udp_port=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_osc_udp));
-  gboolean osc_start=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->enable_OSC_start));
-  gboolean osc_enable=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->enable_OSC));
+  boolean osc_start=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->enable_OSC_start));
+  boolean osc_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->enable_OSC));
 #endif
 
-  gint rte_keys_virtual=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rte_keys));
+  int rte_keys_virtual=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rte_keys));
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
-  gboolean omc_js_enable=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_omc_js));
+  boolean omc_js_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_js));
   const gchar *omc_js_fname=gtk_entry_get_text(GTK_ENTRY(prefsw->omc_js_entry));
 #endif
 
 
 #ifdef OMC_MIDI_IMPL
-  gboolean omc_midi_enable=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_omc_midi));
+  boolean omc_midi_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_midi));
   const gchar *omc_midi_fname=gtk_entry_get_text(GTK_ENTRY(prefsw->omc_midi_entry));
-  gint midicr=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midicr));
-  gint midirpt=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midirpt));
+  int midicr=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midicr));
+  int midirpt=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_midirpt));
 
 #ifdef ALSA_MIDI
-  gboolean use_alsa_midi=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->alsa_midi));
+  boolean use_alsa_midi=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->alsa_midi));
 #endif
 
 #endif
 #endif
 
-  gint rec_gb=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rec_gb));
+  int rec_gb=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(prefsw->spinbutton_rec_gb));
 
   gchar audio_player[256];
-  gint listlen=g_list_length (prefs->acodec_list);
-  gint rec_opts=rec_frames*REC_FRAMES+rec_fps*REC_FPS+rec_effects*REC_EFFECTS+rec_clips*REC_CLIPS+rec_audio*REC_AUDIO+
-    rec_ext_audio*REC_EXT_AUDIO;
+  int listlen=g_list_length (prefs->acodec_list);
+  int rec_opts=rec_frames*REC_FRAMES+rec_fps*REC_FPS+rec_effects*REC_EFFECTS+rec_clips*REC_CLIPS+rec_audio*REC_AUDIO+rec_after_pb*REC_AFTER_PB;
   guint warn_mask;
 
   unsigned char *new_undo_buf;
@@ -584,9 +624,9 @@
 
  
 #ifdef ENABLE_OSC
-  gboolean set_omc_dev_opts=FALSE;
+  boolean set_omc_dev_opts=FALSE;
 #ifdef OMC_MIDI_IMPL
-  gboolean needs_midi_restart=FALSE;
+  boolean needs_midi_restart=FALSE;
 #endif
 #endif
 
@@ -594,25 +634,47 @@
 
   gchar *cdplay_device=g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(prefsw->cdplay_entry)),-1,NULL,NULL,NULL);
 
-  for (idx=0;idx<listlen&&strcmp((gchar *)g_list_nth_data (prefs->acodec_list,idx),audio_codec);idx++);
+  if (capable->has_encoder_plugins) {
+    audio_codec = lives_combo_get_active_text( LIVES_COMBO(prefsw->acodec_combo) );
 
-  if (idx==listlen) future_prefs->encoder.audio_codec=0;
-  else future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[idx];
+    for (idx=0;idx<listlen&&strcmp((gchar *)g_list_nth_data (prefs->acodec_list,idx),audio_codec);idx++);
+    g_free(audio_codec);
+
+    if (idx==listlen) future_prefs->encoder.audio_codec=0;
+    else future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[idx];
+  }
+  else future_prefs->encoder.audio_codec=0;
 
   g_snprintf (tmpdir,PATH_MAX,"%s",(tmp=g_filename_from_utf8(gtk_entry_get_text(GTK_ENTRY(prefsw->tmpdir_entry)),
 							     -1,NULL,NULL,NULL)));
   g_free(tmp);
 
-  if (!strncmp(audp,"mplayer",7)) g_snprintf(audio_player,256,"mplayer");
+  if (audp==NULL) memset(audio_player,0,1);
+  else if (!strncmp(audp,"mplayer",7)) g_snprintf(audio_player,256,"mplayer");
   else if (!strncmp(audp,"jack",4)) g_snprintf(audio_player,256,"jack");
   else if (!strncmp(audp,"sox",3)) g_snprintf(audio_player,256,"sox");
   else if (!strncmp(audp,"pulse audio",11)) g_snprintf(audio_player,256,"pulse");
   
+  g_free(audp);
+
+  if (!((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
+    if (prefs->audio_src==AUDIO_SRC_EXT) prefs->audio_src=AUDIO_SRC_INT;
+  }
+
   if (rec_opts!=prefs->rec_opts) {
     prefs->rec_opts=rec_opts;
     set_int_pref("record_opts",prefs->rec_opts);
   }
 
+  if (rec_ext_audio&&prefs->audio_src==AUDIO_SRC_INT) {
+    prefs->audio_src=AUDIO_SRC_EXT;
+    set_int_pref("audio_src",AUDIO_SRC_EXT);
+  }
+  else if (!rec_ext_audio&&prefs->audio_src==AUDIO_SRC_EXT) {
+    prefs->audio_src=AUDIO_SRC_INT;
+    set_int_pref("audio_src",AUDIO_SRC_INT);
+  }
+
 
   warn_mask=!warn_fps*WARN_MASK_FPS+!warn_save_set*WARN_MASK_SAVE_SET+!warn_fsize*WARN_MASK_FSIZE+!warn_mplayer*
     WARN_MASK_NO_MPLAYER+!warn_rendered_fx*WARN_MASK_RENDERED_FX+!warn_encoders*
@@ -660,26 +722,46 @@
     prefs->ce_maxspect=ce_maxspect;
     set_boolean_pref("ce_maxspect",ce_maxspect);
     if (mainw->current_file>-1) {
-      gint current_file=mainw->current_file;
+      int current_file=mainw->current_file;
       switch_to_file((mainw->current_file=0),current_file);
     }
   }
 
+  if (strcmp(wp_path,prefs->weed_plugin_path)) {
+    set_pref("weed_plugin_path",wp_path);
+    snprintf(prefs->weed_plugin_path,PATH_MAX,"%s",wp_path);
+  }
+
+  if (strcmp(frei0r_path,prefs->frei0r_path)) {
+    set_pref("frei0r_path",frei0r_path);
+    snprintf(prefs->frei0r_path,PATH_MAX,"%s",frei0r_path);
+  }
+
+  if (strcmp(ladspa_path,prefs->ladspa_path)) {
+    set_pref("ladspa_path",ladspa_path);
+    snprintf(prefs->ladspa_path,PATH_MAX,"%s",ladspa_path);
+  }
+
   ensure_isdir(tmpdir);
   ensure_isdir(prefs->tmpdir);
   ensure_isdir(future_prefs->tmpdir);
 
   if (strcmp(prefs->tmpdir,tmpdir)||strcmp (future_prefs->tmpdir,tmpdir)) {
     if (g_file_test (tmpdir, G_FILE_TEST_EXISTS)&&(strlen (tmpdir)<10||
-						   strncmp (tmpdir+strlen (tmpdir)-10,"/livestmp/",10))) 
-      g_strappend (tmpdir,PATH_MAX,"livestmp/");
+						   strncmp (tmpdir+strlen (tmpdir)-10,"/"LIVES_TMP_NAME"/",10))) 
+      g_strappend (tmpdir,PATH_MAX,LIVES_TMP_NAME"/");
 
     if (strcmp(prefs->tmpdir,tmpdir)||strcmp (future_prefs->tmpdir,tmpdir)) {
       gchar *msg;
 
       if (!check_dir_access (tmpdir)) {
 	tmp=g_filename_to_utf8(tmpdir,-1,NULL,NULL,NULL);
-	msg=g_strdup_printf (_ ("Unable to create or write to the new temporary directory.\nYou may need to create it as the root user first, e.g:\n\nmkdir %s; chmod 777 %s\n\nThe directory will not be changed now.\n"),tmp,tmp);
+#ifndef IS_MINGW
+	msg=g_strdup_printf (_ ("Unable to create or write to the new temporary directory.\nYou may need to create it as the root user first, e.g:\n\nsudo mkdir -p %s; sudo chmod 777 %s\n\nThe directory will not be changed now.\n"),tmp,tmp);
+#else
+	msg=g_strdup_printf (_ ("Unable to create or write to the new temporary directory.\n%s\nPlease try another directory or contact your system administrator.\n\nThe directory will not be changed now.\n"),tmp);
+#endif
+
 	g_free(tmp);
 	do_blocking_error_dialog (msg);
       }
@@ -687,7 +769,7 @@
 	g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",tmpdir);
 	set_temp_label_text(GTK_LABEL(prefsw->temp_label));
 	gtk_widget_queue_draw(prefsw->temp_label);
-	while (g_main_context_iteration(NULL,FALSE)); // update prefs window before showing confirmation box
+	lives_widget_context_update(); // update prefs window before showing confirmation box
 
 	msg=g_strdup (_ ("You have chosen to change the temporary directory.\nPlease make sure you have no other copies of LiVES open.\n\nIf you do have other copies of LiVES open, please close them now, *before* pressing OK.\n\nAlternatively, press Cancel to restore the temporary directory to its original setting."));	
         if (do_warning_dialog(msg)) {
@@ -762,40 +844,10 @@
       prefs->gui_monitor=gui_monitor;
       prefs->play_monitor=play_monitor;
 
-      if (mainw->multitrack==NULL) {
-	if (prefs->gui_monitor!=0) {
-	  gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-							  mainw->LiVES->allocation.width)/2;
-	  gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-							  mainw->LiVES->allocation.height)/2;
-	  gtk_window_move(GTK_WINDOW(mainw->LiVES),xcen,ycen);
-	  
-	}
-	if (prefs->open_maximised&&prefs->show_gui) {
-	  gtk_window_maximize (GTK_WINDOW(mainw->LiVES));
-	}
-      }
-      else {
-	if (prefs->gui_monitor!=0) {
-	  gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-							  mainw->multitrack->window->allocation.width)/2;
-	  gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-							  mainw->multitrack->window->allocation.height)/2;
-	  gtk_window_move(GTK_WINDOW(mainw->multitrack->window),xcen,ycen);
-	}
-	
-	
-	if ((prefs->gui_monitor!=0||capable->nmonitors<=1)&&prefs->open_maximised) {
-	  gtk_window_maximize (GTK_WINDOW(mainw->multitrack->window));
-	}
-      }
-      if (mainw->play_window!=NULL) {
-	resize_play_window();
-      }
+      resize_widgets_for_monitor(TRUE);
     }
   }
 
-
   // fps stats
   if (prefs->show_player_stats!=show_player_stats) {
     prefs->show_player_stats=show_player_stats;
@@ -821,15 +873,6 @@
     }
   }
 
-  if (capable->has_xmms) {
-    pause_xmms=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->check_xmms_pause));
-    // pause xmms during playback
-    if (prefs->pause_xmms!=pause_xmms) {
-      prefs->pause_xmms=pause_xmms;
-      set_boolean_pref("pause_xmms_on_playback",pause_xmms);
-    }
-  }
-  
   // midi synch
   if (prefs->midisynch!=midisynch) {
     prefs->midisynch=midisynch;
@@ -896,6 +939,8 @@
   if (!strcmp(pb_quality,(gchar *)g_list_nth_data(prefsw->pbq_list,1))) pbq=PB_QUALITY_MED;
   if (!strcmp(pb_quality,(gchar *)g_list_nth_data(prefsw->pbq_list,2))) pbq=PB_QUALITY_HIGH;
 
+  g_free(pb_quality);
+
   if (pbq!=prefs->pb_quality) {
     prefs->pb_quality=pbq;
     set_int_pref("pb_quality",pbq);
@@ -917,9 +962,11 @@
   }
 
   // cd play device
-  if (strcmp(prefs->cdplay_device,cdplay_device)) {
-    g_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
-    set_pref("cdplay_device",prefs->cdplay_device);
+  if (!capable->has_cdda2wav) {
+    if (strcmp(prefs->cdplay_device,cdplay_device)) {
+      g_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
+      set_pref("cdplay_device",prefs->cdplay_device);
+    }
   }
 
   g_free(cdplay_device);
@@ -966,8 +1013,9 @@
   }
 
   // the theme
-  if (strcmp(future_prefs->theme,theme)&&!(!strcasecmp(future_prefs->theme,"none")&&!strcmp(theme,mainw->none_string))) {
-    if (strcmp(theme,mainw->none_string)) {
+  if (strcmp(future_prefs->theme,theme)&&!(!g_ascii_strcasecmp(future_prefs->theme,"none")&&
+					   !strcmp(theme,mainw->string_constants[LIVES_STRING_CONSTANT_NONE]))) {
+    if (strcmp(theme,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
       g_snprintf(future_prefs->theme,64,"%s",theme);
     }
     else g_snprintf(future_prefs->theme,64,"none");
@@ -975,6 +1023,8 @@
     mainw->prefs_changed|=PREFS_THEME_CHANGED;
   }
 
+  g_free(theme);
+
   // default fps
   if (prefs->default_fps!=default_fps) {
     prefs->default_fps=default_fps;
@@ -1016,8 +1066,6 @@
   }
 
 
-
-
 #ifdef ENABLE_OSC
   if (osc_enable) {
     if (prefs->osc_udp_started&&osc_udp_port!=prefs->osc_udp_port) {
@@ -1083,13 +1131,13 @@
   if (prefs->audio_player==AUD_PLAYER_JACK&&!capable->has_jackd) {
     do_error_dialog_with_check_transient
       (_("\nUnable to switch audio players to jack - jackd must be installed first.\nSee http://jackaudio.org\n"),
-       TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES->window));
+       TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES));
   }
   else {
     if (prefs->audio_player==AUD_PLAYER_JACK&&strcmp(audio_player,"jack")) {
       do_error_dialog_with_check_transient
 	(_("\nSwitching audio players requires restart (jackd must not be running)\n"),
-	 TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES->window));
+	 TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES));
     }
 
     // switch to sox
@@ -1102,7 +1150,7 @@
       // may fail
       if (!switch_aud_to_jack()) {
 	do_jack_noopen_warn();
-	set_combo_box_active_string(GTK_COMBO_BOX(prefsw->audp_combo), prefsw->orig_audp_name);
+	lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->orig_audp_name);
       }
     }
     
@@ -1116,12 +1164,12 @@
       if (!capable->has_pulse_audio) {
 	do_error_dialog_with_check_transient
 	  (_("\nUnable to switch audio players to pulse audio\npulseaudio must be installed first.\nSee http://www.pulseaudio.org\n"),
-	   TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES->window));
+	   TRUE,0,prefsw!=NULL?GTK_WINDOW(prefsw->prefs_dialog):GTK_WINDOW(mainw->LiVES));
       }
       else {
 	if (!switch_aud_to_pulse()) {
 	  // revert text
-	  set_combo_box_active_string(GTK_COMBO_BOX(prefsw->audp_combo), prefsw->orig_audp_name);
+	  lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->orig_audp_name);
 	}
       }
     }
@@ -1331,8 +1379,7 @@
 
 
 
-void
-save_future_prefs(void) {
+void save_future_prefs(void) {
   // save future prefs on exit, if they have changed
 
   // show_recent is a special case, future prefs has our original value
@@ -1354,14 +1401,17 @@
 }
 
 
-void 
-rdet_acodec_changed (GtkComboBox *acodec_combo, gpointer user_data) {
-  gint listlen=g_list_length (prefs->acodec_list);
+void rdet_acodec_changed (GtkComboBox *acodec_combo, gpointer user_data) {
+  int listlen=g_list_length (prefs->acodec_list);
   int idx;
-  const gchar *audio_codec = gtk_combo_box_get_active_text(acodec_combo);
-  if (!strcmp(audio_codec,mainw->any_string)) return;
+  char *audio_codec = lives_combo_get_active_text(acodec_combo);
+  if (!strcmp(audio_codec,mainw->string_constants[LIVES_STRING_CONSTANT_ANY])) {
+    g_free(audio_codec);
+    return;
+  }
 
   for (idx=0;idx<listlen&&strcmp((gchar *)g_list_nth_data (prefs->acodec_list,idx),audio_codec);idx++);
+  g_free(audio_codec);
 
   if (idx==listlen) future_prefs->encoder.audio_codec=0;
   else future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[idx];
@@ -1384,7 +1434,7 @@
 
 
   int count=0,idx;
-  gboolean is_allowed=FALSE;
+  boolean is_allowed=FALSE;
   
   if (prefs->acodec_list!=NULL) {
     g_list_free (prefs->acodec_list);
@@ -1392,15 +1442,15 @@
   }
 
   if (future_prefs->encoder.of_allowed_acodecs==0) {
-    prefs->acodec_list = g_list_append (prefs->acodec_list, g_strdup(mainw->none_string));
+    prefs->acodec_list = g_list_append (prefs->acodec_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
     future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[0]=AUDIO_CODEC_NONE;
 
     if (prefsw!=NULL) {
-      populate_combo_box(GTK_COMBO_BOX(prefsw->acodec_combo), prefs->acodec_list);
+      lives_combo_populate(LIVES_COMBO(prefsw->acodec_combo), prefs->acodec_list);
       gtk_combo_box_set_active(GTK_COMBO_BOX(prefsw->acodec_combo), 0);
     }
     if (rdet!=NULL) {
-      populate_combo_box(GTK_COMBO_BOX(rdet->acodec_combo), prefs->acodec_list);
+      lives_combo_populate(LIVES_COMBO(rdet->acodec_combo), prefs->acodec_list);
       gtk_combo_box_set_active(GTK_COMBO_BOX(rdet->acodec_combo), 0);
     }
     return;
@@ -1416,10 +1466,10 @@
   }
 
   if (prefsw != NULL){
-    populate_combo_box(GTK_COMBO_BOX(prefsw->acodec_combo), prefs->acodec_list);
+    lives_combo_populate(LIVES_COMBO(prefsw->acodec_combo), prefs->acodec_list);
   }
   if (rdet != NULL){
-    populate_combo_box(GTK_COMBO_BOX(rdet->acodec_combo), prefs->acodec_list);
+    lives_combo_populate(LIVES_COMBO(rdet->acodec_combo), prefs->acodec_list);
   }
   if (!is_allowed) {
     future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[0];
@@ -1440,38 +1490,43 @@
 
 
 void after_vpp_changed (GtkWidget *vpp_combo, gpointer advbutton) {
-  const gchar *newvpp=gtk_combo_box_get_active_text(GTK_COMBO_BOX(vpp_combo));
+  gchar *newvpp=lives_combo_get_active_text(LIVES_COMBO(vpp_combo));
   _vid_playback_plugin *tmpvpp;
 
-  if (!g_strcasecmp(newvpp,mainw->none_string)) {
+  if (!g_ascii_strcasecmp(newvpp,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
     gtk_widget_set_sensitive (GTK_WIDGET(advbutton), FALSE);
   }
   else {
     gtk_widget_set_sensitive (GTK_WIDGET(advbutton), TRUE);
 
     // will call set_astream_settings
-    if ((tmpvpp=open_vid_playback_plugin (newvpp, FALSE))==NULL) return;
+    if ((tmpvpp=open_vid_playback_plugin (newvpp, FALSE))==NULL) {
+      g_free(newvpp);
+      return;
+    }
     close_vid_playback_plugin(tmpvpp);
   }
   g_snprintf (future_prefs->vpp_name,64,"%s",newvpp);
+  g_free(newvpp);
 
   if (future_prefs->vpp_argv!=NULL) {
-    int i;
+    register int i;
     for (i=0;future_prefs->vpp_argv[i]!=NULL;g_free(future_prefs->vpp_argv[i++]));
     g_free(future_prefs->vpp_argv);
     future_prefs->vpp_argv=NULL;
   }
   future_prefs->vpp_argc=0;
 
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb),FALSE);
 
 }
 
 
 
 static void on_forcesmon_toggled (GtkToggleButton *tbutton, gpointer user_data) {
-  gtk_widget_set_sensitive(prefsw->spinbutton_gmoni,!gtk_toggle_button_get_active(tbutton));
-  gtk_widget_set_sensitive(prefsw->spinbutton_pmoni,!gtk_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(prefsw->spinbutton_gmoni,!lives_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(prefsw->spinbutton_pmoni,!lives_toggle_button_get_active(tbutton));
 }
 
 
@@ -1481,40 +1536,41 @@
   if (user_data!=NULL) xprefsw=(_prefsw *)user_data;
   else xprefsw=prefsw;
 
-  gtk_widget_set_sensitive(xprefsw->spinbutton_mt_ab_time,gtk_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(xprefsw->spinbutton_mt_ab_time,lives_toggle_button_get_active(tbutton));
 
 }
 
 #ifdef ENABLE_JACK_TRANSPORT
 static void after_jack_client_toggled(GtkToggleButton *tbutton, gpointer user_data) {
 
-  if (!gtk_toggle_button_get_active(tbutton)) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start),FALSE);
+  if (!lives_toggle_button_get_active(tbutton)) {
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start),FALSE);
     gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_start,FALSE);
   }
   else {
     gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_start,TRUE);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_start),
-				  (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?TRUE:FALSE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_start),
+				    (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?TRUE:FALSE);
   }
 }
 
 static void after_jack_tb_start_toggled(GtkToggleButton *tbutton, gpointer user_data) {
 
-  if (!gtk_toggle_button_get_active(tbutton)) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client),FALSE);
+  if (!lives_toggle_button_get_active(tbutton)) {
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client),FALSE);
     gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_client,FALSE);
   }
   else {
     gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_client,TRUE);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_client),
-				  (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?TRUE:FALSE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_client),
+				    (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?TRUE:FALSE);
   }
 }
 #endif
 
 
-
+#ifdef ENABLE_OSC
+#ifdef OMC_MIDI_IMPL
 #ifdef ALSA_MIDI
 static void on_alsa_midi_toggled (GtkToggleButton *tbutton, gpointer user_data) {
   _prefsw *xprefsw;
@@ -1522,29 +1578,33 @@
   if (user_data!=NULL) xprefsw=(_prefsw *)user_data;
   else xprefsw=prefsw;
 
-  gtk_widget_set_sensitive(xprefsw->button_midid,!gtk_toggle_button_get_active(tbutton));
-  gtk_widget_set_sensitive(xprefsw->omc_midi_entry,!gtk_toggle_button_get_active(tbutton));
-  gtk_widget_set_sensitive(xprefsw->spinbutton_midicr,!gtk_toggle_button_get_active(tbutton));
-  gtk_widget_set_sensitive(xprefsw->spinbutton_midirpt,!gtk_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(xprefsw->button_midid,!lives_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(xprefsw->omc_midi_entry,!lives_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(xprefsw->spinbutton_midicr,!lives_toggle_button_get_active(tbutton));
+  gtk_widget_set_sensitive(xprefsw->spinbutton_midirpt,!lives_toggle_button_get_active(tbutton));
 }
 #endif
-
-
+#endif
+#endif
 
 
 static void on_audp_entry_changed (GtkWidget *audp_combo, gpointer ptr) {
-  const gchar *audp = gtk_combo_box_get_active_text(GTK_COMBO_BOX(audp_combo));
+  gchar *audp = lives_combo_get_active_text(LIVES_COMBO(audp_combo));
 
-  if (!strlen(audp)||!strcmp(audp,prefsw->audp_name)) return;
+  if (!strlen(audp)||!strcmp(audp,prefsw->audp_name)) {
+    g_free(audp);
+    return;
+  }
 
   if (mainw->playing_file>-1) {
     do_aud_during_play_error();
     g_signal_handler_block(audp_combo, prefsw->audp_entry_func);
 
-    set_combo_box_active_string(GTK_COMBO_BOX(audp_combo), prefsw->audp_name);
+    lives_combo_set_active_string(LIVES_COMBO(audp_combo), prefsw->audp_name);
 
     //gtk_widget_queue_draw(audp_entry);
     g_signal_handler_unblock(audp_combo, prefsw->audp_entry_func);
+    g_free(audp);
     return;
   }
 
@@ -1552,38 +1612,38 @@
   if (!strncmp(audp,"jack",4)||!strncmp(audp,"pulse",5)) {
     gtk_widget_set_sensitive(prefsw->checkbutton_aclips,TRUE);
     gtk_widget_set_sensitive(prefsw->checkbutton_afollow,TRUE);
-    gtk_widget_set_sensitive(prefsw->raudio,!(prefs->rec_opts&REC_EXT_AUDIO));
-    gtk_widget_set_sensitive(prefsw->rextaudio,!(prefs->rec_opts&REC_AUDIO));
   }
   else {
     gtk_widget_set_sensitive(prefsw->checkbutton_aclips,FALSE);
     gtk_widget_set_sensitive(prefsw->checkbutton_afollow,FALSE);
     gtk_widget_set_sensitive(prefsw->raudio,FALSE);
     gtk_widget_set_sensitive(prefsw->rextaudio,FALSE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio),FALSE);
   }
   if (!strncmp(audp,"jack",4)) {
     gtk_widget_set_sensitive(prefsw->checkbutton_jack_pwp,TRUE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),TRUE);
     gtk_widget_show(prefsw->jack_int_label);
   }
   else {
     gtk_widget_set_sensitive(prefsw->checkbutton_jack_pwp,FALSE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),FALSE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),FALSE);
     gtk_widget_hide(prefsw->jack_int_label);
   }
 #endif
   g_free(prefsw->audp_name);
-  prefsw->audp_name=g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(audp_combo)));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
+  prefsw->audp_name=lives_combo_get_active_text(LIVES_COMBO(audp_combo));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb),FALSE);
+  g_free(audp);
+
 }
 
 
-static void stream_audio_toggled(GtkToggleButton *togglebutton,
-				 gpointer  user_data) {
+static void stream_audio_toggled(GtkToggleButton *togglebutton, gpointer user_data) {
   // if audio streaming is enabled, check requisites
 
-
-  if (gtk_toggle_button_get_active(togglebutton)) {
+  if (lives_toggle_button_get_active(togglebutton)) {
     // init vpp, get audio codec, check requisites
     _vid_playback_plugin *tmpvpp;
     guint32 orig_acodec=AUDIO_CODEC_NONE;
@@ -1599,11 +1659,12 @@
 
     if (tmpvpp->audio_codec!=AUDIO_CODEC_NONE) {
       // make audiostream plugin name
-      char buf[1024];
-      gchar *com;
       FILE *rfile;
       size_t rlen;
 
+      gchar buf[1024];
+      gchar *com;
+
       gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
       
       com=g_strdup_printf("\"%s\" check %d",astreamer,tmpvpp->audio_codec);
@@ -1623,7 +1684,7 @@
       g_free(com);
 
       if (rlen>0) {
-	gtk_toggle_button_set_active(togglebutton, FALSE);
+	lives_toggle_button_set_active(togglebutton, FALSE);
       }
     }
 
@@ -1645,22 +1706,33 @@
 
 void prefsw_set_astream_settings(_vid_playback_plugin *vpp) {
 
-  if (vpp==NULL||vpp->audio_codec!=AUDIO_CODEC_NONE) {
+  if (vpp!=NULL&&vpp->audio_codec!=AUDIO_CODEC_NONE) {
     gtk_widget_set_sensitive(prefsw->checkbutton_stream_audio,TRUE);
-    //gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),future_prefs->stream_audio_out);
+    //lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),future_prefs->stream_audio_out);
   }
   else {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),FALSE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),FALSE);
     gtk_widget_set_sensitive(prefsw->checkbutton_stream_audio,FALSE);
   }
 }
 
 
+void prefsw_set_rec_after_settings(_vid_playback_plugin *vpp) {
+  if (vpp!=NULL&&(vpp->capabilities&VPP_CAN_RETURN)) {
+    gtk_widget_set_sensitive(prefsw->checkbutton_rec_after_pb,TRUE);
+    //lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),future_prefs->stream_audio_out);
+  }
+  else {
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_rec_after_pb),FALSE);
+    gtk_widget_set_sensitive(prefsw->checkbutton_rec_after_pb,FALSE);
+  }
+}
+
+
 /*
  * Initialize preferences dialog list
  */
-static void pref_init_list(GtkWidget *list)
-{
+static void pref_init_list(GtkWidget *list) {
   GtkCellRenderer *renderer, *pixbufRenderer;
   GtkTreeViewColumn *column1, *column2;
   GtkListStore *store;
@@ -1673,7 +1745,7 @@
   gtk_tree_view_append_column(GTK_TREE_VIEW(list), column1);
   gtk_tree_view_append_column(GTK_TREE_VIEW(list), column2);
   gtk_tree_view_column_set_sizing(column2, GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width(column2, 150);
+  gtk_tree_view_column_set_fixed_width(column2, 150.*widget_opts.scale);
 
   store = gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_UINT);
 
@@ -1685,8 +1757,7 @@
 /*
  * Adds entry to preferences dialog list 
  */
-static void prefs_add_to_list(GtkWidget *list, GdkPixbuf *pix, const gchar *str, guint idx)
-{
+static void prefs_add_to_list(GtkWidget *list, GdkPixbuf *pix, const gchar *str, guint idx) {
   GtkListStore *store;
   GtkTreeIter iter;
 
@@ -1699,90 +1770,104 @@
 /*
  * Callback function called when preferences list row changed
  */
-void on_prefDomainChanged(GtkTreeSelection *widget, gpointer dummy) 
-{
+void on_prefDomainChanged(GtkTreeSelection *widget, gpointer dummy) {
   GtkTreeIter iter;
   GtkTreeModel *model;
-  guint idx;
 
-  if (gtk_tree_selection_get_selected( widget, &model, &iter)) {
-    gtk_tree_model_get(model, &iter, LIST_NUM, &idx, -1);
-    //
-    // Hide currently shown widget
-    if (prefsw->right_shown){
-      gtk_widget_hide_all(prefsw->right_shown);
-    }
-    //
-    switch (idx){
-    case LIST_ENTRY_MULTITRACK:
-      gtk_widget_show_all(prefsw->scrollw_right_multitrack);
-      prefsw->right_shown = prefsw->scrollw_right_multitrack;
-      break;
-    case LIST_ENTRY_GUI:
-      gtk_widget_show_all(prefsw->scrollw_right_gui);
-      prefsw->right_shown = prefsw->scrollw_right_gui;
-      break;
-    case LIST_ENTRY_DECODING:
-      gtk_widget_show_all(prefsw->scrollw_right_decoding);
-      prefsw->right_shown = prefsw->scrollw_right_decoding;
-      break;
-    case LIST_ENTRY_PLAYBACK:
-      gtk_widget_show_all(prefsw->scrollw_right_playback);
-      prefsw->right_shown = prefsw->scrollw_right_playback;
-      break;
-    case LIST_ENTRY_RECORDING:
-      gtk_widget_show_all(prefsw->scrollw_right_recording);
-      prefsw->right_shown = prefsw->scrollw_right_recording;
-      break;
-    case LIST_ENTRY_ENCODING:
-      gtk_widget_show_all(prefsw->scrollw_right_encoding);
-      prefsw->right_shown = prefsw->scrollw_right_encoding;
-      break;
-    case LIST_ENTRY_EFFECTS:
-      gtk_widget_show_all(prefsw->scrollw_right_effects);
-      prefsw->right_shown = prefsw->scrollw_right_effects;
-      break;
-    case LIST_ENTRY_DIRECTORIES:
-      gtk_widget_show_all(prefsw->scrollw_right_directories);
-      prefsw->right_shown = prefsw->scrollw_right_directories;
-      break;
-    case LIST_ENTRY_WARNINGS:
-      gtk_widget_show_all(prefsw->scrollw_right_warnings);
-      prefsw->right_shown = prefsw->scrollw_right_warnings;
-      break;
-    case LIST_ENTRY_MISC:
-      gtk_widget_show_all(prefsw->scrollw_right_misc);
-      prefsw->right_shown = prefsw->scrollw_right_misc;
-      break;
-    case LIST_ENTRY_THEMES:
-      gtk_widget_show_all(prefsw->scrollw_right_themes);
-      prefsw->right_shown = prefsw->scrollw_right_themes;
-      break;
-    case LIST_ENTRY_NET:
-      gtk_widget_show_all(prefsw->scrollw_right_net);
-      prefsw->right_shown = prefsw->scrollw_right_net;
-      break;
-    case LIST_ENTRY_JACK:
-      gtk_widget_show_all(prefsw->scrollw_right_jack);
-      prefsw->right_shown = prefsw->scrollw_right_jack;
-      break;
-    case LIST_ENTRY_MIDI:
-      gtk_widget_show_all(prefsw->scrollw_right_midi);
-      prefsw->right_shown = prefsw->scrollw_right_midi;
-      break;
-    default:
-      gtk_widget_show_all(prefsw->scrollw_right_gui);
-      prefsw->right_shown = prefsw->scrollw_right_gui;
-    }
-  }
+  register int i;
 
-  //if (!strcmp(prefs->wm,"Compiz")) {
-    // this is needed to force the window to update in some cases
-    if (GTK_WIDGET_VISIBLE(prefsw->prefs_dialog)) gtk_widget_show_all(prefsw->prefs_dialog);
-    gtk_widget_queue_draw(prefsw->prefs_dialog);
-    if (dummy==NULL) on_prefDomainChanged(widget,GINT_TO_POINTER(1));
-    //}
+  for (i=0;i<2;i++) {
+    // for some reason gtk+ needs us to do this twice..
+    if (gtk_tree_selection_get_selected( widget, &model, &iter)) {
+      gtk_tree_model_get(model, &iter, LIST_NUM, &prefs_current_page, -1);
+      //
+      // Hide currently shown widget
+      if (prefsw->right_shown){
+	gtk_widget_hide(prefsw->right_shown);
+      }
+      //
+      
+      switch (prefs_current_page){
+      case LIST_ENTRY_MULTITRACK:
+	gtk_widget_show_all(prefsw->scrollw_right_multitrack);
+	prefsw->right_shown = prefsw->scrollw_right_multitrack;
+	break;
+      case LIST_ENTRY_DECODING:
+	gtk_widget_show_all(prefsw->scrollw_right_decoding);
+	prefsw->right_shown = prefsw->scrollw_right_decoding;
+	break;
+      case LIST_ENTRY_PLAYBACK:
+	gtk_widget_show_all(prefsw->scrollw_right_playback);
+	prefsw->right_shown = prefsw->scrollw_right_playback;
+	break;
+      case LIST_ENTRY_RECORDING:
+	gtk_widget_show_all(prefsw->scrollw_right_recording);
+	prefsw->right_shown = prefsw->scrollw_right_recording;
+	break;
+      case LIST_ENTRY_ENCODING:
+	gtk_widget_show_all(prefsw->scrollw_right_encoding);
+	prefsw->right_shown = prefsw->scrollw_right_encoding;
+	break;
+      case LIST_ENTRY_EFFECTS:
+	gtk_widget_show_all(prefsw->scrollw_right_effects);
+	prefsw->right_shown = prefsw->scrollw_right_effects;
+	break;
+      case LIST_ENTRY_DIRECTORIES:
+	gtk_widget_show_all(prefsw->scrollw_right_directories);
+	prefsw->right_shown = prefsw->scrollw_right_directories;
+	break;
+      case LIST_ENTRY_WARNINGS:
+	gtk_widget_show_all(prefsw->scrollw_right_warnings);
+	prefsw->right_shown = prefsw->scrollw_right_warnings;
+	break;
+      case LIST_ENTRY_MISC:
+	gtk_widget_show_all(prefsw->scrollw_right_misc);
+	prefsw->right_shown = prefsw->scrollw_right_misc;
+	if (!capable->has_cdda2wav) {
+	  gtk_widget_hide (prefsw->cdda_hbox);
+	}
+	break;
+      case LIST_ENTRY_THEMES:
+	gtk_widget_show_all(prefsw->scrollw_right_themes);
+	prefsw->right_shown = prefsw->scrollw_right_themes;
+	break;
+      case LIST_ENTRY_NET:
+	gtk_widget_show_all(prefsw->scrollw_right_net);
+	prefsw->right_shown = prefsw->scrollw_right_net;
+	break;
+      case LIST_ENTRY_JACK:
+	gtk_widget_show_all(prefsw->scrollw_right_jack);
+	gtk_widget_hide(prefsw->jack_int_label);
 
+#ifdef ENABLE_JACK
+	if (prefs->audio_player==AUD_PLAYER_JACK) {
+	  gtk_widget_show(prefsw->jack_int_label);
+	}
+#endif
+
+	prefsw->right_shown = prefsw->scrollw_right_jack;
+	break;
+      case LIST_ENTRY_MIDI:
+	gtk_widget_show_all(prefsw->scrollw_right_midi);
+	prefsw->right_shown = prefsw->scrollw_right_midi;
+#ifdef OMC_MIDI_IMPL
+#ifndef ALSA_MIDI
+	gtk_widget_hide (prefsw->midi_hbox);
+#endif
+#endif
+	break;
+      case LIST_ENTRY_GUI:
+      default:
+	gtk_widget_show_all(prefsw->scrollw_right_gui);
+	prefsw->right_shown = prefsw->scrollw_right_gui;
+	gtk_widget_show_all(prefsw->scrollw_right_gui);
+	if (capable->nmonitors<=1) {
+	  gtk_widget_hide (prefsw->forcesmon_hbox);
+	}
+	prefs_current_page=LIST_ENTRY_GUI;
+      }
+    }
+  }
   gtk_widget_queue_draw(prefsw->prefs_dialog);
 
 }
@@ -1790,89 +1875,26 @@
 /*
  * Function makes apply button sensitive
  */
-void apply_button_set_enabled(GtkWidget *widget, gpointer func_data)
-{
+void apply_button_set_enabled(GtkWidget *widget, gpointer func_data) {
   gtk_widget_set_sensitive(GTK_WIDGET(prefsw->applybutton), TRUE);
   gtk_widget_set_sensitive(GTK_WIDGET(prefsw->cancelbutton), TRUE);
   gtk_widget_set_sensitive(GTK_WIDGET(prefsw->closebutton), FALSE);
 }
 
 // toggle sets other widget sensitive/insensitive
-static void toggle_set_sensitive(GtkWidget *widget, gpointer func_data)
-{
-  gtk_widget_set_sensitive(GTK_WIDGET(func_data), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
+static void toggle_set_sensitive(GtkWidget *widget, gpointer func_data) {
+  gtk_widget_set_sensitive(GTK_WIDGET(func_data), lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget)));
 }
 
 // toggle sets other widget insensitive/sensitive
-static void toggle_set_insensitive(GtkWidget *widget, gpointer func_data)
-{
-  gtk_widget_set_sensitive(GTK_WIDGET(func_data), !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
-}
-
-void populate_combo_box(GtkComboBox *combo, GList *data)
-{
-  gchar			*text;
-  GtkListStore		*store;
-  GtkTreeIter		iter;
-  GtkCellRenderer	*renderer;
-
-
-  GList *listrunner = g_list_first(data);
-
-  // Create tree store for the combo box
-  store = gtk_list_store_new(1, G_TYPE_STRING);
-
-  while (listrunner){
-    text = (gchar*)listrunner->data;
-
-    gtk_list_store_append(store, &iter);
-    gtk_list_store_set(store, &iter, 0, text, -1);
-
-    listrunner = g_list_next(listrunner);
-  }
-  gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store));
-  g_object_unref(G_OBJECT(store));
-
-  gtk_cell_layout_clear(GTK_CELL_LAYOUT (combo));
-
-  renderer = gtk_cell_renderer_text_new ();
-
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
-
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", 0, NULL);
+static void toggle_set_insensitive(GtkWidget *widget, gpointer func_data) {
+  gtk_widget_set_sensitive(GTK_WIDGET(func_data), !lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget)));
 }
 
-/*
- * Set active string to the combo box, if it is in the given list
- */
-void set_combo_box_active_string(GtkComboBox *combo, gchar *active_str)
-{
-  gchar *text = NULL;
-  GtkTreeModel *model;
-  GtkTreeIter   iter;
-
-  model = gtk_combo_box_get_model( combo );
-
-  if ( gtk_tree_model_get_iter_first(model, &iter) ){
-    do {
-      gtk_tree_model_get( model, &iter, 0, &text, -1 );
-      if (!g_ascii_strcasecmp(text, active_str)) {
-	gtk_combo_box_set_active_iter(combo, &iter);
-                
-	if (text)
-	  g_free(text);
-
-	break;
-      }
-      if (text)
-	g_free(text);
-    } while ( gtk_tree_model_iter_next(model, &iter) );
-  }
-}
 
 
 static void spinbutton_crit_ds_value_changed (GtkSpinButton *crit_ds, gpointer user_data) {
-  gdouble myval=gtk_spin_button_get_value(crit_ds);
+  double myval=gtk_spin_button_get_value(crit_ds);
   gtk_spin_button_set_range (GTK_SPIN_BUTTON (prefsw->spinbutton_warn_ds),myval,DS_WARN_CRIT_MAX);
   apply_button_set_enabled(NULL,NULL);
 }
@@ -1904,78 +1926,27 @@
   gchar *icon;
 
   GtkWidget *ins_resample;
-  GtkWidget *hbox100;
   GtkWidget *hbox;
-  GObject *spinbutton_adj;
-  GObject *spinbutton_warn_fsize_adj;
-  GObject *spinbutton_bwidth_adj;
-  GtkWidget *label157;
-  GtkWidget *hseparator;
+
   GtkWidget *hbox1;
   GtkWidget *hbox2;
-  GtkWidget *hbox3;
-  GtkWidget *hbox4;
-  GtkWidget *hbox5;
-  GtkWidget *hbox6;
-  GtkWidget *hbox7;
-  GtkWidget *vbox69;
-  GtkWidget *frame4;
-  GtkWidget *hbox109;
-  GtkWidget *hbox99;
-  GtkWidget *hbox19;
-  GtkWidget *label133;
-  GtkWidget *label134;
-  GtkWidget *label31;
-  GtkWidget *frame5;
-  GtkWidget *hbox10;
-  GtkWidget *label35;
-  GtkWidget *label36;
-  GtkWidget *label32;
-  GtkWidget *label97;
-  GtkWidget *label88;
   GtkWidget *vbox;
-  GtkWidget *hbox11;
-  GtkWidget *hbox94;
-  GtkWidget *hbox101;
-  GtkWidget *label37;
-  GtkWidget *hbox115;
-  GtkWidget *label56;
-  GtkWidget *label94;
-  GtkWidget *hbox93;
-  GtkWidget *label39;
-  GtkWidget *label100;
-  GtkWidget *label40;
-  GtkWidget *label41;
-  GtkWidget *label42;
-  GtkWidget *label52;
-  GtkWidget *label43;
-  GtkWidget *hbox13;
-  GtkWidget *label44;
-  GObject *spinbutton_def_fps_adj;
-  GtkWidget *dialog_action_area8;
+
+  GtkWidget *dialog_action_area;
   GtkWidget *dirbutton1;
   GtkWidget *dirbutton2;
   GtkWidget *dirbutton3;
   GtkWidget *dirbutton4;
   GtkWidget *dirbutton5;
   GtkWidget *dirbutton6;
-  GtkWidget *dirimage1;
-  GtkWidget *dirimage2;
-  GtkWidget *dirimage3;
-  GtkWidget *dirimage4;
-  GtkWidget *dirimage5;
-  GtkWidget *dirimage6;
-  GtkWidget *hbox31;
-  GtkWidget *label126;
+
   GtkWidget *pp_combo;
   GtkWidget *png;
   GtkWidget *frame;
-  GtkWidget *label158;
-  GtkWidget *label159;
-  GtkWidget *hbox116;
   GtkWidget *mt_enter_defs;
-  GObject *spinbutton_ocp_adj;
+
   GtkWidget *advbutton;
+  GtkWidget *rbutton;
 
 #ifdef ENABLE_OSC
 #ifdef OMC_MIDI_IMPL
@@ -1984,8 +1955,6 @@
 #endif
 
   GtkWidget *label;
-  GtkWidget *eventbox;
-  GtkWidget *vbox2;
   GtkWidget *buttond;
 
   // radio button groups
@@ -2003,6 +1972,10 @@
   GSList *autoback_group = NULL;
   GSList *st_interface_group = NULL;
 
+  LiVESSList *asrc_group=NULL;
+
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+
   // drop down lists
   GList *themes = NULL;
   GList *ofmt = NULL;
@@ -2011,18 +1984,18 @@
   GList *encoders = NULL;
   GList *vid_playback_plugins = NULL;
   
-  gchar **array,*tmp;
-
-  int i;
+  gchar **array;
+  gchar *tmp,*tmp2,*tmp3;
+  gchar *theme;
 
-  gint nmonitors = capable->nmonitors; ///< number of screen monitors
-  gboolean pfsm;
+  boolean pfsm;
+  boolean has_ap_rec = FALSE;
 
-  gchar *theme;
+  int nmonitors = capable->nmonitors; ///< number of screen monitors
+  int dph;
 
-  gboolean has_ap_rec = FALSE;
+  register int i;
 
-  GdkGeometry hints;
 
   // Allocate memory for the preferences structure
   prefsw = (_prefsw*)(g_malloc(sizeof(_prefsw)));
@@ -2030,36 +2003,23 @@
   mainw->prefs_need_restart = FALSE;
 
   // Create new modal dialog window and set some attributes
-  prefsw->prefs_dialog = gtk_dialog_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->prefs_dialog), 10);
-  gtk_window_set_title (GTK_WINDOW (prefsw->prefs_dialog), _("LiVES: - Preferences"));
-  gtk_window_set_position (GTK_WINDOW (prefsw->prefs_dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (prefsw->prefs_dialog), TRUE);
+  prefsw->prefs_dialog = lives_standard_dialog_new (_("LiVES: - Preferences"),FALSE);
+  gtk_window_add_accel_group (GTK_WINDOW (prefsw->prefs_dialog), accel_group);
+
   gtk_window_set_default_size (GTK_WINDOW (prefsw->prefs_dialog), PREF_WIN_WIDTH, PREF_WIN_HEIGHT);
-  gtk_window_set_resizable (GTK_WINDOW (prefsw->prefs_dialog), FALSE);
+  gtk_widget_set_size_request (prefsw->prefs_dialog, PREF_WIN_WIDTH, PREF_WIN_HEIGHT);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) gtk_window_set_transient_for(GTK_WINDOW(prefsw->prefs_dialog),GTK_WINDOW(mainw->LiVES));
     else gtk_window_set_transient_for(GTK_WINDOW(prefsw->prefs_dialog),GTK_WINDOW(mainw->multitrack->window));
   }
 
-  gtk_widget_modify_bg(prefsw->prefs_dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_widget_modify_fg(prefsw->prefs_dialog, GTK_STATE_NORMAL, &palette->normal_fore);
-
-  if (palette->style & STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(prefsw->prefs_dialog), FALSE);
-  }
   // Get dialog's vbox and show it
   dialog_vbox_main = lives_dialog_get_content_area(GTK_DIALOG(prefsw->prefs_dialog));
   gtk_widget_show (dialog_vbox_main);
-  // Set geometry hints for dialog's vbox
-  // This prevents shrinking of dialog window in some cases
-  hints.min_width = PREF_WIN_WIDTH;
-  hints.min_height = PREF_WIN_HEIGHT;
-  gtk_window_set_geometry_hints (GTK_WINDOW(prefsw->prefs_dialog), GTK_WIDGET (dialog_vbox_main), &hints, GDK_HINT_MIN_SIZE);
 
   // Create dialog horizontal panels
-  dialog_hpaned = gtk_hpaned_new();
+  dialog_hpaned = lives_hpaned_new();
   gtk_widget_show (dialog_hpaned);
   gtk_paned_set_position(GTK_PANED(dialog_hpaned),PREFS_PANED_POS);
 
@@ -2068,11 +2028,19 @@
   dialog_table = gtk_table_new(1, 1, FALSE);
   gtk_widget_show(dialog_table);
 
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(dialog_hpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+
+
   // Create preferences list with invisible headers
   prefsw->prefs_list = gtk_tree_view_new();
   gtk_widget_show(prefsw->prefs_list);
 
-  //gtk_widget_set_size_request (prefsw->prefs_list, 200, 600);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(prefsw->prefs_list, LIVES_WIDGET_STATE_SELECTED, &palette->normal_back);
+    lives_widget_set_fg_color(prefsw->prefs_list, LIVES_WIDGET_STATE_SELECTED, &palette->normal_fore);
+  }
 
   gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(prefsw->prefs_list), FALSE);
 
@@ -2082,185 +2050,126 @@
   // Place list on the left panel
   pref_init_list(prefsw->prefs_list);
   
-  list_scroll = gtk_scrolled_window_new(gtk_tree_view_get_hadjustment(GTK_TREE_VIEW(prefsw->prefs_list)), NULL);
+  list_scroll = gtk_scrolled_window_new(lives_tree_view_get_hadjustment(LIVES_TREE_VIEW(prefsw->prefs_list)), NULL);
   gtk_widget_show(list_scroll);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (list_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_container_add (GTK_CONTAINER (list_scroll), prefsw->prefs_list);
 
-  gtk_paned_pack1(GTK_PANED(dialog_hpaned), list_scroll, FALSE, FALSE);
+  if (palette->style&STYLE_1) {
+    lives_widget_set_bg_color(prefsw->prefs_list, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
+    lives_widget_set_fg_color(prefsw->prefs_list, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
+  }
+
+  gtk_paned_pack1(GTK_PANED(dialog_hpaned), list_scroll, TRUE, FALSE);
   // Place table on the right panel
-  //gtk_paned_pack2(GTK_PANED(dialog_hpaned), dummy_scroll, TRUE, FALSE);
+
   gtk_paned_pack2(GTK_PANED(dialog_hpaned), dialog_table, TRUE, FALSE);
 
   // -------------------,
   // gui controls       |
   // -------------------'
-  prefsw->vbox_right_gui = gtk_vbox_new (FALSE, 10);
+  prefsw->vbox_right_gui = lives_vbox_new (FALSE, widget_opts.packing_height);
 
-  prefsw->scrollw_right_gui = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_gui), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_gui), prefsw->vbox_right_gui);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_gui)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_gui)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_gui = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_gui);
 
   gtk_widget_show (prefsw->vbox_right_gui);
   prefsw->right_shown = prefsw->vbox_right_gui;
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_gui), 20);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_gui), widget_opts.packing_width*2);
+
   // ---
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox1, TRUE, TRUE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-
-  // TODO - copy pattern to all other checkboxes
-  hbox = gtk_hbox_new(FALSE, 0);
   prefsw->fs_max_check = 
-    lives_standard_check_button_new(_("Open file selection maximised"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox1), hbox, TRUE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->fs_max_check), prefs->fileselmax);
+    lives_standard_check_button_new(_("Open file selection maximised"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->fs_max_check), prefs->fileselmax);
   // ---
 
+  add_fill_to_box(LIVES_BOX(hbox));
 
-
-  hbox = gtk_hbox_new(FALSE, 0);
   prefsw->recent_check = 
-    lives_standard_check_button_new(_("Show recent files in the File menu"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox1), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->recent_check), prefs->show_recent);
-
+    lives_standard_check_button_new(_("Show recent files in the File menu"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->recent_check), prefs->show_recent);
 
 
   // ---
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox2, TRUE, TRUE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new(FALSE, 0);
   prefsw->stop_screensaver_check = 
-    lives_standard_check_button_new(_("Stop screensaver on playback    "),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX(hbox2), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->stop_screensaver_check), prefs->stop_screensaver);
+    lives_standard_check_button_new(_("Stop screensaver on playback    "),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->stop_screensaver_check), prefs->stop_screensaver);
 
+  add_fill_to_box(LIVES_BOX(hbox));
 
   // ---
-  hbox = gtk_hbox_new(FALSE, 0);
-  prefsw->open_maximised_check = 
-    lives_standard_check_button_new(_("Open main window maximised"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->open_maximised_check), prefs->open_maximised);
 
-  // --
-  hbox3 = gtk_hbox_new(FALSE, 0);
-  gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox3, TRUE, TRUE, 10);
+  prefsw->open_maximised_check=lives_standard_check_button_new(_("Open main window maximised"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->open_maximised_check), prefs->open_maximised);
 
+  // --
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new(FALSE, 0);
   prefsw->show_tool = 
-    lives_standard_check_button_new(_("Show toolbar when background is blanked"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, TRUE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->show_tool), future_prefs->show_tool);
-  // ---
+    lives_standard_check_button_new(_("Show toolbar when background is blanked"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->show_tool), future_prefs->show_tool);
 
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
   prefsw->mouse_scroll = 
-    lives_standard_check_button_new(_("Allow mouse wheel to switch clips"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, TRUE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->mouse_scroll), prefs->mouse_scroll_clips);
+    lives_standard_check_button_new(_("Allow mouse wheel to switch clips"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->mouse_scroll), prefs->mouse_scroll_clips);
+
 
   // ---
-  hbox4 = gtk_hbox_new(FALSE, 0);
-  gtk_widget_show (hbox4);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox4, TRUE, FALSE, 10);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
+
   prefsw->checkbutton_ce_maxspect = 
-    lives_standard_check_button_new(_("Shrink previews to fit in interface"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox4), hbox, TRUE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_ce_maxspect), prefs->ce_maxspect);
+    lives_standard_check_button_new(_("Shrink previews to fit in interface"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_ce_maxspect), prefs->ce_maxspect);
+
+  add_fill_to_box(LIVES_BOX(hbox));
 
   // ---
-  hbox5 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox5);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox5, TRUE, FALSE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+
   // ---
-  label = gtk_label_new (_("Startup mode:"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (hbox5), label, FALSE, TRUE, 0);
-  add_fill_to_box(GTK_BOX(hbox5));
+  label = lives_standard_label_new (_("Startup mode:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+
   // --- 
-  prefsw->rb_startup_ce = gtk_radio_button_new(st_interface_group);
-  st_interface_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->rb_startup_ce));
-  label = gtk_label_new_with_mnemonic(_("_Clip editor"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->rb_startup_ce);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->rb_startup_ce);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->rb_startup_ce, FALSE, FALSE, 10);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start(GTK_BOX(hbox5), hbox, TRUE, TRUE, 0);
-  add_fill_to_box(GTK_BOX(hbox5));
-  // ---
-  prefsw->rb_startup_mt = gtk_radio_button_new(st_interface_group);
-  st_interface_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->rb_startup_mt));
-  label = gtk_label_new_with_mnemonic(_("_Multitrack mode"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->rb_startup_ce);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->rb_startup_mt);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->rb_startup_mt, FALSE, FALSE, 10);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start(GTK_BOX(hbox5), hbox, TRUE, TRUE, 0);
+  prefsw->rb_startup_ce = lives_standard_radio_button_new(_("_Clip editor"),TRUE,st_interface_group,LIVES_BOX(hbox),NULL);
+  st_interface_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->rb_startup_ce));
+
+  // ---
+  prefsw->rb_startup_mt = lives_standard_radio_button_new(_("_Multitrack mode"),TRUE,st_interface_group,LIVES_BOX(hbox),NULL);
+
   // ---
   if (future_prefs->startup_interface==STARTUP_MT) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->rb_startup_mt),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rb_startup_mt),TRUE);
   }
   else {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->rb_startup_ce),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rb_startup_ce),TRUE);
   }
+
+  add_fill_to_box(GTK_BOX(hbox));
+
   // 
   // multihead support (inside Gui part)
   //
   pfsm=prefs->force_single_monitor;
   prefs->force_single_monitor=FALSE;
+
   get_monitors();
+
   prefs->force_single_monitor=pfsm;
 
   if (capable->nmonitors!=nmonitors) {
@@ -2290,94 +2199,52 @@
     }
   }
   // ---
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hseparator, FALSE, TRUE, 20);
+  add_hsep_to_box (LIVES_BOX (prefsw->vbox_right_gui));
   // ---
-  label = gtk_label_new (_("Multi-head support"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), label, FALSE, TRUE, 10);
+  label = lives_standard_label_new (_("Multi-head support"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), label, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  hbox6 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox6);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox6, TRUE, TRUE, 20);
-  // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->gui_monitor, 1, capable->nmonitors, 1, 1, 0);
-  prefsw->spinbutton_gmoni = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  label = gtk_label_new (_ (" monitor number for LiVES interface"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->spinbutton_gmoni);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_gmoni, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox6), hbox, FALSE, TRUE, 0);
-  // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->play_monitor, 0, capable->nmonitors==1?0:capable->nmonitors, 1, 1, 0);
-  prefsw->spinbutton_pmoni = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  label = gtk_label_new (_ (" monitor number for playback"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->spinbutton_pmoni);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_pmoni, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_end (GTK_BOX (hbox6), hbox, FALSE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height*2);
   // ---
-  label = gtk_label_new (_("A setting of 0 means use all available monitors (only works with some playback plugins)."));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), label, TRUE, TRUE, 0);
+
+
+  prefsw->spinbutton_gmoni = lives_standard_spin_button_new (_(" monitor number for LiVES interface"), TRUE, prefs->gui_monitor, 1, capable->nmonitors, 
+							     1., 1., 0, LIVES_BOX(hbox),NULL);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->spinbutton_pmoni = lives_standard_spin_button_new (_(" monitor number for playback"), TRUE, prefs->play_monitor, 0, 
+							     capable->nmonitors==1?0:capable->nmonitors,
+							     1., 1., 0, LIVES_BOX(hbox),NULL);
+
   // ---
-  hbox7 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox7);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), hbox7, TRUE, TRUE, 20);
-  // ---
-  prefsw->forcesmon = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Force single monitor"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->forcesmon);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->forcesmon);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->forcesmon, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox7), hbox, FALSE, FALSE, 0);
-  gtk_widget_set_tooltip_text( prefsw->forcesmon, (_("Force single monitor mode")));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->forcesmon), prefs->force_single_monitor);
+
+  label = lives_standard_label_new (_("A setting of 0 means use all available monitors (only works with some playback plugins)."));
+
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+  // ---
+
+  // ---
+
+  prefsw->forcesmon_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_gui), prefsw->forcesmon_hbox, FALSE, FALSE, widget_opts.packing_height*2);
+
+  prefsw->forcesmon = lives_standard_check_button_new((tmp=g_strdup(_("Force single monitor"))),FALSE,LIVES_BOX(prefsw->forcesmon_hbox),
+						      (tmp2=g_strdup(_("Ignore all except the first monitor."))));
+  g_free(tmp);
+  g_free(tmp2);
+
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->forcesmon), prefs->force_single_monitor);
+
   // ---
   if (capable->nmonitors<=1) {
     gtk_widget_set_sensitive(prefsw->spinbutton_gmoni,FALSE);
     gtk_widget_set_sensitive(prefsw->spinbutton_pmoni,FALSE);
   }
-  else {
-    gtk_widget_show (prefsw->forcesmon);
-  }
-
-  if (prefs->force_single_monitor) get_monitors();
 
   g_signal_connect (GTK_OBJECT (prefsw->forcesmon), "toggled",
 		    G_CALLBACK (on_forcesmon_toggled),
@@ -2387,7 +2254,6 @@
   pixbuf_gui = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_gui, _("GUI"), LIST_ENTRY_GUI);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_gui);
 
@@ -2395,367 +2261,176 @@
   // multitrack controls    |
   // -----------------------'
 
-  prefsw->vbox_right_multitrack = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_multitrack), 10);
+  prefsw->vbox_right_multitrack = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_multitrack), widget_opts.border_width);
 
-  prefsw->scrollw_right_multitrack = gtk_scrolled_window_new (NULL, NULL);
-  
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_multitrack), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_multitrack), 
-					 prefsw->vbox_right_multitrack);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_multitrack)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_multitrack)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_multitrack = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_multitrack);
 
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox1, FALSE, FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  label = gtk_label_new (_("When entering Multitrack mode:"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 16);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  // ---
-  label = gtk_label_new ("");
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 16);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  // ---
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox2, TRUE, FALSE, 0);
-  // ---
-  prefsw->mt_enter_prompt = gtk_radio_button_new (mt_enter_prompt);
-  mt_enter_prompt = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->mt_enter_prompt));
-  label = gtk_label_new_with_mnemonic(_("_Prompt me for width, height, fps and audio settings"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->mt_enter_prompt);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->mt_enter_prompt);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->mt_enter_prompt, FALSE, FALSE, 10);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start(GTK_BOX(hbox2), hbox, TRUE, TRUE, 0);
-  // ---
-  mt_enter_defs = gtk_radio_button_new(mt_enter_prompt);
-  mt_enter_prompt = gtk_radio_button_get_group (GTK_RADIO_BUTTON (mt_enter_defs));
-  label = gtk_label_new_with_mnemonic(_("_Always use the following values:"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), mt_enter_defs);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), mt_enter_defs);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), mt_enter_defs, FALSE, FALSE, 10);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start(GTK_BOX(hbox2), hbox, TRUE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mt_enter_defs), !prefs->mt_enter_prompt);
-
-  prefsw->checkbutton_render_prompt = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Use these same _values for rendering a new clip"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_render_prompt);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_render_prompt);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_render_prompt, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
+  label = lives_standard_label_new (_("When entering Multitrack mode:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+  // ---
+  add_fill_to_box(LIVES_BOX(hbox));
+  // ---
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  // ---
+
+  prefsw->mt_enter_prompt = lives_standard_radio_button_new (_("_Prompt me for width, height, fps and audio settings"),TRUE,
+							     mt_enter_prompt,LIVES_BOX(hbox),NULL);
+  mt_enter_prompt = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_enter_prompt));
+
+
+  // ---
+  mt_enter_defs = lives_standard_radio_button_new(_("_Always use the following values:"),TRUE,
+						  mt_enter_prompt,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (mt_enter_defs), !prefs->mt_enter_prompt);
+
+
+  hbox = lives_hbox_new(FALSE, 0);
   gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_render_prompt), !prefs->render_prompt);
+
+  prefsw->checkbutton_render_prompt = lives_standard_check_button_new(_("Use these same _values for rendering a new clip"),TRUE,
+								      LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_render_prompt), !prefs->render_prompt);
+
+
   // ---
   frame = gtk_frame_new (NULL);
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), frame, TRUE, TRUE, 0);
-  vbox = gtk_vbox_new (FALSE, 10);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-  gtk_widget_show (vbox);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), frame, FALSE, FALSE, widget_opts.packing_height);
+  vbox = lives_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   
-  label = gtk_label_new (_("Video"));
+  label = lives_standard_label_new (_("Video"));
+
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(label, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_bg(frame, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
-  gtk_widget_show (label);
   gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+
+
   // ---
-  hbox3 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox3, TRUE, FALSE, 0);
-  // ---
-  label = gtk_label_new_with_mnemonic (_("_Width           "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->mt_def_width, 0, 8192, 1, 10, 0);
-  prefsw->spinbutton_mt_def_width = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), prefsw->spinbutton_mt_def_width);
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_mt_def_width, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, FALSE, TRUE, 0);
-  // ---
-  label = gtk_label_new_with_mnemonic (_("          _Height      "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->mt_def_height, 0, 8192, 1, 10, 0);
-  prefsw->spinbutton_mt_def_height = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), prefsw->spinbutton_mt_def_height);
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_mt_def_height, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, FALSE, TRUE, 0);
-  // ---
-  label = gtk_label_new_with_mnemonic (_("          _FPS"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
   // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->mt_def_fps, 1, FPS_MAX, .1, 1, 0);
-  prefsw->spinbutton_mt_def_fps = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 3);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->spinbutton_mt_def_fps);
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_mt_def_fps, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, FALSE, TRUE, 0);
-  // --- 
-  prefsw->backaudio_checkbutton = gtk_check_button_new ();
-  prefsw->pertrack_checkbutton = gtk_check_button_new();
+  prefsw->spinbutton_mt_def_width = lives_standard_spin_button_new (_("_Width           "),
+								    TRUE, prefs->mt_def_width, 0., 8192., 4., 16., 0,
+								    LIVES_BOX(hbox),NULL);
+
+
+  prefsw->spinbutton_mt_def_height = lives_standard_spin_button_new (_("          _Height      "),
+								     TRUE, prefs->mt_def_height, 0., 8192., 4., 16., 0,
+								     LIVES_BOX(hbox),NULL);
+
+  prefsw->spinbutton_mt_def_fps = lives_standard_spin_button_new (_("          _FPS"),
+								  TRUE, prefs->mt_def_fps, 1., FPS_MAX, .1, 1., 3,
+								  LIVES_BOX(hbox),NULL);
+
+
+
+  hbox = lives_hbox_new (FALSE, 0);
+
+  prefsw->backaudio_checkbutton = lives_standard_check_button_new (_("Enable backing audio track"),FALSE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->backaudio_checkbutton), prefs->mt_backaudio>0);
+
+  add_fill_to_box(LIVES_BOX(hbox));
+// ---
+
+  prefsw->pertrack_checkbutton = lives_standard_check_button_new(_("Audio track per video track"),FALSE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->pertrack_checkbutton), prefs->mt_pertrack_audio);
+
+
+
+
+  // must be done after creating check buttons
   resaudw=create_resaudw(4, NULL, prefsw->vbox_right_multitrack);
   // ---
-  hbox4 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox4);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox4, TRUE, TRUE, 0);
-  // ---
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic (_("Enable backing audio track"));
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  gtk_label_set_mnemonic_widget (GTK_LABEL(label), prefsw->backaudio_checkbutton);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event", G_CALLBACK (label_act_toggle), 
-		    prefsw->backaudio_checkbutton); 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->backaudio_checkbutton, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox4), hbox, FALSE, FALSE, 0);
-  GTK_WIDGET_SET_FLAGS (prefsw->backaudio_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->backaudio_checkbutton), prefs->mt_backaudio>0);
+
+
+  // must be done after resaudw
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+
   gtk_widget_set_sensitive(prefsw->backaudio_checkbutton, 
-			   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
-  // ---
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic (_("Audio track per video track"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL(label), prefsw->pertrack_checkbutton);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event", G_CALLBACK (label_act_toggle), 
-		    prefsw->pertrack_checkbutton); 
+			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+
   gtk_widget_set_sensitive(prefsw->pertrack_checkbutton, 
-			   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_end (GTK_BOX (hbox), eventbox, FALSE, FALSE, 5);
-  gtk_box_pack_end (GTK_BOX (hbox), prefsw->pertrack_checkbutton, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox4), hbox, FALSE, FALSE, 0);
-  GTK_WIDGET_SET_FLAGS (prefsw->pertrack_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->pertrack_checkbutton), prefs->mt_pertrack_audio);
+			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+  
+   // ---
+  add_hsep_to_box (LIVES_BOX (prefsw->vbox_right_multitrack));
   // ---
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hseparator, FALSE, TRUE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+
   // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, TRUE, FALSE, 0);
+  prefsw->spinbutton_mt_undo_buf = lives_standard_spin_button_new (_("    _Undo buffer size (MB)    "),TRUE,
+								   prefs->mt_undo_buf, 0., G_MAXSIZE/(1024.*1024.), 1., 1., 0,
+								   LIVES_BOX(hbox),NULL);
+
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+
   // ---
-  label = gtk_label_new_with_mnemonic (_("    _Undo buffer size (MB)    "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+  prefsw->checkbutton_mt_exit_render = lives_standard_check_button_new(_("_Exit multitrack mode after rendering"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_mt_exit_render), prefs->mt_exit_render);
   // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->mt_undo_buf, 0, G_MAXSIZE/(1024*1024), 1, 1, 0);
-  prefsw->spinbutton_mt_undo_buf = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_mt_undo_buf);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_mt_undo_buf, FALSE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->spinbutton_mt_undo_buf);
-  // ---
-  prefsw->checkbutton_mt_exit_render = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("_Exit multitrack mode after rendering"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_mt_exit_render);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_mt_exit_render);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_mt_exit_render, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_mt_exit_render), prefs->mt_exit_render);
+
+  hbox2 = lives_hbox_new (FALSE, 0);
+
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox2, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  hbox5 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox5);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_multitrack), hbox5, TRUE, FALSE, 0);
+  label = lives_standard_label_new (_("Auto backup layouts"));
+  gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0);
   // ---
-  label = gtk_label_new (_("Auto backup layouts"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (hbox5), label, FALSE, TRUE, 0);
-  // ---
-  prefsw->mt_autoback_every = gtk_radio_button_new(autoback_group);
-  autoback_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->mt_autoback_every));
-  label = gtk_label_new_with_mnemonic(_("_Every"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->mt_autoback_every);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->mt_autoback_every);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->mt_autoback_every, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox5), hbox, TRUE, TRUE, 0);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  prefsw->mt_autoback_every = lives_standard_radio_button_new(_("_Every"),TRUE,autoback_group,LIVES_BOX(hbox),NULL);
+  autoback_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_autoback_every));
+  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, TRUE, 0);
+
   // ---
-  label = gtk_label_new_with_mnemonic (_("seconds"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  widget_opts.swap_label=TRUE;
+  prefsw->spinbutton_mt_ab_time = lives_standard_spin_button_new (_("seconds"),FALSE,120.,10.,1800.,1.,10.,0,LIVES_BOX(hbox),NULL);
+  widget_opts.swap_label=FALSE;
+  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, TRUE, 0);
+
+  add_fill_to_box(GTK_BOX(hbox2));
   // ---
-  spinbutton_adj = (GObject *)gtk_adjustment_new (30, 10, 1800, 1, 10, 0);
-  prefsw->spinbutton_mt_ab_time = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), prefsw->spinbutton_mt_ab_time);
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_mt_ab_time, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 20);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_box_pack_start (GTK_BOX (hbox5), hbox, FALSE, TRUE, 0);
-  add_fill_to_box(GTK_BOX(hbox5));
-  // ---
-  prefsw->mt_autoback_always = gtk_radio_button_new(autoback_group);
-  autoback_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->mt_autoback_always));
-  label = gtk_label_new_with_mnemonic(_("After every _change"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->mt_autoback_always);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->mt_autoback_always);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->mt_autoback_always, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox5), hbox, TRUE, TRUE, 0);
-  // ---
-  prefsw->mt_autoback_never = gtk_radio_button_new(autoback_group);
-  autoback_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->mt_autoback_never));
-  label = gtk_label_new_with_mnemonic(_("_Never"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->mt_autoback_never);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->mt_autoback_never);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->mt_autoback_never, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox5), hbox, TRUE, TRUE, 0);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  prefsw->mt_autoback_always = lives_standard_radio_button_new(_("After every _change"),TRUE,autoback_group,LIVES_BOX(hbox),NULL);
+  autoback_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_autoback_always));
+  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, TRUE, 0);
+  // ---
+
+  hbox = lives_hbox_new(FALSE, 0);
+  prefsw->mt_autoback_never = lives_standard_radio_button_new(_("_Never"),TRUE,autoback_group,LIVES_BOX(hbox),NULL);
+  autoback_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_autoback_never));
+  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, TRUE, 0);
+
+
   // ---
   g_signal_connect (GTK_OBJECT (prefsw->mt_autoback_every), "toggled", G_CALLBACK (on_mtbackevery_toggled), prefsw); 
 
   if (prefs->mt_auto_back==0) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->mt_autoback_always),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_always),TRUE);
   }
   else if (prefs->mt_auto_back==-1) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->mt_autoback_never),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_never),TRUE);
   }
   else {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->mt_autoback_every),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_every),TRUE);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time),prefs->mt_auto_back);
   }
   // ---
@@ -2763,7 +2438,6 @@
   pixbuf_multitrack = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_multitrack, _("Multitrack/Render"), LIST_ENTRY_MULTITRACK);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_multitrack);
 
@@ -2772,54 +2446,25 @@
   // decoding       |
   // ---------------'
 
-  prefsw->vbox_right_decoding = gtk_vbox_new (FALSE, 20);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_decoding), 20);
-
-  prefsw->scrollw_right_decoding = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_decoding), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_decoding), prefsw->vbox_right_decoding);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_decoding)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_decoding)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->vbox_right_decoding = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_decoding), widget_opts.border_width*2);
 
+  prefsw->scrollw_right_decoding = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_decoding);
 
-  // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
 
-  prefsw->checkbutton_instant_open = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Use instant opening when possible"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_instant_open);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_instant_open);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->checkbutton_instant_open, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_set_tooltip_text( prefsw->checkbutton_instant_open, 
-			       (_("Enable instant opening of some file types using decoder plugins")));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_instant_open),prefs->instant_open);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
+  prefsw->checkbutton_instant_open = lives_standard_check_button_new((tmp=g_strdup(_("Use instant opening when possible"))),FALSE,LIVES_BOX(hbox),
+								      (tmp2=g_strdup(_("Enable instant opening of some file types using decoder plugins"))));
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_instant_open),prefs->instant_open);
 
+  g_free(tmp); g_free(tmp2);
 
   // advanced instant opening
   advbutton = gtk_button_new_with_mnemonic (_("_Advanced"));
-  gtk_widget_show (advbutton);
-  gtk_box_pack_start (GTK_BOX (hbox), advbutton, FALSE, FALSE, 40);
+  gtk_box_pack_start (GTK_BOX (hbox), advbutton, FALSE, FALSE, widget_opts.packing_width*4);
 
   g_signal_connect (GTK_OBJECT (advbutton), "clicked",
 		    G_CALLBACK (on_decplug_advanced_clicked),
@@ -2827,246 +2472,119 @@
 
   gtk_widget_set_sensitive(advbutton,prefs->instant_open);
 
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_instant_open), "toggled", GTK_SIGNAL_FUNC(instopen_toggled), advbutton);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_instant_open), "toggled", G_CALLBACK(instopen_toggled), advbutton);
 
 
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-
-  hbox109 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox109);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox109, TRUE, FALSE, 0);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox109), 20);
   // ---
-  label133 = gtk_label_new (_("Video open command             "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label133, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label133);
-  gtk_box_pack_start (GTK_BOX (hbox109), label133, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL(label133), GTK_JUSTIFY_LEFT);
-  // ---
-  prefsw->video_open_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->video_open_entry),255);
-  gtk_widget_show (prefsw->video_open_entry);
-  gtk_box_pack_start (GTK_BOX (hbox109), prefsw->video_open_entry, FALSE, TRUE, 0);
-  gtk_entry_set_text(GTK_ENTRY(prefsw->video_open_entry),prefs->video_open_command);
+  prefsw->video_open_entry = lives_standard_entry_new (_("Video open command (fallback)"),FALSE,
+						       prefs->video_open_command,-1,255,
+						       LIVES_BOX(hbox),NULL);
+
 
   if (prefs->ocp==-1) prefs->ocp=get_int_pref ("open_compression_percent");
+
   // ---
-  hbox116 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox116);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox116, TRUE, FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  label158 = gtk_label_new (_("Open/render compression                  "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label158, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label158);
-  gtk_label_set_justify (GTK_LABEL (label158), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (hbox116), label158, FALSE, TRUE, 0);
+
+  prefsw->spinbutton_ocp = lives_standard_spin_button_new (_("Open/render compression"), FALSE, prefs->ocp, 0., 100., 1., 5., 0,
+							   LIVES_BOX(hbox),NULL);
+
+  label = lives_standard_label_new (_ (" %     ( lower = slower, larger files; for jpeg, higher quality )"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
+
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_decoding));
+
+
+
+  // ---
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  spinbutton_ocp_adj = (GObject *)gtk_adjustment_new (prefs->ocp, 0, 100, 1, 5, 0);
-  prefsw->spinbutton_ocp = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_ocp_adj), 1, 0);
-  gtk_box_pack_start (GTK_BOX (hbox116), prefsw->spinbutton_ocp, FALSE, TRUE, 0);
 
-  label159 = gtk_label_new (_ (" %     ( lower = slower, larger files; for jpeg, higher quality )"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label159, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox116), label159, FALSE, FALSE, 5);
-  gtk_label_set_justify (GTK_LABEL (label159), GTK_JUSTIFY_LEFT);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox116), 20);
-  gtk_widget_show_all(hbox116);
-  // ---
-  hbox115 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox115);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox115, TRUE, FALSE, 5);
+  label = lives_standard_label_new (_("Default image format"));
+
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
   // ---
-  label157 = gtk_label_new (_("Default image format          "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label157, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_justify (GTK_LABEL (label157), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (hbox115), label157, FALSE, TRUE, 5);
+  prefsw->jpeg = lives_standard_radio_button_new(_("_jpeg"),TRUE,jpeg_png,LIVES_BOX(hbox),NULL);
+  jpeg_png = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->jpeg));
+
+  png = lives_standard_radio_button_new(_("_png"),TRUE,jpeg_png,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (png),!strcmp (prefs->image_ext,"png"));
+
   // ---
-  prefsw->jpeg = gtk_radio_button_new(jpeg_png);
-  jpeg_png = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->jpeg));
-  label = gtk_label_new_with_mnemonic(_("_jpeg"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->jpeg);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  gtk_box_pack_start(GTK_BOX(hbox115), eventbox, FALSE, FALSE, 5);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->jpeg);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox115), prefsw->jpeg, FALSE, FALSE, 5);
-  // ---
-  png = gtk_radio_button_new(jpeg_png);
-  jpeg_png = gtk_radio_button_get_group (GTK_RADIO_BUTTON (png));
-  label = gtk_label_new_with_mnemonic(_("_png"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), png);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  gtk_box_pack_start(GTK_BOX(hbox115), eventbox, FALSE, FALSE, 5);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), png);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox115), png, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox115), 20);
-  gtk_widget_show_all(hbox115);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (png),!strcmp (prefs->image_ext,"png"));
-  // ---
-  hbox115 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox115);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox115, TRUE, FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height*2);
   // ---
-  label157 = gtk_label_new (_("(Check Help/Troubleshoot to see which image formats are supported)"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label157, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label157);
-  gtk_label_set_justify (GTK_LABEL (label157), GTK_JUSTIFY_LEFT);
-  gtk_box_pack_start (GTK_BOX (hbox115), label157, FALSE, TRUE, 20);
+  label = lives_standard_label_new (_("(Check Help/Troubleshoot to see which image formats are supported)"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+
   // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->checkbutton_auto_deint = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
+  prefsw->checkbutton_auto_deint = lives_standard_check_button_new((tmp=g_strdup(_("Enable automatic deinterlacing when possible"))),FALSE,
+								   LIVES_BOX(hbox),
+								    (tmp2=g_strdup(_("Automatically deinterlace frames when a plugin suggests it"))));
+  g_free(tmp); g_free(tmp2);
 
-  label = gtk_label_new_with_mnemonic(_("Enable automatic deinterlacing when possible"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_auto_deint);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_auto_deint);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->checkbutton_auto_deint, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_auto_deint),prefs->auto_deint);
-  gtk_widget_set_tooltip_text( prefsw->checkbutton_auto_deint, (_("Automatically deinterlace frames when a plugin suggests it")));
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_auto_deint),prefs->auto_deint);
 
 
   // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->checkbutton_nobord = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-
-  label = gtk_label_new_with_mnemonic(_("Ignore blank borders when possible"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_nobord);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_nobord);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->checkbutton_nobord, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_nobord),prefs->auto_nobord);
-  gtk_widget_set_tooltip_text( prefsw->checkbutton_nobord, (_("Clip any blank borders from frames where possible")));
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
+  prefsw->checkbutton_nobord = lives_standard_check_button_new((tmp=g_strdup(_("Ignore blank borders when possible"))),FALSE,
+							       LIVES_BOX(hbox),
+							       (tmp2=g_strdup(_("Clip any blank borders from frames where possible"))));
+  g_free(tmp); g_free(tmp2);
 
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_nobord),prefs->auto_nobord);
+ 
   // ---
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hseparator, TRUE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_decoding));
   // ---
-  prefsw->checkbutton_concat_images = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("When opening multiple files, concatenate images into one clip"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_concat_images);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_concat_images);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_concat_images, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_concat_images),prefs->concat_images);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_concat_images = lives_standard_check_button_new(_("When opening multiple files, concatenate images into one clip"),
+								      FALSE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_concat_images),prefs->concat_images);
+
   // ---
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_decoding.png", NULL);
   pixbuf_decoding = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
+
   prefs_add_to_list(prefsw->prefs_list, pixbuf_decoding, _("Decoding"), LIST_ENTRY_DECODING);
-  //gtk_table_attach(GTK_TABLE(dialog_table), prefsw->vbox_right_decoding, 0, 1, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0);
+
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_decoding);
 
   // ---------------,
   // playback       |
   // ---------------'
 
-  prefsw->vbox_right_playback = gtk_vbox_new (FALSE, 10);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_playback), 20);
-
-  prefsw->scrollw_right_playback = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_playback), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_playback), prefsw->vbox_right_playback);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_playback)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_playback)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
+  prefsw->vbox_right_playback = lives_vbox_new (FALSE, widget_opts.packing_height);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_playback), widget_opts.border_width*2);
 
-  frame4 = gtk_frame_new (NULL);
-  gtk_widget_show (frame4);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_playback), frame4, TRUE, TRUE, 0);
+  prefsw->scrollw_right_playback = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_playback);
 
-  vbox69=gtk_vbox_new (FALSE, 10);
-  gtk_widget_show (vbox69);
-  gtk_container_add (GTK_CONTAINER (frame4), vbox69);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox69), 10);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_container_add (GTK_CONTAINER (vbox69), hbox);
+  frame = gtk_frame_new (NULL);
+ 
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_playback), frame, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->pbq_combo = gtk_combo_box_new_text();
-  gtk_widget_set_tooltip_text( prefsw->pbq_combo, (_("The preview quality for video playback - affects resizing")));
-  
-  label = gtk_label_new_with_mnemonic (_("Preview _quality"));
-  if (palette->style & STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  vbox=lives_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width);
 
-  gtk_tooltips_copy(label, prefsw->pbq_combo);
-  
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->pbq_combo, FALSE, FALSE, 10);
-  
   prefsw->pbq_list=NULL;
   // TRANSLATORS: video quality, max len 50
   prefsw->pbq_list=g_list_append(prefsw->pbq_list,g_strdup((_("Low - can improve performance on slower machines"))));
@@ -3075,12 +2593,12 @@
   // TRANSLATORS: video quality, max len 50
   prefsw->pbq_list=g_list_append(prefsw->pbq_list,g_strdup((_("High - can improve quality on very fast machines"))));
 
-  populate_combo_box(GTK_COMBO_BOX(prefsw->pbq_combo), prefsw->pbq_list);
-  gtk_combo_box_set_active(GTK_COMBO_BOX(prefsw->pbq_combo), 0);
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
+  prefsw->pbq_combo = lives_standard_combo_new((tmp=g_strdup(_("Preview _quality"))),TRUE,prefsw->pbq_list,LIVES_BOX(vbox),
+					       (tmp2=g_strdup(_("The preview quality for video playback - affects resizing"))));
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  gtk_widget_show (hbox);
-  gtk_widget_show (prefsw->pbq_combo);
-  gtk_widget_show (label);
+  g_free(tmp); g_free(tmp2);
 
   switch (prefs->pb_quality) {
   case PB_QUALITY_HIGH:
@@ -3089,71 +2607,41 @@
   case PB_QUALITY_MED:
     gtk_combo_box_set_active(GTK_COMBO_BOX(prefsw->pbq_combo), 1);
   }
-  // ---
-  hbox101 = gtk_hbox_new (TRUE, 0);
-  gtk_widget_show (hbox101);
-  gtk_box_pack_start (GTK_BOX (vbox69), hbox101, FALSE, FALSE, 0);
-
-  prefsw->checkbutton_show_stats = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("_Show FPS statistics"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_show_stats);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_show_stats);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_show_stats, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox101), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_show_stats),prefs->show_player_stats);
 
-  add_fill_to_box(GTK_BOX(hbox101));
   // ---
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (vbox69), hseparator, TRUE, TRUE, 0);
+
+  prefsw->checkbutton_show_stats = lives_standard_check_button_new(_("_Show FPS statistics"),TRUE,LIVES_BOX(vbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_show_stats),prefs->show_player_stats);
+
   // ---
-  hbox31 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox31);
-  gtk_box_pack_start (GTK_BOX (vbox69), hbox31, FALSE, FALSE, 0);
+  add_hsep_to_box(LIVES_BOX(vbox));
 
-  label126 = gtk_label_new_with_mnemonic (_("_Plugin"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label126, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label126);
-  gtk_box_pack_start (GTK_BOX (hbox31), label126, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label126), GTK_JUSTIFY_LEFT);
   // ---
-  pp_combo = gtk_combo_box_new_text();
-  gtk_box_pack_start (GTK_BOX (hbox31), pp_combo, FALSE, FALSE, 20);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
   // ---
+#ifndef IS_MINGW
   vid_playback_plugins = get_plugin_list(PLUGIN_VID_PLAYBACK, TRUE, NULL, "-so");
-  vid_playback_plugins = g_list_prepend (vid_playback_plugins, g_strdup(mainw->none_string));
-
-  populate_combo_box(GTK_COMBO_BOX(pp_combo), vid_playback_plugins);
+#else
+  vid_playback_plugins = get_plugin_list(PLUGIN_VID_PLAYBACK, TRUE, NULL, "-dll");
+#endif
+  vid_playback_plugins = g_list_prepend (vid_playback_plugins, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
 
-  gtk_widget_show(pp_combo);
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
+  pp_combo = lives_standard_combo_new(_("_Plugin"),TRUE,vid_playback_plugins,LIVES_BOX(hbox),NULL);
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
   advbutton = gtk_button_new_with_mnemonic (_("_Advanced"));
-  gtk_widget_show (advbutton);
-  gtk_box_pack_start (GTK_BOX (hbox31), advbutton, FALSE, FALSE, 40);
+  gtk_box_pack_start (GTK_BOX (hbox), advbutton, FALSE, FALSE, 40);
 
   g_signal_connect (GTK_OBJECT (advbutton), "clicked",
 		    G_CALLBACK (on_vpp_advanced_clicked),
 		    NULL);
 
+
   if (mainw->vpp != NULL) {
-    set_combo_box_active_string(GTK_COMBO_BOX(pp_combo), mainw->vpp->name);
+    lives_combo_set_active_string(LIVES_COMBO(pp_combo), mainw->vpp->name);
   }
   else {
     gtk_combo_box_set_active(GTK_COMBO_BOX(pp_combo), 0);
@@ -3164,106 +2652,85 @@
 
   g_signal_connect_after (G_OBJECT (pp_combo), "changed", G_CALLBACK (after_vpp_changed), (gpointer) advbutton);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox69), hbox, FALSE, FALSE, 0);
-
-  prefsw->checkbutton_stream_audio = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Stream audio"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_stream_audio);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_stream_audio);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->checkbutton_stream_audio, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_set_tooltip_text( prefsw->checkbutton_stream_audio, (_("Stream audio to playback plugin")));
+  prefsw->checkbutton_stream_audio = 
+    lives_standard_check_button_new((tmp=g_strdup(_("Stream audio"))),
+				    TRUE,LIVES_BOX(vbox),
+				    (tmp2=g_strdup
+				     (_("Stream audio to playback plugin"))));
+  g_free(tmp); g_free(tmp2);
+
 
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),prefs->stream_audio_out);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),prefs->stream_audio_out);
 
   prefsw_set_astream_settings(mainw->vpp);
 
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_stream_audio), "toggled", GTK_SIGNAL_FUNC(stream_audio_toggled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_stream_audio), "toggled", G_CALLBACK(stream_audio_toggled), NULL);
+
 
-  label31 = gtk_label_new (_("VIDEO"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label31, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(label31, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(frame4, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_widget_show (label31);
-  gtk_frame_set_label_widget (GTK_FRAME (frame4), label31);
-  gtk_label_set_justify (GTK_LABEL(label31), GTK_JUSTIFY_LEFT);
-
-  frame5 = gtk_frame_new (NULL);
-  gtk_widget_show (frame5);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_playback), frame5, TRUE, TRUE, 0);
-
-  vbox = gtk_vbox_new (FALSE, 10);
-  gtk_widget_show (vbox);
-  gtk_container_add (GTK_CONTAINER (frame5), vbox);
-
-  hbox10 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox10);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox10, TRUE, TRUE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox10), 10);
 
-  label35 = gtk_label_new_with_mnemonic (_("_Player"));
+  prefsw->checkbutton_rec_after_pb = 
+    lives_standard_check_button_new((tmp=g_strdup(_("Record player output"))),
+				    TRUE,LIVES_BOX(vbox),
+				    (tmp2=g_strdup
+				     (_("Record output from player instead of input to player"))));
+  g_free(tmp); g_free(tmp2);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_rec_after_pb),(prefs->rec_opts&REC_AFTER_PB));
+
+  prefsw_set_rec_after_settings(mainw->vpp);
+
+  label = lives_standard_label_new (_("VIDEO"));
+
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label35, GTK_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  gtk_widget_show (label35);
-  gtk_box_pack_start (GTK_BOX (hbox10), label35, FALSE, FALSE, 20);
-  gtk_label_set_justify (GTK_LABEL (label35), GTK_JUSTIFY_LEFT);
+
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+
+
+  //-
+
+  frame = gtk_frame_new (NULL);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_playback), frame, TRUE, TRUE, 0);
+
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
 
 #ifdef HAVE_PULSE_AUDIO
-  audp = g_list_append (audp, g_strdup_printf("pulse audio (%s)",mainw->recommended_string));
+  audp = g_list_append (audp, g_strdup_printf("pulse audio (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
   has_ap_rec=TRUE;
 #endif
 
 #ifdef ENABLE_JACK
-  if (!has_ap_rec) audp = g_list_append (audp, g_strdup_printf("jack (%s)",mainw->recommended_string));
+  if (!has_ap_rec) audp = g_list_append (audp, g_strdup_printf("jack (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
   else audp = g_list_append (audp, g_strdup_printf("jack"));
   has_ap_rec=TRUE;
 #endif
 
-  if (capable->has_sox) {
+  if (capable->has_sox_play) {
     if (has_ap_rec) audp = g_list_append (audp, g_strdup("sox"));
-    else audp = g_list_append (audp, g_strdup_printf("sox (%s)",mainw->recommended_string));
+    else audp = g_list_append (audp, g_strdup_printf("sox (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
   }
 
   if (capable->has_mplayer) {
     audp = g_list_append (audp, g_strdup("mplayer"));
   }
 
-  prefsw->audp_combo = gtk_combo_box_new_text();
-  populate_combo_box(GTK_COMBO_BOX(prefsw->audp_combo), audp);
-
-  gtk_box_pack_start (GTK_BOX (hbox10), prefsw->audp_combo, TRUE, TRUE, 20);
-  gtk_widget_show(prefsw->audp_combo);
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
+  prefsw->audp_combo = lives_standard_combo_new(_("_Player"),TRUE,audp,LIVES_BOX(vbox),NULL);
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
   has_ap_rec=FALSE;
 
-  add_fill_to_box(GTK_BOX(hbox10));
-
-  prefsw->jack_int_label=gtk_label_new(_("(See also the Jack Integration tab for jack startup options)"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(prefsw->jack_int_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (vbox), prefsw->jack_int_label, FALSE, FALSE, 0);
-
-  gtk_widget_hide(prefsw->jack_int_label);
-
+  prefsw->jack_int_label=lives_standard_label_new(_("(See also the Jack Integration tab for jack startup options)"));
+  gtk_box_pack_start (GTK_BOX (vbox), prefsw->jack_int_label, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->audp_name=NULL;
 
 #ifdef HAVE_PULSE_AUDIO
   if (prefs->audio_player==AUD_PLAYER_PULSE) {
-    prefsw->audp_name=g_strdup_printf("pulse audio (%s)",mainw->recommended_string);
+    prefsw->audp_name=g_strdup_printf("pulse audio (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
   }
   has_ap_rec=TRUE;
 #endif
@@ -3271,15 +2738,14 @@
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK) {
     if (!has_ap_rec)
-      prefsw->audp_name=g_strdup_printf("jack (%s)",mainw->recommended_string);
+      prefsw->audp_name=g_strdup_printf("jack (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
     else prefsw->audp_name=g_strdup_printf("jack");
-    gtk_widget_show(prefsw->jack_int_label);
   }
   has_ap_rec=TRUE;
 #endif
 
   if (prefs->audio_player==AUD_PLAYER_SOX) {
-    if (!has_ap_rec) prefsw->audp_name=g_strdup_printf("sox (%s)",mainw->recommended_string);
+    if (!has_ap_rec) prefsw->audp_name=g_strdup_printf("sox (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
     else prefsw->audp_name=g_strdup_printf("sox");
   }
 
@@ -3288,163 +2754,131 @@
   }
   // ---
   if (prefsw->audp_name!=NULL) 
-    set_combo_box_active_string(GTK_COMBO_BOX(prefsw->audp_combo), prefsw->audp_name);
+    lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->audp_name);
   prefsw->orig_audp_name=g_strdup(prefsw->audp_name);
+
+
   //---
-  hbox10 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox10);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox10, TRUE, TRUE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox10), 10);
 
-  label36 = gtk_label_new_with_mnemonic (_("Audio play _command"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label36, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label36);
-  gtk_box_pack_start (GTK_BOX (hbox10), label36, FALSE, FALSE, 20);
-  gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_LEFT);
-
-  prefsw->audio_command_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->audio_command_entry),255);
-  gtk_widget_show (prefsw->audio_command_entry);
-  gtk_box_pack_start (GTK_BOX (hbox10), prefsw->audio_command_entry, TRUE, TRUE, 0);
+  prefsw->audio_command_entry = lives_standard_entry_new (_("Audio play _command"),TRUE,"",-1,255,LIVES_BOX(vbox),NULL);
 
-  add_fill_to_box(GTK_BOX(hbox10));
 
   // get from prefs
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) gtk_entry_set_text(GTK_ENTRY(prefsw->audio_command_entry),prefs->audio_play_command);
+  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) 
+    gtk_entry_set_text(GTK_ENTRY(prefsw->audio_command_entry),prefs->audio_play_command);
   else {
     gtk_entry_set_text(GTK_ENTRY(prefsw->audio_command_entry),(_("- internal -")));
     gtk_widget_set_sensitive(prefsw->audio_command_entry,FALSE);
   }
 
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
 
-  gtk_box_pack_start (GTK_BOX (vbox), hbox1, TRUE, TRUE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  prefsw->checkbutton_afollow = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Audio follows video _rate/direction"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_afollow);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_afollow);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_afollow, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox1), hbox, FALSE, FALSE, 10);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_afollow),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)?TRUE:FALSE);
+
+  prefsw->checkbutton_afollow = lives_standard_check_button_new(_("Audio follows video _rate/direction"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_afollow),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)?TRUE:FALSE);
   gtk_widget_set_sensitive(prefsw->checkbutton_afollow,prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE);
 
+  add_fill_to_box(LIVES_BOX(hbox));
+
   // ---
-  prefsw->checkbutton_aclips = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Audio follows _clip switches"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_aclips);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_aclips);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_aclips, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_end (GTK_BOX (hbox1), hbox, FALSE, FALSE, 10);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_aclips),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)?TRUE:FALSE);
+  prefsw->checkbutton_aclips = lives_standard_check_button_new(_("Audio follows _clip switches"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_aclips),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)?TRUE:FALSE);
   gtk_widget_set_sensitive(prefsw->checkbutton_aclips,prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE);
 
-  label32 = gtk_label_new (_("AUDIO"));
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  label=lives_standard_label_new(_("Source:"));
+  gtk_box_pack_start(GTK_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  rbutton=lives_standard_radio_button_new(_("_Internal"),TRUE,asrc_group,LIVES_BOX(hbox),NULL);
+
+  asrc_group=lives_radio_button_get_group (LIVES_RADIO_BUTTON (rbutton));
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  prefsw->rextaudio = lives_standard_radio_button_new(_("_External (requires jack or pulse audio player)"),
+						      TRUE,asrc_group,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rextaudio),prefs->audio_src==AUDIO_SRC_EXT);
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  if (mainw->playing_file>0&&mainw->record){
+    gtk_widget_set_sensitive (prefsw->rextaudio,FALSE);
+  }
+
+  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE){
+    gtk_widget_set_sensitive (prefsw->rextaudio,FALSE);
+  }
+
+  g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", G_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_aclips);
+  g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", G_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_afollow);
+
+
+
+  label = lives_standard_label_new (_("AUDIO"));
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label32, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(label31, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_widget_modify_bg(frame5, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_widget_show (label32);
-  gtk_frame_set_label_widget (GTK_FRAME (frame5), label32);
-  gtk_label_set_justify (GTK_LABEL (label32), GTK_JUSTIFY_LEFT);
+    lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  }
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
 
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_playback.png", NULL);
   pixbuf_playback = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_playback, _("Playback"), LIST_ENTRY_PLAYBACK);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_playback);
 
+
+  gtk_widget_hide(prefsw->jack_int_label);
+
+#ifdef ENABLE_JACK
+  if (prefs->audio_player==AUD_PLAYER_JACK) {
+    gtk_widget_show(prefsw->jack_int_label);
+  }
+#endif
+
+
   // ---------------,
   // recording      |
   // ---------------'
 
-  prefsw->vbox_right_recording = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_recording), 20);
+  prefsw->vbox_right_recording = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_recording), widget_opts.border_width*2);
 
-  prefsw->scrollw_right_recording = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_recording), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_recording), 
-					 prefsw->vbox_right_recording);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_recording)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_recording)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_recording = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_recording);
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  prefsw->rdesk_audio = lives_standard_check_button_new(_("Record audio when capturing an e_xternal window\n (requires jack or pulse audio)"),TRUE,(LiVESBox *)hbox,NULL);
+  hbox = lives_hbox_new(FALSE, 0);
+  prefsw->rdesk_audio = lives_standard_check_button_new(_("Record audio when capturing an e_xternal window\n (requires jack or pulse audio)"),
+							TRUE,LIVES_BOX(hbox),NULL);
 
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
 
 #ifndef RT_AUDIO
   gtk_widget_set_sensitive (prefsw->rdesk_audio,FALSE);
 #endif
 
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->rdesk_audio),prefs->rec_desktop_audio);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rdesk_audio),prefs->rec_desktop_audio);
 
   // ---
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hseparator, TRUE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_recording));
+
   // ---
-  label37 = gtk_label_new (_("      What to record when 'r' is pressed   "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label37, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label37);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), label37, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_LEFT);
+  label = lives_standard_label_new (_("      What to record when 'r' is pressed   "));
+ 
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), label, FALSE, FALSE, widget_opts.packing_height);
+
   // ---
-  hbox2 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox2, TRUE, TRUE, 6);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
+  prefsw->rframes = lives_standard_check_button_new(_("_Frame changes"),TRUE,LIVES_BOX(hbox),NULL);
 
-  prefsw->rframes = lives_standard_check_button_new(_("_Frame changes"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->rframes),prefs->rec_opts&REC_FRAMES);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rframes),prefs->rec_opts&REC_FRAMES);
 
   // ---
   if (prefs->rec_opts&REC_FPS||prefs->rec_opts&REC_CLIPS){
@@ -3454,11 +2888,11 @@
     gtk_widget_set_sensitive (prefsw->rframes,FALSE);
   }
 
+  add_fill_to_box(LIVES_BOX(hbox));
+
   // ---
-  hbox = gtk_hbox_new(FALSE, 0);
-  prefsw->rfps = lives_standard_check_button_new(_("F_PS changes"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
+  prefsw->rfps = lives_standard_check_button_new(_("F_PS changes"),TRUE,LIVES_BOX(hbox),NULL);
+
   // ---
   if (prefs->rec_opts&REC_CLIPS) {
     gtk_widget_set_sensitive (prefsw->rfps,FALSE); // we must record these if recording clip switches
@@ -3468,123 +2902,68 @@
     gtk_widget_set_sensitive (prefsw->rfps,FALSE);
   }
   // ---
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->rfps),prefs->rec_opts&REC_FPS);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rfps),prefs->rec_opts&REC_FPS);
 
   // ---
-  hbox3 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox3);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox3, TRUE, TRUE, 6);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  prefsw->reffects = lives_standard_check_button_new(_("_Real time effects"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
+  prefsw->reffects = lives_standard_check_button_new(_("_Real time effects"),TRUE,LIVES_BOX(hbox),NULL);
 
   if (mainw->playing_file>0&&mainw->record){
     gtk_widget_set_sensitive (prefsw->reffects,FALSE);
   }
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->reffects),prefs->rec_opts&REC_EFFECTS);
-  // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  prefsw->rclips = lives_standard_check_button_new(_("_Clip switches"),TRUE,(LiVESBox *)hbox,NULL);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->rclips),prefs->rec_opts&REC_CLIPS);
-
-  if (mainw->playing_file>0&&mainw->record){
-    gtk_widget_set_sensitive (prefsw->rclips,FALSE);
-  }
+  add_fill_to_box(LIVES_BOX(hbox));
 
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->reffects),prefs->rec_opts&REC_EFFECTS);
   // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, TRUE, TRUE, 6);
-  prefsw->raudio = lives_standard_check_button_new(_("_Internal Audio (requires jack or pulse audio player)"),
-						   TRUE,(LiVESBox *)hbox,NULL);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->raudio),prefs->rec_opts&REC_AUDIO);
-
+  prefsw->rclips = lives_standard_check_button_new(_("_Clip switches"),TRUE,LIVES_BOX(hbox),NULL);
 
-  if (prefs->rec_opts&REC_EXT_AUDIO) {
-    gtk_widget_set_sensitive (prefsw->raudio,FALSE);
-  }
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rclips),prefs->rec_opts&REC_CLIPS);
 
   if (mainw->playing_file>0&&mainw->record){
-    gtk_widget_set_sensitive (prefsw->raudio,FALSE);
+    gtk_widget_set_sensitive (prefsw->rclips,FALSE);
   }
 
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE){
-    gtk_widget_set_sensitive (prefsw->raudio,FALSE);
-  }
 
+  // ---
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, TRUE, TRUE, 6);
-  prefsw->rextaudio = lives_standard_check_button_new(_("_External Audio (requires jack or pulse audio player)"),
-						   TRUE,(LiVESBox *)hbox,NULL);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->rextaudio),prefs->rec_opts&REC_EXT_AUDIO);
+  prefsw->raudio = lives_standard_check_button_new(_("_Audio (requires jack or pulse audio player)"),
+						   TRUE,LIVES_BOX(prefsw->vbox_right_recording),NULL);
 
-  if (prefs->rec_opts&REC_AUDIO) {
-    gtk_widget_set_sensitive (prefsw->rextaudio,FALSE);
-  }
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->raudio),prefs->rec_opts&REC_AUDIO);
 
   if (mainw->playing_file>0&&mainw->record){
-    gtk_widget_set_sensitive (prefsw->rextaudio,FALSE);
+    gtk_widget_set_sensitive (prefsw->raudio,FALSE);
   }
 
   if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE){
-    gtk_widget_set_sensitive (prefsw->rextaudio,FALSE);
+    gtk_widget_set_sensitive (prefsw->raudio,FALSE);
   }
 
-  g_signal_connect(GTK_OBJECT(prefsw->raudio), "toggled", GTK_SIGNAL_FUNC(toggle_set_insensitive), prefsw->rextaudio);
-  g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", GTK_SIGNAL_FUNC(toggle_set_insensitive), prefsw->raudio);
-
   // ---
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hseparator, TRUE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_recording));
   // ---
-  hbox5 = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox5);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox5, TRUE, TRUE, 0);
-
-  label = gtk_label_new_with_mnemonic (_("Pause recording if free disk space falls below"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox5), label, FALSE, FALSE, 10);
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->rec_stop_gb, 0, 1024., 1., 10., 0.);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height*4);
   
-  prefsw->spinbutton_rec_gb = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_rec_gb);
-  gtk_box_pack_start (GTK_BOX (hbox5), prefsw->spinbutton_rec_gb, FALSE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), prefsw->spinbutton_rec_gb);
+  prefsw->spinbutton_rec_gb = lives_standard_spin_button_new (_("Pause recording if free disk space falls below"),FALSE,
+							      prefs->rec_stop_gb, 0., 1024., 1., 10., 0,
+							      LIVES_BOX(hbox),NULL);
 
-  label = gtk_label_new_with_mnemonic (_("GB")); // translators - gigabytes
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox5), label, FALSE, FALSE, 10);
+
+  // TRANSLATORS: gigabytes
+  label = lives_standard_label_new (_("GB"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
 
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_record.png", NULL);
   pixbuf_recording = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_recording, _("Recording"), LIST_ENTRY_RECORDING);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_recording);
 
@@ -3592,70 +2971,29 @@
   // encoding       |
   // ---------------'
 
-  prefsw->vbox_right_encoding = gtk_vbox_new (FALSE, 30);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_encoding), 20);
-
-  prefsw->scrollw_right_encoding = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_encoding), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_encoding), 
-					 prefsw->vbox_right_encoding);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_encoding)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_encoding)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->vbox_right_encoding = lives_vbox_new (FALSE, widget_opts.packing_height*4);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_encoding), widget_opts.border_width);
 
-  hbox11 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox11);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_encoding), hbox11, FALSE, FALSE, 20);
-
-  label37 = gtk_label_new (_("      Encoder                  "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label37, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label37);
-  gtk_box_pack_start (GTK_BOX (hbox11), label37, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_LEFT);
-
-  prefsw->encoder_combo = gtk_combo_box_new_text();
-  gtk_box_pack_start(GTK_BOX(hbox11), prefsw->encoder_combo, FALSE, FALSE, 0);
+  prefsw->scrollw_right_encoding = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_encoding);
 
   if (capable->has_encoder_plugins) {
     // scan for encoder plugins
-    if ((encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL))!=NULL) {
-      encoders=filter_encoders_by_img_ext(encoders,prefs->image_ext);
-      populate_combo_box(GTK_COMBO_BOX(prefsw->encoder_combo), encoders);
-      // ---
-      set_combo_box_active_string(GTK_COMBO_BOX(prefsw->encoder_combo), prefs->encoder.name);
-      // ---
-      g_list_free_strings (encoders);
-      g_list_free (encoders);
-    }
+    encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL);
   }
 
-  gtk_widget_show(prefsw->encoder_combo);
+  widget_opts.expand=LIVES_EXPAND_EXTRA;
+  prefsw->encoder_combo = lives_standard_combo_new(_("Encoder"),FALSE,encoders,
+						   LIVES_BOX (prefsw->vbox_right_encoding),NULL);
+  widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_encoding), hseparator, FALSE, FALSE, 20);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_encoding), hbox, FALSE, FALSE, 20);
 
-  label56 = gtk_label_new (_("Output format"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label56, GTK_STATE_NORMAL, &palette->normal_fore);
+  if (encoders!=NULL) {
+    lives_combo_set_active_string(LIVES_COMBO(prefsw->encoder_combo), prefs->encoder.name);
+    g_list_free_strings (encoders);
+    g_list_free (encoders);
   }
-  gtk_box_pack_start (GTK_BOX (hbox), label56, TRUE, FALSE, 0);
-  
-  prefsw->ofmt_combo = gtk_combo_box_new_text();
+
+  add_hsep_to_box (LIVES_BOX (prefsw->vbox_right_encoding));
 
   if (capable->has_encoder_plugins) {
     // reqest formats from the encoder plugin
@@ -3671,47 +3009,43 @@
 	}
       }
       lives_memcpy (&future_prefs->encoder,&prefs->encoder,sizeof(_encoder));
-      populate_combo_box(GTK_COMBO_BOX(prefsw->ofmt_combo), ofmt);
-      g_list_free_strings(ofmt);
-      g_list_free(ofmt);
-      g_list_free_strings(ofmt_all);
-      g_list_free(ofmt_all);
     }
     else {
       do_plugin_encoder_error(prefs->encoder.name);
       future_prefs->encoder.of_allowed_acodecs=0;
     }
     
-    gtk_box_pack_start (GTK_BOX (hbox), prefsw->ofmt_combo, TRUE, TRUE, 10);
-    add_fill_to_box (GTK_BOX (hbox));
-    gtk_widget_show_all(hbox);
 
-    set_combo_box_active_string(GTK_COMBO_BOX(prefsw->ofmt_combo), prefs->encoder.of_desc);
+    widget_opts.expand=LIVES_EXPAND_EXTRA;
+    prefsw->ofmt_combo = lives_standard_combo_new(_("Output format"),FALSE,ofmt,LIVES_BOX(prefsw->vbox_right_encoding),NULL);
+    widget_opts.expand=LIVES_EXPAND_DEFAULT;
+
+    if (ofmt!=NULL) {
+      lives_combo_set_active_string(LIVES_COMBO(prefsw->ofmt_combo), prefs->encoder.of_desc);
+      g_list_free_strings(ofmt);
+      g_list_free(ofmt);
+    }
+
+    if (ofmt_all!=NULL) {
+      g_list_free_strings(ofmt_all);
+      g_list_free(ofmt_all);
+    }
 
-    prefsw->acodec_combo = gtk_combo_box_new_text();
+
+    widget_opts.expand=LIVES_EXPAND_EXTRA;
+    prefsw->acodec_combo = lives_standard_combo_new(_("Audio codec"),FALSE,NULL,LIVES_BOX(prefsw->vbox_right_encoding),NULL);
+    widget_opts.expand=LIVES_EXPAND_DEFAULT;
     prefs->acodec_list=NULL;
 
     set_acodec_list_from_allowed(prefsw, rdet);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_encoding), hbox, FALSE, FALSE, 20);
-
-    label = gtk_label_new (_("Audio codec"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 10);
-    
-    gtk_box_pack_start (GTK_BOX (hbox), prefsw->acodec_combo, TRUE, TRUE, 10);
-    add_fill_to_box (GTK_BOX (hbox));
-    gtk_widget_show_all (hbox);
   }
+  else prefsw->acodec_combo=NULL;
 
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_encoding.png", NULL);
   pixbuf_encoding = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_encoding, _("Encoding"), LIST_ENTRY_ENCODING);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_encoding);
 
@@ -3719,110 +3053,75 @@
   // effects        |
   // ---------------'
 
-  prefsw->vbox_right_effects = gtk_vbox_new (FALSE, 20);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_effects), 20);
+  prefsw->vbox_right_effects = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_effects), widget_opts.border_width);
   
-  prefsw->scrollw_right_effects = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_effects), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_effects), 
-					 prefsw->vbox_right_effects);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_effects)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_effects)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_effects = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_effects);
 
-  prefsw->checkbutton_antialias = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Use _antialiasing when resizing"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_antialias);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_antialias);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_antialias, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, 10);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_antialias), prefs->antialias);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_antialias = lives_standard_check_button_new(_("Use _antialiasing when resizing"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_antialias), prefs->antialias);
   //
-  hbox = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, TRUE, TRUE, 0);
-  
-  label = gtk_label_new_with_mnemonic (_("Number of _real time effect keys"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->rte_keys_virtual, FX_KEYS_PHYSICAL, FX_KEYS_MAX_VIRTUAL, 1, 1, 0);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
   
-  prefsw->spinbutton_rte_keys = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_rte_keys);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_rte_keys, FALSE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->spinbutton_rte_keys);
-  gtk_widget_set_tooltip_text( prefsw->spinbutton_rte_keys, _("The number of \"virtual\" real time effect keys. They can be controlled through the real time effects window, or via network (OSC)."));
+  prefsw->spinbutton_rte_keys = lives_standard_spin_button_new 
+    ((tmp=g_strdup(_("Number of _real time effect keys"))),TRUE,prefs->rte_keys_virtual, FX_KEYS_PHYSICAL, 
+     FX_KEYS_MAX_VIRTUAL, 1., 1., 0, LIVES_BOX(hbox),
+    (tmp2=g_strdup(_("The number of \"virtual\" real time effect keys. They can be controlled through the real time effects window, or via network (OSC)."))));
+  g_free(tmp);
+  g_free(tmp2);
 
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
 
+  prefsw->checkbutton_threads = lives_standard_check_button_new(_("Use _threads where possible when applying effects"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_threads), future_prefs->nfx_threads>1);
 
-  prefsw->checkbutton_threads = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Use _threads where possible when applying effects"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_threads);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_threads);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_threads, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, 10);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_threads), future_prefs->nfx_threads>1);
   //
-  hbox = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, TRUE, TRUE, 0);
 
+  add_fill_to_box(LIVES_BOX(hbox));
 
-  label = gtk_label_new_with_mnemonic (_("Number of _threads"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (future_prefs->nfx_threads, 2., 65536, 1, 1, 0);
-  
-  prefsw->spinbutton_nfx_threads = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_nfx_threads);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_nfx_threads, FALSE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->spinbutton_nfx_threads);
+  prefsw->spinbutton_nfx_threads = lives_standard_spin_button_new (_("Number of _threads"),TRUE,future_prefs->nfx_threads, 2., 65536., 1., 1., 0, 
+								   LIVES_BOX(hbox),NULL);
 
+  add_fill_to_box(LIVES_BOX(hbox));
 
   if (future_prefs->nfx_threads==1) gtk_widget_set_sensitive(prefsw->spinbutton_nfx_threads,FALSE);
 
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_effects));
+
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  label = lives_standard_label_new (_("Restart is required if any of the following paths are changed:"));
+
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+  // ---
+  add_fill_to_box(LIVES_BOX(hbox));
+
+
+  dph=widget_opts.packing_height;
+  widget_opts.packing_height*=4;
+
+  prefsw->wpp_entry=lives_standard_entry_new(_("Weed plugin path"),TRUE,prefs->weed_plugin_path,-1,PATH_MAX,LIVES_BOX(prefsw->vbox_right_effects),NULL);
+ 
+  prefsw->frei0r_entry=lives_standard_entry_new(_("Frei0r plugin path"),TRUE,prefs->frei0r_path,-1,PATH_MAX,LIVES_BOX(prefsw->vbox_right_effects),NULL);
+ 
+  prefsw->ladspa_entry=lives_standard_entry_new(_("LADSPA plugin path"),TRUE,prefs->ladspa_path,-1,PATH_MAX,LIVES_BOX(prefsw->vbox_right_effects),NULL);
+ 
+  widget_opts.packing_height=dph;
+
 
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_effects.png", NULL);
   pixbuf_effects = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_effects, _("Effects"), LIST_ENTRY_EFFECTS);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_effects);
 
@@ -3831,93 +3130,51 @@
   // -------------------'
 
   prefsw->table_right_directories = gtk_table_new (10, 3, FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->table_right_directories), 20);
-  
-  prefsw->scrollw_right_directories = gtk_scrolled_window_new (NULL, NULL);
-  
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_directories), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_directories), 
-					 prefsw->table_right_directories);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_directories)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_directories)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->table_right_directories), widget_opts.border_width*2);
+  gtk_table_set_col_spacings (GTK_TABLE (prefsw->table_right_directories), widget_opts.packing_width);
+  gtk_table_set_row_spacings (GTK_TABLE (prefsw->table_right_directories), widget_opts.packing_height);
 
+  prefsw->scrollw_right_directories = lives_standard_scrolled_window_new (0,0,prefsw->table_right_directories);
 
-  label39 = gtk_label_new (_("      Video load directory (default)      "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label39, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label39);
-  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label39, 0, 1, 4, 5,
+  label = lives_standard_label_new (_("      Video load directory (default)      "));
+  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 1, 4, 5,
 		    (GtkAttachOptions) (GTK_FILL),
 		    (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label39), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   
-  label40 = gtk_label_new (_("      Video save directory (default) "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label40, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label40);
-  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label40, 0, 1, 5, 6,
+  label = lives_standard_label_new (_("      Video save directory (default) "));
+  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 1, 5, 6,
 		    (GtkAttachOptions) (GTK_FILL),
 		    (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label40), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   
-  label41 = gtk_label_new (_("      Audio load directory (default) "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label41, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label41);
-  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label41, 0, 1, 6, 7,
+  label = lives_standard_label_new (_("      Audio load directory (default) "));
+  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 1, 6, 7,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label41), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   
-  label42 = gtk_label_new (_("      Image directory (default) "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label42, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label42);
-  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label42, 0, 1, 7, 8,
+  label = lives_standard_label_new (_("      Image directory (default) "));
+  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 1, 7, 8,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label42), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   
-  label52 = gtk_label_new (_("      Backup/Restore directory (default) "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label52, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label52);
-  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label52, 0, 1, 8, 9,
+  label = lives_standard_label_new (_("      Backup/Restore directory (default) "));
+  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 1, 8, 9,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label52), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label52), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   
-  label43 = gtk_label_new (_("      Temp directory (do not remove) "));
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label43, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label43);
-  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label43, 0, 1, 3, 4,
+  label = lives_standard_label_new (_("      Temp directory (do not remove) "));
+  gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 1, 3, 4,
 		    (GtkAttachOptions) (GTK_FILL),
 		    (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label43), GTK_JUSTIFY_LEFT);
-  gtk_misc_set_alignment (GTK_MISC (label43), 0, 0.5);
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+
 
   prefsw->vid_load_dir_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->vid_load_dir_entry),255);
-  gtk_widget_show (prefsw->vid_load_dir_entry);
+  gtk_entry_set_max_length(GTK_ENTRY(prefsw->vid_load_dir_entry),PATH_MAX);
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), prefsw->vid_load_dir_entry, 1, 2, 4, 5,
 		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		    (GtkAttachOptions) (0), 0, 0);
@@ -3929,161 +3186,97 @@
   // tempdir warning label
 
 
-  label = gtk_label_new ("");
-
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  label = lives_standard_label_new ("");
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
   set_temp_label_text(GTK_LABEL(label));
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (label);
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), label, 0, 3, 0, 2,
-		    (GtkAttachOptions) (GTK_FILL),
-		    (GtkAttachOptions) (GTK_EXPAND), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+		    (GtkAttachOptions) (0), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.65);
  
   prefsw->temp_label=label;
 
-
-
-
-
-
-
-
  
   // get from prefs
   gtk_entry_set_text(GTK_ENTRY(prefsw->vid_load_dir_entry),prefs->def_vid_load_dir);
+
+
   
-  prefsw->vid_save_dir_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->vid_save_dir_entry),PATH_MAX);
-  gtk_widget_show (prefsw->vid_save_dir_entry);
+  prefsw->vid_save_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_vid_save_dir,-1,PATH_MAX,
+							 NULL,_("The default directory for saving encoded clips to"));
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), prefsw->vid_save_dir_entry, 1, 2, 5, 6,
 		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		    (GtkAttachOptions) (0), 0, 0);
-  
-  gtk_widget_set_tooltip_text( prefsw->vid_save_dir_entry, 
-			       _("The default directory for saving encoded clips to"));
 
-  // get from prefs
-  gtk_entry_set_text(GTK_ENTRY(prefsw->vid_save_dir_entry),prefs->def_vid_save_dir);
+  lives_entry_set_editable(LIVES_ENTRY(prefsw->vid_save_dir_entry),FALSE);
   
-  prefsw->audio_dir_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->audio_dir_entry),PATH_MAX);
-  gtk_widget_show (prefsw->audio_dir_entry);
+  prefsw->audio_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_audio_dir,-1,PATH_MAX,
+						      NULL,_("The default directory for loading and saving audio"));
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), prefsw->audio_dir_entry, 1, 2, 6, 7,
 		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		    (GtkAttachOptions) (0), 0, 0);
-  
-  gtk_widget_set_tooltip_text( prefsw->audio_dir_entry, 
-			       _("The default directory for loading and saving audio"));
 
-  // get from prefs
-  gtk_entry_set_text(GTK_ENTRY(prefsw->audio_dir_entry),prefs->def_audio_dir);
+  lives_entry_set_editable(LIVES_ENTRY(prefsw->audio_dir_entry),FALSE);
    
-  prefsw->image_dir_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->image_dir_entry),PATH_MAX);
-  gtk_widget_show (prefsw->image_dir_entry);
+  prefsw->image_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_image_dir,-1,PATH_MAX,
+						      NULL,_("The default directory for saving frameshots to"));
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), prefsw->image_dir_entry, 1, 2, 7, 8,
 		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		    (GtkAttachOptions) (0), 0, 0);
-   
-  gtk_widget_set_tooltip_text( prefsw->image_dir_entry, 
-			       _("The default directory for saving frameshots to"));
 
-  // get from prefs
-  gtk_entry_set_text(GTK_ENTRY(prefsw->image_dir_entry),prefs->def_image_dir);
+  lives_entry_set_editable(LIVES_ENTRY(prefsw->image_dir_entry),FALSE);
    
-  prefsw->proj_dir_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->proj_dir_entry),PATH_MAX);
-  gtk_widget_show (prefsw->proj_dir_entry);
+  prefsw->proj_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_proj_dir,-1,PATH_MAX,
+						     NULL,_("The default directory for backing up/restoring single clips"));
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), prefsw->proj_dir_entry, 1, 2, 8, 9,
 		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		    (GtkAttachOptions) (0), 0, 0);
    
-  gtk_widget_set_tooltip_text( prefsw->proj_dir_entry, 
-			       _("The default directory for backing up/restoring single clips"));
-
-  // get from prefs
-  gtk_entry_set_text(GTK_ENTRY(prefsw->proj_dir_entry),prefs->def_proj_dir);
+  lives_entry_set_editable(LIVES_ENTRY(prefsw->proj_dir_entry),FALSE);
    
-  prefsw->tmpdir_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->tmpdir_entry),PATH_MAX);
-  gtk_widget_show (prefsw->tmpdir_entry);
+  prefsw->tmpdir_entry = lives_standard_entry_new (NULL,FALSE,(tmp=g_filename_to_utf8(future_prefs->tmpdir,-1,NULL,NULL,NULL)),-1,PATH_MAX,
+						   NULL,(tmp2=g_strdup(_("LiVES working directory."))));
+
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), prefsw->tmpdir_entry, 1, 2, 3, 4,
 		    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		    (GtkAttachOptions) (0), 0, 0);
-   
-  gtk_widget_set_tooltip_text( prefsw->tmpdir_entry, _("LiVES working directory."));
 
-  // get from prefs
-  gtk_entry_set_text(GTK_ENTRY(prefsw->tmpdir_entry),(tmp=g_filename_to_utf8(future_prefs->tmpdir,-1,NULL,NULL,NULL)));
-  g_free(tmp);
-   
-  dirbutton1 = gtk_button_new ();
-  gtk_widget_show (dirbutton1);
-   
+  g_free(tmp); g_free(tmp2);
+
+  lives_entry_set_editable(LIVES_ENTRY(prefsw->tmpdir_entry),FALSE);
    
-  dirimage1 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (dirimage1);
-  gtk_container_add (GTK_CONTAINER (dirbutton1), dirimage1);
+  dirbutton1 = lives_standard_file_button_new (TRUE,NULL);
    
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), dirbutton1, 2, 3, 4, 5,
 		    (GtkAttachOptions) (0),
 		    (GtkAttachOptions) (0), 0, 0);
    
-  dirbutton2 = gtk_button_new ();
-  gtk_widget_show (dirbutton2);
-   
-  dirimage2 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (dirimage2);
-  gtk_container_add (GTK_CONTAINER (dirbutton2), dirimage2);
+  dirbutton2 = lives_standard_file_button_new (TRUE,NULL);
    
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), dirbutton2, 2, 3, 5, 6,
 		    (GtkAttachOptions) (0),
 		    (GtkAttachOptions) (0), 0, 0);
    
-  dirbutton3 = gtk_button_new ();
-  gtk_widget_show (dirbutton3);
-   
-  dirimage3 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (dirimage3);
-  gtk_container_add (GTK_CONTAINER (dirbutton3), dirimage3);
+  dirbutton3 = lives_standard_file_button_new (TRUE,NULL);
    
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), dirbutton3, 2, 3, 6, 7,
 		    (GtkAttachOptions) (0),
 		    (GtkAttachOptions) (0), 0, 0);
    
-  dirbutton4 = gtk_button_new ();
-  gtk_widget_show (dirbutton4);
-   
-  dirimage4 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (dirimage4);
-  gtk_container_add (GTK_CONTAINER (dirbutton4), dirimage4);
+  dirbutton4 = lives_standard_file_button_new (TRUE,NULL);
    
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), dirbutton4, 2, 3, 7, 8,
 		    (GtkAttachOptions) (0),
 		    (GtkAttachOptions) (0), 0, 0);
 
-  dirbutton5 = gtk_button_new ();
-  gtk_widget_show (dirbutton5);
-   
-  dirimage5 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (dirimage5);
-  gtk_container_add (GTK_CONTAINER (dirbutton5), dirimage5);
+  dirbutton5 = lives_standard_file_button_new (TRUE,NULL);
   
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), dirbutton5, 2, 3, 8, 9,
 		    (GtkAttachOptions) (0),
 		    (GtkAttachOptions) (0), 0, 0);
-  
-  dirbutton6 = gtk_button_new ();
-  gtk_widget_show (dirbutton6);
-   
-  dirimage6 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
-  gtk_widget_show (dirimage6);
-  gtk_container_add (GTK_CONTAINER (dirbutton6), dirimage6);
+
+  dirbutton6 = lives_standard_file_button_new (TRUE,NULL);
    
   gtk_table_attach (GTK_TABLE (prefsw->table_right_directories), dirbutton6, 2, 3, 3, 4,
 		    (GtkAttachOptions) (0),
@@ -4093,7 +3286,6 @@
   pixbuf_directories = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_directories, _("Directories"), LIST_ENTRY_DIRECTORIES);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_directories);
 
@@ -4101,820 +3293,418 @@
   // Warnings       |
   // ---------------'
    
-  prefsw->vbox_right_warnings = gtk_vbox_new (FALSE, 10);
-  gtk_widget_show (prefsw->vbox_right_warnings);
+  prefsw->vbox_right_warnings = lives_vbox_new (FALSE, 0);
 
-  prefsw->scrollw_right_warnings = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_warnings), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
+  prefsw->scrollw_right_warnings = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_warnings);
 
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_warnings), 
-					 prefsw->vbox_right_warnings);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height);
+  // ---
+   
+  prefsw->spinbutton_warn_ds = lives_standard_spin_button_new (_("Warn if diskspace falls below: "),FALSE,
+							       (double)prefs->ds_warn_level/1000000., 
+							       (double)prefs->ds_crit_level/1000000.,
+							       DS_WARN_CRIT_MAX, 1., 10., 0,
+							       LIVES_BOX(hbox),NULL);
+   
+  label = lives_standard_label_new (_ (" MB [set to 0 to disable]"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
 
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_warnings)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_warnings)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  // ---
 
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_warnings), 20);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height);
+  // ---
    
+  prefsw->spinbutton_crit_ds = lives_standard_spin_button_new (_("Diskspace critical level: "),FALSE,
+							       (double)prefs->ds_crit_level/1000000., 0.,
+							       DS_WARN_CRIT_MAX, 1., 10., 0,
+							       LIVES_BOX(hbox),NULL);
+
+  label = lives_standard_label_new (_ (" MB [set to 0 to disable]"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
+
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_widget_show(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 20);
   // ---
-  label = gtk_label_new_with_mnemonic(_("Warn if diskspace falls below: "));
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_warnings));
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new ((gdouble)prefs->ds_warn_level/1000000., 
-				       (gdouble)prefs->ds_crit_level/1000000.,
-				       DS_WARN_CRIT_MAX, 1., 10., 0.);
-   
-  prefsw->spinbutton_warn_ds = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_warn_ds);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_warn_ds, FALSE, TRUE, 0);
-   
-  label = gtk_label_new (_ (" MB [set to 0 to disable]"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-  gtk_widget_show_all(hbox);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_fps = lives_standard_check_button_new(_("Warn on Insert / Merge if _frame rate of clipboard does not match frame rate of selection"),
+								 TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_fps), !(prefs->warning_mask&WARN_MASK_FPS));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  // ---
+  prefsw->checkbutton_warn_fsize = lives_standard_check_button_new(_("Warn on Open if file _size exceeds "),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_fsize), !(prefs->warning_mask&WARN_MASK_FSIZE));
+
+  prefsw->spinbutton_warn_fsize = lives_standard_spin_button_new (NULL,FALSE,
+								  prefs->warn_file_size, 1., 2048., 1., 10., 0,
+								  LIVES_BOX(hbox),NULL);
+
    
+  label = lives_standard_label_new (_ (" MB"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
 
   // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_save_set = lives_standard_check_button_new(_("Show a warning before saving a se_t"),
+								      TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_save_set), !(prefs->warning_mask&WARN_MASK_SAVE_SET));
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_widget_show(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 20);
   // ---
-  label = gtk_label_new_with_mnemonic(_("Diskspace critical level: "));
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
+  prefsw->checkbutton_warn_mplayer = lives_standard_check_button_new
+    (_("Show a warning if _mplayer, sox, composite or convert is not found when LiVES is started."),
+     TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mplayer), !(prefs->warning_mask&WARN_MASK_NO_MPLAYER));
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new ((gdouble)prefs->ds_crit_level/1000000., 0.,
-				       DS_WARN_CRIT_MAX, 1., 10., 0.);
-   
-  prefsw->spinbutton_crit_ds = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_crit_ds);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_crit_ds, FALSE, TRUE, 0);
-   
-  label = gtk_label_new (_ (" MB [set to 0 to disable]"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
-  gtk_widget_show_all(hbox);
+  prefsw->checkbutton_warn_rendered_fx = lives_standard_check_button_new
+    (_("Show a warning if no _rendered effects are found at startup."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_rendered_fx), !(prefs->warning_mask&WARN_MASK_RENDERED_FX));
 
 
   // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hseparator, FALSE, FALSE, 20);
 
+  prefsw->checkbutton_warn_encoders = lives_standard_check_button_new
+    (_("Show a warning if no _encoder plugins are found at startup."),
+     TRUE,LIVES_BOX(hbox),NULL);
 
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_encoders), !(prefs->warning_mask&WARN_MASK_NO_ENCODERS));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_dup_set = lives_standard_check_button_new
+    (_("Show a warning if a _duplicate set name is entered."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_dup_set), !(prefs->warning_mask&WARN_MASK_DUPLICATE_SET));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+
+  prefsw->checkbutton_warn_layout_clips = lives_standard_check_button_new
+    (_("When a set is loaded, warn if clips are missing from _layouts."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_clips), !(prefs->warning_mask&WARN_MASK_LAYOUT_MISSING_CLIPS));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_close = lives_standard_check_button_new
+    (_("Warn if a clip used in a layout is about to be closed."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_close), !(prefs->warning_mask&WARN_MASK_LAYOUT_CLOSE_FILE));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_delete = lives_standard_check_button_new
+    (_("Warn if frames used in a layout are about to be deleted."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_delete), !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_shift = lives_standard_check_button_new
+    (_("Warn if frames used in a layout are about to be shifted."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_shift), !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_alter = lives_standard_check_button_new
+    (_("Warn if frames used in a layout are about to be altered."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_alter), !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_adel = lives_standard_check_button_new
+    (_("Warn if audio used in a layout is about to be deleted."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_adel), !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO));
+
+  // ---
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_ashift = lives_standard_check_button_new
+    (_("Warn if audio used in a layout is about to be shifted."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_ashift), !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_aalt = lives_standard_check_button_new
+    (_("Warn if audio used in a layout is about to be altered."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_aalt), !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_layout_popup = lives_standard_check_button_new
+    (_("Popup layout errors after clip changes."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_popup), !(prefs->warning_mask&WARN_MASK_LAYOUT_POPUP));
+
+  // ---
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_discard_layout = lives_standard_check_button_new
+    (_("Warn if the layout has not been saved when leaving multitrack mode."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_discard_layout), !(prefs->warning_mask&WARN_MASK_EXIT_MT));
+
+  // ---
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_mt_achans = lives_standard_check_button_new
+    (_("Warn if multitrack has no audio channels, and a layout with audio is loaded."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_achans), !(prefs->warning_mask&WARN_MASK_MT_ACHANS));
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_mt_no_jack = lives_standard_check_button_new
+    (_("Warn if multitrack has audio channels, and your audio player is not \"jack\" or \"pulse audio\"."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_no_jack), !(prefs->warning_mask&WARN_MASK_MT_NO_JACK));
+
+  // ---
 
-  prefsw->checkbutton_warn_fps = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn on Insert / Merge if _frame rate of clipboard does not match frame rate of selection"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_fps);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_fps);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_fps, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_fps), !(prefs->warning_mask&WARN_MASK_FPS));
-  // ---
-  hbox100 = gtk_hbox_new(FALSE, 0);
-  gtk_widget_show(hbox100);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox100, FALSE, TRUE, 0);
-  // ---
-  prefsw->checkbutton_warn_fsize = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn on Open if file _size exceeds "));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_fsize);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_fsize);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_fsize, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox100), hbox, FALSE, TRUE, 0);
-   
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_fsize), !(prefs->warning_mask&WARN_MASK_FSIZE));
-  spinbutton_warn_fsize_adj = (GObject *)gtk_adjustment_new (prefs->warn_file_size, 1, 2048, 1, 10, 0);
-   
-  prefsw->spinbutton_warn_fsize = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_warn_fsize_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_warn_fsize);
-  gtk_box_pack_start (GTK_BOX (hbox100), prefsw->spinbutton_warn_fsize, FALSE, TRUE, 0);
-   
-  label100 = gtk_label_new (_ (" MB"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label100, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label100);
-  gtk_box_pack_start (GTK_BOX (hbox100), label100, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label100), GTK_JUSTIFY_LEFT);
-  // ---
-  prefsw->checkbutton_warn_save_set = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning before saving a se_t"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_save_set);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_save_set);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_save_set, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_save_set), !(prefs->warning_mask&WARN_MASK_SAVE_SET));
-  // ---
-  prefsw->checkbutton_warn_mplayer = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning if _mplayer, sox, composite or convert is not found when LiVES is started."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_mplayer);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_mplayer);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_mplayer, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_mplayer), !(prefs->warning_mask&WARN_MASK_NO_MPLAYER));
-  // ---
-  prefsw->checkbutton_warn_rendered_fx = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning if no _rendered effects are found at startup."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_rendered_fx);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_rendered_fx);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_rendered_fx, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_rendered_fx), !(prefs->warning_mask&WARN_MASK_RENDERED_FX));
-  // ---
-  prefsw->checkbutton_warn_encoders = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning if no _encoder plugins are found at startup."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_encoders);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_encoders);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_encoders, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_rendered_fx), !(prefs->warning_mask&WARN_MASK_NO_ENCODERS));
-  // ---
-  prefsw->checkbutton_warn_dup_set = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning if a _duplicate set name is entered."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_dup_set);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_dup_set);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_dup_set, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_dup_set), !(prefs->warning_mask&WARN_MASK_DUPLICATE_SET));
-  // ---
-  prefsw->checkbutton_warn_layout_clips = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("When a set is loaded, warn if clips are missing from _layouts."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_clips);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_clips);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_clips, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_widget_show (prefsw->checkbutton_warn_layout_clips);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_clips), !(prefs->warning_mask&WARN_MASK_LAYOUT_MISSING_CLIPS));
-  // ---
-  prefsw->checkbutton_warn_layout_close = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if a clip used in a layout is about to be closed."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_close);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_close);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_close, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_close), !(prefs->warning_mask&WARN_MASK_LAYOUT_CLOSE_FILE));
-  // ---
-  prefsw->checkbutton_warn_layout_delete = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if frames used in a layout are about to be deleted."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_delete);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_delete);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_delete, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_delete), !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES));
-  // ---
-  prefsw->checkbutton_warn_layout_shift = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if frames used in a layout are about to be shifted."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_shift);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_shift);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_shift, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_shift), !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES));
-  // ---
-  prefsw->checkbutton_warn_layout_alter = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if frames used in a layout are about to be altered."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_alter);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_alter);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_alter, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_alter), !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES));
-  // ---
-  prefsw->checkbutton_warn_layout_adel = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if audio used in a layout is about to be deleted."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_adel);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_adel);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_adel, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_adel), !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO));
-  // ---
-  prefsw->checkbutton_warn_layout_ashift = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if audio used in a layout is about to be shifted."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_ashift);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_ashift);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_ashift, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_ashift), !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO));
-  // ---
-  prefsw->checkbutton_warn_layout_aalt = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if audio used in a layout is about to be altered."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_aalt);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_aalt);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_aalt, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_aalt), !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO));
-  // ---
-  prefsw->checkbutton_warn_layout_popup = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Popup layout errors after clip changes."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_layout_popup);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_layout_popup);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_layout_popup, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_popup), !(prefs->warning_mask&WARN_MASK_LAYOUT_POPUP));
-  // ---
-  prefsw->checkbutton_warn_discard_layout = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if the layout has not been saved when leaving multitrack mode."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_discard_layout);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_discard_layout);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_discard_layout, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_discard_layout), !(prefs->warning_mask&WARN_MASK_EXIT_MT));
-  // ---
-  prefsw->checkbutton_warn_mt_achans = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if multitrack has no audio channels, and a layout with audio is loaded."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_mt_achans);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_mt_achans);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_mt_achans, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_achans), !(prefs->warning_mask&WARN_MASK_MT_ACHANS));
-  // ---
-  prefsw->checkbutton_warn_mt_no_jack = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Warn if multitrack has audio channels, and your audio player is not \"jack\" or \"pulse audio\"."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_mt_no_jack);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_mt_no_jack);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_mt_no_jack, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_no_jack), !(prefs->warning_mask&WARN_MASK_MT_NO_JACK));
-  // ---
-  prefsw->checkbutton_warn_after_dvgrab = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show info message after importing from firewire device."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_after_dvgrab);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_after_dvgrab);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_after_dvgrab, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
 #ifdef HAVE_LDVGRAB
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-#endif   
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_after_dvgrab), !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB));
-  // ---
-  prefsw->checkbutton_warn_yuv4m_open = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning before opening a yuv4mpeg stream (advanced)."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_yuv4m_open);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_yuv4m_open);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_yuv4m_open, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_after_dvgrab = lives_standard_check_button_new
+    (_("Show info message after importing from firewire device."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_after_dvgrab), !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB));
+
+#else
+  prefsw->checkbutton_warn_after_dvgrab = NULL;
+#endif
+
+  // ---
+
 #ifdef HAVE_YUV4MPEG
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-#endif   
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_yuv4m_open), !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M));
-  // ---
-  prefsw->checkbutton_warn_mt_backup_space = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning when multitrack is low on backup space."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_mt_backup_space);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_mt_backup_space);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_mt_backup_space, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_backup_space), !(prefs->warning_mask&WARN_MASK_MT_BACKUP_SPACE));
-  // ---
-  prefsw->checkbutton_warn_after_crash = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning advising cleaning of disk space after a crash."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_after_crash);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_after_crash);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_after_crash, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_after_crash), !(prefs->warning_mask&WARN_MASK_CLEAN_AFTER_CRASH));
-
-  // ---
-  prefsw->checkbutton_warn_no_pulse = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Show a warning if unable to connect to pulseaudio player."));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_warn_no_pulse);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_warn_no_pulse);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_warn_no_pulse, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 0);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, TRUE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_warn_no_pulse), !(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT));
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_yuv4m_open = lives_standard_check_button_new
+    (_("Show a warning before opening a yuv4mpeg stream (advanced)."),
+     TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_yuv4m_open), !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M));
+#else
+  prefsw->checkbutton_warn_yuv4m_open = NULL;
+#endif
+
+
   // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
+  prefsw->checkbutton_warn_mt_backup_space = lives_standard_check_button_new
+    (_("Show a warning when multitrack is low on backup space."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_backup_space), !(prefs->warning_mask&WARN_MASK_MT_BACKUP_SPACE));
+
+  // ---
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_after_crash = lives_standard_check_button_new
+    (_("Show a warning advising cleaning of disk space after a crash."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_after_crash), !(prefs->warning_mask&WARN_MASK_CLEAN_AFTER_CRASH));
+
+  // ---
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+
+  prefsw->checkbutton_warn_no_pulse = lives_standard_check_button_new
+    (_("Show a warning if unable to connect to pulseaudio player."),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_no_pulse), !(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT));
+
+  // ---
 
 
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_warning.png", NULL);
   pixbuf_warnings = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_warnings, _("Warnings"), LIST_ENTRY_WARNINGS);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_warnings);
 
+
   // -----------,
   // Misc       |
   // -----------'
    
-  prefsw->vbox_right_misc = gtk_vbox_new (FALSE, 10);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_misc), 20);
-   
-  prefsw->scrollw_right_misc = gtk_scrolled_window_new (NULL, NULL);
+  prefsw->vbox_right_misc = lives_vbox_new (FALSE, widget_opts.packing_height*4);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_misc), widget_opts.border_width*2);
    
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_misc), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_misc), prefsw->vbox_right_misc);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_misc)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_misc)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_misc = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_misc);
 
-  prefsw->check_midi = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Midi synch (requires the files midistart and midistop)"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->check_midi);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->check_midi);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->check_midi, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, 16);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->check_midi), prefs->midisynch);
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+
+  prefsw->check_midi = lives_standard_check_button_new
+    (_("Midi synch (requires the files midistart and midistop)"),
+     TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->check_midi), prefs->midisynch);
 
   gtk_widget_set_sensitive(prefsw->check_midi,capable->has_midistartstop);
-  gtk_widget_set_sensitive(label,capable->has_midistartstop);
+
+
    
-  hbox99 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox99);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox99, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
    
-  label97 = gtk_label_new (_("When inserting/merging frames:  "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label97, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label97);
-  gtk_box_pack_start (GTK_BOX (hbox99), label97, FALSE, FALSE, 16);
-  gtk_label_set_justify (GTK_LABEL (label97), GTK_JUSTIFY_LEFT);
-   
-  prefsw->ins_speed = gtk_radio_button_new(rb_group2);
-  rb_group2 = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->ins_speed));
-  label = gtk_label_new_with_mnemonic(_("_Speed Up/Slow Down Insertion"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->ins_speed);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->ins_speed);
-  gtk_box_pack_start (GTK_BOX (hbox99), prefsw->ins_speed, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (hbox99), eventbox, FALSE, FALSE, 5);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  // ---
-  ins_resample = gtk_radio_button_new(rb_group2);
-  rb_group2 = gtk_radio_button_get_group (GTK_RADIO_BUTTON (ins_resample));
-  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(ins_resample),prefs->ins_resample);
-  label = gtk_label_new_with_mnemonic(_("_Resample Insertion"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->ins_speed);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), ins_resample);
-  gtk_box_pack_start (GTK_BOX (hbox99), ins_resample, FALSE, FALSE, 5);
-  gtk_box_pack_start (GTK_BOX (hbox99), eventbox, FALSE, FALSE, 5);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_container_set_border_width(GTK_CONTAINER (hbox99), 20);
-  gtk_widget_show_all(hbox99);
-  // ---
-  prefsw->check_xmms_pause = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Pause xmms during audio playback"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->check_xmms_pause);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->check_xmms_pause);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->check_xmms_pause, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX(prefsw->vbox_right_misc), hbox, FALSE, FALSE, 10);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->check_xmms_pause), prefs->pause_xmms);
-   
-  if (capable->has_xmms) {
-    gtk_widget_show_all(hbox);
-  }
-  // ---  
-  hbox19 = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox19, TRUE, TRUE, 0);
-   
-  label134 = gtk_label_new (_("CD device           "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label134, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label134);
-  gtk_box_pack_start (GTK_BOX (hbox19), label134, FALSE, FALSE, 18);
-  gtk_label_set_justify (GTK_LABEL (label134), GTK_JUSTIFY_LEFT);
-   
-  prefsw->cdplay_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->cdplay_entry),255);
-  gtk_box_pack_start (GTK_BOX (hbox19), prefsw->cdplay_entry, TRUE, TRUE, 20);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox19), vbox2, FALSE, TRUE, 0);
-  add_fill_to_box (GTK_BOX (vbox2));
-  gtk_widget_show (vbox2);
-
-  buttond = gtk_file_chooser_button_new(_("LiVES: Choose CD device"),GTK_FILE_CHOOSER_ACTION_OPEN);
-  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(buttond),LIVES_DEVICE_DIR);
-  gtk_box_pack_start(GTK_BOX(vbox2),buttond,TRUE,FALSE,0);
-  gtk_widget_show (buttond);
-  add_fill_to_box (GTK_BOX (vbox2));
-  gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(buttond),16);
-
-  g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",
-		    G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->cdplay_entry);
-
-  if (capable->has_cdda2wav) {
-    gtk_widget_show (prefsw->cdplay_entry);
-    gtk_widget_show (hbox19);
-  }
-  else {
-    gtk_widget_hide (prefsw->cdplay_entry);
-    gtk_widget_hide (hbox19);
-  }
+  label = lives_standard_label_new (_("When inserting/merging frames:  "));
+
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width*2);
    
-  // get from prefs
-  gtk_entry_set_text(GTK_ENTRY(prefsw->cdplay_entry),(tmp=g_filename_to_utf8(prefs->cdplay_device,-1,NULL,NULL,NULL)));
-  g_free(tmp);
+  prefsw->ins_speed = lives_standard_radio_button_new(_("_Speed Up/Slow Down Insertion"),TRUE,rb_group2,LIVES_BOX(hbox),NULL);
+  rb_group2 = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->ins_speed));
+
+  // ---
+  ins_resample = lives_standard_radio_button_new(_("_Resample Insertion"),TRUE,rb_group2,LIVES_BOX(hbox),NULL);
+
+  // ---
+
+  prefsw->cdda_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), prefsw->cdda_hbox, FALSE, FALSE, widget_opts.packing_height);
    
-  gtk_widget_set_tooltip_text( prefsw->cdplay_entry, _("LiVES can load audio tracks from this CD"));
+  prefsw->cdplay_entry = lives_standard_entry_new ((tmp=g_strdup(_("CD device           "))),FALSE,
+						   (tmp2=g_filename_to_utf8(prefs->cdplay_device,-1,NULL,NULL,NULL)),
+						   -1,PATH_MAX,LIVES_BOX(prefsw->cdda_hbox),
+						   (tmp3=g_strdup(_("LiVES can load audio tracks from this CD"))));
+  g_free(tmp); g_free(tmp2); g_free(tmp3);
+
+  buttond = lives_standard_file_button_new (FALSE,LIVES_DEVICE_DIR);
+  gtk_box_pack_start(GTK_BOX(prefsw->cdda_hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
+  
+  g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)prefsw->cdplay_entry);
+
+
    
-  hbox13 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox13);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox13, TRUE, TRUE, 0);
-   
-  label44 = gtk_label_new (_("Default FPS        "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label44, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label44);
-  gtk_box_pack_start (GTK_BOX (hbox13), label44, FALSE, FALSE, 18);
-  gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_LEFT);
-   
-  spinbutton_def_fps_adj = (GObject *)gtk_adjustment_new (prefs->default_fps, 1, 2048, 1, 10, 0);
-   
-  prefsw->spinbutton_def_fps = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_def_fps_adj), 1, 2);
-  gtk_widget_show (prefsw->spinbutton_def_fps);
-  gtk_box_pack_start (GTK_BOX (hbox13), prefsw->spinbutton_def_fps, FALSE, TRUE, 0);
-  gtk_widget_set_tooltip_text( prefsw->spinbutton_def_fps, _("Frames per second to use when none is specified"));
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
    
+  prefsw->spinbutton_def_fps = lives_standard_spin_button_new ((tmp=g_strdup(_("Default FPS        "))),TRUE,
+							  prefs->default_fps, 1., FPS_MAX, 1., 1., 3,
+							  LIVES_BOX(hbox),
+							  (tmp2=g_strdup(_("Frames per second to use when none is specified"))));
+
+
   icon = g_strdup_printf("%s%s/pref_misc.png", prefs->prefix_dir, ICON_DIR);
   pixbuf_misc = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_misc, _("Misc"), LIST_ENTRY_MISC);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
 
+
+  if (!capable->has_cdda2wav) {
+    gtk_widget_hide (prefsw->cdda_hbox);
+  }
+   
+
   // -----------,
   // Themes     |
   // -----------'
    
-  prefsw->vbox_right_themes = gtk_vbox_new (FALSE, 10);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_themes), 20);
-   
-  prefsw->scrollw_right_themes = gtk_scrolled_window_new (NULL, NULL);
+  prefsw->vbox_right_themes = lives_vbox_new (FALSE, widget_opts.packing_height);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_themes), widget_opts.border_width*2);
    
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_themes), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-   
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_themes), prefsw->vbox_right_themes);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_themes)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_themes)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_themes = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_themes);
 
-  hbox93 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox93);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_themes), hbox93, TRUE, FALSE, 0);
-   
-  label94 = gtk_label_new (_("New theme:           "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label94, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label94);
-  gtk_box_pack_start (GTK_BOX (hbox93), label94, FALSE, FALSE, 40);
-  gtk_label_set_justify (GTK_LABEL (label94), GTK_JUSTIFY_LEFT);
-   
-  prefsw->theme_combo = gtk_combo_box_new_text();
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_themes), hbox, TRUE, FALSE, widget_opts.packing_height);
    
   // scan for themes
   themes = get_plugin_list(PLUGIN_THEMES, TRUE, NULL, NULL);
-  themes = g_list_prepend(themes, g_strdup(mainw->none_string));
-   
-  populate_combo_box(GTK_COMBO_BOX(prefsw->theme_combo), themes);
+  themes = g_list_prepend(themes, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
 
-  gtk_box_pack_start (GTK_BOX (hbox93), prefsw->theme_combo, FALSE, FALSE, 0);
-  gtk_widget_show(prefsw->theme_combo);
+  prefsw->theme_combo = lives_standard_combo_new(_("New theme:           "),FALSE,themes,LIVES_BOX(hbox),NULL);
+   
    
-  if (strcasecmp(future_prefs->theme, "none")) {
+  if (g_ascii_strcasecmp(future_prefs->theme, "none")) {
     theme = g_strdup(future_prefs->theme);
   }
-  else theme = g_strdup(mainw->none_string);
+  else theme = g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
   // ---
-  set_combo_box_active_string(GTK_COMBO_BOX(prefsw->theme_combo), theme);
+  lives_combo_set_active_string(LIVES_COMBO(prefsw->theme_combo), theme);
   //---
   g_free(theme);
   g_list_free_strings (themes);
@@ -4924,7 +3714,6 @@
   pixbuf_themes = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_themes, _("Themes"), LIST_ENTRY_THEMES);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_themes);
 
@@ -4932,114 +3721,52 @@
   // streaming/networking      |
   // --------------------------'
 
-  prefsw->vbox_right_net = gtk_vbox_new (FALSE, 10);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_net), 20);
+  prefsw->vbox_right_net = lives_vbox_new (FALSE, widget_opts.packing_height*4);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_net), widget_opts.border_width);
 
-  prefsw->scrollw_right_net = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_net), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-   
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_net), prefsw->vbox_right_net);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_net)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_net)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_net = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_net);
 
-  hbox94 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox94);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hbox94, FALSE, FALSE, 20);
-   
-  label88 = gtk_label_new (_("Download bandwidth (Kb/s)       "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label88, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label88);
-  gtk_box_pack_start (GTK_BOX (hbox94), label88, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label88), GTK_JUSTIFY_LEFT);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hbox, FALSE, FALSE, widget_opts.packing_height);
    
-  spinbutton_bwidth_adj = (GObject *)gtk_adjustment_new (prefs->dl_bandwidth, 0, 100000, 1, 10, 0);
-   
-  prefsw->spinbutton_bwidth = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_bwidth_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_bwidth);
-  gtk_box_pack_start (GTK_BOX (hbox94), prefsw->spinbutton_bwidth, FALSE, TRUE, 0);
+  prefsw->spinbutton_bwidth = lives_standard_spin_button_new (_("Download bandwidth (Kb/s)       "),FALSE,
+							      prefs->dl_bandwidth, 0, 100000, 1, 10, 0,
+							      LIVES_BOX(hbox),NULL);
+
    
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hseparator, FALSE, FALSE, 20);
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_net));
    
 #ifndef ENABLE_OSC
-  label = gtk_label_new (_("LiVES must be compiled without \"configure --disable-OSC\" to use OMC"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), label, FALSE, FALSE, 0);
+  label = lives_standard_label_new (_("LiVES must be compiled without \"configure --disable-OSC\" to use OMC"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), label, FALSE, FALSE, widget_opts->packing_height);
 #endif
    
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hbox1, FALSE, FALSE, 20);
-   
-  prefsw->enable_OSC = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("OMC remote control enabled"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->enable_OSC);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->enable_OSC);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->enable_OSC, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
+  hbox1 = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hbox1, FALSE, FALSE, widget_opts.packing_height);
+
+  hbox = lives_hbox_new (FALSE, 0);
   gtk_box_pack_start(GTK_BOX (hbox1), hbox, FALSE, FALSE, 0);
+   
+  prefsw->enable_OSC = lives_standard_check_button_new(_("OMC remote control enabled"),FALSE,LIVES_BOX(hbox),NULL);
+
+
 #ifndef ENABLE_OSC
   gtk_widget_set_sensitive (prefsw->enable_OSC,FALSE);
-  gtk_widget_set_sensitive (label,FALSE);
 #endif
   // ---
-  label = gtk_label_new (_("UDP port       "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 20);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-   
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->osc_udp_port, 1, 65535, 1, 10, 0);
-   
-  prefsw->spinbutton_osc_udp = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (prefsw->spinbutton_osc_udp);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_osc_udp, FALSE, TRUE, 0);
-  // ---
-  prefsw->enable_OSC_start = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Start OMC on startup"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->enable_OSC_start);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->enable_OSC_start);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->enable_OSC_start, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hbox, FALSE, FALSE, 20);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->enable_OSC_start), future_prefs->osc_start);
+
+  prefsw->spinbutton_osc_udp = lives_standard_spin_button_new (_("UDP port       "),FALSE,
+							       prefs->osc_udp_port, 1., 65535., 1., 10., 0,
+							       LIVES_BOX(hbox),NULL);
+
+
+  // ---
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_net), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->enable_OSC_start = lives_standard_check_button_new(_("Start OMC on startup"),FALSE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->enable_OSC_start), future_prefs->osc_start);
    
 #ifndef ENABLE_OSC
   gtk_widget_set_sensitive (prefsw->spinbutton_osc_udp,FALSE);
@@ -5047,7 +3774,7 @@
   gtk_widget_set_sensitive (label,FALSE);
 #else
   if (prefs->osc_udp_started) {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->enable_OSC), TRUE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->enable_OSC), TRUE);
     gtk_widget_set_sensitive (prefsw->spinbutton_osc_udp,FALSE);
     gtk_widget_set_sensitive (prefsw->enable_OSC,FALSE);
   }
@@ -5057,320 +3784,145 @@
   pixbuf_net = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_net, _("Streaming/Networking"), LIST_ENTRY_NET);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_net);
-
    
   // ----------,
   // jack      |
   // ----------'
 
-  prefsw->vbox_right_jack = gtk_vbox_new (FALSE, 20);
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_jack), 20);
+  prefsw->vbox_right_jack = lives_vbox_new (FALSE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_jack), widget_opts.packing_width*2);
 
-  prefsw->scrollw_right_jack = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_jack), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-   
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_jack), prefsw->vbox_right_jack);
-   
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_jack)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_jack)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  prefsw->scrollw_right_jack = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_jack);
 
+  label = lives_standard_label_new (_("Jack transport"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
-  label = gtk_label_new (_("Jack transport"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, 10);
-
-  prefsw->jack_tserver_entry = gtk_entry_new ();
-  prefsw->checkbutton_start_tjack = gtk_check_button_new();
-  prefsw->checkbutton_jack_master = gtk_check_button_new();
-  prefsw->checkbutton_jack_client = gtk_check_button_new();
-  prefsw->checkbutton_jack_tb_start = gtk_check_button_new();
-  prefsw->checkbutton_jack_tb_client = gtk_check_button_new();
-   
 #ifndef ENABLE_JACK_TRANSPORT
-  label = gtk_label_new (_("LiVES must be compiled with jack/transport.h and jack/jack.h present to use jack transport"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, 10);
+  label = lives_standard_label_new (_("LiVES must be compiled with jack/transport.h and jack/jack.h present to use jack transport"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 #else
-  hbox1 = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox1);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox1, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  label = gtk_label_new_with_mnemonic (_("Jack _transport config file"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 10);
+  prefsw->jack_tserver_entry = lives_standard_entry_new (_("Jack _transport config file"),TRUE,prefs->jack_tserver,-1,255,LIVES_BOX(hbox),NULL);
 
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->jack_tserver_entry),255);
+  gtk_widget_set_sensitive(prefsw->jack_tserver_entry,FALSE); // unused for now
 
-  gtk_entry_set_text(GTK_ENTRY(prefsw->jack_tserver_entry),prefs->jack_tserver);
-  gtk_widget_set_sensitive(prefsw->jack_tserver_entry,FALSE);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->jack_tserver_entry);
-
-  gtk_widget_show (prefsw->jack_tserver_entry);
-  gtk_box_pack_start (GTK_BOX (hbox1), prefsw->jack_tserver_entry, FALSE, FALSE, 0);
-  gtk_widget_set_tooltip_text( prefsw->jack_tserver_entry, _("The name of the jack server which can control LiVES transport"));
-
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Start _server on LiVES startup"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_start_tjack);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_start_tjack);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_start_tjack, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox1), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_start_tjack), 
+
+  // -
+
+  prefsw->checkbutton_start_tjack=lives_standard_check_button_new(_("Start _server on LiVES startup"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_start_tjack), 
 				(future_prefs->jack_opts&JACK_OPTS_START_TSERVER)?TRUE:FALSE);
+
+
+
   // ---
-  hbox2 = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox2);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox2, TRUE, TRUE, 0);
-  // ---
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Jack transport _master (start and stop)"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_jack_master);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_jack_master);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_jack_master, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_master), 
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  // ---
+
+  prefsw->checkbutton_jack_master=lives_standard_check_button_new(_("Jack transport _master (start and stop)"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_master), 
 				(future_prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER)?TRUE:FALSE);
+
+
   // ---
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Jack transport _client (start and stop)"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_jack_client);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_jack_client);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_jack_client, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox2), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_client), 
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_jack_client=lives_standard_check_button_new(_("Jack transport _client (start and stop)"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_client), 
 				(future_prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)?TRUE:FALSE);
-  // ---
-  hbox3 = gtk_hbox_new (FALSE,0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox3, TRUE, TRUE, 0);
-  add_fill_to_box(GTK_BOX(hbox3));
-  // ---
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Jack transport sets start position"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_jack_tb_start);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_jack_tb_start);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_jack_tb_start, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_start),
-				(future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?
-				(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_client))):FALSE);
 
-  gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_start, 
-			   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_client)));
-  gtk_widget_set_sensitive(label, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_client)));
 
   g_signal_connect_after (GTK_OBJECT (prefsw->checkbutton_jack_client), "toggled",
 			  G_CALLBACK (after_jack_client_toggled),
 			  NULL);
   // ---
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Jack transport timebase slave"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_jack_tb_client);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_jack_tb_client);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_jack_tb_client, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox3), hbox, TRUE, FALSE, 0);
-   
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_client), 
-				(future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?
-				(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start))):FALSE);
 
-  gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_client, 
-			   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start)));
-  gtk_widget_set_sensitive(label, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start)));
-  // ---
-  label = gtk_label_new (_("(See also Playback -> Audio follows video rate/direction)"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, 10);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_jack_tb_start=lives_standard_check_button_new(_("Jack transport sets start position"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_start),
+				(future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?
+				(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client))):FALSE);
+
+  gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_start, 
+			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client)));
 
   g_signal_connect_after (GTK_OBJECT (prefsw->checkbutton_jack_tb_start), "toggled",
 			  G_CALLBACK (after_jack_tb_start_toggled),
 			  NULL);
 
-  //add_fill_to_box(GTK_BOX(hbox));
-  //gtk_widget_show_all (hbox);
+  // ---
+
+  add_fill_to_box(LIVES_BOX(hbox));
+
+  prefsw->checkbutton_jack_tb_client=lives_standard_check_button_new(_("Jack transport timebase slave"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_client), 
+				(future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?
+				(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start))):FALSE);
+
+  gtk_widget_set_sensitive(prefsw->checkbutton_jack_tb_client, 
+			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start)));
+
+
+  // ---
+  label = lives_standard_label_new (_("(See also Playback -> Audio follows video rate/direction)"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
 #endif
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_jack));
 
-  label = gtk_label_new (_("Jack audio"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, 10);
+
+  label = lives_standard_label_new (_("Jack audio"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifndef ENABLE_JACK
-  label = gtk_label_new (_("LiVES must be compiled with jack/jack.h present to use jack audio"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, 10);
+  label = lives_standard_label_new (_("LiVES must be compiled with jack/jack.h present to use jack audio"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 #else
-  label = gtk_label_new (_("You MUST set the audio player to \"jack\" in the Playback tab to use jack audio"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, 10);
-
-  hbox4 = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox4);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox4, TRUE, TRUE, 0);
+  label = lives_standard_label_new (_("You MUST set the audio player to \"jack\" in the Playback tab to use jack audio"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
-  label = gtk_label_new_with_mnemonic (_("Jack _audio server config file"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox4), label, FALSE, FALSE, 10);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->jack_aserver_entry = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->jack_aserver_entry),255);
+  prefsw->jack_aserver_entry = lives_standard_entry_new (_("Jack _audio server config file"),TRUE,prefs->jack_aserver,-1,255,LIVES_BOX(hbox),NULL);
 
-  gtk_entry_set_text(GTK_ENTRY(prefsw->jack_aserver_entry),prefs->jack_aserver);
   gtk_widget_set_sensitive(prefsw->jack_aserver_entry,FALSE);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->jack_aserver_entry);
 
-  gtk_widget_show (prefsw->jack_aserver_entry);
-  gtk_box_pack_start (GTK_BOX (hbox4), prefsw->jack_aserver_entry, FALSE, FALSE, 0);
-  gtk_widget_set_tooltip_text( prefsw->jack_aserver_entry, _("The name of the jack server for audio"));
-  // ---
-  hbox5 = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox5);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox5, TRUE, TRUE, 0);
-  // ---
-  prefsw->checkbutton_start_ajack = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Start _server on LiVES startup"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_start_ajack);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_start_ajack);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_start_ajack, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox5), hbox, TRUE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_start_ajack), 
+  // ---
+  prefsw->checkbutton_start_ajack = lives_standard_check_button_new(_("Start _server on LiVES startup"),TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_start_ajack), 
 				(future_prefs->jack_opts&JACK_OPTS_START_ASERVER)?TRUE:FALSE);
   // ---
-  prefsw->checkbutton_jack_pwp = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("Play audio even when transport is _paused"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_jack_pwp);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_jack_pwp);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_jack_pwp, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 10);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start (GTK_BOX (hbox5), hbox, TRUE, FALSE, 0);
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_jack_pwp = lives_standard_check_button_new(_("Play audio even when transport is _paused"),TRUE,LIVES_BOX(hbox),NULL);
    
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_jack_pwp), 
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_pwp), 
 				(future_prefs->jack_opts&JACK_OPTS_NOPLAY_WHEN_PAUSED)?FALSE:TRUE);
 
   gtk_widget_set_sensitive (prefsw->checkbutton_jack_pwp, prefs->audio_player==AUD_PLAYER_JACK);
-  gtk_widget_set_sensitive (label, prefs->audio_player==AUD_PLAYER_JACK);
+
 #endif
 
   icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_jack.png", NULL);
   pixbuf_jack = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_jack, _("Jack Integration"), LIST_ENTRY_JACK);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_jack);
 
@@ -5379,257 +3931,120 @@
   // ----------------------'
 
 
-  // TODO - copy pattern to all
-  prefsw->vbox_right_midi = gtk_vbox_new (FALSE, 10);
+  prefsw->vbox_right_midi = lives_vbox_new (FALSE, 0);
 
-  prefsw->scrollw_right_midi = gtk_scrolled_window_new (NULL, NULL);
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_midi), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (prefsw->scrollw_right_midi), prefsw->vbox_right_midi);
+  prefsw->scrollw_right_midi = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_midi);
 
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(prefsw->scrollw_right_midi)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(prefsw->scrollw_right_midi)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_midi), widget_opts.border_width*2);
 
-  gtk_container_set_border_width (GTK_CONTAINER (prefsw->vbox_right_midi), 20);
-
-  label = gtk_label_new (_("Events to respond to:"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, 10);
+  label = lives_standard_label_new (_("Events to respond to:"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
-  prefsw->checkbutton_omc_js = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("_Joystick events"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_omc_js);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->checkbutton_omc_js);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_omc_js, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_omc_js), prefs->omc_dev_opts&OMC_DEV_JS);
-  // ---
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, TRUE, TRUE, 0);
-  gtk_widget_show (hbox);
-   
-  label = gtk_label_new_with_mnemonic (_("_Joystick device"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 18);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-
-  prefsw->omc_js_entry = gtk_entry_new ();
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->omc_js_entry);
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->omc_js_entry),255);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->omc_js_entry, TRUE, TRUE, 20);
-  gtk_widget_show (prefsw->omc_js_entry);
-  if (strlen(prefs->omc_js_fname)!=0) gtk_entry_set_text (GTK_ENTRY (prefsw->omc_js_entry),prefs->omc_js_fname);
-   
-  gtk_widget_set_tooltip_text( prefsw->omc_js_entry, _("The joystick device, e.g. /dev/input/js0"));
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, TRUE, 0);
-  gtk_widget_show (vbox2);
-  add_fill_to_box (GTK_BOX (vbox2));
-
-  buttond = gtk_file_chooser_button_new(_("LiVES: Choose joystick device"),GTK_FILE_CHOOSER_ACTION_OPEN);
-  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(buttond),LIVES_DEVICE_DIR);
-  gtk_box_pack_start(GTK_BOX(vbox2),buttond,TRUE,FALSE,0);
-  gtk_widget_show (buttond);
-  add_fill_to_box (GTK_BOX (vbox2));
-  gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(buttond),16);
-   
-  g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",G_CALLBACK (on_fileread_clicked),
-		    (gpointer)prefsw->omc_js_entry);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_omc_js = lives_standard_check_button_new(_("_Joystick events"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_omc_js), prefs->omc_dev_opts&OMC_DEV_JS);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->omc_js_entry = lives_standard_entry_new ((tmp=g_strdup(_("_Joystick device")))
+						    ,TRUE,prefs->omc_js_fname,-1,PATH_MAX,LIVES_BOX(hbox),
+						    (tmp2=g_strdup(_("The joystick device, e.g. /dev/input/js0"))));
+  g_free(tmp); g_free(tmp2);
+
+  buttond = lives_standard_file_button_new (FALSE,LIVES_DEVICE_DIR);
+  gtk_box_pack_start(GTK_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
+
+  g_signal_connect(buttond, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)prefsw->omc_js_entry);
+
+#ifdef OMC_MIDI_IMPL
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_midi));
+#endif
 
 #endif
 
 #ifdef OMC_MIDI_IMPL
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->checkbutton_omc_midi = lives_standard_check_button_new(_("_MIDI events"),TRUE,LIVES_BOX(hbox),NULL);
+
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_omc_midi), prefs->omc_dev_opts&OMC_DEV_MIDI);
 
-  prefsw->checkbutton_omc_midi = gtk_check_button_new();
-  eventbox = gtk_event_box_new();
-  label = gtk_label_new_with_mnemonic(_("_MIDI events"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->checkbutton_omc_midi);
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), 
-		   prefsw->checkbutton_omc_midi);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), prefsw->checkbutton_omc_midi, FALSE, FALSE, 5);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 5);
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefsw->checkbutton_omc_midi), prefs->omc_dev_opts&OMC_DEV_MIDI);
   // ---
-  hbox1 = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox1, TRUE, TRUE, 20);
 
-#ifdef ALSA_MIDI
-  gtk_widget_show (hbox1);
-#endif
+  prefsw->midi_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), prefsw->midi_hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->alsa_midi = gtk_radio_button_new(alsa_midi_group);
-  alsa_midi_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (prefsw->alsa_midi));
-  gtk_widget_set_tooltip_text( prefsw->alsa_midi, 
-			       (_("Create an ALSA MIDI port which other MIDI devices can be connected to")));
-  label = gtk_label_new_with_mnemonic(_("Use _ALSA MIDI (recommended)"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), prefsw->alsa_midi);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), prefsw->alsa_midi);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->alsa_midi, FALSE, FALSE, 10);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 10);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_widget_show_all(hbox);
-  gtk_box_pack_start(GTK_BOX(hbox1), hbox, TRUE, TRUE, 0);
-  // ---
-  raw_midi_button = gtk_radio_button_new(alsa_midi_group);
-  alsa_midi_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (raw_midi_button));
-  label = gtk_label_new_with_mnemonic(_("Use _raw MIDI"));
-  gtk_label_set_mnemonic_widget(GTK_LABEL(label), raw_midi_button);
-  eventbox = gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox), label);
-  g_signal_connect(GTK_OBJECT(eventbox), "button_press_event", G_CALLBACK(label_act_toggle), raw_midi_button);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(hbox), raw_midi_button, TRUE, TRUE, 10);
-  gtk_box_pack_start(GTK_BOX(hbox), eventbox, FALSE, FALSE, 10);
-  gtk_widget_set_tooltip_text( raw_midi_button, (_("Read directly from the MIDI device")));
-  gtk_widget_show_all(hbox);
-  gtk_container_set_border_width(GTK_CONTAINER (hbox), 20);
-  gtk_box_pack_start (GTK_BOX (hbox1), hbox, TRUE, TRUE, 0);
+  prefsw->alsa_midi = lives_standard_radio_button_new((tmp=g_strdup(_("Use _ALSA MIDI (recommended)"))),TRUE,alsa_midi_group,
+						      LIVES_BOX(prefsw->midi_hbox),
+						      (tmp2=g_strdup(_("Create an ALSA MIDI port which other MIDI devices can be connected to"))));
+
+  g_free(tmp); g_free(tmp2);
+
+  alsa_midi_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->alsa_midi));
+
+  // ---
+
+  raw_midi_button = lives_standard_radio_button_new((tmp=g_strdup(_("Use _raw MIDI"))),TRUE,alsa_midi_group,
+						    LIVES_BOX(prefsw->midi_hbox),
+						    (tmp2=g_strdup(_("Read directly from the MIDI device"))));
+
+  g_free(tmp); g_free(tmp2);
 
 #ifdef ALSA_MIDI
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (raw_midi_button),!prefs->use_alsa_midi);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (raw_midi_button),!prefs->use_alsa_midi);
 #endif
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, TRUE, TRUE, 0);
-  gtk_widget_show (hbox);
+
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
    
-  label = gtk_label_new_with_mnemonic (_("_MIDI device"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 18);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-   
-  prefsw->omc_midi_entry = gtk_entry_new ();
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->omc_midi_entry);
-  gtk_entry_set_max_length(GTK_ENTRY(prefsw->omc_midi_entry),255);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->omc_midi_entry, TRUE, TRUE, 20);
-  gtk_widget_show (prefsw->omc_midi_entry);
-  if (strlen(prefs->omc_midi_fname)!=0) gtk_entry_set_text (GTK_ENTRY (prefsw->omc_midi_entry),prefs->omc_midi_fname);
-
-  gtk_widget_set_tooltip_text( prefsw->omc_midi_entry, _("The MIDI device, e.g. /dev/input/midi0"));
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, TRUE, 0);
-  gtk_widget_show (vbox2);
-  add_fill_to_box (GTK_BOX (vbox2));
-
-  prefsw->button_midid = gtk_file_chooser_button_new(_("LiVES: Choose MIDI device"),GTK_FILE_CHOOSER_ACTION_OPEN);
-  gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(prefsw->button_midid),LIVES_DEVICE_DIR);
-  gtk_box_pack_start(GTK_BOX(vbox2),prefsw->button_midid,TRUE,FALSE,0);
+  prefsw->omc_midi_entry = lives_standard_entry_new ((tmp=g_strdup(_("_MIDI device"))),TRUE,prefs->omc_midi_fname,
+						     -1,PATH_MAX,LIVES_BOX(hbox),
+						     (tmp2=g_strdup(_("The MIDI device, e.g. /dev/input/midi0"))));
+
+  g_free(tmp); g_free(tmp2);
+
+  prefsw->button_midid = lives_standard_file_button_new (FALSE,LIVES_DEVICE_DIR);
+  gtk_box_pack_start(GTK_BOX(hbox),prefsw->button_midid,FALSE,FALSE,widget_opts.packing_width);
   gtk_widget_show (prefsw->button_midid);
-  add_fill_to_box (GTK_BOX (vbox2));
-  gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(prefsw->button_midid),16);
 
-  g_signal_connect (GTK_FILE_CHOOSER(buttond), "selection-changed",
-		    G_CALLBACK (on_fileread_clicked),(gpointer)prefsw->omc_midi_entry);
+  g_signal_connect(prefsw->button_midid, "clicked", G_CALLBACK (on_filesel_button_clicked), (gpointer)prefsw->omc_midi_entry);
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(hseparator, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hseparator, FALSE, TRUE, 10);
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_midi));
    
-  label = gtk_label_new (_("Advanced"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, 10);
+  label = lives_standard_label_new (_("Advanced"));
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, TRUE, TRUE, 0);
-   
-  label = gtk_label_new_with_mnemonic (_("MIDI check _rate"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-   
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->midi_check_rate, 1, 2000, 10, 100, 0);
-   
-  prefsw->spinbutton_midicr = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 10, 0);
-  gtk_widget_show (prefsw->spinbutton_midicr);
-  gtk_box_pack_start (GTK_BOX (hbox), prefsw->spinbutton_midicr, FALSE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->spinbutton_midicr);
-  gtk_widget_set_tooltip_text( prefsw->spinbutton_midicr, _("Number of MIDI checks per keyboard tick. Increasing this may improve MIDI responsiveness, but may slow down playback."));
+  hbox = lives_hbox_new (FALSE,0);
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  label = gtk_label_new_with_mnemonic (_("MIDI repeat"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-   
-  spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->midi_rpt, 1, 10000, 100, 1000, 0);
+  prefsw->spinbutton_midicr = lives_standard_spin_button_new ((tmp=g_strdup(_("MIDI check _rate"))),TRUE,
+							      prefs->midi_check_rate, 1., 2000., 10., 100., 0,
+							      LIVES_BOX(hbox),
+							      (tmp2=g_strdup(_("Number of MIDI checks per keyboard tick. Increasing this may improve MIDI responsiveness, but may slow down playback."))));
+
+  g_free(tmp); g_free(tmp2);
+
+
+  add_fill_to_box(LIVES_BOX(hbox));
    
-  prefsw->spinbutton_midirpt = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 100, 0);
-  gtk_widget_show (prefsw->spinbutton_midirpt);
-  gtk_box_pack_end (GTK_BOX (hbox), prefsw->spinbutton_midirpt, FALSE, TRUE, 0);
-  gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),prefsw->spinbutton_midirpt);
-  gtk_widget_set_tooltip_text( prefsw->spinbutton_midirpt, _("Number of non-reads allowed between succesive reads."));
-  //
-  hbox = gtk_hbox_new (FALSE,0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), hbox, TRUE, TRUE, 0);
+  prefsw->spinbutton_midirpt = lives_standard_spin_button_new ((tmp=g_strdup(_("MIDI repeat"))),FALSE,
+							       prefs->midi_rpt, 1., 10000., 100., 1000., 0,
+							       LIVES_BOX(hbox),
+							       (tmp2=g_strdup(_("Number of non-reads allowed between succesive reads."))));
+  g_free(tmp); g_free(tmp2);
 
-  label = gtk_label_new (_("(Warning: setting this value too high can slow down playback.)"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  label = lives_standard_label_new (_("(Warning: setting this value too high can slow down playback.)"));
+
+  gtk_box_pack_start (GTK_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifdef ALSA_MIDI
   g_signal_connect (GTK_OBJECT (prefsw->alsa_midi), "toggled",
@@ -5646,42 +4061,38 @@
   pixbuf_midi = gdk_pixbuf_new_from_file(icon, NULL);
   g_free(icon);
 
-  /* TRANSLATORS: please keep this string short */
   prefs_add_to_list(prefsw->prefs_list, pixbuf_midi, _("MIDI/Joystick learner"), LIST_ENTRY_MIDI);
   gtk_container_add (GTK_CONTAINER (dialog_table), prefsw->scrollw_right_midi);
 
-  prefsw->selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(prefsw->prefs_list));
-  gtk_tree_selection_set_mode(prefsw->selection, GTK_SELECTION_SINGLE);
 
-  // In multitrack mode multitrack/render settings should be selected by default!
-  if (mainw->multitrack != NULL){
-    select_pref_list_row(LIST_ENTRY_MULTITRACK);
-  }
 
-  // 
-  // end
-  //
+
+  prefsw->selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(prefsw->prefs_list));
+  gtk_tree_selection_set_mode(prefsw->selection, GTK_SELECTION_SINGLE);
 
   g_signal_connect(prefsw->selection, "changed", G_CALLBACK(on_prefDomainChanged), NULL);
   //
 
-  dialog_action_area8 = GTK_DIALOG (prefsw->prefs_dialog)->action_area;
-  gtk_widget_show (dialog_action_area8);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area8), GTK_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (prefsw->prefs_dialog));
+  gtk_widget_show (dialog_action_area);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
    
   // Preferences 'Revert' button
   prefsw->cancelbutton = gtk_button_new_from_stock ("gtk-revert-to-saved");
   gtk_widget_show (prefsw->cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (prefsw->prefs_dialog), prefsw->cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (prefsw->cancelbutton, GTK_CAN_DEFAULT);
-  // Set 'Close' button as inactive since there is no changes yet
+
+  lives_widget_set_can_focus (prefsw->cancelbutton,TRUE);
+
+  // Set 'Close' button as inactive since there are no changes yet
   gtk_widget_set_sensitive(prefsw->cancelbutton, FALSE);
    
   // Preferences 'Apply' button
   prefsw->applybutton = gtk_button_new_from_stock ("gtk-apply");
   gtk_widget_show (prefsw->applybutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (prefsw->prefs_dialog), prefsw->applybutton, 0);
-  GTK_WIDGET_SET_FLAGS (prefsw->applybutton, GTK_CAN_DEFAULT);
+
+  lives_widget_set_can_focus_and_default (prefsw->applybutton);
   // Set 'Apply' button as inactive since there is no changes yet
   gtk_widget_set_sensitive(prefsw->applybutton, FALSE);
    
@@ -5689,190 +4100,207 @@
   prefsw->closebutton = gtk_button_new_from_stock ("gtk-close");
   gtk_widget_show(prefsw->closebutton);
   gtk_dialog_add_action_widget(GTK_DIALOG(prefsw->prefs_dialog), prefsw->closebutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (prefsw->closebutton, GTK_CAN_DEFAULT);
+
+  lives_widget_set_can_focus_and_default (prefsw->closebutton);
+
+  gtk_widget_add_accelerator (prefsw->closebutton, "activate", accel_group,
+			      LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
    
-  g_signal_connect(dirbutton1, "clicked", G_CALLBACK (on_filesel_simple_clicked),prefsw->vid_load_dir_entry);
-  g_signal_connect(dirbutton2, "clicked", G_CALLBACK (on_filesel_simple_clicked),prefsw->vid_save_dir_entry);
-  g_signal_connect(dirbutton3, "clicked", G_CALLBACK (on_filesel_simple_clicked),prefsw->audio_dir_entry);
-  g_signal_connect(dirbutton4, "clicked", G_CALLBACK (on_filesel_simple_clicked),prefsw->image_dir_entry);
-  g_signal_connect(dirbutton5, "clicked", G_CALLBACK (on_filesel_simple_clicked),prefsw->proj_dir_entry);
+  g_signal_connect(dirbutton1, "clicked", G_CALLBACK (on_filesel_button_clicked),prefsw->vid_load_dir_entry);
+  g_signal_connect(dirbutton2, "clicked", G_CALLBACK (on_filesel_button_clicked),prefsw->vid_save_dir_entry);
+  g_signal_connect(dirbutton3, "clicked", G_CALLBACK (on_filesel_button_clicked),prefsw->audio_dir_entry);
+  g_signal_connect(dirbutton4, "clicked", G_CALLBACK (on_filesel_button_clicked),prefsw->image_dir_entry);
+  g_signal_connect(dirbutton5, "clicked", G_CALLBACK (on_filesel_button_clicked),prefsw->proj_dir_entry);
   g_signal_connect(dirbutton6, "clicked", G_CALLBACK (on_filesel_complex_clicked),prefsw->tmpdir_entry);
 
   // Connect signals for 'Apply' button activity handling
-  g_signal_connect(GTK_OBJECT(prefsw->fs_max_check), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->recent_check), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->stop_screensaver_check), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->open_maximised_check), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->show_tool), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->mouse_scroll), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_ce_maxspect), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rb_startup_ce), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rb_startup_mt), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->wpp_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->frei0r_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->ladspa_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->fs_max_check), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->recent_check), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->stop_screensaver_check), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->open_maximised_check), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->show_tool), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->mouse_scroll), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_ce_maxspect), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rb_startup_ce), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rb_startup_mt), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
   g_signal_connect(GTK_OBJECT(prefsw->spinbutton_crit_ds), "value_changed", 
-		   GTK_SIGNAL_FUNC(spinbutton_crit_ds_value_changed), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_gmoni), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_pmoni), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->forcesmon), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_stream_audio), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+		   G_CALLBACK(spinbutton_crit_ds_value_changed), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_crit_ds), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_gmoni), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_pmoni), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->forcesmon), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_stream_audio), "toggled", G_CALLBACK(apply_button_set_enabled), 
+		   NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_rec_after_pb), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_warn_ds), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_warn_ds), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->mt_enter_prompt), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(mt_enter_defs), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_render_prompt), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->mt_enter_prompt), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(mt_enter_defs), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_render_prompt), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_def_width), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled),
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_def_width), "changed", G_CALLBACK(apply_button_set_enabled),
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_def_height), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled),
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_def_height), "changed", G_CALLBACK(apply_button_set_enabled),
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_def_fps), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_def_fps), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->backaudio_checkbutton), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->pertrack_checkbutton), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_undo_buf), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->backaudio_checkbutton), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->pertrack_checkbutton), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_undo_buf), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_mt_exit_render), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_mt_exit_render), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_ab_time), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_mt_ab_time), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->mt_autoback_always), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->mt_autoback_never), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->mt_autoback_every), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->video_open_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_ocp), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->jpeg), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(png), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_instant_open), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->mt_autoback_always), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->mt_autoback_never), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->mt_autoback_every), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->video_open_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_ocp), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->jpeg), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(png), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_instant_open), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_auto_deint), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_nobord), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_concat_images), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_auto_deint), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_nobord), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_concat_images), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->pbq_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_show_stats), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(pp_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->audp_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->audio_command_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_afollow), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_aclips), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rdesk_audio), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rframes), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rfps), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->reffects), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rclips), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->raudio), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_rec_gb), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->encoder_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->ofmt_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->acodec_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_antialias), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_rte_keys), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->pbq_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_show_stats), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(pp_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->audp_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->audio_command_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_afollow), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_aclips), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rdesk_audio), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rframes), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rfps), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->reffects), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rclips), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->raudio), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->rextaudio), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_rec_gb), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->encoder_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->ofmt_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+
+  if (prefsw->acodec_combo!=NULL) 
+    g_signal_connect(GTK_OBJECT(prefsw->acodec_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_antialias), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_rte_keys), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_threads), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_threads), "toggled", GTK_SIGNAL_FUNC(toggle_set_sensitive), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_threads), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_threads), "toggled", G_CALLBACK(toggle_set_sensitive), 
 		   (gpointer)prefsw->spinbutton_nfx_threads);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_nfx_threads), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_nfx_threads), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->vid_load_dir_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->vid_save_dir_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->audio_dir_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->image_dir_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->proj_dir_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->tmpdir_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_fps), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_fsize), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_warn_fsize), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_EDITABLE(prefsw->vid_load_dir_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->vid_save_dir_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->audio_dir_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->image_dir_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->proj_dir_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->tmpdir_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_fps), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_fsize), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_warn_fsize), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_save_set), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_save_set), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mplayer), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mplayer), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_rendered_fx), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_rendered_fx), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_encoders), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_encoders), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_dup_set), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_dup_set), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_clips), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_clips), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_close), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_close), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_delete), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled),
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_delete), "toggled", G_CALLBACK(apply_button_set_enabled),
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_shift), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_shift), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_alter), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_alter), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_adel), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_adel), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_ashift), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled),
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_ashift), "toggled", G_CALLBACK(apply_button_set_enabled),
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_aalt), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_aalt), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_popup), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled),
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_layout_popup), "toggled", G_CALLBACK(apply_button_set_enabled),
 		   NULL);
   g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_discard_layout), "toggled", 
-		   GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mt_achans), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+		   G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mt_achans), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mt_no_jack), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mt_no_jack), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_after_dvgrab), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+#ifdef HAVE_LDVGRAB
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_after_dvgrab), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_yuv4m_open), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+#endif
+#ifdef HAVE_YUV4MPEG
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_yuv4m_open), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
+#endif
   g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_mt_backup_space), "toggled", 
-		   GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_after_crash), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+		   G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_after_crash), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_no_pulse), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_warn_no_pulse), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->check_midi), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->ins_speed), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(ins_resample), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->check_xmms_pause), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->cdplay_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_def_fps), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->check_midi), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->ins_speed), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(ins_resample), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->cdplay_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_def_fps), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->theme_combo), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_bwidth), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->theme_combo), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_bwidth), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
 #ifdef ENABLE_OSC
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_osc_udp), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_osc_udp), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->enable_OSC_start), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->enable_OSC), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->enable_OSC_start), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->enable_OSC), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
 #endif
 
-#ifndef ENABLE_JACK_TRANSPORT
-  g_signal_connect(GTK_EDITABLE(prefsw->jack_tserver_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_start_tjack), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_master), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_client), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_tb_start), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+#ifdef ENABLE_JACK_TRANSPORT
+  g_signal_connect(GTK_EDITABLE(prefsw->jack_tserver_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_start_tjack), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_master), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_client), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_tb_start), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_tb_client), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_tb_client), "toggled", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
 #endif
 
 #ifdef ENABLE_JACK
-  g_signal_connect(GTK_EDITABLE(prefsw->jack_aserver_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_start_ajack), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_pwp), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->jack_aserver_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_start_ajack), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_jack_pwp), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
 #endif
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_omc_js), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->omc_js_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_omc_js), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->omc_js_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
 #endif
 #ifdef OMC_MIDI_IMPL
-  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_omc_midi), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->alsa_midi), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(raw_midi_button), "toggled", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_EDITABLE(prefsw->omc_midi_entry), "changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_midicr), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), NULL);
-  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_midirpt), "value_changed", GTK_SIGNAL_FUNC(apply_button_set_enabled), 
+  g_signal_connect(GTK_OBJECT(prefsw->checkbutton_omc_midi), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->alsa_midi), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(raw_midi_button), "toggled", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_EDITABLE(prefsw->omc_midi_entry), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_midicr), "changed", G_CALLBACK(apply_button_set_enabled), NULL);
+  g_signal_connect(GTK_OBJECT(prefsw->spinbutton_midirpt), "changed", G_CALLBACK(apply_button_set_enabled), 
 		   NULL);
 #endif
 #endif
@@ -5900,31 +4328,39 @@
    
   g_signal_connect (GTK_OBJECT (prefsw->closebutton), "clicked",
 		    G_CALLBACK (on_prefs_close_clicked),
-		    NULL);
+		    prefsw);
    
   g_signal_connect (GTK_OBJECT (prefsw->applybutton), "clicked",
 		    G_CALLBACK (on_prefs_apply_clicked),
 		    NULL);
    
-  g_signal_connect (GTK_OBJECT (prefsw->prefs_dialog), "delete_event",
-		    G_CALLBACK (on_prefs_delete_event),
-		    prefsw);
 
   g_list_free_strings (audp);
   g_list_free (audp);
 
+
+
+  if (prefs_current_page==-1) {
+    if (mainw->multitrack == NULL)
+      select_pref_list_row(LIST_ENTRY_GUI);
+    else
+      select_pref_list_row(LIST_ENTRY_MULTITRACK);
+  }
+  else select_pref_list_row(prefs_current_page);
+
   on_prefDomainChanged(prefsw->selection,NULL);
+  gtk_widget_queue_draw(prefsw->prefs_list);
 
   return prefsw;
 }
 
 
-void
-on_preferences_activate(GtkMenuItem *menuitem, gpointer user_data)
-{
+void on_preferences_activate(GtkMenuItem *menuitem, gpointer user_data) {
+  if (menuitem!=NULL) prefs_current_page=-1;
+
   if (prefsw != NULL && prefsw->prefs_dialog != NULL) {
     gtk_window_present(GTK_WINDOW(prefsw->prefs_dialog));
-    gdk_window_raise(prefsw->prefs_dialog->window);
+    gdk_window_raise(lives_widget_get_xwindow(prefsw->prefs_dialog));
     return;
   }
 
@@ -5933,20 +4369,12 @@
   prefsw = create_prefs_dialog();
   gtk_widget_show(prefsw->prefs_dialog);
 
-  //if (!strcmp(prefs->wm,"Compiz")) {
-    // need to do exactly this, else the window does not get properly centered on some WMs
-    while (g_main_context_iteration(NULL,FALSE));
-    on_prefDomainChanged(prefsw->selection,NULL);
-    //}
-
 }
 
 /*!
  * Closes preferences dialog window
  */
-void
-on_prefs_close_clicked(GtkButton *button, gpointer user_data)
-{
+void on_prefs_close_clicked(GtkButton *button, gpointer user_data) {
   if (prefs->acodec_list!=NULL) {
     g_list_free_strings (prefs->acodec_list);
     g_list_free (prefs->acodec_list);
@@ -5963,12 +4391,12 @@
     g_list_free (future_prefs->disabled_decoders);
   }
 
-  on_cancel_button1_clicked(button, user_data);
+  lives_general_button_clicked(button, user_data);
 
   prefsw=NULL;
 
   if (mainw->prefs_need_restart) {
-    do_blocking_error_dialog(_("\nLiVES will now shut down. You need to restart it for the directory change to take effect.\nClick OK to continue.\n"));
+    do_blocking_info_dialog(_("\nLiVES will now shut down. You need to restart it for the directory change to take effect.\nClick OK to continue.\n"));
     on_quit_activate (NULL,NULL);
   }
 }
@@ -5976,35 +4404,13 @@
 /*!
  *
  */
-void
-on_prefs_apply_clicked(GtkButton *button, gpointer user_data)
-{
-  gboolean needs_restart;
+void on_prefs_apply_clicked(GtkButton *button, gpointer user_data) {
+  boolean needs_restart;
 
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  guint selected_idx;
- 
-  // Applying preferences, so 'Apply' and 'Revert' buttons are getting disabled
-  gtk_widget_set_sensitive(GTK_WIDGET(prefsw->applybutton), FALSE);
-  gtk_widget_set_sensitive(GTK_WIDGET(prefsw->cancelbutton), FALSE);
-  gtk_widget_set_sensitive(GTK_WIDGET(prefsw->closebutton), TRUE);
-
-  // Get currently selected row number
-  model = gtk_tree_view_get_model(GTK_TREE_VIEW(prefsw->prefs_list));
-  if (gtk_tree_selection_get_selected(prefsw->selection, &model, &iter)) {
-    gtk_tree_model_get(model, &iter, LIST_NUM, &selected_idx, -1);
-  }
-  else{
-    if (mainw->multitrack == NULL)
-      selected_idx = LIST_ENTRY_GUI;
-    else
-      selected_idx = LIST_ENTRY_MULTITRACK;
-  }
   // Apply preferences
   needs_restart = apply_prefs(FALSE);
 
-  // do this again in case anything was changed or reverted
+  // do this now in case anything was changed or reverted
   gtk_widget_set_sensitive(GTK_WIDGET(prefsw->applybutton), FALSE);
   gtk_widget_set_sensitive(GTK_WIDGET(prefsw->cancelbutton), FALSE);
   gtk_widget_set_sensitive(GTK_WIDGET(prefsw->closebutton), TRUE);
@@ -6014,32 +4420,29 @@
   }
 
   if (needs_restart) {
-    do_blocking_error_dialog(_("For the directory change to take effect LiVES will restart when preferences dialog closes."));
+    do_blocking_info_dialog(_("For the directory change to take effect LiVES will restart when preferences dialog closes."));
   }
 
   if (mainw->prefs_changed & PREFS_THEME_CHANGED) {
-    do_blocking_error_dialog(_("Theme changes will not take effect until the next time you start LiVES."));
+    do_blocking_info_dialog(_("Theme changes will not take effect until the next time you start LiVES."));
   }
 
   if (mainw->prefs_changed & PREFS_JACK_CHANGED) {
-    do_blocking_error_dialog(_("Jack options will not take effect until the next time you start LiVES."));
+    do_blocking_info_dialog(_("Jack options will not take effect until the next time you start LiVES."));
   }
 
   mainw->prefs_changed = 0;
-  // Select row, that was previously selected
-  select_pref_list_row(selected_idx);
+
 }
 
 /*
  * Function is used to select particular row in preferences selection list
  * selection is performed according to provided index which is one of LIST_ENTRY_* constants
  */
-void
-select_pref_list_row(guint selected_idx)
-{
+static void select_pref_list_row(guint selected_idx) {
   GtkTreeIter iter;
   GtkTreeModel *model;
-  gboolean valid;
+  boolean valid;
   guint idx;
 
   model = gtk_tree_view_get_model(GTK_TREE_VIEW(prefsw->prefs_list));
@@ -6056,10 +4459,9 @@
   }
 }
 
-void
-on_prefs_revert_clicked(GtkButton *button, gpointer user_data)
-{
-  int i;
+
+void on_prefs_revert_clicked(GtkButton *button, gpointer user_data) {
+  register int i;
 
   if (future_prefs->vpp_argv != NULL) {
     for ( i = 0; future_prefs->vpp_argv[i] != NULL; g_free(future_prefs->vpp_argv[i++]) );
@@ -6089,13 +4491,8 @@
     g_list_free (future_prefs->disabled_decoders);
   }
 
-  lives_set_cursor_style(LIVES_CURSOR_BUSY,prefsw->prefs_dialog->window);
-  while (g_main_context_iteration(NULL,FALSE)); // force busy cursor
-
-  on_cancel_button1_clicked(button, prefsw);
-
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
-  while (g_main_context_iteration(NULL,FALSE)); // force busy cursor
+  lives_general_button_clicked(button, prefsw);
 
   prefsw = NULL;
 
@@ -6103,16 +4500,14 @@
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 }
 
-gboolean
-on_prefs_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data)
-{
-  on_prefs_close_clicked(GTK_BUTTON (((_prefsw *)user_data)->closebutton), user_data);
 
+boolean on_prefs_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+  on_prefs_close_clicked(GTK_BUTTON (((_prefsw *)user_data)->closebutton), user_data);
   return FALSE;
 }
 
 
-gboolean lives_ask_permission(int what) {
+boolean lives_ask_permission(int what) {
   switch (what) {
   case LIVES_PERM_OSC_PORTS:
     return ask_permission_dialog(what);

LiVES-1.6.1.tar.bz2/src/preferences.h -> LiVES-2.0.3.tar.bz2/src/preferences.h Changed

@@ -1,6 +1,6 @@
 // preferences.h
 // LiVES (lives-exe)
-// (c) G. Finch (salsaman@gmail.com) 2004 - 2012
+// (c) G. Finch (salsaman@gmail.com) 2004 - 2013
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -9,22 +9,22 @@
 
 #define LIVES_PREFS_TIMEOUT  (10 * U_SEC) // 10 sec timeout
 
-#define PREFS_PANED_POS 200
+#define PREFS_PANED_POS ((int)(200.*widget_opts.scale))
 
 typedef struct {
   gchar bgcolour[256];
-  gboolean stop_screensaver;
-  gboolean open_maximised;
+  boolean stop_screensaver;
+  boolean open_maximised;
   gchar theme[64];  ///< the theme name
 
-  gshort pb_quality;
+  short pb_quality;
 #define PB_QUALITY_LOW 1
 #define PB_QUALITY_MED 2  ///< default
 #define PB_QUALITY_HIGH 3
 
   _encoder encoder; ///< from main.h
 
-  gshort audio_player;
+  short audio_player;
 #define AUD_PLAYER_SOX 1
 #define AUD_PLAYER_MPLAYER 2
 #define AUD_PLAYER_JACK 3
@@ -33,7 +33,7 @@
   gchar aplayer[512]; // name, eg. "jack","pulse","sox","mplayer"
 
   /// frame quantisation type
-  gshort q_type;
+  short q_type;
 #define Q_FILL 1
 #define Q_SMOOTH 1
 
@@ -54,7 +54,7 @@
 
   gchar image_ext[16];
 
-  guint warning_mask;
+  uint32_t warning_mask;
   // if these bits are set, we do not show the warning
 #define WARN_MASK_FPS (1<<0)
 #define WARN_MASK_FSIZE (1<<1)
@@ -104,56 +104,59 @@
   gchar video_open_command[256];
   gchar audio_play_command[256];
   gchar cdplay_device[PATH_MAX];  ///< locale encoding
-  gdouble default_fps;
-  gint bar_height;
-  gboolean pause_effect_during_preview;
-  gboolean open_decorated;
+  double default_fps;
+  int bar_height;
+  boolean pause_effect_during_preview;
+  boolean open_decorated;
   int sleep_time;
-  gboolean pause_during_pb;
-  gboolean fileselmax;
-  gboolean show_recent;
-  gint warn_file_size;
-  gboolean pause_xmms;
-  gboolean midisynch;
-  gint dl_bandwidth;
-  gboolean conserve_space;
-  gboolean ins_resample;
-  gboolean show_tool;
-  gshort sepwin_type;   ///< 0 == non-sticky (show only when playing), 1 == sticky (show always)
-  gboolean show_player_stats;
-  gboolean show_framecount;
-  gboolean show_subtitles;
-  gboolean loop_recording;
-  gboolean discard_tv;
-  gboolean save_directories;
-  gboolean safer_preview;
-  gint rec_opts;
+  boolean pause_during_pb;
+  boolean fileselmax;
+  boolean show_recent;
+  int warn_file_size;
+  boolean midisynch;
+  int dl_bandwidth;
+  boolean conserve_space;
+  boolean ins_resample;
+  boolean show_tool;
+  short sepwin_type;   ///< 0 == non-sticky (show only when playing), 1 == sticky (show always)
+  boolean show_player_stats;
+  boolean show_framecount;
+  boolean show_subtitles;
+  boolean loop_recording;
+  boolean discard_tv;
+  boolean save_directories;
+  boolean safer_preview;
+  int rec_opts;
 #define REC_FRAMES (1<<0)
 #define REC_FPS (1<<1)
 #define REC_EFFECTS (1<<2)
 #define REC_CLIPS (1<<3)
 #define REC_AUDIO (1<<4)
-#define REC_EXT_AUDIO (1<<5)
-#define REC_AFTER_PB (1<<6)
+#define REC_AFTER_PB (1<<5)
   
-  gboolean no_bandwidth;
-  gboolean osc_udp_started;
-  guint osc_udp_port;
 
-  gboolean omc_noisy; ///< send success/fail
-  gboolean omc_events; ///< send other events
+  int audio_src;
+#define AUDIO_SRC_INT 0
+#define AUDIO_SRC_EXT 1
 
-  gshort startup_phase; ///< -1 = fresh install, 1 = tmpdir set, 2, pre-audio start, 3, pre-tests, 100 = all tests passed
+  boolean no_bandwidth;
+  boolean osc_udp_started;
+  uint32_t osc_udp_port;
+
+  boolean omc_noisy; ///< send success/fail
+  boolean omc_events; ///< send other events
+
+  short startup_phase; ///< -1 = fresh install, 1 = tmpdir set, 2, pre-audio start, 3, pre-tests, 100 = all tests passed
   gchar *wm; ///<window manager name
-  gint ocp; ///< open_compression_percent : get/set in prefs
+  int ocp; ///< open_compression_percent : get/set in prefs
 
-  gboolean antialias;
+  boolean antialias;
 
-  gboolean ignore_tiny_fps_diffs;
+  boolean ignore_tiny_fps_diffs;
 
-  gshort rte_keys_virtual;
+  short rte_keys_virtual;
 
-  guint jack_opts;
+  uint32_t jack_opts;
 #define JACK_OPTS_TRANSPORT_CLIENT (1<<0)   ///< jack can start/stop
 #define JACK_OPTS_TRANSPORT_MASTER (1<<1)  ///< transport master
 #define JACK_OPTS_START_TSERVER (1<<2)     ///< start transport server
@@ -171,124 +174,128 @@
   gchar *vppdefaultsfile;
 
   GList *acodec_list;
-  gint acodec_list_to_format[AUDIO_CODEC_NONE];
+  int acodec_list_to_format[AUDIO_CODEC_NONE];
 
-  guint audio_opts;
+  uint32_t audio_opts;
 #define AUDIO_OPTS_FOLLOW_CLIPS (1<<0)
 #define AUDIO_OPTS_FOLLOW_FPS (1<<1)
 
-  gboolean event_window_show_frame_events;
-  gboolean crash_recovery; ///< TRUE==maintain mainw->recovery file
+  boolean event_window_show_frame_events;
+  boolean crash_recovery; ///< TRUE==maintain mainw->recovery file
 
-  gboolean show_rdet; ///< show render details (frame size, encoder type) before saving to file
+  boolean show_rdet; ///< show render details (frame size, encoder type) before saving to file
 
-  gboolean move_effects;
+  boolean move_effects;
 
-  gint mt_undo_buf;
-  gboolean mt_enter_prompt;
+  int mt_undo_buf;
+  boolean mt_enter_prompt;
 
-  gint mt_def_width;
-  gint mt_def_height;
-  gdouble mt_def_fps;
+  int mt_def_width;
+  int mt_def_height;
+  double mt_def_fps;
 
-  gint mt_def_arate;
-  gint mt_def_achans;
-  gint mt_def_asamps;
-  gint mt_def_signed_endian;
+  int mt_def_arate;
+  int mt_def_achans;
+  int mt_def_asamps;
+  int mt_def_signed_endian;
 
-  gboolean mt_exit_render;
-  gboolean render_prompt;
+  boolean mt_exit_render;
+  boolean render_prompt;
 
-  gboolean mt_pertrack_audio;
-  gint mt_backaudio;
+  boolean mt_pertrack_audio;
+  int mt_backaudio;
 
-  gint mt_auto_back;
+  int mt_auto_back;
 
-  gboolean ar_clipset;
-  gboolean ar_layout;
+  boolean ar_clipset;
+  boolean ar_layout;
 
   gchar ar_clipset_name[128]; ///< utf8 (not converted (to locale?))
   gchar ar_layout_name[PATH_MAX];  ///< utf8 (not converted) 
 
-  gboolean rec_desktop_audio;
+  boolean rec_desktop_audio;
 
-  gboolean show_gui;
-  gboolean show_splash;
-  gboolean show_playwin;
+  boolean show_gui;
+  boolean show_splash;
+  boolean show_playwin;
 
-  gboolean osc_start;
+  boolean osc_start;
 
-  gboolean collate_images;
+  boolean collate_images;
 
-  gint virt_height; ///< n screens vert.
+  int virt_height; ///< n screens vert.
 
-  gboolean concat_images;
+  boolean concat_images;
 
-  gboolean render_audio;
-  gboolean normalise_audio;
+  boolean render_audio;
+  boolean normalise_audio;
 
-  gboolean instant_open;
-  gboolean auto_deint;
-  gboolean auto_nobord;
+  boolean instant_open;
+  boolean auto_deint;
+  boolean auto_nobord;
 
-  gint gui_monitor;
-  gint play_monitor;
+  int gui_monitor;
+  int play_monitor;
 
-  gboolean force_single_monitor;
+  boolean force_single_monitor;
 
-  gint midi_check_rate;
-  gint midi_rpt;
+  int midi_check_rate;
+  int midi_rpt;
 
 #define OMC_DEV_MIDI 1<<0
 #define OMC_DEV_JS 1<<1
 #define OMC_DEV_FORCE_RAW_MIDI 1<<2
-  guint omc_dev_opts;
+  uint32_t omc_dev_opts;
 
   gchar omc_js_fname[PATH_MAX];  ///< utf8
   gchar omc_midi_fname[PATH_MAX]; ///< utf8
   
-  gboolean mouse_scroll_clips;
+  boolean mouse_scroll_clips;
 
-  gint num_rtaudiobufs;
+  int num_rtaudiobufs;
 
-  gboolean safe_symlinks;
+  boolean safe_symlinks;
 
 #ifdef ALSA_MIDI
-  gboolean use_alsa_midi;
+  boolean use_alsa_midi;
 #endif
 
-  gint startup_interface;
+  int startup_interface;
 
 #define STARTUP_CE 0
 #define STARTUP_MT 1
 
-  gboolean ce_maxspect;
+  boolean ce_maxspect;
 
-  gboolean lamp_buttons;
+  boolean lamp_buttons;
 
-  gboolean autoload_subs;
+  boolean autoload_subs;
 
   glong rec_stop_gb;
 
-  gint max_modes_per_key; ///< maximum effect modes per key
+  int max_modes_per_key; ///< maximum effect modes per key
 
   // autotransitioning in mt
-  gint atrans_fx;
+  int atrans_fx;
   gchar def_autotrans[256];
 
-  gint nfx_threads;
+  int nfx_threads;
+
+  boolean alpha_post; ///< set to TRUE to force use of post alpha internally
 
-  gboolean alpha_post; ///< set to TRUE to force use of post alpha internally
+  boolean stream_audio_out;
+  boolean unstable_fx;
+  boolean letterbox; ///< playback with letterbox
+  boolean enc_letterbox; ///< encode with letterbox
 
-  gboolean stream_audio_out;
-  gboolean unstable_fx;
-  gboolean letterbox; ///< playback with letterbox
-  gboolean enc_letterbox; ///< encode with letterbox
+  boolean force_system_clock; /// < force system clock (rather than soundcard) for timing ( better for high framerates )
 
-  gboolean force_system_clock; /// < force system clock (rather than soundcard) for timing ( better for high framerates )
+  boolean force64bit;
+
+  boolean auto_trim_audio;
 
   /** default 0; 1==use old (bad) behaviour on bigendian machines (r/w bigend ints/doubles); 2==bad reads, good writes */
-  gint bigendbug;
+  int bigendbug;
 
 
   // these are defualt values; actual values can be adjusted in Preferences
@@ -308,13 +315,23 @@
 #define LIVES_CDISK_REBUILD_ORDER_FILES (1<<6) ///< not yet implemented - TODO
 
 
-  guint clear_disk_opts;
+  uint32_t clear_disk_opts;
 
 #ifdef HAVE_YUV4MPEG
   gchar yuvin[PATH_MAX];
 #endif
 
   GList *disabled_decoders;
+
+  char backend_sync[PATH_MAX];
+  char backend[PATH_MAX];
+
+  char weed_plugin_path[PATH_MAX];
+  char frei0r_path[PATH_MAX];
+  char ladspa_path[PATH_MAX];
+
+  boolean present;
+
 } _prefs;
 
 enum {
@@ -342,8 +359,8 @@
 };
 
 
-#define PREF_WIN_WIDTH 960
-#define PREF_WIN_HEIGHT 640
+#define PREF_WIN_WIDTH (mainw->scr_width*.9)
+#define PREF_WIN_HEIGHT (mainw->scr_height*.9)
 
 #define DS_WARN_CRIT_MAX 1000000. ///< MB.
 
@@ -438,7 +455,6 @@
   GtkWidget *checkbutton_warn_after_dvgrab;
   GtkWidget *checkbutton_warn_no_pulse;
   GtkWidget *checkbutton_show_stats;
-  GtkWidget *check_xmms_pause;
   GtkWidget *checkbutton_warn_fsize;
   GtkWidget *checkbutton_warn_mt_achans;
   GtkWidget *checkbutton_warn_mt_no_jack;
@@ -490,6 +506,7 @@
   GtkWidget *checkbutton_nobord;
   GtkWidget *checkbutton_concat_images;
   GtkWidget *forcesmon;
+  GtkWidget *forcesmon_hbox;
   GList *pbq_list;
   gchar *audp_name;
   gchar *orig_audp_name;
@@ -508,41 +525,47 @@
   GtkWidget *checkbutton_ce_maxspect;
   GtkWidget *temp_label;
   GtkWidget *checkbutton_stream_audio;
+  GtkWidget *checkbutton_rec_after_pb;
+  GtkWidget *wpp_entry;
+  GtkWidget *frei0r_entry;
+  GtkWidget *ladspa_entry;
+  GtkWidget *cdda_hbox;
+  GtkWidget *midi_hbox;
   GtkTreeSelection *selection;
-  gboolean needs_restart;
+  boolean needs_restart;
 } _prefsw;
 
 /// startup overrides from commandline
 typedef struct {
-  gboolean ign_clipset;
-  gboolean ign_osc;
-  gboolean ign_aplayer;
-  gboolean ign_stmode;
-  gboolean ign_vppdefs;
+  boolean ign_clipset;
+  boolean ign_osc;
+  boolean ign_aplayer;
+  boolean ign_stmode;
+  boolean ign_vppdefs;
 } _ign_opts;
 
 typedef struct {
   gchar tmpdir[PATH_MAX];
   gchar theme[64];
   gchar vpp_name[64]; ///< new video playback plugin
-  gint vpp_fixed_fps_numer;
-  gint vpp_fixed_fps_denom;
-  gdouble vpp_fixed_fpsd;
+  int vpp_fixed_fps_numer;
+  int vpp_fixed_fps_denom;
+  double vpp_fixed_fpsd;
   int vpp_palette;
   int vpp_YUV_clamping;
-  gint vpp_fwidth;
-  gint vpp_fheight;
-  gint vpp_argc;
+  int vpp_fwidth;
+  int vpp_fheight;
+  int vpp_argc;
   gchar **vpp_argv;
 
   _encoder encoder;
-  gboolean show_recent;
-  gboolean show_tool;
-  gboolean osc_start;
-  gint startup_interface;
-  guint jack_opts;
+  boolean show_recent;
+  boolean show_tool;
+  boolean osc_start;
+  int startup_interface;
+  uint32_t jack_opts;
 
-  gint nfx_threads;
+  int nfx_threads;
 
 
   GList *disabled_decoders;
@@ -559,7 +582,7 @@
 
 _prefsw* create_prefs_dialog (void);
 
-gboolean on_prefs_delete_event (GtkWidget *, GdkEvent *, gpointer prefsw);
+boolean on_prefs_delete_event (GtkWidget *, GdkEvent *, gpointer prefsw);
 
 void on_preferences_activate (GtkMenuItem *, gpointer);
 
@@ -567,17 +590,16 @@
 
 void on_prefs_revert_clicked (GtkButton *, gpointer);
 
-void set_vpp(gboolean set_in_prefs);
+void set_vpp(boolean set_in_prefs);
 
 void on_prefDomainChanged(GtkTreeSelection *, gpointer);
 
-void select_pref_list_row(guint);
-
 void populate_combo_box(GtkComboBox *combo, GList *data);
 
 void set_combo_box_active_string(GtkComboBox *, gchar *active_str);
 
 void prefsw_set_astream_settings(_vid_playback_plugin *);
+void prefsw_set_rec_after_settings(_vid_playback_plugin *);
 
 void apply_button_set_enabled(GtkWidget *widget, gpointer func_data);
 
@@ -586,7 +608,7 @@
 
 #define LIVES_PERM_OSC_PORTS 1
 
-gboolean lives_ask_permission(int what);
+boolean lives_ask_permission(int what);
 
 
 #endif

LiVES-1.6.1.tar.bz2/src/pulse.c -> LiVES-2.0.3.tar.bz2/src/pulse.c Changed

@@ -9,6 +9,7 @@
 #include "main.h"
 #include "callbacks.h"
 #include "support.h"
+#include "effects-weed.h"
 
 #define afile mainw->files[pulsed->playing_file]
 
@@ -26,11 +27,11 @@
 
 #define PULSE_READ_BYTES 48000
 
-static guchar prbuf[PULSE_READ_BYTES];
+static guchar prbuf[PULSE_READ_BYTES*2];
 
 static size_t prb=0;
 
-static gboolean seek_err;
+static boolean seek_err;
 
 ///////////////////////////////////////////////////////////////////
 
@@ -47,7 +48,7 @@
 #define PULSE_START_WAIT 500000000
 
 
-gboolean lives_pulse_init (short startup_phase) {
+boolean lives_pulse_init (short startup_phase) {
   // startup pulse audio server
   gchar *msg,*msg2;
 
@@ -81,7 +82,7 @@
     LIVES_WARN("Unable to connect to pulseaudio server");
 
     if (!mainw->foreign) {
-      if (startup_phase==0&&capable->has_sox) {
+      if (startup_phase==0&&capable->has_sox_play) {
 	do_error_dialog_with_check(_("\nUnable to connect to pulse audio server.\nFalling back to sox audio player.\nYou can change this in Preferences/Playback.\n"),WARN_MASK_NO_PULSE_CONNECT);
 	switch_aud_to_sox(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
       }
@@ -93,6 +94,7 @@
 	msg=g_strdup(_("\nUnable to connect to pulse audio server.\n"));
 	if (startup_phase!=2) {
 	  do_blocking_error_dialog(msg);
+	  mainw->aplayer_broken=TRUE;
 	}
 	else {
 	  msg2=g_strdup_printf("%s%s",msg,_("LiVES will exit and you can choose another audio player.\n"));
@@ -117,7 +119,7 @@
   }
 }
 
-static void pulse_set_rec_avals(pulse_driver_t *pulsed, gboolean is_forward) {
+static void pulse_set_rec_avals(pulse_driver_t *pulsed, boolean is_forward) {
   // record direction change
   mainw->rec_aclip=pulsed->playing_file;
   if (mainw->rec_aclip!=-1) {
@@ -136,6 +138,7 @@
 static void sample_silence_pulse (pulse_driver_t *pdriver, size_t nbytes, size_t xbytes) {
   guchar *buff;
   if (xbytes<=0) return;
+  if (mainw->aplayer_broken) return;
   while (nbytes>0) {
     if (nbytes<xbytes) xbytes=nbytes;
     buff=(guchar *)g_try_malloc0(xbytes);
@@ -150,6 +153,16 @@
 static short *shortbuffer=NULL;
 
 
+static void pulse_audio_write_process_dummy (pa_stream *pstream, size_t nbytes, void *arg) {
+  pulse_driver_t* pulsed = (pulse_driver_t*)arg;
+  uint64_t nframes=nbytes/pulsed->out_achans/(pulsed->out_asamps>>3);
+  size_t xbytes=pa_stream_writable_size(pstream);
+  sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
+  //g_print("pt a1 %ld\n",nframes);
+  return;
+}
+
+
 static void pulse_audio_write_process (pa_stream *pstream, size_t nbytes, void *arg) {
   // PULSE AUDIO calls this periodically to get the next audio buffer
 
@@ -162,19 +175,19 @@
    static float old_volume=-1.;
    pulse_driver_t* pulsed = (pulse_driver_t*)arg;
 
-   gulong nframes=nbytes/pulsed->out_achans/(pulsed->out_asamps>>3);
+   uint64_t nframes=nbytes/pulsed->out_achans/(pulsed->out_asamps>>3);
 
    aserver_message_t *msg;
 
-   long seek,xseek;
+   int64_t seek,xseek;
    int new_file;
    gchar *filename;
-   gboolean from_memory=FALSE;
+   boolean from_memory=FALSE;
 
    guchar *buffer;
    size_t xbytes=pa_stream_writable_size(pstream);
 
-   gboolean needs_free=FALSE;
+   boolean needs_free=FALSE;
 
    size_t offs=0;
 
@@ -190,11 +203,10 @@
      return;
    }
 
-
    while ((msg=(aserver_message_t *)pulsed->msgq)!=NULL) {
      switch (msg->command) {
      case ASERVER_CMD_FILE_OPEN:
-       new_file=atoi(msg->data);
+       new_file=atoi((char *)msg->data);
        if (pulsed->playing_file!=new_file) {
 	 if (pulsed->is_opening) filename=g_build_filename(prefs->tmpdir,mainw->files[new_file]->handle,
 							   "audiodump.pcm",NULL);
@@ -207,6 +219,9 @@
 	   pulsed->playing_file=-1;
 	 }
 	 else {
+#ifdef IS_MINGW
+	   setmode(pulsed->fd, O_BINARY);
+#endif
 	   pulsed->seek_pos=0;
 	   pulsed->playing_file=new_file;
 	   pulsed->audio_ticks=mainw->currticks;
@@ -227,9 +242,9 @@
        break;
      case ASERVER_CMD_FILE_SEEK:
        if (pulsed->fd<0) break;
-       xseek=seek=atol(msg->data);
+       xseek=seek=atol((char *)msg->data);
        if (seek<0.) xseek=0.;
-       if (!pulsed->mute) {
+       if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
 	 lseek(pulsed->fd,xseek,SEEK_SET);
        }
        pulsed->seek_pos=seek;
@@ -240,7 +255,7 @@
      default:
        msg->data=NULL;
      }
-     if (msg->data!=NULL) g_free(msg->data);
+     if (msg->data!=NULL) g_free((gpointer)msg->data);
      msg->command=ASERVER_CMD_PROCESSED;
      if (msg->next==NULL) pulsed->msgq=NULL;
      else pulsed->msgq = msg->next;
@@ -251,21 +266,26 @@
    pulsed->state=pa_context_get_state(pulsed->con);
 
    if (pulsed->state==PA_CONTEXT_READY) {
-     gulong pulseFramesAvailable = nframes;
-     gulong inputFramesAvailable;
-     gulong numFramesToWrite;
-     glong in_frames=0;
-     gulong in_bytes=0;
+
+     uint64_t pulseFramesAvailable = nframes;
+     uint64_t inputFramesAvailable;
+     uint64_t numFramesToWrite;
+     int64_t in_frames=0;
+     uint64_t in_bytes=0,xin_bytes=0;
      gfloat shrink_factor=1.f;
      int swap_sign;
 
+     file *xfile=afile;
+
  #ifdef DEBUG_PULSE
      g_printerr("playing... pulseFramesAvailable = %ld\n", pulseFramesAvailable);
  #endif
 
      pulsed->num_calls++;
 
-     if (!pulsed->in_use||((pulsed->fd<0||pulsed->seek_pos<0.)&&pulsed->read_abuf<0)||pulsed->is_paused) {
+     if (!pulsed->in_use||(((pulsed->fd<0||pulsed->seek_pos<0.)&&pulsed->read_abuf<0)&&
+			   ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL))
+			   ||pulsed->is_paused) {
 
        sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
 
@@ -274,17 +294,20 @@
 	 pulsed->seek_pos+=nframes*afile->achans*afile->asampsize/8;
 	 if (pulsed->seek_pos>=0) pulse_audio_seek_bytes(pulsed,pulsed->seek_pos);
        }
-       //g_print("pt a3\n");
+       //g_print("pt a3 %d\n",pulsed->in_use);
        return;
      }
 
-     if (G_LIKELY(pulseFramesAvailable>0&&(pulsed->read_abuf>-1||
+
+      if (G_LIKELY(pulseFramesAvailable>0&&(pulsed->read_abuf>-1||
 					   (pulsed->aPlayPtr!=NULL
-					    &&pulsed->in_achans>0)))) {
+					    &&pulsed->in_achans>0)||
+					   ((mainw->agen_key!=0||mainw->agen_needs_reinit)&&mainw->multitrack==NULL) 
+					   ))) {
 
-       if (mainw->playing_file>-1&&pulsed->read_abuf>-1) {
+        if (mainw->playing_file>-1&&pulsed->read_abuf>-1) {
 	 // playing back from memory buffers instead of from file
-	 // this is used in multitrack
+ 	 // this is used in multitrack
 	 from_memory=TRUE;
 
 	 numFramesToWrite=pulseFramesAvailable;
@@ -294,6 +317,12 @@
        }
        else {
 	 if (G_LIKELY(pulsed->fd>=0)) {
+
+	   if ((pulsed->playing_file==mainw->ascrap_file&&!mainw->preview)&&mainw->playing_file>=-1
+	       &&mainw->files[mainw->playing_file]->achans>0) {
+	     xfile=mainw->files[mainw->playing_file];
+	   }
+
 	   pulsed->aPlayPtr->size=0;
 	   in_bytes=ABS((in_frames=((gdouble)pulsed->in_arate/(gdouble)pulsed->out_arate*
 				    (gdouble)pulseFramesAvailable+((gdouble)fastrand()/(gdouble)G_MAXUINT32))))
@@ -321,19 +350,21 @@
 	       }
 	     }
 	     // rewind by in_bytes
-	     lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
+	     if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
+	       lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
 	   }
 	   if G_UNLIKELY((in_bytes>pulsed->aPlayPtr->max_size && !(*pulsed->cancelled) && ABS(shrink_factor)<=100.f)) {
-	     pulsed->aPlayPtr->data=g_try_realloc(pulsed->aPlayPtr->data,in_bytes);
-	     if (pulsed->aPlayPtr->data!=NULL) {
-	       memset(pulsed->aPlayPtr->data,0,in_bytes);
-	       pulsed->aPlayPtr->max_size=in_bytes;
+	       pulsed->aPlayPtr->data=g_try_realloc(pulsed->aPlayPtr->data,in_bytes);
+	       if (pulsed->aPlayPtr->data!=NULL) {
+		 memset(pulsed->aPlayPtr->data,0,in_bytes);
+		 pulsed->aPlayPtr->max_size=in_bytes;
+	       }
 	     }
-	   }
 	   else {
 	     pulsed->aPlayPtr->max_size=0;
 	   }
-	   if (pulsed->mute||pulsed->aPlayPtr->data==NULL) {
+	   if (pulsed->mute||(pulsed->aPlayPtr->data==NULL&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||
+							     mainw->multitrack!=NULL))) {
 	     if (shrink_factor>0.f) pulsed->seek_pos+=in_bytes;
 	     if (pulsed->seek_pos>=pulsed->seek_end) {
 	       if (*pulsed->whentostop==STOP_ON_AUD_END) {
@@ -356,13 +387,16 @@
 	     return;
 	   }
 	   else {
-	     gboolean loop_restart;
+	     boolean loop_restart;
 	     do {
 	       loop_restart=FALSE;
 	       if (in_bytes>0) {
 		 // playing from a file
 		 if (!(*pulsed->cancelled)&&ABS(shrink_factor)<=100.f) {
-		   if ((pulsed->aPlayPtr->size=read(pulsed->fd,pulsed->aPlayPtr->data,in_bytes))==0) {
+		   if (((((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)&&
+			 (pulsed->aPlayPtr->size=read(pulsed->fd,pulsed->aPlayPtr->data,in_bytes))==0))||
+		       (((mainw->agen_key!=0||mainw->agen_needs_reinit)&&mainw->multitrack==NULL&&
+			 pulsed->seek_pos+in_bytes>=xfile->afilesize))) {
 		     if (*pulsed->whentostop==STOP_ON_AUD_END) {
 		       *pulsed->cancelled=CANCEL_AUD_END;
 		     }
@@ -370,17 +404,21 @@
 		       loop_restart=TRUE;
 		       if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
 			 pulsed->in_arate=-pulsed->in_arate;
-			 lseek(pulsed->fd,(pulsed->seek_pos-=in_bytes),SEEK_SET);
+			 if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
+			   lseek(pulsed->fd,(pulsed->seek_pos-=in_bytes),SEEK_SET);
+			 else pulsed->seek_pos-=in_bytes;
 			 pulse_set_rec_avals(pulsed,FALSE);
 		       }
 		       else {
 			 if (pulsed->loop!=AUDIO_LOOP_NONE) {
 			   seek=0;
-			   lseek(pulsed->fd,(pulsed->seek_pos=seek),SEEK_SET);
+			   if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
+			     lseek(pulsed->fd,(pulsed->seek_pos=seek),SEEK_SET);
+			   else pulsed->seek_pos=seek;
 			   pulse_set_rec_avals(pulsed,TRUE);
 			 }
 			 else {
-			   pulsed->in_use=FALSE;
+			   if (mainw->agen_key==0&&!mainw->agen_needs_reinit) pulsed->in_use=FALSE;
 			   loop_restart=FALSE;
 			   pulse_set_rec_avals(pulsed,TRUE);
 			 }
@@ -388,7 +426,8 @@
 		     }
 		   }
 		   else {
-		     if (pulsed->aPlayPtr->size<0) {
+		     if (pulsed->aPlayPtr->size<0&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||
+						    mainw->multitrack!=NULL)) {
 		       // read error...output silence
 		       sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
 					    (pulsed->out_asamps>>3),xbytes);
@@ -397,18 +436,29 @@
 		     }
 		     if (shrink_factor<0.f) {
 		       // reverse play - rewind again by in_bytes
-		       lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
+		       if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
+			 lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
+		     }
+		     else {
+		       if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
+			 pulsed->seek_pos+=pulsed->aPlayPtr->size;
+		       else 
+			 pulsed->seek_pos+=in_bytes;
 		     }
-		     else pulsed->seek_pos+=pulsed->aPlayPtr->size;
 		   }
 		 }
 	       }
 	     } while (loop_restart);
 	   }
+	   xin_bytes=in_bytes;
 	 }
 
+	 if (mainw->agen_key!=0&&mainw->multitrack==NULL) {
+	   in_bytes=pulseFramesAvailable*pulsed->out_achans*2;
+	   if (xin_bytes==0) xin_bytes=in_bytes;
+	 }
 
-	 if (!pulsed->in_use||in_bytes==0) {
+	 if (!pulsed->in_use||in_bytes==0||pulsed->mute) {
 	   // reached end of audio with no looping
 	   sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
 				(pulsed->out_asamps>>3),xbytes);
@@ -421,43 +471,180 @@
 	   return;
 	 }
 
-	 inputFramesAvailable = pulsed->aPlayPtr->size / (pulsed->in_achans * (pulsed->in_asamps>>3));
+	 if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) {
+	   swap_sign=afile->signed_endian&AFORM_UNSIGNED;
+
+	   inputFramesAvailable = pulsed->aPlayPtr->size / (pulsed->in_achans * (pulsed->in_asamps>>3));
  #ifdef DEBUG_PULSE
-	 g_printerr("%ld inputFramesAvailable == %ld, %ld, %ld %ld,pulseFramesAvailable == %ld\n", pulsed->aPlayPtr->size, inputFramesAvailable, in_frames, pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable);
- #endif
-	 buffer = (guchar *)pulsed->aPlayPtr->data;
+	   g_printerr("%ld inputFramesAvailable == %ld, %ld, %ld %ld,pulseFramesAvailable == %ld\n", pulsed->aPlayPtr->size, inputFramesAvailable, in_frames, pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable);
+#endif
+	   buffer = (guchar *)pulsed->aPlayPtr->data;
+	   
+	   numFramesToWrite = MIN(pulseFramesAvailable, (inputFramesAvailable/ABS(shrink_factor)+.001));
 
-	 numFramesToWrite = MIN(pulseFramesAvailable, (inputFramesAvailable/ABS(shrink_factor)+.001));
+#ifdef DEBUG_PULSE
+	   g_printerr("inputFramesAvailable after conversion %d\n",(uint64_t)((gdouble)inputFramesAvailable/shrink_factor+.001));
+	   g_printerr("nframes == %ld, pulseFramesAvailable == %ld,\n\tpulsed->num_input_channels == %ld, pulsed->out_achans == %ld\n",  nframes, pulseFramesAvailable, pulsed->in_achans, pulsed->out_achans);
+#endif
 
- #ifdef DEBUG_PULSE
-	 g_printerr("inputFramesAvailable after conversion %d\n",(gulong)((gdouble)inputFramesAvailable/shrink_factor+.001));
-	 g_printerr("nframes == %ld, pulseFramesAvailable == %ld,\n\tpulsed->num_input_channels == %ld, pulsed->out_achans == %ld\n",  nframes, pulseFramesAvailable, pulsed->in_achans, pulsed->out_achans);
- #endif
+	   if (pulsed->in_asamps==pulsed->out_asamps&&shrink_factor==1.&&pulsed->in_achans==pulsed->out_achans&&
+	       !pulsed->reverse_endian&&!swap_sign) {
+	     // no transformation needed
+	     pulsed->sound_buffer=buffer;
+	   }
+	   else {
+	     pulsed->sound_buffer=(guchar *)g_try_malloc0(pulsed->chunk_size);
+	     if (!pulsed->sound_buffer) {
+	       sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
+				    (pulsed->out_asamps>>3),xbytes);
+	       if (!pulsed->is_paused) pulsed->frames_written+=nframes;
+	       return;
+	     }
+
+	     if (pulsed->in_asamps==8) {
+	       sample_move_d8_d16 ((short *)(pulsed->sound_buffer),(guchar *)buffer, numFramesToWrite, in_bytes, 
+				   shrink_factor, pulsed->out_achans, pulsed->in_achans, swap_sign?SWAP_U_TO_S:0);
+	     }
+	     else {
+	       sample_move_d16_d16((short*)pulsed->sound_buffer, (short*)buffer, numFramesToWrite, in_bytes, shrink_factor,
+				   pulsed->out_achans, pulsed->in_achans, pulsed->reverse_endian?SWAP_X_TO_L:0, 
+				   swap_sign?SWAP_U_TO_S:0);
+	     }
+	   }
+
+	   if (has_audio_filters(FALSE)&&(pulsed->playing_file!=mainw->ascrap_file)) {
+	     boolean memok=TRUE;
+	     float **fltbuf=(float **)g_malloc(pulsed->out_achans*sizeof(float *));
+	     register int i;
+
+	     // we have audio filters; convert to float, pass through any audio filters, then back to s16
+	     for (i=0;i<pulsed->out_achans;i++) {
+	       // convert s16 to non-interleaved float
+	       fltbuf[i]=(float *)g_try_malloc(numFramesToWrite*sizeof(float));
+	       if (fltbuf[i]==NULL) {
+		 memok=FALSE;
+		 for (--i;i>=0;i--) {
+		   g_free(fltbuf[i]);
+		 }
+		 break;
+	       }
+
+	       sample_move_d16_float(fltbuf[i],(short*)pulsed->sound_buffer+i,numFramesToWrite,pulsed->out_achans,FALSE,FALSE,1.0);
+	     }
 
-	 swap_sign=afile->signed_endian&AFORM_UNSIGNED;
+	     if (memok) {
+	       int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(gdouble)pulsed->out_arate*U_SEC);
+	       // apply any audio effects with in_channels
+
+	       weed_apply_audio_effects_rt(fltbuf,pulsed->out_achans,numFramesToWrite,pulsed->out_arate,tc,FALSE);
+
+	       // convert float audio back to s16
+	       sample_move_float_int(pulsed->sound_buffer,fltbuf,numFramesToWrite,1.0,pulsed->out_achans,16,0,
+				     (capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
+
+	       for (i=0;i<pulsed->out_achans;i++) {
+		 g_free(fltbuf[i]);
+	       }
+	     }
+
+	     g_free(fltbuf);
+	   }
 
-	 if (pulsed->in_asamps==pulsed->out_asamps&&shrink_factor==1.&&pulsed->in_achans==pulsed->out_achans&&
-	     !pulsed->reverse_endian&&!swap_sign) {
-	   // no transformation needed
-	   pulsed->sound_buffer=buffer;
 	 }
 	 else {
-	   pulsed->sound_buffer=(guchar *)g_try_malloc0(pulsed->chunk_size);
-	   if (!pulsed->sound_buffer) {
-	     sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
-				  (pulsed->out_asamps>>3),xbytes);
-	     if (!pulsed->is_paused) pulsed->frames_written+=nframes;
-	     return;
+	   // audio generator
+	   // get float audio from gen, convert it to S16
+	   float *fbuffer=NULL;
+	   boolean pl_error=FALSE;
+	   xbytes=nbytes;
+	   numFramesToWrite=pulseFramesAvailable;
+
+	   if (mainw->agen_needs_reinit) pl_error=TRUE;
+	   else {
+	     fbuffer=(float *)g_malloc(numFramesToWrite*pulsed->out_achans*sizeof(float));
+	     if (!get_audio_from_plugin(fbuffer,pulsed->out_achans,pulsed->out_arate,numFramesToWrite)) {
+	       pl_error=TRUE;
+	     }
 	   }
-
-	   if (pulsed->in_asamps==8) {
-	     sample_move_d8_d16 ((short *)(pulsed->sound_buffer),(guchar *)buffer, numFramesToWrite, in_bytes, 
-				 shrink_factor, pulsed->out_achans, pulsed->in_achans, swap_sign?SWAP_U_TO_S:0);
+	   
+	   if (!pl_error) {
+	     if (G_UNLIKELY(nbytes>pulsed->aPlayPtr->max_size)) {
+	       pulsed->aPlayPtr->data=g_try_realloc(pulsed->aPlayPtr->data,nbytes);
+	       if (pulsed->aPlayPtr->data!=NULL) {
+		 memset(pulsed->aPlayPtr->data,0,nbytes);
+		 pulsed->aPlayPtr->max_size=nbytes;
+	       }
+	       else pl_error=TRUE;
+	     }
+	     pulsed->aPlayPtr->size=nbytes;
 	   }
+
+	   // get back non-interleaved float fbuffer; rate and channels should match
+	   if (pl_error) nbytes=0;
 	   else {
-	     sample_move_d16_d16((short*)pulsed->sound_buffer, (short*)buffer, numFramesToWrite, in_bytes, shrink_factor,
-				 pulsed->out_achans, pulsed->in_achans, pulsed->reverse_endian?SWAP_X_TO_L:0, 
-				 swap_sign?SWAP_U_TO_S:0);
+	     register int i;
+	     boolean memok=FALSE;
+	     float **fp=(float**)lives_malloc(pulsed->out_achans*sizeof(float *));
+	     void *buf;
+	     pulsed->sound_buffer=(guchar *)pulsed->aPlayPtr->data;
+	     buf=(void *)pulsed->sound_buffer;
+
+	     if (has_audio_filters(FALSE)) {
+	       register int i;
+
+	       memok=TRUE;
+
+	       // we have audio filters; convert to float, pass through any audio filters, then back to s16
+	       for (i=0;i<pulsed->out_achans;i++) {
+		 // convert s16 to non-interleaved float
+		 fp[i]=(float *)g_try_malloc(numFramesToWrite*sizeof(float));
+		 if (fp[i]==NULL) {
+		   memok=FALSE;
+		   for (--i;i>=0;i--) {
+		     g_free(fp[i]);
+		   }
+		   break;
+		 }
+		 
+		 lives_memcpy(fp[i],&fbuffer[i*numFramesToWrite],numFramesToWrite*sizeof(float));
+
+	       }
+	       
+	       if (memok) {
+		 int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(gdouble)pulsed->out_arate*U_SEC);
+		 // apply any audio effects with in_channels
+		 
+		 weed_apply_audio_effects_rt(fp,pulsed->out_achans,numFramesToWrite,pulsed->out_arate,tc,FALSE);
+		 
+		 // convert float audio to s16
+		 sample_move_float_int(buf,fp,numFramesToWrite,1.0,pulsed->out_achans,16,FALSE,
+				       (capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
+		 
+		 for (i=0;i<pulsed->out_achans;i++) {
+		   g_free(fp[i]);
+		 }
+	       }
+	     }
+
+	     if (!memok) {
+	       // no audio effects; or memory allocation error
+	       for (i=0;i<pulsed->out_achans;i++) {
+		 fp[i]=fbuffer+(i*numFramesToWrite);
+	       }
+	       sample_move_float_int(buf,fp,numFramesToWrite,1.0,
+				     pulsed->out_achans,16,0,(capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
+	     }
+
+	     if (fbuffer!=NULL) g_free(fbuffer);
+	     free(fp);
+
+	     if (mainw->record&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
+	       // write generated audio to ascrap_file
+	       size_t rbytes=numFramesToWrite*mainw->files[mainw->ascrap_file]->achans*
+		 mainw->files[mainw->ascrap_file]->asampsize>>3;
+	       pulse_flush_read_data(pulsed,mainw->ascrap_file,nbytes,mainw->files[mainw->ascrap_file]->signed_endian&AFORM_BIG_ENDIAN,buf);
+	       mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+	     }
 	   }
 	 }
 
@@ -496,12 +683,13 @@
 	       if (!pulsed->is_paused) pulsed->frames_written+=nframes;
 	       return;
 	     }
-	     lives_memcpy(buffer,pulsed->sound_buffer+offs,xbytes);
+	     if (pulsed->sound_buffer) lives_memcpy(buffer,pulsed->sound_buffer+offs,xbytes);
 	     offs+=xbytes;
 	     needs_free=TRUE;
 	   }
 	   if (pulsed->astream_fd!=-1) audio_stream(buffer,xbytes,pulsed->astream_fd);
-	   pa_stream_write(pulsed->pstream,buffer,xbytes,buffer==pulsed->aPlayPtr->data?NULL:pulse_buff_free,0,PA_SEEK_RELATIVE);
+	   pa_stream_write(pulsed->pstream,buffer,xbytes,buffer==pulsed->aPlayPtr->data?NULL:
+			   pulse_buff_free,0,PA_SEEK_RELATIVE);
 	 }
 	 else {
 	   if (pulsed->read_abuf>-1&&!pulsed->mute) {
@@ -518,8 +706,10 @@
 	nbytes-=xbytes;
       }
       
-      if (needs_free&&pulsed->sound_buffer!=pulsed->aPlayPtr->data) g_free(pulsed->sound_buffer);
-      
+       if (needs_free&&pulsed->sound_buffer!=pulsed->aPlayPtr->data&&pulsed->sound_buffer!=NULL) {
+	 g_free(pulsed->sound_buffer);
+	 pulsed->sound_buffer=NULL;
+       }
     }
 
     if(pulseFramesAvailable) {
@@ -549,41 +739,64 @@
 
 
 
-void pulse_flush_read_data(pulse_driver_t *pulsed, size_t rbytes, void *data) {
+size_t pulse_flush_read_data(pulse_driver_t *pulsed, int fileno, size_t rbytes, boolean rev_endian, void *data) {
   short *gbuf;
-  size_t bytes_out,frames_out;
+  size_t bytes_out,frames_out,bytes=0;
   void *holding_buff;
-  float out_scale=(float)pulsed->in_arate/(float)afile->arate;
 
-  int swap_sign=afile->signed_endian&AFORM_UNSIGNED;
+  float out_scale;
+  int swap_sign;
+
+  file *ofile;
 
-  if (prb==0||mainw->rec_samples==0) return;
 
-  gbuf=(short *)g_try_malloc(prb);
+  if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+    if (prb==0||mainw->rec_samples==0) return 0;
+    if (prb<=PULSE_READ_BYTES*2&&rbytes>0) {
+      gbuf=(short *)data;
+    }
+    else {
+      gbuf=(short *)g_try_malloc(prb);
+      if (!gbuf) return 0;
+      lives_memcpy(gbuf,prbuf,prb-rbytes);
+      if (rbytes>0) lives_memcpy(gbuf+(prb-rbytes)/sizeof(short),data,rbytes);
+    }
+    ofile=afile;
+  }
+  else {
+    if (rbytes==0) return 0;
+    if (fileno==-1) return 0;
+    gbuf=(short *)data;
+    prb=rbytes;
+    ofile=mainw->files[fileno];
+  }
 
-  if (!gbuf) return;
+  out_scale=(float)pulsed->in_arate/(float)ofile->arate;
+  swap_sign=ofile->signed_endian&AFORM_UNSIGNED;
 
-  lives_memcpy(gbuf,prbuf,prb-rbytes);
-  if (rbytes>0) lives_memcpy(gbuf+(prb-rbytes)/sizeof(short),data,rbytes);
+  frames_out=(size_t)((gdouble)((prb/(ofile->asampsize>>3)/ofile->achans))/out_scale+.5);
 
-  frames_out=(size_t)((gdouble)((prb/(pulsed->in_asamps>>3)/pulsed->in_achans))/out_scale+.5);
+  if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+    if (frames_out != pulsed->chunk_size) pulsed->chunk_size = frames_out;
+  }
 
-  bytes_out=frames_out*afile->achans*(afile->asampsize>>3);
+  bytes_out=frames_out*ofile->achans*(ofile->asampsize>>3);
 
   holding_buff=g_try_malloc(bytes_out);
 
-  if (!holding_buff) return;
-
-  if (frames_out != pulsed->chunk_size) pulsed->chunk_size = frames_out;
+  if (!holding_buff) return 0;
 
-  if (afile->asampsize==16) {
-    sample_move_d16_d16((short *)holding_buff,gbuf,frames_out,prb,out_scale,afile->achans,pulsed->in_achans,pulsed->reverse_endian?SWAP_L_TO_X:0,swap_sign?SWAP_S_TO_U:0);
+  if (ofile->asampsize==16) {
+    sample_move_d16_d16((short *)holding_buff,gbuf,frames_out,prb,out_scale,ofile->achans,pulsed->in_achans,pulsed->reverse_endian?SWAP_L_TO_X:0,swap_sign?SWAP_S_TO_U:0);
   }
   else {
-    sample_move_d16_d8((uint8_t *)holding_buff,gbuf,frames_out,prb,out_scale,afile->achans,pulsed->in_achans,swap_sign?SWAP_S_TO_U:0);
+    sample_move_d16_d8((uint8_t *)holding_buff,gbuf,frames_out,prb,out_scale,ofile->achans,pulsed->in_achans,swap_sign?SWAP_S_TO_U:0);
   }
     
-  g_free(gbuf);
+  if (gbuf!=(short *)data) {
+    g_free(gbuf);
+  }
+
   prb=0;
 
   if (mainw->rec_samples>0) {
@@ -592,7 +805,7 @@
   }
 
   if (mainw->bad_aud_file==NULL) {
-    size_t target=frames_out*(afile->asampsize/8)*afile->achans,bytes;
+    size_t target=frames_out*(ofile->asampsize/8)*ofile->achans,bytes;
     // use write not lives_write - because of potential threading issues
     bytes=write (mainw->aud_rec_fd,holding_buff,target);
     if (bytes<target) mainw->bad_aud_file=filename_from_fd(NULL,mainw->aud_rec_fd);
@@ -600,38 +813,105 @@
 
   g_free(holding_buff);
 
+  return bytes;
 }
 
 
 
 static void pulse_audio_read_process (pa_stream *pstream, size_t nbytes, void *arg) {
-  // read nframes from pulse buffer, and then write to mainw->aud_rec_fd
+  // read nframes from pulse buffer, and then possibly write to mainw->aud_rec_fd
 
-  // this is the callback from pulse when we are recording
+  // this is the callback from pulse when we are recording or playing external audio
 
   pulse_driver_t* pulsed = (pulse_driver_t*)arg;
-  float out_scale=(float)pulsed->in_arate/(float)afile->arate;
-  size_t frames_out;
+  float out_scale;
+  size_t frames_out,nframes;
   void *data;
   size_t rbytes=nbytes;
 
-  if (mainw->effects_paused) return; // pause during record
+  if (mainw->playing_file<0&&prefs->audio_src==AUDIO_SRC_EXT) return; 
+
+  if (mainw->effects_paused) return; // pause during record ???
 
   pa_stream_peek(pulsed->pstream,(const void**)&data,&rbytes);
 
   if (data==NULL) return;
 
-  prb+=rbytes;
+  if (pulsed->playing_file==-1) {
+    out_scale=1.0; // just listening, no recording
+  }
+  else {
+    out_scale=(float)pulsed->in_arate/(float)afile->arate; // recording to ascrap_file
+    prb+=rbytes;
+  }
+
+  if (pulsed->playing_file==-1||(mainw->record&&mainw->record_paused)) prb=0;
 
   frames_out=(size_t)((gdouble)((prb/(pulsed->in_asamps>>3)/pulsed->in_achans))/out_scale+.5);
   
+  nframes=(size_t)((gdouble)((rbytes/(pulsed->in_asamps>>3)/pulsed->in_achans))/out_scale+.5);
+
   // should really be frames_read here
-  pulsed->frames_written+=(size_t)((gdouble)((rbytes/(pulsed->in_asamps>>3)/pulsed->in_achans))/out_scale+.5);
+  pulsed->frames_written+=nframes;
+
+
+  if (prefs->audio_src==AUDIO_SRC_EXT&&(pulsed->playing_file==-1||pulsed->playing_file==mainw->ascrap_file)) {
+    // - (do not call this when recording ext window or voiceover)
+
+    // in this case we read external audio, but maybe not record it
+    // we may wish to analyse the audio for example
+
+    if (has_audio_filters(TRUE)) {
+      // convert to float, apply any analysers
+      boolean memok=TRUE;
+      float **fltbuf=(float **)g_malloc(pulsed->in_achans*sizeof(float *));
+      register int i;
+
+      size_t xnframes=(size_t)(rbytes/(pulsed->in_asamps>>3)/pulsed->in_achans);
+
+      for (i=0;i<pulsed->in_achans;i++) {
+	// convert s16 to non-interleaved float
+	fltbuf[i]=(float *)g_try_malloc(xnframes*sizeof(float));
+	if (fltbuf[i]==NULL) {
+	  memok=FALSE;
+	  for (--i;i>=0;i--) {
+	    g_free(fltbuf[i]);
+	  }
+	  break;
+	}
+	
+	sample_move_d16_float(fltbuf[i],(short*)data+i,xnframes,pulsed->in_achans,FALSE,FALSE,1.0);
+      }
+      
+      if (memok) {
+	int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(gdouble)pulsed->in_arate*U_SEC);
+	// apply any audio effects with in channels but no out channels
+	weed_apply_audio_effects_rt(fltbuf,pulsed->in_achans,xnframes,pulsed->in_arate,tc,TRUE);
+	
+	for (i=0;i<pulsed->in_achans;i++) {
+	  g_free(fltbuf[i]);
+	}
+      }
+      
+      g_free(fltbuf);
+
+    }
+
+  }
+
+  if (pulsed->playing_file==-1||(mainw->record&&mainw->record_paused)) {
+    pa_stream_drop(pulsed->pstream);
+    return;
+  }
 
-  if (mainw->record&&(prefs->rec_opts&REC_EXT_AUDIO)&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
-    mainw->files[mainw->playing_file]->aseek_pos+=rbytes;
-    pulsed->seek_pos+=rbytes;
+  if (mainw->playing_file!=mainw->ascrap_file) {
+    if (mainw->playing_file!=-1) mainw->files[mainw->playing_file]->aseek_pos+=rbytes;
+    if (mainw->ascrap_file!=-1&&!mainw->record_paused) mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
   }
+  else if (mainw->ascrap_file!=-1&&!mainw->record_paused) mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+
+  pulsed->seek_pos+=rbytes;
+
 
   if (prb<PULSE_READ_BYTES&&(mainw->rec_samples==-1||frames_out<mainw->rec_samples)) {
     // buffer until we have enough
@@ -640,7 +920,11 @@
     return;
   }
 
-  pulse_flush_read_data(pulsed,rbytes,data);
+  if (prb<=PULSE_READ_BYTES*2) {
+    lives_memcpy(&prbuf[prb-rbytes],data,rbytes);
+    pulse_flush_read_data(pulsed,mainw->playing_file,prb,pulsed->reverse_endian,prbuf);
+  }
+  else pulse_flush_read_data(pulsed,mainw->playing_file,rbytes,pulsed->reverse_endian,data);
 
   pa_stream_drop(pulsed->pstream);
 
@@ -712,6 +996,7 @@
   pulsed.pstream=NULL;
   pulsed.pa_props=NULL;
   pulsed.playing_file=-1;
+  pulsed.sound_buffer=NULL;
   return 0;
 }
 
@@ -741,16 +1026,21 @@
   pulsed_reader.is_paused=FALSE;
   pulsed_reader.pstream=NULL;
   pulsed_reader.pa_props=NULL;
+  pulsed_reader.sound_buffer=NULL;
 
   return 0;
 }
 
 
+void set_process_callback_pulse(pulse_driver_t *pdriver, boolean activate) {
+  if (activate) pa_stream_set_write_callback(pdriver->pstream,pulse_audio_write_process,pdriver);
+  else pa_stream_set_write_callback(pdriver->pstream,pulse_audio_write_process_dummy,pdriver);
+}
 
 
 int pulse_driver_activate(pulse_driver_t *pdriver) {
 // create a new client and connect it to pulse server
-  gchar *pa_clientname="LiVES_audio_out";
+  gchar *pa_clientname;
   gchar *mypid;
 
   pa_sample_spec pa_spec;
@@ -765,6 +1055,14 @@
 
   if (mainw->aplayer_broken) return 2;
 
+
+  if (pdriver->is_output) {
+    pa_clientname="LiVES_audio_out";
+  }
+  else {
+    pa_clientname="LiVES_audio_in";
+  }
+
   mypid=g_strdup_printf("%d",getpid());
 
   pdriver->pa_props=pa_proplist_new();
@@ -786,7 +1084,7 @@
   pdriver->in_asamps=pdriver->out_asamps=16;
   pdriver->out_signed=0;
 
-  if (G_BYTE_ORDER==G_BIG_ENDIAN) pdriver->out_endian=AFORM_BIG_ENDIAN;
+  if (capable->byte_order==LIVES_BIG_ENDIAN) pdriver->out_endian=AFORM_BIG_ENDIAN;
   else pdriver->out_endian=AFORM_LITTLE_ENDIAN;
 
   if (pdriver->is_output) {
@@ -825,13 +1123,18 @@
     pa_cvolume_set(&out_vol,pdriver->out_achans,pavol);
 
     // set write callback
-    pa_stream_set_write_callback(pdriver->pstream,pulse_audio_write_process,pdriver);
+    set_process_callback_pulse(pdriver,TRUE);
 
 #ifdef PA_STREAM_START_UNMUTED
     pa_stream_connect_playback(pdriver->pstream,NULL,&pa_battr,
-			       (pa_stream_flags_t)(PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY|PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE),&out_vol,NULL);
+			       (pa_stream_flags_t)(PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY|
+						   PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE),
+			       &out_vol,NULL);
 #else
-    pa_stream_connect_playback(pdriver->pstream,NULL,&pa_battr,(pa_stream_flags_t)(PA_STREAM_ADJUST_LATENCY|PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE),&out_vol,NULL);
+    pa_stream_connect_playback(pdriver->pstream,NULL,&pa_battr,(pa_stream_flags_t)(PA_STREAM_ADJUST_LATENCY|
+										   PA_STREAM_INTERPOLATE_TIMING|
+										   PA_STREAM_AUTO_TIMING_UPDATE),
+			       &out_vol,NULL);
 #endif
 
     while (pa_stream_get_state(pdriver->pstream)!=PA_STREAM_READY) {
@@ -870,7 +1173,7 @@
 ///////////////////////////////////////////////////////////////
 
 
-pulse_driver_t *pulse_get_driver(gboolean is_output) {
+pulse_driver_t *pulse_get_driver(boolean is_output) {
   if (is_output) return &pulsed;
   return &pulsed_reader;
 }
@@ -887,17 +1190,16 @@
 
 
 
-gint64 lives_pulse_get_time(pulse_driver_t *pulsed, gboolean absolute) {
+int64_t lives_pulse_get_time(pulse_driver_t *pulsed, boolean absolute) {
   // get the time in ticks since either playback started or since last seek
 
   volatile aserver_message_t *msg=pulsed->msgq;
   gdouble frames_written;
 
-  frames_written=pulsed->frames_written;
-  if (frames_written<0.) frames_written=0.;
+  int64_t xtime;
 
   if (msg!=NULL&&msg->command==ASERVER_CMD_FILE_SEEK) {
-    gboolean timeout;
+    boolean timeout;
     int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
     while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(pulsed)!=NULL) {
       sched_yield(); // wait for seek
@@ -906,15 +1208,21 @@
     lives_alarm_clear(alarm_handle);
   }
 
+  frames_written=pulsed->frames_written;
+  if (frames_written<0.) frames_written=0.;
+
 #ifdef USE_PA_INTERP_TIME
   {
     pa_usec_t usec;
     pa_stream_get_time(pulsed->pstream,&usec);
-    return pulsed->audio_ticks*absolute+(gint64)((usec-pulsed->usec_start)*U_SEC_RATIO);
+    return pulsed->audio_ticks*absolute+(int64_t)((usec-pulsed->usec_start)*U_SEC_RATIO);
   }
 #else
-  if (pulsed->is_output) return pulsed->audio_ticks*absolute+(gint64)(frames_written/(gdouble)pulsed->out_arate*U_SEC);
-  return pulsed->audio_ticks*absolute+(gint64)(frames_written/(gdouble)afile->arate*U_SEC);
+  pthread_mutex_lock(&mainw->afilter_mutex);
+  if (pulsed->is_output) xtime = pulsed->audio_ticks*absolute+(int64_t)(frames_written/(gdouble)pulsed->out_arate*U_SEC);
+  else xtime = pulsed->audio_ticks*absolute+(int64_t)(frames_written/(gdouble)afile->arate*U_SEC);
+  pthread_mutex_unlock(&mainw->afilter_mutex);
+  return xtime;
 #endif
 
 }
@@ -926,13 +1234,13 @@
 
 
 
-gboolean pulse_audio_seek_frame (pulse_driver_t *pulsed, gint frame) {
+boolean pulse_audio_seek_frame (pulse_driver_t *pulsed, gint frame) {
   // seek to frame "frame" in current audio file
   // position will be adjusted to (floor) nearest sample
-  long seekstart;
+  int64_t seekstart;
   volatile aserver_message_t *pmsg;
   int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-  gboolean timeout;
+  boolean timeout;
 
   if (alarm_handle==-1) {
     LIVES_WARN("Invalid alarm handle");
@@ -951,23 +1259,23 @@
   }
   lives_alarm_clear(alarm_handle);
   if (frame>afile->frames) frame=afile->frames;
-  seekstart=(long)((gdouble)(frame-1.)/afile->fps*afile->arate)*afile->achans*(afile->asampsize/8);
+  seekstart=(int64_t)((gdouble)(frame-1.)/afile->fps*afile->arate)*afile->achans*(afile->asampsize/8);
   pulse_audio_seek_bytes(pulsed,seekstart);
   return TRUE;
 }
 
 
-long pulse_audio_seek_bytes (pulse_driver_t *pulsed, long bytes) {
+int64_t pulse_audio_seek_bytes (pulse_driver_t *pulsed, int64_t bytes) {
   // seek to position "bytes" in current audio file
   // position will be adjusted to (floor) nearest sample
 
   // if the position is > size of file, we will seek to the end of the file
   volatile aserver_message_t *pmsg;
 
-  gboolean timeout;
+  boolean timeout;
   int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
 
-  long seekstart;
+  int64_t seekstart;
 
   if (alarm_handle==-1) {
     LIVES_WARN("Invalid alarm handle");
@@ -985,7 +1293,7 @@
   }
   lives_alarm_clear(alarm_handle);
 
-  seekstart=((long)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8);
+  seekstart=((int64_t)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8);
 
   if (seekstart<0) seekstart=0;
   if (seekstart>afile->afilesize) seekstart=afile->afilesize;
@@ -996,7 +1304,7 @@
   return seekstart;
 }
 
-gboolean pulse_try_reconnect(void) {
+boolean pulse_try_reconnect(void) {
    mainw->pulsed=NULL;
    pa_mloop=NULL;
    if (!lives_pulse_init(9999)) goto err123; // init server
@@ -1019,6 +1327,8 @@
 
 
 void pulse_aud_pb_ready(gint fileno) {
+  // TODO - can we merge with switch_audio_clip() ?
+
   // prepare to play file fileno
   // - set loop mode
   // - check if we need to reconnect
@@ -1045,7 +1355,7 @@
 	  g_file_test((tmpfilename=g_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL)),
 		      G_FILE_TEST_EXISTS)))) {
       
-      gboolean timeout;
+      boolean timeout;
       int alarm_handle;
       
       if (tmpfilename!=NULL) g_free(tmpfilename);
@@ -1057,7 +1367,7 @@
       if (sfile->opening) mainw->pulsed->is_opening=TRUE;
       else mainw->pulsed->is_opening=FALSE;
       
-      if ((aendian&&(G_BYTE_ORDER==G_BIG_ENDIAN))||(!aendian&&(G_BYTE_ORDER==G_LITTLE_ENDIAN))) 
+      if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||(!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
 	mainw->pulsed->reverse_endian=TRUE;
       else mainw->pulsed->reverse_endian=FALSE;
       
@@ -1088,6 +1398,7 @@
 	mainw->rec_aseek=(gdouble)sfile->aseek_pos/(gdouble)(sfile->arate*sfile->achans*(sfile->asampsize/8));
       }
     }
+    if (mainw->agen_key!=0&&mainw->multitrack==NULL) mainw->pulsed->in_use=TRUE; // audio generator is active
   }
 }

LiVES-1.6.1.tar.bz2/src/pulse.h -> LiVES-2.0.3.tar.bz2/src/pulse.h Changed

@@ -41,16 +41,16 @@
   pa_context_state_t state;
 
   // app side
-  glong in_arate; /**< samples(frames) per second */
-  gulong in_achans; /**< number of input channels(1 is mono, 2 stereo etc..) */
-  gulong in_asamps;
+  int64_t in_arate; /**< samples(frames) per second */
+  uint64_t in_achans; /**< number of input channels(1 is mono, 2 stereo etc..) */
+  uint64_t in_asamps;
 
   // server side
-  glong out_arate; /**< samples(frames) per second */
-  gulong out_achans; /**< number of output channels(1 is mono, 2 stereo etc..) */
-  gulong out_asamps;
+  int64_t out_arate; /**< samples(frames) per second */
+  uint64_t out_achans; /**< number of output channels(1 is mono, 2 stereo etc..) */
+  uint64_t out_asamps;
 
-  gulong out_chans_available;
+  uint64_t out_chans_available;
 
   int in_signed;
   int in_endian;
@@ -58,7 +58,7 @@
   int out_signed;
   int out_endian;
 
-  gulong num_calls; /**< count of process_audio() calls */
+  uint64_t num_calls; /**< count of process_audio() calls */
 
   audio_buffer_t* aPlayPtr; ///< data read from file
   lives_audio_loop_t loop;
@@ -67,40 +67,40 @@
 
   float volume[PULSE_MAX_OUTPUT_CHANS]; ///< amount volume, 1.0 is full volume
 
-  gboolean in_use; /**< true if this device is currently in use */
-  gboolean mute;
+  boolean in_use; /**< true if this device is currently in use */
+  boolean mute;
 
   /**< linked list of messages we are sending to the callback process */
   volatile aserver_message_t   *msgq;
 
-  volatile gulong frames_written;
+  volatile uint64_t frames_written;
 
-  gboolean is_paused;
+  boolean is_paused;
 
   volatile gint64 audio_ticks; ///< ticks when we did the last seek, used to calculate current ticks from audio
 
   int fd; /**< if >0 we are playing from a file */
-  gboolean is_opening; ///< TRUE if file is opening (audiodump.pcm)
+  boolean is_opening; ///< TRUE if file is opening (audiodump.pcm)
   volatile off_t seek_pos;
   off_t seek_end;
-  gboolean usigned;
-  gboolean reverse_endian;
+  boolean usigned;
+  boolean reverse_endian;
 
   lives_whentostop_t *whentostop; ///< pointer to mainw->whentostop
   volatile lives_cancel_t *cancelled; ///< pointer to mainw->cancelled
 
   /* variables used for trying to restart the connection to pulse */
-  gboolean pulsed_died;
+  boolean pulsed_died;
   struct timeval last_reconnect_attempt;
 
-  gboolean is_output; ///< is output FROM host to jack
+  boolean is_output; ///< is output FROM host to jack
 
   gint playing_file;
 
   lives_audio_buf_t **abufs;
   volatile gint read_abuf;
 
-  gulong chunk_size;
+  uint64_t chunk_size;
 
   volatile int astream_fd;
 
@@ -110,12 +110,12 @@
 
 // TODO - rationalise names
 
-gboolean lives_pulse_init (short startup_phase); ///< init server, mainloop and context
+boolean lives_pulse_init (short startup_phase); ///< init server, mainloop and context
 
 int pulse_audio_init(void);  ///< init driver vars.
 int pulse_audio_read_init(void); // ditto
 
-pulse_driver_t *pulse_get_driver(gboolean is_output); ///< get driver refs
+pulse_driver_t *pulse_get_driver(boolean is_output); ///< get driver refs
 
 int pulse_driver_activate(pulse_driver_t *); ///< connect to server
 void pulse_close_client(pulse_driver_t *);
@@ -124,25 +124,25 @@
 
 void pulse_aud_pb_ready(gint fileno);
 
-void pulse_flush_read_data(pulse_driver_t *, size_t rbytes, void *data);
+size_t pulse_flush_read_data(pulse_driver_t *pulsed, int fileno, size_t rbytes, boolean rev_endian, void *data);
 
 void pulse_driver_uncork(pulse_driver_t *);
 
-gboolean pulse_try_reconnect(void);
+boolean pulse_try_reconnect(void);
 
 // utils
 volatile aserver_message_t *pulse_get_msgq(pulse_driver_t *); ///< pull last msg from msgq, or return NULL
 
-long pulse_audio_seek_bytes (pulse_driver_t *, long bytes); ///< seek to byte position
+int64_t pulse_audio_seek_bytes (pulse_driver_t *, int64_t bytes); ///< seek to byte position
 
-gint64 lives_pulse_get_time(pulse_driver_t *, gboolean absolute); ///< get time from pa, in 10^-8 seconds
+int64_t lives_pulse_get_time(pulse_driver_t *, boolean absolute); ///< get time from pa, in 10^-8 seconds
 
 gdouble lives_pulse_get_pos(pulse_driver_t *);
 
 
 //////////////////////
 
-gboolean pulse_audio_seek_frame (pulse_driver_t *, gint frame); ///< seek to (video) frame
+boolean pulse_audio_seek_frame (pulse_driver_t *, gint frame); ///< seek to (video) frame
 
 void pulse_get_rec_avals(pulse_driver_t *);

LiVES-1.6.1.tar.bz2/src/resample.c -> LiVES-2.0.3.tar.bz2/src/resample.c Changed

@@ -1,6 +1,6 @@
 // resample.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -23,50 +23,50 @@
 #include "audio.h"
 #include "cvirtual.h"
 
-static gint reorder_width=0;
-static gint reorder_height=0;
-static gboolean reorder_leave_back=FALSE;
+static int reorder_width=0;
+static int reorder_height=0;
+static boolean reorder_leave_back=FALSE;
 
 /////////////////////////////////////////////////////
 
-LIVES_INLINE weed_timecode_t q_gint64 (weed_timecode_t in, gdouble fps) {
+LIVES_INLINE weed_timecode_t q_gint64 (weed_timecode_t in, double fps) {
   if (in>(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps+(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
   if (in<(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps-(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
   return (weed_timecode_t)0;
 }
 
-LIVES_INLINE weed_timecode_t q_gint64_floor (weed_timecode_t in, gdouble fps) {
+LIVES_INLINE weed_timecode_t q_gint64_floor (weed_timecode_t in, double fps) {
   if (in!=(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
   return (weed_timecode_t)0;
 }
 
-LIVES_INLINE weed_timecode_t q_dbl (gdouble in, gdouble fps) {
+LIVES_INLINE weed_timecode_t q_dbl (double in, double fps) {
   if (in>0.) return ((weed_timecode_t)((long double)in*(long double)fps+(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
   if (in<0.) return ((weed_timecode_t)((long double)in*(long double)fps-(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
   return (weed_timecode_t)0;
 }
 
 
-LIVES_INLINE gint count_resampled_frames (gint in_frames, gdouble orig_fps, gdouble resampled_fps) {
-  gint res_frames;
-  if (resampled_fps<orig_fps) return ((res_frames=(gint)((gdouble)in_frames/orig_fps*resampled_fps))<1)?1:res_frames;
-  else return ((res_frames=(gint)((gdouble)in_frames/orig_fps*resampled_fps+.49999))<1)?1:res_frames;
+LIVES_INLINE int count_resampled_frames (int in_frames, double orig_fps, double resampled_fps) {
+  int res_frames;
+  if (resampled_fps<orig_fps) return ((res_frames=(int)((double)in_frames/orig_fps*resampled_fps))<1)?1:res_frames;
+  else return ((res_frames=(int)((double)in_frames/orig_fps*resampled_fps+.49999))<1)?1:res_frames;
 }
 
 /////////////////////////////////////////////////////
 
-gboolean auto_resample_resize (gint width,gint height,gdouble fps,gint fps_num,gint fps_denom, gint arate, 
-			       gint asigned, gboolean swap_endian) {
+boolean auto_resample_resize (int width,int height,double fps,int fps_num,int fps_denom, int arate, 
+			       int asigned, boolean swap_endian) {
   // do a block atomic: resample audio, then resample video/resize or joint resample/resize
 
   gchar *com,*msg=NULL;
-  gint current_file=mainw->current_file;
-  gboolean audio_resampled=FALSE;
-  gboolean video_resampled=FALSE;
-  gboolean video_resized=FALSE;
-  gboolean bad_header=FALSE;
+  int current_file=mainw->current_file;
+  boolean audio_resampled=FALSE;
+  boolean video_resampled=FALSE;
+  boolean video_resized=FALSE;
+  boolean bad_header=FALSE;
 	  
-  gint frames=cfile->frames;
+  int frames=cfile->frames;
 
   reorder_leave_back=FALSE;
 
@@ -105,7 +105,7 @@
     if ((width!=cfile->hsize||height!=cfile->vsize)&&width*height>0) {
       // CHANGING SIZE..
       if (fps>cfile->fps) {
-	gboolean rs_builtin;
+	boolean rs_builtin;
 	lives_rfx_t *resize_rfx;
 
 	// we will have more frames...
@@ -119,8 +119,9 @@
 	  }
 
 	  if (!prefs->enc_letterbox) {
-	    com=g_strdup_printf ("smogrify resize_all \"%s\" %d %d %d \"%s\"",cfile->handle,cfile->frames,width,height,
-				 cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	    com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\"",prefs->backend,
+				 cfile->handle,cfile->frames,width,height,
+				 get_image_ext_for_type(cfile->img_type));
 	    msg=g_strdup_printf(_("Resizing frames 1 to %d"),cfile->frames);
 	  }
 	  else {
@@ -133,9 +134,9 @@
 	    }
 
 	    reorder_leave_back=TRUE;
-	    com=g_strdup_printf ("smogrify resize_all \"%s\" %d %d %d \"%s\" %d %d",cfile->handle,
+	    com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\" %d %d",prefs->backend,cfile->handle,
 				 cfile->frames,width,height,
-				 cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",iwidth,iheight);
+				 get_image_ext_for_type(cfile->img_type),iwidth,iheight);
 	    msg=g_strdup_printf(_("Resizing/letterboxing frames 1 to %d"),cfile->frames);
 	  }
 
@@ -281,7 +282,7 @@
     }
   }
   else {
-    gboolean rs_builtin=TRUE;
+    boolean rs_builtin=TRUE;
     lives_rfx_t *resize_rfx;
     // NO FPS CHANGE
     if ((width!=cfile->hsize||height!=cfile->vsize)&&width*height>0) {
@@ -297,8 +298,9 @@
 	}
 
 	if (!prefs->enc_letterbox) {
-	  com=g_strdup_printf ("smogrify resize_all \"%s\" %d %d %d \"%s\"",cfile->handle,cfile->frames,width,height,
-			       cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	  com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\"",prefs->backend,
+			       cfile->handle,cfile->frames,width,height,
+			       get_image_ext_for_type(cfile->img_type));
 	  msg=g_strdup_printf(_("Resizing frames 1 to %d"),cfile->frames);
 	}
 	else {
@@ -310,8 +312,9 @@
 	    iheight=-iheight;
 	  }
 
-	  com=g_strdup_printf ("smogrify resize_all \"%s\" %d %d %d \"%s\" %d %d",cfile->handle,cfile->frames,width,height,
-			       cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",iwidth,iheight);
+	  com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\" %d %d",prefs->backend,
+			       cfile->handle,cfile->frames,width,height,
+			       get_image_ext_for_type(cfile->img_type),iwidth,iheight);
 	  msg=g_strdup_printf(_("Resizing/letterboxing frames 1 to %d"),cfile->frames);
 	}
 
@@ -407,7 +410,7 @@
 //////////////////////////////////////////////////////////////////
 
 WARN_UNUSED weed_plant_t *
-quantise_events (weed_plant_t *in_list, gdouble qfps, gboolean allow_gap) { 
+quantise_events (weed_plant_t *in_list, double qfps, boolean allow_gap) { 
   // new style event system, now we quantise from event_list_t *in_list to *out_list with period tl/U_SEC
 
   // the timecode of the midpoint of our last frame events will match as near as possible the old length
@@ -421,13 +424,13 @@
   weed_plant_t *last_audio_event=NULL;
   weed_plant_t *event,*last_frame_event,*penultimate_frame_event,*next_frame_event,*shortcut=NULL;
   weed_timecode_t out_tc=0,in_tc=-1,nearest_tc=LONG_MAX;
-  gboolean is_first=TRUE;
+  boolean is_first=TRUE;
   weed_timecode_t tc_end,tp;
   int *out_clips=NULL,*out_frames=NULL;
   int numframes=0;
   weed_timecode_t tl=q_dbl(1./qfps,qfps);
   int error;
-  gboolean needs_audio=FALSE,add_audio=FALSE;
+  boolean needs_audio=FALSE,add_audio=FALSE;
   int *aclips=NULL;
   double *aseeks=NULL;
   int num_aclips=0;
@@ -609,13 +612,13 @@
       if (get_first_event(out_list)==NULL) weed_set_voidptr_value(out_list,"first",get_last_event(out_list));
     }
   }
-
+  
   if (out_clips!=NULL) weed_free(out_clips);
   if (out_frames!=NULL) weed_free(out_frames);
 
   if (aclips!=NULL) weed_free(aclips);
   if (aseeks!=NULL) weed_free(aseeks);
-
+  
   return out_list;
 }
 
@@ -625,7 +628,7 @@
 
 static void on_reorder_activate (int rwidth, int rheight) {
   gchar *msg;
-  gboolean has_lmap_error=FALSE;
+  boolean has_lmap_error=FALSE;
 
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
     if (!do_layout_alter_frames_warning()) {
@@ -715,26 +718,26 @@
 					     GtkEntry *entry)
 {
   gchar *com,*msg;  
-  gint arate,achans,asampsize,arps;
+  int arate,achans,asampsize,arps;
   int asigned=1,aendian=1;
-  gint cur_signed,cur_endian;
-  gboolean noswitch=mainw->noswitch;
-  gboolean has_lmap_error=FALSE;
+  int cur_signed,cur_endian;
+  boolean noswitch=mainw->noswitch;
+  boolean has_lmap_error=FALSE;
 
   if (button!=NULL) {
-    arps=arate=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
-    achans=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
-    asampsize=(gint)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
+    arps=arate=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_arate)));
+    achans=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_achans)));
+    asampsize=(int)atoi (gtk_entry_get_text(GTK_ENTRY(resaudw->entry_asamps)));
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       asigned=0;
     }
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(resaudw->rb_bigend))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
       aendian=0;
     }
 
     gtk_widget_destroy (resaudw->dialog);
     mainw->noswitch=TRUE;
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     mainw->noswitch=noswitch;
     g_free (resaudw);
     
@@ -781,10 +784,11 @@
   if (!(arate==cfile->arate&&arps==cfile->arps&&achans==cfile->achans&&asampsize==cfile->asampsize&&
 	asigned==cur_signed&&aendian==cur_endian)) {
     if (cfile->arps!=cfile->arate) {
-      gdouble audio_stretch=(gdouble)cfile->arps/(gdouble)cfile->arate;
+      double audio_stretch=(double)cfile->arps/(double)cfile->arate;
      // pb rate != real rate - stretch to pb rate and resample 
       unlink (cfile->info_file);
-      com=g_strdup_printf ("smogrify resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",cfile->handle,cfile->arps,
+      com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",prefs->backend,
+			   cfile->handle,cfile->arps,
 			   cfile->achans,cfile->asampsize,cur_signed,cur_endian,arps,cfile->achans,cfile->asampsize,
 			   cur_signed,cur_endian,audio_stretch);
       mainw->com_failed=FALSE;
@@ -796,7 +800,8 @@
     }
     else {
       unlink (cfile->info_file);
-      com=g_strdup_printf ("smogrify resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",cfile->handle,cfile->arps,
+      com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",prefs->backend,
+			   cfile->handle,cfile->arps,
 			   cfile->achans,cfile->asampsize,cur_signed,cur_endian,arps,achans,asampsize,asigned,aendian);
       mainw->com_failed=FALSE;
       mainw->cancelled=CANCEL_NONE;
@@ -873,7 +878,7 @@
   _resaudw *resaudw=(_resaudw *)user_data;
   gchar *tmp;
 
-  if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widg))) {
+  if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widg))) {
     gtk_widget_set_sensitive (resaudw->rb_signed,FALSE);
     gtk_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
     gtk_widget_set_sensitive (resaudw->rb_bigend,FALSE);
@@ -884,12 +889,12 @@
     if (prefsw!=NULL) {
       gtk_widget_set_sensitive (prefsw->pertrack_checkbutton,FALSE);
       gtk_widget_set_sensitive (prefsw->backaudio_checkbutton,FALSE);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(prefsw->pertrack_checkbutton),FALSE);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(prefsw->backaudio_checkbutton),FALSE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(prefsw->pertrack_checkbutton),FALSE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(prefsw->backaudio_checkbutton),FALSE);
     }
     else if (rdet!=NULL) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(rdet->pertrack_checkbutton),FALSE);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(rdet->backaudio_checkbutton),FALSE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(rdet->pertrack_checkbutton),FALSE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton),FALSE);
       gtk_widget_set_sensitive(rdet->pertrack_checkbutton,FALSE);
       gtk_widget_set_sensitive(rdet->backaudio_checkbutton,FALSE);
     }
@@ -928,7 +933,7 @@
     gtk_widget_set_sensitive (resaudw->rb_littleend,FALSE);
     gtk_widget_set_sensitive (resaudw->rb_signed,FALSE);
     gtk_widget_set_sensitive (resaudw->rb_unsigned,TRUE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
   }
   else {
     gtk_widget_set_sensitive (resaudw->rb_bigend,TRUE);
@@ -936,7 +941,7 @@
     if (atoi (gtk_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)))==16) {
       gtk_widget_set_sensitive (resaudw->rb_signed,TRUE);
       gtk_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
     }
   }
 }
@@ -956,22 +961,22 @@
 
 void on_resample_vid_ok (GtkButton *button, GtkEntry *entry) {
   int i;
-  gint old_frames;
-  gint ostart=cfile->start;
-  gint oend=cfile->end;
-  gdouble oundo1_dbl=cfile->undo1_dbl;
+  int old_frames;
+  int ostart=cfile->start;
+  int oend=cfile->end;
+  double oundo1_dbl=cfile->undo1_dbl;
   gchar *msg;
   weed_timecode_t in_time=0;
-  gdouble old_fps=cfile->fps;
-  gboolean ratio_fps;
-  gboolean bad_header=FALSE;
+  double old_fps=cfile->fps;
+  boolean ratio_fps;
+  boolean bad_header=FALSE;
   weed_plant_t *real_back_list=NULL;
   weed_plant_t *new_event_list=NULL;
 
   mainw->error=FALSE;
 
   if (button!=NULL) {
-    gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+    lives_general_button_clicked(button,NULL);
     if (mainw->fx1_val==0.) mainw->fx1_val=1.;
   }
   else {
@@ -1039,8 +1044,8 @@
   old_frames=cfile->frames;
 
   // must set these before calling reorder
-  cfile->start=(gint)((cfile->start-1.)/old_fps*mainw->fx1_val+1.);
-  if ((cfile->end=(gint)((cfile->end*mainw->fx1_val)/old_fps+.49999))<cfile->start) cfile->end=cfile->start;
+  cfile->start=(int)((cfile->start-1.)/old_fps*mainw->fx1_val+1.);
+  if ((cfile->end=(int)((cfile->end*mainw->fx1_val)/old_fps+.49999))<cfile->start) cfile->end=cfile->start;
 
   cfile->undo_action=UNDO_RESAMPLE;
   // REORDER
@@ -1089,8 +1094,7 @@
 
 
 
-_resaudw *
-create_resaudw (gshort type, render_details *rdet, GtkWidget *top_vbox) {
+_resaudw *create_resaudw (gshort type, render_details *rdet, GtkWidget *top_vbox) {
   // type 1 == resample
   // type 2 == insert silence
   // type 3 == enter multitrack or encode or render to clip
@@ -1101,82 +1105,69 @@
   // type 8 == grab external window, with audio
   // type 9 == grab external, no audio
   // type 10 == change inside multitrack
+  // type 11 == rte audio gen as rfx
 
   GtkWidget *dialog_vbox=NULL;
-  GtkWidget *vbox21;
-  GtkWidget *frame6;
-  GtkWidget *hbox24;
-  GtkWidget *label94;
+  GtkWidget *vboxx;
+  GtkWidget *vbox2;
+  GtkWidget *frame;
+  GtkWidget *label_aud=NULL;
   GtkWidget *combo_entry2;
-  GtkWidget *label95;
   GtkWidget *combo_entry3;
-  GtkWidget *label96;
   GtkWidget *combo_entry1;
-  GtkWidget *vseparator3;
-  GtkWidget *vbox22;
-  GtkWidget *radiobutton26;
-  GSList *radiobutton26_group = NULL;
-  GtkWidget *radiobutton27;
-  GtkWidget *vseparator4;
-  GtkWidget *vbox23;
-  GtkWidget *radiobutton28;
-  GSList *radiobutton28_group = NULL;
-  GtkWidget *radiobutton29;
-  GtkWidget *label92;
-  GtkWidget *frame7;
-  GtkWidget *hbox25;
-  GtkWidget *label98;
+  GtkWidget *vseparator;
+  GtkWidget *radiobutton_u1;
+  GtkWidget *radiobutton_s1;
+  GtkWidget *vbox;
+  GtkWidget *radiobutton_b1;
+  GtkWidget *radiobutton_l1;
   GtkWidget *combo4;
-  GtkWidget *label99;
   GtkWidget *combo5;
-  GtkWidget *label100;
   GtkWidget *combo6;
-  GtkWidget *vseparator5;
-  GtkWidget *vbox24;
-  GSList *radiobutton30_group = NULL;
-  GSList *rbgroup = NULL;
-  GtkWidget *vseparator6;
-  GtkWidget *vbox25;
-  GSList *radiobutton32_group = NULL;
-  GtkWidget *label93;
-  GtkWidget *dialog_action_area15;
-  GtkWidget *cancelbutton13;
-  GtkWidget *okbutton12;
+  GtkWidget *dialog_action_area;
+  GtkWidget *cancelbutton;
+  GtkWidget *okbutton;
   GtkWidget *label;
-  GtkWidget *hsep;
+  GtkWidget *hseparator;
   GtkWidget *radiobutton;
   GtkWidget *hbox;
   GtkWidget *hbox2;
-  GtkWidget *xvbox;
-  GtkWidget *eventbox;
-  GObject *spinbutton_adj;
+
+  GtkAccelGroup *accel_group=NULL;
+
+  GSList *s1_group=NULL;
+  GSList *e1_group=NULL;
+  GSList *s2_group=NULL;
+  GSList *e2_group=NULL;
+  GSList *rbgroup = NULL;
+
   GList *channels = NULL;
   GList *sampsize = NULL;
   GList *rate = NULL;
+
+  double secs=0.;
+
   gchar *tmp;
 
-  gint hours=0,mins=0;
-  gdouble secs=0.;
+  int hours=0,mins=0;
+  int aendian;
 
-  gint aendian;
+  boolean chans_fixed=FALSE;
+  boolean is_8bit;
 
-  gboolean chans_fixed=FALSE;
-  gboolean is_8bit;
+  _resaudw *resaudw=(_resaudw*)(g_malloc(sizeof(_resaudw)));
 
   if (type==10) {
     if (mainw->multitrack!=NULL) chans_fixed=TRUE; // TODO *
     type=3;
   }
 
-  if (type>5&&mainw->rec_end_time!=-1.) {
-    hours=(gint)(mainw->rec_end_time/3600.);
-    mins=(gint)((mainw->rec_end_time-(hours*3600.))/60.);
+  if (type>5&&type!=11&&mainw->rec_end_time!=-1.) {
+    hours=(int)(mainw->rec_end_time/3600.);
+    mins=(int)((mainw->rec_end_time-(hours*3600.))/60.);
     secs=mainw->rec_end_time-hours*3600.-mins*60.;
   }
 
-  _resaudw *resaudw=(_resaudw*)(g_malloc(sizeof(_resaudw)));
-
-  //if (type>2&&type<5) channels=g_list_append(channels,"0");
   channels = g_list_append (channels, (gpointer)"1");
   channels = g_list_append (channels, (gpointer)"2");
 
@@ -1195,376 +1186,199 @@
   rate = g_list_append (rate, (gpointer)"128000");
 
   if (type<3||type>4) {
-    resaudw->dialog = gtk_dialog_new ();
-    gtk_container_set_border_width (GTK_CONTAINER (resaudw->dialog), 10);
+    gchar *title=NULL;
+
     if (type==1) {
-      gtk_window_set_title (GTK_WINDOW (resaudw->dialog), _("LiVES: - Resample Audio"));
+      title=g_strdup(_("LiVES: - Resample Audio"));
     }
     else if (type==2) {
-      gtk_window_set_title (GTK_WINDOW (resaudw->dialog), _("LiVES: - Insert Silence"));
+      title=g_strdup(_("LiVES: - Insert Silence"));
     }
-    else if (type==5) {
-      gtk_window_set_title (GTK_WINDOW (resaudw->dialog), _("LiVES: - New Clip Audio"));
+    else if (type==5||type==11||type==6||type==7) {
+      title=g_strdup(_("LiVES: - New Clip Audio"));
     }
     else if (type==9||type==8) {
-      gtk_window_set_title (GTK_WINDOW (resaudw->dialog), _("LiVES: - External Clip Settings"));
+      title=g_strdup(_("LiVES: - External Clip Settings"));
     }
-    gtk_window_set_position (GTK_WINDOW (resaudw->dialog), GTK_WIN_POS_CENTER_ALWAYS);
-    gtk_window_set_modal (GTK_WINDOW (resaudw->dialog), TRUE);
+
+    resaudw->dialog = lives_standard_dialog_new (title,FALSE);
+    g_free(title);
+
+    accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+    gtk_window_add_accel_group (GTK_WINDOW (resaudw->dialog), accel_group);
 
     if (prefs->show_gui) {
       gtk_window_set_transient_for(GTK_WINDOW(resaudw->dialog),GTK_WINDOW(mainw->LiVES));
     }
 
     dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(resaudw->dialog));
-    gtk_widget_show (dialog_vbox);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg (resaudw->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    }
 
-    vbox21 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox21);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox21, TRUE, TRUE, 0);
+    vboxx = lives_vbox_new (FALSE, 0);
+
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), vboxx, TRUE, TRUE, 0);
   }
-  else if (type==3) vbox21 = lives_dialog_get_content_area(GTK_DIALOG(rdet->dialog));
-  else vbox21=top_vbox;
+  else vboxx=top_vbox;
 
-  frame6 = gtk_frame_new (NULL);
- 
   if (type==1) {
-
-    gtk_widget_show (frame6);
-    gtk_box_pack_start (GTK_BOX (vbox21), frame6, TRUE, TRUE, 0);
+    frame = gtk_frame_new (NULL);
+ 
+    gtk_box_pack_start (GTK_BOX (vboxx), frame, TRUE, TRUE, 0);
     
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg (frame6, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     
-    hbox24 = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox24);
-    gtk_container_add (GTK_CONTAINER (frame6), hbox24);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox24), 10);
+    hbox2 = lives_hbox_new (FALSE, 0);
+    gtk_widget_show (hbox2);
+    gtk_container_add (GTK_CONTAINER (frame), hbox2);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox2), widget_opts.packing_width);
     
-    label94 = gtk_label_new (_("Rate (Hz) "));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label94, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_widget_show (label94);
-    gtk_box_pack_start (GTK_BOX (hbox24), label94, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label94), GTK_JUSTIFY_LEFT);
+    tmp=g_strdup_printf ("%d",(int)mainw->fx1_val);
     
-    combo_entry2 = gtk_entry_new();
-    gtk_widget_show (combo_entry2);
-    gtk_box_pack_start (GTK_BOX (hbox24), combo_entry2, TRUE, TRUE, 1);
+    combo_entry2 = lives_standard_entry_new(_("Rate (Hz) "),FALSE,tmp,10,6,LIVES_BOX(hbox2),NULL);
+    g_free (tmp);
 
     gtk_editable_set_editable (GTK_EDITABLE (combo_entry2), FALSE);
-    gtk_entry_set_width_chars (GTK_ENTRY (combo_entry2), 8);
+    lives_widget_set_can_focus (combo_entry2, FALSE);
     
-    tmp=g_strdup_printf ("%d",(gint)mainw->fx1_val);
-
-    gtk_entry_set_text (GTK_ENTRY (combo_entry2),tmp);
+    tmp=g_strdup_printf ("%d",(int)mainw->fx2_val);
+    combo_entry3 = lives_standard_entry_new(_("Channels"),FALSE,tmp,6,2,LIVES_BOX(hbox2),NULL);
     g_free (tmp);
-    GTK_WIDGET_UNSET_FLAGS (combo_entry2, GTK_CAN_FOCUS);
-    
-    label95 = gtk_label_new (_("         Channels "));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label95, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_widget_show (label95);
-    gtk_box_pack_start (GTK_BOX (hbox24), label95, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label95), GTK_JUSTIFY_LEFT);
-    
-    combo_entry3 = gtk_entry_new();
-    gtk_widget_show (combo_entry3);
-    gtk_box_pack_start (GTK_BOX (hbox24), combo_entry3, TRUE, TRUE, 1);
-    
+
     gtk_editable_set_editable (GTK_EDITABLE (combo_entry3), FALSE);
-    gtk_entry_set_width_chars (GTK_ENTRY (combo_entry3), 3);
+    lives_widget_set_can_focus (combo_entry3, FALSE);
     
-    tmp=g_strdup_printf ("%d",(gint)mainw->fx2_val);
-    gtk_entry_set_text (GTK_ENTRY (combo_entry3),tmp);
+    tmp=g_strdup_printf ("%d",(int)mainw->fx3_val);
+    combo_entry1 = lives_standard_entry_new(_("Sample Size "),FALSE,tmp,6,2,LIVES_BOX(hbox2),NULL);
     g_free (tmp);
-    GTK_WIDGET_UNSET_FLAGS (combo_entry3, GTK_CAN_FOCUS);
-    
-    label96 = gtk_label_new (_("        Sample Size "));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label96, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_widget_show (label96);
-    gtk_box_pack_start (GTK_BOX (hbox24), label96, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label96), GTK_JUSTIFY_LEFT);
-
-    combo_entry1 = gtk_entry_new();
-    gtk_widget_show (combo_entry1);
-    gtk_box_pack_start (GTK_BOX (hbox24), combo_entry1, TRUE, TRUE, 1);
 
     gtk_editable_set_editable (GTK_EDITABLE (combo_entry1), FALSE);
-    gtk_entry_set_width_chars (GTK_ENTRY (combo_entry1), 3);
-
-    tmp=g_strdup_printf ("%d",(gint)mainw->fx3_val);
-    gtk_entry_set_text (GTK_ENTRY (combo_entry1),tmp);
-    g_free (tmp);
-    GTK_WIDGET_UNSET_FLAGS (combo_entry1, GTK_CAN_FOCUS);
-
-    vseparator3 = gtk_vseparator_new ();
-    gtk_widget_show (vseparator3);
-    gtk_box_pack_start (GTK_BOX (hbox24), vseparator3, FALSE, FALSE, 12);
-
-    vbox22 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox22);
-    gtk_box_pack_start (GTK_BOX (hbox24), vbox22, TRUE, TRUE, 0);
-
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox22), hbox, FALSE, FALSE, 10);
-
-    radiobutton26 = gtk_radio_button_new (NULL);
-    gtk_widget_show(radiobutton26);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton26), radiobutton26_group);
-    radiobutton26_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton26));
-
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton26, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Signed"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton26);
-
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    lives_widget_set_can_focus (combo_entry1, FALSE);
 
+    vseparator = lives_vseparator_new ();
+    gtk_widget_show (vseparator);
+    gtk_box_pack_start (GTK_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox22), hbox, FALSE, FALSE, 10);
+    vbox = lives_vbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
 
-    radiobutton27 = gtk_radio_button_new (NULL);
-    gtk_widget_show(radiobutton27);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton27), radiobutton26_group);
-    radiobutton26_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton27));
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton27, FALSE, FALSE, 10);
+    radiobutton_s1 = lives_standard_radio_button_new (_("Signed"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
+    s1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_s1));
 
-    label=gtk_label_new_with_mnemonic (_ ("Unsigned"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton27);
-
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
+    radiobutton_u1 = lives_standard_radio_button_new (_("Unsigned"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
 
     aendian=mainw->fx4_val;
 
     if (aendian&AFORM_UNSIGNED) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton27), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_u1), TRUE);
     }
     else {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton26), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_s1), TRUE);
     }
 
-    gtk_widget_set_sensitive (radiobutton26, FALSE);
-    gtk_widget_set_sensitive (radiobutton27, FALSE);
+    gtk_widget_set_sensitive (radiobutton_u1, FALSE);
+    gtk_widget_set_sensitive (radiobutton_s1, FALSE);
 
-    vseparator4 = gtk_vseparator_new ();
-    gtk_widget_show (vseparator4);
-    gtk_box_pack_start (GTK_BOX (hbox24), vseparator4, FALSE, FALSE, 12);
+    vseparator = lives_vseparator_new ();
+    gtk_box_pack_start (GTK_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
     
-    vbox23 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox23);
-    gtk_box_pack_start (GTK_BOX (hbox24), vbox23, TRUE, TRUE, 0);
-
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox23), hbox, FALSE, FALSE, 10);
-
-    radiobutton28 = gtk_radio_button_new (NULL);
-    gtk_widget_show(radiobutton28);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton28), radiobutton28_group);
-    radiobutton28_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton28));
-
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton28, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Little Endian"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton28);
-
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
+    vbox = lives_vbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox23), hbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton29 = gtk_radio_button_new (NULL);
-    gtk_widget_show(radiobutton29);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton29), radiobutton28_group);
-    radiobutton28_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton29));
+    radiobutton_l1 = lives_standard_radio_button_new (_("Little Endian"),FALSE,e1_group,LIVES_BOX(hbox),NULL);
+    e1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_l1));
 
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton29, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    label=gtk_label_new_with_mnemonic (_ ("Big Endian"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton28);
-
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    radiobutton_b1 = lives_standard_radio_button_new (_("Big Endian"),FALSE,e1_group,LIVES_BOX(hbox),NULL);
 
     if (aendian&AFORM_BIG_ENDIAN) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton29), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_b1), TRUE);
     }
     else {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radiobutton28), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_l1), TRUE);
     }
 
-    gtk_widget_set_sensitive (radiobutton29, FALSE);
-    gtk_widget_set_sensitive (radiobutton28, FALSE);
+    gtk_widget_set_sensitive (radiobutton_b1, FALSE);
+    gtk_widget_set_sensitive (radiobutton_l1, FALSE);
 
-    label92 = gtk_label_new (_("Current"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label92, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    label = lives_standard_label_new (_("Current"));
+
+    gtk_frame_set_label_widget (GTK_FRAME (frame), label);
 
-    gtk_widget_show (label92);
-    gtk_frame_set_label_widget (GTK_FRAME (frame6), label92);
-    gtk_label_set_justify (GTK_LABEL (label92), GTK_JUSTIFY_LEFT);
-    
   }
 
   resaudw->aud_checkbutton = NULL;
 
+  if (type<9||type==11) {
+    frame = gtk_frame_new (NULL);
 
-  if (type<9) {
-    frame7 = gtk_frame_new (NULL);
-    gtk_widget_show (frame7);
-    gtk_box_pack_start (GTK_BOX (vbox21), frame7, TRUE, TRUE, 0);
+    if (type==4) gtk_box_pack_start (GTK_BOX (vboxx), frame, FALSE, FALSE, widget_opts.packing_height);
+    else gtk_box_pack_start (GTK_BOX (vboxx), frame, TRUE, TRUE, 0);
 
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg (frame7, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
-    xvbox = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show(xvbox);
-    gtk_container_add (GTK_CONTAINER (frame7), xvbox);
+    vbox2 = lives_vbox_new (FALSE, 0);
+    gtk_container_add (GTK_CONTAINER (frame), vbox2);
     
-    resaudw->aud_checkbutton = gtk_check_button_new ();
-
     if (type>2&&type<5) {
+      resaudw->aud_hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox2), resaudw->aud_hbox, FALSE, FALSE, 0);
 
-      eventbox=gtk_event_box_new();
-      label=gtk_label_new_with_mnemonic (_("_Enable audio"));
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label),resaudw->aud_checkbutton);
+      resaudw->aud_checkbutton = lives_standard_check_button_new (_("_Enable audio"),TRUE,LIVES_BOX(resaudw->aud_hbox),NULL);
 
-      gtk_container_add(GTK_CONTAINER(eventbox),label);
-      g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-			G_CALLBACK (label_act_toggle),
-			resaudw->aud_checkbutton);
+      if (rdet!=NULL) lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), rdet->achans>0);
+      else lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), prefs->mt_def_achans>0);
+    }
+    else resaudw->aud_checkbutton = gtk_check_button_new ();
 
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-      }
+    hbox2 = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, widget_opts.packing_height);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox2), widget_opts.border_width);
 
-      resaudw->aud_hbox = gtk_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (xvbox), resaudw->aud_hbox, FALSE, FALSE, 0);
+    vbox = lives_vbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, widget_opts.packing_width);
 
-      gtk_box_pack_start (GTK_BOX (resaudw->aud_hbox), resaudw->aud_checkbutton, FALSE, FALSE, 10);
-      gtk_box_pack_start (GTK_BOX (resaudw->aud_hbox), eventbox, FALSE, FALSE, 10);
-      GTK_WIDGET_SET_FLAGS (resaudw->aud_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-      if (rdet!=NULL) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->aud_checkbutton), rdet->achans>0);
-      else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->aud_checkbutton), prefs->mt_def_achans>0);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), widget_opts.border_width);
 
-      gtk_widget_show_all(resaudw->aud_hbox);
-    }
-
-    hbox25 = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox25);
-    gtk_box_pack_start (GTK_BOX (xvbox), hbox25, FALSE, FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox25), 10);
+    combo4 = lives_standard_combo_new (_("Rate (Hz) "),type>=3&&type!=11,rate,LIVES_BOX(hbox),NULL);
     
-    if (type>=3) label98 = gtk_label_new_with_mnemonic (_("_Rate (Hz) "));
-    else label98 = gtk_label_new (_("Rate (Hz) "));
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label98, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    resaudw->entry_arate = lives_combo_get_entry(LIVES_COMBO(combo4));
 
-    gtk_widget_show (label98);
-    gtk_box_pack_start (GTK_BOX (hbox25), label98, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label98), GTK_JUSTIFY_LEFT);
-    
-    combo4 = gtk_combo_new ();
-    gtk_combo_set_popdown_strings (GTK_COMBO (combo4), rate);
-    gtk_widget_show (combo4);
-    gtk_box_pack_start (GTK_BOX (hbox25), combo4, TRUE, TRUE, 1);
-    
-    resaudw->entry_arate = GTK_COMBO (combo4)->entry;
-    gtk_widget_show (resaudw->entry_arate);
-    gtk_entry_set_width_chars (GTK_ENTRY (resaudw->entry_arate), 8);
+    gtk_entry_set_width_chars (GTK_ENTRY (resaudw->entry_arate), 6);
     if (type==7) gtk_widget_set_sensitive(combo4,FALSE);
   
-    if (type<3||(type>4&&type<8)) tmp=g_strdup_printf ("%d",(gint)mainw->fx1_val);
+    if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx1_val);
     else if (type==8) tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_RATE);
     else if (type==3) tmp=g_strdup_printf ("%d",rdet->arate);
     else tmp=g_strdup_printf ("%d",prefs->mt_def_arate);
     gtk_entry_set_text (GTK_ENTRY (resaudw->entry_arate),tmp);
     g_free (tmp);
-    
-    if (type>=3) label99 = gtk_label_new_with_mnemonic (_("    _Channels "));
-    else label99 = gtk_label_new (_("    Channels "));
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label99, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
 
-    gtk_widget_show (label99);
-    gtk_box_pack_start (GTK_BOX (hbox25), label99, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label99), GTK_JUSTIFY_LEFT);
+    combo5 = lives_standard_combo_new ((type>=3&&type!=11?(_("_Channels")):(_("Channels"))),type>=3&&type!=11,
+				       channels,LIVES_BOX(hbox),NULL);
     
-    combo5 = gtk_combo_new ();
-    gtk_combo_set_popdown_strings (GTK_COMBO (combo5), channels);
-    gtk_widget_show (combo5);
-    gtk_box_pack_start (GTK_BOX (hbox25), combo5, FALSE, FALSE, 0);
+
     if (type==7) gtk_widget_set_sensitive(combo5,FALSE);
+
+    resaudw->entry_achans = lives_combo_get_entry(LIVES_COMBO(combo5));
+    gtk_entry_set_width_chars (GTK_ENTRY (resaudw->entry_achans), 2);
     
-    resaudw->entry_achans = GTK_COMBO (combo5)->entry;
-    gtk_widget_show (resaudw->entry_achans);
-    gtk_editable_set_editable (GTK_EDITABLE (resaudw->entry_achans), FALSE);
-    gtk_entry_set_width_chars (GTK_ENTRY (resaudw->entry_achans), 3);
-    
-    if (type<3||(type>4&&type<8)) tmp=g_strdup_printf ("%d",(gint)mainw->fx2_val);
+    if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx2_val);
     else if (type==8) tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_CHANS);
     else if (type==3) tmp=g_strdup_printf ("%d",rdet->achans);
     else tmp=g_strdup_printf ("%d",prefs->mt_def_achans==0?DEFAULT_AUDIO_CHANS:prefs->mt_def_achans);
@@ -1576,30 +1390,18 @@
       gtk_widget_set_sensitive(combo5,FALSE);
     }
 
-    if (type>=3) label100 = gtk_label_new_with_mnemonic (_("    _Sample Size "));
-    else label100 = gtk_label_new (_("    Sample Size "));
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label100, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+ 
+    combo6 = lives_standard_combo_new ((type>=3&&type!=11?(_("_Sample Size")):(_("Sample Size"))),type>=3&&type!=11,
+				       sampsize,LIVES_BOX(hbox),NULL);
 
-    gtk_widget_show (label100);
-    gtk_box_pack_start (GTK_BOX (hbox25), label100, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label100), GTK_JUSTIFY_LEFT);
-    
-    combo6 = gtk_combo_new ();
-    gtk_combo_set_popdown_strings (GTK_COMBO (combo6), sampsize);
-    gtk_widget_show (combo6);
-    gtk_box_pack_start (GTK_BOX (hbox25), combo6, TRUE, TRUE, 0);
     if (type==7) gtk_widget_set_sensitive(combo6,FALSE);
 
-    resaudw->entry_asamps = GTK_COMBO (combo6)->entry;
-    gtk_widget_show (resaudw->entry_asamps);
+    resaudw->entry_asamps = lives_combo_get_entry(LIVES_COMBO(combo6));
     gtk_entry_set_max_length (GTK_ENTRY (resaudw->entry_asamps), 2);
     gtk_editable_set_editable (GTK_EDITABLE (resaudw->entry_asamps), FALSE);
-    gtk_entry_set_width_chars (GTK_ENTRY (resaudw->entry_asamps), 3);
+    gtk_entry_set_width_chars (GTK_ENTRY (resaudw->entry_asamps), 2);
     
-    if (type<3||(type>4&&type<8)) tmp=g_strdup_printf ("%d",(gint)mainw->fx3_val);
+    if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx3_val);
     else if (type==8) tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_SAMPS);
     else if (type==3) tmp=g_strdup_printf ("%d",rdet->asamps);
     else tmp=g_strdup_printf ("%d",prefs->mt_def_asamps);
@@ -1610,170 +1412,68 @@
 
     g_free (tmp);
 
-    vseparator5 = gtk_vseparator_new ();
-    gtk_widget_show (vseparator5);
-    if (type!=4) gtk_box_pack_start (GTK_BOX (hbox25), vseparator5, FALSE, FALSE, 12);
+    vseparator = lives_vseparator_new ();
+    gtk_widget_show (vseparator);
+    if (type!=4) gtk_box_pack_start (GTK_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    vbox24 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox24);
-    if (type!=4) gtk_box_pack_start (GTK_BOX (hbox25), vbox24, TRUE, TRUE, 0);
+    vbox = lives_vbox_new (FALSE, 0);
+    if (type!=4) gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox24), hbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    resaudw->rb_signed = gtk_radio_button_new (NULL);
-    gtk_widget_show(resaudw->rb_signed);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (resaudw->rb_signed), radiobutton30_group);
-    radiobutton30_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resaudw->rb_signed));
-
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->rb_signed, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Signed"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),resaudw->rb_signed);
-
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      resaudw->rb_signed);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
+    resaudw->rb_signed = lives_standard_radio_button_new (_("Signed"),FALSE,s2_group,LIVES_BOX(hbox),NULL);
+    s2_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->rb_signed));
 
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->rb_signed), TRUE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_signed), TRUE);
     if (type==7||is_8bit) gtk_widget_set_sensitive(resaudw->rb_signed,FALSE);
     
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox24), hbox, FALSE, FALSE, 10);
-
-    resaudw->rb_unsigned = gtk_radio_button_new (NULL);
-    gtk_widget_show(resaudw->rb_unsigned);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (resaudw->rb_unsigned), radiobutton30_group);
-    radiobutton30_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resaudw->rb_unsigned));
-
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->rb_unsigned, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Unsigned"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),resaudw->rb_unsigned);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      resaudw->rb_unsigned);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    resaudw->rb_unsigned = lives_standard_radio_button_new (_("Unsigned"),FALSE,s2_group,LIVES_BOX(hbox),NULL);
 
     if (type==7||!is_8bit) gtk_widget_set_sensitive(resaudw->rb_unsigned,FALSE);
 
-    if (type<3||(type>4&&type<8)) aendian=mainw->fx4_val;
-    else if (type==8) aendian=DEFAULT_AUDIO_SIGNED16|((G_BYTE_ORDER==G_BIG_ENDIAN)&AFORM_BIG_ENDIAN);
+    if (type<3||(type>4&&type<8)||type==11) aendian=mainw->fx4_val;
+    else if (type==8) aendian=DEFAULT_AUDIO_SIGNED16|((capable->byte_order==LIVES_BIG_ENDIAN)?AFORM_BIG_ENDIAN:0);
     else if (type==3) aendian=rdet->aendian;
     else aendian=prefs->mt_def_signed_endian;
 
     if (aendian&AFORM_UNSIGNED) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->rb_unsigned), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_unsigned), TRUE);
     }
     else {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->rb_signed), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_signed), TRUE);
     }
 
-    vseparator6 = gtk_vseparator_new ();
-    gtk_widget_show (vseparator6);
-    gtk_box_pack_start (GTK_BOX (hbox25), vseparator6, FALSE, FALSE, 12);
-
-    vbox25 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox25);
-    gtk_box_pack_start (GTK_BOX (hbox25), vbox25, TRUE, TRUE, 0);
-
+    vseparator = lives_vseparator_new ();
+    gtk_box_pack_start (GTK_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox25), hbox, FALSE, FALSE, 10);
+    vbox = lives_vbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
 
-    resaudw->rb_littleend = gtk_radio_button_new (NULL);
-    gtk_widget_show(resaudw->rb_littleend);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (resaudw->rb_littleend), radiobutton32_group);
-    radiobutton32_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resaudw->rb_littleend));
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->rb_littleend, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Little Endian"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),resaudw->rb_littleend);
-
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      resaudw->rb_littleend);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    resaudw->rb_littleend = lives_standard_radio_button_new (_("Little Endian"),FALSE,e2_group,LIVES_BOX(hbox),NULL);
+    e2_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->rb_littleend));
 
     if (type==7) gtk_widget_set_sensitive(resaudw->rb_littleend,FALSE);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show(hbox);
-    gtk_box_pack_start (GTK_BOX (vbox25), hbox, FALSE, FALSE, 10);
-
-    resaudw->rb_bigend = gtk_radio_button_new (NULL);
-    gtk_widget_show(resaudw->rb_bigend);
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (resaudw->rb_bigend), radiobutton32_group);
-    radiobutton32_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resaudw->rb_bigend));
-
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->rb_bigend, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Big Endian"));
-    gtk_widget_show(label);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),resaudw->rb_bigend);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    eventbox=gtk_event_box_new();
-    gtk_widget_show(eventbox);
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      resaudw->rb_bigend);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    resaudw->rb_bigend = lives_standard_radio_button_new (_("Big Endian"),FALSE,e2_group,LIVES_BOX(hbox),NULL);
 
     if (type==7) gtk_widget_set_sensitive(resaudw->rb_bigend,FALSE);
 
     if (aendian&AFORM_BIG_ENDIAN) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->rb_bigend), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_bigend), TRUE);
     }
     else {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (resaudw->rb_littleend), TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_littleend), TRUE);
     }
 
     if (!strcmp(gtk_entry_get_text (GTK_ENTRY (resaudw->entry_asamps)),"8")) {
@@ -1785,236 +1485,136 @@
 		      G_CALLBACK (on_resaudw_asamps_changed),
 		      NULL);
 
-    if (type>=3) label93 = gtk_label_new (_("Audio"));
-    else label93 = gtk_label_new (_("New"));
+    if (type>=3&&type!=11) label_aud = lives_standard_label_new (_("Audio"));
+    else label_aud = lives_standard_label_new (_("New"));
 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label93, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    if (type==3&&type!=11&&palette->style&STYLE_1) lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-    gtk_widget_show (label93);
+    gtk_frame_set_label_widget (GTK_FRAME (frame), label_aud);
 
-    if (type==3&&palette->style&STYLE_1) gtk_widget_modify_bg(frame7, GTK_STATE_NORMAL, &palette->normal_back);
-
-    gtk_frame_set_label_widget (GTK_FRAME (frame7), label93);
-    gtk_label_set_justify (GTK_LABEL (label93), GTK_JUSTIFY_LEFT);
-    
   }
 
-  if (type>7) {
-    frame7 = gtk_frame_new (NULL);
-    gtk_widget_show (frame7);
-    gtk_box_pack_start (GTK_BOX (vbox21), frame7, TRUE, TRUE, 0);
+  if (type>7&&type!=11) {
+    frame = gtk_frame_new (NULL);
+    gtk_widget_show (frame);
+    gtk_box_pack_start (GTK_BOX (vboxx), frame, TRUE, TRUE, 0);
 
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg (frame7, GTK_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     
-    hbox25 = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox25);
-    gtk_container_add (GTK_CONTAINER (frame7), hbox25);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox25), 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_widget_show (hbox);
+    gtk_container_add (GTK_CONTAINER (frame), hbox);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), widget_opts.border_width);
     
-    if (type>=3) label98 = gtk_label_new_with_mnemonic (_("_Frames Per Second "));
-    gtk_widget_show (label98);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label98, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
-    gtk_box_pack_start (GTK_BOX (hbox25), label98, FALSE, FALSE, 0);
-    gtk_label_set_justify (GTK_LABEL (label98), GTK_JUSTIFY_LEFT);
 
-    spinbutton_adj = (GObject *)gtk_adjustment_new (prefs->default_fps, 1., FPS_MAX, 1., 1., 0.);
-    resaudw->fps_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 3);
-    gtk_widget_show (resaudw->fps_spinbutton);
-    gtk_box_pack_start (GTK_BOX (hbox25), resaudw->fps_spinbutton, FALSE, FALSE, 20);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (resaudw->fps_spinbutton)->entry)), TRUE);
+    resaudw->fps_spinbutton = lives_standard_spin_button_new (_("_Frames Per Second "),TRUE,
+							      prefs->default_fps,1.,FPS_MAX,1.,1.,3,LIVES_BOX(hbox),NULL);
 
-    label93 = gtk_label_new (_("Video"));
-    gtk_widget_show (label93);
 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_bg(label93, GTK_STATE_NORMAL, &palette->normal_back);
-      gtk_widget_modify_fg(label93, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    label = lives_standard_label_new (_("Video"));
 
-    gtk_frame_set_label_widget (GTK_FRAME (frame7), label93);
-    gtk_label_set_justify (GTK_LABEL (label93), GTK_JUSTIFY_LEFT);
+    gtk_frame_set_label_widget (GTK_FRAME (frame), label);
   }
 
-  if (type>4) {
-    gtk_box_set_spacing(GTK_BOX(dialog_vbox),30);
+  if (type>4&&type!=11) {
+    lives_box_set_spacing(GTK_BOX(dialog_vbox),widget_opts.packing_height*3);
     
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = lives_hbox_new (FALSE, 0);
     gtk_widget_show (hbox);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 10);
-    
-    hbox2 = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 10);
-
-    radiobutton=gtk_radio_button_new(rbgroup);
-    rbgroup = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton));
-
-    if (type!=6&&type!=7) gtk_box_pack_start (GTK_BOX (hbox2), radiobutton, FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic ( _("Record for maximum:  "));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-
-    eventbox=gtk_event_box_new();
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      radiobutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 10);
-
-    gtk_widget_show_all (hbox2);
-
-    spinbutton_adj = (GObject *)gtk_adjustment_new (hours, 0, hours>23?hours:23, 1, 1, 0);
-    resaudw->hour_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-    gtk_widget_show (resaudw->hour_spinbutton);
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->hour_spinbutton, TRUE, TRUE, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (resaudw->hour_spinbutton)->entry)), TRUE);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
     
-    label=gtk_label_new(_(" hours  "));
-    gtk_widget_show(label);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-
-    spinbutton_adj = (GObject *)gtk_adjustment_new (mins, 0, 59, 1, 1, 0);
-    resaudw->minute_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-    gtk_widget_show (resaudw->minute_spinbutton);
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->minute_spinbutton, TRUE, TRUE, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (resaudw->minute_spinbutton)->entry)), TRUE);
+    if (type!=6&&type!=7) {
 
-    label=gtk_label_new(_(" minutes  "));
-    gtk_widget_show(label);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+      radiobutton=lives_standard_radio_button_new(_("Record for maximum:  "),FALSE,rbgroup,LIVES_BOX(hbox),NULL);
+      rbgroup = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
 
-    spinbutton_adj = (GObject *)gtk_adjustment_new (secs, 0, 59, 1, 1, 0);
-    resaudw->second_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 2);
-    gtk_widget_show (resaudw->second_spinbutton);
-    gtk_box_pack_start (GTK_BOX (hbox), resaudw->second_spinbutton, TRUE, TRUE, 0);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (resaudw->second_spinbutton)->entry)), TRUE);
+      resaudw->hour_spinbutton = lives_standard_spin_button_new (_(" hours  "),FALSE,hours,
+								 0.,hours>23?hours:23,1.,1.,0,LIVES_BOX(hbox),NULL);
 
-    label=gtk_label_new(_(" seconds  "));
-    gtk_widget_show(label);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+      resaudw->minute_spinbutton = lives_standard_spin_button_new (_(" minutes  "),FALSE,mins,0.,59.,1.,1.,0,LIVES_BOX(hbox),NULL);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 10);
+      resaudw->second_spinbutton = lives_standard_spin_button_new (_(" seconds  "),FALSE,secs,0.,59.,1.,1.,0,LIVES_BOX(hbox),NULL);
 
-    hbox2 = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 10);
 
-    resaudw->unlim_radiobutton=gtk_radio_button_new(rbgroup);
-    rbgroup = gtk_radio_button_get_group (GTK_RADIO_BUTTON (resaudw->unlim_radiobutton));
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_widget_show (hbox);
+      gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
+      resaudw->unlim_radiobutton=lives_standard_radio_button_new(_("Unlimited"),FALSE,rbgroup,LIVES_BOX(hbox),NULL);
+      rbgroup = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->unlim_radiobutton));
 
-    
-    gtk_box_pack_start (GTK_BOX (hbox2), resaudw->unlim_radiobutton, FALSE, FALSE, 10);
+      g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
+			G_CALLBACK (on_rb_audrec_time_toggled),
+			(gpointer)resaudw);
 
-    label=gtk_label_new_with_mnemonic ( _("Unlimited"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),resaudw->unlim_radiobutton);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton),(type==5||type>7)&&type!=11);
 
-    eventbox=gtk_event_box_new();
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      resaudw->unlim_radiobutton);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
     }
-    gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 10);
-
-    if (type!=6&&type!=7) gtk_widget_show_all (hbox2);
 
-    g_signal_connect (GTK_OBJECT (radiobutton), "toggled",
-                      G_CALLBACK (on_rb_audrec_time_toggled),
-                      (gpointer)resaudw);
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resaudw->unlim_radiobutton),type==5||type>7);
-
-    if (type<8) {
-      hsep = gtk_hseparator_new ();
-      gtk_widget_show (hsep);
-      gtk_box_pack_start (GTK_BOX (dialog_vbox), hsep, TRUE, TRUE, 0);
+    if (type<8||type==11) {
+      hseparator = lives_hseparator_new ();
+      gtk_widget_show (hseparator);
+      gtk_box_pack_start (GTK_BOX (dialog_vbox), hseparator, TRUE, TRUE, 0);
       
-      label=gtk_label_new(_("Click OK to begin recording, or Cancel to quit."));
-      gtk_widget_show(label);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
+      label=lives_standard_label_new(_("Click OK to begin recording, or Cancel to quit."));
+
       gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 0);
     }
   }
 
 
   if (type<3||type>4) {
-    dialog_action_area15 = GTK_DIALOG (resaudw->dialog)->action_area;
-    gtk_widget_show (dialog_action_area15);
-    gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area15), GTK_BUTTONBOX_END);
+    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (resaudw->dialog));
+    gtk_widget_show (dialog_action_area);
+    gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
     
-    cancelbutton13 = gtk_button_new_from_stock ("gtk-cancel");
-    gtk_widget_show (cancelbutton13);
-    gtk_dialog_add_action_widget (GTK_DIALOG (resaudw->dialog), cancelbutton13, GTK_RESPONSE_CANCEL);
-    GTK_WIDGET_SET_FLAGS (cancelbutton13, GTK_CAN_DEFAULT);
+    cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
+ 
+    gtk_dialog_add_action_widget (GTK_DIALOG (resaudw->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+    lives_widget_set_can_focus_and_default (cancelbutton);
     
-    gtk_widget_add_accelerator (cancelbutton13, "activate", mainw->accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+    if (accel_group!=NULL) gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+						       LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
     
       
-    okbutton12 = gtk_button_new_from_stock ("gtk-ok");
-    gtk_widget_show (okbutton12);
-    gtk_dialog_add_action_widget (GTK_DIALOG (resaudw->dialog), okbutton12, GTK_RESPONSE_OK);
-    GTK_WIDGET_SET_FLAGS (okbutton12, GTK_CAN_DEFAULT);
-    gtk_widget_grab_default (okbutton12);
-
-    if (type<8) {
-      g_signal_connect (GTK_OBJECT (cancelbutton13), "clicked",
-			G_CALLBACK (on_cancel_button1_clicked),
+    okbutton = gtk_button_new_from_stock ("gtk-ok");
+ 
+    gtk_dialog_add_action_widget (GTK_DIALOG (resaudw->dialog), okbutton, GTK_RESPONSE_OK);
+    lives_widget_set_can_focus_and_default (okbutton);
+    gtk_widget_grab_default (okbutton);
+
+    if (type<8||type==11) {
+      g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
+			G_CALLBACK (lives_general_button_clicked),
 			resaudw);
 
       if (type==1) {
-	g_signal_connect (GTK_OBJECT (okbutton12), "clicked",
+	g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 			  G_CALLBACK (on_resaudio_ok_clicked),
 			  NULL);
       }
-      if (type==2) {
-	g_signal_connect (GTK_OBJECT (okbutton12), "clicked",
+      else if (type==2||type==11) {
+	g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 			  G_CALLBACK (on_ins_silence_details_clicked),
 			  NULL);
       }
-      if (type==5) {
-	g_signal_connect (GTK_OBJECT (okbutton12), "clicked",
+      else if (type==5) {
+	g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 			  G_CALLBACK (on_recaudclip_ok_clicked),
 			  GINT_TO_POINTER(0));
       }
-      if (type==6||type==7) {
-	g_signal_connect (GTK_OBJECT (okbutton12), "clicked",
+      else if (type==6||type==7) {
+	g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 			  G_CALLBACK (on_recaudclip_ok_clicked),
 			  GINT_TO_POINTER(1));
       }
       
-      g_signal_connect (GTK_OBJECT (resaudw->dialog), "delete_event",
-			G_CALLBACK (return_true),
-			NULL);
     }
+
+    gtk_widget_show_all(resaudw->dialog);
+
   }
   else {
     if (type>2&&type<5) {
@@ -2025,6 +1625,10 @@
     }
   }
 
+  gtk_widget_show_all(vboxx);
+
+  if (type==2) gtk_widget_hide (label_aud);
+
   g_list_free (channels);
   g_list_free (sampsize);
   g_list_free (rate);
@@ -2034,140 +1638,128 @@
 
 
 
-void
-create_new_pb_speed (gshort type)
-{
+void create_new_pb_speed (short type) {
   // type 1 = change speed
   // type 2 = resample
 
-
   GtkWidget *new_pb_speed;
-  GtkWidget *dialog_vbox6;
-  GtkWidget *vbox6;
+  GtkWidget *dialog_vbox;
+  GtkWidget *vbox;
   GtkWidget *hbox;
-  GtkWidget *eventbox;
+  GtkWidget *ca_hbox;
   GtkWidget *label;
-  GtkWidget *alabel;
+  GtkWidget *label2;
   GtkWidget *radiobutton1=NULL;
   GtkWidget *radiobutton2=NULL;
-  GSList *rbgroup = NULL;
-  GObject *spinbutton_pb_speed_adj;
   GtkWidget *spinbutton_pb_speed;
-  GObject *spinbutton_pb_time_adj;
   GtkWidget *spinbutton_pb_time=NULL;
-  GtkWidget *dialog_action_area6;
-  GtkWidget *cancelbutton4;
+  GtkWidget *dialog_action_area;
+  GtkWidget *cancelbutton;
   GtkWidget *change_pb_ok;
   GtkWidget *change_audio_speed;
+
+  GtkAccelGroup *accel_group;
+
+  GSList *rbgroup = NULL;
+
   gchar label_text[256];
 
-  new_pb_speed = gtk_dialog_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (new_pb_speed), 10);
+  gchar *title=NULL;
+
   if (type==1) {
-    gtk_window_set_title (GTK_WINDOW (new_pb_speed), _("LiVES: - Change playback speed"));
+    title=g_strdup( _("LiVES: - Change playback speed"));
   }
-  else if (type==2) {
-    gtk_window_set_title (GTK_WINDOW (new_pb_speed), _("LiVES: - Resample Video"));
+  else {
+    title=g_strdup(_("LiVES: - Resample Video"));
   }
-  gtk_window_set_position (GTK_WINDOW (new_pb_speed), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (new_pb_speed), TRUE);
-  gtk_window_set_default_size (GTK_WINDOW (new_pb_speed), 300, 200);
+
+  new_pb_speed = lives_standard_dialog_new (title,FALSE);
+  g_free(title);
+
+  gtk_container_set_border_width (GTK_CONTAINER (new_pb_speed), widget_opts.border_width*2);
+
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (new_pb_speed), accel_group);
 
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(new_pb_speed),GTK_WINDOW(mainw->LiVES));
   }
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(new_pb_speed, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(new_pb_speed),FALSE);
-  }
-
-  dialog_vbox6 = lives_dialog_get_content_area(GTK_DIALOG(new_pb_speed));
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(new_pb_speed));
 
-  vbox6 = gtk_vbox_new (FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox6), vbox6, TRUE, TRUE, 20);
+  vbox = lives_vbox_new (FALSE, 0);
+  
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), vbox, TRUE, TRUE, widget_opts.packing_height*2);
 
   if (type==1) {
-    g_snprintf(label_text,256,_("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the desired playback speed\nin _frames per second"),cfile->fps);
+    g_snprintf(label_text,256,
+	       _("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the desired playback speed\nin _frames per second"),
+	       cfile->fps);
   }
   else if (type==2) {
-    g_snprintf(label_text,256,_("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the _resampled rate\nin frames per second"),cfile->fps);
-  }
-  label = gtk_label_new_with_mnemonic (label_text);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+    g_snprintf(label_text,256,
+	       _("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the _resampled rate\nin frames per second"),
+	       cfile->fps);
   }
-  spinbutton_pb_speed_adj = (GObject *)gtk_adjustment_new (cfile->fps, 1, FPS_MAX, 0.01, .1, 0.);
-  spinbutton_pb_speed = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_pb_speed_adj), 1, 3);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton_pb_speed);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox6), label, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox6), hbox, FALSE, FALSE, 0);
+  label=lives_standard_label_new_with_mnemonic(label_text,NULL);
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   if (type==2) {
-    add_fill_to_box(GTK_BOX(hbox));
-    gtk_box_pack_start (GTK_BOX (hbox), spinbutton_pb_speed, TRUE, TRUE, 10);
+    add_fill_to_box(LIVES_BOX(hbox));
+    spinbutton_pb_speed = lives_standard_spin_button_new (NULL,FALSE,cfile->fps,1.,FPS_MAX,.01,.1,3,LIVES_BOX(hbox),NULL);
     add_fill_to_box(GTK_BOX(hbox));
   }
   else {
-    radiobutton1 = gtk_radio_button_new (NULL);
-    rbgroup=gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
+    radiobutton1 = lives_standard_radio_button_new (NULL,FALSE,rbgroup,LIVES_BOX(hbox),NULL);
+    rbgroup=lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton1));
 
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton1, TRUE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), spinbutton_pb_speed, TRUE, TRUE, 10);
 
-    label=gtk_label_new_with_mnemonic(_("OR enter the desired clip length in _seconds"));
-    gtk_box_pack_start (GTK_BOX (vbox6), label, TRUE, TRUE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    spinbutton_pb_speed = lives_standard_spin_button_new (NULL,FALSE,cfile->fps,1.,FPS_MAX,.01,.1,3,LIVES_BOX(hbox),NULL);
 
-    hbox = gtk_hbox_new (FALSE, 0);
-    radiobutton2 = gtk_radio_button_new (rbgroup);
-    gtk_box_pack_start (GTK_BOX (vbox6), hbox, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton2, TRUE, FALSE, 0);
+    label2=lives_standard_label_new_with_mnemonic(_("OR enter the desired clip length in _seconds"),NULL);
+    gtk_box_pack_start (GTK_BOX (vbox), label2, TRUE, TRUE, widget_opts.packing_height);
 
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    spinbutton_pb_time_adj = (GObject *)gtk_adjustment_new ((gdouble)((gint)(cfile->frames/cfile->fps*100.))/100., 1./FPS_MAX, cfile->frames, 1., 10., 0.);
-    spinbutton_pb_time = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_pb_time_adj), 1, 2);
-    gtk_box_pack_start (GTK_BOX (hbox), spinbutton_pb_time, TRUE, TRUE, 10);
-    gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbutton_pb_time)->entry)), TRUE);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton_pb_time);
+    radiobutton2 = lives_standard_radio_button_new (NULL,FALSE,rbgroup,LIVES_BOX(hbox),NULL);
 
-  }
-  gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbutton_pb_speed)->entry)), TRUE);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  change_audio_speed = gtk_check_button_new();
-  alabel=gtk_label_new_with_mnemonic (_("Change the _audio speed as well"));
-  eventbox=gtk_event_box_new();
+    spinbutton_pb_time = lives_standard_spin_button_new (NULL,FALSE,
+							 (double)((int)(cfile->frames/cfile->fps*100.))/100., 
+							 1./FPS_MAX, cfile->frames, 1., 10., 2, LIVES_BOX(hbox),NULL);
+
+    gtk_label_set_mnemonic_widget (GTK_LABEL (label2), spinbutton_pb_time);
 
-  gtk_box_pack_start (GTK_BOX (hbox), change_audio_speed, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (alabel),change_audio_speed);
-  gtk_container_add(GTK_CONTAINER(eventbox),alabel);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    change_audio_speed);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(alabel, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
   }
-  gtk_box_pack_start (GTK_BOX (dialog_vbox6), hbox, TRUE, TRUE, 20);
 
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton_pb_speed);
+
+
+  ca_hbox = lives_hbox_new (FALSE, 0);
+  change_audio_speed = lives_standard_check_button_new
+    (_("Change the _audio speed as well"),TRUE,LIVES_BOX(ca_hbox),NULL);
 
-  dialog_action_area6 = GTK_DIALOG (new_pb_speed)->action_area;
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area6), GTK_BUTTONBOX_END);
+  gtk_box_pack_start (GTK_BOX (vbox), ca_hbox, TRUE, TRUE, widget_opts.packing_height);
 
-  cancelbutton4 = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_dialog_add_action_widget (GTK_DIALOG (new_pb_speed), cancelbutton4, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton4, GTK_CAN_DEFAULT);
+
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (new_pb_speed));
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
+
+  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_dialog_add_action_widget (GTK_DIALOG (new_pb_speed), cancelbutton, GTK_RESPONSE_CANCEL);
+  lives_widget_set_can_focus (cancelbutton,TRUE);
+
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   change_pb_ok = gtk_button_new_from_stock ("gtk-ok");
   gtk_dialog_add_action_widget (GTK_DIALOG (new_pb_speed), change_pb_ok, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (change_pb_ok, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (change_pb_ok);
   gtk_widget_grab_default (change_pb_ok);
   gtk_widget_grab_focus(spinbutton_pb_speed);
 
@@ -2177,8 +1769,8 @@
   g_signal_connect (GTK_OBJECT (change_audio_speed), "toggled",
 		    G_CALLBACK (on_boolean_toggled),
 		    &mainw->fx1_bool);
-  g_signal_connect (GTK_OBJECT (cancelbutton4), "clicked",
-		    G_CALLBACK (on_cancel_button1_clicked),
+  g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
+		    G_CALLBACK (lives_general_button_clicked),
 		    NULL);
   if (type==1) {
     g_signal_connect (GTK_OBJECT (change_pb_ok), "clicked",
@@ -2210,9 +1802,9 @@
   }
 
   gtk_widget_show_all (new_pb_speed);
+
   if (type!=1||cfile->achans==0) {
-    gtk_widget_hide (change_audio_speed);
-    gtk_widget_hide (alabel);
+    gtk_widget_hide (ca_hbox);
   }
 
 }
@@ -2231,28 +1823,25 @@
 
 
 
-void
-on_change_speed_ok_clicked                (GtkButton *button,
-					   gpointer         user_data)
-{
-  gdouble arate=cfile->arate/cfile->fps;
+void on_change_speed_ok_clicked (GtkButton *button, gpointer user_data) {
+  double arate=cfile->arate/cfile->fps;
   gchar *msg;
-  gboolean has_lmap_error=FALSE;
-  gboolean bad_header=FALSE;
+  boolean has_lmap_error=FALSE;
+  boolean bad_header=FALSE;
 
   // change playback rate
   if (button!=NULL) {
-    gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+    lives_general_button_clicked(button,NULL);
   }
 
   if (mainw->fx2_bool) {
-    mainw->fx1_val=(gdouble)((gint)((gdouble)cfile->frames/mainw->fx2_val*1000.+.5))/1000.;
+    mainw->fx1_val=(double)((int)((double)cfile->frames/mainw->fx2_val*1000.+.5))/1000.;
     if (mainw->fx1_val<1.) mainw->fx1_val=1.;
     if (mainw->fx1_val>FPS_MAX) mainw->fx1_val=FPS_MAX;
   }
 
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES)&&mainw->fx1_val>cfile->fps) {
-    gint new_frames=count_resampled_frames(cfile->frames,mainw->fx1_val,cfile->fps);
+    int new_frames=count_resampled_frames(cfile->frames,mainw->fx1_val,cfile->fps);
     if ((mainw->xlays=layout_frame_is_affected(mainw->current_file,new_frames))!=NULL) {
       if (!do_warning_dialog(_("\nSpeeding up the clip will cause missing frames in some multitrack layouts.\nAre you sure you wish to change the speed ?\n"))) {
 	g_list_free_strings(mainw->xlays);
@@ -2269,7 +1858,7 @@
   }
 
   if (mainw->fx1_bool&&!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)&&mainw->fx1_val>cfile->fps) {
-    gint new_frames=count_resampled_frames(cfile->frames,mainw->fx1_val,cfile->fps);
+    int new_frames=count_resampled_frames(cfile->frames,mainw->fx1_val,cfile->fps);
     if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,(new_frames-1.)/cfile->fps))!=NULL) {
       if (!do_warning_dialog(_("\nSpeeding up the clip will cause missing audio in some multitrack layouts.\nAre you sure you wish to change the speed ?\n"))) {
 	g_list_free_strings(mainw->xlays);
@@ -2354,7 +1943,7 @@
   if (mainw->fx1_val==0.) mainw->fx1_val=1.;
   cfile->pb_fps=cfile->fps=mainw->fx1_val;
   if (mainw->fx1_bool) {
-    cfile->arate=(gint)(arate*cfile->fps+.5);
+    cfile->arate=(int)(arate*cfile->fps+.5);
     msg=g_strdup_printf (_ ("Changed playback speed to %.3f frames per second and audio to %d Hz.\n"),cfile->fps,cfile->arate);
   }
   else {
@@ -2389,19 +1978,19 @@
 
 
 
-gint reorder_frames(int rwidth, int rheight) {
+int reorder_frames(int rwidth, int rheight) {
   int new_frames=cfile->old_frames;
   int cur_frames=cfile->frames;
   gchar **array;
   gchar *com;
 
-  if (rwidth*rheight==0) com=g_strdup_printf("smogrify reorder \"%s\" \"%s\" %d 0 0 %d %d",cfile->handle,
-					     cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",!mainw->endian,
+  if (rwidth*rheight==0) com=g_strdup_printf("%s reorder \"%s\" \"%s\" %d 0 0 %d %d",prefs->backend,cfile->handle,
+					     get_image_ext_for_type(cfile->img_type),!mainw->endian,
 					     reorder_leave_back,cfile->frames);
   else {
     if (!prefs->enc_letterbox) {
-      com=g_strdup_printf("smogrify reorder \"%s\" \"%s\" %d %d %d 0 %d",cfile->handle,
-			  cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",!mainw->endian,rwidth,rheight,cfile->frames);
+      com=g_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d 0 %d",prefs->backend,cfile->handle,
+			  get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight,cfile->frames);
     }
     else {
       int iwidth=cfile->hsize,iheight=cfile->vsize;
@@ -2412,8 +2001,8 @@
 	iheight=-iheight;
       }
   
-      com=g_strdup_printf("smogrify reorder \"%s\" \"%s\" %d %d %d %d %d %d %d",cfile->handle,
-			  cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",!mainw->endian,rwidth,rheight,
+      com=g_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d %d %d %d %d",prefs->backend,cfile->handle,
+			  get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight,
 			  reorder_leave_back,cfile->frames,iwidth,iheight);
     }
   }
@@ -2484,11 +2073,10 @@
 
 
 
-gint
-deorder_frames(gint old_frames, gboolean leave_bak) {
+int deorder_frames(int old_frames, boolean leave_bak) {
   gchar *com;
   weed_timecode_t time_start;
-  gint perf_start,perf_end;
+  int perf_start,perf_end;
   
   if (cfile->event_list!=NULL) return cfile->frames;
 
@@ -2501,11 +2089,12 @@
   }
   else {
     time_start=get_event_timecode (get_first_event(cfile->event_list));
-    perf_start=(gint)(cfile->fps*(gdouble)time_start/U_SEC)+1;
+    perf_start=(int)(cfile->fps*(double)time_start/U_SEC)+1;
     perf_end=perf_start+count_events (cfile->event_list,FALSE,0,0)-1;
   }
-  com=g_strdup_printf("smogrify deorder \"%s\" %d %d %d \"%s\" %d",cfile->handle,perf_start,cfile->frames,perf_end,
-		      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",leave_bak);
+  com=g_strdup_printf("%s deorder \"%s\" %d %d %d \"%s\" %d",prefs->backend,cfile->handle,
+		      perf_start,cfile->frames,perf_end,
+		      get_image_ext_for_type(cfile->img_type),leave_bak);
 
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
@@ -2526,17 +2115,17 @@
 }
 
 
-gboolean resample_clipboard(gdouble new_fps) {
+boolean resample_clipboard(double new_fps) {
   // resample the clipboard video - if we already did it once, it is
   // quicker the second time
   gchar *msg,*com;
-  gint current_file=mainw->current_file;
+  int current_file=mainw->current_file;
 
   mainw->no_switch_dprint=TRUE;
 
   if (clipboard->undo1_dbl==new_fps&&!prefs->conserve_space) {
-    gint new_frames;
-    gdouble old_fps=clipboard->fps;
+    int new_frames;
+    double old_fps=clipboard->fps;
 
     if (new_fps==clipboard->fps) {
       mainw->no_switch_dprint=FALSE;
@@ -2549,8 +2138,8 @@
     mainw->current_file=0;
 
     // copy .mgk to .img_ext and .img_ext to .bak (i.e redo the resample)
-    com=g_strdup_printf("smogrify redo \"%s\" %d %d \"%s\"",cfile->handle,1,new_frames,
-			cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+    com=g_strdup_printf("%s redo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,1,new_frames,
+			get_image_ext_for_type(cfile->img_type));
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
@@ -2578,10 +2167,10 @@
   }
   else {
     if (clipboard->undo1_dbl<clipboard->fps) {
-      gint old_frames=count_resampled_frames(clipboard->frames,clipboard->fps,clipboard->undo1_dbl);
+      int old_frames=count_resampled_frames(clipboard->frames,clipboard->fps,clipboard->undo1_dbl);
       mainw->current_file=0;
-      com=g_strdup_printf("smogrify undo \"%s\" %d %d \"%s\"",cfile->handle,old_frames+1,cfile->frames,
-			  cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+      com=g_strdup_printf("%s undo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,old_frames+1,cfile->frames,
+			  get_image_ext_for_type(cfile->img_type));
       unlink(cfile->info_file);
       lives_system(com,FALSE);
       cfile->progress_start=old_frames+1;

LiVES-1.6.1.tar.bz2/src/resample.h -> LiVES-2.0.3.tar.bz2/src/resample.h Changed

LiVES-1.6.1.tar.bz2/src/rfx-builder.c -> LiVES-2.0.3.tar.bz2/src/rfx-builder.c Changed

@@ -1,9 +1,11 @@
 // rfx-builder.c
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
+
+
 #include <errno.h>
 
 #include "main.h"
@@ -13,6 +15,10 @@
 #include "paramwindow.h"
 #include "effects.h"
 
+static GtkWidget *copy_script_okbutton;
+
+static void table_select_row(rfx_build_window_t *rfxbuilder, int row);
+
 void
 on_new_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   rfx_build_window_t *rfxbuilder;
@@ -82,13 +88,10 @@
   GtkWidget *dialog_action_area;
   GtkWidget *hbox;
   GtkWidget *label;
-  GtkWidget *langc_combo;
-  GtkWidget *hseparator;
   GtkWidget *okbutton;
   GtkWidget *cancelbutton;
   GtkWidget *scrollw;
   GtkWidget *top_vbox;
-  GObject *spinbutton_adj;
 
   GSList *radiobutton_type_group = NULL;
   GList *langc=NULL;
@@ -97,6 +100,8 @@
 
   GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
+  gchar *tmp,*tmp2,*title,*string;
+
   rfxbuilder->rfx_version=g_strdup(RFX_VERSION);
 
   rfxbuilder->type=RFX_BUILD_TYPE_EFFECT1; // the default
@@ -128,420 +133,217 @@
   /////////////////////////////////////////////////////////
 
 
-  rfxbuilder->dialog = gtk_dialog_new ();
   if (script_name==NULL) {
-    gtk_window_set_title (GTK_WINDOW (rfxbuilder->dialog), _("LiVES: - New Test RFX"));
+    title=g_strdup(_("LiVES: - New Test RFX"));
   }
   else {
-    gtk_window_set_title (GTK_WINDOW (rfxbuilder->dialog), _("LiVES: - Edit Test RFX"));
+    title=g_strdup(_("LiVES: - Edit Test RFX"));
   }
-  gtk_window_set_position (GTK_WINDOW (rfxbuilder->dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (rfxbuilder->dialog), TRUE);
+
+  rfxbuilder->dialog = lives_standard_dialog_new (title,FALSE);
+  g_free(title);
+
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(rfxbuilder->dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(rfxbuilder->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(rfxbuilder->dialog),FALSE);
-  }
+
 
   gtk_window_add_accel_group (GTK_WINDOW (rfxbuilder->dialog), accel_group);
 
-  gtk_container_set_border_width (GTK_CONTAINER (rfxbuilder->dialog), 8);
-  gtk_window_set_default_size (GTK_WINDOW (rfxbuilder->dialog), (PREF_RFXDIALOG_W<mainw->scr_width-20)?
-			       PREF_RFXDIALOG_W:mainw->scr_width-20, (PREF_RFXDIALOG_H<mainw->scr_height-60)?
-			       PREF_RFXDIALOG_H:mainw->scr_height-60);
+  gtk_container_set_border_width (GTK_CONTAINER (rfxbuilder->dialog), widget_opts.border_width>>1);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(rfxbuilder->dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 8);
-  gtk_widget_show (dialog_vbox);
-
-  top_vbox = gtk_vbox_new (FALSE, 10);
-  gtk_widget_show (top_vbox);
 
+  top_vbox = lives_vbox_new (FALSE, 0);
 
-  scrollw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrollw);
+  scrollw = lives_standard_scrolled_window_new ((PREF_RFXDIALOG_W<mainw->scr_width-20.*widget_opts.scale)?
+						PREF_RFXDIALOG_W:mainw->scr_width-20.*widget_opts.scale, 
+						(PREF_RFXDIALOG_H<mainw->scr_height-60.*widget_opts.scale)?
+						PREF_RFXDIALOG_H:mainw->scr_height-60.*widget_opts.scale,top_vbox);
   gtk_box_pack_start (GTK_BOX (dialog_vbox), scrollw, TRUE, TRUE, 0);
 
-   
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollw), GTK_POLICY_AUTOMATIC, 
-				  GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollw), 
-					 top_vbox);
-  
-  // Apply theme background to scrolled window
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(GTK_BIN(scrollw)->child, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg(GTK_BIN(scrollw)->child, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-
-
-
-
-
-
   // types
-  hbox = gtk_hbox_new (FALSE, 20);
-  gtk_widget_show (hbox);
+  hbox = lives_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
 
 
-  label = gtk_label_new (_("Type:"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->type_effect1_radiobutton = gtk_radio_button_new (NULL);
-  rfxbuilder->type_effect2_radiobutton = gtk_radio_button_new (NULL);
-  rfxbuilder->type_effect0_radiobutton = gtk_radio_button_new (NULL);
-  rfxbuilder->type_tool_radiobutton = gtk_radio_button_new (NULL);
-  rfxbuilder->type_utility_radiobutton = gtk_radio_button_new (NULL);
-
-  label = gtk_label_new (_("Effect -"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (rfxbuilder->type_effect1_radiobutton);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->type_effect1_radiobutton, TRUE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (rfxbuilder->type_effect1_radiobutton), radiobutton_type_group);
-  radiobutton_type_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rfxbuilder->type_effect1_radiobutton));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->type_effect1_radiobutton), TRUE);
-
-
-  label = gtk_label_new (_("Transition -"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (rfxbuilder->type_effect2_radiobutton);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->type_effect2_radiobutton, TRUE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (rfxbuilder->type_effect2_radiobutton), radiobutton_type_group);
-  radiobutton_type_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rfxbuilder->type_effect2_radiobutton));
-
-
-  label = gtk_label_new (_("Generator -"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (rfxbuilder->type_effect0_radiobutton);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->type_effect0_radiobutton, TRUE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (rfxbuilder->type_effect0_radiobutton), radiobutton_type_group);
-  radiobutton_type_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rfxbuilder->type_effect0_radiobutton));
-
-  label = gtk_label_new (_("Tool -"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_widget_show (rfxbuilder->type_tool_radiobutton);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->type_tool_radiobutton, TRUE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (rfxbuilder->type_tool_radiobutton), radiobutton_type_group);
-  radiobutton_type_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rfxbuilder->type_tool_radiobutton));
+  label = lives_standard_label_new (_("Type:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, widget_opts.packing_width);
 
+  string=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE);
+  rfxbuilder->type_effect1_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_effect1_radiobutton));
+  g_free(string);
+
+  string=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,FALSE);
+  rfxbuilder->type_effect2_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_effect2_radiobutton));
+  g_free(string);
+
+  string=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_GENERATOR,FALSE);
+  rfxbuilder->type_effect0_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_effect0_radiobutton));
+  g_free(string);
 
-  label = gtk_label_new (_("Utility -"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
+  rfxbuilder->type_tool_radiobutton = lives_standard_radio_button_new (_("tool"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_tool_radiobutton));  gtk_widget_show (label);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  rfxbuilder->type_utility_radiobutton = lives_standard_radio_button_new (_("utility"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
 
-  gtk_widget_show (rfxbuilder->type_utility_radiobutton);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->type_utility_radiobutton, TRUE, FALSE, 0);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (rfxbuilder->type_utility_radiobutton), radiobutton_type_group);
-  radiobutton_type_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rfxbuilder->type_utility_radiobutton));
 
   // name
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new (_("Name:          "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->name_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->name_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->name_entry, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->name_entry,(_ ("The name of the plugin. No spaces allowed.")));
+  rfxbuilder->name_entry = lives_standard_entry_new ((tmp=g_strdup(_("Name:          "))),FALSE,NULL,-1,-1,
+						     LIVES_BOX(top_vbox),(tmp2=g_strdup(_("The name of the plugin. No spaces allowed.")))
+						     );
+  g_free(tmp); g_free(tmp2);
 
   // version
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new (_("Version:       "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (rfxbuilder->plugin_version, rfxbuilder->plugin_version, 1000000., 1., 1., 0.);
-  rfxbuilder->spinbutton_version = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
+  rfxbuilder->spinbutton_version = lives_standard_spin_button_new ((tmp=g_strdup(_("Version:       "))),FALSE,
+								   rfxbuilder->plugin_version, rfxbuilder->plugin_version, 1000000., 1., 1., 0,
+								   LIVES_BOX(hbox),(tmp2=g_strdup(_ ("The script version.")))
+								   );
+  g_free(tmp); g_free(tmp2);
 
-  gtk_widget_show (rfxbuilder->spinbutton_version);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_version, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->spinbutton_version,(_ ("The script version.")));
 
   // author
 
-  label = gtk_label_new (_("    Author:       "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->author_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->author_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->author_entry, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->author_entry,(_ ("The script author.")));
-
+  rfxbuilder->author_entry = lives_standard_entry_new ((tmp=g_strdup(_("    Author:       "))),FALSE,NULL,-1,-1,
+						       LIVES_BOX(hbox),(tmp2=g_strdup(_("The script author.")))
+						       );
+  g_free(tmp); g_free(tmp2);
 
   // URL
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new (_("    URL (optional):       "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->url_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->url_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->url_entry, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->url_entry,(_ ("URL for the plugin maintainer.")));
+  rfxbuilder->url_entry = lives_standard_entry_new ((tmp=g_strdup(_("    URL (optional):       "))),FALSE,NULL,-1,-1,
+						    LIVES_BOX(top_vbox),(tmp2=g_strdup(_("URL for the plugin maintainer.")))
+						    );
+  g_free(tmp); g_free(tmp2);
 
 
   // menu entry
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new (_("Menu text:    "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->menu_text_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->menu_text_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->menu_text_entry, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->menu_text_entry,(_ ("The text to show in the menu.")));
 
+  rfxbuilder->menu_text_entry = lives_standard_entry_new ((tmp=g_strdup(_("Menu text:    "))),FALSE,NULL,-1,-1,
+							  LIVES_BOX(top_vbox),(tmp2=g_strdup(_("The text to show in the menu.")))
+							  );
+  g_free(tmp); g_free(tmp2);
 
-  rfxbuilder->action_desc_hsep = gtk_hseparator_new ();
-  gtk_widget_show (rfxbuilder->action_desc_hsep);
-  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->action_desc_hsep, FALSE, TRUE, 0);
 
+  rfxbuilder->action_desc_hsep = add_hsep_to_box(LIVES_BOX(top_vbox));
 
   // action description
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
+  rfxbuilder->action_desc_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->action_desc_hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  rfxbuilder->action_desc_label = gtk_label_new (_("Action description:        "));
-  gtk_widget_show (rfxbuilder->action_desc_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->action_desc_label, FALSE, FALSE, 0);
+  rfxbuilder->action_desc_entry = lives_standard_entry_new ((tmp=g_strdup(_("Action description:        "))),FALSE,NULL,-1,-1,
+							    LIVES_BOX(rfxbuilder->action_desc_hbox),
+							    (tmp2=g_strdup(_("Describe what the plugin is doing. E.g. \"Edge detecting\"")))
+							    );
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->action_desc_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  rfxbuilder->action_desc_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->action_desc_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->action_desc_entry, TRUE, TRUE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->action_desc_entry,
-			(_ ("Describe what the plugin is doing. E.g. \"Edge detecting\"")));
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
+  rfxbuilder->spinbutton_min_frames = lives_standard_spin_button_new ((tmp=g_strdup(_("Minimum frames:"))),FALSE,
+								      1., 1., 1000., 1., 1., 0,
+								      LIVES_BOX(top_vbox),
+								      (tmp2=g_strdup(_("Minimum number of frames this effect/tool can be applied to. Normally 1.")))
+								      );
 
-  rfxbuilder->min_frames_label = gtk_label_new (_("Minimum frames:"));
-  gtk_widget_show (rfxbuilder->min_frames_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->min_frames_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->min_frames_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new (1., 1., 1000., 1., 1., 0);
-  rfxbuilder->spinbutton_min_frames = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (rfxbuilder->spinbutton_min_frames);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_min_frames, TRUE, FALSE, 0);
-  gtk_widget_set_tooltip_text( rfxbuilder->spinbutton_min_frames,
-			(_ ("Minimum number of frames this effect/tool can be applied to. Normally 1.")));
+  rfxbuilder->min_frames_label=widget_opts.last_label;
 
   // requirements
 
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->requirements_button=gtk_button_new_with_mnemonic (_ ("_Requirements..."));
-  gtk_widget_show (rfxbuilder->requirements_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->requirements_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->requirements_button,
 			(_ ("Enter any binaries required by the plugin.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->properties_button=gtk_button_new_with_mnemonic (_ ("_Properties..."));
-  gtk_widget_show (rfxbuilder->properties_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->properties_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->properties_button,
 			(_ ("Set properties for the plugin. Optional.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->params_button=gtk_button_new_with_mnemonic (_ ("_Parameters..."));
-  gtk_widget_show (rfxbuilder->params_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->params_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->params_button,
 			(_ ("Set up parameters used in pre/loop/post/trigger code. Optional.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->param_window_button=gtk_button_new_with_mnemonic (_ ("Parameter _Window Hints..."));
-  gtk_widget_show (rfxbuilder->param_window_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->param_window_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->param_window_button,
 			(_ ("Set hints about how to lay out the parameter window. Optional.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbox, TRUE, TRUE, 0);
+  langc = g_list_append (langc, (gpointer)"0xF0 - LiVES-Perl");
 
-  label = gtk_label_new (_("Language code:"));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  rfxbuilder->langc_combo = lives_standard_combo_new ((tmp=g_strdup(_("_Language code:"))),TRUE,langc,LIVES_BOX(top_vbox),
+						      (tmp2=g_strdup(_ ("Language for pre/loop/post/triggers. Optional."))));
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  g_free(tmp);
+  g_free(tmp2);
+  g_list_free(langc);
 
-  langc = g_list_append (langc, (gpointer)"0xF0 - LiVES-Perl");
 
-  langc_combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (langc_combo), langc);
-  g_list_free(langc);
-  gtk_box_pack_start (GTK_BOX (hbox), langc_combo, TRUE, FALSE, 0);
-  gtk_widget_show(langc_combo);
-  rfxbuilder->langc_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(langc_combo))->entry));
-  gtk_editable_set_editable (GTK_EDITABLE(rfxbuilder->langc_entry),FALSE);
-
-  gtk_widget_set_tooltip_text( rfxbuilder->langc_entry,
-			(_ ("Language for pre/loop/post/triggers. Optional.")));
-
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->pre_button=gtk_button_new_with_mnemonic (_ ("_Pre loop code..."));
-  gtk_widget_show (rfxbuilder->pre_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->pre_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->pre_button,
 			(_ ("Code to be executed before the loop. Optional.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->loop_button=gtk_button_new_with_mnemonic (_ ("_Loop code..."));
-  gtk_widget_show (rfxbuilder->loop_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->loop_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->loop_button,
 			(_ ("Loop code to be applied to each frame.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->post_button=gtk_button_new_with_mnemonic (_ ("_Post loop code..."));
-  gtk_widget_show (rfxbuilder->post_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->post_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->post_button,
 			(_ ("Code to be executed after the loop. Optional.")));
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (top_vbox), hseparator, FALSE, TRUE, 0);
+  add_hsep_to_box(LIVES_BOX(top_vbox));
 
   rfxbuilder->trigger_button=gtk_button_new_with_mnemonic (_ ("_Trigger code..."));
-  gtk_widget_show (rfxbuilder->trigger_button);
   gtk_box_pack_start (GTK_BOX (top_vbox), rfxbuilder->trigger_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text( rfxbuilder->trigger_button,
 			(_ ("Set trigger code for when the parameter window is shown, or when a parameter is changed. Optional (except for Utilities).")));
 
 
-  dialog_action_area = GTK_DIALOG (rfxbuilder->dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (rfxbuilder->dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+
+  okbutton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), okbutton, GTK_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default (okbutton);
 
   gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
+  gtk_widget_add_accelerator (okbutton, "activate", accel_group,
+                              LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
 
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (rfxbuilder->dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
 
   g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 		    G_CALLBACK (on_rfxbuilder_ok),
@@ -600,10 +402,6 @@
 			  (gpointer)rfxbuilder);
 
 
-  g_signal_connect (GTK_OBJECT (rfxbuilder->dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
-		    NULL);
-
   // edit mode
   if (script_name!=NULL) {
     // we assume the name is valid
@@ -635,16 +433,16 @@
     g_free (script_file);
     switch (rfxbuilder->type) {
     case RFX_BUILD_TYPE_TOOL:
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->type_tool_radiobutton),TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_tool_radiobutton),TRUE);
       break;
     case RFX_BUILD_TYPE_EFFECT0:
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->type_effect0_radiobutton),TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect0_radiobutton),TRUE);
       break;
     case RFX_BUILD_TYPE_UTILITY:
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->type_utility_radiobutton),TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_utility_radiobutton),TRUE);
       break;
     case RFX_BUILD_TYPE_EFFECT2:
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->type_effect2_radiobutton),TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect2_radiobutton),TRUE);
       break;
     default:
       break;
@@ -653,12 +451,14 @@
   else {
     gtk_widget_grab_focus (rfxbuilder->name_entry);
   }
+
+  gtk_widget_show_all(rfxbuilder->dialog);
+
   return rfxbuilder;
 }
 
 
-void
-after_rfxbuilder_type_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
+void after_rfxbuilder_type_toggled (GtkToggleButton *togglebutton, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   gtk_widget_set_sensitive (rfxbuilder->pre_button,TRUE);
@@ -668,8 +468,7 @@
   gtk_widget_set_sensitive (rfxbuilder->properties_button,TRUE);
   gtk_widget_show (rfxbuilder->spinbutton_min_frames);
   gtk_widget_show (rfxbuilder->min_frames_label);
-  gtk_widget_show (rfxbuilder->action_desc_label);
-  gtk_widget_show (rfxbuilder->action_desc_entry);
+  gtk_widget_show (rfxbuilder->action_desc_hbox);
   gtk_widget_show (rfxbuilder->action_desc_hsep);
 
   if (togglebutton==GTK_TOGGLE_BUTTON (rfxbuilder->type_effect1_radiobutton)) {
@@ -699,8 +498,7 @@
     gtk_widget_set_sensitive (rfxbuilder->loop_button,FALSE);
     gtk_widget_set_sensitive (rfxbuilder->post_button,FALSE);
     gtk_widget_hide (rfxbuilder->min_frames_label);
-    gtk_widget_hide (rfxbuilder->action_desc_label);
-    gtk_widget_hide (rfxbuilder->action_desc_entry);
+    gtk_widget_hide (rfxbuilder->action_desc_hbox);
     gtk_widget_hide (rfxbuilder->action_desc_hsep);
   }
 
@@ -721,13 +519,15 @@
 
   // buttons
   GtkWidget *new_entry_button;
-  GtkWidget *edit_entry_button;
-  GtkWidget *remove_entry_button;
   GtkWidget *okbutton;
   GtkWidget *scrolledwindow;
   GtkWidget *cancelbutton;
 
-  int i;
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+
+  register int i;
+
+  char *title=NULL;
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
@@ -744,51 +544,35 @@
     rfxbuilder->table_type=RFX_TABLE_TYPE_TRIGGERS;
   }
 
-  dialog = gtk_dialog_new ();
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Requirements"));
+    title=g_strdup(_("LiVES: - RFX Requirements"));
     rfxbuilder->onum_reqs=rfxbuilder->num_reqs;
   }
   else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Parameters"));
+    title=g_strdup(_("LiVES: - RFX Parameters"));
     rfxbuilder->onum_params=rfxbuilder->num_params;
   }
   else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Parameter Window Hints"));
+    title=g_strdup(_("LiVES: - RFX Parameter Window Hints"));
     rfxbuilder->onum_paramw_hints=rfxbuilder->num_paramw_hints;
   }
   else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Triggers"));
+    title=g_strdup(_("LiVES: - RFX Triggers"));
     rfxbuilder->onum_triggers=rfxbuilder->num_triggers;
   }
 
-  gtk_widget_show (dialog);
+  dialog = lives_standard_dialog_new (title,FALSE);
+  if (title!=NULL) g_free(title);
+
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
 
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 10);
-  gtk_widget_show (dialog_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow);
-  gtk_box_pack_start (GTK_BOX (hbox), scrolledwindow, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   // create table and add rows
   rfxbuilder->ptable_rows=rfxbuilder->table_rows=0;
@@ -823,57 +607,63 @@
       on_table_add_row (NULL,(gpointer)rfxbuilder);
     }
   }
-  gtk_widget_set_size_request (scrolledwindow,500,100);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), rfxbuilder->table);
-  gtk_widget_show (rfxbuilder->table);
+  hbox = lives_hbox_new (FALSE,0);
+
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4,rfxbuilder->table);
+
+  gtk_box_pack_start(GTK_BOX(hbox),scrolledwindow,FALSE,FALSE,widget_opts.packing_width);
 
 
   // button box on right
-  vseparator = gtk_vseparator_new ();
-  gtk_widget_show (vseparator);
-  gtk_box_pack_start (GTK_BOX (hbox), vseparator, TRUE, TRUE, 10);
+  vseparator = lives_vseparator_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), vseparator, TRUE, TRUE, widget_opts.packing_width);
 
-  button_box=gtk_vbutton_box_new();
+  button_box=lives_vbutton_box_new();
   gtk_box_pack_start (GTK_BOX (hbox), button_box, FALSE, FALSE, 0);
-  gtk_widget_show (button_box);
 
   new_entry_button=gtk_button_new_with_mnemonic (_ ("_New Entry"));
-  gtk_widget_show (new_entry_button);
   gtk_box_pack_start (GTK_BOX (button_box), new_entry_button, FALSE, FALSE, 0);
 
-  edit_entry_button=gtk_button_new_with_mnemonic (_ ("_Edit Entry"));
-  gtk_widget_show (edit_entry_button);
-  gtk_box_pack_start (GTK_BOX (button_box), edit_entry_button, FALSE, FALSE, 0);
-
-  remove_entry_button=gtk_button_new_with_mnemonic (_ ("_Remove Entry"));
-  gtk_widget_show (remove_entry_button);
-  gtk_box_pack_start (GTK_BOX (button_box), remove_entry_button, FALSE, FALSE, 0);
+  rfxbuilder->edit_entry_button=gtk_button_new_with_mnemonic (_ ("_Edit Entry"));
+  gtk_box_pack_start (GTK_BOX (button_box), rfxbuilder->edit_entry_button, FALSE, FALSE, 0);
+
+  rfxbuilder->remove_entry_button=gtk_button_new_with_mnemonic (_ ("_Remove Entry"));
+  gtk_box_pack_start (GTK_BOX (button_box), rfxbuilder->remove_entry_button, FALSE, FALSE, 0);
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
     rfxbuilder->move_up_button=gtk_button_new_with_mnemonic (_ ("Move _Up"));
-    gtk_widget_show (rfxbuilder->move_up_button);
     gtk_box_pack_start (GTK_BOX (button_box), rfxbuilder->move_up_button, FALSE, FALSE, 0);
     
     rfxbuilder->move_down_button=gtk_button_new_with_mnemonic (_ ("Move _Down"));
-    gtk_widget_show (rfxbuilder->move_down_button);
     gtk_box_pack_start (GTK_BOX (button_box), rfxbuilder->move_down_button, FALSE, FALSE, 0);
+
+
+    gtk_widget_set_sensitive(rfxbuilder->move_up_button,FALSE);
+    gtk_widget_set_sensitive(rfxbuilder->move_down_button,FALSE);
+  }
+  else {
+    rfxbuilder->move_up_button=rfxbuilder->move_down_button=NULL;
   }
 
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  gtk_widget_set_sensitive(rfxbuilder->edit_entry_button,FALSE);
+  gtk_widget_set_sensitive(rfxbuilder->remove_entry_button,FALSE);
+
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) {
     g_signal_connect (GTK_OBJECT (okbutton), "clicked",
@@ -883,9 +673,6 @@
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		      G_CALLBACK (on_requirements_cancel),
 		      user_data);
-    g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		      G_CALLBACK (gtk_true),
-		      NULL);
   }
   else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
     g_signal_connect (GTK_OBJECT (okbutton), "clicked",
@@ -895,9 +682,6 @@
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		      G_CALLBACK (on_params_cancel),
 		      user_data);
-    g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		      G_CALLBACK (gtk_true),
-		      NULL);
   }
   else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
     g_signal_connect (GTK_OBJECT (okbutton), "clicked",
@@ -907,9 +691,6 @@
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		      G_CALLBACK (on_param_window_cancel),
 		      user_data);
-    g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		      G_CALLBACK (gtk_true),
-		      NULL);
   }
   else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
     g_signal_connect (GTK_OBJECT (okbutton), "clicked",
@@ -919,9 +700,6 @@
     g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
 		      G_CALLBACK (on_triggers_cancel),
 		      user_data);
-    g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		      G_CALLBACK (gtk_true),
-		      NULL);
   }
 
 
@@ -930,11 +708,11 @@
 		    G_CALLBACK (on_table_add_row),
 		    user_data);
 
-  g_signal_connect (GTK_OBJECT (edit_entry_button), "clicked",
+  g_signal_connect (GTK_OBJECT (rfxbuilder->edit_entry_button), "clicked",
 		    G_CALLBACK (on_table_edit_row),
 		    user_data);
 
-  g_signal_connect (GTK_OBJECT (remove_entry_button), "clicked",
+  g_signal_connect (GTK_OBJECT (rfxbuilder->remove_entry_button), "clicked",
 		    G_CALLBACK (on_table_delete_row),
 		    user_data);
 
@@ -947,6 +725,9 @@
 		      G_CALLBACK (on_table_swap_row),
 		      user_data);
   }
+
+  gtk_widget_show_all (dialog);
+  table_select_row(rfxbuilder,-1);
 }
 
 void on_requirements_ok (GtkButton *button, gpointer user_data) {
@@ -959,14 +740,14 @@
   for (i=0;i<rfxbuilder->num_reqs;i++) {
     rfxbuilder->reqs[i]=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[i])));
   }
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 void on_requirements_cancel (GtkButton *button, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   rfxbuilder->num_reqs=rfxbuilder->onum_reqs;
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 void on_properties_ok (GtkButton *button, gpointer user_data) {
@@ -988,12 +769,9 @@
       rfxbuilder->props^=RFX_PROPS_BATCHG;
     }
   }
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
-void on_properties_cancel (GtkButton *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-}
 
 void on_params_ok (GtkButton *button, gpointer user_data) { 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
@@ -1025,7 +803,7 @@
   if (rfxbuilder->num_params) {
     g_free (rfxbuilder->copy_params);
   }
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 
@@ -1046,7 +824,7 @@
     g_free (rfxbuilder->copy_params);
   }
   rfxbuilder->num_params=rfxbuilder->onum_params;
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 void on_param_window_ok (GtkButton *button, gpointer user_data) {
@@ -1058,41 +836,36 @@
     g_free (rfxbuilder->paramw_hints[i]);
   }
   for (i=0;i<rfxbuilder->num_paramw_hints;i++) {
-    rfxbuilder->paramw_hints[i]=g_strdup_printf ("%s%s%s",gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[i])),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry2[i])));
+    rfxbuilder->paramw_hints[i]=g_strdup_printf ("%s%s%s",gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[i])),rfxbuilder->field_delim,
+						 gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry2[i])));
   }
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 void on_param_window_cancel (GtkButton *button, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   rfxbuilder->num_paramw_hints=rfxbuilder->onum_paramw_hints;
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 void on_code_ok (GtkButton *button, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  GtkTextIter startiter,enditer;
-
-  gtk_text_buffer_get_start_iter (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter);
-  gtk_text_buffer_get_end_iter (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&enditer);
-
-
   switch (rfxbuilder->codetype) {
   case RFX_CODE_TYPE_PRE:
     g_free (rfxbuilder->pre_code);
-    rfxbuilder->pre_code=gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE);
+    rfxbuilder->pre_code=text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
     break;
 
   case RFX_CODE_TYPE_LOOP:
     g_free (rfxbuilder->loop_code);
-    rfxbuilder->loop_code=gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE);
+    rfxbuilder->loop_code=text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
     break;
 
   case RFX_CODE_TYPE_POST:
     g_free (rfxbuilder->post_code);
-    rfxbuilder->post_code=gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE);
+    rfxbuilder->post_code=text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
     break;
 
   case RFX_CODE_TYPE_STRDEF:
@@ -1101,14 +874,14 @@
       gchar buf[++maxlen];
       
       if (rfxbuilder->copy_params[rfxbuilder->edit_param].def!=NULL) g_free (rfxbuilder->copy_params[rfxbuilder->edit_param].def);
-      g_snprintf (buf,maxlen,"%s",gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE));
+      g_snprintf (buf,maxlen,"%s",text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview)));
 
       rfxbuilder->copy_params[rfxbuilder->edit_param].def=subst (buf,rfxbuilder->field_delim,"");
       break;
     }
   case RFX_CODE_TYPE_STRING_LIST:
     {
-      gchar *values=gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE);
+      gchar *values=text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
       gchar **lines=g_strsplit (values,"\n",-1);
       gint numlines=get_token_count (values,'\n');
       int i;
@@ -1127,25 +900,23 @@
       g_strfreev (lines);
 
       // set "default" combo - TODO - try to retain old default using string matching
-      combo_set_popdown_strings (GTK_COMBO (rfxbuilder->param_def_combo), 
-				 rfxbuilder->copy_params[rfxbuilder->edit_param].list);
+      lives_combo_populate (LIVES_COMBO (rfxbuilder->param_def_combo), 
+			     rfxbuilder->copy_params[rfxbuilder->edit_param].list);
       if (rfxbuilder->copy_params[rfxbuilder->edit_param].list==NULL||
 	  defindex>g_list_length (rfxbuilder->copy_params[rfxbuilder->edit_param].list)) {
 	set_int_param (rfxbuilder->copy_params[rfxbuilder->edit_param].def,(defindex=0));
       }
       if (rfxbuilder->copy_params[rfxbuilder->edit_param].list!=NULL) {
-	gtk_entry_set_text (GTK_ENTRY((GTK_COMBO(rfxbuilder->param_def_combo))->entry), 
-			    (gchar *)g_list_nth_data (rfxbuilder->copy_params[rfxbuilder->edit_param].list,defindex));
+	lives_combo_set_active_string (LIVES_COMBO(rfxbuilder->param_def_combo), 
+				       (gchar *)g_list_nth_data (rfxbuilder->copy_params[rfxbuilder->edit_param].list,defindex));
       }
 
     }
   }
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
-void on_code_cancel (GtkButton *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-}
+
 void on_triggers_ok (GtkButton *button, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
@@ -1165,7 +936,7 @@
   if (rfxbuilder->num_triggers) {
     g_free (rfxbuilder->copy_triggers);
   }
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 void on_triggers_cancel (GtkButton *button, gpointer user_data) {
@@ -1179,7 +950,7 @@
     g_free (rfxbuilder->copy_triggers);
   }
   rfxbuilder->num_triggers=rfxbuilder->onum_triggers;
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_general_button_clicked(button,NULL);
 }
 
 
@@ -1187,142 +958,178 @@
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
   GtkWidget *dialog_action_area;
-  GtkWidget *hbox;
   GtkWidget *cancelbutton;
   GtkWidget *okbutton;
-  GtkWidget *label;
+
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Properties"));
-  gtk_widget_show (dialog);
+  dialog = lives_standard_dialog_new (_("LiVES: - RFX Properties"),FALSE);
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
 
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(rfxbuilder->dialog));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
-  gtk_window_set_default_size (GTK_WINDOW (rfxbuilder->dialog), 300, 200);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 10);
-  gtk_widget_show (dialog_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  rfxbuilder->prop_slow= lives_standard_check_button_new (_("_Slow (hint to GUI)"),TRUE,LIVES_BOX(dialog_vbox),NULL);
+
   if (rfxbuilder->type!=RFX_BUILD_TYPE_EFFECT0) {
-    gtk_widget_show (hbox);
+    gtk_widget_show (rfxbuilder->prop_slow);
   }
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
 
-  rfxbuilder->prop_slow= gtk_check_button_new ();
-  label=gtk_label_new_with_mnemonic (_ ("_Slow (hint to GUI)"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),rfxbuilder->prop_slow);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->prop_slow, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-  gtk_widget_show (label);
-  gtk_widget_show (rfxbuilder->prop_slow);
   if (rfxbuilder->props&RFX_PROPS_SLOW) {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->prop_slow),TRUE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->prop_slow),TRUE);
   }
 
   if (rfxbuilder->type==RFX_BUILD_TYPE_EFFECT0) {
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-    
-    rfxbuilder->prop_batchg= gtk_check_button_new ();
-    label=gtk_label_new_with_mnemonic (_ ("_Batch mode generator"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),rfxbuilder->prop_batchg);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->prop_batchg, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 10);
-    gtk_widget_show (label);
-    gtk_widget_show (rfxbuilder->prop_batchg);
+    rfxbuilder->prop_batchg=lives_standard_check_button_new (_("_Batch mode generator"),TRUE,LIVES_BOX(dialog_vbox),NULL);
     if (rfxbuilder->props&RFX_PROPS_BATCHG) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rfxbuilder->prop_batchg),TRUE);
+      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->prop_batchg),TRUE);
     }
   }
 
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
+
+  gtk_widget_grab_default (okbutton);
+
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
+  
+  gtk_widget_add_accelerator (okbutton, "activate", accel_group,
+                              LIVES_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0);
+
 
   g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 		    G_CALLBACK (on_properties_ok),
 		    user_data);
 
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
-		    G_CALLBACK (on_properties_cancel),
-		    user_data);
-  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
+		    G_CALLBACK (lives_general_button_clicked),
 		    NULL);
   
+  gtk_widget_show_all (dialog);
 
 }
 
 
+static void table_select_row(rfx_build_window_t *rfxbuilder, int row) {
+  register int i;
+  for (i=0;i<rfxbuilder->table_rows;i++) {
+    if (i==row) {
+      gtk_widget_set_sensitive(rfxbuilder->edit_entry_button,TRUE);
+      gtk_widget_set_sensitive(rfxbuilder->remove_entry_button,TRUE);
+      if (rfxbuilder->move_up_button!=NULL) gtk_widget_set_sensitive(rfxbuilder->move_up_button,i!=0);
+      if (rfxbuilder->move_down_button!=NULL) gtk_widget_set_sensitive(rfxbuilder->move_down_button,i<rfxbuilder->table_rows-1);
+    
+      gtk_widget_set_sensitive(rfxbuilder->entry[i],TRUE);
+      if (rfxbuilder->entry2[i]!=NULL) {
+	gtk_widget_set_sensitive(rfxbuilder->entry2[i],TRUE);
+      }
+      if (rfxbuilder->entry3[i]!=NULL) {
+	gtk_widget_set_sensitive(rfxbuilder->entry3[i],TRUE);
+      }
+    }
+    else {
+      gtk_editable_select_region(GTK_EDITABLE(rfxbuilder->entry[i]),0,0);
+      gtk_widget_set_sensitive(rfxbuilder->entry[i],FALSE);
+      lives_entry_set_editable(LIVES_ENTRY(rfxbuilder->entry[i]),FALSE);
+      if (rfxbuilder->entry2[i]!=NULL) {
+	gtk_editable_select_region(GTK_EDITABLE(rfxbuilder->entry2[i]),0,0);
+	gtk_widget_set_sensitive(rfxbuilder->entry2[i],FALSE);
+      }
+      if (rfxbuilder->entry3[i]!=NULL) {
+	gtk_editable_select_region(GTK_EDITABLE(rfxbuilder->entry3[i]),0,0);
+	gtk_widget_set_sensitive(rfxbuilder->entry3[i],FALSE);
+      }
+    }
+  }
+}
+
+
+
+
+
+static boolean on_entry_click (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+  rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
+  register int i;
+
+  widget=lives_bin_get_child(LIVES_BIN(widget));
+  for (i=0;i<rfxbuilder->table_rows;i++) {
+    if (widget==rfxbuilder->entry[i]||widget==rfxbuilder->entry2[i]||widget==rfxbuilder->entry3[i]) {
+      table_select_row(rfxbuilder,i);
+      
+      if (event->type!=GDK_BUTTON_PRESS) {
+	//double click
+	on_table_edit_row(NULL,rfxbuilder);
+      }
+      return TRUE;
+    }
+  }
+  return TRUE;
+}
+
 
 
 void on_table_add_row (GtkButton *button, gpointer user_data) {
-  // horrible, horrible code...
-  GtkWidget *entry,*entry2,*entry3;
+  GtkWidget *entry=NULL,*entry2=NULL,*entry3=NULL;
   GtkWidget *param_dialog=NULL;
   GtkWidget *param_window_dialog=NULL;
   GtkWidget *trigger_dialog=NULL;
 
-  GtkTextIter startiter,enditer;
-
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   lives_param_t *param=NULL;
-  int i;
+
+  register int i;
 
   gchar *tmpx;
+  gchar *ctext;
+
+  GtkWidget *ebox,*ebox2,*ebox3;
+
+  rfxbuilder->entry2[rfxbuilder->table_rows]=rfxbuilder->entry3[rfxbuilder->table_rows]=NULL;
 
   switch (rfxbuilder->table_type) {
   case RFX_TABLE_TYPE_REQUIREMENTS:
     if (rfxbuilder->table_rows>=RFXBUILD_MAX_REQ) return;
 
     for (i=0;i<rfxbuilder->table_rows;i++) {
-      gtk_editable_set_editable (GTK_EDITABLE (rfxbuilder->entry[i]), FALSE);
+      lives_entry_set_editable (LIVES_ENTRY (rfxbuilder->entry[i]), FALSE);
     }
 
-
     entry = rfxbuilder->entry[rfxbuilder->table_rows] = gtk_entry_new ();
-    gtk_widget_show (entry);
-    gtk_editable_set_editable (GTK_EDITABLE (entry), TRUE);
+
+    if (button!=NULL)
+      lives_entry_set_editable (LIVES_ENTRY (entry), TRUE);
+    else 
+      lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
+
+    ebox=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox),entry);
 
     gtk_table_resize (GTK_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,1);
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry, 0, 1, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, rfxbuilder->table_rows+rfxbuilder->ptable_rows,
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+rfxbuilder->ptable_rows,
 		      (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
 		      (GtkAttachOptions) (0), 0, 0);
-    while (g_main_context_iteration (NULL,FALSE));
+
+    lives_widget_context_update();
     gtk_widget_grab_focus (entry);
     if (button!=NULL) {
       rfxbuilder->num_reqs++;
     }
+    else goto add_row_done;
     break;
 
   case RFX_TABLE_TYPE_PARAMS:
@@ -1330,7 +1137,7 @@
     entry2 = rfxbuilder->entry2[rfxbuilder->table_rows] = gtk_entry_new ();
 
     if (button!=NULL) {
-      gboolean param_ok=FALSE;
+      boolean param_ok=FALSE;
       param=&rfxbuilder->copy_params[rfxbuilder->num_params];
 
       param->def=NULL;
@@ -1359,21 +1166,29 @@
 
     gtk_entry_set_text (GTK_ENTRY (entry),(tmpx=g_strdup_printf ("p%d",rfxbuilder->table_rows)));
     g_free(tmpx);
-    gtk_widget_show (entry);
+
+    lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
      
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry, 0, 1, rfxbuilder->table_rows+rfxbuilder->ptable_rows, rfxbuilder->table_rows+1+rfxbuilder->ptable_rows,
+    ebox=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox),entry);
+
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+1+rfxbuilder->ptable_rows,
 		      (GtkAttachOptions) (0),
 		      (GtkAttachOptions) (0), 0, 0);
 
 
-    gtk_widget_show (entry2);
-    gtk_editable_set_editable (GTK_EDITABLE (entry2), FALSE);
+
+    lives_entry_set_editable (LIVES_ENTRY (entry2), FALSE);
 
     gtk_table_resize (GTK_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,3);
 
 
+    ebox2=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox2),entry2);
 
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry2, 1, 2, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, rfxbuilder->table_rows+rfxbuilder->ptable_rows,
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox2, 1, 2, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+rfxbuilder->ptable_rows,
 		      (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
 		      (GtkAttachOptions) (0), 0, 0);
 
@@ -1407,14 +1222,17 @@
       break;
     }
 
-    gtk_widget_show (entry3);
-    gtk_editable_set_editable (GTK_EDITABLE (entry3), FALSE);
+    lives_entry_set_editable (LIVES_ENTRY (entry3), FALSE);
+
+    ebox3=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox3),entry3);
 
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry3, 2, 3, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, rfxbuilder->table_rows+rfxbuilder->ptable_rows,
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox3, 2, 3, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+rfxbuilder->ptable_rows,
 		      (GtkAttachOptions) (GTK_FILL),
 		      (GtkAttachOptions) (0), 0, 0);
 
-    if (button==NULL) return;
+    if (button==NULL) goto add_row_done;
     
     gtk_widget_queue_resize(gtk_widget_get_parent(GTK_WIDGET(rfxbuilder->table)));
     gtk_widget_destroy (param_dialog);
@@ -1429,7 +1247,9 @@
 	return;
       }
       entry = rfxbuilder->entry[rfxbuilder->table_rows] = gtk_entry_new ();
-      gtk_entry_set_text (GTK_ENTRY (entry),gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_kw_entry)));
+      ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_kw_combo));
+      gtk_entry_set_text (GTK_ENTRY (entry),ctext);
+      g_free(ctext);
       rfxbuilder->num_paramw_hints++;
     }
     else {
@@ -1439,28 +1259,39 @@
       g_strfreev (array);
     }
 
-    gtk_widget_show (entry);
-    gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
+    lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
+
+    ebox=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox),entry);
 
     gtk_table_resize (GTK_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,2);
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry, 0, 1, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, rfxbuilder->table_rows+rfxbuilder->ptable_rows,
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+rfxbuilder->ptable_rows,
 		      (GtkAttachOptions) (GTK_FILL),
 		      (GtkAttachOptions) (0), 0, 0);
 
     entry2 = rfxbuilder->entry2[rfxbuilder->table_rows-1] = gtk_entry_new ();
+
     if (button!=NULL) {
       if (!strcmp (gtk_entry_get_text (GTK_ENTRY (entry)),"layout")) {
 	gtk_entry_set_text (GTK_ENTRY (entry2),gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)));
       }
       else {
 	// TODO - use lives_rfx_special_t->has_subtype,name,num_params
-	if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry)),"framedraw")) {
-	  gtk_entry_set_text (GTK_ENTRY (entry2),(tmpx=g_strdup_printf ("%s%s%s%s%s",gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry)),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_spsub_entry)),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
+	ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_sp_combo));
+	if (!strcmp (ctext,"framedraw")) {
+	  gchar *ctext2=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_spsub_combo));
+	  gtk_entry_set_text (GTK_ENTRY (entry2),(tmpx=g_strdup_printf ("%s%s%s%s%s",ctext,rfxbuilder->field_delim,ctext2,
+									rfxbuilder->field_delim, 
+									gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
+	  g_free(ctext2);
 	}
 	else {
-	  gtk_entry_set_text (GTK_ENTRY (entry2),(tmpx=g_strdup_printf ("%s%s%s",gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry)),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
+	  gtk_entry_set_text (GTK_ENTRY (entry2),(tmpx=g_strdup_printf ("%s%s%s",ctext,rfxbuilder->field_delim,
+									gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
 	}
 	g_free(tmpx);
+	g_free(ctext);
       }
     }
     else {
@@ -1468,23 +1299,28 @@
       gtk_entry_set_text (GTK_ENTRY (entry2),array[1]);
       g_strfreev (array);
     }
-    gtk_widget_show (entry2);
-    gtk_editable_set_editable (GTK_EDITABLE (entry2), FALSE);
 
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry2, 1, 2, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, rfxbuilder->table_rows+rfxbuilder->ptable_rows,
+    lives_entry_set_editable (LIVES_ENTRY (entry2), FALSE);
+
+    ebox2=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox2),entry);
+
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox2, 1, 2, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+rfxbuilder->ptable_rows,
 		      (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
 		      (GtkAttachOptions) (0), 0, 0);
 
-    if (button==NULL) return;
+
+    if (button==NULL) goto add_row_done;
 
     gtk_widget_destroy (param_window_dialog);
     gtk_widget_queue_resize (gtk_widget_get_parent(GTK_WIDGET(rfxbuilder->table)));
     break;
 
 
- case RFX_TABLE_TYPE_TRIGGERS:
+  case RFX_TABLE_TYPE_TRIGGERS:
     entry = rfxbuilder->entry[rfxbuilder->table_rows] = gtk_entry_new ();
-    
+
     if (button!=NULL) {
       trigger_dialog=make_trigger_dialog(-1,rfxbuilder);
       if (gtk_dialog_run (GTK_DIALOG (trigger_dialog))==GTK_RESPONSE_CANCEL) {
@@ -1496,24 +1332,25 @@
     }
     else {
       gchar *tmpx2=NULL;
-      gtk_entry_set_text (GTK_ENTRY (entry),rfxbuilder->triggers[rfxbuilder->table_rows].when?(tmpx2=g_strdup_printf ("%d",rfxbuilder->triggers[rfxbuilder->table_rows].when-1)):"init");
+      gtk_entry_set_text (GTK_ENTRY (entry),rfxbuilder->triggers[rfxbuilder->table_rows].when?
+			  (tmpx2=g_strdup_printf ("%d",rfxbuilder->triggers[rfxbuilder->table_rows].when-1)):"init");
       if (tmpx2!=NULL) g_free(tmpx2);
     }
     
-    gtk_widget_show (entry);
-    gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
+    lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
+
+    ebox=gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(ebox),entry);
 
     gtk_table_resize (GTK_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,1);
-    gtk_table_attach (GTK_TABLE (rfxbuilder->table), entry, 0, 1, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, rfxbuilder->table_rows+rfxbuilder->ptable_rows,
-		      (GtkAttachOptions) (GTK_FILL),
+    gtk_table_attach (GTK_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1+rfxbuilder->ptable_rows, 
+		      rfxbuilder->table_rows+rfxbuilder->ptable_rows,
+		      (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
 		      (GtkAttachOptions) (0), 0, 0);
 
-    if (button==NULL) return;
-
-    gtk_text_buffer_get_start_iter (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter);
-    gtk_text_buffer_get_end_iter (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&enditer);
+    if (button==NULL) goto add_row_done;
 
-    rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].code=gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE);
+    rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].code=text_view_get_text(LIVES_TEXT_VIEW (rfxbuilder->code_textview));
     
     rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when=atoi (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->trigger_when_entry)))+1;
     if (!strcmp(gtk_entry_get_text (GTK_ENTRY (rfxbuilder->trigger_when_entry)),"init")) rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when=0;
@@ -1528,7 +1365,73 @@
     gtk_widget_destroy (trigger_dialog);
     gtk_widget_queue_resize (gtk_widget_get_parent(GTK_WIDGET(rfxbuilder->table)));
     break;
-}
+  default:
+    return;
+  }
+
+  gtk_widget_show_all(rfxbuilder->table);
+
+
+ add_row_done:
+
+  gtk_widget_set_events (ebox, GDK_BUTTON_PRESS_MASK);
+  gtk_event_box_set_above_child(GTK_EVENT_BOX(ebox),TRUE);
+
+  g_signal_connect (GTK_OBJECT (ebox), "button_press_event",
+		    G_CALLBACK (on_entry_click),
+		    (gpointer)rfxbuilder);
+
+  if (palette->style&STYLE_1) {
+    if (palette->style&STYLE_3) {
+      lives_widget_set_bg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+      lives_widget_set_fg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->info_text);
+    }
+    else {
+    lives_widget_set_bg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+    lives_widget_set_fg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+    }
+  }
+
+  if (entry2!=NULL) {
+    gtk_widget_set_events (ebox2, GDK_BUTTON_PRESS_MASK);
+    gtk_event_box_set_above_child(GTK_EVENT_BOX(ebox2),TRUE);
+
+    g_signal_connect (GTK_OBJECT (ebox2), "button_press_event",
+		      G_CALLBACK (on_entry_click),
+		      (gpointer)rfxbuilder);
+
+    if (palette->style&STYLE_1) {
+      if (palette->style&STYLE_3) {
+	lives_widget_set_bg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+	lives_widget_set_fg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->info_text);
+    }
+      else {
+	lives_widget_set_bg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+	lives_widget_set_fg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+      }
+    }
+  }
+
+  if (entry3!=NULL) {
+    gtk_widget_set_events (ebox3, GDK_BUTTON_PRESS_MASK);
+    gtk_event_box_set_above_child(GTK_EVENT_BOX(ebox3),TRUE);
+
+    g_signal_connect (GTK_OBJECT (ebox3), "button_press_event",
+		      G_CALLBACK (on_entry_click),
+		      (gpointer)rfxbuilder);
+
+    if (palette->style&STYLE_1) {
+      if (palette->style&STYLE_3) {
+	lives_widget_set_bg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+	lives_widget_set_fg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->info_text);
+    }
+      else {
+	lives_widget_set_bg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+	lives_widget_set_fg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+      }
+    }
+  }
+
 }
 
 
@@ -1536,25 +1439,29 @@
 void param_set_from_dialog (lives_param_t *copy_param, rfx_build_window_t *rfxbuilder) {
   // set parameter values from param_dialog
   // this is called after adding a new copy_param or editing an existing one
+  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
   copy_param->name=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_name_entry)));
   copy_param->label=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_label_entry)));
   
-  if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"num")) {
+  if (!strcmp (ctext,"num")) {
     copy_param->type=LIVES_PARAM_NUM;
   }
-  else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"bool")) {
+  else if (!strcmp (ctext,"bool")) {
     copy_param->type=LIVES_PARAM_BOOL;
   }
-  else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"colRGB24")) {
+  else if (!strcmp (ctext,"colRGB24")) {
     copy_param->type=LIVES_PARAM_COLRGB24;
   }
-  else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"string")) {
+  else if (!strcmp (ctext,"string")) {
     copy_param->type=LIVES_PARAM_STRING;
   }
-  else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"string_list")) {
+  else if (!strcmp (ctext,"string_list")) {
     copy_param->type=LIVES_PARAM_STRING_LIST;
   }
+
+  g_free(ctext);
+
   copy_param->dp=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp));
   copy_param->group=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_group));
   copy_param->onchange=FALSE;  // no trigger assigned yet
@@ -1590,11 +1497,13 @@
   case LIVES_PARAM_STRING_LIST:
     copy_param->dp=0;
     copy_param->def=g_malloc (sizdbl);
-    set_int_param (copy_param->def,lives_list_index (copy_param->list,gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(rfxbuilder->param_def_combo)->entry))));
+    set_int_param (copy_param->def,lives_list_index (copy_param->list,lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_def_combo))));
     break;
   case LIVES_PARAM_COLRGB24:
     copy_param->def=g_malloc (3*sizint);
-    set_colRGB24_param (copy_param->def,gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)),gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)),gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
+    set_colRGB24_param (copy_param->def,gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)),
+			gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)),
+			gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
     copy_param->dp=0;
     break;
   default:
@@ -1611,40 +1520,39 @@
   GtkWidget *paramw_dialog;
   GtkWidget *trigger_dialog;
 
-  GtkTextIter startiter,enditer;
-
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   lives_param_t *param;
+
   int i;
-  gint found=-1;
-  gboolean param_ok=FALSE;
+  int found=-1;
+  boolean param_ok=FALSE;
 
   gchar *tmpx;
+  gchar *ctext;
 
-  switch (rfxbuilder->table_type) {
-  case RFX_TABLE_TYPE_REQUIREMENTS:
-    for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
-      if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)) found=i;
+  for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
+    if (gtk_widget_is_sensitive(rfxbuilder->entry[i])) {
+      found=i;
+      break;
     }
-    if (found==-1) return;
+  }
+  if (found==-1) return;
+
+  switch (rfxbuilder->table_type) {
+    case RFX_TABLE_TYPE_REQUIREMENTS:
     for (i=0;i<rfxbuilder->table_rows;i++) {
       if (found==i) { 
-	gtk_editable_set_editable (GTK_EDITABLE (rfxbuilder->entry[i]), TRUE);
-	while (g_main_context_iteration (NULL,FALSE));
+	lives_entry_set_editable (LIVES_ENTRY (rfxbuilder->entry[i]), TRUE);
+	lives_widget_context_update();
 	gtk_widget_grab_focus (rfxbuilder->entry[i]);
       }
       else {
-	gtk_editable_set_editable (GTK_EDITABLE (rfxbuilder->entry[i]), FALSE);
+	lives_entry_set_editable (LIVES_ENTRY (rfxbuilder->entry[i]), FALSE);
       }
     }
     break;
 
   case RFX_TABLE_TYPE_PARAMS:
-    for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
-      if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)||gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry2[i]),NULL,NULL)||gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry3[i]),NULL,NULL)) found=i;
-    }
-    if (found==-1) return;
-
     param_dialog=make_param_dialog(found,rfxbuilder);
     do {
       if (gtk_dialog_run (GTK_DIALOG (param_dialog))==GTK_RESPONSE_CANCEL) {
@@ -1680,48 +1588,46 @@
     break;
 
   case RFX_TABLE_TYPE_PARAM_WINDOW:
-    for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
-      if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)||gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry2[i]),NULL,NULL)) found=i;
-    }
-    if (found==-1) return;
     paramw_dialog=make_param_window_dialog(found,rfxbuilder);
     if (gtk_dialog_run (GTK_DIALOG (paramw_dialog))==GTK_RESPONSE_CANCEL) {
       gtk_widget_destroy (paramw_dialog);
       return;
     }
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry[found]),gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_kw_entry)));
+    ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_kw_combo));
+    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry[found]),ctext);
+    g_free(ctext);
     if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[found])),"layout")) {
       gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry2[found]),gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)));
     }
     else {
       // TODO - use lives_rfx_special_t->has_subtype,name,num_params
-      if (!strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry)),"framedraw")) {
-	gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry2[found]),(tmpx=g_strdup_printf ("%s%s%s%s%s",gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry)),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_spsub_entry)),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
+      ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_sp_combo));
+      if (!strcmp (ctext,"framedraw")) {
+	gchar *ctext2=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_spsub_combo));
+	gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry2[found]),
+			    (tmpx=g_strdup_printf ("%s%s%s%s%s",ctext,rfxbuilder->field_delim,ctext2,rfxbuilder->field_delim,
+						   gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
+	g_free(ctext2);
       }
       else {
-	gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry2[found]),(tmpx=g_strdup_printf ("%s%s%s",gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry)),rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
+	gtk_entry_set_text (GTK_ENTRY (rfxbuilder->entry2[found]),
+			    (tmpx=g_strdup_printf ("%s%s%s",ctext,rfxbuilder->field_delim,gtk_entry_get_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry)))));
       }
+      g_free(ctext);
       g_free(tmpx);
     }
     gtk_widget_destroy (paramw_dialog);
     break;
 
   case RFX_TABLE_TYPE_TRIGGERS:
-    for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
-      if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)) found=i;
-    }
-    if (found==-1) return;
     trigger_dialog=make_trigger_dialog(found,rfxbuilder);
     if (gtk_dialog_run (GTK_DIALOG (trigger_dialog))==GTK_RESPONSE_CANCEL) {
       gtk_widget_destroy (trigger_dialog);
       return;
     }
 
-    gtk_text_buffer_get_start_iter (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter);
-    gtk_text_buffer_get_end_iter (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&enditer);
-
     g_free (rfxbuilder->copy_triggers[found].code);
-    rfxbuilder->copy_triggers[found].code=gtk_text_buffer_get_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)),&startiter,&enditer,FALSE);
+    rfxbuilder->copy_triggers[found].code=text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
 
     gtk_widget_destroy (trigger_dialog);
     break;
@@ -1736,13 +1642,11 @@
   int i;
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  switch (rfxbuilder->table_type) {
-  case RFX_TABLE_TYPE_PARAM_WINDOW:
-    for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
-      if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)||gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry2[i]),NULL,NULL)) found=i;
+  for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
+    if (lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE) {
+      found=i;
+      break;
     }
-  default:
-    break;
   }
 
   if (found==-1) if ((found=rfxbuilder->table_swap_row1)==-1) return;
@@ -1772,25 +1676,24 @@
     break;
   }
   rfxbuilder->table_swap_row1=rfxbuilder->table_swap_row2;
+  table_select_row(rfxbuilder,rfxbuilder->table_swap_row1);
 
-  // TODO - more of this...
-  gtk_editable_select_region (GTK_EDITABLE (rfxbuilder->entry2[rfxbuilder->table_swap_row1]),0,-1);
 }
 
 
 void on_table_delete_row (GtkButton *button, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   int i;
-  gint move=0;
-  gboolean triggers_adjusted=FALSE;
+  int move=0;
+  boolean triggers_adjusted=FALSE;
 
   switch (rfxbuilder->table_type) {
   case RFX_TABLE_TYPE_REQUIREMENTS:
     for (i=0;i<rfxbuilder->table_rows;i++) {
-      if (move) {
+      if (move>0) {
 	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
       }
-      else if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)) {
+      else if (lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE) {
 	gtk_widget_destroy (rfxbuilder->entry[i]);
 	if (rfxbuilder->table_rows>1) {
 	  gtk_table_resize (GTK_TABLE (rfxbuilder->table),rfxbuilder->table_rows-1,1);
@@ -1799,14 +1702,14 @@
 	rfxbuilder->ptable_rows++;
       }
     }
-    if (!move) return;
+    if (move==0) return;
     rfxbuilder->table_rows--;
     rfxbuilder->num_reqs--;
     break;
 
   case RFX_TABLE_TYPE_PARAMS:
     for (i=0;i<rfxbuilder->table_rows;i++) {
-      if (move) {
+      if (move>0) {
 	// note - parameters become renumbered here
 	gchar *tmpx;
 	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
@@ -1819,7 +1722,7 @@
 	g_free (rfxbuilder->copy_params[i].label);
 	g_free (rfxbuilder->copy_params[i].def);
       }
-      else if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)||gtk_editable_get_selection_bounds (GTK_EDITABLE (rfxbuilder->entry2[i]),NULL,NULL)||gtk_editable_get_selection_bounds (GTK_EDITABLE (rfxbuilder->entry2[i]),NULL,NULL)) {
+      else if (lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE) {
 	if (rfxbuilder->copy_params[i].onchange) {
 	  do_blocking_error_dialog(_ ("\n\nCannot remove this parameter as it has a trigger.\nPlease remove the trigger first.\n\n"));
 	  return;
@@ -1838,7 +1741,7 @@
 	rfxbuilder->ptable_rows++;
       }
     }
-    if (!move) return;
+    if (move==0) return;
     rfxbuilder->table_rows--;
     rfxbuilder->num_params--;
     for (i=0;i<rfxbuilder->num_triggers;i++) {
@@ -1855,11 +1758,11 @@
 
   case RFX_TABLE_TYPE_PARAM_WINDOW:
     for (i=0;i<rfxbuilder->table_rows;i++) {
-      if (move) {
+      if (move>0) {
 	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
 	rfxbuilder->entry2[i-1]=rfxbuilder->entry2[i];
       }
-      else if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)||gtk_editable_get_selection_bounds (GTK_EDITABLE (rfxbuilder->entry2[i]),NULL,NULL)) {
+      else if (lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE) {
 	gtk_widget_destroy (rfxbuilder->entry[i]);
 	gtk_widget_destroy (rfxbuilder->entry2[i]);
 	if (rfxbuilder->table_rows>1) {
@@ -1869,21 +1772,21 @@
 	rfxbuilder->ptable_rows++;
       }
     }
-    if (!move) return;
+    if (move==0) return;
     rfxbuilder->table_rows--;
     rfxbuilder->num_paramw_hints--;
     break;
 
   case RFX_TABLE_TYPE_TRIGGERS:
     for (i=0;i<rfxbuilder->table_rows;i++) {
-      if (move) {
+      if (move>0) {
 	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
 	rfxbuilder->copy_triggers[i-1].when=rfxbuilder->copy_triggers[i].when;
 	rfxbuilder->copy_triggers[i-1].code=g_strdup (rfxbuilder->copy_triggers[i].code);
 	g_free (rfxbuilder->copy_triggers[i].code);
       }
-      else if (gtk_editable_get_selection_bounds(GTK_EDITABLE(rfxbuilder->entry[i]),NULL,NULL)) {
-	gint when=atoi (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[i])))+1;
+      else if (lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE) {
+	int when=atoi (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[i])))+1;
 
 	if (!strcmp(gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[i])),"init")) rfxbuilder->has_init_trigger=FALSE;
 	else rfxbuilder->params[when-1].onchange=FALSE;
@@ -1897,137 +1800,76 @@
 	rfxbuilder->ptable_rows++;
       }
     }
-    if (!move) return;
+    if (move==0) return;
     rfxbuilder->table_rows--;
     rfxbuilder->num_triggers--;
     break;
+  default:
+    return;
+  }
+
+  if (rfxbuilder->table_rows==0) {
+    gtk_widget_set_sensitive(rfxbuilder->edit_entry_button,FALSE);
+    gtk_widget_set_sensitive(rfxbuilder->remove_entry_button,FALSE);
+    if (rfxbuilder->move_up_button!=NULL) gtk_widget_set_sensitive(rfxbuilder->move_up_button,FALSE);
+    if (rfxbuilder->move_down_button!=NULL) gtk_widget_set_sensitive(rfxbuilder->move_down_button,FALSE);
+  }
+  else {
+    if (move>=rfxbuilder->table_rows) move=rfxbuilder->table_rows-1;
+    table_select_row(rfxbuilder,move);
   }
+
 }
 
 
-GtkWidget * make_param_dialog (gint pnum, rfx_build_window_t *rfxbuilder) {
+GtkWidget * make_param_dialog (int pnum, rfx_build_window_t *rfxbuilder) {
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
-  GtkWidget *dialog_action_area;
-  GtkWidget *hbox;
-  GtkWidget *cancelbutton;
-  GtkWidget *okbutton;
-  GtkWidget *label;
-  GtkWidget *combo;
-  GtkWidget *hseparator;
-  GObject *spinbutton_adj;
+
+  GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
 
   GList *typelist=NULL;
 
   lives_colRGB24_t rgb;
 
-  dialog = gtk_dialog_new ();
+  gchar *tmp,*tmp2,*title;
+
   if (pnum<0) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - New RFX Parameter"));
+    title=g_strdup(_("LiVES: - New RFX Parameter"));
   }
   else {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Edit RFX Parameter"));
+    title=g_strdup(_("LiVES: - Edit RFX Parameter"));
   }
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  dialog = lives_standard_dialog_new (title,TRUE);
+  g_free(title);
+
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
+
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
-  //gtk_window_set_default_size (GTK_WINDOW (rfxbuilder->dialog), 300, 200);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 10);
-  gtk_widget_show (dialog_vbox);
 
   // name
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new_with_mnemonic (_("_Name:    "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->param_name_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->param_name_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_name_entry, TRUE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),rfxbuilder->param_name_entry);
-
-  if (pnum>=0) {
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_name_entry),rfxbuilder->copy_params[pnum].name);
-  }
-  gtk_widget_set_tooltip_text( rfxbuilder->param_name_entry,(_ ("Name of the parameter, must be unique in the plugin.")));
+  rfxbuilder->param_name_entry = lives_standard_entry_new ((tmp=g_strdup(_("_Name:    "))),TRUE,
+							   pnum>=0?rfxbuilder->copy_params[pnum].name:NULL,
+							   60.*widget_opts.scale,-1,LIVES_BOX(dialog_vbox),
+							   (tmp2=g_strdup((_("Name of the parameter, must be unique in the plugin.")))));
 
+  g_free(tmp); g_free(tmp2);
 
   // label
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new_with_mnemonic (_("_Label:    "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->param_label_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->param_label_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_label_entry, TRUE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),rfxbuilder->param_label_entry);
-
-  if (pnum>=0) {
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_label_entry),rfxbuilder->copy_params[pnum].label);
-  }
-  gtk_widget_set_tooltip_text( rfxbuilder->param_label_entry,(_ ("Label to be shown by the parameter. An underscore represents mnemonic accelerator.")));
-
-  // group
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->bg_label = gtk_label_new_with_mnemonic (_("Button _Group: "));
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->bg_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->bg_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (0., 0., 16., 1., 1., 0.);
-  rfxbuilder->spinbutton_param_group = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_param_group, TRUE, FALSE, 0);
-  if (pnum>=0) {
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_group),(gdouble)rfxbuilder->copy_params[pnum].group);
-  }
-  gtk_widget_set_tooltip_text( rfxbuilder->spinbutton_param_group,(_ ("A non-zero value can be used to group radio buttons.")));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->bg_label),rfxbuilder->spinbutton_param_group);
+  rfxbuilder->param_label_entry = lives_standard_entry_new ((tmp=g_strdup(_("_Label:    "))),TRUE,
+							   pnum>=0?rfxbuilder->copy_params[pnum].label:NULL,
+							   60.*widget_opts.scale,-1,LIVES_BOX(dialog_vbox),
+							    (tmp2=g_strdup(_("Label to be shown by the parameter. An underscore represents mnemonic accelerator."))));
+  g_free(tmp); g_free(tmp2);
 
   // type
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new_with_mnemonic (_("_Type:         "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
   typelist = g_list_append (typelist, (gpointer)"num");
   typelist = g_list_append (typelist, (gpointer)"bool");
@@ -2035,33 +1877,30 @@
   typelist = g_list_append (typelist, (gpointer)"colRGB24");
   typelist = g_list_append (typelist, (gpointer)"string_list");
 
-  combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (combo), typelist);
+  rfxbuilder->param_type_combo = lives_standard_combo_new ((tmp=g_strdup(_("_Type:         "))),TRUE,typelist,
+							   LIVES_BOX(dialog_vbox),(tmp2=g_strdup(_ ("Parameter type (select from list)."))));
+  g_free(tmp);
+  g_free(tmp2);
   g_list_free(typelist);
-  gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, FALSE, 0);
-  gtk_widget_show(combo);
-  rfxbuilder->param_type_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(combo))->entry));
-  gtk_editable_set_editable (GTK_EDITABLE(rfxbuilder->param_type_entry),FALSE);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),rfxbuilder->param_type_entry);
-  gtk_widget_set_tooltip_text( rfxbuilder->param_type_entry,(_ ("Parameter type (select from list).")));
+
+  rfxbuilder->edit_param=pnum;
 
   if (pnum>=0) {
-    rfxbuilder->edit_param=pnum;
     switch(rfxbuilder->copy_params[pnum].type) {
     case LIVES_PARAM_NUM:
-      gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_type_entry),"num");
+      gtk_combo_box_set_active(GTK_COMBO_BOX(rfxbuilder->param_type_combo),0);
       break;
     case LIVES_PARAM_BOOL:
-      gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_type_entry),"bool");
-      break;
-    case LIVES_PARAM_COLRGB24:
-      gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_type_entry),"colRGB24");
+      gtk_combo_box_set_active(GTK_COMBO_BOX(rfxbuilder->param_type_combo),1);
       break;
     case LIVES_PARAM_STRING:
-      gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_type_entry),"string");
+      gtk_combo_box_set_active(GTK_COMBO_BOX(rfxbuilder->param_type_combo),2);
+      break;
+    case LIVES_PARAM_COLRGB24:
+      gtk_combo_box_set_active(GTK_COMBO_BOX(rfxbuilder->param_type_combo),3);
       break;
     case LIVES_PARAM_STRING_LIST:
-      gtk_entry_set_text (GTK_ENTRY (rfxbuilder->param_type_entry),"string_list");
+      gtk_combo_box_set_active(GTK_COMBO_BOX(rfxbuilder->param_type_combo),4);
       break;
     default:
       break;
@@ -2072,72 +1911,33 @@
 
   // dp
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->param_dp_label = gtk_label_new_with_mnemonic (_("Decimal _places: "));
-  gtk_widget_show (rfxbuilder->param_dp_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_dp_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->param_dp_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (0., 0., 16., 1., 1., 0.);
-  rfxbuilder->spinbutton_param_dp = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_widget_show (rfxbuilder->spinbutton_param_dp);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_param_dp, TRUE, FALSE, 0);
-  if (pnum>=0) {
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp),(gdouble)rfxbuilder->copy_params[pnum].dp);
-  }
-
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hseparator, FALSE, TRUE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_dp_label),rfxbuilder->spinbutton_param_dp);
+  rfxbuilder->spinbutton_param_dp = lives_standard_spin_button_new (_("Decimal _places: "),TRUE,pnum>=0?rfxbuilder->copy_params[pnum].dp:0.,
+								    0., 16., 1., 1., 0,
+								    LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->param_dp_label = widget_opts.last_label;
 
+  add_hsep_to_box(LIVES_BOX(dialog_vbox));
 
   // default val
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->param_def_label = gtk_label_new_with_mnemonic (_("_Default value:    "));
-  gtk_widget_show (rfxbuilder->param_def_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_def_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->param_def_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (0., -G_MAXINT, G_MAXINT, 1., 1., 0.);
-  rfxbuilder->spinbutton_param_def = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_def_label),rfxbuilder->spinbutton_param_def);
+  rfxbuilder->spinbutton_param_def = lives_standard_spin_button_new (_("_Default value:    "),TRUE, 0., -G_MAXINT, G_MAXINT, 1., 1., 0,
+								     LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->param_def_label = widget_opts.last_label;
 
   // extra bits for string/string_list
-  gtk_widget_show (rfxbuilder->spinbutton_param_def);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_param_def, TRUE, FALSE, 0);
+
+  rfxbuilder->param_strdef_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), rfxbuilder->param_strdef_hbox, TRUE, TRUE, widget_opts.packing_height);
 
   rfxbuilder->param_strdef_button = gtk_button_new();
   gtk_button_set_use_underline (GTK_BUTTON (rfxbuilder->param_strdef_button),TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_strdef_button, TRUE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (rfxbuilder->param_strdef_hbox), rfxbuilder->param_strdef_button, TRUE, TRUE, widget_opts.packing_width);
 
-  rfxbuilder->param_strlist_hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), rfxbuilder->param_strlist_hbox, TRUE, TRUE, 0);
+  rfxbuilder->param_strlist_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), rfxbuilder->param_strlist_hbox, FALSE, FALSE, widget_opts.packing_width);
 
-  label = gtk_label_new_with_mnemonic (_("_Default: "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (rfxbuilder->param_strlist_hbox), label, FALSE, FALSE, 0);
+  rfxbuilder->param_def_combo = lives_standard_combo_new (_("_Default: "),TRUE,NULL,LIVES_BOX(rfxbuilder->param_strlist_hbox),NULL);
 
-  rfxbuilder->param_def_combo = gtk_combo_new ();
-  gtk_box_pack_start (GTK_BOX (rfxbuilder->param_strlist_hbox), rfxbuilder->param_def_combo, FALSE, FALSE, 0);
-  gtk_widget_show(rfxbuilder->param_def_combo);
-  gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO(rfxbuilder->param_def_combo))->entry),FALSE);
   gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_def_label),rfxbuilder->param_def_combo);
 
   if (pnum>=0) {
@@ -2165,130 +1965,62 @@
     }
   }
 
-  // min
+  // group
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
+  rfxbuilder->hbox_bg = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), rfxbuilder->hbox_bg, FALSE, FALSE, widget_opts.packing_height);
 
-  rfxbuilder->param_min_label = gtk_label_new_with_mnemonic (_("_Minimum value: "));
-  gtk_widget_show (rfxbuilder->param_min_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_min_label, FALSE, FALSE, 0);
+  rfxbuilder->spinbutton_param_group = lives_standard_spin_button_new ((tmp=g_strdup(_("Button _Group: "))),TRUE,0., 0., 16., 1., 1., 0,
+								       LIVES_BOX(rfxbuilder->hbox_bg),
+								       (tmp2=g_strdup(_("A non-zero value can be used to group radio buttons."))));
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->param_min_label, GTK_STATE_NORMAL, &palette->normal_fore);
+  if (pnum>=0) {
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_group),(gdouble)rfxbuilder->copy_params[pnum].group);
   }
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new (0., -G_MAXINT, G_MAXINT, 1., 1., 0.);
-  rfxbuilder->spinbutton_param_min = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
+  // min
 
-  gtk_widget_show (rfxbuilder->spinbutton_param_min);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_param_min, TRUE, FALSE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_min_label),rfxbuilder->spinbutton_param_min);
+  rfxbuilder->spinbutton_param_min = lives_standard_spin_button_new (_("_Minimum value: "),TRUE,0., -G_MAXINT, G_MAXINT, 1., 1., 0,
+								     LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->param_min_label = widget_opts.last_label;
 
   // max
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->param_max_label = gtk_label_new_with_mnemonic (_("Ma_ximum value: "));
-  gtk_widget_show (rfxbuilder->param_max_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_max_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->param_max_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  spinbutton_adj = (GObject *)gtk_adjustment_new (RFX_DEF_NUM_MAX, -G_MAXINT, G_MAXINT, 1., 1., 0.);
-  rfxbuilder->spinbutton_param_max = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_max_label),rfxbuilder->spinbutton_param_max);
-
-  gtk_widget_show (rfxbuilder->spinbutton_param_max);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_param_max, TRUE, FALSE, 0);
+  rfxbuilder->spinbutton_param_max = lives_standard_spin_button_new (_("Ma_ximum value: "),TRUE, RFX_DEF_NUM_MAX, -G_MAXINT, G_MAXINT, 1., 1., 0,
+								     LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->param_max_label = widget_opts.last_label;
 
 
   // step size
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->param_step_label = gtk_label_new_with_mnemonic (_("     _Step size:   "));
-  gtk_widget_show (rfxbuilder->param_step_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_step_label, FALSE, FALSE, 0);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->param_step_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
-  spinbutton_adj = (GObject *)gtk_adjustment_new (1., 1., G_MAXINT, 1., 1., 0.);
-  rfxbuilder->spinbutton_param_step = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
+  rfxbuilder->spinbutton_param_step = lives_standard_spin_button_new ((tmp=g_strdup(_("     _Step size:   "))),TRUE,1., 1., G_MAXINT, 1., 1., 0,
+								      LIVES_BOX(dialog_vbox),
+								      (tmp2=g_strdup(_(
+										       "How much the parameter is adjusted when the spinbutton arrows are pressed."
+										       ))));
+  rfxbuilder->param_step_label = widget_opts.last_label;
+  g_free(tmp); g_free(tmp2);
 
-  gtk_widget_show (rfxbuilder->spinbutton_param_step);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->spinbutton_param_step, TRUE, FALSE, 0);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_step_label),rfxbuilder->spinbutton_param_step);
-  gtk_widget_set_tooltip_text( rfxbuilder->spinbutton_param_step,
-			       (_ ("How much the parameter is adjusted when the spinbutton arrows are pressed.")));
 
   // wrap
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->param_wrap_eventbox=gtk_event_box_new();
+  rfxbuilder->param_wrap_hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), rfxbuilder->param_wrap_hbox, TRUE, TRUE, widget_opts.packing_height);
 
-  rfxbuilder->param_wrap_label = gtk_label_new_with_mnemonic (_("_Wrap: "));
-  gtk_widget_show (rfxbuilder->param_wrap_label);
-  gtk_widget_show (rfxbuilder->param_wrap_eventbox);
+  rfxbuilder->param_wrap_checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("_Wrap value"))),TRUE,LIVES_BOX(rfxbuilder->param_wrap_hbox),
+									(tmp2=g_strdup(_ ("Whether the value wraps max->min and min->max."))));
 
-  gtk_container_add(GTK_CONTAINER(rfxbuilder->param_wrap_eventbox),rfxbuilder->param_wrap_label);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(rfxbuilder->param_wrap_label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(rfxbuilder->param_wrap_eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (rfxbuilder->param_wrap_eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  g_free(tmp); g_free(tmp2);
 
-  rfxbuilder->param_wrap_checkbutton = gtk_check_button_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_wrap_eventbox, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->param_wrap_checkbutton, FALSE, FALSE, 10);
-  gtk_widget_show (rfxbuilder->param_wrap_checkbutton);
-  GTK_WIDGET_SET_FLAGS (rfxbuilder->param_wrap_checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_widget_set_tooltip_text( rfxbuilder->param_wrap_checkbutton,(_ ("Whether the value wraps max->min and min->max.")));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (rfxbuilder->param_wrap_label),rfxbuilder->param_wrap_checkbutton);
 
-  g_signal_connect (GTK_OBJECT (rfxbuilder->param_wrap_eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    rfxbuilder->param_wrap_checkbutton);
-
-
-
-
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
-
-  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
-
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
-
-  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
-		    NULL);
 
   g_signal_connect (GTK_OBJECT (rfxbuilder->param_strdef_button), "clicked",
 		    G_CALLBACK (on_code_clicked),
 		    (gpointer)rfxbuilder);
 
-  g_signal_connect (GTK_OBJECT(rfxbuilder->param_type_entry),"changed",G_CALLBACK (on_param_type_changed),
+  g_signal_connect (GTK_OBJECT(rfxbuilder->param_type_combo),"changed",G_CALLBACK (on_param_type_changed),
 		    (gpointer)rfxbuilder);
 
   g_signal_connect_after (GTK_OBJECT (rfxbuilder->spinbutton_param_dp), "value_changed",
@@ -2307,16 +2039,16 @@
 			  G_CALLBACK (after_param_max_changed),
 			  (gpointer)rfxbuilder);
 
+
   if (pnum>=0) {
-    on_param_type_changed (GTK_ENTRY (rfxbuilder->param_type_entry),(gpointer)rfxbuilder);
     switch (rfxbuilder->copy_params[pnum].type) {
     case LIVES_PARAM_NUM:
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),rfxbuilder->copy_params[pnum].min);
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),rfxbuilder->copy_params[pnum].max);
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_step),
 				 rfxbuilder->copy_params[pnum].step_size);
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rfxbuilder->param_wrap_checkbutton),
-				   rfxbuilder->copy_params[pnum].wrap);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->param_wrap_checkbutton),
+				     rfxbuilder->copy_params[pnum].wrap);
       break;
     case LIVES_PARAM_COLRGB24:
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),(gdouble)rgb.green);
@@ -2329,13 +2061,26 @@
       break;
     }
   }
+  gtk_widget_show_all (dialog);
+  on_param_type_changed (LIVES_COMBO (rfxbuilder->param_type_combo),(gpointer)rfxbuilder);
+  after_param_dp_changed(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp),(gpointer)rfxbuilder);
   return dialog;
 }
 
 
 void after_param_dp_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gint dp=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spinbutton));
+  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  int dp;
+
+  if (strcmp (ctext,"num")) {
+    g_free(ctext);
+    return;
+  }
+
+  g_free(ctext);
+
+  dp=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spinbutton));
 
   gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),dp);
   gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),dp);
@@ -2343,55 +2088,78 @@
   gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_step),dp);
 
   if (dp>0) {
-    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1./(double)lives_10pow(dp),
-			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
-			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
+    double max=gtk_spin_button_get_value(GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max));
+    double min=gtk_spin_button_get_value(GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min));
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-G_MAXFLOAT,G_MAXFLOAT);
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXFLOAT,G_MAXFLOAT);
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-G_MAXFLOAT,G_MAXFLOAT);
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1./(double)lives_10pow(dp),(max-min)>1.?(max-min):1.);
+
     gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXFLOATLEN+dp);
+    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXFLOATLEN+dp);
+    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_min),MAXFLOATLEN+dp);
+    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_max),MAXFLOATLEN+dp);
   }
   else {
-    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,
-			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
-			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
+    int max=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max));
+    int min=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min));
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-G_MAXINT,G_MAXINT);
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXINT,G_MAXINT);
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-G_MAXINT,G_MAXINT);
+    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,(max-min)>1?(max-min):1);
+    
     gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXINTLEN);
+    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXINTLEN);
+    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_min),MAXINTLEN);
+    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_max),MAXINTLEN);
   }
 }
 
 
 void after_param_min_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gint dp;
+  int dp;
+  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
-  if (strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"num")) return;
+  if (strcmp (ctext,"num")) {
+    g_free(ctext);
+    return;
+  }
+
+  g_free(ctext);
 
   g_signal_handler_block (rfxbuilder->spinbutton_param_max,rfxbuilder->max_spin_f);
   g_signal_handler_block (rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
 
   if ((dp=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)))>0) {
-    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),
-			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXFLOATLEN+dp);
+    if (gtk_spin_button_get_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))<
+	gtk_spin_button_get_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+				gtk_spin_button_get_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
+    }
+
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),
 			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),G_MAXFLOAT);
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),
 			      1./(double)lives_10pow(dp),gtk_spin_button_get_value 
 			      (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
 			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXFLOATLEN+dp);
+
   }
   else {
-    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-			      gtk_spin_button_get_value_as_int 
-			      (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),
-			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXINTLEN);
+    if (gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))<
+	gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+				gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
+    }
+
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),
 			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),
 			      G_MAXINT);
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,
 			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
 			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXINTLEN);
+
   }
 
   g_signal_handler_unblock (rfxbuilder->spinbutton_param_max,rfxbuilder->max_spin_f);
@@ -2401,38 +2169,47 @@
 
 void after_param_max_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gint dp;
+  int dp;
+  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+
+  if (strcmp (ctext,"num")) {
+    g_free(ctext);
+    return;
+  }
 
-  if (strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"num")) return;
+  g_free(ctext);
 
   g_signal_handler_block (rfxbuilder->spinbutton_param_min,rfxbuilder->min_spin_f);
   g_signal_handler_block (rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
 
   if ((dp=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)))>0) {
-    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),
-			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXFLOATLEN+dp);
+    if (gtk_spin_button_get_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))>
+	gtk_spin_button_get_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+				gtk_spin_button_get_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
+    }
+
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXFLOAT,
 			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),
 			      1./(double)lives_10pow(dp),
 			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
 			      gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXFLOATLEN+dp);
+
   }
   else {
-    gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-			      gtk_spin_button_get_value_as_int 
-			      (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),
-			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXINTLEN);
+    if (gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))>
+	gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+				gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
+    }
+
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXINT,
 			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
     gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,
 			      gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))
 			      -gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
-    gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXINTLEN);
+
   }
 
   g_signal_handler_unblock (rfxbuilder->spinbutton_param_min,rfxbuilder->min_spin_f);
@@ -2442,11 +2219,17 @@
 
 void after_param_def_changed (GtkSpinButton *spinbutton, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
+  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+
+  if (strcmp (ctext,"num")) {
+    g_free(ctext);
+    return;
+  }
 
-  if (strcmp (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_type_entry)),"num")) return;
+  g_free(ctext);
 
   if (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp))) {
-    gdouble dbl_def=gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def));
+    double dbl_def=gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def));
     if (dbl_def<gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min))) {
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),dbl_def);
     }
@@ -2466,11 +2249,12 @@
 }
 
 
-void on_param_type_changed (GtkEntry *param_type_entry, gpointer user_data) {
+void on_param_type_changed (GtkComboBox *param_type_combo, gpointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gint pnum=rfxbuilder->edit_param;
-  gint dp;
+  int pnum=rfxbuilder->edit_param;
+
+  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
   gtk_widget_show (rfxbuilder->param_min_label);
   gtk_widget_show (rfxbuilder->param_max_label);
@@ -2480,18 +2264,18 @@
   gtk_widget_show (rfxbuilder->spinbutton_param_def);
   gtk_widget_show (rfxbuilder->param_dp_label);
   gtk_widget_show (rfxbuilder->param_def_label);
-  gtk_widget_hide (rfxbuilder->param_strdef_button);
+
+  gtk_widget_hide (rfxbuilder->param_strdef_hbox);
   gtk_widget_hide (rfxbuilder->param_strlist_hbox);
-  gtk_widget_hide (rfxbuilder->spinbutton_param_group);
-  gtk_widget_hide (rfxbuilder->bg_label);
+  gtk_widget_hide (rfxbuilder->hbox_bg);
   gtk_widget_hide (rfxbuilder->spinbutton_param_step);
   gtk_widget_hide (rfxbuilder->param_step_label);
-  gtk_widget_hide (rfxbuilder->param_wrap_label);
-  gtk_widget_hide (rfxbuilder->param_wrap_checkbutton);
-  gtk_widget_hide (rfxbuilder->param_wrap_eventbox);
+  gtk_widget_hide (rfxbuilder->param_wrap_hbox);
 
-  if (!strcmp (gtk_entry_get_text (GTK_ENTRY (param_type_entry)),"string_list")) {
-    gint defindex;
+  if (pnum<0) return;
+
+  if (!strcmp (ctext,"string_list")) {
+    int defindex;
 
     if (rfxbuilder->copy_params[pnum].type!=LIVES_PARAM_STRING_LIST) {
       if (rfxbuilder->copy_params[pnum].def!=NULL) {
@@ -2503,14 +2287,16 @@
 
     rfxbuilder->copy_params[pnum].type=LIVES_PARAM_STRING_LIST;
     defindex=get_int_param (rfxbuilder->copy_params[pnum].def);
-    combo_set_popdown_strings (GTK_COMBO (rfxbuilder->param_def_combo), rfxbuilder->copy_params[pnum].list);
+
+    lives_combo_populate (LIVES_COMBO (rfxbuilder->param_def_combo), rfxbuilder->copy_params[pnum].list);
+
     if (rfxbuilder->copy_params[pnum].list==NULL||defindex>g_list_length (rfxbuilder->copy_params[pnum].list)) {
       set_int_param (rfxbuilder->copy_params[pnum].def,(defindex=0));
     }
 
     if (rfxbuilder->copy_params[pnum].list!=NULL) {
-      gtk_entry_set_text (GTK_ENTRY((GTK_COMBO(rfxbuilder->param_def_combo))->entry),
-			  (gchar *)g_list_nth_data (rfxbuilder->copy_params[pnum].list,defindex));
+      lives_combo_set_active_string (LIVES_COMBO(rfxbuilder->param_def_combo), 
+				     (gchar *)g_list_nth_data (rfxbuilder->copy_params[pnum].list,defindex));
     }
 
     gtk_widget_hide (rfxbuilder->spinbutton_param_dp);
@@ -2523,116 +2309,66 @@
     gtk_widget_hide (rfxbuilder->param_max_label);
 
     gtk_button_set_label (GTK_BUTTON (rfxbuilder->param_strdef_button),(_("Set _values")));
-    gtk_widget_show (rfxbuilder->param_strdef_button);
+    gtk_widget_show (rfxbuilder->param_strdef_hbox);
     gtk_widget_show (rfxbuilder->param_strlist_hbox);
   }
   else {
-    if (!strcmp (gtk_entry_get_text (GTK_ENTRY (param_type_entry)),"num")) {
+    if (!strcmp (ctext,"num")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_NUM;
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_def_label),(_("Default value:    ")));
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_min_label),(_("Minimum value: ")));
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_max_label),(_("Maximum value: ")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_def_label),(_("_Default value:    ")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_min_label),(_("_Minimum value: ")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_max_label),(_("Ma_ximum value: ")));
       gtk_widget_show (rfxbuilder->spinbutton_param_step);
       gtk_widget_show (rfxbuilder->param_step_label);
-      gtk_widget_show (rfxbuilder->param_wrap_label);
-      gtk_widget_show (rfxbuilder->param_wrap_checkbutton);
-      gtk_widget_show (rfxbuilder->param_wrap_eventbox);
-
-      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),
-				  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)));
-      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),
-				  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)));
-      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),
-				  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)));
-      gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_step),
-				  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)));
-
-      if ((dp=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)))>0) {
-	gdouble min=gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min));
-	gdouble max=RFX_DEF_NUM_MAX;
-	gdouble def=gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def));
-	gdouble step=gtk_spin_button_get_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_step));
-      
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-G_MAXFLOAT,G_MAXFLOAT);
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXFLOAT,G_MAXFLOAT);
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-G_MAXFLOAT,G_MAXFLOAT);
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1./dp,(max-min)>1.?(max-min):1.);
-	gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXFLOATLEN);
-	gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXFLOATLEN+dp);
-	if (def<min) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),min);
-	}
-	if (def>max) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),max);
-	}
-	if (step>(max-min)) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),max-min);
-	}
-	if (step<1.) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1.);
-	}
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),max);
-      }
-      else {
-	gint min=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min));
-	gint max=RFX_DEF_NUM_MAX;
-	gint def=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def));
-	gint step=gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_step));
-
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-G_MAXINT,G_MAXINT);
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXINT,G_MAXINT);
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-G_MAXINT,G_MAXINT);
-	gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,(max-min)>1?(max-min):1);
-	gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),MAXINTLEN);
-	gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_step),MAXINTLEN);
-	if (def<min) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),(gdouble)min);
-	}
-	if (def>max) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),(gdouble)max);
-	}
-	if (step>(max-min)) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),(gdouble)(max-min));
-	}
-	if (step<1) {
-	  gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1);
-	}
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),max);
+      gtk_widget_show_all (rfxbuilder->param_wrap_hbox);
+
+      after_param_dp_changed(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp),(gpointer)rfxbuilder);
+
+      if (pnum<0) {
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0.);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),RFX_DEF_NUM_MAX);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0.);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1.);
       }
     }
-    else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (param_type_entry)),"bool")) {
+    else if (!strcmp (ctext,"bool")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_BOOL;
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_def_label),(_("Default value:    ")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_def_label),(_("_Default value:    ")));
       gtk_widget_hide (rfxbuilder->param_min_label);
       gtk_widget_hide (rfxbuilder->param_max_label);
       gtk_widget_hide (rfxbuilder->spinbutton_param_min);
       gtk_widget_hide (rfxbuilder->spinbutton_param_max);
       gtk_widget_hide (rfxbuilder->spinbutton_param_dp);
       gtk_widget_hide (rfxbuilder->param_dp_label);
-      gtk_widget_show (rfxbuilder->spinbutton_param_group);
-      gtk_widget_show (rfxbuilder->bg_label);
+      gtk_widget_show (rfxbuilder->hbox_bg);
       gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0,1);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),0);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
     }
-    else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (param_type_entry)),"colRGB24")) {
+    else if (!strcmp (ctext,"colRGB24")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_COLRGB24;
       gtk_widget_hide (rfxbuilder->spinbutton_param_dp);
       gtk_widget_hide (rfxbuilder->param_dp_label);
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_def_label),(_ ("Default _Red:  ")));
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_min_label),(_ ("Default _Green:")));
-      gtk_label_set_text (GTK_LABEL (rfxbuilder->param_max_label),(_ ("Default _Blue: ")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_def_label),(_("Default _Red:  ")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_min_label),(_("Default _Green:")));
+      gtk_label_set_text_with_mnemonic (GTK_LABEL (rfxbuilder->param_max_label),(_("Default _Blue: ")));
       gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_def),4);
+      gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_min),4);
+      gtk_entry_set_width_chars (GTK_ENTRY (rfxbuilder->spinbutton_param_max),4);
       gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0,255);
       gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0,255);
       gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),0,255);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),0);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
+      if (pnum<0) {
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0.);
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),0.);
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0.);
+      }
     }
-    else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (param_type_entry)),"string")) {
+    else if (!strcmp (ctext,"string")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_STRING;
       gtk_widget_hide (rfxbuilder->spinbutton_param_dp);
       gtk_widget_hide (rfxbuilder->param_dp_label);
@@ -2641,11 +2377,11 @@
       gtk_widget_hide (rfxbuilder->spinbutton_param_def);
       
       gtk_button_set_label (GTK_BUTTON (rfxbuilder->param_strdef_button),(_("Set _default")));
-      gtk_widget_show (rfxbuilder->param_strdef_button);
+      gtk_widget_show (rfxbuilder->param_strdef_hbox);
       gtk_label_set_text (GTK_LABEL (rfxbuilder->param_def_label),(_ ("Default value:  ")));
       gtk_label_set_text (GTK_LABEL (rfxbuilder->param_max_label),(_ ("Maximum length (chars): ")));
       gtk_spin_button_set_range(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),1,RFX_MAXSTRINGLEN);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),RFX_TEXT_MAGIC);
+      if (pnum<0) gtk_spin_button_set_value(GTK_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),RFX_TEXT_MAGIC);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0);
       gtk_spin_button_set_digits (GTK_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
       
@@ -2654,6 +2390,8 @@
       }
     }
   }
+
+  g_free(ctext);
 }
 
 
@@ -2664,45 +2402,32 @@
 GtkWidget * make_param_window_dialog (gint pnum, rfx_build_window_t *rfxbuilder) {
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
-  GtkWidget *dialog_action_area;
-  GtkWidget *hbox;
-  GtkWidget *cancelbutton;
-  GtkWidget *okbutton;
-  GtkWidget *label;
-  GtkWidget *combo;
 
   GList *kwlist=NULL;
   GList *splist=NULL;
   GList *spsublist=NULL;
 
-
   gchar *kw=NULL;
   gchar *sp=NULL;
   gchar *spsub=NULL;
   gchar *rest=NULL;
+  gchar *title;
 
-  dialog = gtk_dialog_new ();
   if (pnum<0) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - New RFX Parameter Window Hint"));
+    title=g_strdup(_("LiVES: - New RFX Parameter Window Hint"));
   }
   else {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Edit RFX Parameter Window Hint"));
+    title=g_strdup(_("LiVES: - Edit RFX Parameter Window Hint"));
   }
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  dialog = lives_standard_dialog_new (title,TRUE);
+  g_free(title);
+
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 10);
-  gtk_widget_show (dialog_vbox);
 
   if (pnum>=0) {
     kw=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->entry[pnum])));
@@ -2732,268 +2457,180 @@
   }
 
   // kw
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new (_("Keyword:         "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
   kwlist = g_list_append (kwlist, (gpointer)"layout");
   kwlist = g_list_append (kwlist, (gpointer)"special");
 
-  combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (combo), kwlist);
+  rfxbuilder->paramw_kw_combo = lives_standard_combo_new (_("_Keyword:         "),TRUE,kwlist,LIVES_BOX(dialog_vbox),NULL);
   g_list_free(kwlist);
-  gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, FALSE, 0);
-  gtk_widget_show(combo);
-  rfxbuilder->paramw_kw_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(combo))->entry));
-  gtk_editable_set_editable (GTK_EDITABLE(rfxbuilder->paramw_kw_entry),FALSE);
 
   if (pnum>=0&&kw!=NULL) {
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->paramw_kw_entry),kw);
+    lives_combo_set_active_string (LIVES_COMBO (rfxbuilder->paramw_kw_combo),kw);
   }
 
 
   // type
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->paramw_sp_label = gtk_label_new (_("Special Type:         "));
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->paramw_sp_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->paramw_sp_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
   splist = g_list_append (splist, (gpointer)"aspect");
   splist = g_list_append (splist, (gpointer)"framedraw");
   splist = g_list_append (splist, (gpointer)"fileread");
+  splist = g_list_append (splist, (gpointer)"password");
   if (rfxbuilder->type==RFX_BUILD_TYPE_EFFECT2) {
     splist = g_list_append (splist, (gpointer)"mergealign");
   }
 
-  rfxbuilder->paramw_sp_combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (rfxbuilder->paramw_sp_combo), splist);
+  rfxbuilder->paramw_sp_combo = lives_standard_combo_new (_("Special _Type:         "),TRUE,splist,LIVES_BOX(dialog_vbox),NULL);
   g_list_free(splist);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->paramw_sp_combo, TRUE, FALSE, 0);
-  rfxbuilder->paramw_sp_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(rfxbuilder->paramw_sp_combo))->entry));
-  gtk_editable_set_editable (GTK_EDITABLE(rfxbuilder->paramw_sp_entry),FALSE);
+
   if (pnum>=0&&sp!=NULL) {
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->paramw_sp_entry),sp);
+    lives_combo_set_active_string (LIVES_COMBO (rfxbuilder->paramw_sp_combo),sp);
   }
 
   // subtype
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->paramw_spsub_label = gtk_label_new (_("Special Subtype:         "));
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->paramw_spsub_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->paramw_spsub_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
   spsublist = g_list_append (spsublist, (gpointer)"rectdemask");
-  spsublist = g_list_append (spsublist, (gpointer)"multrect");
+  if (pnum>=0&&spsub!=NULL) {
+    // deprecated value
+    if (!strcmp(spsub,"multrect")) spsublist = g_list_append (spsublist, (gpointer)"multrect");
+  }
+  else spsublist = g_list_append (spsublist, (gpointer)"multirect");
   spsublist = g_list_append (spsublist, (gpointer)"singlepoint");
 
-  rfxbuilder->paramw_spsub_combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (rfxbuilder->paramw_spsub_combo), spsublist);
+  rfxbuilder->paramw_spsub_combo = lives_standard_combo_new (_("Special _Subtype:         "),TRUE,spsublist,LIVES_BOX(dialog_vbox),NULL);
   g_list_free(spsublist);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->paramw_spsub_combo, TRUE, FALSE, 0);
-  rfxbuilder->paramw_spsub_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(rfxbuilder->paramw_spsub_combo))->entry));
-  gtk_editable_set_editable (GTK_EDITABLE(rfxbuilder->paramw_spsub_entry),FALSE);
+
   if (pnum>=0&&spsub!=NULL) {
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->paramw_spsub_entry),spsub);
+    lives_combo_set_active_string (LIVES_COMBO (rfxbuilder->paramw_spsub_combo),spsub);
   }
 
 
   // paramwindow rest
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  rfxbuilder->paramw_rest_label = gtk_label_new (_("Row:    "));
-  gtk_widget_show (rfxbuilder->paramw_rest_label);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->paramw_rest_label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (rfxbuilder->paramw_rest_label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  rfxbuilder->paramw_rest_entry = gtk_entry_new ();
-  gtk_widget_show (rfxbuilder->paramw_rest_entry);
-  gtk_box_pack_start (GTK_BOX (hbox), rfxbuilder->paramw_rest_entry, TRUE, TRUE, 0);
-  if (pnum>=0&&rest!=NULL) {
-    gtk_entry_set_text (GTK_ENTRY (rfxbuilder->paramw_rest_entry),rest);
-  }
 
+  rfxbuilder->paramw_rest_entry = lives_standard_entry_new (_("Row:    "),TRUE,pnum>=0&&rest!=NULL?rest:NULL,
+							    -1,-1,LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->paramw_rest_label=widget_opts.last_label;
+  
   if (kw!=NULL) g_free (kw);
   if (sp!=NULL) g_free (sp);
   if (spsub!=NULL) g_free (spsub);
   if (rest!=NULL) g_free (rest);
 
-
   gtk_widget_grab_focus (rfxbuilder->paramw_rest_entry);
 
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
-
-  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
-
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
-
-  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
-		    NULL);
-
-  g_signal_connect (GTK_OBJECT(rfxbuilder->paramw_kw_entry),"changed",
+  g_signal_connect (GTK_OBJECT(rfxbuilder->paramw_kw_combo),"changed",
 		    G_CALLBACK (on_paramw_kw_changed),(gpointer)rfxbuilder);
 
-  g_signal_connect (GTK_OBJECT(rfxbuilder->paramw_sp_entry),"changed",
+  g_signal_connect (GTK_OBJECT(rfxbuilder->paramw_sp_combo),"changed",
 		    G_CALLBACK (on_paramw_sp_changed),(gpointer)rfxbuilder);
 
-  g_signal_connect (GTK_OBJECT(rfxbuilder->paramw_spsub_entry),"changed",
+  g_signal_connect (GTK_OBJECT(rfxbuilder->paramw_spsub_combo),"changed",
 		    G_CALLBACK (on_paramw_spsub_changed),(gpointer)rfxbuilder);
 
-  if (pnum>=0) on_paramw_kw_changed (GTK_ENTRY (rfxbuilder->paramw_kw_entry),(gpointer)rfxbuilder);
+  gtk_widget_show_all(dialog);
+  on_paramw_kw_changed (GTK_COMBO_BOX (rfxbuilder->paramw_kw_combo),(gpointer)rfxbuilder);
 
   return dialog;
 }
 
 
 
-void on_paramw_kw_changed (GtkEntry *paramw_kw_entry, gpointer user_data) {
+void on_paramw_kw_changed (GtkComboBox *combo, gpointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
+  gchar *ctext=lives_combo_get_active_text(combo);
 
-  if (!strcmp (gtk_entry_get_text (GTK_ENTRY (paramw_kw_entry)),"special")) {
-    gtk_widget_show (rfxbuilder->paramw_sp_label);
-    gtk_widget_show (rfxbuilder->paramw_sp_combo);
-    on_paramw_sp_changed (GTK_ENTRY (rfxbuilder->paramw_sp_entry),(gpointer)rfxbuilder);
-    gtk_widget_grab_focus (rfxbuilder->paramw_sp_entry);
+  if (!strcmp (ctext,"special")) {
+    gtk_widget_show_all (gtk_widget_get_parent(rfxbuilder->paramw_sp_combo));
+    on_paramw_sp_changed (GTK_COMBO_BOX(rfxbuilder->paramw_sp_combo),(gpointer)rfxbuilder);
+    gtk_widget_grab_focus (lives_combo_get_entry(LIVES_COMBO(rfxbuilder->paramw_sp_combo)));
   }
   else {
     gtk_label_set_text (GTK_LABEL (rfxbuilder->paramw_rest_label),(_("Row:    ")));
-    gtk_widget_hide (rfxbuilder->paramw_sp_label);
-    gtk_widget_hide (rfxbuilder->paramw_sp_combo);
-    gtk_widget_hide (rfxbuilder->paramw_spsub_label);
-    gtk_widget_hide (rfxbuilder->paramw_spsub_combo);
+    gtk_widget_hide (gtk_widget_get_parent(rfxbuilder->paramw_sp_combo));
+    gtk_widget_hide (gtk_widget_get_parent(rfxbuilder->paramw_spsub_combo));
     gtk_widget_grab_focus (rfxbuilder->paramw_rest_entry);
   }
+
+  g_free(ctext);
 }
 
 
-void on_paramw_sp_changed (GtkEntry *paramw_sp_entry, gpointer user_data) {
+void on_paramw_sp_changed (GtkComboBox *combo, gpointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  const gchar *text=gtk_entry_get_text (GTK_ENTRY (paramw_sp_entry));
-  gint npars;
+  int npars;
   gchar *tmpx;
+  gchar *ctext=lives_combo_get_active_text(combo);
 
-  if (!strcmp (text,"framedraw")) {
-    gtk_widget_show (rfxbuilder->paramw_spsub_label);
-    gtk_widget_show (rfxbuilder->paramw_spsub_combo);
-    gtk_widget_grab_focus (rfxbuilder->paramw_spsub_entry);
-    on_paramw_spsub_changed (GTK_ENTRY (rfxbuilder->paramw_spsub_entry),(gpointer)rfxbuilder);
+  if (!strcmp (ctext,"framedraw")) {
+    gtk_widget_show_all (gtk_widget_get_parent(rfxbuilder->paramw_spsub_combo));
+    on_paramw_spsub_changed (GTK_COMBO_BOX(rfxbuilder->paramw_spsub_combo),(gpointer)rfxbuilder);
+    gtk_widget_grab_focus (lives_combo_get_entry(LIVES_COMBO(rfxbuilder->paramw_spsub_combo)));
   }
   else {
-    if (!strcmp(text,"fileread")) npars=1;
+    if (!strcmp(ctext,"fileread")||!strcmp(ctext,"password")) npars=1;
     else npars=2;
     gtk_label_set_text (GTK_LABEL (rfxbuilder->paramw_rest_label),
 			(tmpx=g_strdup_printf(_("Linked parameters (%d):    "),npars)));
     g_free(tmpx);
-    gtk_widget_hide (rfxbuilder->paramw_spsub_label);
-    gtk_widget_hide (rfxbuilder->paramw_spsub_combo);
+    gtk_widget_hide (gtk_widget_get_parent(rfxbuilder->paramw_spsub_combo));
     gtk_widget_grab_focus (rfxbuilder->paramw_rest_entry);
   }
+
+  g_free(ctext);
 }
 
 
-void on_paramw_spsub_changed (GtkEntry *paramw_spsub_entry, gpointer user_data) {
+void on_paramw_spsub_changed (GtkComboBox *combo, gpointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
+  gchar *ctext=lives_combo_get_active_text(combo);
 
-  if (!strcmp (gtk_entry_get_text (GTK_ENTRY (paramw_spsub_entry)),"rectdemask")||
-      !strcmp (gtk_entry_get_text (GTK_ENTRY (paramw_spsub_entry)),"multrect")) {
+  if (!strcmp (ctext,"rectdemask")||
+      !strcmp (ctext,"multrect")||!strcmp(ctext,"multirect")) {
     gtk_label_set_text (GTK_LABEL (rfxbuilder->paramw_rest_label),(_("Linked parameters (4):    ")));
   }
-  else if (!strcmp (gtk_entry_get_text (GTK_ENTRY (paramw_spsub_entry)),"singlepoint")) {
+  else if (!strcmp (ctext,"singlepoint")) {
     gtk_label_set_text (GTK_LABEL (rfxbuilder->paramw_rest_label),(_("Linked parameters (2):    ")));
   }
+
+  g_free(ctext);
 }
 
 
 
 
 
-GtkWidget * make_trigger_dialog (gint tnum, rfx_build_window_t *rfxbuilder) {
+GtkWidget * make_trigger_dialog (int tnum, rfx_build_window_t *rfxbuilder) {
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
-  GtkWidget *dialog_action_area;
-  GtkWidget *hbox;
-  GtkWidget *cancelbutton;
-  GtkWidget *okbutton;
-  GtkWidget *label;
   GtkWidget *combo;
   GtkWidget *scrolledwindow;
 
   GList *whenlist=NULL;
 
-  int i;
+  gchar *title;
+
+  boolean woat;
+
+  register int i;
 
-  dialog = gtk_dialog_new ();
   if (tnum<0) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - New RFX Trigger"));
+    title=g_strdup(_("LiVES: - New RFX Trigger"));
   }
   else {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Edit RFX Trigger"));
+    title=g_strdup(_("LiVES: - Edit RFX Trigger"));
   }
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  dialog = lives_standard_dialog_new (title,TRUE);
+  g_free(title);
+
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
-  //gtk_window_set_default_size (GTK_WINDOW (rfxbuilder->dialog), 300, 200);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 10);
-  gtk_widget_show (dialog_vbox);
 
   // when
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 0);
-
-  label = gtk_label_new (_("When:         "));
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
 
   if (tnum>=0) whenlist = g_list_append (whenlist, (gpointer)(rfxbuilder->copy_triggers[tnum].when?
 							      g_strdup_printf ("%d",rfxbuilder->copy_triggers[tnum].
@@ -3009,56 +2646,34 @@
     }
   }
 
-  combo = gtk_combo_new ();
-  combo_set_popdown_strings (GTK_COMBO (combo), whenlist);
+  combo = lives_standard_combo_new (_("When:         "),FALSE,whenlist,LIVES_BOX(dialog_vbox),FALSE);
   g_list_free(whenlist);
-  gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, FALSE, 0);
-  gtk_widget_show(combo);
-  rfxbuilder->trigger_when_entry=(GtkWidget*)(GTK_ENTRY((GTK_COMBO(combo))->entry));
-  gtk_editable_set_editable (GTK_EDITABLE(rfxbuilder->trigger_when_entry),FALSE);
 
+  rfxbuilder->trigger_when_entry=lives_combo_get_entry(LIVES_COMBO(combo));
 
-  // code area
-
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
+  // code area
   rfxbuilder->code_textview = gtk_text_view_new ();
-  gtk_widget_show (rfxbuilder->code_textview);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), rfxbuilder->code_textview);
-
   gtk_text_view_set_editable (GTK_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (rfxbuilder->code_textview), GTK_WRAP_WORD);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
 
-  if (tnum>=0) {
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), 
-			      rfxbuilder->copy_triggers[tnum].code, -1);
-    gtk_widget_grab_focus(rfxbuilder->code_textview);
-  }
-    
-  gtk_widget_set_size_request (scrolledwindow,400,100);
-
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
+  woat=widget_opts.apply_theme;
+  widget_opts.apply_theme=FALSE;
+  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H*2./3.,RFX_WINSIZE_V/4.,rfxbuilder->code_textview);
+  widget_opts.apply_theme=woat;
 
-  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  if (tnum>=0) {
+    text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
+			rfxbuilder->copy_triggers[tnum].code,-1);
+  }
 
-  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
-		    NULL);
+  if (tnum>=0||rfxbuilder->num_params==0) gtk_widget_grab_focus(rfxbuilder->code_textview);
 
+  gtk_widget_show_all(dialog);
+    
   return dialog;
 }
 
@@ -3075,40 +2690,30 @@
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
+  boolean woat;
+
   gchar *tmpx;
 
-  dialog = gtk_dialog_new ();
-  gtk_widget_show (dialog);
+  dialog = lives_standard_dialog_new (NULL,FALSE);
 
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
-  //gtk_window_set_default_size (GTK_WINDOW (rfxbuilder->dialog), 300, 200);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing (GTK_BOX (dialog_vbox), 10);
-  gtk_widget_show (dialog_vbox);
-
 
   // code area
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show (scrolledwindow);
+  rfxbuilder->code_textview = gtk_text_view_new ();
+
+  woat=widget_opts.apply_theme;
+  widget_opts.apply_theme=FALSE;
+  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H,RFX_WINSIZE_V,rfxbuilder->code_textview);
+  widget_opts.apply_theme=woat;
+
   gtk_box_pack_start (GTK_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-  rfxbuilder->code_textview = gtk_text_view_new ();
   g_object_ref (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolledwindow)));
   g_object_ref (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolledwindow)));
-  gtk_widget_show (rfxbuilder->code_textview);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), rfxbuilder->code_textview);
 
   gtk_text_view_set_editable (GTK_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (rfxbuilder->code_textview), GTK_WRAP_WORD);
@@ -3116,9 +2721,6 @@
 
   gtk_widget_grab_focus (rfxbuilder->code_textview);
 
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (rfxbuilder->code_textview),GTK_WRAP_NONE);
-
-
   // TODO !!
   /*  if (glib_major_version>=2&&glib_minor_version>=4) {
       gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (rfxbuilder->code_textview),TRUE);
@@ -3127,22 +2729,22 @@
   if (button==GTK_BUTTON (rfxbuilder->pre_button)) {
     rfxbuilder->codetype=RFX_CODE_TYPE_PRE;
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Pre Loop Code"));
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), 
-			      rfxbuilder->pre_code, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
+			rfxbuilder->pre_code,-1);
   }
 
   else if (button==GTK_BUTTON (rfxbuilder->loop_button)) {
     rfxbuilder->codetype=RFX_CODE_TYPE_LOOP;
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Loop Code"));
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), 
-			      rfxbuilder->loop_code, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
+			rfxbuilder->loop_code,-1);
   }
 
   else if (button==GTK_BUTTON (rfxbuilder->post_button)) {
     rfxbuilder->codetype=RFX_CODE_TYPE_POST;
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Post Loop Code"));
-    gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), 
-			      rfxbuilder->post_code, -1);
+    text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
+			rfxbuilder->post_code,-1);
   }
 
   else if (button==GTK_BUTTON (rfxbuilder->param_strdef_button)) {
@@ -3157,8 +2759,8 @@
       g_free(tmpx);
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (rfxbuilder->code_textview),GTK_WRAP_WORD);
 
-      gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), 
-				(gchar *)rfxbuilder->copy_params[rfxbuilder->edit_param].def, len);
+      text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
+			  (gchar *)rfxbuilder->copy_params[rfxbuilder->edit_param].def,len);
     }
     else {
       int i;
@@ -3175,8 +2777,7 @@
 	  if (string!=string_new) g_free (string);
 	  string=string_new;
 	}
-	gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), string, 
-				  strlen (string)-1);
+	text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), string, strlen(string)-1);
 	g_free (string);
 	gtk_text_buffer_get_start_iter (gtk_text_view_get_buffer(GTK_TEXT_VIEW(rfxbuilder->code_textview)),&start_iter);
 	gtk_text_buffer_place_cursor (gtk_text_view_get_buffer (GTK_TEXT_VIEW (rfxbuilder->code_textview)), &start_iter);
@@ -3184,35 +2785,29 @@
     }
   }
 
-  gtk_widget_set_size_request (scrolledwindow,600,400);
-
-  dialog_action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (dialog_action_area);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (cancelbutton);
 
   okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (okbutton);
 
   g_signal_connect (GTK_OBJECT (okbutton), "clicked",
 		    G_CALLBACK (on_code_ok),
 		    user_data);
   
   g_signal_connect (GTK_OBJECT (cancelbutton), "clicked",
-		    G_CALLBACK (on_code_cancel),
-		    user_data);
-
-  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
+		    G_CALLBACK (lives_general_button_clicked),
 		    NULL);
 
 
+  gtk_widget_show_all (dialog);
+
+
 }
 
 
@@ -3222,16 +2817,14 @@
   if (!perform_rfxbuilder_checks (rfxbuilder)) return;
   if (!rfxbuilder_to_script (rfxbuilder)) return;
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
   rfxbuilder_destroy (rfxbuilder);
 }
 
 void on_rfxbuilder_cancel (GtkButton *button, gpointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-  while (g_main_context_iteration (NULL,FALSE));
+  lives_general_button_clicked(button,NULL);
   rfxbuilder_destroy (rfxbuilder);
 }
 
@@ -3282,7 +2875,7 @@
 }
 
 
-gboolean perform_rfxbuilder_checks (rfx_build_window_t *rfxbuilder) {
+boolean perform_rfxbuilder_checks (rfx_build_window_t *rfxbuilder) {
   gchar *name=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->name_entry)));
 
   if (!strlen (name)) {
@@ -3338,8 +2931,8 @@
   return TRUE;
 }
 
-gboolean perform_param_checks (rfx_build_window_t *rfxbuilder, gint index, gint rows) {
-  int i;
+boolean perform_param_checks (rfx_build_window_t *rfxbuilder, int index, int rows) {
+  register int i;
 
   if (!strlen(gtk_entry_get_text (GTK_ENTRY (rfxbuilder->param_name_entry)))) {
     do_blocking_error_dialog (_ ("\n\nParameter name must not be blank.\n"));
@@ -3356,39 +2949,47 @@
 }
 
 
-gboolean rfxbuilder_to_script (rfx_build_window_t *rfxbuilder) {
+boolean rfxbuilder_to_script (rfx_build_window_t *rfxbuilder) {
   FILE *sfile;
-  int i,j;
-  int retval;
-  gchar **array;
   lives_colRGB24_t rgb;
+  gchar **array;
+
+  double stepwrap;
+
   guint32 props;
-  gdouble stepwrap;
 
-  gchar *name=g_strdup (gtk_entry_get_text (GTK_ENTRY (rfxbuilder->name_entry)));
+  const gchar *name=gtk_entry_get_text (GTK_ENTRY (rfxbuilder->name_entry));
   gchar *script_file,*script_file_dir;
   gchar *script_name=g_strdup_printf ("%s.%s",name,RFXBUILDER_SCRIPT_SUFFIX);
   gchar *new_name;
   gchar *buf;
   gchar *msg;
-  gchar *tmp,*tmp2,*tmpx;
+  gchar *tmp,*tmp2;
+
+  int retval;
+
+  register int i,j;
+
 
   if (rfxbuilder->mode!=RFX_BUILDER_MODE_EDIT) {
-    if (!(new_name=prompt_for_script_name (script_name,RFX_STATUS_TEST))) return FALSE;
+    if (!(new_name=prompt_for_script_name (script_name,RFX_STATUS_TEST))) {
+      g_free(script_name);
+      return FALSE;
+    }
     g_free (script_name);
     script_name=new_name;
   }
 
-  /////
-
   mainw->com_failed=FALSE;
 
   script_file_dir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
 
-  lives_system ((tmpx=g_strdup_printf ("/bin/mkdir -p \"%s/\"",script_file_dir)),FALSE);
-  g_free(tmpx);
-
-  if (mainw->com_failed) return FALSE;
+  if (!g_file_test(script_file_dir,G_FILE_TEST_IS_DIR)) {
+    if (g_mkdir_with_parents(script_file_dir,S_IRWXU)==-1) {
+      g_free (script_name);
+      return FALSE;
+    }
+  }
 
   script_file=g_strdup_printf ("%s%s",script_file_dir,script_name);
   g_free (script_file_dir);
@@ -3398,19 +2999,17 @@
   g_free (msg);
 
   if (!check_file (script_file,TRUE)) {
-    g_free (name);
     g_free (script_file);
     d_print_failed();
     return FALSE;
   }
-
+  
   do {
     retval=0;
     if (!(sfile=fopen(script_file,"w"))) {
       retval=do_write_failed_error_s_with_retry(script_file,g_strerror(errno),GTK_WINDOW(rfxbuilder->dialog));
       if (retval==LIVES_CANCEL) {
 	g_free (msg);
-	g_free (name);
 	g_free (script_file);
 	d_print_failed();
 	return FALSE;
@@ -3619,7 +3218,7 @@
       g_free (buf);
       lives_fputs("\n</properties>\n\n",sfile);
       lives_fputs("<language_code>\n",sfile);
-      array=g_strsplit(gtk_entry_get_text (GTK_ENTRY (rfxbuilder->langc_entry))," ",-1);
+      array=g_strsplit(lives_combo_get_active_text (LIVES_COMBO (rfxbuilder->langc_combo))," ",-1);
       lives_fputs (array[0],sfile);
       g_strfreev (array);
       lives_fputs("\n</language_code>\n\n",sfile);
@@ -3668,29 +3267,36 @@
     }
   } while (retval==LIVES_RETRY);
 
-  g_free(name);
   g_free(script_file);
 
   if (retval!=LIVES_CANCEL) {
     d_print_done();
+
+    gtk_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->delete_test_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->rename_test_rfx,TRUE);
+    gtk_widget_set_sensitive(mainw->edit_test_rfx,TRUE);
+
     return TRUE;
   }
   return FALSE;
 }
 
 
-gboolean script_to_rfxbuilder (rfx_build_window_t *rfxbuilder, const gchar *script_file) {
+boolean script_to_rfxbuilder (rfx_build_window_t *rfxbuilder, const gchar *script_file) {
   GList *list;
+
   gchar **array;
-  gint num_channels;
   gchar *tmp;
-  gint tnum,found;
-  gint filled_triggers=0;
   gchar *line;
-  gint len;
   gchar *version;
 
-  int i,j;
+  int num_channels;
+  int tnum,found;
+  int filled_triggers=0;
+  int len;
+
+  register int i,j;
 
   rfxbuilder->type=RFX_BUILD_TYPE_EFFECT1;
   if (!(list=get_script_section ("define",script_file,TRUE))) {
@@ -3706,7 +3312,7 @@
   }
 
   version=g_strdup(tmp+1);
-  if (strcmp(version,RFX_VERSION)) {
+  if (make_version_hash(version)>make_version_hash(RFX_VERSION)) {
     g_list_free_strings(list);
     g_list_free(list);
     g_free(version);
@@ -3829,7 +3435,6 @@
       rfxbuilder->params[i].step_size=1.;
       rfxbuilder->params[i].interp_func=rfxbuilder->params[i].display_func=NULL;
       rfxbuilder->params[i].hidden=FALSE;
-      rfxbuilder->params[i].copy_to=-1;
       rfxbuilder->params[i].transition=FALSE;
       rfxbuilder->params[i].wrap=FALSE;
       ////////////////
@@ -4013,16 +3618,25 @@
 
 
 
-GList *get_script_section (const gchar *section, const gchar *file, gboolean strip) {
+GList *get_script_section (const gchar *section, const gchar *file, boolean strip) {
   FILE *script_file;
-  gchar buff[65536];
   GList *list=NULL;
+
+  size_t linelen;
+
+  gchar buff[65536];
+
   gchar *line;
   gchar *whole=g_strdup (""),*whole2;
-  size_t linelen;
 
+#ifndef IS_MINGW
   gchar *outfile=g_strdup_printf ("%s/rfxsec.%d",g_get_tmp_dir(),getpid());
   gchar *com=g_strdup_printf ("\"%s\" -get \"%s\" \"%s\" > \"%s\"",RFX_BUILDER,section,file,outfile);
+#else
+  gchar *outfile=g_strdup_printf ("%s\\rfxsec.%d",g_get_tmp_dir(),getpid());
+  gchar *com=g_strdup_printf ("perl \"%s\\%s\" -get \"%s\" \"%s\" > \"%s\"",prefs->prefix_dir,RFX_BUILDER,
+			      section,file,outfile);
+#endif
 
   mainw->com_failed=FALSE;
 
@@ -4034,7 +3648,7 @@
   if ((script_file=fopen (outfile,"r"))) {
     while (fgets(buff,65536,script_file)) {
       if (buff!=NULL) {
-	if (strip) line=(g_strchomp (g_strchug(buff)));
+	if (strip) line=(g_strstrip(buff));
 	else line=buff;
 	if ((linelen=strlen (line))) {
 	  whole2=g_strconcat (whole,line,NULL);
@@ -4064,27 +3678,31 @@
 
 
 
-void
-on_rebuild_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
+void on_rebuild_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   gchar *com;
   if (!check_builder_programs()) return;
 
   d_print (_("Rebuilding all RFX scripts...builtin...")); 
   do_threaded_dialog(_("Rebuilding scripts"),FALSE);
 
-  com=g_strdup_printf("smogrify build_rfx_plugins builtinx \"%s%s%s\" \"%s%s%s\" \"%s/bin\"",prefs->prefix_dir,
+  com=g_strdup_printf("%s build_rfx_plugins builtinx \"%s%s%s\" \"%s%s%s\" \"%s/bin\"",prefs->backend_sync,
+		      prefs->prefix_dir,
 		      PLUGIN_SCRIPTS_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,
 		      prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,prefs->prefix_dir);
   lives_system(com,TRUE);
   g_free(com);
   d_print (_ ("custom...")); 
-  lives_system("smogrify build_rfx_plugins custom",FALSE);
+  com=g_strdup_printf("%s build_rfx_plugins custom",prefs->backend_sync);
+  lives_system(com,FALSE);
+  g_free(com);
   d_print (_("test...")); 
-  lives_system("smogrify build_rfx_plugins test",FALSE);
+  com=g_strdup_printf("%s build_rfx_plugins test",prefs->backend_sync);
+  lives_system(com,FALSE);
+  g_free(com);
 
 
   d_print(_("rebuilding dynamic menu entries..."));
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   threaded_dialog_spin();
   add_rfx_effects();
   threaded_dialog_spin();
@@ -4093,13 +3711,17 @@
   end_threaded_dialog();
 
   gtk_widget_queue_draw(mainw->LiVES);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 }
 
 
 
 
-gboolean check_builder_programs (void) {
+boolean check_builder_programs (void) {
+#ifdef IS_MINGW
+  return TRUE;
+#endif
+
   // check our plugin builder routines are executable
   gchar loc[32];
   gchar *msg;
@@ -4123,11 +3745,10 @@
 
 
 
-void
-on_delete_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
+void on_delete_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   lives_rfx_status_t status=(lives_rfx_status_t)GPOINTER_TO_INT (user_data);
-  gint ret;
-  gchar *rfx_script_file;
+  int ret;
+  gchar *rfx_script_file,*rfx_script_dir;
   gchar *script_name=prompt_for_script_name (NULL,status);
   gchar *msg;
 
@@ -4136,12 +3757,14 @@
   if (strlen (script_name)) {
     switch (status) {
     case RFX_STATUS_TEST:
-      rfx_script_file=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-					PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,script_name,NULL);
+      rfx_script_dir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
+					PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
+      rfx_script_file=g_build_filename (rfx_script_dir,script_name,NULL);
       break;
     case RFX_STATUS_CUSTOM:
-      rfx_script_file=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-					PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
+      rfx_script_dir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
+					PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
+      rfx_script_file=g_build_filename (rfx_script_dir,script_name,NULL);
       break;
     default:
       // we will not delete builtins
@@ -4154,6 +3777,8 @@
     msg=g_strdup_printf (_ ("\n\nReally delete RFX script\n%s ?\n\n"),rfx_script_file);
     if (!do_warning_dialog (msg)) {
       g_free (msg);
+      g_free (rfx_script_file);
+      g_free (rfx_script_dir);
       return;
     }
     g_free (msg);
@@ -4162,6 +3787,17 @@
     d_print (msg);
     g_free (msg);
     if (!(ret=unlink (rfx_script_file))) {
+      gchar *com;
+#ifndef IS_MINGW
+      com=g_strdup_printf("/bin/rm -rf \"%s\"",rfx_script_dir);
+#else
+      com=g_strdup_printf("DEL /q \"%s\"",rfx_script_dir);
+      lives_system(com,TRUE);
+      g_free(com);
+      com=g_strdup_printf("RMDIR \"%s\"",rfx_script_dir);
+#endif
+      lives_system(com,TRUE);
+      g_free(com);
       d_print_done();
       on_rebuild_rfx_activate (NULL,NULL);
     }
@@ -4172,32 +3808,43 @@
       g_free (msg);
     }
     g_free (rfx_script_file);
+    g_free (rfx_script_dir);
   }
 }
 
 
-void
-on_promote_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
+void on_promote_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   gchar *rfx_script_from=NULL;
   gchar *rfx_script_to=NULL;
+  gchar *rfx_dir_from=NULL;
+  gchar *rfx_dir_to=NULL;
   gchar *script_name=prompt_for_script_name (NULL,RFX_STATUS_TEST);
   gchar *msg;
-  gint ret=0;
-  gboolean failed=TRUE;
+  int ret=0;
+  boolean failed=TRUE;
 
   if (script_name==NULL) return;  // user cancelled
 
   if (strlen (script_name)) {
-    rfx_script_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				      PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,script_name,NULL);
-    rfx_script_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				    PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
+    rfx_dir_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
+				   PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
+
+    rfx_script_from=g_build_filename (rfx_dir_from,script_name,NULL);
+
+
+    rfx_dir_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
+				 PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
+
+
+    rfx_script_to=g_build_filename (rfx_dir_to,script_name,NULL);
 
     if (g_file_test (rfx_script_to, G_FILE_TEST_EXISTS)) {
       gchar *msg=g_strdup_printf (_ ("\nCustom script file:\n%s\nalready exists.\nPlease delete it first, or rename the test script.\n"),script_name);
       do_blocking_error_dialog (msg);
       g_free (msg);
+      g_free (rfx_dir_from);
       g_free (rfx_script_from);
+      g_free (rfx_dir_to);
       g_free (rfx_script_to);
       g_free (script_name);
       return;
@@ -4208,72 +3855,61 @@
     g_free (script_name);
     g_free (msg);
 
+    g_mkdir_with_parents(rfx_dir_to,S_IRWXU);
+
     if (!(ret=rename (rfx_script_from,rfx_script_to))) {
       d_print_done();
       on_rebuild_rfx_activate (NULL,NULL);
       failed=FALSE;
     }
   }
+
   if (failed) {
+    rmdir(rfx_dir_to);
     d_print_failed();
-    msg=g_strdup_printf(_ ("\n\nFailed to move the plugin script from\n%s to\n%s\nReturn code was %d\n"),
-			rfx_script_from,rfx_script_to,ret);
+    msg=g_strdup_printf(_ ("\n\nFailed to move the plugin script from\n%s to\n%s\nReturn code was %d (%s)\n"),
+			rfx_script_from,rfx_script_to,errno,strerror(errno));
     do_error_dialog (msg);
     g_free (msg);
   }
+  else rmdir(rfx_dir_from);
+
   if (rfx_script_from!=NULL) {
+    g_free (rfx_dir_from);
     g_free (rfx_script_from);
+    g_free (rfx_dir_to);
     g_free (rfx_script_to);
   }
 }
 
 
 
-void
-on_import_rfx_activate (GtkMenuItem *menuitem, gpointer status) {
-  GtkWidget *fileselection = create_fileselection (_ ("Import Script from..."),0,NULL);
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked",G_CALLBACK (on_import_rfx_ok),status);
-  gtk_widget_show (fileselection);
-}
-
-
-
-void
-on_export_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
+void on_export_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
   lives_rfx_status_t status=(lives_rfx_status_t)GPOINTER_TO_INT (user_data);
-  gchar *script_name=prompt_for_script_name (NULL,status);
-  GtkWidget *fileselection;
-  gchar *tmp;
-  
-  if (script_name==NULL) return;  // user cancelled
 
-  fileselection = create_fileselection (_ ("Export Script to..."),0,script_name);
+  gchar *script_name=prompt_for_script_name (NULL,status);
+  gchar *rfx_script_from,*filename;
+  gchar *com,*msg,*tmp,*tmp2;
   
-  g_signal_connect (GTK_FILE_SELECTION(fileselection)->ok_button, "clicked", 
-		    G_CALLBACK (on_export_rfx_ok),(gpointer)script_name);
-  gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection), 
-			      (tmp=g_filename_from_utf8 (script_name,-1,NULL,NULL,NULL)));
-  g_free(tmp);
-  gtk_widget_show (fileselection);
-}
-
+  if (script_name==NULL||!strlen(script_name)) return;  // user cancelled
 
-void on_export_rfx_ok (GtkButton *button, gchar *script_name) {
-  gchar *filename=g_filename_to_utf8 (gtk_file_selection_get_filename
-				      (GTK_FILE_SELECTION(gtk_widget_get_toplevel(GTK_WIDGET(button)))),
-				      -1,NULL,NULL,NULL);
-  gchar *rfx_script_from;
-  gchar *com,*msg,*tmp,*tmp2;
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  filename = choose_file (NULL,script_name,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("LiVES: - Export Script to..."),NULL);
 
+  if (filename==NULL) return;
+  
   rfx_script_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
 				    PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
 
   msg=g_strdup_printf(_ ("Copying %s to %s..."),rfx_script_from,filename);
   d_print(msg);
   g_free(msg);
+#ifndef IS_MINGW
   com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",(tmp=g_filename_from_utf8 (rfx_script_from,-1,NULL,NULL,NULL)),
 		      (tmp2=g_filename_from_utf8 (filename,-1,NULL,NULL,NULL)));
+#else
+  com=g_strdup_printf("cp.exe \"%s\" \"%s\"",(tmp=g_filename_from_utf8 (rfx_script_from,-1,NULL,NULL,NULL)),
+		      (tmp2=g_filename_from_utf8 (filename,-1,NULL,NULL,NULL)));
+#endif
   if (system(com)) d_print_failed();
   else d_print_done();
   g_free(tmp);
@@ -4285,16 +3921,16 @@
 }
 
 
-void on_import_rfx_ok (GtkButton *button, gpointer user_data) {
+void on_import_rfx_activate (GtkMenuItem *menuitem, gpointer user_data) {
+
   gshort status=(gshort)GPOINTER_TO_INT (user_data);
-  gchar *filename=g_filename_to_utf8 
-    (gtk_file_selection_get_filename(GTK_FILE_SELECTION
-				     (gtk_widget_get_toplevel(GTK_WIDGET(button)))),-1,NULL,NULL,NULL);
   gchar *rfx_script_to,*rfx_dir_to;
   gchar *com,*msg,*tmp,*tmp2,*tmpx;
   gchar basename[PATH_MAX];
 
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  gchar *filename=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,_ ("LiVES: Import Script from..."),NULL);
+
+  if (filename==NULL) return;
 
   g_snprintf (basename,PATH_MAX,"%s",filename);
   get_basename (basename);
@@ -4304,18 +3940,18 @@
   switch (status) {
   case RFX_STATUS_TEST :
     rfx_dir_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
-    lives_system ((tmpx=g_strdup_printf ("/bin/mkdir -p \"%s\"",
-					 (tmp=g_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)))),FALSE);
+
+    g_mkdir_with_parents((tmp=g_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)),S_IRWXU);
+
     g_free(tmp);
-    g_free(tmpx);
     rfx_script_to=g_build_filename(rfx_dir_to,basename,NULL);
     g_free (rfx_dir_to);
     break;
   case RFX_STATUS_CUSTOM :
     rfx_dir_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
-    lives_system ((tmpx=g_strdup_printf ("/bin/mkdir -p \"%s\"",
-					 (tmp=g_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)))),FALSE);
-    g_free(tmpx);
+
+    g_mkdir_with_parents((tmp=g_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)),S_IRWXU);
+
     g_free(tmp);
     rfx_script_to=g_build_filename (rfx_dir_to,basename,NULL);
     g_free (rfx_dir_to);
@@ -4346,8 +3982,13 @@
   msg=g_strdup_printf(_ ("Copying %s to %s..."),filename,rfx_script_to);
   d_print(msg);
   g_free(msg);
+#ifndef IS_MINGW
   com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",(tmp=g_filename_from_utf8(filename,-1,NULL,NULL,NULL)),
 		      (tmp2=g_filename_from_utf8(rfx_script_to,-1,NULL,NULL,NULL)));
+#else
+  com=g_strdup_printf("cp.exe \"%s\" \"%s\"",(tmp=g_filename_from_utf8(filename,-1,NULL,NULL,NULL)),
+		      (tmp2=g_filename_from_utf8(rfx_script_to,-1,NULL,NULL,NULL)));
+#endif
   g_free(tmp);
   g_free(tmp2);
   if (system(com)) d_print_failed();
@@ -4381,6 +4022,7 @@
   gchar *from_status;
   gchar *rfx_script_from;
   gchar *rfx_script_to;
+
   rfx_build_window_t *rfxbuilder;
 
   GtkWidget *vbox;
@@ -4389,162 +4031,127 @@
   GtkWidget *script_combo=NULL;
   GtkWidget *name_entry=NULL;
   GtkWidget *script_combo_entry=NULL;
-  GtkWidget *status_combo;
+  GtkWidget *status_combo=NULL;
   GtkWidget *status_combo_entry=NULL;
   GtkWidget *dialog;
-  GtkWidget *action_area;
+  GtkWidget *dialog_action_area;
   GtkWidget *cancelbutton;
-  GtkWidget *okbutton;
 
   GList *status_list=NULL;
 
-  gboolean copy_mode=FALSE;
-  gboolean rename_mode=FALSE;
-  gboolean OK;
+  boolean copy_mode=FALSE;
+  boolean rename_mode=FALSE;
+  boolean OK;
 
   if (status==RFX_STATUS_COPY) {
     copy_mode=TRUE;
-    status_list = g_list_append (status_list, g_strdup(_("Builtin")));
-    status_list = g_list_append (status_list, g_strdup(_("Custom")));
-    status_list = g_list_append (status_list, g_strdup(_("Test")));
+    status_list = g_list_append (status_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]));
+    status_list = g_list_append (status_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]));
+    status_list = g_list_append (status_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_TEST]));
   }
-  dialog = gtk_dialog_new ();
 
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
+  dialog = lives_standard_dialog_new (NULL,FALSE);
+
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(mainw->LiVES));
   }
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-  }
-  gtk_widget_modify_bg (dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 200);
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 10);
 
   vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  vbox = lives_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+
+  add_fill_to_box(LIVES_BOX(vbox));
+
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  add_fill_to_box(LIVES_BOX(vbox));
   
   if (copy_mode) {
     gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Copy RFX Script"));
 
-    label = gtk_label_new (_ ("From type:    "));
-    gtk_widget_show (label);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
-
-    status_combo = gtk_combo_new ();
-    gtk_widget_show (status_combo);
+    status_combo = lives_standard_combo_new (_ ("_From type:    "),TRUE,status_list,LIVES_BOX(hbox),NULL);
 
-    status_combo_entry = GTK_COMBO (status_combo)->entry;
-    gtk_editable_set_editable (GTK_EDITABLE(status_combo_entry),FALSE);
-    gtk_widget_show (status_combo_entry);
+    status_combo_entry = lives_combo_get_entry(LIVES_COMBO(status_combo));
 
-    combo_set_popdown_strings (GTK_COMBO (status_combo), status_list);
     g_list_free_strings (status_list);
     g_list_free (status_list);
-    gtk_box_pack_start (GTK_BOX (hbox), status_combo, TRUE, TRUE, 0);
 
-    label = gtk_label_new (_ ("   Script:    "));
+    label = lives_standard_label_new (_ ("   Script:    "));
     gtk_widget_show (label);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     }
   }
   else {
     if (status==RFX_STATUS_RENAME) {
       gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Rename test RFX Script"));
-      label = gtk_label_new (_ ("From script: "));
+      label = lives_standard_label_new (_ ("From script: "));
       rename_mode=TRUE;
       status=RFX_STATUS_TEST;
     }
     else {
       gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - RFX Script name"));
-      label = gtk_label_new (_ ("Script name: "));
+      label = lives_standard_label_new (_ ("Script name: "));
     }
-    gtk_widget_show (label);
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
   }
   
   
   if (sname==NULL||copy_mode||rename_mode) {
-    GList *sclist;
-    script_combo = gtk_combo_new ();
-    gtk_widget_show (script_combo);
-
-    name_entry = script_combo_entry = GTK_COMBO (script_combo)->entry;
-    gtk_editable_set_editable (GTK_EDITABLE(name_entry),FALSE);
-    gtk_widget_show (name_entry);
-
-    combo_set_popdown_strings (GTK_COMBO (script_combo), (sclist=get_script_list (status)));
-    if (sclist!=NULL) {
-      g_list_free_strings(sclist);
-      g_list_free(sclist);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox), script_combo, TRUE, TRUE, 0);
+    script_combo = lives_combo_new ();
+
+    name_entry = script_combo_entry = lives_combo_get_entry(LIVES_COMBO(script_combo));
+    lives_entry_set_editable (LIVES_ENTRY(name_entry),FALSE);
+    gtk_box_pack_start (GTK_BOX (hbox), script_combo, TRUE, TRUE, widget_opts.packing_width);
   }
   if (sname!=NULL||copy_mode||rename_mode) {
     // name_entry becomes a normal gtk_entry
     name_entry=gtk_entry_new();
 
     if (copy_mode) {
-      g_signal_connect (GTK_OBJECT(status_combo_entry),"changed",G_CALLBACK (on_script_status_changed),
+      g_signal_connect (GTK_OBJECT(status_combo),"changed",G_CALLBACK (on_script_status_changed),
 			(gpointer)script_combo);
-      label = gtk_label_new (_ ("New name: "));
+      label = lives_standard_label_new (_ ("New name: "));
     }
     if (rename_mode) {
-      label = gtk_label_new (_ ("New script name: "));
+      label = lives_standard_label_new (_ ("New script name: "));
     }
     if (copy_mode||rename_mode) {
-      hbox = gtk_hbox_new (FALSE, 0);
-      gtk_widget_show (hbox);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
-      gtk_widget_show (label);
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &palette->normal_fore);
-      }
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
     }
     else {
       gtk_entry_set_text (GTK_ENTRY (name_entry),sname);
     }
-    gtk_widget_show (name_entry);
-    gtk_box_pack_start (GTK_BOX (hbox), name_entry, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), name_entry, TRUE, TRUE, widget_opts.packing_width);
   }
   gtk_widget_grab_focus (name_entry);
   gtk_entry_set_activates_default (GTK_ENTRY (name_entry), TRUE);
 
-  action_area = GTK_DIALOG (dialog)->action_area;
-  gtk_widget_show (action_area);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
+
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
+  gtk_widget_show (dialog_action_area);
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area), GTK_BUTTONBOX_END);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
 
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_widget_show (okbutton);
+  copy_script_okbutton = gtk_button_new_from_stock ("gtk-ok");
+  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), copy_script_okbutton, GTK_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default (copy_script_okbutton);
+  gtk_widget_grab_default (copy_script_okbutton); 
 
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default (okbutton);
+  gtk_widget_show_all(dialog);
 
-  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
-		    G_CALLBACK (gtk_true),
-		    NULL);
+  if (status_combo!=NULL) on_script_status_changed(LIVES_COMBO(status_combo),(gpointer)script_combo);
+  else if (script_combo!=NULL) populate_script_combo(LIVES_COMBO(script_combo), status);
 
   do {
     OK=TRUE;
@@ -4562,9 +4169,9 @@
 	else {
 	  from_name=g_strdup(gtk_entry_get_text (GTK_ENTRY (script_combo_entry)));
 	  from_status=g_strdup(gtk_entry_get_text (GTK_ENTRY (status_combo_entry)));
-	  if (!strcmp (from_status,_("Builtin"))) status=RFX_STATUS_BUILTIN;
+	  if (!strcmp (from_status,mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN])) status=RFX_STATUS_BUILTIN;
 	  else {
-	    if (!strcmp (from_status,_("Custom"))) status=RFX_STATUS_CUSTOM;
+	    if (!strcmp (from_status,mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM])) status=RFX_STATUS_CUSTOM;
 	    else status=RFX_STATUS_TEST;
 	  }
 
@@ -4585,7 +4192,9 @@
       }
       if (rename_mode) {
 	GList *nmlist=NULL;
-	if (name !=NULL&&g_list_find ((nmlist=get_script_list (status)),name)!=NULL) {
+	gchar *xname=ensure_extension(name,".script");
+
+	if (name !=NULL&&g_list_find ((nmlist=get_script_list (status)),xname)!=NULL) {
 	  do_blocking_error_dialog (_ ("\n\nThere is already a test script with this name.\nScript name must be unique.\n"));
 	  OK=FALSE;
 	}
@@ -4594,9 +4203,11 @@
 	  gchar *tmp;
 
 	  from_name=g_strdup(gtk_entry_get_text (GTK_ENTRY (script_combo_entry)));
-	  rfx_script_from=g_strdup_printf ("%s/%s/%s",capable->home_dir,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,from_name);
-	  rfx_script_to=g_strdup_printf ("%s/%s/%s",capable->home_dir,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,name);
-	  d_print ((tmp=g_strdup_printf (_ ("Renaming RFX test script %s to %s..."),from_name,name)));
+	  rfx_script_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
+					    PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,from_name,NULL);
+	  rfx_script_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
+					  PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,xname,NULL);
+	  d_print ((tmp=g_strdup_printf (_ ("Renaming RFX test script %s to %s..."),from_name,xname)));
 	  g_free(tmp);
 	  g_free (from_name);
 
@@ -4615,6 +4226,7 @@
 	  g_list_free_strings(nmlist);
 	  g_list_free(nmlist);
 	}
+	g_free(xname);
       }
     }
   } while (!OK);
@@ -4624,34 +4236,46 @@
 }
 
 
-void on_script_status_changed (GtkEntry *script_entry, gpointer combo) {
-  gchar *text=g_strdup (gtk_entry_get_text (GTK_ENTRY (script_entry)));
+void populate_script_combo(GtkComboBox *script_combo, lives_rfx_status_t status) {
   GList *list=NULL;
+  lives_combo_populate (script_combo, (list=get_script_list (status)));
+  if (list!=NULL) {
+    gtk_combo_box_set_active(script_combo,0);
+    gtk_widget_set_sensitive(copy_script_okbutton,TRUE);
+    g_list_free_strings(list);
+    g_list_free(list);
+  }
+  else {
+    lives_combo_set_active_string(script_combo,"");
+    gtk_widget_set_sensitive(copy_script_okbutton,FALSE);
+  }
+}
+
+
 
-  if (combo==NULL||!GTK_IS_COMBO (combo)) return;
+void on_script_status_changed (GtkComboBox *status_combo, gpointer user_data) {
+  gchar *text=lives_combo_get_active_text(status_combo);
+  LiVESWidget *script_combo=(LiVESWidget *)user_data;
 
-  if (!(strcmp (text,_("Builtin")))) {
-    combo_set_popdown_strings (GTK_COMBO (combo), (list=get_script_list (RFX_STATUS_BUILTIN)));
+  if (script_combo==NULL||!LIVES_IS_COMBO (script_combo)) return;
+
+  if (!(strcmp (text,mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]))) {
+    populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_BUILTIN);
   }
   else {
-    if (!(strcmp (text,_("Custom")))) {
-    combo_set_popdown_strings (GTK_COMBO (combo), (list=get_script_list (RFX_STATUS_CUSTOM)));
+    if (!(strcmp (text,mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]))) {
+      populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_CUSTOM);
     }
     else {
-      if (!(strcmp (text,_("Test")))) {
-	combo_set_popdown_strings (GTK_COMBO (combo), (list=get_script_list (RFX_STATUS_TEST)));
+      if (!(strcmp (text,mainw->string_constants[LIVES_STRING_CONSTANT_TEST]))) {
+	populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_TEST);
       }
     }
   }
   g_free (text);
-  if (list!=NULL) {
-    g_list_free_strings(list);
-    g_list_free(list);
-  }
 }
 
 
-
 GList *get_script_list (gshort status) {
   GList *script_list=NULL;
 
@@ -4673,20 +4297,12 @@
 
 
 
-static void remove_from_parent(GtkWidget *widget) {
-  gtk_container_remove(GTK_CONTAINER(widget->parent),widget);
-}
-
-
 void add_rfx_effects(void) {
   // scan render plugin directories, create a rfx array, and add each to the appropriate menu area
   GList *rfx_builtin_list=NULL;
   GList *rfx_custom_list=NULL;
   GList *rfx_test_list=NULL;
 
-  gint tool_posn=RFX_TOOL_MENU_POSN;
-
-  gint rfx_builtin_list_length=0,rfx_custom_list_length=0,rfx_test_list_length=0,rfx_list_length=0;
 
   lives_rfx_t *rfx=NULL;
   lives_rfx_t *rendered_fx;
@@ -4700,6 +4316,13 @@
 
   int rc_child=0;
 
+  int tool_posn=RFX_TOOL_MENU_POSN;
+  int rfx_builtin_list_length=0,rfx_custom_list_length=0,rfx_test_list_length=0,rfx_list_length=0;
+
+#ifndef NO_RFX
+  boolean allow_nonex;
+#endif
+
   mainw->has_custom_tools=FALSE;
   mainw->has_custom_gens=FALSE;
   mainw->has_custom_utilities=FALSE;
@@ -4711,28 +4334,32 @@
 	   +mainw->num_rendered_effects_test;i++) {
       if (mainw->rendered_fx!=NULL) {
 	if (mainw->rendered_fx[i].menuitem!=NULL) {
-	  remove_from_parent(mainw->rendered_fx[i].menuitem);
+	  gtk_widget_destroy(mainw->rendered_fx[i].menuitem);
 	  threaded_dialog_spin();
 	}
       }
     }
+    
     threaded_dialog_spin();
+
     if (mainw->rte_separator!=NULL) {
-      remove_from_parent (mainw->custom_effects_separator);
-      remove_from_parent (mainw->custom_effects_menu);
-      remove_from_parent (mainw->custom_effects_submenu);
-      remove_from_parent (mainw->custom_gens_menu);
-      remove_from_parent (mainw->custom_gens_submenu);
-      remove_from_parent (mainw->gens_menu);
-      remove_from_parent (mainw->custom_utilities_separator);
-      remove_from_parent (mainw->custom_utilities_menu);
-      remove_from_parent (mainw->custom_utilities_submenu);
-      remove_from_parent (mainw->custom_tools_menu);
-      remove_from_parent (mainw->utilities_menu);
-      remove_from_parent (mainw->run_test_rfx_menu);
+      if (mainw->custom_effects_separator!=NULL) gtk_widget_destroy (mainw->custom_effects_separator);
+      if (mainw->custom_effects_menu!=NULL) gtk_widget_destroy (mainw->custom_effects_menu);
+      if (mainw->custom_effects_submenu!=NULL) gtk_widget_destroy (mainw->custom_effects_submenu);
+      if (mainw->custom_gens_menu!=NULL) gtk_widget_destroy (mainw->custom_gens_menu);
+      if (mainw->custom_gens_submenu!=NULL) gtk_widget_destroy (mainw->custom_gens_submenu);
+      if (mainw->gens_menu!=NULL) gtk_widget_destroy (mainw->gens_menu);
+
+      if (mainw->custom_utilities_separator!=NULL) gtk_widget_destroy (mainw->custom_utilities_separator);
+      if (mainw->custom_utilities_menu!=NULL) gtk_widget_destroy (mainw->custom_utilities_menu);
+      if (mainw->custom_utilities_submenu!=NULL) gtk_widget_destroy (mainw->custom_utilities_submenu);
+      if (mainw->custom_tools_menu!=NULL) gtk_widget_destroy (mainw->custom_tools_menu);
+      if (mainw->utilities_menu!=NULL) gtk_widget_destroy (mainw->utilities_menu);
+      if (mainw->run_test_rfx_menu!=NULL) gtk_widget_destroy (mainw->run_test_rfx_menu);
     }
+
     gtk_widget_queue_draw(mainw->effects_menu);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     threaded_dialog_spin();
 
     if (mainw->rendered_fx!=NULL) rfx_free_all();
@@ -4748,36 +4375,51 @@
   mainw->run_test_rfx_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->run_test_rfx_submenu), mainw->run_test_rfx_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->run_test_rfx_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->run_test_rfx_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
   gtk_widget_show(mainw->run_test_rfx_menu);
 
   mainw->custom_effects_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_effects_submenu), mainw->custom_effects_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->custom_effects_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->custom_effects_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   mainw->custom_tools_menu=gtk_menu_new();
+
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_tools_submenu), mainw->custom_tools_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->custom_tools_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->custom_tools_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
+#ifdef IS_MINGW
+  //#define NO_RFX
+#endif
+
+
+#ifndef NO_RFX
 
   // scan rendered effect directories
-  rfx_custom_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_CUSTOM,FALSE,NULL,NULL);
+#ifndef IS_MINGW
+  allow_nonex=FALSE;
+#else
+  allow_nonex=TRUE;
+#endif
+
+  rfx_custom_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_CUSTOM,allow_nonex,NULL,NULL);
   rfx_custom_list_length=g_list_length(rfx_custom_list);
 
-  rfx_test_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_TEST,FALSE,NULL,NULL);
+  rfx_test_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_TEST,allow_nonex,NULL,NULL);
   rfx_test_list_length=g_list_length(rfx_test_list);
     
-  if ((rfx_builtin_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_BUILTIN,FALSE,NULL,NULL))==NULL) {
+  if ((rfx_builtin_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_BUILTIN,allow_nonex,NULL,NULL))==NULL) {
     do_rendered_fx_dialog();
   }
   else {
     rfx_builtin_list_length=g_list_length(rfx_builtin_list);
   }
+#endif
+
   rfx_list_length=rfx_builtin_list_length+rfx_custom_list_length+rfx_test_list_length;
 
   threaded_dialog_spin();
@@ -4816,7 +4458,7 @@
     for (plugin_idx=0;plugin_idx<rfx_list_length;plugin_idx++) {
       threaded_dialog_spin();
       if (mainw->splash_window==NULL) {
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
       }
       if (plugin_idx==rfx_builtin_list_length) {
 	g_free(type);
@@ -4862,7 +4504,7 @@
 	g_free(def);
 	continue;
       }
-      if (strcmp(def+1,RFX_VERSION)) {
+      if (make_version_hash(def+1)>make_version_hash(RFX_VERSION)) {
 #ifdef DEBUG_RENDER_FX
 	g_print("Invalid version %s instead of %s in %s\n",def+1,RFX_VERSION,plugin_name);
 #endif
@@ -4944,7 +4586,7 @@
   gtk_widget_set_tooltip_text( menuitem,_("See: VJ - show VJ keys. Set the realtime effects, and then apply them here."));
   
   gtk_widget_add_accelerator (menuitem, "activate", mainw->accel_group,
-			      GDK_e, GDK_CONTROL_MASK,
+			      LIVES_KEY_e, LIVES_CONTROL_MASK,
 			      GTK_ACCEL_VISIBLE);
 
   g_signal_connect (GTK_OBJECT (menuitem), "activate",
@@ -4954,6 +4596,15 @@
   mainw->rendered_fx[0].menuitem=menuitem;
   mainw->rendered_fx[0].num_in_channels=1;
   
+  if (mainw->is_ready&&mainw->playing_file==-1&&mainw->current_file>0&&
+      ((has_video_filters(TRUE)&&!has_video_filters(FALSE))||
+       (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(FALSE))||
+       mainw->agen_key!=0)) {
+    
+    gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
+  }
+  else gtk_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+
   gtk_container_add (GTK_CONTAINER (mainw->effects_menu), mainw->custom_effects_submenu);
   
   mainw->custom_effects_separator = gtk_menu_item_new ();
@@ -4961,12 +4612,12 @@
   
   gtk_container_add (GTK_CONTAINER (mainw->effects_menu), mainw->custom_effects_separator);
   threaded_dialog_spin();
-    
+
   // now we need to add to the effects menu and set a callback
   for (rfx=&mainw->rendered_fx[(plugin_idx=1)];plugin_idx<=rfx_slot_count;rfx=&mainw->rendered_fx[++plugin_idx]) {
     threaded_dialog_spin();
     if (mainw->splash_window==NULL) {
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
     }
     render_fx_get_params (rfx,rfx->name,rfx->status);
     threaded_dialog_spin();
@@ -4974,27 +4625,27 @@
     rfx->extra=NULL;
     rfx->menuitem=NULL;
 
-      switch (rfx->status) {
-      case RFX_STATUS_BUILTIN:
-	mainw->num_rendered_effects_builtin++;
-	break;
-      case RFX_STATUS_CUSTOM:
-	mainw->num_rendered_effects_custom++;
-	break;
-      case RFX_STATUS_TEST:
-	mainw->num_rendered_effects_test++;
-	break;
-      default:
-	break;
-      }
-      
+    switch (rfx->status) {
+    case RFX_STATUS_BUILTIN:
+      mainw->num_rendered_effects_builtin++;
+      break;
+    case RFX_STATUS_CUSTOM:
+      mainw->num_rendered_effects_custom++;
+      break;
+    case RFX_STATUS_TEST:
+      mainw->num_rendered_effects_test++;
+      break;
+    default:
+      break;
+    }
+
     if (!(rfx->props&RFX_PROPS_MAY_RESIZE)&&rfx->min_frames>=0&&rfx->num_in_channels==1) {
       // add resizing effects to tools menu later
       g_snprintf (txt,61,"_%s",_(rfx->menu_text));
       if (rfx->num_params) g_strappend (txt,64,"...");
       menuitem = gtk_image_menu_item_new_with_mnemonic(txt);
       gtk_widget_show(menuitem);
-      
+
       switch (rfx->status) {
       case RFX_STATUS_BUILTIN:
 	gtk_container_add (GTK_CONTAINER (mainw->effects_menu), menuitem);
@@ -5009,12 +4660,12 @@
       default:
 	break;
       }
-      
+
       if (rfx->props&RFX_PROPS_SLOW) {
-	rfx_image = gtk_image_new_from_stock ("gtk-no", GTK_ICON_SIZE_MENU);
+	rfx_image = lives_image_new_from_stock ("gtk-no", LIVES_ICON_SIZE_MENU);
       }
       else {
-	rfx_image = gtk_image_new_from_stock ("gtk-yes", GTK_ICON_SIZE_MENU);
+	rfx_image = lives_image_new_from_stock ("gtk-yes", LIVES_ICON_SIZE_MENU);
       }
       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), rfx_image);
       
@@ -5034,7 +4685,6 @@
     }
   }
 
-
   threaded_dialog_spin();
 
   // custom effects
@@ -5052,50 +4702,37 @@
   mainw->utilities_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->utilities_submenu), mainw->utilities_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->utilities_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
-  }
-
-  if (mainw->custom_tools_menu!=NULL) {
-    remove_from_parent(mainw->custom_tools_menu);
-  }
-
-  mainw->custom_tools_menu=gtk_menu_new();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_tools_submenu), mainw->custom_tools_menu);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->custom_tools_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->utilities_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
-
   mainw->gens_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->gens_submenu), mainw->gens_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->gens_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->gens_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
 
   mainw->custom_gens_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_gens_submenu), mainw->custom_gens_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->custom_gens_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->custom_gens_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_container_add (GTK_CONTAINER (mainw->gens_menu), mainw->custom_gens_submenu);
 
 
-
   mainw->custom_utilities_separator=gtk_menu_item_new();
   gtk_widget_set_sensitive (mainw->custom_utilities_separator, FALSE);
 
   mainw->custom_utilities_menu=gtk_menu_new();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (mainw->custom_utilities_submenu), mainw->custom_utilities_menu);
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(mainw->custom_utilities_menu, GTK_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mainw->custom_utilities_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   }
 
   gtk_container_add (GTK_CONTAINER (mainw->custom_tools_menu), mainw->custom_utilities_separator);
   gtk_container_add (GTK_CONTAINER (mainw->custom_tools_menu), mainw->custom_utilities_submenu);
 
-
   threaded_dialog_spin();
 
   mainw->resize_menuitem=NULL;
@@ -5104,7 +4741,7 @@
     for (rfx=&mainw->rendered_fx[(plugin_idx=1)];plugin_idx<=rfx_slot_count;rfx=&mainw->rendered_fx[++plugin_idx]) {
       threaded_dialog_spin();
       if (mainw->splash_window==NULL) {
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
       }
       if ((rfx->props&RFX_PROPS_MAY_RESIZE&&rfx->num_in_channels==1)||rfx->min_frames<0) {
 	// add resizing effects to tools menu
@@ -5229,6 +4866,7 @@
     gtk_widget_show(mainw->custom_utilities_submenu);
   }
   else {
+    gtk_widget_hide(mainw->custom_utilities_separator);
     gtk_widget_hide(mainw->custom_utilities_menu);
     gtk_widget_hide(mainw->custom_utilities_submenu);
   }
@@ -5240,6 +4878,33 @@
     gtk_widget_hide(mainw->custom_gens_menu);
     gtk_widget_hide(mainw->custom_gens_submenu);
   }
+
+  if (mainw->is_ready) {
+    if (mainw->num_rendered_effects_custom>0) {
+      gtk_widget_set_sensitive(mainw->delete_custom_rfx,TRUE);
+      gtk_widget_set_sensitive(mainw->export_custom_rfx,TRUE);
+    }
+    else {
+      gtk_widget_set_sensitive(mainw->delete_custom_rfx,FALSE);
+      gtk_widget_set_sensitive(mainw->export_custom_rfx,FALSE);
+    }
+    
+    if (mainw->num_rendered_effects_test>0) {
+      gtk_widget_set_sensitive(mainw->run_test_rfx_submenu,TRUE);
+      gtk_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
+      gtk_widget_set_sensitive(mainw->delete_test_rfx,TRUE);
+      gtk_widget_set_sensitive(mainw->rename_test_rfx,TRUE);
+      gtk_widget_set_sensitive(mainw->edit_test_rfx,TRUE);
+    }
+    else {
+      gtk_widget_set_sensitive(mainw->run_test_rfx_submenu,FALSE);
+      gtk_widget_set_sensitive(mainw->promote_test_rfx,FALSE);
+      gtk_widget_set_sensitive(mainw->delete_test_rfx,FALSE);
+      gtk_widget_set_sensitive(mainw->rename_test_rfx,FALSE);
+      gtk_widget_set_sensitive(mainw->edit_test_rfx,FALSE);
+    }
+  }
+
   if (mainw->current_file>0&&mainw->playing_file==-1) sensitize();
 
 }

LiVES-1.6.1.tar.bz2/src/rfx-builder.h -> LiVES-2.0.3.tar.bz2/src/rfx-builder.h Changed

@@ -1,13 +1,17 @@
 // rfx-builder.h
 // LiVES
-// (c) G. Finch 2004 - 2009 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
+#ifndef HAS_LIVES_RFX_BUILDER_H
+#define HAS_LIVES_RFX_BUILDER_H
+
+
 #define RFX_BUILDER "build-lives-rfx-plugin"
 
 /// must match whatever is in RFX_BUILDER
-#define RFX_VERSION "1.7"
+#define RFX_VERSION "1.8"
 
 /// this definition must match with smogrify
 #define RFX_BUILDER_MULTI "build-lives-rfx-plugin-multi"
@@ -48,14 +52,14 @@
 #define RFXBUILD_MAX_TROWS 512
 
 
-#define PREF_RFXDIALOG_W 800
-#define PREF_RFXDIALOG_H 650
+#define PREF_RFXDIALOG_W ((int)(800.*widget_opts.scale))
+#define PREF_RFXDIALOG_H ((int)(650.*widget_opts.scale))
 
 
 /// maximum decimal places allowed (should correspond to precision of a "float")
 #define RFXBUILD_MAX_DP 16
 typedef struct {
-  gint when;
+  int when;
   gchar *code;
 } rfx_trigger_t;
 
@@ -104,7 +108,7 @@
   GtkWidget *author_entry;
   GtkWidget *url_entry;
   GtkWidget *menu_text_entry;
-  GtkWidget *action_desc_label;
+  GtkWidget *action_desc_hbox;
   GtkWidget *action_desc_entry;
   GtkWidget *action_desc_hsep;
   GtkWidget *spinbutton_min_frames;
@@ -113,7 +117,7 @@
   GtkWidget *type_effect0_radiobutton;
   GtkWidget *type_tool_radiobutton;
   GtkWidget *type_utility_radiobutton;
-  GtkWidget *langc_entry;
+  GtkWidget *langc_combo;
   GtkWidget *table;
   GtkWidget *requirements_button;
   GtkWidget *properties_button;
@@ -130,8 +134,8 @@
 
   lives_rfx_table_type_t table_type;
 
-  gint table_rows;
-  gint ptable_rows;
+  int table_rows;
+  int ptable_rows;
 
   lives_rfx_code_type_t codetype;
 
@@ -141,28 +145,24 @@
   GtkWidget *param_dialog;
   GtkWidget *param_name_entry;
   GtkWidget *param_label_entry;
-  GtkWidget *param_type_entry;
+  GtkWidget *param_type_combo;
   GtkWidget *param_dp_label;
   GtkWidget *param_def_label;
   GtkWidget *param_min_label;
   GtkWidget *param_max_label;
   GtkWidget *param_step_label;
-  GtkWidget *param_wrap_label;
-  GtkWidget *param_wrap_eventbox;
+  GtkWidget *param_wrap_hbox;
   GtkWidget *param_wrap_checkbutton;
   GtkWidget *param_strlist_hbox;
   GtkWidget *param_def_combo;
-  GtkWidget *paramw_kw_entry;
-  GtkWidget *paramw_sp_entry;
-  GtkWidget *paramw_spsub_entry;
   GtkWidget *paramw_rest_entry;
-  GtkWidget *paramw_sp_label;
+  GtkWidget *paramw_kw_combo;
   GtkWidget *paramw_sp_combo;
-  GtkWidget *paramw_spsub_label;
   GtkWidget *paramw_spsub_combo;
   GtkWidget *paramw_rest_label;
-  GtkWidget *bg_label;
+  GtkWidget *hbox_bg;
   GtkWidget *param_strdef_button;
+  GtkWidget *param_strdef_hbox;
   GtkWidget *trigger_when_entry;
   GtkWidget *spinbutton_param_dp;
   GtkWidget *spinbutton_param_group;
@@ -171,6 +171,8 @@
   GtkWidget *spinbutton_param_max;
   GtkWidget *spinbutton_param_step;
   GtkWidget *code_textview;
+  GtkWidget *edit_entry_button;
+  GtkWidget *remove_entry_button;
   GtkWidget *move_up_button;
   GtkWidget *move_down_button;
 
@@ -180,34 +182,34 @@
   gchar *loop_code;
   gchar *post_code;
 
-  gint edit_param;
+  int edit_param;
 
   gchar *reqs[RFXBUILD_MAX_REQ];
-  gint num_reqs;
-  gint onum_reqs;
+  int num_reqs;
+  int onum_reqs;
 
   lives_param_t *params;   ///< store our parameters
   lives_param_t *copy_params;   ///< store our parameters while editing
-  gint num_params; ///< upper limit is RFXBUILD_MAX_PARAMS-1
-  gint onum_params;
+  int num_params; ///< upper limit is RFXBUILD_MAX_PARAMS-1
+  int onum_params;
 
   gchar *paramw_hints[RFXBUILD_MAX_PARAMS];
-  gint num_paramw_hints;  ///< upper limit is RFXBUILD_MAX_PARAMW_HINTS-1
-  gint onum_paramw_hints;
+  int num_paramw_hints;  ///< upper limit is RFXBUILD_MAX_PARAMW_HINTS-1
+  int onum_paramw_hints;
 
   rfx_trigger_t *triggers;
   rfx_trigger_t *copy_triggers; ///< store triggers while editing
-  gint num_triggers;   ///< upper limit is RFXBUILD_MAX_PARAMS, 0 == init
-  gint onum_triggers;
+  int num_triggers;   ///< upper limit is RFXBUILD_MAX_PARAMS, 0 == init
+  int onum_triggers;
 
-  gboolean has_init_trigger;
+  boolean has_init_trigger;
 
   gchar *field_delim;
 
   lives_rfx_builder_mode_t mode;
 
-  gint table_swap_row1;
-  gint table_swap_row2;
+  int table_swap_row1;
+  int table_swap_row2;
 
   gchar *script_name;
   gchar *oname;
@@ -218,7 +220,7 @@
   gulong step_spin_f;
 
   gchar *rfx_version;
-  gint plugin_version;
+  int plugin_version;
 
 } rfx_build_window_t;
 
@@ -232,7 +234,6 @@
 void on_requirements_cancel (GtkButton *, gpointer);
 void on_properties_clicked (GtkButton *, gpointer rfxbuilder);
 void on_properties_ok (GtkButton *, gpointer rfxbuilder);
-void on_properties_cancel (GtkButton *, gpointer);
 void on_params_ok (GtkButton *, gpointer rfxbuilder);
 void on_params_cancel (GtkButton *, gpointer);
 void on_param_window_ok (GtkButton *, gpointer rfxbuilder);
@@ -246,9 +247,9 @@
 
 
 
-GtkWidget * make_param_dialog (gint pnum, rfx_build_window_t *rfxbuilder);
-GtkWidget * make_param_window_dialog (gint hnum, rfx_build_window_t *rfxbuilder);
-GtkWidget * make_trigger_dialog (gint tnum, rfx_build_window_t *rfxbuilder);
+GtkWidget * make_param_dialog (int pnum, rfx_build_window_t *rfxbuilder);
+GtkWidget * make_param_window_dialog (int hnum, rfx_build_window_t *rfxbuilder);
+GtkWidget * make_trigger_dialog (int tnum, rfx_build_window_t *rfxbuilder);
 
 void on_table_add_row (GtkButton *, gpointer rfxbuilder);
 void on_table_edit_row (GtkButton *, gpointer rfxbuilder);
@@ -262,11 +263,12 @@
 void after_param_max_changed (GtkSpinButton *, gpointer rfxbuilder);
 void after_param_def_changed (GtkSpinButton *, gpointer rfxbuilder);
 void after_rfxbuilder_type_toggled (GtkToggleButton *, gpointer rfxbuilder);
-void on_param_type_changed (GtkEntry *, gpointer rfxbuilder);
-void on_paramw_kw_changed (GtkEntry *, gpointer rfxbuilder);
-void on_paramw_sp_changed (GtkEntry *, gpointer rfxbuilder);
-void on_paramw_spsub_changed (GtkEntry *, gpointer rfxbuilder);
-void on_script_status_changed (GtkEntry *, gpointer combo);
+void on_param_type_changed (GtkComboBox *, gpointer rfxbuilder);
+void on_paramw_kw_changed (GtkComboBox *, gpointer rfxbuilder);
+void on_paramw_sp_changed (GtkComboBox *, gpointer rfxbuilder);
+void on_paramw_spsub_changed (GtkComboBox *, gpointer rfxbuilder);
+void populate_script_combo(GtkComboBox *script_combo, lives_rfx_status_t status);
+void on_script_status_changed (GtkComboBox *status_combo, gpointer script_combo);
 
 // fileselectors
 void on_export_rfx_ok (GtkButton *, gchar *script_name);
@@ -277,16 +279,17 @@
 
 // utility functions
 gchar *prompt_for_script_name (const gchar *sname, lives_rfx_status_t status);
-gboolean check_builder_programs (void);
+boolean check_builder_programs (void);
 GList *get_script_list (gshort status);
 
-gboolean perform_rfxbuilder_checks (rfx_build_window_t *);
-gboolean perform_param_checks (rfx_build_window_t *, gint index, gint rows);
+boolean perform_rfxbuilder_checks (rfx_build_window_t *);
+boolean perform_param_checks (rfx_build_window_t *, int index, int rows);
 
 
 // read/write script files
-gboolean rfxbuilder_to_script (rfx_build_window_t *);
-gboolean script_to_rfxbuilder (rfx_build_window_t *, const gchar *script_file);
+boolean rfxbuilder_to_script (rfx_build_window_t *);
+boolean script_to_rfxbuilder (rfx_build_window_t *, const gchar *script_file);
 
-GList *get_script_section (const gchar *section, const gchar *script_file, gboolean strip);
+GList *get_script_section (const gchar *section, const gchar *script_file, boolean strip);
 
+#endif // HAS_LIVES_RFX_BUILDER_H

LiVES-1.6.1.tar.bz2/src/rte_window.c -> LiVES-2.0.3.tar.bz2/src/rte_window.c Changed

@@ -1,6 +1,6 @@
 // rte_window.c
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2012
+// (c) G. Finch 2005 - 2013
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -25,9 +25,6 @@
 #include "effects.h"
 #include "paramwindow.h"
 
-#define RTE_INFO_WIDTH 350
-#define RTE_INFO_HEIGHT 200
-
 static GtkWidget **key_checks;
 static GtkWidget **key_grabs;
 static GtkWidget **mode_radios;
@@ -36,32 +33,35 @@
 static GtkWidget **nlabels;
 static GtkWidget **type_labels;
 static GtkWidget **param_buttons;
+static GtkWidget **conx_buttons;
 static GtkWidget **clear_buttons;
 static GtkWidget **info_buttons;
 static GtkWidget *clear_all_button;
 static GtkWidget *save_keymap_button;
 static GtkWidget *load_keymap_button;
 
+static GtkWidget *datacon_dialog=NULL;
+
 static gulong *ch_fns;
 static gulong *gr_fns;
 static gulong *mode_ra_fns;
 
-static gint keyw=-1,modew=-1;
+static int keyw=-1,modew=-1;
 
 static GList *hash_list;
 static GList *name_list;
 static GList *name_type_list;
 
 
-static gboolean ca_canc;
+static boolean ca_canc;
 
 //////////////////////////////////////////////////////////////////////////////
 
 
-void type_label_set_text (gint key, gint mode) {
+void type_label_set_text (int key, int mode) {
   int modes=rte_getmodespk();
   int idx=key*modes+mode;
-  gchar *type=rte_keymode_get_type(key+1,mode,FALSE);
+  gchar *type=rte_keymode_get_type(key+1,mode);
 
   if (strlen(type)) {
     gtk_label_set_text (GTK_LABEL(type_labels[idx]),g_strdup_printf(_("Type: %s"),type));
@@ -82,12 +82,8 @@
 }
 
 
-void on_rtei_ok_clicked (GtkButton *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
-}
-
 
-gboolean on_clear_all_clicked (GtkButton *button, gpointer user_data) {
+boolean on_clear_all_clicked (GtkButton *button, gpointer user_data) {
   int modes=rte_getmodespk();
   int i,j;
 
@@ -101,8 +97,11 @@
       return FALSE;
     }
 
+  pconx_delete_all();
+  cconx_delete_all();
+
   for (i=0;i<prefs->rte_keys_virtual;i++) {
-    if (rte_window!=NULL) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(key_checks[i]),FALSE);
+    if (rte_window!=NULL) lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[i]),FALSE);
     for (j=modes-1;j>=0;j--) {
       weed_delete_effectkey (i+1,j);
       if (rte_window!=NULL) {
@@ -118,14 +117,16 @@
 }
 
 
-static gboolean save_keymap2_file(gchar *kfname) {
-  int i,j;
+static boolean save_keymap2_file(gchar *kfname) {
+  // save perkey defaults
   int slen;
   int version=1;
   int modes=rte_getmodespk();
   int kfd;
   int retval;
-  gchar *hashname;
+  int i,j;
+
+  gchar *hashname,*tmp;
 
   do {
     retval=0;
@@ -143,7 +144,9 @@
 	for (j=0;j<modes;j++) {
 	  if (rte_keymode_valid(i,j,TRUE)) {
 	    lives_write_le(kfd,&i,4,TRUE);
-	    hashname=g_strdup_printf("Weed%s",make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE));
+	    if (mainw->write_failed) break;
+	    hashname=g_strdup_printf("Weed%s",(tmp=make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE,FALSE)));
+	    g_free(tmp);
 	    slen=strlen(hashname);
 	    lives_write_le(kfd,&slen,4,TRUE);
 	    lives_write(kfd,hashname,slen,TRUE);
@@ -167,7 +170,200 @@
 }
 
 
-gboolean on_save_keymap_clicked (GtkButton *button, gpointer user_data) {
+
+static boolean save_keymap3_file(gchar *kfname) {
+  // save data connections
+
+  gchar *hashname;
+
+  int version=1;
+
+  int slen;
+  int kfd;
+  int retval;
+  int count=0,totcons=0,nconns;
+
+  register int i,j=0;
+
+  do {
+    retval=0;
+    kfd=creat(kfname,S_IRUSR|S_IWUSR);
+    if (kfd==-1) {
+      retval=do_write_failed_error_s_with_retry (kfname,g_strerror(errno),GTK_WINDOW(rte_window));
+    }
+    else {
+      mainw->write_failed=FALSE;
+      
+      lives_write_le(kfd,&version,4,TRUE);
+
+
+      if (mainw->cconx!=NULL) {
+	lives_cconnect_t *cconx=mainw->cconx;
+	int nchans;
+
+	while (cconx!=NULL) {
+	  count++;
+	  cconx=cconx->next;
+	}
+
+	lives_write_le(kfd,&count,4,TRUE);
+	if (mainw->write_failed) goto write_failed1;
+
+	cconx=mainw->cconx;
+	while (cconx!=NULL) {
+	  lives_write_le(kfd,&cconx->okey,4,TRUE);
+	  if (mainw->write_failed) goto write_failed1;
+
+	  lives_write_le(kfd,&cconx->omode,4,TRUE);
+	  if (mainw->write_failed) goto write_failed1;
+
+	  hashname=make_weed_hashname(rte_keymode_get_filter_idx(cconx->okey+1,cconx->omode),TRUE,FALSE);
+	  slen=strlen(hashname);
+	  lives_write_le(kfd,&slen,4,TRUE);
+	  lives_write(kfd,hashname,slen,TRUE);
+	  g_free(hashname);
+
+	  nchans=cconx->nchans;
+	  lives_write_le(kfd,&nchans,4,TRUE);
+	  if (mainw->write_failed) goto write_failed1;
+
+	  for (i=0;i<nchans;i++) {
+	    lives_write_le(kfd,&cconx->chans[i],4,TRUE);
+	    if (mainw->write_failed) goto write_failed1;
+
+	    nconns=cconx->nconns[i];
+	    lives_write_le(kfd,&nconns,4,TRUE);
+	    if (mainw->write_failed) goto write_failed1;
+
+	    totcons+=nconns;
+
+	    while (j<totcons) {
+	      lives_write_le(kfd,&cconx->ikey[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+
+	      lives_write_le(kfd,&cconx->imode[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+	      
+	      hashname=make_weed_hashname(rte_keymode_get_filter_idx(cconx->ikey[j]+1,cconx->imode[j]),TRUE,FALSE);
+	      slen=strlen(hashname);
+	      lives_write_le(kfd,&slen,4,TRUE);
+	      lives_write(kfd,hashname,slen,TRUE);
+	      g_free(hashname);
+
+	      lives_write_le(kfd,&cconx->icnum[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+
+	      j++;
+	    }
+
+	  }
+
+	  cconx=cconx->next;
+	}
+      }
+      else {
+	lives_write_le(kfd,&count,4,TRUE);
+	if (mainw->write_failed) goto write_failed1;
+      }
+
+
+      if (mainw->pconx!=NULL) {
+	lives_pconnect_t *pconx=mainw->pconx;
+
+	int nparams;
+
+	totcons=0;
+	count=0;
+	j=0;
+
+	while (pconx!=NULL) {
+	  count++;
+	  pconx=pconx->next;
+	}
+
+	lives_write_le(kfd,&count,4,TRUE);
+	if (mainw->write_failed) goto write_failed1;
+
+	pconx=mainw->pconx;
+	while (pconx!=NULL) {
+	  lives_write_le(kfd,&pconx->okey,4,TRUE);
+	  if (mainw->write_failed) goto write_failed1;
+
+	  lives_write_le(kfd,&pconx->omode,4,TRUE);
+	  if (mainw->write_failed) goto write_failed1;
+
+	  hashname=make_weed_hashname(rte_keymode_get_filter_idx(pconx->okey+1,pconx->omode),TRUE,FALSE);
+	  slen=strlen(hashname);
+	  lives_write_le(kfd,&slen,4,TRUE);
+	  lives_write(kfd,hashname,slen,TRUE);
+	  g_free(hashname);
+
+	  nparams=pconx->nparams;
+	  lives_write_le(kfd,&nparams,4,TRUE);
+	  if (mainw->write_failed) goto write_failed1;
+
+	  for (i=0;i<nparams;i++) {
+	    lives_write_le(kfd,&pconx->params[i],4,TRUE);
+	    if (mainw->write_failed) goto write_failed1;
+
+	    nconns=pconx->nconns[i];
+	    lives_write_le(kfd,&nconns,4,TRUE);
+	    if (mainw->write_failed) goto write_failed1;
+
+	    totcons+=nconns;
+
+	    while (j<totcons) {
+	      lives_write_le(kfd,&pconx->ikey[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+
+	      lives_write_le(kfd,&pconx->imode[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+
+	      hashname=make_weed_hashname(rte_keymode_get_filter_idx(pconx->ikey[j]+1,pconx->imode[j]),TRUE,FALSE);
+	      slen=strlen(hashname);
+	      lives_write_le(kfd,&slen,4,TRUE);
+	      lives_write(kfd,hashname,slen,TRUE);
+	      g_free(hashname);
+
+	      lives_write_le(kfd,&pconx->ipnum[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+
+	      lives_write_le(kfd,&pconx->autoscale[j],4,TRUE);
+	      if (mainw->write_failed) goto write_failed1;
+
+	      j++;
+	    }
+
+	  }
+
+	  pconx=pconx->next;
+	}
+
+      }
+      else {
+	lives_write_le(kfd,&count,4,TRUE);
+	if (mainw->write_failed) goto write_failed1;
+      }
+
+
+    write_failed1:
+      close(kfd);
+      
+      if (mainw->write_failed) {
+	retval=do_write_failed_error_s_with_retry(kfname,NULL,GTK_WINDOW(rte_window));
+	mainw->write_failed=FALSE;
+      }
+    }
+  } while (retval==LIVES_RETRY);
+
+  if (retval==LIVES_CANCEL) return FALSE;
+  return TRUE;
+
+}
+
+
+
+static boolean on_save_keymap_clicked (GtkButton *button, gpointer user_data) {
   // save as keymap type 1 file - to allow backwards compatibility with older versions of LiVES
   // default.keymap
 
@@ -182,22 +378,27 @@
   // format is binary
   // (4 bytes key) (4 bytes hlen) (hlen bytes hashname) then a dump of the weed plant default values
 
+  // if we have data connections, we will save a third file
 
-  int modes=rte_getmodespk();
-  int i,j;
-  int retval;
 
   FILE *kfile;
-  gchar *msg,*tmp;
   GList *list=NULL;
-  gboolean update=FALSE;
 
+  gchar *msg,*tmp;
   gchar *keymap_file=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
   gchar *keymap_file2=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap2",NULL);
+  gchar *keymap_file3=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap3",NULL);
+
+  boolean update=FALSE;
+
+  int modes=rte_getmodespk();
+  int i,j;
+  int retval;
  
   if (button!=NULL) {
     if (!do_warning_dialog_with_check_transient
 	((_("\n\nClick 'OK' to save this keymap as your default\n\n")),0,GTK_WINDOW(rte_window))) {
+      g_free(keymap_file3);
       g_free(keymap_file2);
       g_free(keymap_file);
       return FALSE;
@@ -228,7 +429,8 @@
 	for (i=1;i<=prefs->rte_keys_virtual;i++) {
 	  for (j=0;j<modes;j++) {
 	    if (rte_keymode_valid(i,j,TRUE)) {
-	      lives_fputs(g_strdup_printf("%d|Weed%s\n",i,make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE)),kfile);
+	      lives_fputs(g_strdup_printf("%d|Weed%s\n",i,(tmp=make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE,FALSE))),kfile);
+	      g_free(tmp);
 	    }
 	  }
 	}
@@ -257,6 +459,18 @@
   }
   else unlink(keymap_file2);
 
+
+  // if we have data connections, save them
+  if (mainw->pconx!=NULL||mainw->cconx!=NULL) {
+    if (!save_keymap3_file(keymap_file3)) {
+      unlink(keymap_file3);
+      retval=LIVES_CANCEL;
+    }
+  }
+  else unlink(keymap_file3);
+
+
+  g_free(keymap_file3);
   g_free(keymap_file2);
   g_free(keymap_file);
 
@@ -272,7 +486,7 @@
 void on_save_rte_defs_activate (GtkMenuItem *menuitem, gpointer user_data) {
   int fd,i;
   int retval;
-  gint numfx;
+  int numfx;
   gchar *msg;
 
   if (prefs->fxdefsfile==NULL) {
@@ -287,7 +501,7 @@
   d_print(msg);
   g_free(msg);
 
-  numfx=rte_get_numfilters();
+  numfx=rte_get_numfilters(FALSE);
 
   do {
     retval=0;
@@ -297,6 +511,9 @@
       g_free (msg);
     }
     else {
+#ifdef IS_MINGW
+      setmode(fd, O_BINARY);
+#endif
       msg=g_strdup("LiVES filter defaults file version 1.1\n");
       mainw->write_failed=FALSE;
       lives_write(fd,msg,strlen(msg),TRUE);
@@ -328,6 +545,9 @@
       g_free (msg);
     }
     else {
+#ifdef IS_MINGW
+      setmode(fd, O_BINARY);
+#endif
       msg=g_strdup("LiVES generator default sizes file version 2\n");
       mainw->write_failed=FALSE;
       lives_write(fd,msg,strlen(msg),TRUE);
@@ -379,6 +599,9 @@
 	retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,g_strerror(errno),NULL);
       }
       else {
+#ifdef IS_MINGW
+	setmode(fd, O_BINARY);
+#endif
 	mainw->read_failed=FALSE;
 	msg2=g_strdup_printf(_("Loading real time effect defaults from %s..."),prefs->fxdefsfile);
 	d_print(msg2);
@@ -426,6 +649,9 @@
 	if (retval==LIVES_CANCEL) return;
       }
       else {
+#ifdef IS_MINGW
+	setmode(fd, O_BINARY);
+#endif
 	msg2=g_strdup_printf(_("Loading generator default sizes from %s..."),prefs->fxsizesfile);
 	d_print(msg2);
 	g_free(msg2);
@@ -460,47 +686,505 @@
 }
 
 
-static void check_clear_all_button (void) {
-  int modes=rte_getmodespk();
-  int i,j;
-  gboolean hasone=FALSE;
+static void check_clear_all_button (void) {
+  int modes=rte_getmodespk();
+  int i,j;
+  boolean hasone=FALSE;
+
+  for (i=0;i<prefs->rte_keys_virtual;i++) {
+    for (j=modes-1;j>=0;j--) {
+      if (rte_keymode_valid(i+1,j,TRUE)) hasone=TRUE;
+    }
+  }
+
+  gtk_widget_set_sensitive (GTK_WIDGET(clear_all_button), hasone);
+}
+
+
+
+
+static boolean read_perkey_defaults(int kfd, int key, int mode, int version) {
+  boolean ret=TRUE;
+  int nparams;
+  ssize_t bytes=lives_read_le(kfd,&nparams,4,TRUE);
+
+  if (nparams>65536) {
+    g_printerr("Too many params, file is probably broken.\n");
+    return FALSE;
+  }
+
+  if (bytes<sizint) {
+    return FALSE;
+  }
+
+  if (nparams>0) {
+    ret=read_key_defaults(kfd,nparams,key,mode,version);
+  }
+  return ret;
+}
+
+
+
+
+static boolean load_datacons(const gchar *fname, uint8_t **badkeymap) {
+  weed_plant_t **ochans,**ichans,**iparams;
+
+  weed_plant_t *filter;
+
+  ssize_t bytes;
+
+  gchar *hashname;
+
+  boolean ret=TRUE;
+  boolean is_valid,is_valid2;
+  boolean eof=FALSE;
+
+  int kfd;
+
+  int retval;
+
+  int hlen;
+
+  int version,nchans,nparams,nconns,ncconx,npconx;
+
+  int nichans,nochans,niparams,noparams,error;
+
+  int okey,omode,ocnum,opnum,ikey,imode,icnum,ipnum,autoscale;
+
+  int maxmodes=rte_getmodespk();
+
+  register int i,j,k,count;
+  
+
+  
+  do {
+    retval=0;
+    if ((kfd=open(fname,O_RDONLY))==-1) {
+      retval=do_read_failed_error_s_with_retry(fname,g_strerror(errno),NULL);
+    }
+    else {
+#ifdef IS_MINGW
+      setmode(fd, O_BINARY);
+#endif
+      mainw->read_failed=FALSE;
+
+      bytes=lives_read_le(kfd,&version,4,TRUE);
+      if (bytes<4) {
+	eof=TRUE;
+	break;
+      }
+
+      bytes=lives_read_le(kfd,&ncconx,4,TRUE);
+      if (bytes<4) {
+	eof=TRUE;
+	break;
+      }
+
+      for (count=0;count<ncconx;count++) {
+	is_valid=TRUE;
+
+	bytes=lives_read_le(kfd,&okey,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	if (okey<0||okey>=prefs->rte_keys_virtual) is_valid=FALSE;
+
+	bytes=lives_read_le(kfd,&omode,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	  
+	bytes=lives_read_le(kfd,&hlen,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+	  
+	hashname=(gchar *)g_try_malloc(hlen+1);
+
+	if (hashname==NULL) {
+	  eof=TRUE;
+	  break;
+	}
+
+	bytes=read(kfd,hashname,hlen);
+	if (bytes<hlen) {
+	  eof=TRUE;
+	  g_free(hashname);
+	  break;
+	}
+	  
+	memset(hashname+hlen,0,1);
+	  
+	  
+	// if we had bad/missing fx, adjust the omode value
+	for (i=0;i<omode;i++) omode-=badkeymap[okey][omode];
+
+	if (omode<0||omode>maxmodes) is_valid=FALSE;
+
+
+	if (is_valid) {
+	  int fidx=rte_keymode_get_filter_idx(okey+1,omode);
+	  if (fidx==-1) is_valid=FALSE;
+	  else {
+	    gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+	    if (strcmp(hashname,hashname2)) is_valid=FALSE;
+	    g_free(hashname2);
+	    if (!is_valid) {
+	      hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+	      if (!strcmp(hashname,hashname2)) is_valid=TRUE;
+	      g_free(hashname2);
+	    }
+	  }
+	}
+
+	g_free(hashname);
+
+	bytes=lives_read_le(kfd,&nchans,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	for (i=0;i<nchans;i++) {
+	  is_valid2=is_valid;
+
+	  bytes=lives_read_le(kfd,&ocnum,4,TRUE);
+	  if (bytes<4) {
+	    eof=TRUE;
+	    break;
+	  }
+
+	  // check ocnum
+	  filter=rte_keymode_get_filter(okey+1,omode);
+	  nochans=weed_leaf_num_elements(filter,"out_channel_templates");
+	  if (ocnum>=nochans) is_valid2=FALSE;
+	  else {
+	    ochans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+	    if (!has_alpha_palette(ochans[ocnum])) is_valid2=FALSE;
+	    weed_free(ochans);
+	  }
+
+	  bytes=lives_read_le(kfd,&nconns,4,TRUE);
+	  if (bytes<4) {
+	    eof=TRUE;
+	    break;
+	  }
+
+	  for (j=0;j<nconns;j++) {
+	    bytes=lives_read_le(kfd,&ikey,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    bytes=lives_read_le(kfd,&imode,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    bytes=lives_read_le(kfd,&hlen,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+	      
+	    hashname=(gchar *)g_try_malloc(hlen+1);
+
+	    if (hashname==NULL) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    bytes=read(kfd,hashname,hlen);
+	    if (bytes<hlen) {
+	      eof=TRUE;
+	      g_free(hashname);
+	      break;
+	    }
+	      
+	    memset(hashname+hlen,0,1);
+	  
+	      
+	    // if we had bad/missing fx, adjust the omode value
+	    for (k=0;k<imode;k++) imode-=badkeymap[ikey][imode];
+
+	    if (imode<0||imode>maxmodes) is_valid2=FALSE;
+
+
+	    if (is_valid2) {
+	      int fidx=rte_keymode_get_filter_idx(ikey+1,imode);
+	      if (fidx==-1) is_valid2=FALSE;
+	      else {
+		gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+		if (strcmp(hashname,hashname2)) is_valid2=FALSE;
+		g_free(hashname2);
+		if (!is_valid2) {
+		  hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+		  if (!strcmp(hashname,hashname2)) is_valid2=TRUE;
+		  g_free(hashname2);
+		}
+	      }
+	    }
+
+	    g_free(hashname);
+
+	    bytes=lives_read_le(kfd,&icnum,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    // check icnum
+	    filter=rte_keymode_get_filter(ikey+1,imode);
+	    nichans=weed_leaf_num_elements(filter,"in_channel_templates");
+	    if (icnum>=nichans) is_valid2=FALSE;
+	    else {
+	      ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+	      if (!has_alpha_palette(ichans[icnum])) is_valid2=FALSE;
+	      weed_free(ichans);
+	    }
+
+
+
+	    if (is_valid2) cconx_add_connection(okey,omode,ocnum,ikey,imode,icnum);
+
+
+
+	  }
+
+	  if (eof) break;
+
+
+	}
+
+	if (eof) break;
+
+
+      }
+
+      if (eof) break;
+
+      // params
+
+
+
+      bytes=lives_read_le(kfd,&npconx,4,TRUE);
+      if (bytes<4) {
+	eof=TRUE;
+	break;
+      }
+
+      for (count=0;count<npconx;count++) {
+	is_valid=TRUE;
+
+	bytes=lives_read_le(kfd,&okey,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	if (okey<0||okey>=prefs->rte_keys_virtual) is_valid=FALSE;
+
+	bytes=lives_read_le(kfd,&omode,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	  
+	bytes=lives_read_le(kfd,&hlen,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	hashname=(gchar *)g_try_malloc(hlen+1);
+
+	if (hashname==NULL) {
+	  eof=TRUE;
+	  break;
+	}
+
+	bytes=read(kfd,hashname,hlen);
+	if (bytes<hlen) {
+	  eof=TRUE;
+	  g_free(hashname);
+	  break;
+	}
+	  
+	memset(hashname+hlen,0,1);
+	  
+	  
+	// if we had bad/missing fx, adjust the omode value
+	for (i=0;i<omode;i++) omode-=badkeymap[okey][omode];
+
+	if (omode<0||omode>maxmodes) is_valid=FALSE;
+
+
+	if (is_valid) {
+	  int fidx=rte_keymode_get_filter_idx(okey+1,omode);
+	  if (fidx==-1) is_valid=FALSE;
+	  else {
+	    gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+	    if (strcmp(hashname,hashname2)) is_valid=FALSE;
+	    g_free(hashname2);
+	    if (!is_valid) {
+	      hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+	      if (!strcmp(hashname,hashname2)) is_valid=TRUE;
+	      g_free(hashname2);
+	    }
+	  }
+	}
+
+	g_free(hashname);
+
+	bytes=lives_read_le(kfd,&nparams,4,TRUE);
+	if (bytes<4) {
+	  eof=TRUE;
+	  break;
+	}
+
+	for (i=0;i<nparams;i++) {
+	  is_valid2=is_valid;
+
+	  bytes=lives_read_le(kfd,&opnum,4,TRUE);
+	  if (bytes<4) {
+	    eof=TRUE;
+	    break;
+	  }
+
+	  // check opnum
+	  filter=rte_keymode_get_filter(okey+1,omode);
+	  noparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+	  if (opnum>=noparams) is_valid2=FALSE;
+
+	  bytes=lives_read_le(kfd,&nconns,4,TRUE);
+	  if (bytes<4) {
+	    eof=TRUE;
+	    break;
+	  }
+
+	  for (j=0;j<nconns;j++) {
+	    bytes=lives_read_le(kfd,&ikey,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    bytes=lives_read_le(kfd,&imode,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    bytes=lives_read_le(kfd,&hlen,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+	      
+	    hashname=(gchar *)g_try_malloc(hlen+1);
+
+	    if (hashname==NULL) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    bytes=read(kfd,hashname,hlen);
+	    if (bytes<hlen) {
+	      eof=TRUE;
+	      g_free(hashname);
+	      break;
+	    }
+	      
+	    memset(hashname+hlen,0,1);
+	  
+	    // if we had bad/missing fx, adjust the omode value
+	    for (k=0;k<imode;k++) imode-=badkeymap[ikey][imode];
+
+	    if (imode<0||imode>maxmodes) is_valid2=FALSE;
+
+	    if (is_valid2) {
+	      int fidx=rte_keymode_get_filter_idx(ikey+1,imode);
+	      if (fidx==-1) is_valid2=FALSE;
+	      else {
+		gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+		if (strcmp(hashname,hashname2)) is_valid2=FALSE;
+		g_free(hashname2);
+		if (!is_valid2) {
+		  hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+		  if (!strcmp(hashname,hashname2)) is_valid2=TRUE;
+		  g_free(hashname2);
+		}
+	      }
+	    }
+
+	    g_free(hashname);
+
+	    bytes=lives_read_le(kfd,&ipnum,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    // check ipnum
+	    filter=rte_keymode_get_filter(ikey+1,imode);
+	    niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+	    if (ipnum>=niparams) is_valid2=FALSE;
+	    else {
+	      iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+	      if (weed_plant_has_leaf(iparams[ipnum],"host_internal_connection")) is_valid2=FALSE;
+	      weed_free(iparams);
+	    }
+
+	    bytes=lives_read_le(kfd,&autoscale,4,TRUE);
+	    if (bytes<4) {
+	      eof=TRUE;
+	      break;
+	    }
+
+	    if (is_valid2) {
+	      pconx_add_connection(okey,omode,opnum,ikey,imode,ipnum,autoscale);
+	    }
+
+
+	  }
 
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
-    for (j=modes-1;j>=0;j--) {
-      if (rte_keymode_valid(i+1,j,TRUE)) hasone=TRUE;
-    }
-  }
+	  if (eof) break;
 
-  gtk_widget_set_sensitive (GTK_WIDGET(clear_all_button), hasone);
-}
 
+	}
 
+	if (eof) break;
 
 
-static gboolean read_perkey_defaults(int kfd, int key, int mode, int version) {
-  gboolean ret=TRUE;
-  int nparams;
-  ssize_t bytes=lives_read_le(kfd,&nparams,4,TRUE);
+      }
 
-  if (nparams>65536) {
-    g_printerr("Too many params, file is probably broken.\n");
-    return FALSE;
-  }
 
-  if (bytes<sizint) {
+
+
+      close(kfd);
+	
+    }
+  } while (retval==LIVES_RETRY);
+
+  if (retval==LIVES_CANCEL) {
+    d_print_cancelled();
     return FALSE;
   }
 
-  if (nparams>0) {
-    ret=read_key_defaults(kfd,nparams,key,mode,version);
-  }
   return ret;
 }
 
 
 
-
-gboolean on_load_keymap_clicked (GtkButton *button, gpointer user_data) {
+boolean on_load_keymap_clicked (GtkButton *button, gpointer user_data) {
   // show file errors at this level
   FILE *kfile=NULL;
 
@@ -519,23 +1203,25 @@
 
   gchar *keymap_file=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
   gchar *keymap_file2=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap2",NULL);
+  gchar *keymap_file3=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap3",NULL);
 
   int *def_modes;
+  uint8_t **badkeymap;
+
+  boolean notfound=FALSE;
+  boolean has_error=FALSE;
+  boolean eof=FALSE;
 
   int modes=rte_getmodespk();
-  int i;
   int kfd=-1;
   int version;
   int hlen;
   int retval;
 
-  gint key,mode;
-  gint update=0;
-
-  gboolean notfound=FALSE;
-  gboolean has_error=FALSE;
-  gboolean eof=FALSE;
+  int key,mode;
+  int update=0;
 
+  register int i;
 
   def_modes=(int *)g_malloc(prefs->rte_keys_virtual*sizint);
   for (i=0;i<prefs->rte_keys_virtual;i++) def_modes[i]=-1;
@@ -558,6 +1244,12 @@
 
     if (keymap_file2!=NULL) {
       if ((kfd=open(keymap_file,O_RDONLY))==-1) has_error=TRUE;
+#ifdef IS_MINGW
+      else {
+	setmode(kfd, O_BINARY);
+      }
+#endif
+
     }
     else {
       if (!(kfile=fopen (keymap_file,"r"))) {
@@ -589,11 +1281,18 @@
     return FALSE;
   }
 
+
+  badkeymap=(uint8_t **)g_malloc(prefs->rte_keys_virtual*sizeof(uint8_t *));
+  for (i=0;i<prefs->rte_keys_virtual;i++) {
+    badkeymap[i]=(uint8_t *)lives_calloc(modes,1);
+  }
+
+
   if (keymap_file2==NULL) {
     // version 1 file
     while (fgets(buff,65536,kfile)) {
-      if (buff!=NULL) {
-	line=(g_strchomp (g_strchug(buff)));
+      if (strlen(buff)) {
+	line=(g_strstrip(buff));
 	if ((linelen=strlen (line))) {
 	  whole2=g_strconcat (whole,line,NULL);
 	  if (whole2!=whole) g_free (whole);
@@ -675,7 +1374,6 @@
       // newer style
 
       // file format is: (4 bytes int)key(4 bytes int)hlen(hlen bytes)hashname
-      // TODO - ensure le format !
 
       //read key and hashname
       bytes=lives_read_le(kfd,&key,4,TRUE);
@@ -690,7 +1388,12 @@
 	break;
       }
 
-      hashname=(gchar *)g_malloc(hlen+1);
+      hashname=(gchar *)g_try_malloc(hlen+1);
+
+      if (hashname==NULL) {
+	eof=TRUE;
+	break;
+      }
 
       bytes=read(kfd,hashname,hlen);
       if (bytes<hlen) {
@@ -729,6 +1432,7 @@
       g_free(tmp);
       notfound=TRUE;
       g_free(hashname);
+      badkeymap[key-1][def_modes[key-1]]++;
       if (keymap_file2!=NULL) {
 	// read param defaults
 	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
@@ -747,6 +1451,7 @@
       g_free(tmp);
       notfound=TRUE;
       g_free(hashname);
+      badkeymap[key-1][def_modes[key-1]]++;
       if (keymap_file2!=NULL) {
 	// read param defaults
 	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
@@ -762,6 +1467,7 @@
 	       (_("This version of LiVES cannot mix generators/non-generators on the same key (%d) !\n"),key)));
       LIVES_ERROR(tmp);
       g_free(tmp);
+      badkeymap[key-1][def_modes[key-1]]++;
       if (keymap_file2!=NULL) {
 	// read param defaults
 	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
@@ -792,7 +1498,6 @@
     }
   }
 
-  g_free(keymap_file);
 
   if (keymap_file2==NULL) {
     g_list_free_strings(list);
@@ -807,18 +1512,40 @@
     }
     else d_print_done();
   }
-
   else {
     if (kfd!=-1) close(kfd);
     d_print_done();
   }
 
-  if (mainw->is_ready) {
-    check_clear_all_button();
-    if (notfound) do_warning_dialog_with_check_transient(_("\n\nSome effects could not be located.\n\n"),
-							 0,GTK_WINDOW(rte_window));
+  if (update==0) {
+    if (g_file_test(keymap_file3,G_FILE_TEST_EXISTS)) {
+
+      msg=g_strdup_printf(_("Loading data connection map from %s..."),keymap_file3);
+      d_print(msg);
+      g_free(msg);
+
+      if (load_datacons(keymap_file3,badkeymap)) d_print_done();
+    }
+    
+    if (mainw->is_ready) {
+      check_clear_all_button();
+      if (notfound) do_warning_dialog_with_check_transient(_("\n\nSome effects could not be located.\n\n"),
+							   0,GTK_WINDOW(rte_window));
+    }
+    else load_rte_defs(); // file errors shown inside
+
+  }
+
+  for (i=0;i<prefs->rte_keys_virtual;i++) {
+    g_free(badkeymap[i]);
   }
-  else load_rte_defs(); // file errors shown inside
+
+  g_free(badkeymap);
+
+  g_free(keymap_file); // frees keymap_file2 if applicable
+
+  g_free(keymap_file3);
+
   g_free(def_modes);
 
   return FALSE;
@@ -827,16 +1554,8 @@
 
 
 
-void 
-on_rte_info_clicked (GtkButton *button, gpointer user_data) {
-  gint key_mode=GPOINTER_TO_INT(user_data);
-  int modes=rte_getmodespk();
-  gint key=(gint)(key_mode/modes);
-  gint mode=key_mode-key*modes;
-
-  gchar *type;
+void on_rte_info_clicked (GtkButton *button, gpointer user_data) {
   weed_plant_t *filter;
-  gchar *plugin_name;
 
   GtkWidget *rte_info_window;
   GtkWidget *vbox;
@@ -844,33 +1563,37 @@
   GtkWidget *label;
   GtkWidget *textview;
 
-  GtkTextBuffer *textbuffer;
-
   GtkWidget *hbuttonbox;
   GtkWidget *ok_button;
 
   gchar *filter_name;
   gchar *filter_author;
+  gchar *filter_extra_authors=NULL;
   gchar *filter_description;
+  gchar *tmp;
+  gchar *type;
+  gchar *plugin_name;
+
   int filter_version;
   int weed_error;
 
-  lives_fx_cat_t cat;
+  int key_mode=GPOINTER_TO_INT(user_data);
+  int modes=rte_getmodespk();
+  int key=(int)(key_mode/modes);
+  int mode=key_mode-key*modes;
+
 
   ////////////////////////
 
   if (!rte_keymode_valid(key+1,mode,TRUE)) return;
 
-  cat=rte_keymode_get_category(key+1,mode);
-  if (cat!=LIVES_FX_CAT_TRANSITION) {
-    type=rte_keymode_get_type(key+1,mode,TRUE);
-  }
-  else type=rte_keymode_get_type(key+1,mode,FALSE);
+  type=rte_keymode_get_type(key+1,mode);
 
   plugin_name=rte_keymode_get_plugin_name(key+1,mode);
   filter=rte_keymode_get_filter(key+1,mode);
   filter_name=weed_get_string_value(filter,"name",&weed_error);
   filter_author=weed_get_string_value(filter,"author",&weed_error);
+  if (weed_plant_has_leaf(filter,"extra_authors")) filter_extra_authors=weed_get_string_value(filter,"extra_authors",&weed_error);
   if (weed_plant_has_leaf(filter,"description")) filter_description=weed_get_string_value(filter,"description",&weed_error);
   else filter_description=g_strdup(_("No Description"));
 
@@ -878,111 +1601,88 @@
 
   rte_info_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (rte_info_window), g_strdup_printf(_("LiVES: Information for %s"),filter_name));
-  gtk_widget_modify_bg(rte_info_window, GTK_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(rte_info_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-  gtk_container_set_border_width (GTK_CONTAINER (rte_info_window), 40);
+  gtk_container_set_border_width (GTK_CONTAINER (rte_info_window), widget_opts.border_width);
   gtk_window_set_transient_for(GTK_WINDOW(rte_info_window),GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button))));
   gtk_window_set_position (GTK_WINDOW (rte_info_window), GTK_WIN_POS_CENTER_ALWAYS);
   gtk_window_set_default_size (GTK_WINDOW (rte_info_window), RTE_INFO_WIDTH, RTE_INFO_HEIGHT);
 
-  gtk_widget_show(rte_info_window);
-
-  vbox = gtk_vbox_new (FALSE, 20);
-  gtk_widget_show (vbox);
+  vbox = lives_vbox_new (FALSE, widget_opts.packing_height*2);
   gtk_container_add (GTK_CONTAINER (rte_info_window), vbox);
 
-  label = gtk_label_new (g_strdup_printf(_("Effect name: %s"),filter_name));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-    
-  gtk_widget_show (label);
+  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Effect name: %s"),filter_name)));
+  g_free(tmp);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
-  label = gtk_label_new (g_strdup_printf(_("Type: %s"),type));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  gtk_widget_show (label);
+  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Type: %s"),type)));
+  g_free(tmp);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
-  label = gtk_label_new (g_strdup_printf(_("Plugin name: %s"),plugin_name));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  gtk_widget_show (label);
+  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Plugin name: %s"),plugin_name)));
+  g_free(tmp);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
-  label = gtk_label_new (g_strdup_printf(_("Author: %s"),filter_author));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
-  gtk_widget_show (label);
+  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Author: %s"),filter_author)));
+  g_free(tmp);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
-  label = gtk_label_new (g_strdup_printf(_("Version: %d"),filter_version));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+  if (filter_extra_authors!=NULL) {
+    label = lives_standard_label_new ((tmp=g_strdup_printf(_("and: %s"),filter_extra_authors)));
+    g_free(tmp);
+    gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
   }
 
-  gtk_widget_show (label);
+  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Version: %d"),filter_version)));
+  g_free(tmp);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 10);
-  gtk_widget_show (hbox);
+  hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
 
-  label = gtk_label_new (_("Description: "));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_widget_show (label);
+  label = lives_standard_label_new (_("Description: "));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
   textview = gtk_text_view_new ();
-  gtk_widget_show (textview);
 
   if (palette->style&STYLE_1) {
-    gtk_widget_modify_text(textview, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_base(textview, GTK_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
-
-
-  textbuffer=gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
   
   gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
   gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview), FALSE);
   
-  gtk_text_buffer_set_text (textbuffer, filter_description, -1);
+  text_view_set_text (LIVES_TEXT_VIEW(textview), filter_description,-1);
   gtk_box_pack_start (GTK_BOX (hbox), textview, TRUE, TRUE, 0);
   
-  hbuttonbox = gtk_hbutton_box_new ();
-  gtk_widget_show (hbuttonbox);
+  hbuttonbox = lives_hbutton_box_new ();
   gtk_box_pack_start (GTK_BOX (vbox), hbuttonbox, TRUE, TRUE, 0);
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
 
   ok_button = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (ok_button);
 
   gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
-  GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (ok_button);
   gtk_widget_grab_default (ok_button);
 
+  set_button_width(hbuttonbox,ok_button,DEF_BUTTON_WIDTH);
+
   g_signal_connect (GTK_OBJECT (ok_button), "clicked",
-		    G_CALLBACK (on_rtei_ok_clicked),
+		    G_CALLBACK (lives_general_button_clicked),
 		    NULL);
 
   g_free(filter_name);
   g_free(filter_author);
+  if (filter_extra_authors!=NULL) g_free(filter_extra_authors);
   if (weed_plant_has_leaf(filter,"description")) g_free(filter_description);
   else weed_free(filter_description);
   g_free(plugin_name);
   g_free(type);
+
+  gtk_widget_show_all(rte_info_window);
+
 }
 
 
@@ -994,13 +1694,22 @@
 
   gint idx=GPOINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
-  gint key=(gint)(idx/modes);
-  gint mode=idx-key*modes;
+  int key=(int)(idx/modes);
+  int mode=idx-key*modes;
+
+  int newmode;
 
-  int i,newmode;
+  register int i;
 
   weed_delete_effectkey (key+1,mode);
 
+  pconx_delete(-1,0,0,key,mode,-1);
+  pconx_delete(key,mode,-1,-1,0,0);
+
+  cconx_delete(-1,0,0,key,mode,-1);
+  cconx_delete(key,mode,-1,-1,0,0);
+
+
   newmode=rte_key_getmode(key+1);
   g_signal_handler_block(mode_radios[key*modes+newmode],mode_ra_fns[key*modes+newmode]);
   rtew_set_mode_radio(key,newmode);
@@ -1010,6 +1719,8 @@
     idx=key*modes+i;
     gtk_entry_set_text (GTK_ENTRY(combo_entries[idx]),gtk_entry_get_text(GTK_ENTRY(combo_entries[idx+1])));
     type_label_set_text(key,i);
+    pconx_remap_mode(key,i+1,i);
+    cconx_remap_mode(key,i+1,i);
   }
   idx++;
   gtk_entry_set_text (GTK_ENTRY(combo_entries[idx]),"");
@@ -1022,11 +1733,24 @@
 }
 
 
-void on_params_clicked (GtkButton *button, gpointer user_data) {
+static void on_datacon_clicked (GtkButton *button, gpointer user_data) {
+  gint idx=GPOINTER_TO_INT(user_data);
+  int modes=rte_getmodespk();
+  int key=(int)(idx/modes);
+  int mode=idx-key*modes;
+
+  //if (datacon_dialog!=NULL) on_datacon_cancel_clicked(NULL,NULL);
+
+  datacon_dialog=make_datacon_window(key,mode);
+
+}
+
+
+static void on_params_clicked (GtkButton *button, gpointer user_data) {
   gint idx=GPOINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
-  gint key=(gint)(idx/modes);
-  gint mode=idx-key*modes;
+  int key=(int)(idx/modes);
+  int mode=idx-key*modes;
 
   weed_plant_t *inst;
   lives_rfx_t *rfx;
@@ -1037,7 +1761,14 @@
     inst=weed_instance_from_filter(filter);
     apply_key_defaults(inst,key,mode);
   }
-  else weed_instance_ref(inst);
+  else {
+    int error;
+    weed_plant_t *ninst=inst;
+    do {
+      weed_instance_ref(ninst);
+    } while (weed_plant_has_leaf(ninst,"host_next_instance")&&(ninst=weed_get_plantptr_value(ninst,"host_next_instance",&error))!=NULL);
+  }
+
 
   if (fx_dialog[1]!=NULL) {
     rfx=(lives_rfx_t *)g_object_get_data (G_OBJECT (fx_dialog[1]),"rfx");
@@ -1060,8 +1791,7 @@
 }
 
 
-gboolean
-on_rtew_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+static boolean on_rtew_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
 
   if (hash_list!=NULL) {
     g_list_free_strings(hash_list);
@@ -1089,45 +1819,73 @@
   g_free(type_labels);
   g_free(info_buttons);
   g_free(param_buttons);
+  g_free(conx_buttons);
   g_free(clear_buttons);
   rte_window=NULL;
   return FALSE;
 }
 
 
-void 
-on_rtew_ok_clicked (GtkButton *button, gpointer user_data) {
-  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+static void on_rtew_ok_clicked (GtkButton *button, gpointer user_data) {
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,rte_window);
+  lives_widget_context_update();
+  lives_general_button_clicked(button,NULL);
   on_rtew_delete_event (NULL,NULL,NULL);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 }
 
 
 
 
-void do_mix_error(void) {
-  do_error_dialog_with_check_transient(_("\n\nThis version of LiVES does not allowing mixing of generators and non-generators on the same key.\n\n"),FALSE,0,GTK_WINDOW(rte_window));
+static void do_mix_error(void) {
+  do_error_dialog_with_check_transient(
+				       _("\n\nThis version of LiVES does not allowing mixing of generators and non-generators on the same key.\n\n"),
+				       FALSE,0,GTK_WINDOW(rte_window));
   return;
 }
 
 
 
+enum {
+  NAME_TYPE_COLUMN,
+  NAME_COLUMN,
+  HASH_COLUMN,
+  NUM_COLUMNS
+};
+
+
+
+void fx_changed (GtkComboBox *combo, gpointer user_data) {
+  GtkTreeIter iter1;
+  GtkTreeModel *model;
 
+  weed_plant_t *filter;
+
+  gchar *txt;
+  gchar *tmp;
+  gchar *hashname1;
+  gchar *hashname2=(gchar *)g_object_get_data(G_OBJECT(combo),"hashname");
 
-void fx_changed (GtkItem *item, gpointer user_data) {
   gint key_mode=GPOINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
-  gint key=(gint)(key_mode/modes);
-  gint mode=key_mode-key*modes;
-  gchar *hashname1=g_strdup((gchar *)g_object_get_data(G_OBJECT(item),"hashname"));
-  gchar *hashname2=g_strdup((gchar *)g_object_get_data(G_OBJECT(combo_entries[key_mode]),"hashname"));
-  gint error;
-  gchar *tmp;
+  int key=(int)(key_mode/modes);
+  int mode=key_mode-key*modes;
+  gint idx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"idx"));
 
-  int i;
+  int error;
+
+  register int i;
+
+  if (gtk_combo_box_get_active(combo)==-1) return; // -1 is returned after we set our own text (without the type)
+
+  gtk_combo_box_get_active_iter(combo,&iter1);
+  model=gtk_combo_box_get_model(combo);
+
+  gtk_tree_model_get(model,&iter1,HASH_COLUMN,&hashname1,-1);
 
   if (!strcmp(hashname1,hashname2)) {
     g_free(hashname1);
-    g_free(hashname2);
     return;
   }
 
@@ -1147,46 +1905,135 @@
     gtk_entry_set_text (GTK_ENTRY (combo_entries[key_mode]),(tmp=rte_keymode_get_filter_name(key+1,mode)));
     g_free(tmp);
 
-    // this gets called twice, unfortunately...may be a bug in gtk+
     if (error==-2) do_mix_error();
     if (error==-1) {
       d_print((tmp=g_strdup_printf(_("LiVES could not locate the effect %s.\n"),rte_keymode_get_filter_name(key+1,mode))));
       g_free(tmp);
     }
-    g_free(hashname1);
-    g_free(hashname2);
     return;
   }
 
-  g_object_set_data(G_OBJECT(combo_entries[key_mode]),"hashname",g_strdup(hashname1));
+  // set parameters button sensitive/insensitive
+  filter=rte_keymode_get_filter(key+1,mode);
+  if (num_in_params(filter,TRUE,TRUE)>0) gtk_widget_set_sensitive(param_buttons[idx],TRUE);
+  else gtk_widget_set_sensitive(param_buttons[idx],FALSE);
+
+  if ((weed_plant_has_leaf(filter,"out_parameter_templates")&&weed_get_plantptr_value(filter,"out_parameter_templates",&error)!=NULL)||num_alpha_channels(filter,TRUE)>1) gtk_widget_set_sensitive(conx_buttons[idx],TRUE);
+  else gtk_widget_set_sensitive(conx_buttons[idx],FALSE);
+
+  // prevents a segfault
+  gtk_combo_box_get_active_iter(combo,&iter1);
+  model=gtk_combo_box_get_model(combo);
 
+  gtk_tree_model_get(model,&iter1,NAME_COLUMN,&txt,-1);
+  gtk_entry_set_text (GTK_ENTRY (combo_entries[key_mode]),txt);
+  g_free(txt);
   g_free(hashname2);
-  g_free(hashname1);
+
+  // TODO - g_free on delete
+  g_object_set_data(G_OBJECT(combo),"hashname",hashname1);
     
   type_label_set_text(key,mode);
 
   check_clear_all_button();
 
+  pconx_delete(-1,0,0,key,mode,-1);
+  pconx_delete(key,mode,-1,-1,0,0);
+
+  cconx_delete(-1,0,0,key,mode,-1);
+  cconx_delete(key,mode,-1,-1,0,0);
+
 }
 
 
 
 
-GtkWidget * create_rte_window (void) {
-  int i,j,idx,fx_idx,error;
+static LiVESTreeModel *rte_window_fx_model (void) {
+  GtkTreeStore *tstore;
+
+  GtkTreeIter iter1,iter2;
+
+  // fill names of our effects
+  int fx_idx=0;
+
+  GList *list=name_type_list;
+
+  int error;
+
+  gchar *pkg=NULL,*pkgstring,*fxname;
+
+  tstore=gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+
+  while (list!=NULL) {
+    weed_plant_t *filter=get_weed_filter(weed_get_idx_for_hashname((gchar *)g_list_nth_data(hash_list,fx_idx),TRUE));
+    int filter_flags=weed_get_int_value(filter,"flags",&error);
+    if ((weed_plant_has_leaf(filter,"plugin_unstable")&&weed_get_boolean_value(filter,"plugin_unstable",&error)==
+	 WEED_TRUE&&!prefs->unstable_fx)||((enabled_in_channels(filter,FALSE)>1&&
+					    !has_video_chans_in(filter,FALSE))||
+					   (weed_plant_has_leaf(filter,"host_menu_hide")&&
+					    weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_TRUE)
+					   ||(filter_flags&WEED_FILTER_IS_CONVERTER))) {
+      list = list->next;
+      fx_idx++;
+      continue; // skip audio transitions and hidden entries
+    }
+
+
+    fxname=g_strdup((gchar *)g_list_nth_data(name_list,fx_idx));
+
+    if ((pkgstring=strstr(fxname,": "))!=NULL) {
+      // package effect
+      if (pkg==NULL) {
+	pkg=fxname;
+	fxname=g_strdup(pkg);
+	memset(pkgstring,0,1);
+	/* TRANSLATORS: example " - LADSPA plugins -" */
+	pkgstring=g_strdup_printf(_(" - %s plugins -"),pkg);
+	gtk_tree_store_append (tstore, &iter1, NULL);
+	gtk_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,pkgstring,NAME_COLUMN,fxname,
+			 HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
+	g_free(pkgstring);
+      }
+      gtk_tree_store_append (tstore, &iter2, &iter1);
+      gtk_tree_store_set(tstore,&iter2,NAME_TYPE_COLUMN,list->data,NAME_COLUMN,fxname,
+			 HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
+    }
+    else {
+      if (pkg!=NULL) g_free(pkg);
+      pkg=NULL;
+      gtk_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
+      gtk_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,list->data,NAME_COLUMN,fxname,
+			 HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
+      }
+
+    g_free(fxname);
+
+    list = list->next;
+    fx_idx++;
+  }
+
+  if (pkg!=NULL) g_free(pkg);
+
+  return (LiVESTreeModel *)tstore;
+}
+
+
+
 
-  gint winsize_h;
-  gint winsize_v;
 
-  gint scr_width,scr_height;
 
+
+
+
+
+
+
+GtkWidget * create_rte_window (void) {
   GtkWidget *rte_window;
   GtkWidget *table;
   GtkWidget *hbox;
   GtkWidget *hbox2;
-  GtkWidget *eventbox;
-  GSList *mode_group = NULL;
-  GSList *grab_group = NULL;
+
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *combo;
@@ -1196,17 +2043,31 @@
 
   GtkWidget *scrolledwindow;
 
+  GSList *mode_group = NULL;
+  GSList *grab_group = NULL;
+
   GtkAccelGroup *rtew_accel_group;
 
+  LiVESTreeModel *model;
+
+  weed_plant_t *filter;
+
+  gchar *tmp,*tmp2;
+
   int modes=rte_getmodespk();
 
-  GList *list;
-  GtkWidget *item;
+  int idx,error;
 
-  gchar *tmp;
+  int winsize_h;
+  int winsize_v;
 
-  ///////////////////////////////////////////////////////////////////////////
+  int scr_width,scr_height;
+
+  register int i,j;
 
+  ///////////////////////////////////////////////////////////////////////////
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
+  lives_widget_context_update();
 
   if (prefs->gui_monitor==0) {
     scr_width=mainw->scr_width;
@@ -1226,6 +2087,7 @@
   combo_entries=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
   info_buttons=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
   param_buttons=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
+  conx_buttons=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
   clear_buttons=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
   nlabels=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
   type_labels=(GtkWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(GtkWidget *));
@@ -1235,18 +2097,18 @@
   mode_ra_fns=(gulong *)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(gulong));
 
   rte_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_modify_bg(rte_window, GTK_STATE_NORMAL, &palette->menu_and_bars);
+  lives_widget_set_bg_color(rte_window, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
   gtk_window_set_title (GTK_WINDOW (rte_window), _("LiVES: Real time effect mapping"));
   gtk_window_add_accel_group (GTK_WINDOW (rte_window), mainw->accel_group);
 
   table = gtk_table_new (prefs->rte_keys_virtual, modes+1, FALSE);
 
-  gtk_table_set_row_spacings (GTK_TABLE (table), 16);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 16*widget_opts.scale);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4*widget_opts.scale);
 
   // dummy button for "no grab", we dont show this...there is a button instead
-  dummy_radio = gtk_radio_button_new_with_label (grab_group, _("Key grab"));
-  grab_group = gtk_radio_button_group (GTK_RADIO_BUTTON (dummy_radio));
+  dummy_radio = gtk_radio_button_new (grab_group);
+  grab_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (dummy_radio));
 
   name_list=weed_get_all_names(1);
   name_type_list=weed_get_all_names(2);
@@ -1254,73 +2116,38 @@
 
   for (i=0;i<prefs->rte_keys_virtual;i++) {
 
-    hbox = gtk_hbox_new (FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
     gtk_table_attach (GTK_TABLE (table), hbox, i, i+1, 0, 1,
 		      (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 		      (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-    
-    label = gtk_label_new (g_strdup_printf(_("Ctrl-%d"),i+1));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), widget_opts.border_width);
     
-    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
+    label = lives_standard_label_new ((tmp=g_strdup_printf(_("Ctrl-%d"),i+1)));
+    g_free(tmp);
 
-    key_checks[i] = gtk_check_button_new ();
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new (_("Key active"));
+    gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, widget_opts.packing_width);
 
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      key_checks[i]);
+    hbox2 = lives_hbox_new (FALSE, 0);
 
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
+    key_checks[i] = lives_standard_check_button_new (_("Key active"),FALSE,LIVES_BOX(hbox2),NULL);
     
-    hbox2 = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox2), key_checks[i], FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 10);
-    GTK_WIDGET_SET_FLAGS (key_checks[i], GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_checks[i]),mainw->rte&(GU641<<i));
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),mainw->rte&(GU641<<i));
 
     ch_fns[i]=g_signal_connect_after (GTK_OBJECT (key_checks[i]), "toggled",
                       G_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1));
 
 
 
-    hbox2 = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 10);
-
-    key_grabs[i]=gtk_radio_button_new(grab_group);
-    grab_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (key_grabs[i]));
-
-    gtk_box_pack_start (GTK_BOX (hbox2), key_grabs[i], FALSE, FALSE, 10);
-
-    label=gtk_label_new_with_mnemonic (_ ("Key grab"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),key_grabs[i]);
+    hbox2 = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
-    eventbox=gtk_event_box_new();
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    gtk_widget_set_tooltip_text( eventbox, _("Grab keyboard for this effect key"));
-    gtk_tooltips_copy(key_grabs[i],eventbox);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      key_grabs[i]);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 10);
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(key_grabs[i]),mainw->rte_keys==i);
+    key_grabs[i]=lives_standard_radio_button_new((tmp=g_strdup(_ ("Key grab"))),FALSE,grab_group,LIVES_BOX(hbox2),
+						 (tmp2=g_strdup(_("Grab keyboard for this effect key"))));
+    g_free(tmp); g_free(tmp2);
+    grab_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (key_grabs[i]));
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_grabs[i]),mainw->rte_keys==i);
 
     gr_fns[i]=g_signal_connect_after (GTK_OBJECT (key_grabs[i]), "toggled",
 				      G_CALLBACK (grabkeys_callback_hook),GINT_TO_POINTER (i));
@@ -1331,110 +2158,67 @@
 
     for (j=0;j<modes;j++) {
       idx=i*modes+j;
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = lives_hbox_new (FALSE, 0);
       gtk_table_attach (GTK_TABLE (table), hbox, i, i+1, j+1, j+2,
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), widget_opts.border_width);
 
 
-      hbox2 = gtk_hbox_new (FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 10);
+      hbox2 = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
       
-      mode_radios[idx]=gtk_radio_button_new(mode_group);
-      mode_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (mode_radios[idx]));
-      
-      gtk_box_pack_start (GTK_BOX (hbox2), mode_radios[idx], FALSE, FALSE, 10);
-
-      label=gtk_label_new_with_mnemonic (_ ("Mode active"));
-      gtk_label_set_mnemonic_widget (GTK_LABEL (label),mode_radios[idx]);
-
-      eventbox=gtk_event_box_new();
-      gtk_container_add(GTK_CONTAINER(eventbox),label);
-      g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-			G_CALLBACK (label_act_toggle),
-			mode_radios[idx]);
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-	gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-      }
-      gtk_box_pack_start (GTK_BOX (hbox2), eventbox, FALSE, FALSE, 10);
+      mode_radios[idx]=lives_standard_radio_button_new(_ ("Mode active"),FALSE,mode_group,LIVES_BOX(hbox2),NULL);
+      mode_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (mode_radios[idx]));
 
-
-      if (rte_key_getmode(i+1)==j) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mode_radios[idx]),TRUE);
+      if (rte_key_getmode(i+1)==j) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mode_radios[idx]),TRUE);
 
       mode_ra_fns[idx]=g_signal_connect_after (GTK_OBJECT (mode_radios[idx]), "toggled",
 					       G_CALLBACK (rtemode_callback_hook),GINT_TO_POINTER (idx));
 
-      type_labels[idx] = gtk_label_new ("");
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(type_labels[idx], GTK_STATE_NORMAL, &palette->normal_fore);
-      }
+      type_labels[idx] = lives_standard_label_new ("");
 
       info_buttons[idx] = gtk_button_new_with_label (_("Info"));
       param_buttons[idx] = gtk_button_new_with_label (_("Set Parameters"));
+      conx_buttons[idx] = gtk_button_new_with_label (_("Set Connections"));
       clear_buttons[idx] = gtk_button_new_with_label (_("Clear"));
 
-      vbox = gtk_vbox_new (FALSE, 15);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 13);
+      vbox = lives_vbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), widget_opts.border_width);
 
-      hbox = gtk_hbox_new (FALSE, 12);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-      nlabels[idx] = gtk_label_new (_("Effect name:"));
-      if (palette->style&STYLE_1) {
-	gtk_widget_modify_fg(nlabels[idx], GTK_STATE_NORMAL, &palette->normal_fore);
-      }
+      nlabels[idx] = lives_standard_label_new (_("Effect name:"));
 
-      gtk_box_pack_start (GTK_BOX (hbox), nlabels[idx], FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (hbox), nlabels[idx], FALSE, FALSE, widget_opts.packing_width);
 
-      combo = gtk_combo_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+      // create combo entry model
+      model=rte_window_fx_model();
 
-      combo_entries[idx] = GTK_COMBO (combo)->entry;
-      g_object_set_data (G_OBJECT(combo_entries[idx]), "hashname", (gpointer)"");
+      combo = lives_combo_new_with_model (model);
 
-      // fill names of our effects
-      fx_idx=0;
-      list=name_type_list;
-      
-      while (list!=NULL) {
-	weed_plant_t *filter=get_weed_filter(weed_get_idx_for_hashname((gchar *)g_list_nth_data(hash_list,fx_idx),TRUE));
-	int filter_flags=weed_get_int_value(filter,"flags",&error);
-	if ((weed_plant_has_leaf(filter,"plugin_unstable")&&weed_get_boolean_value(filter,"plugin_unstable",&error)==
-	     WEED_TRUE&&!prefs->unstable_fx)||((enabled_in_channels(filter,FALSE)>1&&
-						!has_video_chans_in(filter,FALSE))||
-					       (weed_plant_has_leaf(filter,"host_menu_hide")&&
-						weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_TRUE)
-					       ||(filter_flags&WEED_FILTER_IS_CONVERTER))) {
-	  list = list->next;
-	  fx_idx++;
-	  continue; // skip audio transitions and hidden entries
-	}
-	item = gtk_list_item_new_with_label ((gchar *) list->data);
-	gtk_widget_show(item);
-	gtk_container_add (GTK_CONTAINER (GTK_COMBO(combo)->list), item);
-	g_object_set_data (G_OBJECT(item),"hashname",g_list_nth_data(hash_list,fx_idx));
-	gtk_combo_set_item_string(GTK_COMBO(combo),GTK_ITEM(item),(gchar *)g_list_nth_data(name_list,fx_idx));
-
-	if (fx_idx==rte_keymode_get_filter_idx(i+1,j)) {
-	  g_object_set_data (G_OBJECT(combo_entries[idx]),"hashname",g_list_nth_data(hash_list,fx_idx));
-	}
+      lives_combo_set_entry_text_column(LIVES_COMBO(combo),NAME_TYPE_COLUMN);
 
-	g_signal_connect (G_OBJECT(item), "select", G_CALLBACK (fx_changed), GINT_TO_POINTER(idx));
-	list = list->next;
-	fx_idx++;
-      }
+      g_object_set_data (G_OBJECT(combo), "hashname", (gpointer)g_strdup(""));
+      g_object_set_data (G_OBJECT(combo), "idx", GINT_TO_POINTER(idx));
+      gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, widget_opts.packing_width);
+
+
+      combo_entries[idx] = lives_combo_get_entry(LIVES_COMBO(combo));
       
       gtk_entry_set_text (GTK_ENTRY (combo_entries[idx]),(tmp=rte_keymode_get_filter_name(i+1,j)));
       g_free(tmp);
-      gtk_entry_set_editable (GTK_ENTRY (combo_entries[idx]), FALSE);
+ 
+      lives_entry_set_editable (LIVES_ENTRY (combo_entries[idx]), FALSE);
       
-      hbox = gtk_hbox_new (FALSE, 12);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
+      g_signal_connect(GTK_OBJECT (combo), "changed",
+		       G_CALLBACK (fx_changed),GINT_TO_POINTER(i*rte_getmodespk()+j));
+      
       g_signal_connect (GTK_OBJECT (info_buttons[idx]), "clicked",
 			G_CALLBACK (on_rte_info_clicked),GINT_TO_POINTER (idx));
 
@@ -1443,67 +2227,72 @@
 
       g_signal_connect (GTK_OBJECT (param_buttons[idx]), "clicked",
 			G_CALLBACK (on_params_clicked),GINT_TO_POINTER (idx));
+
+      g_signal_connect (GTK_OBJECT (conx_buttons[idx]), "clicked",
+			G_CALLBACK (on_datacon_clicked),GINT_TO_POINTER (idx));
       
       type_label_set_text(i,j);
 
-      gtk_box_pack_start (GTK_BOX (hbox), type_labels[idx], FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), info_buttons[idx], FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), param_buttons[idx], FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), clear_buttons[idx], FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (hbox), type_labels[idx], FALSE, FALSE, widget_opts.packing_width);
+      gtk_box_pack_end (GTK_BOX (hbox), info_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+      gtk_box_pack_end (GTK_BOX (hbox), conx_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+      gtk_box_pack_end (GTK_BOX (hbox), param_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+      gtk_box_pack_end (GTK_BOX (hbox), clear_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
 
-      }
-  }
+      filter=rte_keymode_get_filter(i+1,j);
 
+      if (num_in_params(filter,TRUE,TRUE)>0) gtk_widget_set_sensitive(param_buttons[idx],TRUE);
+      else gtk_widget_set_sensitive(param_buttons[idx],FALSE);
 
-  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  
-  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), table);
+      if ((weed_plant_has_leaf(filter,"out_parameter_templates")&&weed_get_plantptr_value(filter,"out_parameter_templates",&error)!=NULL)||num_alpha_channels(filter,TRUE)>1) gtk_widget_set_sensitive(conx_buttons[idx],TRUE);
+      else gtk_widget_set_sensitive(conx_buttons[idx],FALSE);
 
-  gtk_widget_set_size_request (scrolledwindow, winsize_h, winsize_v);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_bg(gtk_bin_get_child (GTK_BIN (scrolledwindow)), GTK_STATE_NORMAL, &palette->normal_back);
+
+      }
   }
-  
-  gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolledwindow))),GTK_SHADOW_IN);
 
-  top_vbox = gtk_vbox_new (FALSE, 15);
 
-  gtk_box_pack_start (GTK_BOX (top_vbox), dummy_radio, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
+  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, table);
+
+  top_vbox = lives_vbox_new (FALSE, 0);
+
+  gtk_box_pack_start (GTK_BOX (top_vbox), dummy_radio, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
 
   gtk_container_add (GTK_CONTAINER (rte_window), top_vbox);
 
-  hbuttonbox = gtk_hbutton_box_new ();
-  gtk_box_pack_start (GTK_BOX (top_vbox), hbuttonbox, FALSE, TRUE, 20);
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
+  hbuttonbox = lives_hbutton_box_new ();
+  gtk_box_pack_start (GTK_BOX (top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height*2);
 
   gtk_container_add (GTK_CONTAINER (hbuttonbox), clear_all_button);
-  GTK_WIDGET_SET_FLAGS (clear_all_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (clear_all_button);
 
   save_keymap_button = gtk_button_new_with_mnemonic (_("_Save as default keymap"));
 
   gtk_container_add (GTK_CONTAINER (hbuttonbox), save_keymap_button);
-  GTK_WIDGET_SET_FLAGS (save_keymap_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (save_keymap_button);
 
   load_keymap_button = gtk_button_new_with_mnemonic (_("_Load default keymap"));
 
   gtk_container_add (GTK_CONTAINER (hbuttonbox), load_keymap_button);
-  GTK_WIDGET_SET_FLAGS (load_keymap_button, GTK_CAN_DEFAULT);
+  lives_widget_set_can_focus_and_default (load_keymap_button);
 
   ok_button = gtk_button_new_with_mnemonic (_("Close _window"));
 
   gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_button);
-  GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT);
-  
+  lives_widget_set_can_focus_and_default (ok_button);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX (hbuttonbox), DEF_BUTTON_WIDTH, -1);
+#endif
+
 
   rtew_accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
   gtk_window_add_accel_group (GTK_WINDOW (rte_window), rtew_accel_group);
 
   gtk_widget_add_accelerator (ok_button, "activate", rtew_accel_group,
-                              GDK_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
 
   g_signal_connect (GTK_OBJECT (rte_window), "delete_event",
 		    G_CALLBACK (on_rtew_ok_clicked),
@@ -1530,9 +2319,9 @@
 
   if (prefs->gui_monitor!=0) {
     gint xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						    rte_window->allocation.width)/2;
+						    lives_widget_get_allocation_width(rte_window))/2;
     gint ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						    rte_window->allocation.height)/2;
+						    lives_widget_get_allocation_height(rte_window))/2;
     gtk_window_set_screen(GTK_WINDOW(rte_window),mainw->mgeom[prefs->gui_monitor-1].screen);
     gtk_window_move(GTK_WINDOW(rte_window),xcen,ycen);
   }
@@ -1540,11 +2329,16 @@
   if (prefs->open_maximised) {
     gtk_window_maximize (GTK_WINDOW(rte_window));
   }
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,rte_window);
   return rte_window;
 }
 
 void refresh_rte_window (void) {
   if (rte_window!=NULL) {
+    lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
+    lives_set_cursor_style(LIVES_CURSOR_BUSY,rte_window);
+    lives_widget_context_update();
     on_rtew_delete_event(NULL,NULL,NULL);
     rte_window=create_rte_window();
     gtk_widget_show (rte_window);
@@ -1552,8 +2346,7 @@
 }
 
 
-void 
-on_assign_rte_keys_activate (GtkMenuItem *menuitem, gpointer user_data) {
+void on_assign_rte_keys_activate (GtkMenuItem *menuitem, gpointer user_data) {
   if (rte_window!=NULL) {
     on_rtew_ok_clicked(GTK_BUTTON(dummy_radio), user_data);
     return;
@@ -1564,37 +2357,40 @@
 }
 
 
-void rtew_set_keych (gint key, gboolean on) {
+void rtew_set_keych (int key, boolean on) {
   g_signal_handler_block(key_checks[key],ch_fns[key]);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(key_checks[key]),on);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[key]),on);
   g_signal_handler_unblock(key_checks[key],ch_fns[key]);
 }
 
 
-void rtew_set_keygr (gint key) {
+void rtew_set_keygr (int key) {
   if (key>=0) {
     g_signal_handler_block(key_grabs[key],gr_fns[key]);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(key_grabs[key]),TRUE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_grabs[key]),TRUE);
     g_signal_handler_unblock(key_grabs[key],gr_fns[key]);
   }
   else {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dummy_radio),TRUE);
+    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(dummy_radio),TRUE);
   }
 }
 
-void rtew_set_mode_radio (gint key, gint mode) {
+void rtew_set_mode_radio (int key, int mode) {
   int modes=rte_getmodespk();
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(mode_radios[key*modes+mode]),TRUE);
+  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mode_radios[key*modes+mode]),TRUE);
 }
 
 
 
-void redraw_pwindow (gint key, gint mode) {
-  gint keyw=0,modew=0;
+void redraw_pwindow (int key, int mode) {
   GList *child_list;
-  int i;
   lives_rfx_t *rfx;
 
+  GtkWidget *action_area;
+
+  int keyw=0,modew=0;
+  int i;
+
   if (fx_dialog[1]!=NULL) {
     rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
     if (!rfx->is_template) {
@@ -1603,11 +2399,13 @@
     }
     if (rfx->is_template||(key==keyw&&mode==modew)) {
       // rip out the contents
-      if (mainw->invis==NULL) mainw->invis=gtk_vbox_new(FALSE,0);
+      if (mainw->invis==NULL) mainw->invis=lives_vbox_new(FALSE,0);
       child_list=gtk_container_get_children(GTK_CONTAINER(lives_dialog_get_content_area(GTK_DIALOG(fx_dialog[1]))));
+      action_area=lives_dialog_get_action_area(LIVES_DIALOG(fx_dialog[1]));
+      gtk_container_set_focus_child(GTK_CONTAINER(action_area),NULL);
       for (i=0;i<g_list_length(child_list);i++) {
 	GtkWidget *widget=(GtkWidget *)g_list_nth_data(child_list,i);
-	if (widget!=GTK_DIALOG (fx_dialog[1])->action_area) {
+	if (widget!=action_area) {
 	  // we have to do this, because using gtk_widget_destroy() here 
 	  // can causes a crash [bug in gtk+ ???]
 	  gtk_widget_reparent (widget,mainw->invis);
@@ -1616,6 +2414,7 @@
       if (child_list!=NULL) g_list_free(child_list);
       on_paramwindow_cancel_clicked(NULL,NULL);
       restore_pwindow(rfx);
+
     }
   }
 }
@@ -1631,10 +2430,10 @@
 }
 
 
-void update_pwindow (gint key, gint i, GList *list) {
+void update_pwindow (int key, int i, GList *list) {
   const weed_plant_t *inst;
   lives_rfx_t *rfx;
-  gint keyw,modew;
+  int keyw,modew;
 
   if (fx_dialog[1]!=NULL) {
     keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
@@ -1667,8 +2466,11 @@
 
 
 void rte_set_key_defs (GtkButton *button, lives_rfx_t *rfx) {
-  gint key,mode;
-  if (mainw->textwidget_focus!=NULL) after_param_text_changed(mainw->textwidget_focus,rfx);
+  int key,mode;
+  if (mainw->textwidget_focus!=NULL) {
+    GtkWidget *textwidget=(GtkWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    after_param_text_changed(textwidget,rfx);
+  }
 
   if (rfx->num_params>0) {
     key=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
@@ -1681,23 +2483,25 @@
 
 
 void rte_set_defs_ok (GtkButton *button, lives_rfx_t *rfx) {
+  weed_plant_t **ptmpls,*filter;
+  lives_colRGB24_t *rgbp;
+
   int i;
-  weed_plant_t **ptmpls,*filter,*copy_param=NULL;
   int error;
-  lives_colRGB24_t *rgbp;
 
-  if (mainw->textwidget_focus!=NULL) after_param_text_changed(mainw->textwidget_focus,rfx);
+  if (mainw->textwidget_focus!=NULL) {
+    GtkWidget *textwidget=(GtkWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    after_param_text_changed(textwidget,rfx);
+  }
 
   if (rfx->num_params>0) {
-    filter=weed_get_plantptr_value((weed_plant_t *)rfx->source,"filter_class",&error);
+    filter=weed_instance_get_filter((weed_plant_t *)rfx->source,TRUE);
     ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
     for (i=0;i<rfx->num_params;i++) {
       switch (rfx->params[i].type) {
       case LIVES_PARAM_COLRGB24:
 	rgbp=(lives_colRGB24_t *)rfx->params[i].value;
-	if (rfx->params[i].copy_to!=-1) copy_param=weed_inst_in_param((weed_plant_t *)rfx->source,
-								      rfx->params[i].copy_to,FALSE);
-	update_weed_color_value(ptmpls[i],i,copy_param,rgbp->red,rgbp->green,rgbp->blue,0);
+	update_weed_color_value(ptmpls[i],i,rgbp->red,rgbp->green,rgbp->blue,0);
 	break;
       case LIVES_PARAM_STRING:
 	weed_set_string_value(ptmpls[i],"host_default",(gchar *)rfx->params[i].value);
@@ -1706,7 +2510,7 @@
 	weed_set_int_array(ptmpls[i],"host_default",1,(int *)rfx->params[i].value);
 	break;
       case LIVES_PARAM_NUM:
-	if (rfx->params[i].dp>0) weed_set_double_array(ptmpls[i],"host_default",1,(double *)rfx->params[i].value);
+	if (weed_leaf_seed_type(ptmpls[i],"default")==WEED_SEED_DOUBLE) weed_set_double_array(ptmpls[i],"host_default",1,(double *)rfx->params[i].value);
 	else weed_set_int_array(ptmpls[i],"host_default",1,(int *)rfx->params[i].value);
 	break;
       case LIVES_PARAM_BOOL:
@@ -1721,6 +2525,7 @@
 
   on_paramwindow_cancel_clicked(button,rfx);
   fx_dialog[1]=NULL;
+
 }
 
 
@@ -1734,15 +2539,24 @@
 
 
 void rte_reset_defs_clicked (GtkButton *button, lives_rfx_t *rfx) {
-  weed_plant_t **ptmpls,**inp,*filter,*inst;
+  weed_plant_t **ptmpls,**inp,**xinp;
   weed_plant_t **ctmpls;
+
+  weed_plant_t *filter,*inst;
+
   GList *child_list;
-  GtkWidget *pbox,*fxdialog,*cancelbutton;
+
+  GtkWidget *pbox,*fxdialog,*cancelbutton,*action_area;
 
   int error;
-  int i,nchans;
+  int nchans;
+
+  int poffset=0,ninpar,x;
 
-  gboolean is_generic_defs=FALSE;
+  boolean is_generic_defs=FALSE;
+  boolean add_pcons=FALSE;
+
+  register int i;
 
   cancelbutton=(GtkWidget *)g_object_get_data(G_OBJECT(button),"cancelbutton");
 
@@ -1750,7 +2564,7 @@
 
   inst=(weed_plant_t *)rfx->source;
 
-  filter=weed_get_plantptr_value(inst,"filter_class",&error);
+  filter=weed_instance_get_filter(inst,TRUE);
 
   if (rfx->num_params>0) {
 
@@ -1763,13 +2577,42 @@
       weed_free(ptmpls);
     }
 
+    inp=weed_params_create(filter,TRUE);
+
+  resetdefs1:
+    filter=weed_instance_get_filter(inst,FALSE);
+
     // reset params back to default defaults
     weed_in_parameters_free(inst);
     
-    inp=weed_params_create(filter,TRUE);
-    weed_set_plantptr_array(inst,"in_parameters",weed_flagset_array_count(inp,TRUE),inp);
+    ninpar=num_in_params(filter,FALSE,FALSE);
+    if (ninpar==0) xinp=NULL;
+
+    xinp=(weed_plant_t **)g_malloc((ninpar+1)*sizeof(weed_plant_t *));
+    x=0;
+    for (i=poffset;i<poffset+ninpar;i++) xinp[x++]=inp[i];
+    xinp[x]=NULL;
+    poffset+=ninpar;
+
+    weed_set_plantptr_array(inst,"in_parameters",weed_flagset_array_count(xinp,TRUE),xinp);
+    weed_free(xinp);
+
+    if (weed_plant_has_leaf(inst,"host_next_instance")) {
+      // handle compound fx
+      inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+      add_pcons=TRUE;
+      goto resetdefs1;
+    }
+
     weed_free(inp);
 
+    inst=(weed_plant_t *)rfx->source;
+    filter=weed_instance_get_filter(inst,TRUE);
+
+    if (add_pcons) {
+      add_param_connections(inst);
+    }
+
     rfx_params_free(rfx);
     g_free(rfx->params);
     
@@ -1800,12 +2643,14 @@
 
   // redraw the window
 
-  if (mainw->invis==NULL) mainw->invis=gtk_vbox_new(FALSE,0);
+  if (mainw->invis==NULL) mainw->invis=lives_vbox_new(FALSE,0);
   child_list=gtk_container_get_children(GTK_CONTAINER(lives_dialog_get_content_area(GTK_DIALOG(fxdialog))));
 
+  action_area=lives_dialog_get_action_area(LIVES_DIALOG (fxdialog));
+
   for (i=0;i<g_list_length(child_list);i++) {
     GtkWidget *widget=(GtkWidget *)g_list_nth_data(child_list,i);
-    if (widget!=GTK_DIALOG (fxdialog)->action_area) {
+    if (widget!=action_area) {
       // we have to do this, because using gtk_widget_destroy() here 
       // can causes a crash [bug in gtk+ ???]
       gtk_widget_reparent (widget,mainw->invis);
@@ -1822,11 +2667,10 @@
 }
 
 
-
-
 void load_default_keymap(void) {
   // called on startup
-  gchar *keymap_file=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
+  gchar *dir=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
+  gchar *keymap_file=g_build_filename(dir,"default.keymap",NULL);
   gchar *keymap_template=g_build_filename(prefs->prefix_dir,DATA_DIR,"default.keymap",NULL);
   gchar *com,*tmp;
 
@@ -1837,7 +2681,17 @@
   do {
     retval=0;
     if (!g_file_test (keymap_file, G_FILE_TEST_EXISTS)) {
+
+      if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) {
+	g_mkdir_with_parents(dir,S_IRWXU);
+      }
+	
+#ifndef IS_MINGW
       com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",keymap_template,keymap_file);
+#else
+      com=g_strdup_printf("cp.exe \"%s\" \"%s\"",keymap_template,keymap_file);
+#endif
+
       lives_system(com,TRUE); // allow this to fail - we will check for errors below
       g_free(com);
     }
@@ -1854,7 +2708,8 @@
       if (retval==LIVES_CANCEL) {
 	g_free(keymap_file);
 	g_free(keymap_template);
-      
+	g_free(dir);
+
 	threaded_dialog_spin();
 	return;
       }
@@ -1865,5 +2720,6 @@
 
   g_free(keymap_file);
   g_free(keymap_template);
+  g_free(dir);
   threaded_dialog_spin();
 }

LiVES-1.6.1.tar.bz2/src/rte_window.h -> LiVES-2.0.3.tar.bz2/src/rte_window.h Changed

@@ -1,27 +1,36 @@
 // rte_window.h
 // LiVES (lives-exe)
-// (c) G. Finch 2005 - 2010
+// (c) G. Finch 2005 - 2013
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
+#ifndef HAS_LIVES_RTE_WINDOW_H
+#define HAS_LIVES_RTE_WINDOW_H
+
+#define RTE_INFO_WIDTH ((int)(350.*widget_opts.scale))
+#define RTE_INFO_HEIGHT ((int)(200.*widget_opts.scale))
+
+
 void on_assign_rte_keys_activate (GtkMenuItem *, gpointer);
 void on_rte_info_clicked (GtkButton *, gpointer data);
 void load_default_keymap(void);
-void rtew_set_keych (gint key, gboolean on);
-void rtew_set_keygr (gint key);
-void rtew_set_mode_radio (gint key, gint mode);
-void rtew_set_grab_button (gboolean on);
-void redraw_pwindow (gint key, gint mode);
+void rtew_set_keych (int key, boolean on);
+void rtew_set_keygr (int key);
+void rtew_set_mode_radio (int key, int mode);
+void rtew_set_grab_button (boolean on);
+void redraw_pwindow (int key, int mode);
 void restore_pwindow (lives_rfx_t *);
-void update_pwindow (gint key, gint i, GList *list);
+void update_pwindow (int key, int i, GList *list);
 
 GtkWidget *rte_window;
 
 
-void rte_set_defs_activate (GtkMenuItem *m, gpointer user_data);
+void rte_set_defs_activate (GtkMenuItem *, gpointer user_data);
 void rte_set_defs_cancel (GtkButton *, lives_rfx_t *);
 void rte_set_defs_ok (GtkButton *, lives_rfx_t *);
-void rte_reset_defs_clicked (GtkButton *button, lives_rfx_t *rfx);
+void rte_reset_defs_clicked (GtkButton *, lives_rfx_t *rfx);
 void rte_set_key_defs (GtkButton *, lives_rfx_t *);
 void on_save_rte_defs_activate (GtkMenuItem *, gpointer);
-gboolean on_clear_all_clicked (GtkButton *, gpointer user_data);
+boolean on_clear_all_clicked (GtkButton *, gpointer user_data);
+
+#endif // HAS_LIVES_RTE_WINDOW_H

LiVES-1.6.1.tar.bz2/src/saveplay.c -> LiVES-2.0.3.tar.bz2/src/saveplay.c Changed

@@ -1,6 +1,6 @@
 // saveplay.c
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2012
+// (c) G. Finch 2003 - 2013
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -33,16 +33,21 @@
 #include "cvirtual.h"
 
 
-gboolean save_clip_values(gint which) {
-  gint asigned;
-  gint endian;
+boolean save_clip_values(int which) {
   gchar *lives_header;
+
+  int asigned;
+  int endian;
   int retval;
+#ifndef IS_MINGW
   mode_t xumask;
+#endif
 
   if (which==0||which==mainw->scrap_file||which==mainw->ascrap_file) return TRUE;
 
+#ifndef IS_MINGW
   xumask=umask(DEF_FILE_UMASK);
+#endif
 
   asigned=!(mainw->files[which]->signed_endian&AFORM_UNSIGNED);
   endian=mainw->files[which]->signed_endian&AFORM_BIG_ENDIAN;
@@ -55,7 +60,9 @@
       retval=do_write_failed_error_s_with_retry(lives_header,g_strerror(errno),NULL);
       if (retval==LIVES_CANCEL) {
 	g_free(lives_header);
+#ifndef IS_MINGW
 	umask(xumask);
+#endif
 	return FALSE;
       }
     }
@@ -65,6 +72,7 @@
 
       do {
 	retval=0;
+	set_signal_handlers((SignalHandlerPointer)defer_sigint);
 	save_clip_value(which,CLIP_DETAILS_HEADER_VERSION,&mainw->files[which]->header_version);
 	if (mainw->com_failed||mainw->write_failed) break;
 	save_clip_value(which,CLIP_DETAILS_BPP,&mainw->files[which]->bpp);
@@ -109,6 +117,9 @@
 	if (mainw->com_failed||mainw->write_failed) break;
 	save_clip_value(which,CLIP_DETAILS_KEYWORDS,mainw->files[which]->keywords);
       } while (FALSE);
+
+      if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
+      set_signal_handlers((SignalHandlerPointer)catch_sigint);
       
       if (mainw->com_failed||mainw->write_failed) {
 	fclose(mainw->clip_header);
@@ -119,7 +130,9 @@
   } while (retval==LIVES_RETRY);
   
   g_free(lives_header);
+#ifndef IS_MINGW
   umask(xumask);
+#endif
 
   fclose(mainw->clip_header);
   mainw->clip_header=NULL;
@@ -130,7 +143,7 @@
 }
 
 
-gboolean read_file_details(const gchar *file_name, gboolean is_audio) {
+boolean read_file_details(const gchar *file_name, boolean is_audio) {
   // get preliminary details
 
   // is_audio set to TRUE prevents us from checking for images, and deleting the (existing) first frame
@@ -139,10 +152,10 @@
   FILE *infofile;
   int alarm_handle;
   int retval;
-  gboolean timeout;
-  gchar *tmp,*com=g_strdup_printf("smogrify get_details \"%s\" \"%s\" \"%s\" %d %d",cfile->handle,
+  boolean timeout;
+  gchar *tmp,*com=g_strdup_printf("%s get_details \"%s\" \"%s\" \"%s\" %d %d",prefs->backend_sync,cfile->handle,
 				  (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),
-				  cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",mainw->opening_loc,is_audio);
+				  get_image_ext_for_type(cfile->img_type),mainw->opening_loc,is_audio);
   g_free(tmp);
 
   mainw->com_failed=FALSE;
@@ -170,7 +183,7 @@
     alarm_handle=lives_alarm_set(LIVES_LONGER_TIMEOUT);
     
     while (!((infofile=fopen(cfile->info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-      while (g_main_context_iteration (NULL,FALSE));
+      lives_widget_context_update();
       threaded_dialog_spin();
       g_usleep(prefs->sleep_time);
     }
@@ -198,8 +211,7 @@
 }
 
 
-void 
-deduce_file(const gchar *file_name, gdouble start, gint end) {
+void deduce_file(const gchar *file_name, double start, int end) {
   // this is a utility function to deduce whether we are dealing with a file, 
   // a selection, a backup, or a location
   gchar short_file_name[PATH_MAX];
@@ -229,8 +241,8 @@
 
 
 
-static gboolean rip_audio_cancelled(gint old_file, weed_plant_t *mt_pb_start_event, 
-				    gboolean mt_has_audio_file) {
+static boolean rip_audio_cancelled(int old_file, weed_plant_t *mt_pb_start_event, 
+				   boolean mt_has_audio_file) {
 
   if (mainw->cancelled==CANCEL_KEEP) {
     // user clicked "enough"
@@ -260,18 +272,22 @@
 
 #define AUDIO_FRAMES_TO_READ 100
 
-void open_file_sel(const gchar *file_name, gdouble start, gint frames) {
-  gchar *com;
-  gint withsound=1;
-  gint old_file=mainw->current_file;
-  gint new_file=old_file;
-  gchar *fname=g_strdup(file_name),*msgstr;
-  gint achans,arate,arps,asampsize;
-  gint current_file;
-  gboolean mt_has_audio_file=TRUE;
+void open_file_sel(const gchar *file_name, double start, int frames) {
   gchar msg[256],loc[256];
   gchar *tmp=NULL;
   gchar *isubfname=NULL;
+  gchar *fname=g_strdup(file_name),*msgstr;
+  gchar *com;
+
+  int withsound=1;
+  int old_file=mainw->current_file;
+  int new_file=old_file;
+
+  int achans,arate,arps,asampsize;
+  int current_file;
+
+  boolean mt_has_audio_file=TRUE;
+
   const lives_clip_data_t *cdata;
 
   weed_plant_t *mt_pb_start_event=NULL;
@@ -286,7 +302,7 @@
     g_free(fname);
     
     lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     if (frames==0) {
       com=g_strdup_printf(_ ("Opening %s"),file_name);
@@ -316,16 +332,24 @@
     }
 
     if (!strcmp(prefs->image_ext,"png")) cfile->img_type=IMG_TYPE_PNG;
-
+    
     if (prefs->instant_open) {
+      // cd to clip directory - so decoder plugins can write temp files
+      gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+      gchar *cwd=g_get_current_dir();
+      lives_chdir(ppath,FALSE);
+      g_free(ppath);
+	
       cdata=get_decoder_cdata(cfile,prefs->disabled_decoders);
+
+      lives_chdir(cwd,FALSE);
+      g_free(cwd);
+
       if (cfile->ext_src!=NULL) {
 	lives_decoder_t *dplug=(lives_decoder_t *)cfile->ext_src;
 	cfile->opening=TRUE;
 	cfile->clip_type=CLIP_TYPE_FILE;
 	
-	get_mime_type(cfile->type,40,cdata);
-	
 	if (!prefs->auto_nobord) {
 	  cfile->hsize=cdata->frame_width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
 	  cfile->vsize=cdata->frame_height;
@@ -347,7 +371,7 @@
 	cfile->achans=cdata->achans;
 	cfile->asampsize=cdata->asamps;
 	
-	cfile->signed_endian=get_signed_endian(cdata->asigned, G_BYTE_ORDER==G_LITTLE_ENDIAN);
+	cfile->signed_endian=get_signed_endian(cdata->asigned, capable->byte_order==LIVES_LITTLE_ENDIAN);
 
 	if (cfile->achans>0&&(dplug->decoder->rip_audio)!=NULL&&withsound==1) {
 	  // call rip_audio() in the decoder plugin
@@ -407,7 +431,6 @@
 	  // check if we have audio
 	  read_file_details(file_name,FALSE);
 	  unlink (cfile->info_file);
-	  sync();
 	  
 	  if (mainw->com_failed) return;
 
@@ -416,7 +439,7 @@
 	  if (cfile->achans>0) {
 	    // plugin returned no audio, try with mplayer
 	    if (mainw->file_open_params==NULL) mainw->file_open_params=g_strdup("");
-	    com=g_strdup_printf("smogrify open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",cfile->handle,
+	    com=g_strdup_printf("%s open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",prefs->backend,cfile->handle,
 				(tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),-1,
 				prefs->image_ext,start,frames,mainw->file_open_params);
 
@@ -457,9 +480,25 @@
 	      // cancelled
 
 	      if (mainw->cancelled!=CANCEL_ERROR) {
+#ifndef IS_MINGW
 		// clean up our temp files
-		com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+		com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 		lives_system(com,TRUE);
+#else
+		// get pid from backend
+		FILE *rfile;
+		ssize_t rlen;
+		char val[16];
+		int pid;
+		com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+		rfile=popen(com,"r");
+		rlen=fread(val,1,16,rfile);
+		pclose(rfile);
+		memset(val+rlen,0,1);
+		pid=atoi(val);
+    
+		lives_win32_kill_subprocesses(pid,TRUE);
+#endif
 		g_free(com);
 	      }
 
@@ -472,8 +511,24 @@
 	    if (mainw->error==0) add_file_info (cfile->handle,TRUE);
 	    mainw->error=0;
 	    g_free(msgstr);
+
+	    cfile->opening=FALSE;
+	    reget_afilesize(mainw->current_file);
+	    get_total_time(cfile);
+
+	    if (prefs->auto_trim_audio&&(cfile->total_time>cfile->video_time)) {
+	      if (cdata->sync_hint&SYNC_HINT_AUDIO_TRIM_START) {
+		cfile->undo1_dbl=0.;
+		cfile->undo2_dbl=cfile->total_time-cfile->video_time;
+		on_del_audio_activate(NULL,NULL);
+		cfile->changed=FALSE;
+	      }
+	    }
 	  }
 	}
+
+	get_mime_type(cfile->type,40,cdata);
+
       }
 
       save_frame_index(mainw->current_file);
@@ -509,8 +564,7 @@
 	return;
       }
       unlink (cfile->info_file);
-      sync();
-      
+
       // we must set this before calling add_file_info
       cfile->opening=TRUE;
       mainw->opening_frames=-1;
@@ -618,14 +672,13 @@
       g_free(mainw->file_open_params);
       mainw->file_open_params=tmp;
       
-      com=g_strdup_printf("smogrify open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",cfile->handle,
+      com=g_strdup_printf("%s open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",prefs->backend,cfile->handle,
 			  (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),withsound,
 			  prefs->image_ext,start,frames,mainw->file_open_params);
       unlink (cfile->info_file);
       lives_system(com,FALSE);
       g_free(com);
       g_free(tmp);
-      mainw->noswitch=FALSE;
       
       if (mainw->toy_type==LIVES_TOY_TV) {
 	// for LiVES TV we do an auto-preview
@@ -643,6 +696,7 @@
 	mainw->file_open_params=NULL;
 	mainw->cancelled=CANCEL_NONE;
 	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+	mainw->noswitch=FALSE;
 	return;
       }
     }
@@ -661,7 +715,13 @@
     if (cfile->ext_src==NULL&&mainw->toy_type!=LIVES_TOY_TV) {
       if (!do_progress_dialog(TRUE,TRUE,msgstr)) {
 	// user cancelled or switched to another clip
-	
+#ifdef IS_MINGW
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+#endif
+
 	g_free(msgstr);
 	
 	mainw->opening_frames=-1;
@@ -670,13 +730,26 @@
 	if (mainw->cancelled==CANCEL_NO_PROPOGATE) {
 	  mainw->cancelled=CANCEL_NONE;
 	  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+	  mainw->noswitch=FALSE;
 	  return;
 	}
 	
 	// cancelled
 	// clean up our temp files
-	com=g_strdup_printf("smogrify stopsubsub \"%s\" 2>/dev/null",cfile->handle);
+#ifndef IS_MINGW
+	com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 	lives_system(com,TRUE);
+#else
+	// get pid from backend
+	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
 	g_free(com);
 	if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
 	mainw->file_open_params=NULL;
@@ -685,6 +758,7 @@
 	  mainw->multitrack->pb_start_event=mt_pb_start_event;
 	  mainw->multitrack->has_audio_file=mt_has_audio_file;
 	}
+	mainw->noswitch=FALSE;
 	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 	return;
       }
@@ -718,6 +792,7 @@
     do_blocking_error_dialog(mainw->msg);
     d_print_failed();
     close_current_file(old_file);
+    mainw->noswitch=FALSE;
     if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
     mainw->file_open_params=NULL;
     lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
@@ -751,7 +826,11 @@
 	}
       }
       if (subtype!=SUBTITLE_TYPE_NONE) {
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",isubfname,subfname);
+#else
+	com=g_strdup_printf("cp.exe \"%s\" \"%s\"",isubfname,subfname);
+#endif
 	mainw->com_failed=FALSE;
 	lives_system(com,FALSE);
 	g_free(com);
@@ -769,6 +848,7 @@
 
   // now file should be loaded...get full details
   cfile->is_loaded=TRUE;
+
   if (cfile->ext_src==NULL) add_file_info(cfile->handle,FALSE);
   else {
     add_file_info(NULL,FALSE);
@@ -791,6 +871,11 @@
       do_error_dialog(msg);
       d_print_failed();
       close_current_file(old_file);
+      mainw->noswitch=FALSE;
+      if (mainw->multitrack!=NULL) {
+	mainw->multitrack->pb_start_event=mt_pb_start_event;
+	mainw->multitrack->has_audio_file=mt_has_audio_file;
+      }
       if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
       mainw->file_open_params=NULL;
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
@@ -828,9 +913,9 @@
     else if (prefs->concat_images) {
       // insert this image into our image clip, close this file
 
-      com=g_strdup_printf("smogrify insert \"%s\" \"%s\" %d 1 1 \"%s\" 0 %d %d %d",
+      com=g_strdup_printf("%s insert \"%s\" \"%s\" %d 1 1 \"%s\" 0 %d %d %d",prefs->backend,
 			  mainw->files[mainw->img_concat_clip]->handle,
-			  mainw->files[mainw->img_concat_clip]->img_type==IMG_TYPE_JPEG?"jpg":"png",
+			  get_image_ext_for_type(mainw->files[mainw->img_concat_clip]->img_type),
 			  mainw->files[mainw->img_concat_clip]->frames,
 			  cfile->handle,mainw->files[mainw->img_concat_clip]->frames,
 			  mainw->files[mainw->img_concat_clip]->hsize,mainw->files[mainw->img_concat_clip]->vsize);
@@ -849,6 +934,7 @@
 
       if (mainw->cancelled||mainw->error) {
 	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+	mainw->noswitch=FALSE;
 	return;
       }
 
@@ -865,6 +951,7 @@
       gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
       g_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+      mainw->noswitch=FALSE;
 
       return;
     }
@@ -873,6 +960,7 @@
   // set new style file details
   if (!save_clip_values(current_file)) {
     close_current_file(old_file);
+    mainw->noswitch=FALSE;
     return;
   }
 
@@ -891,7 +979,7 @@
     get_total_time(cfile);
     if (!mainw->is_generating) mainw->current_file=mainw->multitrack->render_file;
     mt_init_clips(mainw->multitrack,current_file,TRUE);
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     mt_clip_select(mainw->multitrack,TRUE);
   }
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
@@ -941,7 +1029,7 @@
 
 
 
-gboolean get_handle_from_info_file(gint index) {
+boolean get_handle_from_info_file(gint index) {
   // called from get_new_handle to get the 'real' file handle
   // because until we know the handle we can't use the normal info file yet
 
@@ -950,14 +1038,14 @@
   FILE *infofile;
   int alarm_handle;
   int retval;
-  gboolean timeout;
+  boolean timeout;
 
   do {
     retval=0;
     timeout=FALSE;
     clear_mainw_msg();
 
-#define LIVES_MEDIUM_TIMEOUT  (60 * U_SEC) // 60 sec timeout
+#define LIVES_MEDIUM_TIMEOUT  (10 * U_SEC) // 60 sec timeout
 
     alarm_handle=lives_alarm_set(LIVES_MEDIUM_TIMEOUT);
 
@@ -1009,7 +1097,7 @@
   gchar *ttl;
   char *filename;
 
-  filt[0]=g_strdup_printf ("*.%s",cfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+  filt[0]=g_strdup_printf ("*.%s",get_image_ext_for_type(cfile->img_type));
   filt[1]=NULL;
 
   frame=GPOINTER_TO_INT(user_data);
@@ -1021,7 +1109,7 @@
     ttl=g_strdup (_("LiVES: Save Frame as..."));
 
 
-  filename=choose_file(strlen(mainw->image_dir)?mainw->image_dir:NULL,NULL,filt,GTK_FILE_CHOOSER_ACTION_SAVE,ttl,NULL);
+  filename=choose_file(strlen(mainw->image_dir)?mainw->image_dir:NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,ttl,NULL);
 
   g_free (filt[0]);
   g_free (ttl);
@@ -1055,12 +1143,16 @@
   const char *n_file_name;
   gchar *fps_string;
   gchar *extra_params=NULL;
+#ifndef IS_MINGW
   gchar *redir=g_strdup("1>&2 2>/dev/null");
+#else
+  gchar *redir=g_strdup("1>&2 2>NUL");
+#endif
   gchar *new_stderr_name=NULL;
   gchar *mesg,*bit,*tmp;
   gchar *com;
   gchar *full_file_name=NULL;
-  gchar *enc_exec_name;
+  gchar *enc_exec_name,*cmd;
 
   int new_stderr=-1;
   int retval;
@@ -1074,17 +1166,18 @@
   GError *gerr=NULL;
 
   struct stat filestat;
+
   time_t file_mtime=0;
 
-  gulong fsize;
+  uint64_t fsize;
 
   GtkWidget *hbox;
 
-  gboolean safe_symlinks=prefs->safe_symlinks;
-  gboolean not_cancelled;
-  gboolean output_exists=FALSE;
-  gboolean save_all=FALSE;
-  gboolean resb;
+  boolean safe_symlinks=prefs->safe_symlinks;
+  boolean not_cancelled;
+  boolean output_exists=FALSE;
+  boolean save_all=FALSE;
+  boolean resb;
 
   if (start==1&&end==sfile->frames) save_all=TRUE;
 
@@ -1116,7 +1209,7 @@
   // get file extension
   check_encoder_restrictions (TRUE,FALSE,save_all);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new (FALSE, 0);
   mainw->fx1_bool=TRUE;
   add_suffix_check(GTK_BOX(hbox),prefs->encoder.of_def_ext);
   gtk_widget_show_all(hbox);
@@ -1124,7 +1217,7 @@
   if (filename==NULL) {
     gchar *ttl=g_strdup (_("LiVES: Save Clip as..."));
     do {
-      n_file_name=choose_file(mainw->vid_save_dir,NULL,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,ttl,hbox);
+      n_file_name=choose_file(mainw->vid_save_dir,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,ttl,hbox);
       if (n_file_name==NULL) return;
     } while (!strlen(n_file_name));
     g_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",n_file_name);
@@ -1158,11 +1251,7 @@
   }
 
   if (filename==NULL) {
-#if GLIB_CHECK_VERSION(2,8,0)
     if (!check_file(full_file_name,strcmp(full_file_name,n_file_name))) {
-#else
-    if (!check_file(full_file_name,TRUE)) {
-#endif
       g_free(full_file_name);
       if (rdet!=NULL) {
 	gtk_widget_destroy (rdet->dialog);
@@ -1214,25 +1303,97 @@
   }
 
 
+  if (rdet!=NULL) {
+    gtk_widget_destroy (rdet->dialog);
+    g_free(rdet->encoder_name);
+    g_free(rdet);
+    rdet=NULL;
+    if (resaudw!=NULL) g_free(resaudw);
+    resaudw=NULL;
+  }
+
 
   if (sfile->arate*sfile->achans) {
     aud_start=calc_time_from_frame (clip,start*sfile->arps/sfile->arate);
     aud_end=calc_time_from_frame (clip,(end+1)*sfile->arps/sfile->arate);
   }
 
+
+  // get extra params for encoder
+
+  if (!sfile->ratio_fps) {
+    fps_string=g_strdup_printf ("%.3f",sfile->fps);
+  }
+  else {
+    fps_string=g_strdup_printf ("%.8f",sfile->fps);
+  }
+
+  enc_exec_name=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,prefs->encoder.name,NULL);
+
+#ifdef IS_MINGW
+  //cmd=g_strdup_printf("START perl ");  // real windows : does encode but no redir
+  cmd=g_strdup("perl ");   // mingw : does encode, but no redirection
+#else
+  cmd=g_strdup("");
+#endif
+
+  arate=sfile->arate;
+
+  if (!mainw->save_with_sound||prefs->encoder.of_allowed_acodecs==0) {
+    arate=0;
+  }
+
+  // get extra parameters for saving
+  if (prefs->encoder.capabilities&HAS_RFX) {
+
+    // pull at least one frame so we know the file ext
+    if (sfile->clip_type==CLIP_TYPE_FILE) {
+      resb=virtual_to_images(clip,start,end,TRUE);
+      
+      if (!resb) {
+	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+	mainw->subt_save_file=NULL;
+	d_print_file_error_failed();
+	return;
+      }
+    }
+
+    if (prefs->encoder.capabilities&ENCODER_NON_NATIVE) {
+      com=g_strdup_printf("%s save get_rfx %s \"%s\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",prefs->backend,
+			  sfile->handle,enc_exec_name,
+			  fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
+			  start,end,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
+      g_free(tmp);
+    }
+    else {
+      com=g_strdup_printf("%s\"%s\" save get_rfx %s \"\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",
+			  cmd, enc_exec_name,sfile->handle,
+			  fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
+			  start,end,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
+      g_free(tmp);
+    }
+    extra_params=plugin_run_param_window(com,NULL,NULL);
+    g_free(com);
+
+    if (extra_params==NULL) {
+      if (fx_dialog[1]!=NULL) {
+	gtk_widget_destroy(fx_dialog[1]);
+	fx_dialog[1]=NULL;
+      }
+      g_free(fps_string);
+      switch_to_file(mainw->current_file,current_file);
+      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      mainw->subt_save_file=NULL;
+      return;
+    }
+  }
+
+
   if (!save_all&&!safe_symlinks) {
     // we are saving a selection - make symlinks from a temporary clip
 
     if ((new_file=mainw->first_free_file)==-1) {
       too_many_files();
-      if (rdet!=NULL) {
-	gtk_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-      }
       if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
@@ -1240,13 +1401,6 @@
 
     // create new clip
     if (!get_new_handle(new_file,g_strdup (_("selection")))) {
-      if (rdet!=NULL) {
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-      }
       if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
@@ -1262,14 +1416,6 @@
       
       if (mainw->cancelled!=CANCEL_NONE||!resb) {
 	mainw->cancelled=CANCEL_USER;
-	if (rdet!=NULL) {
-	  gtk_widget_destroy (rdet->dialog);
-	  g_free(rdet->encoder_name);
-	  g_free(rdet);
-	  rdet=NULL;
-	  if (resaudw!=NULL) g_free(resaudw);
-	  resaudw=NULL;
-	}
 	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
 	mainw->subt_save_file=NULL;
 	if (!resb) d_print_file_error_failed();
@@ -1292,7 +1438,7 @@
     nfile->signed_endian=sfile->signed_endian;
     nfile->img_type=sfile->img_type;
 
-    com=g_strdup_printf ("smogrify link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d \"%s\"",nfile->handle,
+    com=g_strdup_printf ("%s link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d \"%s\"",prefs->backend,nfile->handle,
 			 start,end,aud_start,aud_end,nfile->arate,nfile->achans,nfile->asampsize,
 			 !(nfile->signed_endian&AFORM_UNSIGNED),!(nfile->signed_endian&AFORM_BIG_ENDIAN),sfile->handle);
 
@@ -1305,21 +1451,29 @@
     mainw->current_file=new_file;
 
     if (mainw->com_failed) {
-      lives_system (g_strdup_printf("smogrify close \"%s\"",cfile->handle),TRUE);
+#ifdef IS_MINGW
+      // kill any active processes: for other OSes the backend does this
+      // get pid from backend
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+      int pid;
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+      
+      lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+      lives_system (g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle),TRUE);
       g_free (cfile);
       cfile=NULL;
       if (mainw->first_free_file==-1||mainw->first_free_file>new_file) 
 	mainw->first_free_file=new_file;
       switch_to_file(mainw->current_file,current_file);
       d_print_cancelled();
-      if (rdet!=NULL) {
-	gtk_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-      }
       if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
@@ -1328,7 +1482,24 @@
 
     cfile->nopreview=TRUE;
     if (!(do_progress_dialog(TRUE,TRUE,_("Linking selection")))) {
-      lives_system (g_strdup_printf("smogrify close \"%s\"",cfile->handle),TRUE);
+#ifdef IS_MINGW
+      // kill any active processes: for other OSes the backend does this
+      // get pid from backend
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+      int pid;
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+      
+      lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+      lives_system ((tmp=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
+      g_free(tmp);
       g_free (cfile);
       cfile=NULL;
       if (mainw->first_free_file==-1||mainw->first_free_file>new_file) 
@@ -1336,14 +1507,6 @@
       switch_to_file(mainw->current_file,current_file);
       if (mainw->error) d_print_failed();
       else d_print_cancelled();
-      if (rdet!=NULL) {
-	gtk_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-      }
       if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
@@ -1361,41 +1524,35 @@
 
   if (!check_encoder_restrictions(FALSE,FALSE,save_all)) {
     if (!save_all&&!safe_symlinks) {
-      lives_system ((com=g_strdup_printf("smogrify close \"%s\"",nfile->handle)),TRUE);
+#ifdef IS_MINGW
+      // kill any active processes: for other OSes the backend does this
+      // get pid from backend
+      FILE *rfile;
+      ssize_t rlen;
+      char val[16];
+      int pid;
+      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,nfile->handle);
+      rfile=popen(com,"r");
+      rlen=fread(val,1,16,rfile);
+      pclose(rfile);
+      memset(val+rlen,0,1);
+      pid=atoi(val);
+      
+      lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+      lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,nfile->handle)),TRUE);
       g_free(com);
       g_free (nfile);
       mainw->files[new_file]=NULL;
       if (mainw->first_free_file==-1||new_file) mainw->first_free_file=new_file;
     }
-    else if (!save_all&&safe_symlinks) {
-      com=g_strdup_printf("smogrify clear_symlinks \"%s\"",nfile->handle);
-      lives_system (com,TRUE);
-      g_free (com);
-    }
     switch_to_file(mainw->current_file,current_file);
     d_print_cancelled();
-    if (rdet!=NULL) {
-      gtk_widget_destroy (rdet->dialog);
-      g_free(rdet->encoder_name);
-      g_free(rdet);
-      rdet=NULL;
-      if (resaudw!=NULL) g_free(resaudw);
-      resaudw=NULL;
-    }
     if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
     mainw->subt_save_file=NULL;
     return;
   }
 
-  if (rdet!=NULL) {
-    gtk_widget_destroy (rdet->dialog);
-    g_free(rdet->encoder_name);
-    g_free(rdet);
-    rdet=NULL;
-    if (resaudw!=NULL) g_free(resaudw);
-    resaudw=NULL;
-  }
-
 
   if (!save_all&&safe_symlinks) {
     // we are saving a selection - make symlinks in /tmp
@@ -1413,14 +1570,6 @@
       
       if (mainw->cancelled!=CANCEL_NONE||!resb) {
 	mainw->cancelled=CANCEL_USER;
-	if (rdet!=NULL) {
-	  gtk_widget_destroy (rdet->dialog);
-	  g_free(rdet->encoder_name);
-	  g_free(rdet);
-	  rdet=NULL;
-	  if (resaudw!=NULL) g_free(resaudw);
-	  resaudw=NULL;
-	}
 	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
 	mainw->subt_save_file=NULL;
 	if (!resb) d_print_file_error_failed();
@@ -1428,7 +1577,7 @@
       }
     }
 
-    com=g_strdup_printf ("smogrify link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d",sfile->handle,
+    com=g_strdup_printf ("%s link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d",prefs->backend,sfile->handle,
 			 start,end,aud_start,aud_end,sfile->arate,sfile->achans,sfile->asampsize,
 			 !(sfile->signed_endian&AFORM_UNSIGNED),!(sfile->signed_endian&AFORM_BIG_ENDIAN));
 
@@ -1440,20 +1589,12 @@
     mainw->current_file=clip;
 
     if (mainw->com_failed) {
-      com=g_strdup_printf("smogrify clear_symlinks \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system (com,TRUE);
       g_free (com);
       cfile->nopreview=FALSE;
       switch_to_file(mainw->current_file,current_file);
       d_print_cancelled();
-      if (rdet!=NULL) {
-	gtk_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-      }
       if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
@@ -1462,21 +1603,13 @@
 
     cfile->nopreview=TRUE;
     if (!(do_progress_dialog(TRUE,TRUE,_("Linking selection")))) {
-      com=g_strdup_printf("smogrify clear_symlinks \"%s\"",cfile->handle);
+      com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system (com,TRUE);
       g_free (com);
       cfile->nopreview=FALSE;
       switch_to_file(mainw->current_file,current_file);
       if (mainw->error) d_print_failed();
       else d_print_cancelled();
-      if (rdet!=NULL) {
-	gtk_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-      }
       if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
@@ -1508,11 +1641,9 @@
     }
   }
 
-  arate=sfile->arate;
 
   if (!mainw->save_with_sound||prefs->encoder.of_allowed_acodecs==0) {
     bit=g_strdup(_ (" (with no sound)\n"));
-    arate=0;
   }
   else {
     bit=g_strdup("\n");
@@ -1528,60 +1659,6 @@
   }
   g_free (bit);
   
-  if (!sfile->ratio_fps) {
-    fps_string=g_strdup_printf ("%.3f",sfile->fps);
-  }
-  else {
-    fps_string=g_strdup_printf ("%.8f",sfile->fps);
-  }
-
-  enc_exec_name=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,prefs->encoder.name,NULL);
-
-  // get extra parameters for saving
-  if (prefs->encoder.capabilities&HAS_RFX) {
-    if (prefs->encoder.capabilities&ENCODER_NON_NATIVE) {
-      com=g_strdup_printf("smogrify save get_rfx %s \"%s\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",
-			  sfile->handle,enc_exec_name,
-			  fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
-			  1,sfile->frames,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
-      g_free(tmp);
-    }
-    else {
-      com=g_strdup_printf("\"%s\" save get_rfx %s \"\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",
-			  enc_exec_name,sfile->handle,
-			  fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
-			  1,sfile->frames,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
-      g_free(tmp);
-    }
-    extra_params=plugin_run_param_window(com,NULL,NULL);
-    g_free(com);
-
-    if (extra_params==NULL) {
-      if (!save_all&&safe_symlinks) {
-	com=g_strdup_printf("smogrify clear_symlinks \"%s\"",nfile->handle);
-	lives_system (com,TRUE);
-	g_free (com);
-      }
-      if (!save_all&&!safe_symlinks) {
-	lives_system ((com=g_strdup_printf("smogrify close \"%s\"",nfile->handle)),TRUE);
-	g_free(com);
-	g_free(nfile);
-	mainw->files[new_file]=NULL;
-	if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
-	  mainw->first_free_file=new_file;
-      }
-      gtk_widget_destroy(fx_dialog[1]);
-      fx_dialog[1]=NULL;
-      g_free(mesg);
-      g_free(fps_string);
-      switch_to_file(mainw->current_file,current_file);
-      d_print_cancelled();
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-      mainw->subt_save_file=NULL;
-      return;
-    }
-  }
-
 
   mainw->no_switch_dprint=TRUE;
   d_print (mesg);
@@ -1592,20 +1669,31 @@
   if (prefs->show_gui) {
     // open a file for stderr
 
-    new_stderr_name=g_strdup_printf("%s%s/.debug_out",prefs->tmpdir,cfile->handle);
+#ifndef IS_MINGW
+    new_stderr_name=g_build_filename(prefs->tmpdir,cfile->handle,".debug_out",NULL);
+#else
+    new_stderr_name=g_build_filename(prefs->tmpdir,cfile->handle,"debug_out",NULL);
+#endif
     g_free(redir);
 
     do {
       retval=0;
-      new_stderr=open(new_stderr_name,O_CREAT|O_RDWR|O_TRUNC|O_SYNC,S_IRUSR|S_IWUSR);
+      new_stderr=open(new_stderr_name,O_CREAT|O_RDONLY|O_TRUNC|O_SYNC,S_IRUSR|S_IWUSR);
       if (new_stderr<0) {
 	retval=do_write_failed_error_s_with_retry(new_stderr_name,g_strerror(errno),NULL);
 	if (retval==LIVES_CANCEL) redir=g_strdup("1>&2");
       }
       else {
-	redir=g_strdup_printf("1>&2 2>%s",new_stderr_name);
-	
+
+#ifdef IS_MINGW
+	setmode(new_stderr,O_BINARY);
+	mainw->iochan=g_io_channel_win32_new_fd(new_stderr);
+	redir=g_strdup_printf("2>&1 >\"%s\"",new_stderr_name);
+#else
 	mainw->iochan=g_io_channel_unix_new(new_stderr);
+	redir=g_strdup_printf("2>\"%s\"",new_stderr_name);
+#endif
+
 	g_io_channel_set_encoding (mainw->iochan, NULL, NULL);
 	g_io_channel_set_buffer_size(mainw->iochan,0);
 	g_io_channel_set_flags(mainw->iochan,G_IO_FLAG_NONBLOCK,&gerr);
@@ -1627,12 +1715,24 @@
   }
   g_free(tmp);
 
+
+  // re-read values in case they were resampled
+
+  if (arate!=0) arate=cfile->arate;
+
+  if (!cfile->ratio_fps) {
+    fps_string=g_strdup_printf ("%.3f",cfile->fps);
+  }
+  else {
+    fps_string=g_strdup_printf ("%.8f",cfile->fps);
+  }
+
   // if startframe is -ve, we will use the links created for safe_symlinks - in /tmp
   // for non-safe symlinks, cfile will be our new links file
   // for save_all, cfile will be sfile
 
   if (prefs->encoder.capabilities&ENCODER_NON_NATIVE) {
-    com=g_strdup_printf("smogrify save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",
+    com=g_strdup_printf("%s save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",prefs->backend,
 			cfile->handle,
 			enc_exec_name,fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
 			startframe,cfile->frames,arate,cfile->achans,cfile->asampsize,
@@ -1641,8 +1741,8 @@
   }
   else {
     // for native (perl) plugins we go via the plugin
-    com=g_strdup_printf("\"%s\" save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",
-			enc_exec_name, cfile->handle, "",
+    com=g_strdup_printf("%s\"%s\" save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",
+			cmd, enc_exec_name, cfile->handle, "",
 			fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
 			startframe,cfile->frames,arate,cfile->achans,cfile->asampsize,
 			asigned|aendian,aud_start,aud_end,(extra_params==NULL?"":extra_params),redir);
@@ -1660,6 +1760,7 @@
   unlink(cfile->info_file);
   mainw->write_failed=FALSE;
   save_file_comments(current_file);
+
   lives_system(com,FALSE);
   g_free(com);
 
@@ -1670,14 +1771,15 @@
 
 
   if (!mainw->error) {
+    gchar *pluginstr;
+
     not_cancelled=do_progress_dialog(TRUE,TRUE,_ ("Saving [can take a long time]"));
     mesg=g_strdup (mainw->msg);
     
     if (mainw->iochan!=NULL) {
       // flush last of stdout/stderr from plugin
       
-      fsync(new_stderr);
-      
+      lives_fsync(new_stderr);
       pump_io_chan(mainw->iochan);
       
       g_io_channel_shutdown(mainw->iochan,FALSE,&gerr);
@@ -1693,14 +1795,35 @@
     mainw->effects_paused=FALSE;
     cfile->nokeep=FALSE;
     
-    com=g_strdup_printf("smogrify plugin_clear \"%s\" 1 %d \"%s%s\" \"%s\" \"%s\"",cfile->handle,
-			cfile->frames, prefs->lib_dir, PLUGIN_EXEC_DIR, PLUGIN_ENCODERS, prefs->encoder.name);
+    pluginstr=g_build_filename(prefs->lib_dir, PLUGIN_EXEC_DIR, NULL);
+
+    com=g_strdup_printf("%s plugin_clear \"%s\" 1 %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,cfile->handle,
+			cfile->frames, pluginstr, PLUGIN_ENCODERS, prefs->encoder.name);
+    g_free(pluginstr);
 
     lives_system(com,FALSE);
     g_free(com);
   }
+  else {
+    if (mainw->iochan!=NULL) {
+      // flush last of stdout/stderr from plugin
+      
+      lives_fsync(new_stderr);
+      pump_io_chan(mainw->iochan);
+      
+      g_io_channel_shutdown(mainw->iochan,FALSE,&gerr);
+      g_io_channel_unref(mainw->iochan);
+      
+      if (gerr!=NULL) g_error_free(gerr);
+      close(new_stderr);
+      unlink(new_stderr_name);
+      g_free(new_stderr_name);
+      g_free(redir);
+    }
+  }
 
   g_free(enc_exec_name);
+  g_free(cmd);
 
   if (not_cancelled) {
     if (mainw->error) {
@@ -1709,7 +1832,23 @@
       mainw->no_switch_dprint=FALSE;
       g_free(full_file_name);
       if (!save_all&&!safe_symlinks) {
-	lives_system ((com=g_strdup_printf("smogrify close \"%s\"",cfile->handle)),TRUE);
+#ifdef IS_MINGW
+	// kill any active processes: for other OSes the backend does this
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+      
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+	lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
 	g_free(com);
 	g_free (cfile);
 	cfile=NULL;
@@ -1717,7 +1856,7 @@
 	  mainw->first_free_file=mainw->current_file;
       }
       else if (!save_all&&safe_symlinks) {
-	com=g_strdup_printf("smogrify clear_symlinks \"%s\"",cfile->handle);
+	com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
 	lives_system (com,TRUE);
 	g_free (com);
       }
@@ -1752,7 +1891,23 @@
       mainw->no_switch_dprint=FALSE;
       g_free(full_file_name);
       if (!save_all&&!safe_symlinks) {
-	lives_system ((com=g_strdup_printf("smogrify close \"%s\"",cfile->handle)),TRUE);
+#ifdef IS_MINGW
+	// kill any active processes: for other OSes the backend does this
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+	lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
 	g_free(com);
 	g_free (cfile);
 	cfile=NULL;
@@ -1760,7 +1915,7 @@
 	  mainw->first_free_file=mainw->current_file;
       }
       else if (!save_all&&safe_symlinks) {
-	com=g_strdup_printf("smogrify clear_symlinks \"%s\"",cfile->handle);
+	com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
 	lives_system (com,TRUE);
 	g_free (com);
       }
@@ -1789,10 +1944,10 @@
 	// replace letterboxed frames with maxspect frames
 	int iwidth=sfile->ohsize;
 	int iheight=sfile->ovsize;
-	gboolean bad_header=FALSE;
+	boolean bad_header=FALSE;
 
-	com=g_strdup_printf("smogrify mv_mgk \"%s\" %d %d \"%s\" 1",sfile->handle,1,sfile->frames,
-			    sfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+	com=g_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\" 1",prefs->backend,sfile->handle,1,sfile->frames,
+			    get_image_ext_for_type(sfile->img_type));
 
 	unlink(sfile->info_file);
 	lives_system(com,FALSE);
@@ -1838,7 +1993,23 @@
     }
     else {
       if (!safe_symlinks) {
-	lives_system ((com=g_strdup_printf("smogrify close \"%s\"",nfile->handle)),TRUE);
+#ifdef IS_MINGW
+	// kill any active processes: for other OSes the backend does this
+	// get pid from backend
+	FILE *rfile;
+	ssize_t rlen;
+	char val[16];
+	int pid;
+	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,nfile->handle);
+	rfile=popen(com,"r");
+	rlen=fread(val,1,16,rfile);
+	pclose(rfile);
+	memset(val+rlen,0,1);
+	pid=atoi(val);
+	
+	lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+	lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,nfile->handle)),TRUE);
 	g_free(com);
 	g_free (nfile);
 	mainw->files[new_file]=NULL;
@@ -1846,7 +2017,7 @@
 	  mainw->first_free_file=new_file;
       }
       else {
-	com=g_strdup_printf("smogrify clear_symlinks \"%s\"",cfile->handle);
+	com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
 	lives_system (com,TRUE);
 	g_free (com);
       }
@@ -1856,11 +2027,17 @@
   switch_to_file(mainw->current_file,current_file);
 
   if (mainw->iochan!=NULL) {
-    gchar *logfile=g_strdup_printf("%sencoder_log_%d_%d.txt",prefs->tmpdir,getuid(),getgid());
     int logfd;
 
     // save the logfile in tempdir
+
+#ifndef IS_MINGW
+    gchar *logfile=g_strdup_printf("%s/encoder_log_%d_%d.txt",prefs->tmpdir,lives_getuid(),lives_getgid());
     if ((logfd=creat(logfile,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))!=-1) {
+#else
+    gchar *logfile=g_strdup_printf("%s\\encoder_log_%d_%d.txt",prefs->tmpdir,lives_getuid(),lives_getgid());
+    if ((logfd=creat(logfile,S_IRUSR|S_IWUSR))!=-1) {
+#endif
       gchar *btext=text_view_get_text(mainw->optextview);
       lives_write(logfd,btext,strlen(btext),TRUE);  // not really important if it fails
       g_free(btext);
@@ -1913,13 +2090,14 @@
   gint arate;
   gchar *com;
   gchar *com2=g_strdup (" ");
-  gchar *com4=g_strdup (" ");
   gchar *com3=g_strdup (" ");
   gchar *stopcom=NULL;
   gchar *msg;
   gchar *stfile;
   gchar *xtrabit,*title;
+#ifdef GDK_WINDOWING_X11
   gchar *tmp;
+#endif
 
   gint asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
   gint aendian=!(cfile->signed_endian&AFORM_BIG_ENDIAN);
@@ -1928,19 +2106,19 @@
   gint audio_end=0;
 
   gint loop=0;
-  gboolean mute;
+  boolean mute;
 
   GClosure *freeze_closure;
   gshort audio_player=prefs->audio_player;
 
   weed_plant_t *pb_start_event=NULL;
 #ifdef RT_AUDIO
-  gboolean exact_preview=FALSE;
+  boolean exact_preview=FALSE;
 #endif
-  gboolean has_audio_buffers=FALSE;
+  boolean has_audio_buffers=FALSE;
 
-#ifdef USE_X11
-  unsigned long awinid=0;
+#ifdef GDK_WINDOWING_X11
+  uint64_t awinid=-1;
 #endif
 
   if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE) mainw->aud_file_to_kill=mainw->current_file;
@@ -1958,9 +2136,10 @@
   mainw->rec_aclip=-1;
 
   if (mainw->pre_src_file==-2) mainw->pre_src_file=mainw->current_file;
+  mainw->pre_src_audio_file=mainw->current_file;
 
   // enable the freeze button
-  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_BackSpace, (GdkModifierType)GDK_CONTROL_MASK, 
+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_BackSpace, (GdkModifierType)LIVES_CONTROL_MASK, 
 			   (GtkAccelFlags)0, (freeze_closure=g_cclosure_new (G_CALLBACK (freeze_callback),NULL,NULL)));
 
   if (mainw->multitrack!=NULL) {
@@ -2014,7 +2193,6 @@
     }
   }
 
-  find_when_to_stop();
 
   if (!cfile->opening_audio&&!mainw->loop) {
     // if we are opening audio or looping we just play to the end of audio,
@@ -2025,7 +2203,6 @@
 
 
 
-
   if (mainw->multitrack==NULL) {
     if (!mainw->preview) {
       gtk_frame_set_label(GTK_FRAME(mainw->playframe),_ ("Play"));
@@ -2035,8 +2212,8 @@
     }
     
     if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(gtk_frame_get_label_widget(GTK_FRAME(mainw->playframe)), 
-			   GTK_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_fg_color(gtk_frame_get_label_widget(GTK_FRAME(mainw->playframe)), 
+			   LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     }
     
     // blank the background if asked to
@@ -2047,6 +2224,7 @@
     if ((!mainw->sep_win||(!mainw->faded&&(prefs->sepwin_type!=1)))&&(cfile->frames>0||mainw->foreign)) {
       // show the frame in the main window
       gtk_widget_show(mainw->playframe);
+      lives_widget_context_update();
     }
   }
 
@@ -2126,8 +2304,13 @@
 			    &&mainw->current_file>0);
 
   if (cfile->frames==0&&mainw->multitrack==NULL) {
-    if (mainw->preview_box!=NULL&&mainw->preview_box->parent!=NULL) {
+    if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
       gtk_container_remove (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
+
+      mainw->pw_scroll_func=g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event",
+					      G_CALLBACK (on_mouse_scroll),
+					      NULL);
+
     }
   }
   else {
@@ -2141,8 +2324,12 @@
       }
       else {
 	if (mainw->multitrack==NULL) {
-	  if (mainw->preview_box!=NULL&&mainw->preview_box->parent!=NULL) {
+	  if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
 	    gtk_container_remove (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
+
+	    mainw->pw_scroll_func=g_signal_connect (GTK_OBJECT (mainw->play_window), "scroll_event",
+						    G_CALLBACK (on_mouse_scroll),
+						    NULL);
 	  }
 	}
 
@@ -2162,7 +2349,7 @@
 	if (mainw->multitrack==NULL) {
 	  block_expose();
 	  mainw->noswitch=TRUE;
-	  while (g_main_context_iteration (NULL,FALSE));
+	  lives_widget_context_update();
 	  mainw->noswitch=FALSE;
 	  unblock_expose();
 	}
@@ -2170,14 +2357,14 @@
 	  // this doesn't get called if we don't call resize_play_window()
 	  if (mainw->play_window!=NULL) {
 	    gtk_window_present (GTK_WINDOW (mainw->play_window));
-	    gdk_window_raise(mainw->play_window->window);
+	    gdk_window_raise(lives_widget_get_xwindow(mainw->play_window));
 	  }
 	}
       }
     }
 
     if (mainw->play_window!=NULL) {
-      hide_cursor (mainw->play_window->window);
+      hide_cursor (lives_widget_get_xwindow(mainw->play_window));
       gtk_widget_set_app_paintable(mainw->play_window,TRUE);
       if (mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)&&mainw->fs) 
 	gtk_window_set_title (GTK_WINDOW (mainw->play_window),_("LiVES: - Streaming"));
@@ -2190,23 +2377,21 @@
 	g_free(title);
 	g_free(xtrabit);
       }
-      if (!mainw->pw_exp_is_blocked) g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
     }
   
     if (!mainw->foreign&&!mainw->sep_win) {
-      hide_cursor(mainw->playarea->window);
+      hide_cursor(lives_widget_get_xwindow(mainw->playarea));
     }
     
     // pwidth and pheight are playback width and height
     if (!mainw->sep_win&&!mainw->foreign) {
       do {
-	mainw->pwidth=mainw->playframe->allocation.width-H_RESIZE_ADJUST;
-	mainw->pheight=mainw->playframe->allocation.height-V_RESIZE_ADJUST;
+	mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+	mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
 	if (mainw->pwidth*mainw->pheight==0) {
 	  gtk_widget_queue_draw (mainw->playframe);
 	  mainw->noswitch=TRUE;
-	  while (g_main_context_iteration (NULL, FALSE));
+	  lives_widget_context_update();
 	  mainw->noswitch=FALSE;
 	}
       } while (mainw->pwidth*mainw->pheight==0);
@@ -2236,16 +2421,16 @@
   if (prefs->stop_screensaver) {
     g_free (com2);
     com2=NULL;
-#ifdef USE_X11
+#ifdef GDK_WINDOWING_X11
     if (!prefs->show_gui&&prefs->show_playwin&&mainw->play_window!=NULL) {
-      awinid=(unsigned long)GDK_WINDOW_XID (mainw->play_window->window);
+      awinid=lives_widget_get_xwinid(mainw->play_window,NULL);
     }
     else if (prefs->show_gui) {
       if (mainw->multitrack!=NULL) {
-	awinid=(unsigned long)GDK_WINDOW_XID (mainw->multitrack->window->window);
+	awinid=lives_widget_get_xwinid(mainw->multitrack->window,NULL);
       }
       else if (mainw->LiVES!=NULL) {
-	awinid=(unsigned long)GDK_WINDOW_XID (mainw->LiVES->window);
+	awinid=lives_widget_get_xwinid(mainw->LiVES,NULL);
       }
     }
 
@@ -2258,7 +2443,7 @@
       g_free(xnew);
       com2=tmp;
     }
-    if (capable->has_xdg_screensaver) {
+    if (capable->has_xdg_screensaver&&awinid!=-1) {
       gchar *xnew=g_strdup_printf(" xdg-screensaver suspend %"PRIu64" 2>/dev/null ;",awinid);
       tmp=g_strconcat (com2,xnew,NULL);
       g_free(com2);
@@ -2275,22 +2460,17 @@
   }
 
 
-  if (prefs->pause_xmms&&cfile->achans>0&&!mainw->mute&&capable->has_xmms) {
-    g_free (com3);
-    com3=g_strdup ("xmms -u;");
-  }
   if (!mainw->foreign&&prefs->midisynch&&!mainw->preview) {
-    g_free (com4);
-    com4=g_strdup  ("midistart");
+    g_free (com3);
+    com3=g_strdup  ("midistart");
   }
-  com=g_strconcat (com2,com3,com4,NULL);
+  com=g_strconcat (com2,com3,NULL);
   if (strlen (com)) {
     // allow this to fail - not all sub-commands may be present
     lives_system (com,TRUE);
   }
-  g_free (com); g_free (com2); g_free (com3); g_free (com4);
-  com4=g_strdup (" ");
-  com3=NULL;
+  g_free (com); g_free (com2); g_free (com3);
+  com3=g_strdup (" ");
   com2=NULL;
   com=NULL;
 
@@ -2316,20 +2496,20 @@
   // reinit all active effects
   if (!mainw->preview&&!mainw->is_rendering&&!mainw->foreign) weed_reinit_all();
 
-  if (!mainw->foreign&&(!(mainw->record&&(prefs->rec_opts&REC_EXT_AUDIO))&&
+  if (!mainw->foreign&&(!(prefs->audio_src==AUDIO_SRC_EXT&&
 			((audio_player==AUD_PLAYER_JACK) ||
-			 (audio_player==AUD_PLAYER_PULSE)))) {
+			 (audio_player==AUD_PLAYER_PULSE))))) {
     cfile->aseek_pos=(long)((gdouble)(mainw->play_start-1.)/cfile->fps*cfile->arate)*cfile->achans*(cfile->asampsize/8);
 
     // start up our audio player (jack or pulse)
     if (audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-      jack_aud_pb_ready(mainw->current_file);
+      if (mainw->jackd!=NULL) jack_aud_pb_ready(mainw->current_file);
 #endif
     }
     else if (audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-      pulse_aud_pb_ready(mainw->current_file);
+      if (mainw->pulsed!=NULL) pulse_aud_pb_ready(mainw->current_file);
 #endif
     }
     else if (cfile->achans>0) {
@@ -2345,20 +2525,29 @@
     
       if (cfile->achans>0||(!cfile->is_loaded&&!mainw->is_generating)) {
 	if (loop) {
-	  g_free (com4);
-	  com4=g_strdup_printf ("/bin/touch \"%s\" 2>/dev/null;",stfile);
+	  g_free (com3);
+#ifndef IS_MINGW
+	  com3=g_strdup_printf ("/bin/touch \"%s\" 2>/dev/null;",stfile);
+#else
+	  com3=g_strdup_printf ("touch.exe \"%s\" 2>NUL;",stfile);
+#endif
 	}
 	
 	if (cfile->achans>0) {
-	  com2=g_strdup_printf("smogrify stop_audio %s",cfile->handle);
+	  com2=g_strdup_printf("%s stop_audio %s",prefs->backend_sync,cfile->handle);
 	}
     
-	stopcom=g_strconcat (com4,com2,NULL);
+	stopcom=g_strconcat (com3,com2,NULL);
       }
 
       g_free(stfile);
 
+#ifndef IS_MINGW
       stfile=g_build_filename(prefs->tmpdir,cfile->handle,".status.play",NULL);
+#else
+      stfile=g_build_filename(prefs->tmpdir,cfile->handle,"status.play",NULL);
+#endif
+
       g_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
       g_free(stfile);
       if (cfile->clip_type==CLIP_TYPE_DISK) unlink(cfile->info_file);
@@ -2366,13 +2555,13 @@
       // PLAY
 
       if (cfile->clip_type==CLIP_TYPE_DISK&&cfile->opening) {
-	  com=g_strdup_printf("smogrify play_opening_preview \"%s\" %.3f %d %d %d %d %d %d %d %d",
+	  com=g_strdup_printf("%s play_opening_preview \"%s\" %.3f %d %d %d %d %d %d %d %d",prefs->backend,
 			      cfile->handle,cfile->fps,mainw->audio_start,audio_end,0,
 			      arate,cfile->achans,cfile->asampsize,asigned,aendian);
       }
       else {
 	// this is only used now for sox or mplayer audio player
-	com=g_strdup_printf("smogrify play \"%s\" %.3f %d %d %d %d %d %d %d %d",cfile->handle,
+	com=g_strdup_printf("%s play %s %.3f %d %d %d %d %d %d %d %d",prefs->backend,cfile->handle,
 			    cfile->fps,mainw->audio_start,audio_end,loop,
 			    arate,cfile->achans,cfile->asampsize,asigned,aendian);
       }
@@ -2380,36 +2569,62 @@
     }
   }
 
-  g_free (com4);
+  g_free (com3);
 
   // if recording, set up recorder (jack or pulse)
-
-  if (!mainw->foreign&&(mainw->record&&(prefs->rec_opts&REC_EXT_AUDIO))&&
+  if (!mainw->foreign&&!mainw->preview&&(prefs->audio_src==AUDIO_SRC_EXT||(mainw->record&&mainw->agen_key!=0))&&
       ((audio_player==AUD_PLAYER_JACK) ||
        (audio_player==AUD_PLAYER_PULSE))) {
-    // creat temp clip
-    open_ascrap_file();
-    if (mainw->ascrap_file!=-1) {
-      mainw->rec_samples=-1; // record unlimited
-      
-      mainw->rec_aclip=mainw->ascrap_file;
-      mainw->rec_avel=1.;
-      mainw->rec_aseek=0;
-
-      if (audio_player==AUD_PLAYER_JACK) {
+    mainw->rec_samples=-1; // record unlimited
+    if (mainw->record) {
+      // creat temp clip
+      open_ascrap_file();
+      if (mainw->ascrap_file!=-1) {
+	
+	mainw->rec_aclip=mainw->ascrap_file;
+	mainw->rec_avel=1.;
+	mainw->rec_aseek=0;
+      }
+    }
+    if (audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-	jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-#endif
+      if (prefs->audio_src==AUDIO_SRC_EXT&&mainw->jackd!=NULL) {
+	if (mainw->agen_key!=0) {
+	  mainw->jackd->playing_file=mainw->current_file;
+	  mainw->jackd->frames_written=0;
+	  mainw->jackd->in_use=TRUE;
+	  jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+	}
+	else {
+	  jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+	}
       }
-      if (audio_player==AUD_PLAYER_PULSE) {
-#ifdef HAVE_PULSE_AUDIO
-	pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+      mainw->jackd->frames_written=0;
 #endif
+    }
+    if (audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+      if (prefs->audio_src==AUDIO_SRC_EXT&&mainw->pulsed!=NULL) {
+	if (mainw->agen_key!=0) {
+	  mainw->pulsed->playing_file=mainw->current_file;
+	  mainw->pulsed->frames_written=0;
+	  mainw->pulsed->in_use=TRUE;
+	  pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+	}
+	else {
+	  pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+	}
       }
+      mainw->pulsed->frames_written=0;
+#endif
     }
   }
 
 
+
+
+  find_when_to_stop();
+
   if (mainw->foreign||weed_playback_gen_start()) {
 
 #ifdef ENABLE_OSC
@@ -2417,9 +2632,6 @@
     if (mainw->osc_auto) lives_osc_notify_success(NULL);
 #endif
     
-    // add a timer for the keyboard and other realtime events (osc, midi, joystick, etc)
-    mainw->kb_timer=gtk_timeout_add (KEY_RPT_INTERVAL,&plugin_poll_keyboard,NULL);
-
 #ifdef ENABLE_JACK
     if (mainw->event_list!=NULL&&!mainw->record&&audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&
 	!(mainw->preview&&mainw->is_processing&&
@@ -2448,7 +2660,7 @@
       mainw->cancelled=CANCEL_NONE;
 
       if (mainw->event_list!=NULL&&!mainw->record) {
-	if (pb_start_event==NULL) pb_start_event=get_first_frame_event(mainw->event_list);
+	if (pb_start_event==NULL) pb_start_event=get_first_event(mainw->event_list);
 
 	if (has_audio_buffers) {
 
@@ -2569,7 +2781,6 @@
     } while (mainw->multitrack!=NULL&&(mainw->loop_cont||mainw->scratch!=SCRATCH_NONE)&&
 	     (mainw->cancelled==CANCEL_NONE||mainw->cancelled==CANCEL_EVENT_LIST_END));
     mainw->osc_block=TRUE;
-    gtk_timeout_remove (mainw->kb_timer);
     mainw->rte_textparm=NULL;
 
     mainw->playing_file=-1;
@@ -2582,14 +2793,14 @@
 #ifdef ENABLE_JACK
   if (audio_player==AUD_PLAYER_JACK&&(mainw->jackd!=NULL||mainw->jackd_read!=NULL)) {
 
-    if (mainw->jackd_read!=NULL) jack_rec_audio_end();
+    if (mainw->jackd_read!=NULL||mainw->aud_rec_fd!=-1) jack_rec_audio_end(TRUE);
 
     // send jack transport stop
     if (!mainw->preview&&!mainw->foreign) jack_pb_stop();
 
     // tell jack client to close audio file
-    if (mainw->jackd->playing_file>0) {
-      gboolean timeout;
+    if (mainw->jackd!=NULL&&mainw->jackd->playing_file>0) {
+      boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
 	sched_yield(); // wait for seek
@@ -2603,7 +2814,7 @@
       mainw->jackd->msgq=&jack_message;
 
     }
-    if (mainw->record&&((prefs->rec_opts&REC_AUDIO)||(prefs->rec_opts&REC_EXT_AUDIO))) {
+    if (mainw->record&&(prefs->rec_opts&REC_AUDIO)) {
       weed_plant_t *event=get_last_frame_event(mainw->event_list);
       insert_audio_event_at(mainw->event_list,event,-1,1,0.,0.); // audio switch off
     }
@@ -2614,11 +2825,11 @@
 #ifdef HAVE_PULSE_AUDIO
     if (audio_player==AUD_PLAYER_PULSE&&(mainw->pulsed!=NULL||mainw->pulsed_read!=NULL)) {
 
-    if (mainw->pulsed_read!=NULL) pulse_rec_audio_end();
+    if (mainw->pulsed_read!=NULL||mainw->aud_rec_fd!=-1) pulse_rec_audio_end(TRUE);
 
     // tell pulse client to close audio file
-    if (mainw->pulsed->fd>0) {
-      gboolean timeout;
+    if (mainw->pulsed!=NULL&&(mainw->pulsed->playing_file>0||mainw->pulsed->fd>0)) {
+      boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
 	sched_yield(); // wait for seek
@@ -2631,7 +2842,7 @@
       pulse_message.next=NULL;
       mainw->pulsed->msgq=&pulse_message;
     }
-    if (mainw->record&&((prefs->rec_opts&REC_AUDIO)||(prefs->rec_opts&REC_EXT_AUDIO))) {
+    if (mainw->record&&(prefs->rec_opts&REC_AUDIO)) {
       weed_plant_t *event=get_last_frame_event(mainw->event_list);
       insert_audio_event_at(mainw->event_list,event,-1,1,0.,0.); // audio switch off
     }
@@ -2668,7 +2879,7 @@
   // allow this to fail - not all sub-commands may be present
   if (prefs->stop_screensaver) {
 
-#ifdef USE_X11
+#ifdef GDK_WINDOWING_X11
     com=g_strdup("xset s on 2>/dev/null; xset +dpms 2>/dev/null ;");
     
     if (capable->has_gconftool_2) {
@@ -2678,7 +2889,7 @@
       g_free(xnew);
       com=tmp;
     }
-    if (capable->has_xdg_screensaver) {
+    if (capable->has_xdg_screensaver&&awinid!=-1) {
       gchar *xnew=g_strdup_printf(" xdg-screensaver resume %"PRIu64" 2>/dev/null ;",awinid);
       tmp=g_strconcat (com,xnew,NULL);
       g_free(com);
@@ -2697,7 +2908,6 @@
     }
   }
 
-  if (capable->has_xmms&&prefs->pause_xmms&&cfile->achans>0&&!mainw->mute) lives_system("xmms -u",TRUE);
   if (!mainw->foreign&&prefs->midisynch) lives_system ("midistop",TRUE);
 
   if (mainw->ext_playback) {
@@ -2716,7 +2926,11 @@
   }
 
   if (mainw->current_file>-1) {
+#ifndef IS_MINGW
     stfile=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+#else
+    stfile=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+#endif
     g_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
     g_free(stfile);
   }
@@ -2724,15 +2938,15 @@
   if (mainw->foreign) {
     // recording from external window capture
 
-    mainw->pwidth=mainw->playframe->allocation.width-H_RESIZE_ADJUST;
-    mainw->pheight=mainw->playframe->allocation.height-V_RESIZE_ADJUST;
+    mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+    mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
 
     cfile->hsize=mainw->pwidth;
     cfile->vsize=mainw->pheight;
 
     gdk_window_set_keep_above(mainw->foreign_window,FALSE);
 
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
 
     return;
   }
@@ -2777,17 +2991,18 @@
     gtk_widget_show(mainw->eventbox4);
     gtk_widget_show(mainw->sep_image);
     gtk_frame_set_label(GTK_FRAME(mainw->playframe),_ ("Preview"));
-    gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), widget_opts.border_width);
     resize(1);
     gtk_widget_show(mainw->t_bckground);
     gtk_widget_show(mainw->t_double);
   }
 
-  if (mainw->eventbox->allocation.height+mainw->menubar->allocation.height>mainw->scr_height-2) {
+  if (lives_widget_get_allocation_height(mainw->eventbox)+lives_widget_get_allocation_height(mainw->menubar)
+      >mainw->scr_height-2) {
     // the screen grew too much...remaximise it
     gtk_window_unmaximize (GTK_WINDOW(mainw->LiVES));
     mainw->noswitch=TRUE;
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     mainw->noswitch=FALSE;
     gtk_window_maximize (GTK_WINDOW(mainw->LiVES));
   }
@@ -2800,7 +3015,7 @@
     gtk_widget_show(mainw->eventbox4);
     disable_record();
     
-    gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (mainw->playframe), widget_opts.border_width);
   }
 
   if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE) mainw->mute=mute;
@@ -2834,20 +3049,11 @@
     }
     else {
       // or resize it back to single size
-      if (!GTK_WIDGET_VISIBLE (mainw->play_window)) {
-
-	block_expose();
-	mainw->noswitch=TRUE;
-	g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	mainw->pw_exp_is_blocked=TRUE;
-	while (g_main_context_iteration (NULL,FALSE));
-	mainw->noswitch=FALSE;
-	unblock_expose();
-      }
       if (mainw->current_file>-1&&cfile->is_loaded&&cfile->frames>0&&!mainw->is_rendering&&
 	  (cfile->clip_type!=CLIP_TYPE_GENERATOR)) {
 	if (mainw->preview_box==NULL) {
 	  // create the preview in the sepwin
+	  g_signal_handler_disconnect (mainw->play_window, mainw->pw_scroll_func);
 	  make_preview_box();
 	}
 	if (mainw->current_file!=current_file) {
@@ -2875,14 +3081,11 @@
 	  gtk_widget_queue_draw (mainw->LiVES);
 	  mainw->noswitch=TRUE;
 
-	  g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-	  mainw->pw_exp_is_blocked=TRUE;
-
-	  while (g_main_context_iteration (NULL,FALSE));
+	  lives_widget_context_update();
 	  if (mainw->play_window!=NULL) {
 	    gchar *title,*xtrabit;
 	    
-	    load_preview_image(FALSE);
+	    //load_preview_image(FALSE);
 	    
 	    mainw->noswitch=FALSE;
 	    if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
@@ -2895,8 +3098,8 @@
 	    g_free(xtrabit);
 
 	    gtk_window_present (GTK_WINDOW (mainw->play_window));
-	    gdk_window_raise(mainw->play_window->window);
-	    unhide_cursor (mainw->play_window->window);
+	    gdk_window_raise(lives_widget_get_xwindow(mainw->play_window));
+	    unhide_cursor (lives_widget_get_xwindow(mainw->play_window));
 	  }
 	}
       }
@@ -2910,7 +3113,7 @@
   }
   
   if (!mainw->foreign) {
-    unhide_cursor(mainw->playarea->window);
+    unhide_cursor(lives_widget_get_xwindow(mainw->playarea));
   }
 
   if (mainw->current_file>-1) cfile->play_paused=FALSE;
@@ -2922,6 +3125,8 @@
   }
 
   mainw->filter_map=NULL;
+  mainw->afilter_map=NULL;
+  mainw->audio_event=NULL;
 
   // disable the freeze key
   gtk_accel_group_disconnect (GTK_ACCEL_GROUP (mainw->accel_group), freeze_closure);
@@ -2961,7 +3166,7 @@
 
 #ifdef ENABLE_JACK
   if (audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
-    gboolean timeout;
+    boolean timeout;
     int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
     while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
       sched_yield(); // wait for seek
@@ -2982,7 +3187,7 @@
 #endif
 #ifdef HAVE_PULSE_AUDIO
   if (audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-    gboolean timeout;
+    boolean timeout;
     int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
     while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
       sched_yield(); // wait for seek
@@ -3033,10 +3238,14 @@
   if (mainw->multitrack==NULL&&mainw->current_file>-1)
     set_main_title(cfile->name,0);
 
+  if (mainw->play_window!=NULL) {
+    resize_play_window();
+    //load_preview_image(FALSE);
+  }
 }
-  
 
-gboolean get_temp_handle(gint index, gboolean create) {
+
+boolean get_temp_handle(gint index, boolean create) {
   // we can call this to get a temp handle for returning info from the backend
   // this function is also called from get_new_handle to create a permanent handle
   // for an opened file
@@ -3050,7 +3259,7 @@
 
 
   gchar *com;
-  gboolean is_unique;
+  boolean is_unique;
   gint current_file=mainw->current_file;
 
   if (index==-1) {
@@ -3063,7 +3272,7 @@
 
     is_unique=TRUE;
 
-    com=g_strdup_printf("smogrify new %d",getpid());
+    com=g_strdup_printf("%s new %d",prefs->backend_sync,getpid());
     lives_system(com,TRUE);
     g_free(com);
     // ignore return value here, as it will be dealt with in get_handle_from_info_file()
@@ -3087,6 +3296,7 @@
   } while (!is_unique);
 
   if (create) create_cfile();
+
   return TRUE;
 }
 
@@ -3131,7 +3341,7 @@
   cfile->clip_type=CLIP_TYPE_DISK;
   cfile->ratio_fps=FALSE;
   cfile->aseek_pos=0;
-  cfile->unique_id=(gint64)random();
+  cfile->unique_id=lives_random();
   cfile->layout_map=NULL;
   cfile->frame_index=cfile->frame_index_back=NULL;
   cfile->fx_frame_pump=0;
@@ -3172,15 +3382,23 @@
   g_snprintf(cfile->undo_text,32,"%s",_ ("_Undo"));
   g_snprintf(cfile->redo_text,32,"%s",_ ("_Redo"));
 
+#ifndef IS_MINGW
   stfile=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+#else
+  stfile=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+#endif
+
   g_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
   g_free(stfile);
   
+  cfile->laudio_drawable=NULL;
+  cfile->raudio_drawable=NULL;
+
   // remember to set cfile->is_loaded=TRUE !!!!!!!!!!
 }
 
 
-gboolean
+boolean
 get_new_handle (gint index, const gchar *name) {
   // here is where we first initialize for the clipboard
   // and for paste_as_new, and restore
@@ -3214,7 +3432,7 @@
 
 
 
-gboolean add_file_info(const gchar *check_handle, gboolean aud_only) {
+boolean add_file_info(const gchar *check_handle, boolean aud_only) {
   // file information has been retrieved, set struct cfile with details
   // contained in mainw->msg. We do this twice, once before opening the file, once again after.
   // The first time, frames and afilesize may not be correct.
@@ -3224,55 +3442,67 @@
   gchar *test_fps_string1;
   gchar *test_fps_string2;
 
-  if (check_handle!=NULL) {
-    if (mainw->msg==NULL||get_token_count(mainw->msg,'|')==1) return FALSE;
+ 
+  if (!strcmp(mainw->msg,"killed")) {
+    get_frame_count(mainw->current_file);
+    cfile->frames--; // just in case last frame is damaged
+    reget_afilesize(mainw->current_file);
+    mesg=g_strdup_printf(_("%d frames are enough !\n"),cfile->frames);
+    d_print(mesg);
+    g_free(mesg);
+  }
+  else {
+    if (check_handle!=NULL) {
+      if (mainw->msg==NULL||get_token_count(mainw->msg,'|')==1) return FALSE;
 
-    array=g_strsplit(mainw->msg,"|",-1);
+      array=g_strsplit(mainw->msg,"|",-1);
     
-    // sanity check handle against status file
-    // (this should never happen...)
+      // sanity check handle against status file
+      // (this should never happen...)
     
-    if (strcmp(check_handle,array[1])) {
-      LIVES_ERROR("Handle!=statusfile !");
-      mesg=g_strdup_printf(_("\nError getting file info for clip %s.\nBad things may happen with this clip.\n"),
-			   check_handle);
-      do_error_dialog(mesg);
-      g_free(mesg);
-      g_strfreev(array);
-      return FALSE;
-    }
+      if (strcmp(check_handle,array[1])) {
+	LIVES_ERROR("Handle!=statusfile !");
+	mesg=g_strdup_printf(_("\nError getting file info for clip %s.\nBad things may happen with this clip.\n"),
+			     check_handle);
+	do_error_dialog(mesg);
+	g_free(mesg);
+	g_strfreev(array);
+	return FALSE;
+      }
     
-    if (!aud_only) {
-      cfile->frames=atoi(array[2]);
-      g_snprintf(cfile->type,40,"%s",array[3]);
-      cfile->hsize=atoi(array[4]);
-      cfile->vsize=atoi(array[5]);
-      cfile->bpp=atoi(array[6]);
-      cfile->pb_fps=cfile->fps=g_strtod(array[7],NULL);
+      if (!aud_only) {
+	cfile->frames=atoi(array[2]);
+	g_snprintf(cfile->type,40,"%s",array[3]);
+	cfile->hsize=atoi(array[4]);
+	cfile->vsize=atoi(array[5]);
+	cfile->bpp=atoi(array[6]);
+	cfile->pb_fps=cfile->fps=g_strtod(array[7],NULL);
       
-      cfile->f_size=strtol(array[8],NULL,10);
-    }
+	cfile->f_size=strtol(array[8],NULL,10);
+      }
 
-    cfile->arps=cfile->arate=atoi(array[9]);
-    cfile->achans=atoi(array[10]);
-    cfile->asampsize=atoi(array[11]);
-    cfile->signed_endian=get_signed_endian(atoi (array[12]), atoi (array[13]));
-    cfile->afilesize=strtol(array[14],NULL,10);
+      cfile->arps=cfile->arate=atoi(array[9]);
+      cfile->achans=atoi(array[10]);
+      cfile->asampsize=atoi(array[11]);
+      cfile->signed_endian=get_signed_endian(atoi (array[12]), atoi (array[13]));
+      cfile->afilesize=strtol(array[14],NULL,10);
     
-    pieces=get_token_count (mainw->msg,'|');
+      pieces=get_token_count (mainw->msg,'|');
     
-    if (pieces>14&&array[15]!=NULL) {
-      g_snprintf (cfile->title,256,"%s",g_strstrip(array[15]));
-    }
-    if (pieces>15&&array[16]!=NULL) {
-      g_snprintf (cfile->author,256,"%s",g_strstrip(array[16]));
-    }
-    if (pieces>16&&array[17]!=NULL) {
-      g_snprintf (cfile->comment,256,"%s",g_strstrip(array[17]));
-    }
+      if (pieces>14&&array[15]!=NULL) {
+	g_snprintf (cfile->title,256,"%s",g_strstrip(array[15]));
+      }
+      if (pieces>15&&array[16]!=NULL) {
+	g_snprintf (cfile->author,256,"%s",g_strstrip(array[16]));
+      }
+      if (pieces>16&&array[17]!=NULL) {
+	g_snprintf (cfile->comment,256,"%s",g_strstrip(array[17]));
+      }
     
-    g_strfreev(array);
+      g_strfreev(array);
+    }
   }
+  cfile->video_time=0;
 
   if (aud_only) return TRUE;
 
@@ -3347,6 +3577,9 @@
     }
 
   }
+
+  cfile->video_time=(gdouble)cfile->frames/cfile->fps;
+
   if (cfile->opening) return TRUE;
 
   if (cfile->bpp==256) {
@@ -3361,7 +3594,8 @@
     mesg=g_strdup_printf (_ ("%s none\n"),mesg1);
   }
   else {
-    mesg=g_strdup_printf(_ ("%s %d Hz %d channel(s) %d bps\n"),mesg1,cfile->arate,cfile->achans,cfile->asampsize);
+    mesg=g_strdup_printf(P_ ("%s %d Hz %d channel %d bps\n","%s %d Hz %d channels %d bps\n",cfile->achans),
+			 mesg1,cfile->arate,cfile->achans,cfile->asampsize);
   }
   d_print(mesg);
   g_free(mesg1);
@@ -3377,7 +3611,7 @@
 }
 
 
-gboolean save_file_comments (int fileno) {
+boolean save_file_comments (int fileno) {
   // save the comments etc for smogrify
   int retval;
   int comment_fd;
@@ -3430,12 +3664,12 @@
 # define STOP_GIVE_UP_TIME 1.0
 
   gdouble time_waited=0.;
-  gboolean sent_second_stop=FALSE;
+  boolean sent_second_stop=FALSE;
   
   // send another stop if necessary
   mainw->noswitch=TRUE;
   while (!(infofile=fopen(cfile->info_file,"r"))) {
-    while (g_main_context_iteration(NULL,FALSE));
+    lives_widget_context_update();
     g_usleep(prefs->sleep_time);
     time_waited+=1000000./prefs->sleep_time;
     if (time_waited>SECOND_STOP_TIME&&!sent_second_stop) {
@@ -3454,21 +3688,28 @@
 }
 
 
-gboolean save_frame_inner(gint clip, gint frame, const gchar *file_name, gint width, gint height, gboolean allow_over) {
+boolean save_frame_inner(int clip, int frame, const gchar *file_name, int width, int height, boolean from_osc) {
   // save 1 frame as an image (uses imagemagick to convert)
   // width==-1, height==-1 to use "natural" values
-  gint result;
-  gchar *com,*tmp;
-  gchar full_file_name[PATH_MAX];
+
   file *sfile=mainw->files[clip];
+  gchar full_file_name[PATH_MAX];
+  gchar *com,*tmp;
 
-  if (strrchr(file_name,'.')==NULL) {
-    g_snprintf(full_file_name,PATH_MAX,"%s.%s",file_name,sfile->img_type==IMG_TYPE_JPEG?"jpg":"png");
+  boolean allow_over=FALSE;
+  int result;
+
+  if (!from_osc&&strrchr(file_name,'.')==NULL) {
+    g_snprintf(full_file_name,PATH_MAX,"%s.%s",file_name,get_image_ext_for_type(sfile->img_type));
   }
   else {
     g_snprintf(full_file_name,PATH_MAX,"%s",file_name);
+    if (!allow_over) allow_over=TRUE;
   }
 
+  // TODO - allow overwriting in sandbox
+  if (from_osc&&g_file_test (full_file_name, G_FILE_TEST_EXISTS)) return FALSE;
+
   if (!check_file(full_file_name,!allow_over)) return FALSE;
 
   tmp=g_filename_from_utf8 (full_file_name,-1,NULL,NULL,NULL);
@@ -3479,14 +3720,15 @@
     g_free(com);
     
     if (sfile->clip_type==CLIP_TYPE_FILE) {
-      gboolean resb=virtual_to_images(clip,frame,frame,FALSE);
+      boolean resb=virtual_to_images(clip,frame,frame,FALSE);
       if (!resb) {
 	d_print_file_error_failed();
 	return FALSE;
       }
     }
 
-    com=g_strdup_printf("smogrify save_frame \"%s\" %d \"%s\" %d %d",sfile->handle,frame,tmp,width,height);
+    com=g_strdup_printf("%s save_frame %s %d %s %d %d",prefs->backend_sync,sfile->handle,
+			frame,tmp,width,height);
     result=lives_system(com,FALSE);
     g_free(com);
     g_free(tmp);
@@ -3509,8 +3751,8 @@
     int retval;
 
     mt_show_current_frame(mainw->multitrack,TRUE);
+    resize_layer(mainw->frame_layer,sfile->hsize,sfile->vsize,LIVES_INTERP_BEST,WEED_PALETTE_RGB24,0);
     convert_layer_palette(mainw->frame_layer,WEED_PALETTE_RGB24,0);
-    resize_layer(mainw->frame_layer,sfile->hsize,sfile->vsize,LIVES_INTERP_BEST);
     pixbuf=layer_to_pixbuf(mainw->frame_layer);
     weed_plant_free(mainw->frame_layer);
     mainw->frame_layer=NULL;
@@ -3529,7 +3771,7 @@
     } while (retval==LIVES_RETRY);
 
     free(tmp);
-    gdk_pixbuf_unref(pixbuf);
+    lives_object_unref(pixbuf);
   }
 
   // some other error condition
@@ -3538,25 +3780,31 @@
 
 
 void backup_file(int clip, int start, int end, const gchar *file_name) {
-  gchar *com,*tmp;
-  gchar title[256];
+  file *sfile=mainw->files[clip];
   gchar **array;
+
+  gchar title[256];
   gchar full_file_name[PATH_MAX];
-  gint withsound=1;
-  gboolean with_perf=FALSE,retval;
-  gint current_file=mainw->current_file;
 
-  file *sfile=mainw->files[clip];
+  gchar *com,*tmp;
+
+  boolean with_perf=FALSE;
+  boolean retval,allow_over;
+
+  int withsound=1;
+  int current_file=mainw->current_file;
 
   if (strrchr(file_name,'.')==NULL) {
     g_snprintf(full_file_name,PATH_MAX,"%s.lv1",file_name);
+    allow_over=FALSE;
    }
   else {
     g_snprintf(full_file_name,PATH_MAX,"%s",file_name);
+    allow_over=TRUE;
   }
 
   // check if file exists
-  if (!check_file(full_file_name,TRUE)) return;
+  if (!check_file(full_file_name,allow_over)) return;
 
   // create header files
   retval=write_headers(sfile); // for pre LiVES 0.9.6
@@ -3580,7 +3828,7 @@
   cfile->progress_end=sfile->frames;
 
   if (sfile->clip_type==CLIP_TYPE_FILE) {
-    gboolean resb;
+    boolean resb;
     mainw->cancelled=CANCEL_NONE;
     cfile->progress_start=1;
     cfile->progress_end=count_virtual_frames(sfile->frame_index,1,sfile->frames);
@@ -3598,7 +3846,8 @@
     }
   }
 
-  com=g_strdup_printf("smogrify backup \"%s\" %d %d %d \"%s\"",sfile->handle,withsound,start,end,(tmp=g_filename_from_utf8 (full_file_name,-1,NULL,NULL,NULL)));
+  com=g_strdup_printf("%s backup %s %d %d %d %s",prefs->backend,sfile->handle,withsound,
+		      start,end,(tmp=g_filename_from_utf8 (full_file_name,-1,NULL,NULL,NULL)));
 
   // TODO
   mainw->current_file=clip;
@@ -3628,8 +3877,9 @@
     g_free (com);
 
     // using restore details in the 'wrong' way here...it will also clear files
-    com=g_strdup_printf("smogrify restore_details \"%s\"",cfile->handle);
+    com=g_strdup_printf("%s restore_details %s",prefs->backend,cfile->handle);
     unlink (cfile->info_file);
+
     lives_system(com,FALSE);
     // auto-d
     g_free(com);
@@ -3673,7 +3923,7 @@
 }
 
 
-gboolean write_headers (file *file) {
+boolean write_headers (file *file) {
   // this function is included only for backwards compatibility with ancient builds of LiVES
   //
 
@@ -3750,7 +4000,7 @@
 }
 
 
-gboolean read_headers(const gchar *file_name) {
+boolean read_headers(const gchar *file_name) {
   // file_name is only used to get the file size on the disk
   FILE *infofile;
   gchar **array;
@@ -3769,8 +4019,8 @@
 
   lives_clip_details_t detail;
 
-  gboolean timeout;
-  gboolean retval,retvala;
+  boolean timeout;
+  boolean retval,retvala;
 
   ssize_t sizhead=8*4+8+8;
 
@@ -3782,7 +4032,7 @@
   if (!stat(lives_header,&mystat)) new_time=mystat.st_mtime;
   ///////////////
 
-  if (old_time<new_time) {
+  if (old_time<=new_time) {
     do {
       retval2=0;
 
@@ -3796,7 +4046,7 @@
 	g_free(old_hdrfile);
 
 	// clean up and get file sizes
-	com=g_strdup_printf("smogrify restore_details \"%s\" \"%s\" %d",cfile->handle,
+	com=g_strdup_printf("%s restore_details %s %s %d",prefs->backend_sync,cfile->handle,
 			    (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),!strcmp (file_name,"."));
 
 	mainw->com_failed=FALSE;
@@ -4056,7 +4306,7 @@
     cfile->signed_endian=mainw->endian;
   }
   
-  com=g_strdup_printf("smogrify restore_details \"%s\" \"%s\" %d",cfile->handle,
+  com=g_strdup_printf("%s restore_details %s %s %d",prefs->backend_sync,cfile->handle,
 		      (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),!strcmp (file_name,"."));
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
@@ -4128,14 +4378,14 @@
 
 void open_set_file (const gchar *set_name, gint clipnum) {
   gchar name[256];
-  gboolean needs_update=FALSE;
+  boolean needs_update=FALSE;
 
   if (mainw->current_file<1) return;
 
   memset (name,0,256);
 
   if (mainw->cached_list!=NULL) {
-    gboolean retval;
+    boolean retval;
     // LiVES 0.9.6+
 
     retval=get_clip_value(mainw->current_file,CLIP_DETAILS_PB_FPS,&cfile->pb_fps,0);
@@ -4154,7 +4404,7 @@
     }
     retval=get_clip_value(mainw->current_file,CLIP_DETAILS_UNIQUE_ID,&cfile->unique_id,0);
     if (!retval) {
-      cfile->unique_id=random();
+      cfile->unique_id=lives_random();
       needs_update=TRUE;
     }
     retval=get_clip_value(mainw->current_file,CLIP_DETAILS_INTERLACE,&cfile->interlace,0);
@@ -4210,12 +4460,12 @@
 void restore_file(const gchar *file_name) {
   gchar *com=g_strdup("dummy");
   gchar *mesg,*mesg1,*tmp;
-  gboolean is_OK=TRUE;
+  boolean is_OK=TRUE;
   gchar *fname=g_strdup(file_name);
 
   gint old_file=mainw->current_file,current_file;
   gint new_file=mainw->first_free_file;
-  gboolean not_cancelled;
+  boolean not_cancelled;
 
   gchar *subfname;
 
@@ -4224,6 +4474,7 @@
     return;
   }
   
+
   mesg=g_strdup_printf(_ ("Restoring %s..."),file_name);
   d_print(mesg);
   g_free(mesg);
@@ -4236,13 +4487,17 @@
   switch_to_file((mainw->current_file=old_file),new_file);
   set_main_title(cfile->file_name,0);
   
-  com=g_strdup_printf("smogrify restore \"%s\" \"%s\"",cfile->handle,
+  
+  com=g_strdup_printf("%s restore %s %s",prefs->backend,cfile->handle,
 		      (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+
   mainw->com_failed=FALSE;
+  unlink (cfile->info_file);
+
   lives_system(com,FALSE);
+
   g_free(tmp);
   g_free(com);
-  unlink (cfile->info_file);
   
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
@@ -4328,7 +4583,8 @@
     mesg=g_strdup_printf (_ ("%s none\n"),mesg1);
   }
   else {
-    mesg=g_strdup_printf(_ ("%s %d Hz %d channel(s) %d bps\n"),mesg1,cfile->arate,cfile->achans,cfile->asampsize);
+    mesg=g_strdup_printf(P_ ("%s %d Hz %d channel %d bps\n","%s %d Hz %d channels %d bps\n",cfile->achans),
+			 mesg1,cfile->arate,cfile->achans,cfile->asampsize);
   }
   d_print(mesg);
   g_free(mesg);
@@ -4452,9 +4708,9 @@
 
 static gdouble scrap_mb;  // MB written to frame file
 static gdouble ascrap_mb;  // MB written to audio file
-static gulong free_mb; // MB free to write
+static uint64_t free_mb; // MB free to write
 
-gboolean open_scrap_file (void) {
+boolean open_scrap_file (void) {
   // create a scrap file for recording generated video frames
   gint current_file=mainw->current_file;
   gint new_file=mainw->first_free_file;
@@ -4492,7 +4748,7 @@
 
 
 
-gboolean open_ascrap_file (void) {
+boolean open_ascrap_file (void) {
   // create a scrap file for recording audio
   gint current_file=mainw->current_file;
   gint new_file=mainw->first_free_file;
@@ -4535,7 +4791,7 @@
 
 
 
-gboolean load_from_scrap_file(weed_plant_t *layer, int frame) {
+boolean load_from_scrap_file(weed_plant_t *layer, int frame) {
   // load raw frame data from scrap file
 
   // this will also set cfile width and height - for letterboxing etc.
@@ -4551,7 +4807,6 @@
 
   gchar *oname=g_strdup_printf ("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,frame);
 
-  gchar buf[sizint+1];
 
   ssize_t bytes;
   ssize_t tsize;
@@ -4562,47 +4817,43 @@
 
   if (fd==-1) return FALSE;
 
-  memset(&buf[sizint],0,1);
+#ifdef IS_MINGW
+  setmode(fd,O_BINARY);
+#endif
 
-  bytes=read(fd,buf,sizint);
+  bytes=lives_read_le(fd,&palette,4,TRUE);
   if (bytes<sizint) return FALSE;
 
-  palette=atoi(buf);
   weed_set_int_value(layer,"current_palette",palette);
 
   if (weed_palette_is_yuv_palette(palette)) {
 
-    bytes=lives_read_le(fd,buf,4,TRUE);
+    bytes=lives_read_le(fd,&clamping,4,TRUE);
     if (bytes<4) return FALSE;
-    
-    clamping=atoi(buf);
+
     weed_set_int_value(layer,"YUV_clamping",clamping);
 
-    bytes=lives_read_le(fd,buf,4,TRUE);
+    bytes=lives_read_le(fd,&subspace,4,TRUE);
     if (bytes<4) return FALSE;
     
-    subspace=atoi(buf);
     weed_set_int_value(layer,"YUV_subspace",subspace);
 
-    bytes=lives_read_le(fd,buf,4,TRUE);
+    bytes=lives_read_le(fd,&sampling,4,TRUE);
     if (bytes<4) return FALSE;
     
-    sampling=atoi(buf);
     weed_set_int_value(layer,"YUV_sampling",sampling);
   }
 
 
-  bytes=lives_read_le(fd,buf,4,TRUE);
+  bytes=lives_read_le(fd,&width,4,TRUE);
   if (bytes<4) return FALSE;
 
-  width=atoi(buf);
   weed_set_int_value(layer,"width",width);
 
 
-  bytes=lives_read_le(fd,buf,4,TRUE);
+  bytes=lives_read_le(fd,&height,4,TRUE);
   if (bytes<4) return FALSE;
 
-  height=atoi(buf);
   weed_set_int_value(layer,"height",height);
 
 
@@ -4611,12 +4862,11 @@
   rowstrides=(int *)g_malloc(nplanes*sizint);
 
   for (i=0;i<nplanes;i++) {
-    bytes=lives_read_le(fd,buf,4,TRUE);
+    bytes=lives_read_le(fd,&rowstrides[i],4,TRUE);
     if (bytes<4) {
       g_free(rowstrides);
       return FALSE;
     }
-    rowstrides[i]=atoi(buf);
   }
 
   weed_set_int_array(layer,"rowstrides",nplanes,rowstrides);
@@ -4653,7 +4903,7 @@
 
 
 
-gint save_to_scrap_file (weed_plant_t *layer) {
+int save_to_scrap_file (weed_plant_t *layer) {
   // returns frame number
 
   // dump the raw frame data to a file (in machine endian format)
@@ -4676,14 +4926,14 @@
 
   int i;
 
-  gboolean wrtable=TRUE;
+  boolean wrtable=TRUE;
 
   void **pdata;
 
   gchar *oname=g_strdup_printf ("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,
 				mainw->files[mainw->scrap_file]->frames+1);
 
-  gchar *buf,*framecount;
+  gchar *framecount;
 
   struct stat filestat;
 
@@ -4698,13 +4948,15 @@
     return mainw->files[mainw->scrap_file]->frames;
   }
 
+#ifdef IS_MINGW
+  setmode(fd,O_BINARY);
+#endif
+
   mainw->write_failed=FALSE;
 
   // write current_palette, rowstrides and height
   palette=weed_get_int_value(layer,"current_palette",&error);
-  buf=g_strdup_printf("%d",palette);
-  lives_write(fd,buf,sizint,TRUE);
-  g_free(buf);
+  lives_write_le(fd,&palette,4,TRUE);
 
   if (mainw->write_failed) {
     g_free(oname);
@@ -4716,46 +4968,33 @@
       clamping=weed_get_int_value(layer,"YUV_clamping",&error);
     }
     else clamping=WEED_YUV_CLAMPING_CLAMPED;
-    buf=g_strdup_printf("%d",clamping);
-    lives_write(fd,buf,sizint,TRUE);
-    g_free(buf);
+    lives_write_le(fd,&clamping,4,TRUE);
 
     if (weed_plant_has_leaf(layer,"YUV_subspace")) {
       subspace=weed_get_int_value(layer,"YUV_subspace",&error);
     }
     else subspace=WEED_YUV_SUBSPACE_YUV;
-    buf=g_strdup_printf("%d",subspace);
-    lives_write(fd,buf,sizint,TRUE);
-    g_free(buf);
+    lives_write_le(fd,&subspace,4,TRUE);
 
     if (weed_plant_has_leaf(layer,"YUV_sampling")) {
       sampling=weed_get_int_value(layer,"YUV_sampling",&error);
     }
     else sampling=WEED_YUV_SAMPLING_DEFAULT;
-    buf=g_strdup_printf("%d",sampling);
-    lives_write(fd,buf,sizint,TRUE);
-    g_free(buf);
+    lives_write_le(fd,&sampling,4,TRUE);
   }
 
   width=weed_get_int_value(layer,"width",&error);
-  buf=g_strdup_printf("%d",width);
-  lives_write(fd,buf,sizint,TRUE);
-  g_free(buf);
+  lives_write_le(fd,&width,4,TRUE);
 
   height=weed_get_int_value(layer,"height",&error);
-  buf=g_strdup_printf("%d",height);
-  lives_write(fd,buf,sizint,TRUE);
-  g_free(buf);
-  
+  lives_write_le(fd,&height,4,TRUE);
 
   nplanes=weed_palette_get_numplanes(palette);
   
   rowstrides=weed_get_int_array(layer,"rowstrides",&error);
   
   for (i=0;i<nplanes;i++) {
-    buf=g_strdup_printf("%d",rowstrides[i]);
-    lives_write(fd,buf,sizint,TRUE);
-    g_free(buf);
+    lives_write_le(fd,&rowstrides[i],4,TRUE);
   }
   
    
@@ -4769,12 +5008,12 @@
   
   fstat(fd,&filestat);
 
-  scrap_mb+=(gdouble)(filestat.st_size)/1000000.;
+  scrap_mb+=(double)(filestat.st_size)/1000000.;
 
   // check free space every 1000 frames or every 10 MB of audio (TODO ****)
   if (mainw->files[mainw->scrap_file]->frames%1000==0) {
     gchar *dir=g_build_filename(prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,NULL);
-    free_mb=(gdouble)get_fs_free(dir)/1000000.;
+    free_mb=(double)get_fs_free(dir)/1000000.;
     if (free_mb==0) wrtable=is_writeable_dir(dir);
     g_free(dir);
   }
@@ -4797,7 +5036,7 @@
     g_free(framecount);
   }
 
-  fsync(fd); // try to sync file access, to make saving smoother
+  lives_fsync(fd); // try to sync file access, to make saving smoother
   close(fd);
 
   weed_free(rowstrides);
@@ -4806,15 +5045,15 @@
   g_free(oname);
 
   // check if we have enough free space left on the volume
-  if ((glong)(((gdouble)free_mb-(scrap_mb+ascrap_mb))/1000.)<prefs->rec_stop_gb) {
+  if ((int64_t)(((double)free_mb-(scrap_mb+ascrap_mb))/1000.)<prefs->rec_stop_gb) {
     // check free space again
     gchar *dir=g_build_filename(prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,NULL);
-    free_mb=(gdouble)get_fs_free(dir)/1000000.;
+    free_mb=(double)get_fs_free(dir)/1000000.;
     if (free_mb==0) wrtable=is_writeable_dir(dir);
     else wrtable=TRUE;
 
     if (wrtable) {
-      if ((glong)(((gdouble)free_mb-(scrap_mb+ascrap_mb))/1000.)<prefs->rec_stop_gb) {
+      if ((int64_t)(((double)free_mb-(scrap_mb+ascrap_mb))/1000.)<prefs->rec_stop_gb) {
 	if (mainw->record&&!mainw->record_paused) {
 	  gchar *msg=g_strdup_printf(_("\nRECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %ld GB !\nRecord stop level can be set in Preferences.\n"),dir,prefs->rec_stop_gb);
 	  d_print(msg);
@@ -4832,7 +5071,7 @@
 
 
 void close_scrap_file (void) {
-  gint current_file=mainw->current_file;
+  int current_file=mainw->current_file;
 
   if (mainw->scrap_file==-1) return;
 
@@ -4849,7 +5088,7 @@
 
 
 void close_ascrap_file (void) {
-  gint current_file=mainw->current_file;
+  int current_file=mainw->current_file;
 
   if (mainw->ascrap_file==-1) return;
 
@@ -4868,8 +5107,11 @@
 void recover_layout_map(gint numclips) {
   // load global layout map for a set and assign entries to clips [mainw->files[i]->layout_map]
   GList *mlist,*lmap_node,*lmap_node_next,*lmap_entry_list,*lmap_entry_list_next;
+
   layout_map *lmap_entry;
+
   gchar **array;
+  gchar *check_handle;
   
   if (numclips>MAX_FILES) numclips=MAX_FILES;
 
@@ -4882,7 +5124,15 @@
       while (lmap_node!=NULL) {
 	lmap_node_next=lmap_node->next;
 	lmap_entry=(layout_map *)lmap_node->data;
-	if (!strcmp(mainw->files[i]->handle,lmap_entry->handle)&&(mainw->files[i]->unique_id==lmap_entry->unique_id)) {
+
+	check_handle=g_strdup(mainw->files[i]->handle);
+
+	if (strstr(lmap_entry->handle,"/")==NULL) {
+	  g_free(check_handle);
+	  check_handle=g_path_get_basename(mainw->files[i]->handle);
+	}
+
+	if (!strcmp(check_handle,lmap_entry->handle)&&(mainw->files[i]->unique_id==lmap_entry->unique_id)) {
 	  // check handle and unique id match
 	  // got a match, assign list to layout_map and delete this node
 	  lmap_entry_list=lmap_entry->list;
@@ -4909,6 +5159,8 @@
 	  if (lmap_node_next!=NULL) lmap_node_next->prev=lmap_node->prev;
 	  //g_free(lmap_node);   // i don't know why, but this causes a segfault
 	}
+
+	g_free(check_handle);
 	lmap_node=lmap_node_next;
       }
     }
@@ -4934,17 +5186,20 @@
 
 
 
-static gboolean recover_files(gchar *recovery_file, gboolean auto_recover) {
+static boolean recover_files(gchar *recovery_file, boolean auto_recover) {
   FILE *rfile;
   gchar buff[256],*buffptr;
   gchar *clipdir;
+  gchar *cwd=g_get_current_dir();
 
   int retval;
-  gint new_file,clipnum=0;
-  gboolean last_was_normal_file=FALSE;
-  gboolean is_scrap;
-  gboolean is_ascrap;
-  gboolean did_set_check=FALSE;
+  int new_file,clipnum=0;
+
+  boolean last_was_normal_file=FALSE;
+  boolean is_scrap;
+  boolean is_ascrap;
+  boolean did_set_check=FALSE;
+  boolean needs_update=FALSE;
 
   const lives_clip_data_t *cdata=NULL;
 
@@ -5006,7 +5261,7 @@
 	switch_to_file((mainw->current_file=0),current_file);
       }
       reset_clip_menu();
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       threaded_dialog_spin();
 
       if (mainw->read_failed) {
@@ -5117,7 +5372,7 @@
 	}
 	else {
 	  lives_clip_details_t detail;
-	  gint asigned,aendian;
+	  int asigned,aendian;
 	  detail=CLIP_DETAILS_ACHANS;
 	  retval=get_clip_value(mainw->current_file,detail,&cfile->achans,0);
 	  if (!retval) cfile->achans=0;
@@ -5165,8 +5420,13 @@
       if (mainw->current_file<1) continue;
 
       if (load_frame_index(mainw->current_file)) {
+	// cd to clip directory - so decoder plugins can write temp files
+	gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+	boolean next=FALSE;
+
+	lives_chdir(ppath,FALSE);
+	g_free(ppath);
 
-	gboolean next=FALSE;
 	while (1) {
 	  threaded_dialog_spin();
 	  if ((cdata=get_decoder_cdata(cfile,NULL))==NULL) {
@@ -5196,10 +5456,17 @@
       }
 
       if (cfile->ext_src!=NULL) {
-	check_clip_integrity(cfile,cdata);
+	check_clip_integrity(mainw->current_file,cdata);
       }
       else {
-	if (is_scrap||!check_frame_count(mainw->current_file)) get_frame_count(mainw->current_file);
+	if (is_scrap||!check_frame_count(mainw->current_file)) {
+	  get_frame_count(mainw->current_file);
+	  needs_update=TRUE;
+	}
+	if (!is_scrap&&cfile->frames>0&&(cfile->hsize*cfile->vsize==0)) {
+	  get_frames_sizes(mainw->current_file,1);
+	  needs_update=TRUE;
+	}
 	if (is_ascrap&&cfile->afilesize==0) reget_afilesize(mainw->current_file);
       }
   
@@ -5220,8 +5487,13 @@
 	if (mainw->current_file<1) continue;
 	
 	get_total_time (cfile);
-	if (cfile->achans) cfile->aseek_pos=(long)((gdouble)(cfile->frameno-1.)/cfile->fps*cfile->arate*
+	if (cfile->achans) cfile->aseek_pos=(int64_t)((gdouble)(cfile->frameno-1.)/cfile->fps*cfile->arate*
 						   cfile->achans*(cfile->asampsize/8));
+
+	if (needs_update) {
+	  save_clip_values(mainw->current_file);
+	  needs_update=FALSE;
+	}
 	
 	// add to clip menu
 	threaded_dialog_spin();
@@ -5230,6 +5502,7 @@
 	cfile->start=cfile->frames>0?1:0;
 	cfile->end=cfile->frames;
 	cfile->is_loaded=TRUE;
+	cfile->changed=TRUE;
 	unlink (cfile->info_file);
 	set_main_title(cfile->name,0);
 	
@@ -5242,9 +5515,9 @@
 	  get_total_time(cfile);
 	  mainw->current_file=mainw->multitrack->render_file;
 	  mt_init_clips(mainw->multitrack,current_file,TRUE);
-	  while (g_main_context_iteration(NULL,FALSE));
+	  lives_widget_context_update();
 	  mt_clip_select(mainw->multitrack,TRUE);
-	  while (g_main_context_iteration(NULL,FALSE));
+	  lives_widget_context_update();
 	  mainw->current_file=current_file;
 	}
 	
@@ -5261,6 +5534,9 @@
     }
   }
 
+  lives_chdir(cwd,FALSE);
+  g_free(cwd);
+
   end_threaded_dialog();
 
   fclose(rfile);
@@ -5275,7 +5551,7 @@
     mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
   }
   else {
-    gint start_file=mainw->current_file;
+    int start_file=mainw->current_file;
     if (mainw->current_file>1&&mainw->current_file==mainw->ascrap_file&&mainw->files[mainw->current_file-1]!=NULL) {
       start_file--;
     }
@@ -5300,7 +5576,11 @@
 
 
 void add_to_recovery_file (const gchar *handle) {
+#ifndef IS_MINGW
   gchar *com=g_strdup_printf("/bin/echo \"%s\" >> \"%s\"",handle,mainw->recovery_file);
+#else
+  gchar *com=g_strdup_printf("echo.exe \"%s\" >> \"%s\"",handle,mainw->recovery_file);
+#endif
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   g_free(com);
@@ -5318,12 +5598,15 @@
 
 void rewrite_recovery_file(void) {
   // part of the crash recovery system
-  int i;
+  GList *clist=mainw->cliplist;
   gchar *recovery_entry;
+
+  boolean opened=FALSE;
+
   int recovery_fd=-1;
   int retval;
-  GList *clist=mainw->cliplist;
-  gboolean opened=FALSE;
+
+  register int i;
 
   if (clist==NULL) {
     unlink(mainw->recovery_file);
@@ -5366,17 +5649,24 @@
 }
 
 
-gboolean check_for_recovery_files (gboolean auto_recover) {
-  gboolean retval=FALSE;
-  gchar *recovery_file,*recovery_numbering_file;
-  guint recpid=0;
+boolean check_for_recovery_files (boolean auto_recover) {
+  uint32_t recpid=0;
 
   ssize_t bytes;
-  int info_fd;
+
+  gchar *recovery_file,*recovery_numbering_file;
   gchar *info_file=g_strdup_printf("%s/.recovery.%d",prefs->tmpdir,getpid());
   gchar *com;
 
-  com=g_strdup_printf("smogrify get_recovery_file %d %d \"%s\" recovery> \"%s\"",getuid(),getgid(),
+  boolean retval=FALSE;
+
+  int info_fd;
+  int lgid=lives_getgid();
+  int luid=lives_getuid();
+
+  pid_t lpid=lives_getpid();
+
+  com=g_strdup_printf("%s get_recovery_file %d %d %s recovery> \"%s\"",prefs->backend_sync,luid,lgid,
 			     capable->myname,info_file);
   
   unlink(info_file);
@@ -5404,23 +5694,35 @@
 
   if (recpid==0) return FALSE;
   
-  retval=recover_files((recovery_file=g_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,getuid(),
-						      getgid(),recpid)),auto_recover);
+  retval=recover_files((recovery_file=g_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,luid,
+						      lgid,recpid)),auto_recover);
   unlink(recovery_file);
   g_free(recovery_file);
   
   mainw->com_failed=FALSE;
 
   // check for layout recovery file
-  recovery_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),recpid);
+  recovery_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,luid,lgid,recpid);
   if (g_file_test (recovery_file, G_FILE_TEST_EXISTS)) {
     // move files temporarily to stop them being cleansed
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/.layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,getuid(),getgid(),getpid());
+#ifndef IS_MINGW
+    com=g_strdup_printf("/bin/mv \"%s\" \"%s/.layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
+			lgid,lpid);
+#else
+    com=g_strdup_printf("mv.exe \"%s\" \"%s/.layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
+			lgid,lpid);
+#endif
     lives_system(com,FALSE);
     g_free(com);
-    recovery_numbering_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),recpid);
+    recovery_numbering_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,luid,
+					    lgid,recpid);
+#ifndef IS_MINGW
     com=g_strdup_printf("/bin/mv \"%s\" \"%s/.layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,
-			getuid(),getgid(),getpid());
+			luid,lgid,lpid);
+#else
+    com=g_strdup_printf("mv.exe \"%s\" \"%s/.layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,
+			luid,lgid,lpid);
+#endif
     lives_system(com,FALSE);
     g_free(com);
     g_free(recovery_numbering_file);
@@ -5434,20 +5736,31 @@
   
   if (mainw->com_failed) return FALSE;
 
-  com=g_strdup_printf("smogrify clean_recovery_files %d %d \"%s\"",getuid(),getgid(),capable->myname);
+  com=g_strdup_printf("%s clean_recovery_files %d %d \"%s\"",prefs->backend_sync,luid,lgid,capable->myname);
   lives_system(com,FALSE);
   g_free(com);
 
   if (mainw->recoverable_layout) {
-    recovery_file=g_strdup_printf("%s/.layout.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,getuid(),getgid(),getpid());
+    recovery_file=g_strdup_printf("%s/.layout.%d.%d.%d",prefs->tmpdir,luid,lgid,lpid);
+#ifndef IS_MINGW
+    com=g_strdup_printf("/bin/mv \"%s\" \"%s/layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
+			lgid,lpid);
+#else
+    com=g_strdup_printf("mv.exe \"%s\" \"%s/layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
+			lgid,lpid);
+#endif
     lives_system(com,FALSE);
     g_free(com);
     g_free(recovery_file);
 
-    recovery_numbering_file=g_strdup_printf("%s/.layout_numbering.%d.%d.%d",prefs->tmpdir,getuid(),getgid(),getpid());
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,getuid(),
-			getgid(),getpid());
+    recovery_numbering_file=g_strdup_printf("%s/.layout_numbering.%d.%d.%d",prefs->tmpdir,luid,lgid,lpid);
+#ifndef IS_MINGW
+    com=g_strdup_printf("/bin/mv \"%s\" \"%s/layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,luid,
+			lgid,lpid);
+#else
+    com=g_strdup_printf("mv.exe \"%s\" \"%s/layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,luid,
+			lgid,lpid);
+#endif
     lives_system(com,FALSE);
     g_free(com);
     g_free(recovery_numbering_file);

LiVES-1.6.1.tar.bz2/src/startup.c -> LiVES-2.0.3.tar.bz2/src/startup.c Changed

@@ -1,6 +1,6 @@
 // startup.c
 // LiVES
-// (c) G. Finch 2010 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2010 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -15,19 +15,22 @@
 
 
 
-static gboolean prompt_existing_dir(gchar *dirname, guint64 freespace, gboolean wrtable) {
+static boolean prompt_existing_dir(gchar *dirname, guint64 freespace, boolean wrtable) {
   gchar *msg;
-  gboolean res=FALSE;
+  boolean res=FALSE;
 
   if (wrtable) {
     gchar *fspstr=lives_format_storage_space_string(freespace);
-    msg=g_strdup_printf(_("A directory named\n%s\nalready exists. Do you wish to use this directory ?\n\n(Free space = %s)\n"),dirname,fspstr);
+    msg=g_strdup_printf
+      (_("A directory named\n%s\nalready exists. Do you wish to use this directory ?\n\n(Free space = %s)\n"),dirname,fspstr);
     g_free(fspstr);
     res=do_yesno_dialog(msg);
   }
   else
     {
-      msg=g_strdup_printf(_("A directory named\n%s\nalready exists.\nLiVES could not write to this directory or read its free space.\nPlease select another location.\n"),dirname);
+      msg=g_strdup_printf
+	(_("A directory named\n%s\nalready exists.\nLiVES could not write to this directory or read its free space.\nPlease select another location.\n"),
+	 dirname);
       do_error_dialog(msg);
     }
   g_free(msg);
@@ -38,8 +41,8 @@
 
 
 
-static gboolean prompt_new_dir(gchar *dirname, guint64 freespace, gboolean wrtable) {
-  gboolean res=FALSE;
+static boolean prompt_new_dir(gchar *dirname, guint64 freespace, boolean wrtable) {
+  boolean res=FALSE;
   gchar *msg;
   if (wrtable) {
     gchar *fspstr=lives_format_storage_space_string(freespace);
@@ -51,6 +54,7 @@
     msg=g_strdup_printf(_("\nLiVES could not write to the directory\n%s\nPlease try again and choose a different location.\n"),dirname);
     do_error_dialog(msg);
   }
+
   g_free(msg);
   return res;
 }
@@ -58,13 +62,16 @@
 
 
 
-gboolean do_tempdir_query(void) {
-  gint response;
-  gboolean ok=FALSE;
+boolean do_tempdir_query(void) {
+  int response;
+  boolean ok=FALSE;
   _entryw *tdentry;
-  gchar *com,*dirname;
+  gchar *dirname;
   guint64 freesp;
 
+#ifndef IS_MINGW
+  gchar *com;
+#endif
 
  top:
 
@@ -137,16 +144,16 @@
   g_free(tdentry);
 
   mainw->com_failed=FALSE;
-  com=g_strdup_printf ("/bin/mkdir -p \"%s\" 2>/dev/null",dirname);
-  lives_system (com,FALSE);
-  g_free (com);
-
-  if (mainw->com_failed) goto top;
 
+  if (!g_file_test(dirname,G_FILE_TEST_IS_DIR)) {
+    if (g_mkdir_with_parents(dirname,S_IRWXU)==-1) goto top;
+  }
 
-  com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",prefs->tmpdir);
-  lives_system(com,TRUE);
-  g_free(com);
+#ifndef IS_MINGW
+  com=g_strdup_printf ("/bin/chmod 777 \"%s\" 2>/dev/null",dirname);
+  lives_system (com,FALSE);
+  g_free (com);
+#endif
 
   g_snprintf(prefs->tmpdir,PATH_MAX,"%s",dirname);
   g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
@@ -154,7 +161,11 @@
   set_pref("tempdir",prefs->tmpdir);
   set_pref("session_tempdir",prefs->tmpdir);
 
-  g_snprintf(mainw->first_info_file,PATH_MAX,"%s/.info.%d",prefs->tmpdir,getpid());
+#ifndef IS_MINGW
+  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S".info.%d",prefs->tmpdir,getpid());
+#else
+  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S"info.%d",prefs->tmpdir,getpid());
+#endif
 
   g_free(dirname);
   return TRUE;
@@ -167,7 +178,7 @@
 static void on_init_aplayer_toggled (GtkToggleButton *tbutton, gpointer user_data) {
   gint audp=GPOINTER_TO_INT(user_data);
 
-  if (!gtk_toggle_button_get_active(tbutton)) return;
+  if (!lives_toggle_button_get_active(tbutton)) return;
 
   prefs->audio_player=audp;
 
@@ -191,11 +202,15 @@
 
 
 
-gboolean do_audio_choice_dialog(short startup_phase) {
+boolean do_audio_choice_dialog(short startup_phase) {
   GtkWidget *dialog,*dialog_vbox,*radiobutton0,*radiobutton1,*radiobutton2,*radiobutton3,*label;
   GtkWidget *okbutton,*cancelbutton;
-  GtkWidget *eventbox,*hbox;
+  GtkWidget *hbox;
+
+  GtkAccelGroup *accel_group;
+
   GSList *radiobutton_group = NULL;
+
   gchar *txt0,*txt1,*txt2,*txt3,*txt4,*txt5,*txt6,*txt7,*msg;
 
   gint response;
@@ -234,7 +249,7 @@
 
   txt5=g_strdup(_("SOX may be used if neither of the preceding players work, "));
 
-  if (capable->has_sox) {
+  if (capable->has_sox_play) {
     txt6=g_strdup(_("but some audio features will be disabled.\n\n"));
   }
   else {
@@ -259,199 +274,115 @@
   g_free(txt6);
   g_free(txt7);
 
-  dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Choose an audio player"));
+  dialog = lives_standard_dialog_new (_("LiVES: - Choose an audio player"),FALSE);
 
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 200);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
   
-  label=gtk_label_new(msg);
+  label=lives_standard_label_new(msg);
   gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
   g_free(msg);
 
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-
-
-
-  radiobutton0 = gtk_radio_button_new (NULL);
 
 #ifdef HAVE_PULSE_AUDIO
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic ( _("Use _pulse audio player"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), radiobutton0);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton0, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  radiobutton0 = lives_standard_radio_button_new ( _("Use _pulse audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton0));
 
   if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_PULSE;
 
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton0), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton0));
   if (prefs->audio_player==AUD_PLAYER_PULSE) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton0),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton0),TRUE);
     set_pref("audio_player","pulse");
   }
 
-#endif
-
-  radiobutton1 = gtk_radio_button_new(NULL);
-#ifdef ENABLE_JACK
-
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic ( _("Use _jack audio player"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), radiobutton1);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton1);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  g_signal_connect (GTK_OBJECT (radiobutton0), "toggled",
+                      G_CALLBACK (on_init_aplayer_toggled),
+                      GINT_TO_POINTER(AUD_PLAYER_PULSE));
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton1, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+#endif
 
 
-  if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_JACK;
+#ifdef ENABLE_JACK
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton1), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
+  radiobutton1 = lives_standard_radio_button_new(_("Use _jack audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton1));
 
-  if (prefs->audio_player==AUD_PLAYER_JACK||!capable->has_pulse_audio) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton1),TRUE);
+  if (prefs->audio_player==AUD_PLAYER_JACK||!capable->has_pulse_audio||prefs->audio_player==-1) {
+    prefs->audio_player=AUD_PLAYER_JACK;
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton1),TRUE);
     set_pref("audio_player","jack");
   }
 
+  g_signal_connect (GTK_OBJECT (radiobutton1), "toggled",
+                      G_CALLBACK (on_init_aplayer_toggled),
+                      GINT_TO_POINTER(AUD_PLAYER_JACK));
+
 
 #endif
 
-  radiobutton2 = gtk_radio_button_new (NULL);
-  if (capable->has_sox) {
+  if (capable->has_sox_play) {
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new_with_mnemonic ( _("Use _sox audio player"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), radiobutton2);
-    
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      radiobutton2);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton2, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    radiobutton2 = lives_standard_radio_button_new (_("Use _sox audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton2));
 
     if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_SOX;
 
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton2), radiobutton_group);
-    radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton2));
-
     if (prefs->audio_player==AUD_PLAYER_SOX) {
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton2),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton2),TRUE);
       set_pref("audio_player","sox");
     }
 
+    g_signal_connect (GTK_OBJECT (radiobutton2), "toggled",
+                      G_CALLBACK (on_init_aplayer_toggled),
+                      GINT_TO_POINTER(AUD_PLAYER_SOX));
+
 
   }
 
-  radiobutton3 = gtk_radio_button_new (NULL);
   if (capable->has_mplayer) {
-    eventbox=gtk_event_box_new();
-    label=gtk_label_new_with_mnemonic ( _("Use _mplayer audio player"));
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), radiobutton3);
-    
-    gtk_container_add(GTK_CONTAINER(eventbox),label);
-    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		      G_CALLBACK (label_act_toggle),
-		      radiobutton3);
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-      gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-    }
-    
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-    
-    gtk_box_pack_start (GTK_BOX (hbox), radiobutton3, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+    hbox = lives_hbox_new (FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_MPLAYER;
+    radiobutton3 = lives_standard_radio_button_new (_("Use _mplayer audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
-    gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton3), radiobutton_group);
-    radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton3));
+    if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_MPLAYER;
 
     if (prefs->audio_player==AUD_PLAYER_MPLAYER) {
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton3),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton3),TRUE);
       set_pref("audio_player","mplayer");
     }
+						    
+    g_signal_connect (GTK_OBJECT (radiobutton3), "toggled",
+		      G_CALLBACK (on_init_aplayer_toggled),
+                      GINT_TO_POINTER(AUD_PLAYER_MPLAYER));
 
-  }
-
-
-  g_signal_connect (GTK_OBJECT (radiobutton0), "toggled",
-                      G_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_PULSE));
-
-  g_signal_connect (GTK_OBJECT (radiobutton1), "toggled",
-                      G_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_JACK));
 
-  g_signal_connect (GTK_OBJECT (radiobutton2), "toggled",
-                      G_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_SOX));
+  }
 
-  g_signal_connect (GTK_OBJECT (radiobutton3), "toggled",
-                      G_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_MPLAYER));
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
   okbutton = gtk_button_new_from_stock ("gtk-go-forward");
   gtk_button_set_label(GTK_BUTTON(okbutton),_("_Next"));
   gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default(okbutton);
   gtk_widget_grab_focus(okbutton);
 
@@ -469,33 +400,27 @@
 
   if (prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_MPLAYER) {
     gtk_widget_hide(mainw->vol_toolitem);
-    gtk_widget_hide(mainw->vol_label);
+    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
     gtk_widget_hide (mainw->recaudio_submenu);
   }
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   return (response==GTK_RESPONSE_OK);
 }
 
 
-static void add_test(GtkWidget *table, gint row, gchar *ttext, gboolean noskip) {
-  GtkWidget *label=gtk_label_new(ttext);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+static void add_test(GtkWidget *table, gint row, gchar *ttext, boolean noskip) {
+  GtkWidget *label=lives_standard_label_new(ttext);
 
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
   gtk_widget_show(label);
 
   if (!noskip) {
-    GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_LARGE_TOOLBAR);
+    GtkWidget *image=lives_image_new_from_stock(GTK_STOCK_REMOVE,LIVES_ICON_SIZE_LARGE_TOOLBAR);
     // TRANSLATORS - as in "skipped test"
-    label=gtk_label_new(_("Skipped"));
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    }
+    label=lives_standard_label_new(_("Skipped"));
+
     gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
     gtk_widget_show(label);
 
@@ -503,18 +428,14 @@
     gtk_widget_show(image);
   }
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 }
 
 
-static gboolean pass_test(GtkWidget *table, gint row) {
+static boolean pass_test(GtkWidget *table, gint row) {
   // TRANSLATORS - as in "passed test"
-  GtkWidget *label=gtk_label_new(_("Passed"));
-  GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_APPLY,GTK_ICON_SIZE_LARGE_TOOLBAR);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  GtkWidget *label=lives_standard_label_new(_("Passed"));
+  GtkWidget *image=lives_image_new_from_stock(GTK_STOCK_APPLY,LIVES_ICON_SIZE_LARGE_TOOLBAR);
 
   gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
   gtk_widget_show(label);
@@ -522,30 +443,22 @@
   gtk_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
   gtk_widget_show(image);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   return TRUE;
 }
 
 
-static gboolean fail_test(GtkWidget *table, gint row, gchar *ftext) {
+static boolean fail_test(GtkWidget *table, gint row, gchar *ftext) {
   GtkWidget *label;
-  GtkWidget *image=gtk_image_new_from_stock(GTK_STOCK_CANCEL,GTK_ICON_SIZE_LARGE_TOOLBAR);
+  GtkWidget *image=lives_image_new_from_stock(GTK_STOCK_CANCEL,LIVES_ICON_SIZE_LARGE_TOOLBAR);
 
-  label=gtk_label_new(ftext);
+  label=lives_standard_label_new(ftext);
 
   gtk_table_attach (GTK_TABLE (table), label, 3, 4, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
   gtk_widget_show(label);
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  
   // TRANSLATORS - as in "failed test"
-  label=gtk_label_new(_("Failed"));
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label=lives_standard_label_new(_("Failed"));
 
   gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 10, 10);
   gtk_widget_show(label);
@@ -553,7 +466,7 @@
   gtk_table_attach (GTK_TABLE (table), image, 2, 3, row, row+1, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 10);
   gtk_widget_show(image);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
   
   return FALSE;
 }
@@ -565,7 +478,7 @@
 
 
 
-gboolean do_startup_tests(gboolean tshoot) {
+boolean do_startup_tests(boolean tshoot) {
   GtkWidget *dialog;
   GtkWidget *dialog_vbox;
 
@@ -574,22 +487,25 @@
   GtkWidget *okbutton;
   GtkWidget *cancelbutton;
 
-  gchar *com,*rname,*afile,*tmp;
+  GtkAccelGroup *accel_group;
 
+  gchar *com,*rname,*afile,*tmp;
+  gchar *image_ext=g_strdup(prefs->image_ext);
+  gchar *title;
   guchar *abuff;
 
   size_t fsize;
 
-  gboolean success,success2,success3,success4;
+  boolean success,success2,success3,success4;
+  boolean imgext_switched=FALSE;
 
   gint response,res;
   gint current_file=mainw->current_file;
 
   int out_fd,info_fd;
 
-  gchar *image_ext=g_strdup(prefs->image_ext);
-
   mainw->suppress_dprint=TRUE;
+  mainw->cancelled=CANCEL_NONE;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
@@ -599,41 +515,33 @@
     mt_desensitise(mainw->multitrack);
   }
 
-
-  dialog = gtk_dialog_new ();
-
   if (!tshoot) {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Testing Configuration"));
+    title=g_strdup(_("LiVES: - Testing Configuration"));
   }
   else {
-    gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Troubleshoot"));
+    title=g_strdup(_("LiVES: - Troubleshoot"));
   }
 
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 350, 200);
 
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  dialog = lives_standard_dialog_new (title,FALSE);
 
-  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
-
-  label=gtk_label_new(_("LiVES will now run some basic configuration tests\n"));
-  gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
+  accel_group = GTK_ACCEL_GROUP(gtk_accel_group_new ());
+  gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
 
+  g_free(title);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
+  dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
 
+  label=lives_standard_label_new(_("LiVES will now run some basic configuration tests\n"));
+  gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
 
   cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_show (cancelbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
 
+  gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+                              LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
   if (!tshoot) {
     okbutton = gtk_button_new_from_stock ("gtk-go-forward");
     gtk_button_set_label(GTK_BUTTON(okbutton),_("_Next"));
@@ -641,7 +549,7 @@
   else okbutton = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default(okbutton);
   gtk_widget_grab_focus(okbutton);
 
@@ -654,7 +562,7 @@
 
   gtk_widget_show_all(dialog);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
 
   // check for sox presence
@@ -662,7 +570,7 @@
   add_test(table,0,_("Checking for \"sox\" presence"),TRUE);
 
 
-  if (!capable->has_sox) {
+  if (!capable->has_sox_sox) {
     success=fail_test(table,0,_("You should install sox to be able to use all the audio features in LiVES"));
 
   }
@@ -678,10 +586,10 @@
 
   get_temp_handle(mainw->first_free_file,TRUE);
 
-
   if (success) {
     
     info_fd=-1;
+
     unlink(cfile->info_file);
 
     // write 1 second of silence
@@ -692,13 +600,16 @@
     else mainw->write_failed=FALSE;
 
     if (!mainw->write_failed) {
-      abuff=(guchar *)calloc(44100,4);
+      abuff=(guchar *)lives_calloc(44100,4);
       if (!abuff) {
 	tmp=g_strdup(_("Unable to allocate 176400 bytes memory."));
 	fail_test(table,1,tmp);
 	g_free(tmp);
       }
       else {
+#ifdef IS_MINGW
+	setmode(out_fd, O_BINARY);
+#endif
 	lives_write (out_fd,abuff,176400,TRUE);
 	close(out_fd);
 	g_free(abuff);
@@ -717,7 +628,7 @@
       afile=g_build_filename(prefs->tmpdir,cfile->handle,"testout.wav",NULL);
     
       mainw->com_failed=FALSE;
-      com=g_strdup_printf("smogrify export_audio \"%s\" 0. 0. 44100 2 16 0 22050 \"%s\"",cfile->handle,afile);
+      com=g_strdup_printf("%s export_audio \"%s\" 0. 0. 44100 2 16 0 22050 \"%s\"",prefs->backend_sync,cfile->handle,afile);
       lives_system(com,TRUE);
       if (mainw->com_failed) {
 	tmp=g_strdup_printf(_("Command failed: %s"),com);
@@ -726,18 +637,19 @@
       }
       
       g_free(com);
-      
-      while (mainw->cancelled==CANCEL_NONE&&(info_fd=open(cfile->info_file,O_RDONLY)==-1)) {
+
+      while (mainw->cancelled==CANCEL_NONE&&(info_fd=open(cfile->info_file,O_RDONLY))==-1) {
 	g_usleep(prefs->sleep_time);
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
       }
       
       if (info_fd!=-1) {
 	close(info_fd);
 	
-	sync();
+	lives_sync();
 	
 	fsize=sget_file_size(afile);
+	unlink(afile);
 	g_free(afile);
 	
 	if (fsize==0) {
@@ -745,6 +657,7 @@
 	}
 	
 	else pass_test(table,1);
+
       }
     }
   }
@@ -776,7 +689,7 @@
 
     if (!success) {
       gtk_widget_destroy(dialog);
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       do_no_mplayer_sox_error();
       close_current_file(current_file);
       mainw->suppress_dprint=FALSE;
@@ -801,9 +714,12 @@
   add_test(table,3,_("Checking if mplayer can convert audio"),success2);
 
   if (success2) {
+
+#ifndef IS_MINGW
     res=system("LANG=en LANGUAGE=en mplayer -ao help | grep pcm >/dev/null 2>&1");
-    
-    
+#else    
+    res=system("mplayer -ao help | grep pcm >NUL 2>&1");
+#endif
     if (res==0) {
       pass_test(table,3);
     }
@@ -834,11 +750,12 @@
   if (success2&&success4) {
 
     info_fd=-1;
+
     unlink(cfile->info_file);
 
     rname=get_resource("vidtest.avi");
 
-    com=g_strdup_printf("smogrify open_test \"%s\" \"%s\" 0 png",cfile->handle,
+    com=g_strdup_printf("%s open_test \"%s\" \"%s\" 0 png",prefs->backend_sync,cfile->handle,
 			(tmp=g_filename_from_utf8 (rname,-1,NULL,NULL,NULL)));
     g_free(tmp);
     g_free(rname);
@@ -853,14 +770,15 @@
 
     g_free(com);
 
-    while (mainw->cancelled==CANCEL_NONE&&(info_fd=open(cfile->info_file,O_RDONLY)==-1)) {
+    while (mainw->cancelled==CANCEL_NONE&&(info_fd=open(cfile->info_file,O_RDONLY))==-1) {
       g_usleep(prefs->sleep_time);
     }
     
     if (info_fd!=-1) {
+
       close(info_fd);
       
-      sync();
+      lives_sync();
       
       cfile->img_type=IMG_TYPE_PNG;
       get_frame_count(mainw->current_file);
@@ -896,11 +814,16 @@
 
 
   if (success2) {
+#ifndef IS_MINGW
     res=system("LANG=en LANGUAGE=en mplayer -vo help | grep -i \"jpeg file\" >/dev/null 2>&1");
+#else    
+    res=system("mplayer -vo help | grep -i \"jpeg file\" >NUL 2>&1");
+#endif
     
     if (res==0) {
       pass_test(table,5);
       if (!success3) {
+	if (!strcmp(prefs->image_ext,"png")) imgext_switched=TRUE;
 	set_pref("default_image_format","jpeg");
 	g_snprintf (prefs->image_ext,16,"%s","jpg");
       }
@@ -930,17 +853,17 @@
   close_current_file(current_file);
 
   gtk_widget_set_sensitive(okbutton,TRUE);
-  if (tshoot) gtk_widget_hide(cancelbutton); 
-  
-
-  if (!tshoot) {
-    label=gtk_label_new(_("\n\n    Click Cancel to exit and install any missing components, or Next to continue    \n"));
-    gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
-
-    if (palette->style&STYLE_1) {
-      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
+  if (tshoot) {
+    gtk_widget_hide(cancelbutton); 
+    if (imgext_switched) {
+      label=lives_standard_label_new(_("\n\n    Image decoding type has been switched to jpeg. You can revert this in Preferences/Decoding.    \n"));
+      gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
     }
-    
+    gtk_widget_show(label);
+  }
+  else {
+    label=lives_standard_label_new(_("\n\n    Click Cancel to exit and install any missing components, or Next to continue    \n"));
+    gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
     gtk_widget_show(label);
   }
 
@@ -969,7 +892,7 @@
 
   GtkWidget *dialog,*dialog_vbox,*radiobutton0,*radiobutton1,*label;
   GtkWidget *okbutton;
-  GtkWidget *eventbox,*hbox;
+  GtkWidget *hbox;
   GSList *radiobutton_group = NULL;
   gchar *txt1,*txt2,*txt3,*msg;
 
@@ -985,113 +908,42 @@
   g_free(txt2);
   g_free(txt3);
 
-  dialog = gtk_dialog_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), _("LiVES: - Choose the startup interface"));
-
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
-  gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 200);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
-    gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
+  dialog = lives_standard_dialog_new (_("LiVES: - Choose the startup interface"),FALSE);
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(dialog));
   
-  label=gtk_label_new(msg);
+  label=lives_standard_label_new(msg);
   gtk_container_add (GTK_CONTAINER (dialog_vbox), label);
   g_free(msg);
 
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-
-
-
-  radiobutton0 = gtk_radio_button_new (NULL);
-
-
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic ( _("Start in _Clip Edit mode"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), radiobutton0);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  radiobutton0 = lives_standard_radio_button_new (_("Start in _Clip Edit mode"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton0));
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton0, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  label=lives_standard_label_new(_("This is the best choice for simple editing tasks and for VJs\n"));
 
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  radiobutton1 = lives_standard_radio_button_new (_("Start in _Multitrack mode"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton0), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton0));
+  label=lives_standard_label_new(_("This is a better choice for complex editing tasks involving multiple clips.\n"));
 
-  label=gtk_label_new(_("This is the best choice for simple editing tasks and for VJs\n"));
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 10);
-
-  radiobutton1 = gtk_radio_button_new(NULL);
-
-
-  eventbox=gtk_event_box_new();
-  label=gtk_label_new_with_mnemonic ( _("Start in _Multitrack mode"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), radiobutton1);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton1);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, 10);
-
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton1, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-
-
-  label=gtk_label_new(_("This is a better choice for complex editing tasks involving multiple clips.\n"));
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, 10);
-
-
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton1), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1));
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   if (prefs->startup_interface==STARTUP_MT) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radiobutton1),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton1),TRUE);
   }
 
   okbutton = gtk_button_new_from_stock ("gtk-go-forward");
   gtk_button_set_label(GTK_BUTTON(okbutton),_("_Finish"));
+
   gtk_widget_show (okbutton);
   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+  lives_widget_set_can_focus_and_default (okbutton);
   gtk_widget_grab_default(okbutton);
   gtk_widget_grab_focus(okbutton);
 
@@ -1101,14 +953,14 @@
   gtk_dialog_run(GTK_DIALOG(dialog));
 
 
-  if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radiobutton1))) 
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(radiobutton1))) 
     future_prefs->startup_interface=prefs->startup_interface=STARTUP_MT;
   
   set_int_pref("startup_interface",prefs->startup_interface);
 
   gtk_widget_destroy(dialog);
 
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
 }

LiVES-1.6.1.tar.bz2/src/startup.h -> LiVES-2.0.3.tar.bz2/src/startup.h Changed

LiVES-1.6.1.tar.bz2/src/stream.c -> LiVES-2.0.3.tar.bz2/src/stream.c Changed

@@ -1,6 +1,6 @@
 // stream.c
 // LiVES
-// (c) G. Finch 2008 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2008 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -27,9 +27,9 @@
 static int pckoffs=0;
 static size_t pcksize=0;
 
-static gboolean has_last_delta_ticks;
+static boolean has_last_delta_ticks;
 static gchar *hdr=NULL;
-static gboolean fps_can_change;
+static boolean fps_can_change;
 
 static LIVES_INLINE G_GNUC_CONST gint64 abs64(gint64 a) {
     return ((a>0)?a:-a);
@@ -39,7 +39,7 @@
 #ifdef USE_STRMBUF
 
 #define STREAM_BUF_SIZE 1024*1024*128 // allow 8MB buffer size; actually we use twice this much: - TODO - make pref
-static volatile gboolean buffering;
+static volatile boolean buffering;
 
 void *streambuf (void *arg) {
   // read bytes from udp port and load into ringbuffer
@@ -104,7 +104,7 @@
     else {
       weed_plant_t *frame_layer=mainw->frame_layer;
       mainw->frame_layer=NULL;
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       mainw->frame_layer=frame_layer;
       threaded_dialog_spin();
       if (mainw->cancelled) return buflen+btoread;
@@ -114,7 +114,7 @@
 }
 
 
-static gboolean lives_stream_in_chunks(lives_vstream_t *lstream, size_t buflen, guchar *buf, int xx) {
+static boolean lives_stream_in_chunks(lives_vstream_t *lstream, size_t buflen, guchar *buf, int xx) {
   // read first from pckbuf, then from streambuf
   size_t copied=0;
   if (pckoffs<L2L_PACKET_LEN) {
@@ -140,7 +140,7 @@
     if (ret==-1) {
       weed_plant_t *frame_layer=mainw->frame_layer;
       mainw->frame_layer=NULL;
-      while (g_main_context_iteration(NULL,FALSE));
+      lives_widget_context_update();
       mainw->frame_layer=frame_layer;
       threaded_dialog_spin();
       if (mainw->cancelled) {
@@ -153,7 +153,7 @@
 }
 
 
-static gboolean lives_stream_in_chunks(lives_vstream_t *lstream, size_t buflen, guchar *buf, int bfsize) {
+static boolean lives_stream_in_chunks(lives_vstream_t *lstream, size_t buflen, guchar *buf, int bfsize) {
   // return FALSE if we could not set socket buffer size
 
   size_t copied;
@@ -177,7 +177,7 @@
       if (copied==-1) {
 	weed_plant_t *frame_layer=mainw->frame_layer;
 	mainw->frame_layer=NULL;
-	while (g_main_context_iteration(NULL,FALSE));
+	lives_widget_context_update();
 	mainw->frame_layer=frame_layer;
 	threaded_dialog_spin();
 	if (mainw->cancelled) return TRUE;
@@ -193,7 +193,7 @@
 #endif
 
 static void l2l_get_packet_sync(lives_vstream_t *lstream) {
-  gboolean sync=FALSE;
+  boolean sync=FALSE;
 
   if (pckoffs==pcksize) {
     pcksize=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf);
@@ -254,7 +254,7 @@
 
 static gchar *l2l_get_packet_header(lives_vstream_t *lstream) {
   gchar hdr_buf[1024];
-  gboolean sync=FALSE;
+  boolean sync=FALSE;
   size_t hdrsize=0,csize;
 
   if (pckoffs==pcksize) {
@@ -372,7 +372,7 @@
 }
 
 
-static gboolean l2l_parse_packet_header(lives_vstream_t *lstream, gint strtype, gint strid) {
+static boolean l2l_parse_packet_header(lives_vstream_t *lstream, gint strtype, gint strid) {
   gchar **array=g_strsplit(hdr," ",-1);
   gint pid=-1,ptype=-1;
   
@@ -421,7 +421,7 @@
 
 void lives2lives_read_stream(const gchar *host, int port) {
   lives_vstream_t *lstream=(lives_vstream_t *)g_malloc(sizeof(lives_vstream_t));
-  gboolean done=FALSE;
+  boolean done=FALSE;
   gint old_file=mainw->current_file,new_file;
   gchar *tmp,*tmp2;
   gchar *msg;
@@ -635,7 +635,7 @@
     d_print (_ ("none\n"));
   }
   else {
-    d_print ((tmp=g_strdup_printf(_ ("%d Hz %d channel(s) %d bps\n"),cfile->arate,cfile->achans,cfile->asampsize)));
+    d_print ((tmp=g_strdup_printf(P_("%d Hz %d channel %d bps\n","%d Hz %d channels %d bps\n",cfile->achans),cfile->arate,cfile->achans,cfile->asampsize)));
     g_free(tmp);
   }
 
@@ -647,11 +647,6 @@
 
   // if not playing, start playing
   if (mainw->playing_file==-1) {
-    if (mainw->play_window!=NULL&&old_file==-1) {
-      // usually preview or load_preview_frame would do this
-      g_signal_handler_block(mainw->play_window,mainw->pw_exp_func);
-      mainw->pw_exp_is_blocked=TRUE;
-    }
     mainw->play_start=1;
     mainw->play_end=INT_MAX;
     play_file();
@@ -684,12 +679,12 @@
 void weed_layer_set_from_lives2lives(weed_plant_t *layer, gint clip, lives_vstream_t *lstream) {
   static int64_t last_delta_ticks=0;
   int64_t currticks;
-  gboolean done;
+  boolean done;
   int error;
   void **pixel_data;
   int myflags=0;
   size_t framedataread=0;
-  gboolean timeout=FALSE; // TODO
+  boolean timeout=FALSE; // TODO
   gint width=0;
   gint height=0;
   size_t target_size;
@@ -1009,7 +1004,7 @@
 
 void on_send_lives2lives_activate (GtkMenuItem *menuitem, gpointer user_data) {
   _vppaw *vppa;
-  gchar *orig_name=g_strdup(mainw->none_string);
+  gchar *orig_name=g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
   gchar *tmp;
   int resp;
 
@@ -1032,7 +1027,7 @@
   set_vpp(FALSE);
   
   if (strcmp(orig_name,"lives2lives_stream")) {
-    do_error_dialog((tmp=g_strdup_printf(_("\nLiVES will stream whenever it is in full screen/separate window mode.\nTo reset this behaviour, go to Tools/Preferences/Playback,\nand set the playback plugin back to %s\n"),orig_name)));
+    do_info_dialog((tmp=g_strdup_printf(_("\nLiVES will stream whenever it is in full screen/separate window mode.\nTo reset this behaviour, go to Tools/Preferences/Playback,\nand set the playback plugin back to %s\n"),orig_name)));
     g_free(tmp);
   }
   g_free(orig_name);
@@ -1050,7 +1045,7 @@
   gint response=gtk_dialog_run (GTK_DIALOG (pandh->dialog));
 
   if (response==GTK_RESPONSE_OK) {
-    if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pandh->rb_anyhost))) {
+    if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(pandh->rb_anyhost))) {
       host=g_strdup_printf("%s.%s.%s.%s",gtk_entry_get_text(GTK_ENTRY(pandh->entry1)),
 			   gtk_entry_get_text(GTK_ENTRY(pandh->entry2)),
 			   gtk_entry_get_text(GTK_ENTRY(pandh->entry3)),gtk_entry_get_text(GTK_ENTRY(pandh->entry4)));
@@ -1062,7 +1057,7 @@
   gtk_widget_destroy (pandh->dialog);
   g_free(pandh);
   
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   if (host!=NULL) {
     // start receiving
@@ -1078,7 +1073,7 @@
 static void pandhw_anyhost_toggled(GtkToggleButton *tbut, gpointer user_data) {
   lives_pandh_w *pandhw=(lives_pandh_w *)user_data;
 
-  if (gtk_toggle_button_get_active(tbut)) {
+  if (lives_toggle_button_get_active(tbut)) {
     gtk_widget_set_sensitive(pandhw->entry1,FALSE);
     gtk_widget_set_sensitive(pandhw->entry2,FALSE);
     gtk_widget_set_sensitive(pandhw->entry3,FALSE);
@@ -1100,201 +1095,79 @@
   GtkWidget *dialog_vbox;
   GtkWidget *hbox;
   GtkWidget *label;
-  GtkWidget *radiobutton;
-  GtkWidget *cancelbutton;
-  GtkWidget *okbutton;
-  GObject *spinbutton_adj;
-  GtkWidget *hseparator;
-  GtkWidget *eventbox;
 
-  GSList *radiobutton_group = NULL;
+  LiVESSList *radiobutton_group = NULL;
 
   lives_pandh_w *pandhw=(lives_pandh_w *)(g_malloc(sizeof(lives_pandh_w)));
 
-  pandhw->dialog = gtk_dialog_new ();
+  gchar *tmp,*tmp2;
+
+  pandhw->dialog = lives_standard_dialog_new (_("LiVES: - Receive LiVES stream"),TRUE);
 
-  gtk_window_set_position (GTK_WINDOW (pandhw->dialog), GTK_WIN_POS_CENTER_ALWAYS);
   if (prefs->show_gui) {
     gtk_window_set_transient_for(GTK_WINDOW(pandhw->dialog),GTK_WINDOW(mainw->LiVES));
   }
-  gtk_window_set_modal (GTK_WINDOW (pandhw->dialog), TRUE);
-
-  if (palette->style&STYLE_1) {
-    gtk_dialog_set_has_separator(GTK_DIALOG(pandhw->dialog),FALSE);
-    gtk_widget_modify_bg (pandhw->dialog, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-
-  gtk_window_set_default_size (GTK_WINDOW (pandhw->dialog), 300, 200);
-
-  gtk_container_set_border_width (GTK_CONTAINER (pandhw->dialog), 10);
-
-  if (type==0)
-    gtk_window_set_title (GTK_WINDOW (pandhw->dialog), _("LiVES: - Receive LiVES stream"));
 
   dialog_vbox = lives_dialog_get_content_area(GTK_DIALOG(pandhw->dialog));
 
-  label=gtk_label_new(_("You can receive streams from another copy of LiVES."));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 10);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  label=gtk_label_new(_("In the source copy of LiVES, you must select Advanced/Send stream to LiVES\nor select the lives2lives_stream playback plugin in Preferences."));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 10);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label=lives_standard_label_new(_("You can receive streams from another copy of LiVES."));
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  hseparator = gtk_hseparator_new ();
-  gtk_widget_show (hseparator);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hseparator, TRUE, TRUE, 0);
+  label=lives_standard_label_new(_("In the source copy of LiVES, you must select Advanced/Send stream to LiVES\nor select the lives2lives_stream playback plugin in Preferences."));
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  label=gtk_label_new(_("Select the host to receive the stream from (or allow any host to stream)."));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 10);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  add_hsep_to_box(LIVES_BOX(dialog_vbox));
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 10);
+  label=lives_standard_label_new(_("Select the host to receive the stream from (or allow any host to stream)."));
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  pandhw->rb_anyhost = gtk_radio_button_new (NULL);
-  gtk_radio_button_set_group (GTK_RADIO_BUTTON (pandhw->rb_anyhost), radiobutton_group);
-  radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (pandhw->rb_anyhost));
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  gtk_box_pack_start (GTK_BOX (hbox), pandhw->rb_anyhost, FALSE, FALSE, 10);
+  pandhw->rb_anyhost = lives_standard_radio_button_new ((tmp=g_strdup(_("Accept LiVES streams from _any host")))
+							,TRUE,radiobutton_group,LIVES_BOX(hbox),
+							(tmp2=g_strdup(_("Accept incoming LiVES streams from any connected host."))));
+  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (pandhw->rb_anyhost));
 
-  label=gtk_label_new_with_mnemonic (_ ("Accept LiVES streams from _any host"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),pandhw->rb_anyhost);
+  g_free(tmp); g_free(tmp2);
 
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Accept incoming LiVES streams from any connected host."));
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    pandhw->rb_anyhost);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  
   g_signal_connect_after (GTK_OBJECT (pandhw->rb_anyhost), "toggled",
 			  G_CALLBACK (pandhw_anyhost_toggled),
 			  (gpointer)pandhw);
 
-  radiobutton=gtk_radio_button_new(radiobutton_group);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
 
-  label=gtk_label_new_with_mnemonic (_ ("Accept LiVES streams only from the _specified host:"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
-
-  eventbox=gtk_event_box_new();
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_widget_set_tooltip_text( eventbox, _("Accept LiVES streams from the specified host only."));
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
+  lives_standard_radio_button_new ((tmp=g_strdup(_("Accept LiVES streams only from the _specified host:")))
+				   ,TRUE,radiobutton_group,LIVES_BOX(hbox),
+				   (tmp2=g_strdup(_("Accept LiVES streams from the specified host only."))));
   
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(hbox, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  g_free(tmp); g_free(tmp2);
 
   ////////////////////////////////////
 
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  pandhw->entry1 = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY (pandhw->entry1),3);
-  gtk_entry_set_width_chars (GTK_ENTRY (pandhw->entry1),3);
-  gtk_box_pack_start (GTK_BOX (hbox), pandhw->entry1, FALSE, FALSE, 10);
-  gtk_entry_set_text(GTK_ENTRY(pandhw->entry1),"127");
-
-  label=gtk_label_new(".");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  pandhw->entry2 = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY (pandhw->entry2),3);
-  gtk_entry_set_width_chars (GTK_ENTRY (pandhw->entry2),3);
-  gtk_box_pack_start (GTK_BOX (hbox), pandhw->entry2, FALSE, FALSE, 10);
-  gtk_entry_set_text(GTK_ENTRY(pandhw->entry2),"0");
-
-  label=gtk_label_new(".");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  pandhw->entry3 = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY (pandhw->entry3),3);
-  gtk_entry_set_width_chars (GTK_ENTRY (pandhw->entry3),3);
-  gtk_box_pack_start (GTK_BOX (hbox), pandhw->entry3, FALSE, FALSE, 10);
-  gtk_entry_set_text(GTK_ENTRY(pandhw->entry3),"0");
-
-  label=gtk_label_new(".");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-
-  pandhw->entry4 = gtk_entry_new ();
-  gtk_entry_set_max_length(GTK_ENTRY (pandhw->entry4),3);
-  gtk_entry_set_width_chars (GTK_ENTRY (pandhw->entry4),3);
-  gtk_box_pack_start (GTK_BOX (hbox), pandhw->entry4, FALSE, FALSE, 10);
-  gtk_entry_set_text(GTK_ENTRY(pandhw->entry4),"1");
+  pandhw->entry1 = lives_standard_entry_new ("",FALSE,"127",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry2 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry3 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry4 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
 
   gtk_widget_set_sensitive(pandhw->entry1,FALSE);
   gtk_widget_set_sensitive(pandhw->entry2,FALSE);
   gtk_widget_set_sensitive(pandhw->entry3,FALSE);
   gtk_widget_set_sensitive(pandhw->entry4,FALSE);
 
-  label=gtk_label_new(_("Enter the port number to listen for LiVES streams on:"));
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, TRUE, TRUE, 10);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
+  label=lives_standard_label_new(_("Enter the port number to listen for LiVES streams on:"));
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, TRUE, TRUE, 10);
+  hbox = lives_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  label=gtk_label_new(_("Port"));
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-  }
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  spinbutton_adj = (GObject *)gtk_adjustment_new (48888, 1., 65535., 1., 1., 0.);
-  pandhw->port_spin = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1., 0);
-  gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (pandhw->port_spin)->entry)), TRUE);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label),pandhw->port_spin);
-  gtk_box_pack_start (GTK_BOX (hbox), pandhw->port_spin, FALSE, FALSE, 10);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (pandhw->port_spin),GTK_UPDATE_IF_VALID);
-
-
-  cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_dialog_add_action_widget (GTK_DIALOG (pandhw->dialog), cancelbutton, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton, GTK_CAN_DEFAULT);
-
-  okbutton = gtk_button_new_from_stock ("gtk-ok");
-  gtk_dialog_add_action_widget (GTK_DIALOG (pandhw->dialog), okbutton, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
-  gtk_widget_grab_default (okbutton);
+  pandhw->port_spin = lives_standard_spin_button_new (_("Port"),FALSE,48888.,1.,65535,1.,1.,0,LIVES_BOX(hbox),NULL);
 
   gtk_widget_show_all (pandhw->dialog);

LiVES-1.6.1.tar.bz2/src/stream.h -> LiVES-2.0.3.tar.bz2/src/stream.h Changed

LiVES-1.6.1.tar.bz2/src/support.c -> LiVES-2.0.3.tar.bz2/src/support.c Changed

LiVES-1.6.1.tar.bz2/src/support.h -> LiVES-2.0.3.tar.bz2/src/support.h Changed

LiVES-1.6.1.tar.bz2/src/utils.c -> LiVES-2.0.3.tar.bz2/src/utils.c Changed

@@ -1,6 +1,6 @@
 // utils.c
 // LiVES
-// (c) G. Finch 2003 - 2012 <salsaman@xs4all.nl,salsaman@gmail.com>
+// (c) G. Finch 2003 - 2012 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -14,7 +14,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef IS_MINGW
 #include <sys/statvfs.h>
+#endif
 #include <sys/file.h>
 
 #include "main.h"
@@ -25,6 +27,7 @@
 static gboolean  omute,  osepwin,  ofs,  ofaded,  odouble;
 
 
+
 char *filename_from_fd(char *val, int fd) {
   // return filename from an open fd, freeing val first
 
@@ -33,6 +36,7 @@
 
   // call like: foo=filename_from_fd(foo,fd);
 
+#ifndef IS_MINGW
   gchar *fdpath;
   gchar *fidi;
   char rfdpath[PATH_MAX];
@@ -46,7 +50,7 @@
   fdpath=g_build_filename("/proc","self","fd",fidi,NULL);
   g_free(fidi);
 
-  if ((slen=readlink(fdpath,rfdpath,PATH_MAX))==-1) return val;
+  if ((slen=lives_readlink(fdpath,rfdpath,PATH_MAX))==-1) return val;
   g_free(fdpath);
 
   memset(rfdpath+slen,0,1);
@@ -59,6 +63,9 @@
 
   if (val!=NULL) g_free(val);
   return g_strdup(rfdpath);
+#else
+  return g_strdup("unknown");
+#endif
 }
 
 
@@ -74,12 +81,223 @@
 
 // system calls
 
-int lives_system(const char *com, gboolean allow_error) {
+LIVES_INLINE void lives_srandom(unsigned int seed) {
+#ifdef IS_MINGW
+  srand(seed);
+#else
+  srandom(seed);
+#endif
+}
+
+
+LIVES_INLINE uint64_t lives_random(void) {
+#ifdef IS_MINGW
+  return (uint64_t)rand()*(uint64_t)fastrand();
+#else
+  return random();
+#endif
+}
+
+
+
+LIVES_INLINE pid_t lives_getpid(void) {
+#ifdef IS_MINGW
+  return _getpid();
+#else
+  return getpid();
+#endif
+}
+
+
+#ifdef IS_MINGW
+LIVES_INLINE int sidhash(char *strsid) {
+  size_t slen;
+  int retval=0;
+  register int i;
+
+  if (strsid==NULL) return 0;
+
+  slen=strlen(strsid);
+
+  g_print("\n\nval is %d %c\n",slen,strsid[0]);
+
+  for (i=4;i<slen;i++) {
+    retval+=(uint8_t)strsid[i];
+  }
+
+  g_print("\n\ngot token value %d\n",retval);
+  return retval;
+}
+#endif
+
+
+
+
+
+LIVES_INLINE int lives_getuid(void) {
+#ifdef IS_MINGW
+  HANDLE Thandle;
+  DWORD DAmask, size;
+  char *strsid;
+  int retval=0;
+
+  DWORD dwIndex;
+  PTOKEN_GROUPS ptg = NULL;
+  PSID psid=NULL;
+
+
+  DAmask = TOKEN_READ;
+  
+  if (!OpenProcessToken(GetCurrentProcess(), DAmask, &Thandle)) {
+    LIVES_ERROR("could not open token");
+    return 0;
+  }
+  
+  if (!GetTokenInformation(Thandle, TokenGroups, ptg, 0, &size)) {
+    CloseHandle(Thandle);
+    LIVES_ERROR("could not open token info");
+    return 0;
+  }
+
+  ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(),
+				 HEAP_ZERO_MEMORY, size);
+
+  if (ptg == NULL)
+    goto Cleanup;
+
+
+// Loop through the groups to find the logon SID.
+
+  for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) {
+    if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID)
+	==  SE_GROUP_LOGON_ID) 
+      {
+	// Found the logon SID; make a copy of it.
+
+	size = GetLengthSid(ptg->Groups[dwIndex].Sid);
+	psid = (PSID) HeapAlloc(GetProcessHeap(),
+				  HEAP_ZERO_MEMORY, size);
+	if (psid == NULL)
+	  goto Cleanup;
+	if (!CopySid(size, psid, ptg->Groups[dwIndex].Sid)) 
+	  {
+	    HeapFree(GetProcessHeap(), 0, (LPVOID)psid);
+	    goto Cleanup;
+	  }
+	break;
+      }
+  }
+
+  if (psid!=NULL) {
+    ConvertSidToStringSid(psid,&strsid);
+    // string sid is eg: S-1-5-5-X-Y
+    retval=sidhash(strsid);
+    LocalFree(strsid);
+  }
+
+ Cleanup:
+
+   if (ptg != NULL)
+      HeapFree(GetProcessHeap(), 0, (LPVOID)ptg);
+
+   //CloseHandle(Thandle);
+  return retval;
+#else
+  return geteuid();
+#endif
+  return 0; // stop gcc complaining
+}
+
+
+LIVES_INLINE int lives_getgid(void) {
+#ifdef IS_MINGW
+  return lives_getuid();
+#else
+  return getegid();
+#endif
+  return 0; // stop gcc complaining
+}
+
+
+
+LIVES_INLINE ssize_t lives_readlink(const char *path, char *buf, size_t bufsiz) {
+#ifdef IS_MINGW
+  ssize_t sz=strlen(path);
+  if (sz>bufsiz) sz=bufsiz;
+  memcpy(buf,path,sz);
+  return sz;
+#else
+  return readlink(path,buf,bufsiz);
+#endif
+}
+
+
+LIVES_INLINE boolean lives_fsync(int fd) {
+  // ret TRUE on success
+#ifndef IS_MINGW
+  return !fsync(fd);
+#else
+  return _commit(fd);
+#endif
+}
+
+
+LIVES_INLINE void lives_sync(void) {
+  // ret TRUE on success
+#ifndef IS_MINGW
+  sync();
+#else
+  system("sync.exe");
+  return;
+#endif
+}
+
+
+LIVES_INLINE boolean lives_setenv(const char *name, const char *value) {
+  // ret TRUE on success
+#if IS_MINGW
+  return SetEnvironmentVariable(name,value);
+#else
+#if IS_IRIX
+  int len  = strlen(name) + strlen(value) + 2;
+  char *env = malloc(len);
+  if (env != NULL) {
+    strcpy(env, name);
+    strcat(env, "=");
+    strcat(env, val);
+    return !putenv(env);
+  }
+}
+#else
+  return !setenv(name,value,1);
+#endif
+#endif
+}
+
+
+
+int lives_system(const char *com, boolean allow_error) {
   int retval;
+  boolean cnorm=FALSE;
+
+  // TODO - use g_spawn ?
+
+  if (mainw->is_ready&&!mainw->is_exiting&&
+      ((mainw->multitrack==NULL&&mainw->cursor_style==LIVES_CURSOR_NORMAL)||
+       (mainw->multitrack!=NULL&&mainw->multitrack->cursor_style==LIVES_CURSOR_NORMAL))) {
+    cnorm=TRUE;
+    lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
+
+    lives_widget_context_update();
+  }
 
   retval=system(com);
 
-  if (retval) {
+  if (retval
+#ifdef IS_MINGW
+      &&retval!=9009
+#endif
+      ) {
     gchar *msg=NULL;
     mainw->com_failed=TRUE;
     if (!allow_error) {
@@ -95,33 +313,49 @@
 #endif
     if (msg!=NULL) g_free(msg);
   }
+
+  if (cnorm) lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+
   return retval;
 }
 
 
 
-pid_t lives_fork(const char *com) {
+lives_pid_t lives_fork(const char *com) {
   // returns a negative number which is the pgid to lives_kill
+
+  // mingw - return PROCESS_INFORMATION * to use in GenerateConsoleCtrlEvent (?)
+
   // to signal to sub process and all children
   // TODO *** - error check
 
+#ifndef IS_MINGW
   pid_t ret;
 
   if (!(ret=fork())) {
+    int dummy;
     setsid(); // create new session id
     setpgid(getpid(),0); // create new pgid
-    lives_system(com,TRUE);
+    dummy=system(com);
+    dummy=dummy;
     _exit(0);
   }
 
   return ret;
+#else
+  STARTUPINFO si;
+  PROCESS_INFORMATION *pi=malloc(sizeof(PROCESS_INFORMATION));
+
+  CreateProcess(NULL,(char *)com,NULL,NULL,FALSE,CREATE_NEW_PROCESS_GROUP,NULL,NULL,&si,pi);
+  return pi;
+#endif
 }
 
 
 
 
 
-ssize_t lives_write(int fd, const void *buf, size_t count, gboolean allow_fail) {
+ssize_t lives_write(int fd, const void *buf, size_t count, boolean allow_fail) {
   ssize_t retval;
   retval=write(fd, buf, count);
 
@@ -129,8 +363,8 @@
     gchar *msg=NULL;
     mainw->write_failed=TRUE;
     mainw->write_failed_file=filename_from_fd(mainw->write_failed_file,fd);
-    msg=g_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s",(unsigned long)retval,
-			(unsigned long)count,mainw->write_failed_file);
+    msg=g_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s",(uint64_t)retval,
+			(uint64_t)count,mainw->write_failed_file);
     if (!allow_fail) {
       LIVES_ERROR(msg);
       close(fd);
@@ -138,8 +372,8 @@
 #ifndef LIVES_NO_DEBUG
     else {
       gchar *ffile=filename_from_fd(NULL,fd);
-      msg=g_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s (not an error)",(unsigned long)retval,
-			  (unsigned long)count,ffile);
+      msg=g_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s (not an error)",(uint64_t)retval,
+			  (uint64_t)count,ffile);
       LIVES_DEBUG(msg);
       g_free(ffile);
     }
@@ -152,8 +386,8 @@
 
 
 
-ssize_t lives_write_le(int fd, const void *buf, size_t count, gboolean allow_fail) {
-  if (capable->byte_order==G_BIG_ENDIAN&&(prefs->bigendbug!=1)) {
+ssize_t lives_write_le(int fd, const void *buf, size_t count, boolean allow_fail) {
+  if (capable->byte_order==LIVES_BIG_ENDIAN&&(prefs->bigendbug!=1)) {
     uint8_t xbuf[count];
     reverse_bytes(xbuf,(const uint8_t *)buf,count);
     return lives_write(fd,xbuf,count,allow_fail);
@@ -193,7 +427,7 @@
 
 
 
-ssize_t lives_read(int fd, void *buf, size_t count, gboolean allow_less) {
+ssize_t lives_read(int fd, void *buf, size_t count, boolean allow_less) {
   ssize_t retval=read(fd, buf, count);
 
   if (retval<count) {
@@ -201,16 +435,16 @@
     if (!allow_less||retval<0) {
       mainw->read_failed=TRUE;
       mainw->read_failed_file=filename_from_fd(mainw->read_failed_file,fd);
-      msg=g_strdup_printf("Read failed %"PRIu64" of %"PRIu64" in: %s",(unsigned long)retval,
-			  (unsigned long)count,mainw->read_failed_file);
+      msg=g_strdup_printf("Read failed %"PRIu64" of %"PRIu64" in: %s",(uint64_t)retval,
+			  (uint64_t)count,mainw->read_failed_file);
       LIVES_ERROR(msg);
       close(fd);
     }
 #ifndef LIVES_NO_DEBUG
     else {
       gchar *ffile=filename_from_fd(NULL,fd);
-      msg=g_strdup_printf("Read got %"PRIu64" of %"PRIu64" in: %s (not an error)",(unsigned long)retval,
-			  (unsigned long)count,ffile);
+      msg=g_strdup_printf("Read got %"PRIu64" of %"PRIu64" in: %s (not an error)",(uint64_t)retval,
+			  (uint64_t)count,ffile);
       LIVES_DEBUG(msg);
       g_free(ffile);
     }
@@ -222,8 +456,8 @@
 
 
 
-ssize_t lives_read_le(int fd, void *buf, size_t count, gboolean allow_less) {
-  if (capable->byte_order==G_BIG_ENDIAN&&!prefs->bigendbug) {
+ssize_t lives_read_le(int fd, void *buf, size_t count, boolean allow_less) {
+  if (capable->byte_order==LIVES_BIG_ENDIAN&&!prefs->bigendbug) {
     uint8_t xbuf[count];
     ssize_t retval=lives_read(fd,buf,count,allow_less);
     if (retval<count) return retval;
@@ -317,17 +551,390 @@
   }
 }
 
-LIVES_INLINE int lives_kill(pid_t pid, int sig) {
+
+
+#ifdef IS_MINGW
+
+
+
+// should compile but it doesnt: http://msdn.microsoft.com/en-us/library/windows/desktop/ms683194%28v=vs.85%29.aspx
+/*
+typedef BOOL (WINAPI *LPFN_GLPI)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
+
+
+// Helper function to count set bits in the processor mask.
+DWORD CountSetBits(ULONG_PTR bitMask) {
+  DWORD LSHIFT = sizeof(ULONG_PTR)*8 - 1;
+  DWORD bitSetCount = 0;
+  ULONG_PTR bitTest = (ULONG_PTR)1 << LSHIFT;    
+  DWORD i;
+    
+  for (i = 0; i <= LSHIFT; ++i) {
+    bitSetCount += ((bitMask & bitTest)?1:0);
+    bitTest/=2;
+  }
+    
+  return bitSetCount;
+}
+
+
+int lives_win32_get_num_logical_cpus(void) {
+  LPFN_GLPI glpi;
+  BOOL done = FALSE;
+  PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buffer = NULL;
+  PSYSTEM_LOGICAL_PROCESSOR_INFORMATION ptr = NULL;
+  DWORD returnLength = 0;
+  DWORD logicalProcessorCount = 0;
+  DWORD numaNodeCount = 0;
+  DWORD processorCoreCount = 0;
+  DWORD processorL1CacheCount = 0;
+  DWORD processorL2CacheCount = 0;
+  DWORD processorL3CacheCount = 0;
+  DWORD processorPackageCount = 0;
+  DWORD byteOffset = 0;
+  PCACHE_DESCRIPTOR Cache;
+
+  glpi = (LPFN_GLPI) GetProcAddress(
+				    GetModuleHandle(TEXT("kernel32")),
+				    "GetLogicalProcessorInformation");
+  if (NULL == glpi) {
+    LIVES_WARN("GetLogicalProcessorInformation is not supported.");
+    return 0;
+  }
+
+  while (!done) {
+    DWORD rc = glpi(buffer, &returnLength);
+
+    if (FALSE == rc) {
+      if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
+	if (buffer) g_free(buffer);
+	  
+	buffer = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION)g_malloc(returnLength);
+	  
+	if (NULL == buffer) {
+	  LIVES_ERROR("Allocation failure");
+	  return 0;
+	}
+      } 
+      else {
+	LIVES_ERROR("getting numprocs");
+	return 0;
+      }
+    } 
+    else {
+      done = TRUE;
+    }
+  }
+
+  ptr = buffer;
+
+  while (byteOffset + sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION) <= returnLength) {
+    switch (ptr->Relationship) {
+    case RelationNumaNode:
+      // Non-NUMA systems report a single record of this type.
+      numaNodeCount++;
+      break;
+	
+    case RelationProcessorCore:
+      processorCoreCount++;
+	
+      // A hyperthreaded core supplies more than one logical processor.
+      logicalProcessorCount += CountSetBits(ptr->ProcessorMask);
+      break;
+	
+    case RelationCache:
+      // Cache data is in ptr->Cache, one CACHE_DESCRIPTOR structure for each cache. 
+      Cache = &ptr->Cache;
+      if (Cache->Level == 1)
+	{
+	  processorL1CacheCount++;
+	}
+      else if (Cache->Level == 2)
+	{
+	  processorL2CacheCount++;
+	}
+      else if (Cache->Level == 3)
+	{
+	  processorL3CacheCount++;
+	}
+      break;
+	
+    case RelationProcessorPackage:
+      // Logical processors share a physical package.
+      processorPackageCount++;
+      break;
+	
+    default:
+      _tprintf(TEXT("\nError: Unsupported LOGICAL_PROCESSOR_RELATIONSHIP value.\n"));
+      break;
+    }
+    byteOffset += sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION);
+    ptr++;
+  }
+*/
+  /*     _tprintf(TEXT("\nGetLogicalProcessorInformation results:\n"));
+	 _tprintf(TEXT("Number of NUMA nodes: %d\n"), 
+	 numaNodeCount);
+	 _tprintf(TEXT("Number of physical processor packages: %d\n"), 
+	 processorPackageCount);
+	 _tprintf(TEXT("Number of processor cores: %d\n"), 
+	 processorCoreCount);
+	 _tprintf(TEXT("Number of logical processors: %d\n"), 
+	 logicalProcessorCount);
+	 _tprintf(TEXT("Number of processor L1/L2/L3 caches: %d/%d/%d\n"), 
+	 processorL1CacheCount,
+	 processorL2CacheCount,
+	 processorL3CacheCount);*/
+/*    
+  g_free(buffer);
+
+  return logicalProcessorCount;
+}
+
+*/
+
+
+
+
+
+
+
+
+static boolean lives_win32_suspend_resume_threads(DWORD pid, boolean suspend) {
+  HANDLE hThreadSnap;
+  HANDLE hThread;
+  THREADENTRY32 te32;
+
+  // Take a snapshot of all threads in the system.
+  hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
+  if( hThreadSnap == INVALID_HANDLE_VALUE ) {
+    LIVES_ERROR("CreateToolhelp32Snapshot (of threades)");
+    return FALSE;
+  }
+
+  // Set the size of the structure before using it.
+  te32.dwSize = sizeof( THREADENTRY32 );
+
+  // Retrieve information about the first thread,
+  // and exit if unsuccessful
+  if( !Thread32First( hThreadSnap, &te32 ) ) {
+    LIVES_ERROR("Thread32First"); // show cause of failure
+    CloseHandle( hThreadSnap );          // clean the snapshot object
+    return( FALSE );
+  }
+
+  // Now walk the snapshot of threads, and suspend/resume any owned by process
+
+  do {
+    hThread = OpenThread( THREAD_SUSPEND_RESUME, FALSE, te32.th32ThreadID );
+    if( hThread == NULL ) continue;
+
+    if (te32.th32OwnerProcessID == pid) {
+      if (suspend) {
+	SuspendThread(hThread);
+      }
+      else {
+	ResumeThread(hThread);
+      }
+    }
+
+    CloseHandle( hThread );
+
+  } while( Thread32Next( hThreadSnap, &te32 ) );
+
+  CloseHandle( hThreadSnap );
+
+  return TRUE;
+ 
+}
+
+
+boolean lives_win32_suspend_resume_process(DWORD pid, boolean suspend) {
+  HANDLE hProcessSnap;
+  HANDLE hProcess;
+  PROCESSENTRY32 pe32;
+
+  if (pid==0) return TRUE;
+
+  // Take a snapshot of all processes in the system.
+  hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
+  if( hProcessSnap == INVALID_HANDLE_VALUE ) {
+    LIVES_ERROR("CreateToolhelp32Snapshot (of processes)");
+    return FALSE;
+  }
+
+  // Set the size of the structure before using it.
+  pe32.dwSize = sizeof( PROCESSENTRY32 );
+
+  // Retrieve information about the first process,
+  // and exit if unsuccessful
+  if( !Process32First( hProcessSnap, &pe32 ) ) {
+    LIVES_ERROR("Process32First"); // show cause of failure
+    CloseHandle( hProcessSnap );          // clean the snapshot object
+    return( FALSE );
+  }
+
+  // resume this thread first
+  if (!suspend) lives_win32_suspend_resume_threads(pid, FALSE);
+
+  // Now walk the snapshot of processes, and
+  // display information about each process in turn
+
+  do {
+    hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, pe32.th32ProcessID );
+    if( hProcess == NULL ) continue;
+
+    // TODO - find equivalent on "real" windows
+    if (!strcmp(pe32.szExeFile,"wineconsole.exe")) {
+      CloseHandle( hProcess );
+      continue;
+    }
+
+    if (pe32.th32ParentProcessID == pid && pe32.th32ProcessID != pid) {
+      // suspend subprocess
+      lives_win32_suspend_resume_process(pe32.th32ProcessID, suspend);
+    }
+
+    CloseHandle( hProcess );
+
+  } while( Process32Next( hProcessSnap, &pe32 ) );
+ 
+  CloseHandle( hProcessSnap );
+
+  // suspend this thread last
+  if (suspend) lives_win32_suspend_resume_threads(pid, TRUE);
+
+  return TRUE;
+}
+
+
+
+boolean lives_win32_kill_subprocesses(DWORD pid, boolean kill_parent) {
+  HANDLE hProcessSnap;
+  HANDLE hProcess;
+  PROCESSENTRY32 pe32;
+
+  if (pid==0) return TRUE;
+
+  // Take a snapshot of all processes in the system.
+  hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
+  if( hProcessSnap == INVALID_HANDLE_VALUE ) {
+    LIVES_ERROR("CreateToolhelp32Snapshot (of processes)");
+    return FALSE;
+  }
+
+  // Set the size of the structure before using it.
+  pe32.dwSize = sizeof( PROCESSENTRY32 );
+
+  // Retrieve information about the first process,
+  // and exit if unsuccessful
+  if( !Process32First( hProcessSnap, &pe32 ) ) {
+    LIVES_ERROR("Process32First"); // show cause of failure
+    CloseHandle( hProcessSnap );          // clean the snapshot object
+    return( FALSE );
+  }
+
+  // Now walk the snapshot of processes, and
+  // display information about each process in turn
+
+  do {
+    hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, pe32.th32ProcessID );
+    if( hProcess == NULL ) continue;
+
+    //g_print("handling process %d %d : %s\n",pe32.th32ParentProcessID,pe32.th32ProcessID,pe32.szExeFile);
+
+    // TODO - find equivalent on "real" windows
+    if (!strcmp(pe32.szExeFile,"wineconsole.exe")) {
+      CloseHandle( hProcess );
+      continue;
+    }
+
+    if (pe32.th32ParentProcessID == pid && pe32.th32ProcessID != pid) {
+      lives_win32_kill_subprocesses(pe32.th32ProcessID, TRUE);
+    }
+
+    CloseHandle( hProcess );
+
+  } while( Process32Next( hProcessSnap, &pe32 ) );
+
+  CloseHandle( hProcessSnap );
+
+  if (kill_parent) {
+
+    hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
+    if( hProcessSnap == INVALID_HANDLE_VALUE ) {
+      LIVES_ERROR("CreateToolhelp32Snapshot (of processes)");
+      return FALSE;
+    }
+    
+    // Set the size of the structure before using it.
+    pe32.dwSize = sizeof( PROCESSENTRY32 );
+    
+    // Retrieve information about the first process,
+    // and exit if unsuccessful
+    if( !Process32First( hProcessSnap, &pe32 ) ) {
+      LIVES_ERROR("Process32First"); // show cause of failure
+      CloseHandle( hProcessSnap );          // clean the snapshot object
+      return( FALSE );
+    }
+    
+    // Now walk the snapshot of processes, and
+    // display information about each process in turn
+    
+    do {
+      hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, pe32.th32ProcessID );
+      if( hProcess == NULL ) continue;
+      
+      if (pe32.th32ProcessID == pid) {
+	//g_print("killing %d\n", pe32.th32ProcessID);
+	TerminateProcess(hProcess, 0);
+      }
+
+      CloseHandle( hProcess );
+      
+    } while( Process32Next( hProcessSnap, &pe32 ) );
+    
+    CloseHandle( hProcessSnap );
+
+  }
+
+  return TRUE;
+}
+
+#endif
+
+
+
+LIVES_INLINE int lives_kill(lives_pid_t pid, int sig) {
+#ifndef IS_MINGW
+  if (pid==0) {
+    LIVES_ERROR("Tried to kill pid 0");
+    return -1;
+  }
   return kill(pid,sig);
+#else
+  CloseHandle( pid->hProcess );
+  CloseHandle( pid->hThread );
+  GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid->dwProcessId);
+#endif
+  return 0;
 };
 
-LIVES_INLINE int lives_killpg(int pgrp, int sig) {
+
+LIVES_INLINE int lives_killpg(lives_pgid_t pgrp, int sig) {
+#ifndef IS_MINGW
   return killpg(pgrp,sig);
+#else
+  CloseHandle( pgrp->hProcess );
+  CloseHandle( pgrp->hThread );
+  GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pgrp->dwProcessId);
+#endif
+  return 0;
 };
 
 
-LIVES_INLINE gint myround(gdouble n) {
-  return (n>=0.)?(gint)(n + 0.5):(gint)(n - 0.5);
+LIVES_INLINE int myround(double n) {
+  return (n>=0.)?(int)(n + 0.5):(int)(n - 0.5);
 }
 
 LIVES_INLINE void clear_mainw_msg (void) {
@@ -410,8 +1017,7 @@
 /*** check if alarm time passed yet, if so clear that alarm and return TRUE
  * else return FALSE
  */
-
-gboolean lives_alarm_get(int alarm_handle) {
+boolean lives_alarm_get(int alarm_handle) {
   int64_t cticks;
 
   // invalid alarm number
@@ -480,27 +1086,19 @@
 }
 
 
-
-#ifdef IS_IRIX
-void setenv(const char *name, const char *val, int _xx) {
-  int len  = strlen(name) + strlen(val) + 2;
-  char *env = malloc(len);
-
-  if (env != NULL) {
-    strcpy(env, name);
-    strcat(env, "=");
-    strcat(env, val);
-    putenv(env);
+LIVES_INLINE const char *get_image_ext_for_type(lives_image_type_t imgtype) {
+  switch (imgtype) {
+  case IMG_TYPE_JPEG: return "jpg";
+  case IMG_TYPE_PNG: return "png";
+  default: return "";
   }
 }
-#endif
-
 
 
 /* convert to/from a big endian 32 bit float for internal use */
 LIVES_INLINE float LEFloat_to_BEFloat(float f) {
   char *b=(char *)(&f);
-  if (G_BYTE_ORDER==G_LITTLE_ENDIAN) {
+  if (capable->byte_order==LIVES_LITTLE_ENDIAN) {
     float fl;
     guchar rev[4];
     rev[0]=b[3];
@@ -514,11 +1112,11 @@
 }
 
 
-LIVES_INLINE gdouble calc_time_from_frame (gint clip, gint frame) {
+LIVES_INLINE double calc_time_from_frame (int clip, int frame) {
   return (frame-1.)/mainw->files[clip]->fps;
 }
 
-LIVES_INLINE gint calc_frame_from_time (gint filenum, gdouble time) {
+LIVES_INLINE int calc_frame_from_time (int filenum, double time) {
   // return the nearest frame (rounded) for a given time, max is cfile->frames
   int frame=0;
   if (time<0.) return mainw->files[filenum]->frames?1:0;
@@ -526,7 +1124,7 @@
   return (frame<mainw->files[filenum]->frames)?frame:mainw->files[filenum]->frames;
 }
 
-LIVES_INLINE gint calc_frame_from_time2 (gint filenum, gdouble time) {
+LIVES_INLINE int calc_frame_from_time2 (int filenum, double time) {
   // return the nearest frame (rounded) for a given time
   // allow max (frames+1)
   int frame=0;
@@ -535,7 +1133,7 @@
   return (frame<mainw->files[filenum]->frames+1)?frame:mainw->files[filenum]->frames+1;
 }
 
-LIVES_INLINE gint calc_frame_from_time3 (gint filenum, gdouble time) {
+LIVES_INLINE int calc_frame_from_time3 (int filenum, double time) {
   // return the nearest frame (floor) for a given time
   // allow max (frames+1)
   int frame=0;
@@ -595,16 +1193,16 @@
 
 void calc_aframeno(gint fileno) {
 #ifdef ENABLE_JACK
-  if (prefs->audio_player==AUD_PLAYER_JACK&&(mainw->jackd!=NULL||mainw->jackd_read!=NULL)&&
-      mainw->jackd->playing_file==fileno) {
+  if (prefs->audio_player==AUD_PLAYER_JACK&&((mainw->jackd!=NULL&&mainw->jackd->playing_file==fileno)||
+					     (mainw->jackd_read!=NULL&&mainw->jackd_read->playing_file==fileno))) {
     // get seek_pos from jack
     if (mainw->jackd_read!=NULL) mainw->aframeno=lives_jack_get_pos(mainw->jackd_read)/cfile->fps+1.;
     else mainw->aframeno=lives_jack_get_pos(mainw->jackd)/cfile->fps+1.;
   }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-  if (prefs->audio_player==AUD_PLAYER_PULSE&&(mainw->pulsed!=NULL||mainw->pulsed_read!=NULL)&&
-      mainw->pulsed->playing_file==fileno) {
+  if (prefs->audio_player==AUD_PLAYER_PULSE&&((mainw->pulsed!=NULL&& mainw->pulsed->playing_file==fileno)||
+					      (mainw->pulsed_read!=NULL&&mainw->pulsed_read->playing_file==fileno))) {
     // get seek_pos from pulse
     if (mainw->pulsed_read!=NULL) mainw->aframeno=lives_pulse_get_pos(mainw->pulsed_read)/cfile->fps+1.;
     else mainw->aframeno=lives_pulse_get_pos(mainw->pulsed)/cfile->fps+1.;
@@ -615,7 +1213,7 @@
 
 
 
-gint calc_new_playback_position(gint fileno, gint64 otc, gint64 *ntc) {
+int calc_new_playback_position(int fileno, uint64_t otc, uint64_t *ntc) {
   // returns a frame number (floor) using sfile->last_frameno and ntc-otc
   // takes into account looping modes
 
@@ -665,7 +1263,7 @@
 
   if (fps==0.) {
     *ntc=otc;
-    calc_aframeno(fileno);
+    if (prefs->audio_src==AUDIO_SRC_INT) calc_aframeno(fileno);
     return cframe;
   }
 
@@ -676,12 +1274,12 @@
   *ntc=otc+dtc;
 
   // nframe is our new frame
-  nframe=cframe+(gint)((gdouble)dtc/U_SEC*fps+(fps>0?.5:-.5));
+  nframe=cframe+myround((double)dtc/U_SEC*fps);
 
   if (nframe==cframe||mainw->foreign) return nframe;
 
   // calculate audio "frame" from the number of samples played
-  if (mainw->playing_file==fileno) {
+  if (prefs->audio_src==AUDIO_SRC_INT&&mainw->playing_file==fileno) {
     calc_aframeno(fileno);
   }
 
@@ -820,7 +1418,9 @@
       gboolean is_jump=FALSE;
       if (mainw->scratch==SCRATCH_JUMP) is_jump=TRUE;
       mainw->scratch=SCRATCH_NONE;
-      resync_audio(nframe);
+      if (sfile->achans>0) {
+	resync_audio(nframe);
+      }
       if (is_jump) mainw->video_seek_ready=TRUE;
       if (mainw->whentostop==STOP_ON_AUD_END&&sfile->achans>0) {
 	// we check for audio stop here, but the seek may not have happened yet
@@ -899,7 +1499,7 @@
     // need to set current file to 0 before monitoring progress
     mainw->current_file=0;
     mainw->com_failed=FALSE;
-    com=g_strdup_printf("smogrify delete_all \"%s\"",clipboard->handle);
+    com=g_strdup_printf("%s delete_all \"%s\"",prefs->backend,clipboard->handle);
     unlink(clipboard->info_file);
     lives_system(com,FALSE);
     g_free(com);
@@ -1065,10 +1665,10 @@
   case LMAP_ERROR_MISSING_CLIP:
   case LMAP_ERROR_CLOSE_FILE:
     if (affects_current) {
-      text=g_strdup_printf("%s\n",mainw->cl_string);
+      text=g_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
       g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
 
       mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
 
@@ -1088,10 +1688,10 @@
   case LMAP_ERROR_DELETE_FRAMES:
   case LMAP_ERROR_ALTER_FRAMES:
     if (affects_current) {
-      text=g_strdup_printf("%s\n",mainw->cl_string);
+      text=g_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
       g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
 
       mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
     }
@@ -1114,10 +1714,10 @@
   case LMAP_ERROR_DELETE_AUDIO:
   case LMAP_ERROR_ALTER_AUDIO:
     if (affects_current) {
-      text=g_strdup_printf("%s\n",mainw->cl_string);
+      text=g_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       gtk_text_buffer_insert(GTK_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
       g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->cl_string);
+      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
 
       mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,(gpointer)gtk_text_buffer_create_mark(GTK_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
     }
@@ -1183,7 +1783,7 @@
   ssize_t bytes;
 
   gchar *info_file=g_strdup_printf("%s/.locks.%d",prefs->tmpdir,getpid());
-  gchar *com=g_strdup_printf("smogrify check_for_lock \"%s\" \"%s\" %d >\"%s\"",set_name,capable->myname,
+  gchar *com=g_strdup_printf("%s check_for_lock \"%s\" \"%s\" %d >\"%s\"",prefs->backend_sync,set_name,capable->myname,
 			     getpid(),info_file);
 
   unlink(info_file);
@@ -1303,13 +1903,13 @@
   // for files of type CLIP_TYPE_DISK
   // - check the image files (e.g. jpeg or png)
 
-  // use a "goldilocks" algorithm (just the right frames, not too few and not too many
+  // use a "goldilocks" algorithm (just the right frames, not too few and not too many)
 
   // ingores gaps
 
   // make sure nth frame is there...
   gchar *frame=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames,
-			       mainw->files[idx]->img_type==IMG_TYPE_JPEG?"jpg":"png");
+			       get_image_ext_for_type(mainw->files[idx]->img_type));
 
   if (!g_file_test(frame,G_FILE_TEST_EXISTS)) {
     // not enough frames
@@ -1320,7 +1920,7 @@
 
   // ...make sure n + 1 th frame is not
   frame=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames+1,
-			mainw->files[idx]->img_type==IMG_TYPE_JPEG?"jpg":"png");
+			get_image_ext_for_type(mainw->files[idx]->img_type));
   if (g_file_test(frame,G_FILE_TEST_EXISTS)) {
     // too many frames
     g_free(frame);
@@ -1347,8 +1947,8 @@
   int retval;
   ssize_t bytes;
   gchar *info_file=g_strdup_printf("%s/.check.%d",prefs->tmpdir,getpid());
-  gchar *com=g_strdup_printf("smogrify count_frames \"%s\" \"%s\" > \"%s\"",mainw->files[idx]->handle,
-			     mainw->files[idx]->img_type==IMG_TYPE_JPEG?"jpg":"png",info_file);
+  gchar *com=g_strdup_printf("%s count_frames \"%s\" \"%s\" > \"%s\"",prefs->backend_sync,mainw->files[idx]->handle,
+			     get_image_ext_for_type(mainw->files[idx]->img_type),info_file);
 
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
@@ -1384,7 +1984,17 @@
 }
 
 
+void get_frames_sizes(int fileno, int frame) {
+  file *sfile=mainw->files[fileno];
+  LiVESPixbuf *pixbuf;
+  
+  if ((pixbuf=pull_lives_pixbuf(fileno,frame,get_image_ext_for_type(mainw->files[fileno]->img_type),0))) {
+    sfile->hsize=lives_pixbuf_get_width(pixbuf);
+    sfile->vsize=lives_pixbuf_get_height(pixbuf);
+    g_object_unref(pixbuf);
+  }
 
+}
 
 
 
@@ -1465,7 +2075,7 @@
 }
 
 
-gboolean ensure_isdir(gchar *fname) {
+boolean ensure_isdir(gchar *fname) {
   // ensure dirname ends in a single dir separator
   // fname should be gchar[PATH_MAX]
 
@@ -1500,12 +2110,12 @@
 }
 
 
-guint64 get_version_hash(const gchar *exe, const gchar *sep, int piece) {
-  // get version hash output
+uint64_t get_version_hash(const gchar *exe, const gchar *sep, int piece) {
+  /// get version hash output for an executable from the backend
   FILE *rfile;
   ssize_t rlen;
   char val[16];
-  gchar *com=g_strdup_printf("smogrify get_version_hash \"%s\" \"%s\" %d",exe,sep,piece);
+  gchar *com=g_strdup_printf("%s get_version_hash \"%s\" \"%s\" %d",prefs->backend_sync,exe,sep,piece);
   rfile=popen(com,"r");
   rlen=fread(val,1,16,rfile);
   pclose(rfile);
@@ -1514,6 +2124,38 @@
   return strtol(val,NULL,10);
 }
 
+#define VER_MAJOR_MULT 1000000
+#define VER_MINOR_MULT 1000
+#define VER_MICRO_MULT 1
+
+uint64_t make_version_hash(const char *ver) {
+  /// convert a version to uint64_t hash, for comparing
+
+  uint64_t hash;
+  int ntok;
+  gchar **array;
+
+  if (ver==NULL) return 0;
+
+  ntok=get_token_count((gchar *)ver,'.');
+  array=g_strsplit(ver,".",-1);
+
+  hash=atoi(array[0])*VER_MAJOR_MULT;
+
+  if (ntok>1) {
+    hash+=atoi(array[1])*VER_MINOR_MULT;
+  }
+
+  if (ntok>2) {
+    hash+=atoi(array[2])*VER_MICRO_MULT;
+  }
+
+  g_strfreev(array);
+
+  return hash;
+}
+
+
 
 gchar *repl_tmpdir(const gchar *entry, gboolean fwd) {
   // replace prefs->tmpdir with string tmpdir or vice-versa. This allows us to relocate tmpdir if necessary.
@@ -1562,9 +2204,9 @@
   while (map!=NULL) {
     map_next=map->next;
     if (map->data!=NULL) {
-      if (!strcmp((gchar *)map->data,mainw->cl_string)) {
+      if (!strcmp((gchar *)map->data,mainw->string_constants[LIVES_STRING_CONSTANT_CL])) {
 	is_current=TRUE;
-	fname=g_strdup(mainw->cl_string);
+	fname=g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       }
       else {
 	is_current=FALSE;
@@ -1593,7 +2235,11 @@
       g_free(msg);
 
       if (!is_current) {
+#ifndef IS_MINGW
 	com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",fname);
+#else
+	com=g_strdup_printf("rm.exe \"%s\" 2>NUL",fname);
+#endif
 	lives_system(com,TRUE);
 	g_free(com);
 	
@@ -1608,7 +2254,11 @@
 
 	  mainw->com_failed=FALSE;
 	  // touch a file in tpmdir, so we cannot remove tmpdir itself
+#ifndef IS_MINGW
 	  com=g_strdup_printf("/bin/touch \"%s\" >/dev/null 2>&1",protect_file);
+#else
+	  com=g_strdup_printf("touch.exe \"%s\" >NUL 2>&1",protect_file);
+#endif
 	  lives_system(com,FALSE);
 	  g_free(com);
 	  
@@ -1616,7 +2266,11 @@
 	    // ok, the "touch" worked
 	    // now we call rmdir -p : remove directory + any empty parents
 	    fdir=g_path_get_dirname (fname);
+#ifndef IS_MINGW
 	    com=g_strdup_printf("/bin/rmdir -p \"%s\" 2>/dev/null",fdir);
+#else
+	    com=g_strdup_printf("rmdir.exe /p \"%s\" 2>NUL",fdir);
+#endif
 	    lives_system(com,TRUE);
 	    g_free(com);
 	    g_free(fdir);
@@ -1682,13 +2336,13 @@
   // and if we are not playing,
   // get play times for video, audio channels, and total (longest) time
   gchar *tmpstr;
-  gdouble offset=0;
-  gdouble offset_left=0;
-  gdouble offset_right=0;
-  gdouble allocwidth;
-  gdouble allocheight;
+  double offset=0;
+  double offset_left=0;
+  double offset_right=0;
+  double allocwidth;
+  double allocheight;
 
-  if (mainw->current_file==-1||mainw->foreign||cfile==NULL||mainw->multitrack!=NULL) return;
+  if (mainw->current_file==-1||mainw->foreign||cfile==NULL||mainw->multitrack!=NULL||mainw->recoverable_layout) return;
 
   if (mainw->playing_file==-1) {
     get_total_time (cfile);
@@ -1698,41 +2352,45 @@
 
   if (mainw->laudio_drawable==NULL||mainw->raudio_drawable==NULL) return;
 
-
   // draw timer bars
-  allocwidth=mainw->video_draw->allocation.width;
-  allocheight=mainw->video_draw->allocation.height;
+  allocwidth=lives_widget_get_allocation_width(mainw->video_draw);
+  allocheight=lives_widget_get_allocation_height(mainw->video_draw);
 
   
   if (mainw->laudio_drawable!=NULL) {
-    gdk_draw_rectangle (mainw->laudio_drawable,
-			mainw->laudio_draw->style->bg_gc[GTK_WIDGET_STATE (mainw->laudio_draw)],
-			TRUE,
-			0, 0,
-			allocwidth,
-			allocheight
-			);
+    lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
+    lives_painter_set_source_to_bg(cr,mainw->laudio_draw);
+
+    lives_painter_rectangle(cr,0,0,
+		    allocwidth,
+		    allocheight);
+    lives_painter_fill(cr);
+    lives_painter_destroy (cr);
+
   }
   
-  
   if (mainw->raudio_drawable!=NULL) {
-    gdk_draw_rectangle (mainw->raudio_drawable,
-			mainw->raudio_draw->style->bg_gc[GTK_WIDGET_STATE (mainw->raudio_draw)],
-			TRUE,
-			0, 0,
-			allocwidth,
-			allocheight
-			);
+    lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
+    lives_painter_set_source_to_bg(cr,mainw->raudio_draw);
+
+    lives_painter_rectangle(cr,0,0,
+		    allocwidth,
+		    allocheight);
+    lives_painter_fill(cr);
+    lives_painter_destroy (cr);
+
   }
 
   if (mainw->video_drawable!=NULL) {
-    gdk_draw_rectangle (mainw->video_drawable,
-			mainw->video_draw->style->bg_gc[GTK_WIDGET_STATE (mainw->video_draw)],
-			TRUE,
-			0, 0,
-			allocwidth,
-			allocheight
-			);
+    lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
+    lives_painter_set_source_to_bg(cr,mainw->video_draw);
+
+    lives_painter_rectangle(cr,0,0,
+		    allocwidth,
+		    allocheight);
+    lives_painter_fill(cr);
+    lives_painter_destroy (cr);
+
   }
 
   if (cfile->frames>0) {
@@ -1741,19 +2399,26 @@
 
     
     if (mainw->video_drawable!=NULL) {
-      gdk_draw_rectangle (mainw->video_drawable,
-			  mainw->video_draw->style->black_gc,
-			  TRUE,
-			  0, 0,
-			  cfile->video_time/cfile->total_time*allocwidth-1,
-			  prefs->bar_height);
+      lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
+      
+      lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      
+      lives_painter_rectangle(cr,0,0,
+		      cfile->video_time/cfile->total_time*allocwidth-1,
+		      prefs->bar_height);
+      
+      lives_painter_fill(cr);
+      
+      lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+      
+      lives_painter_rectangle(cr,offset_left, 0,
+		      offset_right-offset_left,
+		      prefs->bar_height);
       
-      gdk_draw_rectangle (mainw->video_drawable,
-			  mainw->video_draw->style->white_gc,
-			  TRUE,
-			  offset_left, 0,
-			  offset_right-offset_left,
-			  prefs->bar_height);
+      lives_painter_fill(cr);
+      
+      lives_painter_destroy (cr);
+
     }
   }
   if (cfile->achans>0) {
@@ -1769,54 +2434,63 @@
       }
     }
     
+    if (offset_right>cfile->laudio_time/cfile->total_time*allocwidth)
+      offset_right=cfile->laudio_time/cfile->total_time*allocwidth;
+
     
-    if (mainw->laudio_drawable!=NULL) {
-      gdk_draw_rectangle (mainw->laudio_drawable,
-			  mainw->laudio_draw->style->black_gc,
-			  TRUE,
-			  0, 0,
-			  cfile->laudio_time/cfile->total_time*allocwidth-1,
-			  prefs->bar_height);
-    
-    
-      gdk_draw_rectangle (mainw->laudio_drawable,
-			  mainw->laudio_draw->style->white_gc,
-			  TRUE,
-			  offset_left, 0,
-			  offset_right-offset_left,
-			  prefs->bar_height);
-  
     
-      gdk_draw_rectangle (mainw->laudio_drawable,
-			  mainw->laudio_draw->style->bg_gc[GTK_WIDGET_STATE (mainw->laudio_draw)],
-			  TRUE,
-			  cfile->laudio_time/cfile->total_time*allocwidth, 0,
-			  allocwidth-(cfile->laudio_time/cfile->total_time*allocwidth),
-			  prefs->bar_height);
+    if (mainw->laudio_drawable!=NULL) {
+      lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
+      
+      lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+      
+      lives_painter_rectangle(cr,0,0,
+		      cfile->laudio_time/cfile->total_time*allocwidth-1,
+		      prefs->bar_height);
+      
+      lives_painter_fill(cr);
+
+      if (offset_left<cfile->laudio_time/cfile->total_time*allocwidth) {
+      
+	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+      
+	lives_painter_rectangle(cr,offset_left, 0,
+				offset_right-offset_left,
+				prefs->bar_height);
+	
+	lives_painter_fill(cr);
+      
+      }
+
+      lives_painter_destroy (cr);
+
     }
     if (cfile->achans>1) {
       if (mainw->raudio_drawable!=NULL) {
-	gdk_draw_rectangle (mainw->raudio_drawable,
-			    mainw->raudio_draw->style->black_gc,
-			    TRUE,
-			    0, 0,
-			    cfile->raudio_time/cfile->total_time*allocwidth-1,
-			    prefs->bar_height);
-      
-	gdk_draw_rectangle (mainw->raudio_drawable,
-			    mainw->raudio_draw->style->white_gc,
-			    TRUE,
-			    offset_left, 0,
-			    offset_right-offset_left,
-			    prefs->bar_height);
+	lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
       
+	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	
+	lives_painter_rectangle(cr,0,0,
+			cfile->raudio_time/cfile->total_time*allocwidth-1,
+			prefs->bar_height);
+	
+	lives_painter_fill(cr);
+
+	if (offset_left<cfile->laudio_time/cfile->total_time*allocwidth) {
+	
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	
+	  lives_painter_rectangle(cr,offset_left, 0,
+				  offset_right-offset_left,
+				  prefs->bar_height);
       
-	gdk_draw_rectangle (mainw->raudio_drawable,
-			    mainw->raudio_draw->style->bg_gc[GTK_WIDGET_STATE (mainw->raudio_draw)],
-			    TRUE,
-			    cfile->raudio_time/cfile->total_time*allocwidth, 0,
-			    allocwidth-(cfile->raudio_time/cfile->total_time*allocwidth),
-			    prefs->bar_height);
+	  lives_painter_fill(cr);
+
+	}
+
+	lives_painter_destroy (cr);
+
       }
     }
   }
@@ -1827,40 +2501,42 @@
       offset=(mainw->actual_frame-.5)/cfile->fps;
       offset/=cfile->total_time/allocwidth;
       if (mainw->video_drawable!=NULL) {
+	lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
+
+	lives_painter_set_line_width(cr,1.);
+      
 	if (offset>=offset_left&&offset<=offset_right) {
-	  gdk_draw_line (mainw->video_drawable,
-			 mainw->video_draw->style->black_gc,
-			 offset, 0,
-			 offset,
-			 prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	  lives_painter_move_to(cr, offset, 0);
+	  lives_painter_line_to(cr, offset, prefs->bar_height);
 	}
 	else {
-	  gdk_draw_line (mainw->video_drawable,
-			 mainw->video_draw->style->white_gc,
-			 offset, 0,
-			 offset,
-			 prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	  lives_painter_move_to(cr, offset, 0);
+	  lives_painter_line_to(cr, offset, prefs->bar_height);
 	}
-      
+	lives_painter_stroke(cr);
+
 	if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	  gdk_draw_line (mainw->video_drawable,
-			 mainw->video_draw->style->black_gc,
-			 offset, prefs->bar_height,
-			 offset,
-			 allocheight-prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	  lives_painter_move_to(cr, offset, prefs->bar_height);
+	  lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	}
 	else {
-	  gdk_draw_line (mainw->video_drawable,
-			 mainw->video_draw->style->white_gc,
-			 offset, prefs->bar_height,
-			 offset,
-			 allocheight-prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	  lives_painter_move_to(cr, offset, prefs->bar_height);
+	  lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	}
+
+	lives_painter_stroke(cr);
+
+	lives_painter_destroy(cr);
+
       }
-      GTK_RULER (mainw->hruler)->position=offset*cfile->total_time/allocwidth;
+      lives_ruler_set_value(LIVES_RULER (mainw->hruler),offset*cfile->total_time/allocwidth);
       gtk_widget_queue_draw (mainw->hruler);
     }
-    if (cfile->achans>0&&cfile->is_loaded) {
+    if (cfile->achans>0&&cfile->is_loaded&&prefs->audio_src!=AUDIO_SRC_EXT) {
       if ((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE)&&
 	  (mainw->event_list==NULL||!mainw->preview)) {
 #ifdef ENABLE_JACK
@@ -1878,75 +2554,75 @@
       }
       else offset=allocwidth*(mainw->aframeno-.5)/cfile->fps/cfile->total_time;
       if (mainw->laudio_drawable!=NULL) {
-	if ((offset>=offset_left&&offset<=offset_right)||mainw->loop) {
-	  gdk_draw_line (mainw->laudio_drawable,
-			 mainw->laudio_draw->style->black_gc,
-			 offset, 0,
-			 offset,
-			 prefs->bar_height);
+	lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
+
+	lives_painter_set_line_width(cr,1.);
+      
+	if (offset>=offset_left&&offset<=offset_right) {
+	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	  lives_painter_move_to(cr, offset, 0);
+	  lives_painter_line_to(cr, offset, prefs->bar_height);
 	}
 	else {
-	  gdk_draw_line (mainw->laudio_drawable,
-			 mainw->laudio_draw->style->white_gc,
-			 offset, 0,
-			 offset,
-			 prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	  lives_painter_move_to(cr, offset, 0);
+	  lives_painter_line_to(cr, offset, prefs->bar_height);
 	}
-      
+	lives_painter_stroke(cr);
+
 	if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	  gdk_draw_line (mainw->laudio_drawable,
-			 mainw->laudio_draw->style->black_gc,
-			 offset, prefs->bar_height,
-			 offset,
-			 allocheight-prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	  lives_painter_move_to(cr, offset, prefs->bar_height);
+	  lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	}
 	else {
-	  gdk_draw_line (mainw->laudio_drawable,
-			 mainw->laudio_draw->style->white_gc,
-			 offset, prefs->bar_height,
-			 offset,
-			 allocheight-prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	  lives_painter_move_to(cr, offset, prefs->bar_height);
+	  lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	}
+	lives_painter_stroke(cr);
+
+	lives_painter_destroy(cr);
       }
 
       if (cfile->achans>1) {
 	if (mainw->raudio_drawable!=NULL) {
-	  if ((offset>=offset_left&&offset<=offset_right)||mainw->loop) {
-	    gdk_draw_line (mainw->raudio_drawable,
-			   mainw->raudio_draw->style->black_gc,
-			   offset, 0,
-			   offset,
-			   prefs->bar_height);
+	  lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
+	  
+	  lives_painter_set_line_width(cr,1.);
+	  
+	  if (offset>=offset_left&&offset<=offset_right) {
+	    lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	    lives_painter_move_to(cr, offset, 0);
+	    lives_painter_line_to(cr, offset, prefs->bar_height);
 	  }
 	  else {
-	    gdk_draw_line (mainw->raudio_drawable,
-			   mainw->raudio_draw->style->white_gc,
-			   offset, 0,
-			   offset,
-			   prefs->bar_height);
+	    lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	    lives_painter_move_to(cr, offset, 0);
+	    lives_painter_line_to(cr, offset, prefs->bar_height);
 	  }
-	  
+	  lives_painter_stroke(cr);
 	  
 	  if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	    gdk_draw_line (mainw->raudio_drawable,
-			   mainw->raudio_draw->style->black_gc,
-			   offset, prefs->bar_height,
-			   offset,
-			   allocheight-prefs->bar_height);
+	    lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	    lives_painter_move_to(cr, offset, prefs->bar_height);
+	    lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	  }
 	  else {
-	    gdk_draw_line (mainw->raudio_drawable,
-			   mainw->raudio_draw->style->white_gc,
-			   offset, prefs->bar_height,
-			   offset,
-			   allocheight-prefs->bar_height);
+	    lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	    lives_painter_move_to(cr, offset, prefs->bar_height);
+	    lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	  }
+	  lives_painter_stroke(cr);
+	  
+	  lives_painter_destroy(cr);
+
 	}
       }
-      if (cfile->frames==0) {
-	GTK_RULER (mainw->hruler)->position=offset*cfile->total_time/allocwidth;
-	gtk_widget_queue_draw (mainw->hruler);
-      }
+    }
+    if (cfile->frames==0) {
+      lives_ruler_set_value(LIVES_RULER (mainw->hruler),offset*cfile->total_time/allocwidth);
+      gtk_widget_queue_draw (mainw->hruler);
     }
   }
   
@@ -1961,22 +2637,25 @@
       gtk_widget_show (mainw->laudio_draw);
       gtk_widget_show (mainw->raudio_draw);
 
-      GTK_RULER (mainw->hruler)->upper=cfile->total_time;
+      lives_ruler_set_upper(LIVES_RULER (mainw->hruler),cfile->total_time);
       gtk_widget_queue_draw(mainw->hruler);
 
       draw_little_bars(cfile->pointer_time);
-      if (mainw->playing_file==-1&&prefs->sepwin_type==1&&mainw->sep_win&&cfile->is_loaded) {
+
+      if (mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded) {
 	if (mainw->preview_box==NULL) {
 	  // create the preview box that shows frames
 	  make_preview_box();
 	}
 	// and add it the play window
-	if (mainw->preview_box->parent==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
+	if (lives_widget_get_parent(mainw->preview_box)==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
 					       cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
 	  gtk_widget_queue_draw(mainw->play_window);
 	  gtk_container_add (GTK_CONTAINER (mainw->play_window), mainw->preview_box);
+	  gtk_widget_grab_focus (mainw->preview_spinbutton);
+	  play_window_set_title();
+	  load_preview_image(FALSE);
 	}
-	load_preview_image(FALSE);
       }
     }
     else {
@@ -2041,13 +2720,16 @@
     }
   }
   else {
-    gdouble ptrtime=(mainw->actual_frame-.5)/cfile->fps;
+    double ptrtime=(mainw->actual_frame-.5)/cfile->fps;
     if (ptrtime<0.) ptrtime=0.;
     draw_little_bars(ptrtime);
   }
-  gtk_widget_queue_draw(mainw->video_draw);
-  gtk_widget_queue_draw(mainw->laudio_draw);
-  gtk_widget_queue_draw(mainw->raudio_draw);
+
+  if (!mainw->draw_blocked) {
+    gtk_widget_queue_draw(mainw->video_draw);
+    gtk_widget_queue_draw(mainw->laudio_draw);
+    gtk_widget_queue_draw(mainw->raudio_draw);
+  }
   gtk_widget_queue_draw(mainw->vidbar);
   gtk_widget_queue_draw(mainw->hruler);
 }
@@ -2055,8 +2737,8 @@
 
 void draw_little_bars (gdouble ptrtime) {
   //draw the vertical player bars
-  gdouble allocheight=mainw->video_draw->allocation.height-prefs->bar_height;
-  gdouble offset=ptrtime/cfile->total_time*mainw->vidbar->allocation.width;
+  gdouble allocheight=lives_widget_get_allocation_height(mainw->video_draw)-prefs->bar_height;
+  gdouble offset=ptrtime/cfile->total_time*lives_widget_get_allocation_width(mainw->vidbar);
   gint frame;
 
   if (!prefs->show_gui) return;
@@ -2066,35 +2748,37 @@
 
   if (cfile->frames>0) {
     if (mainw->video_drawable!=NULL) {
+      lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
+
+      lives_painter_set_line_width(cr,1.);
+      
       if (frame>=cfile->start&&frame<=cfile->end) {
-	gdk_draw_line (mainw->video_drawable,
-		       mainw->video_draw->style->black_gc,
-		       offset, 0,
-		       offset,
-		       prefs->bar_height);
+	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	lives_painter_move_to(cr, offset, 0);
+	lives_painter_line_to(cr, offset, prefs->bar_height);
       }
       else {
-	gdk_draw_line (mainw->video_drawable,
-		       mainw->video_draw->style->white_gc,
-		       offset, 0,
-		       offset,
-		       prefs->bar_height);
+	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	lives_painter_move_to(cr, offset, 0);
+	lives_painter_line_to(cr, offset, prefs->bar_height);
       }
-      
+      lives_painter_stroke(cr);
+
       if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	gdk_draw_line (mainw->video_drawable,
-		       mainw->video_draw->style->black_gc,
-		       offset, prefs->bar_height,
-		       offset,
-		       allocheight);
+	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	lives_painter_move_to(cr, offset, prefs->bar_height);
+	lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
       }
       else {
-	gdk_draw_line (mainw->video_drawable,
-		       mainw->video_draw->style->white_gc,
-		       offset, prefs->bar_height,
-		       offset,
-		       allocheight);
+	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	lives_painter_move_to(cr, offset, prefs->bar_height);
+	lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
       }
+      lives_painter_stroke(cr);
+
+      lives_painter_destroy(cr);
+
+
     }
   }
 
@@ -2102,67 +2786,71 @@
 
   if (cfile->achans>0) {
     if (mainw->laudio_drawable!=NULL) {
-      if ((frame>=cfile->start&&frame<=cfile->end)||mainw->loop) {
-	gdk_draw_line (mainw->laudio_drawable,
-		       mainw->laudio_draw->style->black_gc,
-		       offset, 0,
-		       offset,
-		       prefs->bar_height);
+      lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
+
+      lives_painter_set_line_width(cr,1.);
+      
+      if (frame>=cfile->start&&frame<=cfile->end) {
+	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	lives_painter_move_to(cr, offset, 0);
+	lives_painter_line_to(cr, offset, prefs->bar_height);
       }
       else {
-	gdk_draw_line (mainw->laudio_drawable,
-		       mainw->laudio_draw->style->white_gc,
-		       offset, 0,
-		       offset,
-		       prefs->bar_height);
+	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	lives_painter_move_to(cr, offset, 0);
+	lives_painter_line_to(cr, offset, prefs->bar_height);
       }
-      
+      lives_painter_stroke(cr);
+
       if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	gdk_draw_line (mainw->laudio_drawable,
-		       mainw->laudio_draw->style->black_gc,
-		       offset, prefs->bar_height,
-		       offset,
-		       allocheight);
+	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	lives_painter_move_to(cr, offset, prefs->bar_height);
+	lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
       }
       else {
-	gdk_draw_line (mainw->laudio_drawable,
-		       mainw->laudio_draw->style->white_gc,
-		       offset, prefs->bar_height,
-		       offset,
-		       allocheight);
+	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	lives_painter_move_to(cr, offset, prefs->bar_height);
+	lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
       }
+      lives_painter_stroke(cr);
+
+      lives_painter_destroy(cr);
+
     }
+
     if (cfile->achans>1) {
       if (mainw->raudio_drawable!=NULL) {
 	if ((frame>=cfile->start&&frame<=cfile->end)||mainw->loop) {
-	  gdk_draw_line (mainw->raudio_drawable,
-			 mainw->raudio_draw->style->black_gc,
-			 offset, 0,
-			 offset,
-			 prefs->bar_height);
+	lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
+
+	lives_painter_set_line_width(cr,1.);
+      
+	if (frame>=cfile->start&&frame<=cfile->end) {
+	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	  lives_painter_move_to(cr, offset, 0);
+	  lives_painter_line_to(cr, offset, prefs->bar_height);
 	}
 	else {
-	  gdk_draw_line (mainw->raudio_drawable,
-			 mainw->raudio_draw->style->white_gc,
-			 offset, 0,
-			 offset,
-			 prefs->bar_height);
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	  lives_painter_move_to(cr, offset, 0);
+	  lives_painter_line_to(cr, offset, prefs->bar_height);
 	}
-	
-	
+	lives_painter_stroke(cr);
+
 	if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	  gdk_draw_line (mainw->raudio_drawable,
-			 mainw->raudio_draw->style->black_gc,
-			 offset, prefs->bar_height,
-			 offset,
-			 allocheight);
+	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+	  lives_painter_move_to(cr, offset, prefs->bar_height);
+	  lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
 	}
 	else {
-	  gdk_draw_line (mainw->raudio_drawable,
-			 mainw->raudio_draw->style->white_gc,
-			 offset, prefs->bar_height,
-			 offset,
-			 allocheight);
+	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+	  lives_painter_move_to(cr, offset, prefs->bar_height);
+	  lives_painter_line_to(cr, offset, allocheight-prefs->bar_height);
+	}
+	lives_painter_stroke(cr);
+
+	lives_painter_destroy(cr);
+
 	}
       }
     }
@@ -2221,7 +2909,7 @@
   else if (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE) mainw->whentostop=NEVER_STOP;
   else if (cfile->opening_only_audio) mainw->whentostop=STOP_ON_AUD_END;
   else if (cfile->opening_audio) mainw->whentostop=STOP_ON_VID_END;
-  else if (mainw->loop_cont&&!mainw->preview) mainw->whentostop=NEVER_STOP;
+  else if (!mainw->preview&&(mainw->loop_cont||(mainw->loop&&prefs->audio_src==AUDIO_SRC_EXT))) mainw->whentostop=NEVER_STOP;
   else if (cfile->frames==0||(mainw->loop&&cfile->achans>0&&!mainw->is_rendering&&(mainw->audio_end/cfile->fps)
 			      <MAX (cfile->laudio_time,cfile->raudio_time))) mainw->whentostop=STOP_ON_AUD_END;
   else mainw->whentostop=STOP_ON_VID_END; // tada...
@@ -2240,7 +2928,7 @@
   gint ch=height[0];
 
   gint real_width,real_height;
-  gulong delta,current_delta;
+  uint64_t delta,current_delta;
 
   // minimise d[(x-x1)^2 + (y-y1)^2]/d[x1], to get approximate values
   gint calc_width=(gint)((vsize+aspect*hsize)*aspect/(aspect*aspect+1.));
@@ -2289,8 +2977,7 @@
   }
 }
 
-void 
-zero_spinbuttons (void) {
+void zero_spinbuttons (void) {
   g_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
   gtk_spin_button_set_range(GTK_SPIN_BUTTON(mainw->spinbutton_start),0.,0.);
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(mainw->spinbutton_start),0.);
@@ -2302,64 +2989,9 @@
 }
 
 
-void hide_cursor(GdkWindow *window) {
-  //make the cursor invisible in playback windows
-
-#if GTK_CHECK_VERSION(3,0,0)
-cairo_surface_t *s;
-GdkPixbuf *pixbuf;
-
- if (hidden_cursor==NULL) {
-   s = cairo_image_surface_create (CAIRO_FORMAT_A1, 1, 1);
-   pixbuf = gdk_pixbuf_get_from_surface (s,
-					 0, 0,
-					 1, 1);
-   
-   cairo_surface_destroy (s);
-   
-   hidden_cursor = gdk_cursor_new_from_pixbuf (gdk_display_get_default(), pixbuf, 0, 0);
-   
-   g_object_unref (pixbuf);
- }
-#else
-  char cursor_bits[] = {0x00};
-  char cursormask_bits[] = {0x00};
-  GdkPixmap *source, *mask;
-  GdkColor fg = { 0, 0, 0, 0 };
-  GdkColor bg = { 0, 0, 0, 0 };
-
-  if (hidden_cursor==NULL) {
-    source = gdk_bitmap_create_from_data (NULL, cursor_bits,
-					  1, 1);
-    mask = gdk_bitmap_create_from_data (NULL, cursormask_bits,
-					1, 1);
-    hidden_cursor = gdk_cursor_new_from_pixmap (source, mask, &fg, &bg, 0, 0);
-    gdk_pixmap_unref (source);
-    gdk_pixmap_unref (mask);
-  }
-#endif 
-  if (GDK_IS_WINDOW(window))
-    gdk_window_set_cursor (window, hidden_cursor);
-}
-
-
-void 
-unhide_cursor(GdkWindow *window) {
-  if (GDK_IS_WINDOW(window))
-    gdk_window_set_cursor(window,NULL);
-}
-
-
-
-LIVES_INLINE void toggle_button_toggle (GtkToggleButton *tbutton) {
-  if (gtk_toggle_button_get_active(tbutton)) gtk_toggle_button_set_active(tbutton,FALSE);
-  else gtk_toggle_button_set_active(tbutton,FALSE);
-}
-
 
 
-
-gboolean switch_aud_to_jack(void) {
+boolean switch_aud_to_jack(void) {
 #ifdef ENABLE_JACK
   if (mainw->is_ready) {
     lives_jack_init();
@@ -2379,7 +3011,7 @@
     }
     mainw->aplayer_broken=FALSE;
     gtk_widget_show(mainw->vol_toolitem);
-    gtk_widget_show(mainw->vol_label);
+    if (mainw->vol_label!=NULL) gtk_widget_show(mainw->vol_label);
     gtk_widget_show (mainw->recaudio_submenu);
 
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
@@ -2412,9 +3044,9 @@
 
 
 
-gboolean switch_aud_to_pulse(void) {
+boolean switch_aud_to_pulse(void) {
 #ifdef HAVE_PULSE_AUDIO
-  gboolean retval;
+  boolean retval;
 
   if (mainw->is_ready) {
     if ((retval=lives_pulse_init(-1))) {
@@ -2429,7 +3061,7 @@
       }
       mainw->aplayer_broken=FALSE;
       gtk_widget_show(mainw->vol_toolitem);
-      gtk_widget_show(mainw->vol_label);
+      if (mainw->vol_label!=NULL) gtk_widget_show(mainw->vol_label);
       gtk_widget_show (mainw->recaudio_submenu);
 
       prefs->audio_player=AUD_PLAYER_PULSE;
@@ -2461,7 +3093,7 @@
 
 
 
-void switch_aud_to_sox(gboolean set_in_prefs) {
+void switch_aud_to_sox(boolean set_in_prefs) {
   prefs->audio_player=AUD_PLAYER_SOX;
   get_pref_default("sox_command",prefs->audio_play_command,256);
   if (set_in_prefs) set_pref("audio_player","sox");
@@ -2469,7 +3101,7 @@
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     gtk_widget_hide(mainw->vol_toolitem);
-    gtk_widget_hide(mainw->vol_label);
+    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
     gtk_widget_hide (mainw->recaudio_submenu);
     
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
@@ -2505,8 +3137,7 @@
 
 
 
-void
-switch_aud_to_mplayer(gboolean set_in_prefs) {
+void switch_aud_to_mplayer(boolean set_in_prefs) {
   int i;
   for (i=1;i<MAX_FILES;i++) {
     if (mainw->files[i]!=NULL) {
@@ -2524,7 +3155,7 @@
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     gtk_widget_hide(mainw->vol_toolitem);
-    gtk_widget_hide(mainw->vol_label);
+    if (mainw->vol_label!=NULL) gtk_widget_hide(mainw->vol_label);
     gtk_widget_hide (mainw->recaudio_submenu);
 
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
@@ -2560,17 +3191,28 @@
 
 
 
-void
-prepare_to_play_foreign(void) {
+boolean prepare_to_play_foreign(void) {
   // here we are going to 'play' a captured external window
-  gint new_file=mainw->first_free_file;
-#ifdef USE_X11
-  GdkVisual *vissi;
+
+#ifdef GUI_GTK
+
+
+
+#if !GTK_CHECK_VERSION(3,0,0)
+#ifdef GDK_WINDOWING_X11
+  GdkVisual *vissi=NULL;
+  register int i;
+#endif
+#endif
 #endif
 
+  gint new_file=mainw->first_free_file;
+
+  mainw->foreign_window=NULL;
+
   // create a new 'file' to play into
   if (!get_new_handle(new_file,NULL)) {
-    return;
+    return FALSE;
   }
 
   mainw->current_file=new_file;
@@ -2602,38 +3244,65 @@
 
   gtk_widget_show (mainw->playframe);
   gtk_widget_show (mainw->playarea);
-  while (g_main_context_iteration(NULL,FALSE));
+  lives_widget_context_update();
 
   // size must be exact, must not be larger than play window or we end up with nothing
-  mainw->pwidth=mainw->playframe->allocation.width-H_RESIZE_ADJUST+2;
-  mainw->pheight=mainw->playframe->allocation.height-V_RESIZE_ADJUST+2;
+  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST+2;
+  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST+2;
 
   cfile->hsize=mainw->pwidth;
   cfile->vsize=mainw->pheight;
 
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+
+#ifdef GDK_WINDOWING_X11
+  mainw->foreign_window=gdk_x11_window_foreign_new_for_display
+    (mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp,
+     mainw->foreign_id);
+#else
+#ifdef GDK_WINDOWING_WIN32
+  if (mainw->foreign_window==NULL)
+    mainw->foreign_window=gdk_win32_window_foreign_new_for_display
+      (mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp,
+       mainw->foreign_id);
+#endif
 
+#endif // GDK_WINDOWING
+
+  if (mainw->foreign_window!=NULL) gdk_window_set_keep_above(mainw->foreign_window,TRUE);
+
+#else // 3,0,0
   mainw->foreign_window=gdk_window_foreign_new(mainw->foreign_id);
-  gdk_window_set_keep_above(mainw->foreign_window,TRUE);
+#endif
+#endif // GUI_GTK
 
-  // seems not to work
-  //gdk_window_reparent(mainw->foreign_window, mainw->playarea->window, 0, 0);
-  //while (g_main_context_iteration(NULL,FALSE));
-  ////////////////////////
-  
-  //vissi=gdk_x11_screen_lookup_visual(gdk_screen_get_default(),hextodec(mainw->foreign_visual));
+#ifdef GUI_GTK
+#ifdef GDK_WINDOWING_X11
+#if !GTK_CHECK_VERSION(3,0,0)
 
+  if (mainw->foreign_visual!=NULL) {
+    for (i=0;i<capable->nmonitors;i++) {
+      vissi=gdk_x11_screen_lookup_visual(mainw->mgeom[i].screen,hextodec(mainw->foreign_visual));
+      if (vissi!=NULL) break;
+    }
+  }
+
+  if (vissi==NULL) vissi=gdk_visual_get_best_with_depth (mainw->foreign_bpp);
+
+  if (vissi==NULL) return FALSE;
 
-#if GTK_CHECK_VERSION(3,0,0)
-  mainw->foreign_cmap=NULL;
-#else
-#ifdef USE_X11
-  vissi=gdk_visual_get_best_with_depth (mainw->foreign_bpp);
   mainw->foreign_cmap=gdk_x11_colormap_foreign_new(vissi, 
 						   gdk_x11_colormap_get_xcolormap(gdk_colormap_new(vissi,TRUE)));
 
+  if (mainw->foreign_cmap==NULL) return FALSE;
+
+#endif
 #endif
 #endif
 
+  if (mainw->foreign_window==NULL) return FALSE;
+
   mainw->play_start=1;
   if (mainw->rec_vid_frames==-1) mainw->play_end=INT_MAX;
   else mainw->play_end=mainw->rec_vid_frames;
@@ -2656,11 +3325,12 @@
   gtk_widget_hide(mainw->t_bckground);
   gtk_widget_hide(mainw->t_sepwin);
   gtk_widget_hide(mainw->t_infobutton);
+
+  return TRUE;
 }
 
 
-gboolean
-after_foreign_play(void) {
+boolean after_foreign_play(void) {
   // read details from capture file
   int capture_fd;
   gchar *capfile=g_strdup_printf("%s/.capture.%d",prefs->tmpdir,getpid());
@@ -2711,9 +3381,10 @@
 
 	  g_snprintf(file_name,PATH_MAX,"%s/%s/",prefs->tmpdir,cfile->handle);
 	  
-	  com=g_strdup_printf("smogrify fill_and_redo_frames \"%s\" %d %d %d \"%s\" %.4f %d %d %d %d %d",
+	  com=g_strdup_printf("%s fill_and_redo_frames \"%s\" %d %d %d \"%s\" %.4f %d %d %d %d %d",
+			      prefs->backend,
 			      cfile->handle,cfile->frames,cfile->hsize,cfile->vsize,
-			      cfile->img_type==IMG_TYPE_JPEG?"jpg":"png",cfile->fps,cfile->arate,
+			      get_image_ext_for_type(cfile->img_type),cfile->fps,cfile->arate,
 			      cfile->achans,cfile->asampsize,!(cfile->signed_endian&AFORM_UNSIGNED),
 			      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
 	  unlink(cfile->info_file);
@@ -2768,8 +3439,7 @@
 }
 
 
-void
-set_menu_text(GtkWidget *menuitem, const gchar *text, gboolean use_mnemonic) {
+void set_menu_text(GtkWidget *menuitem, const gchar *text, boolean use_mnemonic) {
   GtkWidget *label;
   if (GTK_IS_MENU_ITEM (menuitem)) {
     label=gtk_bin_get_child(GTK_BIN(menuitem));
@@ -2783,8 +3453,7 @@
 }
 
 
-void
-get_menu_text(GtkWidget *menuitem, gchar *text) {
+void get_menu_text(GtkWidget *menuitem, gchar *text) {
   GtkWidget *label=gtk_bin_get_child(GTK_BIN(menuitem));
   g_snprintf(text,255,"%s",gtk_label_get_text(GTK_LABEL(label)));
 }
@@ -2796,7 +3465,7 @@
 }
 
 
-LIVES_INLINE gboolean int_array_contains_value(int *array, int num_elems, int value) {
+LIVES_INLINE boolean int_array_contains_value(int *array, int num_elems, int value) {
   int i;
   for (i=0;i<num_elems;i++) {
     if (array[i]==value) return TRUE;
@@ -2820,11 +3489,11 @@
 	active_image=NULL;
       }
       if (mainw->files[i]->opening) {
-	active_image = gtk_image_new_from_stock ("gtk-no", GTK_ICON_SIZE_MENU);
+	active_image = lives_image_new_from_stock ("gtk-no", LIVES_ICON_SIZE_MENU);
       }
       else {
 	if (i==mainw->current_file) {
-	  active_image = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+	  active_image = lives_image_new_from_stock ("gtk-close", LIVES_ICON_SIZE_MENU);
 	}
       }
       if (!(active_image==NULL)) {
@@ -2842,9 +3511,9 @@
 
 
 
-gboolean check_file(const gchar *file_name, gboolean check_existing) {
+boolean check_file(const gchar *file_name, boolean check_existing) {
   int check;
-  gboolean exists=FALSE;
+  boolean exists=FALSE;
   gchar *msg;
   // file_name should be in utf8
   gchar *lfile_name=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL);
@@ -2889,7 +3558,7 @@
 
 
 
-gboolean check_dir_access (const gchar *dir) {
+boolean check_dir_access (const gchar *dir) {
   // if a directory exists, make sure it is readable and writable
   // otherwise create it and then check
 
@@ -2897,20 +3566,24 @@
 
   // see also is_writeable_dir() which uses statvfs
 
-  gboolean exists=g_file_test (dir, G_FILE_TEST_EXISTS);
+  boolean exists=g_file_test (dir, G_FILE_TEST_EXISTS);
+  boolean is_OK=FALSE;
+
   gchar *com;
   gchar *testfile;
-  gboolean is_OK=FALSE;
 
   if (!exists) {
-    com=g_strdup_printf ("/bin/mkdir -p %s",dir);
-    lives_system (com,TRUE);
-    g_free (com);
+    g_mkdir_with_parents(dir,S_IRWXU);
   }
+
   if (!g_file_test(dir, G_FILE_TEST_IS_DIR)) return FALSE;
 
   testfile=g_build_filename (dir,"livestst.txt",NULL);
+#ifndef IS_MINGW
   com=g_strdup_printf ("/bin/touch \"%s\"",testfile);
+#else
+  com=g_strdup_printf ("touch.exe \"%s\"",testfile);
+#endif
   lives_system (com,TRUE);
   g_free (com);
   if ((is_OK=g_file_test(testfile, G_FILE_TEST_EXISTS))) {
@@ -2924,20 +3597,34 @@
 }
 
 
-gboolean check_dev_busy(gchar *devstr) {
+boolean check_dev_busy(gchar *devstr) {
+#ifndef IS_MINGW
   int ret;
+#ifdef IS_SOLARIS
+  struct flock lock;
+  lock.l_start = 0;
+  lock.l_whence = SEEK_SET;
+  lock.l_len = 0;
+  lock.l_type = F_WRLCK;
+#endif
   int fd=open(devstr,O_RDONLY|O_NONBLOCK);
   if (fd==-1) return FALSE;
+#ifdef IS_SOLARIS
+  ret=fcntl(fd, F_SETLK, &lock);
+#else
   ret=flock(fd,LOCK_EX|LOCK_NB);
+#endif
   close(fd);
   if (ret==-1) return FALSE;
   return TRUE;
+#endif
+  return FALSE;
 }
 
 
 
 void activate_url_inner(const gchar *link) {
-#ifdef HAVE_GTK_NICE_VERSION
+#if GTK_CHECK_VERSION(2,14,0)
   GError *err=NULL;
   gtk_show_uri(NULL,link,GDK_CURRENT_TIME,&err);
 #else
@@ -2969,15 +3656,15 @@
 }
 
 
-gulong
+uint64_t
 get_file_size(int fd) {
   // get the size of file fd
   struct stat filestat;
   fstat(fd,&filestat);
-  return (gulong)(filestat.st_size);
+  return (uint64_t)(filestat.st_size);
 }
 
-gulong
+uint64_t
 sget_file_size(const gchar *name) {
   // get the size of file fd
   struct stat filestat;
@@ -2990,7 +3677,7 @@
   fstat(fd,&filestat);
   close(fd);
 
-  return (gulong)(filestat.st_size);
+  return (uint64_t)(filestat.st_size);
 }
 
 
@@ -3027,14 +3714,6 @@
 
 
 
-void
-colour_equal(GdkColor *c1, const GdkColor *c2) {
-  c1->pixel=c2->pixel;
-  c1->red=c2->red;
-  c1->green=c2->green;
-  c1->blue=c2->blue;
-}
-
 
 gboolean
 create_event_space(gint length) {
@@ -3181,32 +3860,6 @@
 }
 
 
-void lives_set_cursor_style(lives_cursor_t cstyle, GdkWindow *window) {
-  if (mainw->cursor!=NULL) gdk_cursor_unref(mainw->cursor);
-  mainw->cursor=NULL;
-
-  if (window==NULL) {
-    if (mainw->multitrack==NULL&&mainw->is_ready) window=mainw->LiVES->window;
-    else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) window=mainw->multitrack->window->window;
-    else return;
-  }
-
-  switch(cstyle) {
-  case LIVES_CURSOR_NORMAL:
-    if (GDK_IS_WINDOW(window))
-      gdk_window_set_cursor (window, NULL);
-    return;
-  case LIVES_CURSOR_BUSY:
-    mainw->cursor=gdk_cursor_new(GDK_WATCH);
-    if (GDK_IS_WINDOW(window))
-      gdk_window_set_cursor (window, mainw->cursor);
-    return;
-  default:
-    return;
-  }
-}
-
-
 
 
 gint 
@@ -3353,7 +4006,7 @@
 }
 
 
-gboolean cache_file_contents(const gchar *filename) {
+boolean cache_file_contents(const gchar *filename) {
   FILE *hfile;
   gchar buff[65536];
 
@@ -3390,7 +4043,7 @@
       if (!strncmp(keystr_end,(gchar *)clist->data,kelen)) {
 	break;
       }
-      if (strncmp((gchar *)clist->data,"#",1)) g_strappend(buff,maxlen,(gchar *)clist->data);
+      if (strncmp((gchar *)clist->data,"|",1)) g_strappend(buff,maxlen,(gchar *)clist->data);
       else {
 	if (clist->prev!=NULL) clist->prev->next=clist->next;
       }
@@ -3558,7 +4211,8 @@
     if (val==NULL) return FALSE;
   }
   else {
-    com=g_strdup_printf("smogrify get_clip_value \"%s\" %d %d \"%s\"",key,getuid(),getpid(),lives_header);
+    com=g_strdup_printf("%s get_clip_value \"%s\" %d %d \"%s\"",prefs->backend_sync,key,
+			lives_getuid(),lives_getpid(),lives_header);
     g_free(lives_header);
     g_free(key);
     
@@ -3574,7 +4228,11 @@
       return FALSE;
     }
     
-    vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,getuid(),getpid());
+#ifndef IS_MINGW
+    vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),lives_getpid());
+#else
+    vfile=g_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),lives_getpid());
+#endif
 
     do {
       retval2=0;
@@ -3589,7 +4247,7 @@
 	    if (!(mainw==NULL)) {
 	      weed_plant_t *frame_layer=mainw->frame_layer;
 	      mainw->frame_layer=NULL;
-	      while (g_main_context_iteration(NULL,FALSE));
+	      lives_widget_context_update();
 	      mainw->frame_layer=frame_layer;
 	    }
 	    g_usleep(prefs->sleep_time);
@@ -3692,6 +4350,8 @@
   gchar *myval;
   gchar *key;
 
+  boolean needs_sigs=FALSE;
+
   mainw->write_failed=mainw->com_failed=FALSE;
 
   if (which==0||which==mainw->scrap_file) return;
@@ -3793,8 +4453,14 @@
 
   }
   else {
-    com=g_strdup_printf("smogrify set_clip_value \"%s\" \"%s\" \"%s\"",lives_header,key,myval);
+    if (!mainw->signals_deferred) {
+      set_signal_handlers((SignalHandlerPointer)defer_sigint);
+      needs_sigs=TRUE;
+    }
+    com=g_strdup_printf("%s set_clip_value \"%s\" \"%s\" \"%s\"",prefs->backend_sync,lives_header,key,myval);
     lives_system(com,FALSE);
+    if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
+    if (needs_sigs) set_signal_handlers((SignalHandlerPointer)catch_sigint);
     g_free(com);
   }
 
@@ -3820,11 +4486,16 @@
 
   if (tldir==NULL) return NULL;
 
+  lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
+  lives_widget_context_update();
+
+
   while (1) {
     tdirent=readdir(tldir);
 
     if (tdirent==NULL) {
       closedir(tldir);
+      lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
       return setlist;
     }
     
@@ -3854,13 +4525,14 @@
     g_free(subdirname);
     closedir(subdir);
   }
+
 }
 
 
 
 
-gboolean check_for_ratio_fps (gdouble fps) {
-  gboolean ratio_fps;
+boolean check_for_ratio_fps (double fps) {
+  boolean ratio_fps;
   gchar *test_fps_string1=g_strdup_printf ("%.3f00000",fps);
   gchar *test_fps_string2=g_strdup_printf ("%.8f",fps);
   
@@ -3908,7 +4580,7 @@
 }
 
 
-guint get_signed_endian (gboolean is_signed, gboolean little_endian) {
+guint get_signed_endian (boolean is_signed, boolean little_endian) {
   // asigned TRUE == signed, FALSE == unsigned
 
 
@@ -3936,9 +4608,8 @@
 
 
 
-gint 
-get_token_count (const gchar *string, int delim) {
-  gint pieces=1;
+int get_token_count (const gchar *string, int delim) {
+  int pieces=1;
   if (string==NULL) return 0;
   if (delim<=0||delim>255) return 1;
 
@@ -3996,6 +4667,11 @@
   //pass 1, get the required size
   for (i=0;i<tlen;i+=xtoffs) {
     xtoffs=mbtowc(&utfsym,&text[i],4); // get next utf8 wchar
+    if (xtoffs==-1) {
+      LIVES_WARN("mbtowc returned -1");
+      return g_strdup(text);
+    }
+
     if (!strncmp(text+i,"\n",nlen)) runlen=0; // is a newline (in any encoding)
     else {
       runlen++;
@@ -4014,8 +4690,6 @@
   }
 
 
-
-
   retstr=(gchar *)g_malloc(req_size);
   req_size=0; // reuse as a ptr to offset in retstr
   runlen=0;
@@ -4023,8 +4697,8 @@
 
   //pass 2, copy and insert newlines
 
-
   for (i=0;i<tlen;i+=xtoffs) {
+
     xtoffs=mbtowc(&utfsym,&text[i],4); // get next utf8 wchar
     if (!strncmp(text+i,"\n",nlen)) runlen=0; // is a newline (in any encoding)
     else {
@@ -4045,36 +4719,15 @@
     else needsnl=FALSE;
     memcpy(retstr+req_size,&utfsym,xtoffs);
     req_size+=xtoffs;
+
   }
 
   memset(retstr+req_size,0,1);
-
+  
   return retstr;
 }
 
 
-void combo_set_popdown_strings (GtkCombo *combo, GList *list) {
-  // this avoids an assert in some versions of GTK+ when list==NULL
-  GList *empty_list=NULL;
-  empty_list=g_list_append (empty_list,(gpointer)"");
-  if (list==NULL) gtk_combo_set_popdown_strings (combo,empty_list);
-  else {
-    g_list_free (empty_list);
-    gtk_combo_set_popdown_strings (combo,g_list_copy(list));
-  }
-}
-
-
-void get_border_size (GtkWidget *win, gint *bx, gint *by) {
-  GdkRectangle rect;
-  gint wx,wy;
-  gdk_window_get_frame_extents (GDK_WINDOW (win->window),&rect);
-  gdk_window_get_origin (GDK_WINDOW (win->window), &wx, &wy);
-  *bx=wx-rect.x;
-  *by=wy-rect.y;
-}
-
-
 
 gint hextodec (const gchar *string) {
   int i;
@@ -4119,151 +4772,44 @@
 }
 
 
-
-
-GdkPixmap*
-gdk_pixmap_copy (GdkPixmap *pixmap)
-{
-  GdkPixmap *pixmap_out;
-  GdkGC *gc;
-  gint width, height, depth;
-  
-  if (pixmap==NULL) return NULL;
-  
-  gdk_drawable_get_size (pixmap, &width, &height);
-  depth = gdk_drawable_get_depth (pixmap);
-  pixmap_out = gdk_pixmap_new (NULL, width, height, depth);
-  gc = gdk_gc_new (pixmap);
-  gdk_draw_drawable (pixmap_out, gc, pixmap, 0, 0, 0, 0, width, height);
-  g_object_unref (gc);
-  return pixmap_out;
-}
-
-
-void set_fg_colour(gint red, gint green, gint blue) {
-  GdkColor col;
-  col.red=red*255;
-  col.green=green*255;
-  col.blue=blue*255;
-  if (mainw->general_gc==NULL) {
-    if (mainw->multitrack==NULL) mainw->general_gc=gdk_gc_new(GDK_DRAWABLE(mainw->LiVES->window));
-    else mainw->general_gc=gdk_gc_new(GDK_DRAWABLE(mainw->multitrack->window->window));
-  }
-  gdk_gc_set_rgb_fg_color(mainw->general_gc,&col);
-}
-
-
-gboolean
-label_act_toggle (GtkWidget *widget, GdkEventButton *event, GtkToggleButton *togglebutton) {
-  if (!GTK_WIDGET_IS_SENSITIVE(togglebutton)) return FALSE;
-  gtk_toggle_button_set_active (togglebutton, !gtk_toggle_button_get_active(togglebutton));
-  return FALSE;
-}
-
-gboolean
-widget_act_toggle (GtkWidget *widget, GtkToggleButton *togglebutton) {
-  gtk_toggle_button_set_active (togglebutton, TRUE);
-  return FALSE;
-}
-
-
-void gtk_tooltips_copy(GtkWidget *dest, GtkWidget *source) {
-  GtkTooltipsData *td=gtk_tooltips_data_get(source);
-  if (td==NULL) return;
-  gtk_tooltips_set_tip (td->tooltips, dest, td->tip_text, td->tip_private);
-}
-
-
-
-gchar *text_view_get_text(GtkTextView *textview) {
-  GtkTextIter siter,eiter;
-  GtkTextBuffer *textbuf=gtk_text_view_get_buffer (textview);
-  gtk_text_buffer_get_start_iter(textbuf,&siter);
-  gtk_text_buffer_get_end_iter(textbuf,&eiter);
-
-  return gtk_text_buffer_get_text(textbuf,&siter,&eiter,TRUE);
-}
-
-
-void text_view_set_text(GtkTextView *textview, const gchar *text) {
-  GtkTextBuffer *textbuf=gtk_text_view_get_buffer (textview);
-  gtk_text_buffer_set_text(textbuf,text,-1);
-}
-
-
-gint get_box_child_index (GtkBox *box, GtkWidget *tchild) {
-  GList *list=box->children;
-  GtkBoxChild *child;
-  int i=0;
-
-  while (list!=NULL) {
-    child=(GtkBoxChild *)list->data;
-    if (child->widget==tchild) return i;
-    list=list->next;
-    i++;
-  }
-  return -1;
-}
-
-
-
-void adjustment_configure(GtkAdjustment *adjustment,
-		     gdouble value,
-		     gdouble lower,
-		     gdouble upper,
-		     gdouble step_increment,
-		     gdouble page_increment,
-		     gdouble page_size) {
-  g_object_freeze_notify (G_OBJECT(adjustment));
-
-#ifdef HAVE_GTK_NICE_VERSION
-  gtk_adjustment_configure(adjustment,value,lower,upper,step_increment,page_increment,page_size);
-  g_object_thaw_notify (G_OBJECT(adjustment));
-  return;
-#else
-
-
-  adjustment->upper=upper;
-  adjustment->lower=lower;
-  adjustment->value=value;
-  adjustment->step_increment=step_increment;
-  adjustment->page_increment=page_increment;
-  adjustment->page_size=page_size;
-
-  g_object_thaw_notify (G_OBJECT(adjustment));
-#endif
-}
-
-
-gboolean is_writeable_dir(const gchar *dir) {
-  // get free space in bytes for volume containing directory dir
+boolean is_writeable_dir(const gchar *dir) {
   // return 0 if we cannot create/write to dir
 
   // dir should be in locale encoding
-
-  gchar *com;
+#ifndef IS_MINGW
   struct statvfs sbuf;
+#else
+  gchar *com;
+#endif
 
   if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) {
-    com=g_strdup_printf("/bin/mkdir -p \"%s\"",dir);
-    lives_system(com,TRUE);
-    g_free(com);
+    g_mkdir_with_parents(dir,S_IRWXU);
     if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) {
       return FALSE;
     }
   }
 
+#ifndef IS_MINGW
   // use statvfs to get fs details
   if (statvfs(dir,&sbuf)==-1) return FALSE;
   if (sbuf.f_flag&ST_RDONLY) return FALSE;
-
+#else
+  mainw->com_failed=FALSE;
+  com=g_strdup_printf("touch.exe \"%s\\xxxxfile.txt\"",dir);
+  lives_system(com,TRUE);
+  g_free(com);
+  com=g_strdup_printf("%s\\xxxxfile.txt",dir);
+  unlink(com);
+  g_free(com);
+  if (mainw->com_failed) return FALSE;
+#endif
   return TRUE;
 }
 
 
 
 
-gulong get_fs_free(const char *dir) {
+uint64_t get_fs_free(const char *dir) {
   // get free space in bytes for volume containing directory dir
   // return 0 if we cannot create/write to dir
 
@@ -4272,13 +4818,18 @@
 
   // dir should be in locale encoding
 
-  gulong bytes=0;
-  gboolean must_delete=FALSE;
+#ifndef IS_MINGW
   struct statvfs sbuf;
+#endif
+
+  uint64_t bytes=0;
+  gboolean must_delete=FALSE;
 
   if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) must_delete=TRUE;
   if (!is_writeable_dir(dir)) goto getfserr;
 
+#ifndef IS_MINGW
+
   // use statvfs to get fs details
   if (statvfs(dir,&sbuf)==-1) goto getfserr;
   if (sbuf.f_flag&ST_RDONLY) goto getfserr;
@@ -4286,6 +4837,10 @@
   // result is block size * blocks available
   bytes=sbuf.f_bsize*sbuf.f_bavail;
 
+#else
+  GetDiskFreeSpaceEx(dir,(PULARGE_INTEGER)&bytes,NULL,NULL);
+#endif
+
 getfserr:
   if (must_delete) rmdir(dir);
 
@@ -4380,3 +4935,34 @@
 
 
 
+lives_cancel_t check_for_bad_ffmpeg(void) {
+  int i;
+
+  int fcount,ofcount;
+  
+  char *fname_next;
+
+  boolean maybeok=FALSE;
+
+  ofcount=cfile->frames;
+
+  get_frame_count(mainw->current_file);
+
+  fcount=cfile->frames;
+
+  for (i=1;i<=fcount;i++) {
+    fname_next=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,i,prefs->image_ext);
+    if (sget_file_size(fname_next)>0) {
+      maybeok=TRUE;
+      break;
+    }
+  }
+
+  cfile->frames=ofcount;
+
+  if (!maybeok) {
+    do_error_dialog(_("Your version of mplayer/ffmpeg may be broken !\nSee http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n\nYou can work around this temporarily by switching to jpeg output in Preferences/Decoding.\n\nTry running Help/Troubleshoot for more information."));
+    return CANCEL_ERROR;
+  }
+  return CANCEL_NONE;
+}

LiVES-1.6.1.tar.bz2/src/videodev.c -> LiVES-2.0.3.tar.bz2/src/videodev.c Changed

LiVES-1.6.1.tar.bz2/src/videodev.h -> LiVES-2.0.3.tar.bz2/src/videodev.h Changed

LiVES-1.6.1.tar.bz2/src/widget-helper.c -> LiVES-2.0.3.tar.bz2/src/widget-helper.c Changed

@@ -1,6 +1,6 @@
 // widget-helper.c
 // LiVES
-// (c) G. Finch 2012 <salsaman@gmail.com>
+// (c) G. Finch 2012 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -18,6 +18,426 @@
 // basic functions
 
 
+
+////////////////////////////////////////////////////
+//lives_painter functions
+
+LIVES_INLINE lives_painter_t *lives_painter_create(lives_painter_surface_t *target) {
+  lives_painter_t *cr=NULL;
+#ifdef PAINTER_CAIRO
+  cr=cairo_create(target);
+#endif
+  return cr;
+
+}
+
+LIVES_INLINE lives_painter_t *lives_painter_create_from_widget(LiVESWidget *widget) {
+  lives_painter_t *cr=NULL;
+#ifdef PAINTER_CAIRO
+#ifdef GUI_GTK
+  LiVESXWindow *window=lives_widget_get_xwindow(widget);
+  if (window!=NULL) {
+    cr=gdk_cairo_create(window);
+  }
+#endif
+#endif
+  return cr;
+}
+
+
+LIVES_INLINE void lives_painter_set_source_pixbuf (lives_painter_t *cr, const LiVESPixbuf *pixbuf, double pixbuf_x, double pixbuf_y) {
+#ifdef PAINTER_CAIRO
+  gdk_cairo_set_source_pixbuf(cr,pixbuf,pixbuf_x,pixbuf_y);
+#endif
+
+}
+
+
+LIVES_INLINE void lives_painter_set_source_surface (lives_painter_t *cr, lives_painter_surface_t *surface, double x, double y) {
+#ifdef PAINTER_CAIRO
+  cairo_set_source_surface(cr,surface,x,y);
+#endif
+
+}
+
+LIVES_INLINE void lives_painter_paint(lives_painter_t *cr) {
+#ifdef PAINTER_CAIRO
+  cairo_paint(cr);
+#endif
+}
+
+LIVES_INLINE void lives_painter_fill(lives_painter_t *cr) {
+#ifdef PAINTER_CAIRO
+  cairo_fill(cr);
+#endif
+}
+
+LIVES_INLINE void lives_painter_stroke(lives_painter_t *cr) {
+#ifdef PAINTER_CAIRO
+  cairo_stroke(cr);
+#endif
+}
+
+LIVES_INLINE void lives_painter_clip(lives_painter_t *cr) {
+#ifdef PAINTER_CAIRO
+  cairo_clip(cr);
+#endif
+}
+
+LIVES_INLINE void lives_painter_destroy(lives_painter_t *cr) {
+#ifdef PAINTER_CAIRO
+  cairo_destroy(cr);
+#endif
+}
+
+LIVES_INLINE void lives_painter_surface_destroy(lives_painter_surface_t *surf) {
+#ifdef PAINTER_CAIRO
+  cairo_surface_destroy(surf);
+#endif
+}
+
+LIVES_INLINE void lives_painter_new_path(lives_painter_t *cr) {
+#ifdef PAINTER_CAIRO
+  cairo_new_path(cr);
+#endif
+}
+
+
+LIVES_INLINE void lives_painter_translate(lives_painter_t *cr, double x, double y) {
+#ifdef PAINTER_CAIRO
+  cairo_translate(cr,x,y);
+#endif
+
+}
+
+
+LIVES_INLINE void lives_painter_set_line_width(lives_painter_t *cr, double width) {
+#ifdef PAINTER_CAIRO
+  cairo_set_line_width(cr,width);
+#endif
+
+}
+
+
+LIVES_INLINE void lives_painter_move_to(lives_painter_t *cr, double x, double y) {
+#ifdef PAINTER_CAIRO
+  cairo_move_to(cr,x,y);
+#endif
+
+}
+
+LIVES_INLINE void lives_painter_line_to(lives_painter_t *cr, double x, double y) {
+#ifdef PAINTER_CAIRO
+  cairo_line_to(cr,x,y);
+#endif
+
+}
+
+LIVES_INLINE void lives_painter_rectangle(lives_painter_t *cr, double x, double y, double width, double height) {
+#ifdef PAINTER_CAIRO
+  cairo_rectangle(cr,x,y,width,height);
+#endif
+
+}
+
+LIVES_INLINE void lives_painter_arc(lives_painter_t *cr, double xc, double yc, double radius, double angle1, double angle2) {
+#ifdef PAINTER_CAIRO
+  cairo_arc(cr,xc,yc,radius,angle1,angle2);
+#endif
+
+}
+ 
+LIVES_INLINE boolean lives_painter_set_operator(lives_painter_t *cr, lives_painter_operator_t op) {
+  // if op was not LIVES_PAINTER_OPERATOR_DEFAULT, and FALSE is returned, then the operation failed,
+  // and op was set to the default
+#ifdef PAINTER_CAIRO
+  cairo_set_operator(cr,op);
+  if (op==LIVES_PAINTER_OPERATOR_UNKNOWN) return FALSE;
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+LIVES_INLINE void lives_painter_set_source_rgb(lives_painter_t *cr, double red, double green, double blue) {
+#ifdef PAINTER_CAIRO
+  cairo_set_source_rgb(cr,red,green,blue);
+#endif
+}
+
+LIVES_INLINE void lives_painter_set_source_rgba(lives_painter_t *cr, double red, double green, double blue, double alpha) {
+#ifdef PAINTER_CAIRO
+   cairo_set_source_rgba(cr,red,green,blue,alpha);
+#endif
+}
+
+LIVES_INLINE void lives_painter_set_fill_rule(lives_painter_t *cr, lives_painter_fill_rule_t fill_rule) {
+#ifdef PAINTER_CAIRO
+  cairo_set_fill_rule(cr,fill_rule);
+#endif
+}
+
+
+LIVES_INLINE void lives_painter_surface_flush(lives_painter_surface_t *surf) {
+#ifdef PAINTER_CAIRO
+  cairo_surface_flush(surf);
+#endif
+}
+
+
+
+LIVES_INLINE lives_painter_surface_t *lives_painter_image_surface_create_for_data(uint8_t *data, lives_painter_format_t format, 
+										  int width, int height, int stride) {
+  lives_painter_surface_t *surf=NULL;
+#ifdef PAINTER_CAIRO
+  surf=cairo_image_surface_create_for_data(data,format,width,height,stride);
+#endif
+  return surf;
+}
+
+
+LIVES_INLINE lives_painter_surface_t *lives_painter_surface_create_from_widget(LiVESWidget *widget, lives_painter_content_t format, 
+									       int width, int height) {
+  lives_painter_surface_t *surf=NULL;
+#ifdef PAINTER_CAIRO
+  LiVESXWindow *window=lives_widget_get_xwindow(widget);
+  if (window!=NULL) {
+#if G_ENCODE_VERSION(GDK_MAJOR_VERSION,GDK_MINOR_VERSION) >= G_ENCODE_VERSION(2,22)
+    surf=gdk_window_create_similar_surface(window,format,width,height);
+#else 
+    surf=cairo_image_surface_create(CAIRO_FORMAT_ARGB32,width,height);
+#endif
+}
+#endif
+  return surf;
+}
+
+
+LIVES_INLINE lives_painter_surface_t *lives_painter_image_surface_create(lives_painter_format_t format, int width, int height) {
+  lives_painter_surface_t *surf=NULL;
+#ifdef PAINTER_CAIRO
+  surf=cairo_image_surface_create(format,width,height);
+#endif
+  return surf;
+}
+
+
+
+////////////////////////// painter info funcs
+
+lives_painter_surface_t *lives_painter_get_target(lives_painter_t *cr) {
+
+ lives_painter_surface_t *surf=NULL;
+#ifdef PAINTER_CAIRO
+  surf=cairo_get_target(cr);
+#endif  
+  return surf;
+
+}
+
+
+int lives_painter_format_stride_for_width(lives_painter_format_t form, int width) {
+  int stride=-1;
+#ifdef PAINTER_CAIRO
+  stride=cairo_format_stride_for_width(form,width);
+#endif
+  return stride;
+}
+
+
+uint8_t *lives_painter_image_surface_get_data(lives_painter_surface_t *surf) {
+  uint8_t *data=NULL;
+#ifdef PAINTER_CAIRO
+  data=cairo_image_surface_get_data(surf);
+#endif
+  return data;
+}
+
+
+int lives_painter_image_surface_get_width(lives_painter_surface_t *surf) {
+  int width=0;
+#ifdef PAINTER_CAIRO
+  width=cairo_image_surface_get_width(surf);
+#endif
+  return width;
+}
+
+
+int lives_painter_image_surface_get_height(lives_painter_surface_t *surf) {
+  int height=0;
+#ifdef PAINTER_CAIRO
+  height=cairo_image_surface_get_height(surf);
+#endif
+  return height;
+}
+
+
+int lives_painter_image_surface_get_stride(lives_painter_surface_t *surf) {
+  int stride=0;
+#ifdef PAINTER_CAIRO
+  stride=cairo_image_surface_get_stride(surf);
+#endif
+  return stride;
+}
+
+
+lives_painter_format_t lives_painter_image_surface_get_format(lives_painter_surface_t *surf) {
+  lives_painter_format_t format=(lives_painter_format_t)0;
+#ifdef PAINTER_CAIRO
+  format=cairo_image_surface_get_format(surf);
+#endif
+  return format;
+}
+
+
+////////////////////////////////////////////////////////
+
+#ifdef GUI_GTK
+static void set_label_state(GtkWidget *widget, LiVESWidgetState state, gpointer labelp) {
+  GtkWidget *label=(GtkWidget *)labelp;
+  if (gtk_widget_get_sensitive(widget)&&!gtk_widget_get_sensitive(label)) {
+    gtk_widget_set_sensitive(label,TRUE);
+  }
+  if (!gtk_widget_get_sensitive(widget)&&gtk_widget_get_sensitive(label)) {
+    gtk_widget_set_sensitive(label,FALSE);
+  }
+}
+#endif
+
+LIVES_INLINE void lives_object_unref(LiVESObjectPtr object) {
+#ifdef GUI_GTK
+  g_object_unref(object);
+#endif
+}
+
+
+
+LIVES_INLINE void lives_widget_set_bg_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_override_background_color(widget,state,color);
+#else
+  gtk_widget_modify_bg(widget,state,color);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_set_fg_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_override_color(widget,state,color);
+#else
+  gtk_widget_modify_fg(widget,state,color);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_set_text_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_override_color(widget,state,color);
+#else
+  gtk_widget_modify_text(widget,state,color);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_set_base_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_override_background_color(widget,state,color);
+#else
+  gtk_widget_modify_base(widget,state,color);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_get_bg_state_color(LiVESWidget *widget, LiVESWidgetState state, LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_style_context_get_background_color (gtk_widget_get_style_context (widget), state, color);
+#else
+  lives_widget_color_copy(color,&gtk_widget_get_style(widget)->bg[state]);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_get_fg_state_color(LiVESWidget *widget, LiVESWidgetState state, LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_style_context_get_color (gtk_widget_get_style_context (widget), LIVES_WIDGET_STATE_NORMAL, color);
+#else
+  lives_widget_color_copy(color,&gtk_widget_get_style(widget)->fg[LIVES_WIDGET_STATE_NORMAL]);
+#endif
+#endif
+}
+
+
+LIVES_INLINE LiVESWidgetColor *lives_widget_color_copy(LiVESWidgetColor *c1, const LiVESWidgetColor *c2) {
+  LiVESWidgetColor *c0=NULL;
+#ifdef GUI_GTK
+
+  if (c1!=NULL) {
+  c1->red=c2->red;
+  c1->green=c2->green;
+  c1->blue=c2->blue;
+#if GTK_CHECK_VERSION(3,0,0)
+  c1->alpha=c2->alpha;
+#else
+  c1->pixel=c2->pixel;
+#endif
+}
+  else {
+#if GTK_CHECK_VERSION(3,0,0)
+  c0=gdk_rgba_copy(c2);
+#else
+  c0=gdk_color_copy(c2);
+#endif
+}
+
+#endif
+return c0;
+}
+
+
+
+LIVES_INLINE LiVESWidget *lives_image_new_from_stock(const char *stock_id, lives_icon_size_t size) {
+  LiVESWidget *image=NULL;
+#ifdef GUI_GTK
+  GtkIconSet *iset=gtk_icon_factory_lookup_default(stock_id);
+  if (iset!=NULL) {
+    image=gtk_image_new_from_stock(stock_id,size);
+  }
+  else {
+    image=gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE,size);
+    if (image==NULL) image=gtk_image_new_from_stock(GTK_STOCK_NO,size);
+    if (image==NULL) image=gtk_image_new_from_stock(GTK_STOCK_CLOSE,size);
+  }
+#endif
+  return image;
+}
+
+
+
+
+LIVES_INLINE boolean lives_color_parse(const char *spec, LiVESWidgetColor *color) {
+  boolean retval=FALSE;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  retval=gdk_rgba_parse(color,spec);
+#else
+  retval=gdk_color_parse(spec,color);
+#endif
+#endif
+  return retval;
+}
+
+
+
 LIVES_INLINE LiVESWidget *lives_dialog_get_content_area(LiVESDialog *dialog) {
 #ifdef GUI_GTK
 
@@ -30,6 +450,18 @@
 #endif
 }
 
+LIVES_INLINE LiVESWidget *lives_dialog_get_action_area(LiVESDialog *dialog) {
+#ifdef GUI_GTK
+
+#if GTK_CHECK_VERSION(2,14,0)
+  return gtk_dialog_get_action_area(GTK_DIALOG(dialog));
+#else
+  return GTK_DIALOG(dialog)->vbox;
+#endif
+
+#endif
+}
+
 
 
 
@@ -82,7 +514,7 @@
 
 
 
-LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_file(const char *filename, GError **error) {
+LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_file(const char *filename, LiVESError **error) {
 #ifdef GUI_GTK
   return gdk_pixbuf_new_from_file(filename, error);
 #endif
@@ -106,7 +538,7 @@
 
 LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, 
 							      boolean preserve_aspect_ratio,
-							      GError **error) {
+							      LiVESError **error) {
 
 #ifdef GUI_GTK
   return gdk_pixbuf_new_from_file_at_scale(filename, width, height, preserve_aspect_ratio, error);
@@ -181,7 +613,7 @@
 
 
 
-LIVES_INLINE guchar *lives_pixbuf_get_pixels(const LiVESPixbuf *pixbuf) {
+LIVES_INLINE unsigned char *lives_pixbuf_get_pixels(const LiVESPixbuf *pixbuf) {
 #ifdef GUI_GTK
   return gdk_pixbuf_get_pixels(pixbuf);
 #endif
@@ -192,7 +624,7 @@
 }
 
 
-LIVES_INLINE const guchar *lives_pixbuf_get_pixels_readonly(const LiVESPixbuf *pixbuf) {
+LIVES_INLINE const unsigned char *lives_pixbuf_get_pixels_readonly(const LiVESPixbuf *pixbuf) {
 
 #ifdef GUI_GTK
   return (const guchar *)gdk_pixbuf_get_pixels(pixbuf);
@@ -238,248 +670,1932 @@
 }
 
 
+LIVES_INLINE LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper, 
+						   double step_increment, double page_increment, double page_size) {
+  LiVESAdjustment *adj=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  adj=gtk_adjustment_new(value,lower,upper,step_increment,page_increment,page_size);
+#else
+  adj=GTK_ADJUSTMENT(gtk_adjustment_new(value,lower,upper,step_increment,page_increment,page_size));
+#endif
+#endif
+  return adj;
+}
 
-// compound functions
 
+LIVES_INLINE void lives_box_set_homogeneous(LiVESBox *box, boolean homogenous) {
+#ifdef GUI_GTK
+  gtk_box_set_homogeneous(box,homogenous);
+#endif
+}
 
 
+LIVES_INLINE void lives_box_set_spacing(LiVESBox *box, int spacing) {
+#ifdef GUI_GTK
+  gtk_box_set_spacing(box,spacing);
+#endif
+}
 
-LiVESWidget *lives_standard_check_button_new(const char *labeltext, boolean use_mnemonic, LiVESBox *box, 
-					     const char *tooltip) {
-  LiVESWidget *checkbutton;
 
-  // pack a themed check button into box
+LIVES_INLINE LiVESWidget *lives_hbox_new(boolean homogeneous, int spacing) {
+  LiVESWidget *hbox=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  hbox=gtk_box_new(LIVES_ORIENTATION_HORIZONTAL,spacing);
+  lives_box_set_homogeneous(LIVES_BOX(hbox),homogeneous);
+#else
+  hbox=gtk_hbox_new(homogeneous,spacing);
+#endif
+#endif
+  return hbox;
+}
 
 
+LIVES_INLINE LiVESWidget *lives_vbox_new(boolean homogeneous, int spacing) {
+  LiVESWidget *vbox=NULL;
 #ifdef GUI_GTK
-  LiVESWidget *eventbox;
-  LiVESWidget *label;
-  LiVESWidget *hbox;
-
-  checkbutton = gtk_check_button_new ();
-  if (tooltip!=NULL) gtk_widget_set_tooltip_text(checkbutton, tooltip);
-  eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(eventbox,checkbutton);
-  if (use_mnemonic) {
-    label=gtk_label_new_with_mnemonic (labeltext);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),checkbutton);
-  }
-  else label=gtk_label_new (labeltext);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    checkbutton);
-  
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+#if GTK_CHECK_VERSION(3,0,0)
+  vbox=gtk_box_new(LIVES_ORIENTATION_VERTICAL,spacing);
+  lives_box_set_homogeneous(LIVES_BOX(vbox),homogeneous);
+#else
+  vbox=gtk_vbox_new(homogeneous,spacing);
+#endif
+#endif
+  return vbox;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_hseparator_new(void) {
+  LiVESWidget *hsep=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  hsep=gtk_separator_new(LIVES_ORIENTATION_HORIZONTAL);
+#else
+  hsep=gtk_hseparator_new();
+#endif
+#endif
+  return hsep;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_vseparator_new(void) {
+  LiVESWidget *vsep=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  vsep=gtk_separator_new(LIVES_ORIENTATION_VERTICAL);
+#else
+  vsep=gtk_vseparator_new();
+#endif
+#endif
+  return vsep;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_hbutton_box_new(void) {
+  LiVESWidget *bbox=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  bbox=gtk_button_box_new(LIVES_ORIENTATION_HORIZONTAL);
+#else
+  bbox=gtk_hbutton_box_new();
+#endif
+#endif
+  return bbox;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_vbutton_box_new(void) {
+  LiVESWidget *bbox=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  bbox=gtk_button_box_new(LIVES_ORIENTATION_VERTICAL);
+#else
+  bbox=gtk_vbutton_box_new();
+#endif
+#endif
+  return bbox;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_hscale_new(LiVESAdjustment *adj) {
+  LiVESWidget *hscale=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  hscale=gtk_scale_new(LIVES_ORIENTATION_HORIZONTAL,adj);
+#else
+  hscale=gtk_hscale_new(adj);
+#endif
+#endif
+  return hscale;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_vscale_new(LiVESAdjustment *adj) {
+  LiVESWidget *vscale=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  vscale=gtk_scale_new(LIVES_ORIENTATION_VERTICAL,adj);
+#else
+  vscale=gtk_vscale_new(adj);
+#endif
+#endif
+  return vscale;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_hpaned_new(void) {
+  LiVESWidget *hpaned=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  hpaned=gtk_paned_new(LIVES_ORIENTATION_HORIZONTAL);
+#else
+  hpaned=gtk_hpaned_new();
+#endif
+#endif
+  return hpaned;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_vpaned_new(void) {
+  LiVESWidget *vpaned=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  vpaned=gtk_paned_new(LIVES_ORIENTATION_VERTICAL);
+#else
+  vpaned=gtk_vpaned_new();
+#endif
+#endif
+  return vpaned;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_hscrollbar_new(LiVESAdjustment *adj) {
+  LiVESWidget *hscrollbar=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  hscrollbar=gtk_scrollbar_new(LIVES_ORIENTATION_HORIZONTAL,adj);
+#else
+  hscrollbar=gtk_hscrollbar_new(adj);
+#endif
+#endif
+  return hscrollbar;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_vscrollbar_new(LiVESAdjustment *adj) {
+  LiVESWidget *vscrollbar=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  vscrollbar=gtk_scrollbar_new(LIVES_ORIENTATION_VERTICAL,adj);
+#else
+  vscrollbar=gtk_vscrollbar_new(adj);
+#endif
+#endif
+  return vscrollbar;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_combo_new(void) {
+  LiVESWidget *combo=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,24,0)
+  combo = gtk_combo_box_text_new_with_entry ();
+#else
+  combo = gtk_combo_box_entry_new_text ();
+#endif
+#endif
+  return combo;
+}
+
+
+LIVES_INLINE LiVESWidget *lives_combo_new_with_model (LiVESTreeModel *model) {
+  LiVESWidget *combo=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,24,0)
+  combo = gtk_combo_box_new_with_model_and_entry (model);
+#else
+  combo = gtk_combo_box_entry_new ();
+  gtk_combo_box_set_model(GTK_COMBO_BOX(combo),model);
+#endif
+#endif
+  return combo;
+
+}
+
+
+LIVES_INLINE void lives_combo_append_text(LiVESCombo *combo, const char *text) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,24,0)
+  gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo),text);
+#else
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo),text);
+#endif
+#endif
+}
+
+#ifdef GUI_GTK
+static void lives_combo_remove_all_text(LiVESCombo *combo) {
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(combo));
+#else
+  register int count = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(combo),
+						      NULL);
+  while (count-- > 0) gtk_combo_box_remove_text(combo,0);
+#endif
+}
+#endif
+
+
+
+LIVES_INLINE void lives_combo_set_entry_text_column(LiVESCombo *combo, int column) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,24,0)
+  gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(combo),column);
+#else
+  gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo),column);
+#endif
+#endif
+}
+
+
+LIVES_INLINE char *lives_combo_get_active_text(LiVESCombo *combo) {
+  // return value should be freed
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,24,0)
+  return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
+#else
+  return gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo));
+#endif
+#endif
+}
+
+
+
+LIVES_INLINE boolean lives_toggle_button_get_active(LiVESToggleButton *button) {
+#ifdef GUI_GTK
+  return gtk_toggle_button_get_active(button);
+#endif
+}
+
+
+LIVES_INLINE void lives_toggle_button_set_active(LiVESToggleButton *button, boolean active) {
+#ifdef GUI_GTK
+  gtk_toggle_button_set_active(button,active);
+#endif
+}
+
+
+LIVES_INLINE void lives_tooltips_set(LiVESWidget *widget, const char *tip_text) {
+#ifdef GUI_GTK
+
+#if GTK_CHECK_VERSION(2,12,0)
+  gtk_widget_set_tooltip_text(widget,tip_text);
+#else
+  GtkTooltips *tips;
+  tips = gtk_tooltips_new ();
+  gtk_tooltips_set_tip(tips,widget,tip_text,NULL);
+#endif
+#endif
+}
+
+
+LIVES_INLINE LiVESSList *lives_radio_button_get_group(LiVESRadioButton *rbutton) {
+#ifdef GUI_GTK
+  return gtk_radio_button_get_group(rbutton);
+#endif
+}
+
+
+LIVES_INLINE LiVESWidget *lives_widget_get_parent(LiVESWidget *widget) {
+#ifdef GUI_GTK
+  return gtk_widget_get_parent(widget);
+#endif
+}
+
+
+LIVES_INLINE LiVESXWindow *lives_widget_get_xwindow(LiVESWidget *widget) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,12,0)
+  return gtk_widget_get_window(widget);
+#else
+  return GDK_WINDOW(widget->window);
+#endif
+#endif
+}
+
+LIVES_INLINE void lives_widget_set_can_focus(LiVESWidget *widget, boolean state) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_can_focus(widget,state);
+#else
+  if (state)
+    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+  else
+    GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_set_can_default(LiVESWidget *widget, boolean state) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  gtk_widget_set_can_default(widget,state);
+#else
+  if (state)
+    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
+  else
+    GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_DEFAULT);
+#endif
+#endif
+}
+
+
+LIVES_INLINE boolean lives_widget_is_sensitive(LiVESWidget *widget) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  return gtk_widget_is_sensitive(widget);
+#else
+  return GTK_WIDGET_IS_SENSITIVE (widget);
+#endif
+#endif
+}
+
+
+LIVES_INLINE boolean lives_widget_is_visible(LiVESWidget *widget) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  return gtk_widget_get_visible(widget);
+#else
+  return GTK_WIDGET_VISIBLE (widget);
+#endif
+#endif
+}
+
+
+LIVES_INLINE boolean lives_widget_is_realized(LiVESWidget *widget) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  return gtk_widget_get_realized(widget);
+#else
+  return GTK_WIDGET_REALIZED (widget);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_container_remove(LiVESContainer *container, LiVESWidget *widget) {
+#ifdef GUI_GTK
+  gtk_container_remove(container,widget);
+#endif
+}
+
+
+LIVES_INLINE void lives_ruler_set_range(LiVESRuler *ruler, double lower, double upper, double position, double max_size) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_range_set_range(GTK_RANGE(ruler),lower,upper);
+  gtk_range_set_value(GTK_RANGE(ruler),position);
+#else
+  gtk_ruler_set_range(ruler,lower,upper,position,max_size);
+#endif
+#endif
+}
+
+
+LIVES_INLINE double lives_ruler_get_value(LiVESRuler *ruler) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  return gtk_range_get_value(GTK_RANGE(ruler));
+#else
+  return ruler->position;
+#endif
+#endif
+}
+
+
+LIVES_INLINE double lives_ruler_set_value(LiVESRuler *ruler, double value) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_range_set_value(GTK_RANGE(ruler),value);
+#else
+  ruler->position=value;
+#endif
+#endif
+  return value;
+}
+
+
+LIVES_INLINE double lives_ruler_set_upper(LiVESRuler *ruler, double value) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_adjustment_set_upper(gtk_range_get_adjustment(GTK_RANGE(ruler)),value);
+#else
+  ruler->upper=value;
+#endif
+#endif
+  return value;
+}
+
+
+LIVES_INLINE double lives_ruler_set_lower(LiVESRuler *ruler, double value) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_adjustment_set_lower(gtk_range_get_adjustment(GTK_RANGE(ruler)),value);
+#else
+  ruler->lower=value;
+#endif
+#endif
+  return value;
+}
+
+
+LIVES_INLINE int lives_widget_get_allocation_x(LiVESWidget *widget) {
+  int x=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  GtkAllocation alloc;
+  gtk_widget_get_allocation(widget,&alloc);
+  x=alloc.x;
+#else
+  x=widget->allocation.x;
+#endif
+#endif
+  return x;
+}
+
+
+LIVES_INLINE int lives_widget_get_allocation_y(LiVESWidget *widget) {
+  int y=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  GtkAllocation alloc;
+  gtk_widget_get_allocation(widget,&alloc);
+  y=alloc.y;
+#else
+  y=widget->allocation.y;
+#endif
+#endif
+  return y;
+}
+
+
+LIVES_INLINE int lives_widget_get_allocation_width(LiVESWidget *widget) {
+  int width=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  GtkAllocation alloc;
+  gtk_widget_get_allocation(widget,&alloc);
+  width=alloc.width;
+#else
+  width=widget->allocation.width;
+#endif
+#endif
+  return width;
+}
+
+
+LIVES_INLINE int lives_widget_get_allocation_height(LiVESWidget *widget) {
+  int height=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,18,0)
+  GtkAllocation alloc;
+  gtk_widget_get_allocation(widget,&alloc);
+  height=alloc.height;
+#else
+  height=widget->allocation.height;
+#endif
+#endif
+  return height;
+}
+
+
+LIVES_INLINE void lives_widget_set_state(LiVESWidget *widget, LiVESWidgetState state) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_set_state_flags(widget,state,TRUE);
+#else
+  gtk_widget_set_state(widget,state);
+#endif
+#endif
+}
+
+
+LIVES_INLINE LiVESWidgetState lives_widget_get_state(LiVESWidget *widget) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  return gtk_widget_get_state_flags(widget);
+#else
+#if GTK_CHECK_VERSION(2,18,0)
+  return gtk_widget_get_state(widget);
+#else
+  return GTK_WIDGET_STATE(widget);
+#endif
+#endif
+#endif
+}
+
+
+
+LIVES_INLINE LiVESWidget *lives_bin_get_child(LiVESBin *bin) {
+  LiVESWidget *child=NULL;
+#ifdef GUI_GTK
+  child=gtk_bin_get_child(bin);
+#endif
+  return child;
+}
+
+
+
+LIVES_INLINE double lives_adjustment_get_upper(LiVESAdjustment *adj) {
+  double upper=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  upper=gtk_adjustment_get_upper(adj);
+#else
+  upper=adj->upper;
+#endif
+#endif
+  return upper;
+}
+
+
+LIVES_INLINE double lives_adjustment_get_lower(LiVESAdjustment *adj) {
+  double lower=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  lower=gtk_adjustment_get_lower(adj);
+#else
+  lower=adj->lower;
+#endif
+#endif
+  return lower;
+}
+
+
+LIVES_INLINE double lives_adjustment_get_page_size(LiVESAdjustment *adj) {
+  double page_size=0;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  page_size=gtk_adjustment_get_page_size(adj);
+#else
+  page_size=adj->page_size;
+#endif
+#endif
+  return page_size;
+}
+
+
+
+LIVES_INLINE void lives_adjustment_set_upper(LiVESAdjustment *adj, double upper) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  gtk_adjustment_set_upper(adj,upper);
+#else
+  adj->upper=upper;
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_adjustment_set_lower(LiVESAdjustment *adj, double lower) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  gtk_adjustment_set_lower(adj,lower);
+#else
+  adj->lower=lower;
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_adjustment_set_page_size(LiVESAdjustment *adj, double page_size) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  gtk_adjustment_set_page_size(adj,page_size);
+#else
+  adj->page_size=page_size;
+#endif
+#endif
+}
+
+
+LIVES_INLINE LiVESAdjustment *lives_tree_view_get_hadjustment(LiVESTreeView *tview) {
+  LiVESAdjustment *adj=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  adj=gtk_scrollable_get_hadjustment(GTK_SCROLLABLE(tview));
+#else
+  adj=gtk_tree_view_get_hadjustment(tview);
+#endif
+#endif
+  return adj;
+}
+
+
+LIVES_INLINE const char *lives_label_get_text(LiVESLabel *label) {
+#ifdef GUI_GTK
+  return gtk_label_get_text(label);
+#endif
+  return NULL;
+}
+
+
+LIVES_INLINE void lives_entry_set_editable(LiVESEntry *entry, boolean editable) {
+#ifdef GUI_GTK
+  gtk_editable_set_editable(GTK_EDITABLE(entry),editable);
+#endif
+}
+
+
+
+LIVES_INLINE boolean lives_dialog_set_has_separator(LiVESDialog *dialog, boolean has) {
+  // return TRUE if implemented
+
+#ifdef GUI_GTK
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_dialog_set_has_separator(dialog,has);
+  return TRUE;
+#endif
+#endif
+  return FALSE;
+}
+
+
+
+LIVES_INLINE boolean lives_widget_set_hexpand(LiVESWidget *widget, boolean state) {
+  // return TRUE if implemented
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_set_hexpand(widget,state);
+  return TRUE;
+#endif
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE boolean lives_widget_set_vexpand(LiVESWidget *widget, boolean state) {
+  // return TRUE if implemented
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_widget_set_vexpand(widget,state);
+  return TRUE;
+#endif
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE boolean lives_image_menu_item_set_always_show_image(LiVESImageMenuItem *item, boolean show) {
+  // return TRUE if implemented
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,16,0)
+  gtk_image_menu_item_set_always_show_image(item,show);
+  return TRUE;
+#endif
+#endif
+  return FALSE;
+}
+
+
+
+LIVES_INLINE boolean lives_scale_button_set_orientation(LiVESScaleButton *scale, LiVESOrientation orientation) {
+  // return TRUE if implemented
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  gtk_orientable_set_orientation(GTK_ORIENTABLE(scale),orientation);
+  return TRUE;
+#else
+#if GTK_CHECK_VERSION(2,14,0) 
+  gtk_scale_button_set_orientation (scale,orientation);
+  return TRUE;
+#endif
+#endif
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE double lives_scale_button_get_value(LiVESScaleButton *scale) {
+  double value=0.;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0)
+  value=gtk_scale_button_get_value(scale);
+#else
+  value=gtk_adjustment_get_value(gtk_range_get_adjustment(scale));
+#endif
+#endif
+  return value;
+}
+
+
+LIVES_INLINE void lives_widget_get_pointer(LiVESXDevice *device, LiVESWidget *widget, int *x, int *y) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  // try: gdk_event_get_device (event)
+  LiVESXWindow *xwin;
+  if (widget==NULL) xwin=gdk_get_default_root_window ();
+  else xwin=lives_widget_get_xwindow(widget);
+  if (xwin==NULL) {
+    LIVES_ERROR("Tried to get pointer for windowless widget");
+    return;
+  }
+  gdk_window_get_device_position (xwin,device,x,y,NULL);
+#else 
+  gtk_widget_get_pointer(widget,x,y);
+#endif
+#endif
+
+}
+
+
+LIVES_INLINE LiVESXDisplay *lives_widget_get_display(LiVESWidget *widget) {
+  LiVESXDisplay *disp=NULL;
+#ifdef GUI_GTK
+  disp=gtk_widget_get_display(widget);
+#endif
+  return disp;
+}
+
+
+LIVES_INLINE LiVESXWindow *lives_display_get_window_at_pointer 
+(LiVESXDevice *device, LiVESXDisplay *display, int *win_x, int *win_y) {
+  LiVESXWindow *xwindow=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  if (device==NULL) return NULL;
+  xwindow=gdk_device_get_window_at_position (device,win_x,win_y);
+#else
+  xwindow=gdk_display_get_window_at_pointer(display,win_x,win_y);
+#endif
+#endif
+  return xwindow;
+}
+
+
+LIVES_INLINE void lives_display_get_pointer 
+(LiVESXDevice *device, LiVESXDisplay *display, LiVESXScreen **screen, int *x, int *y, LiVESModifierType *mask) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  if (device==NULL) return;
+  gdk_device_get_position (device,screen,x,y);
+#else
+  gdk_display_get_pointer(display,screen,x,y,mask);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_display_warp_pointer 
+(LiVESXDevice *device, LiVESXDisplay *display, LiVESXScreen *screen, int x, int y) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  if (device==NULL) return;
+  gdk_device_warp (device,screen,x,y);
+#else
+#if GLIB_CHECK_VERSION(2,8,0)
+  gdk_display_warp_pointer(display,screen,x,y);
+#endif
+#endif
+#endif
+}
+
+
+LIVES_INLINE lives_display_t lives_widget_get_display_type(LiVESWidget *widget) {
+  lives_display_t dtype=LIVES_DISPLAY_TYPE_UNKNOWN;
+#ifdef GUI_GTK
+  LiVESXDisplay *display=gtk_widget_get_display(widget);
+  display=display; // stop compiler complaining
+  if (GDK_IS_X11_DISPLAY(display)) dtype=LIVES_DISPLAY_TYPE_X11;
+  else if (GDK_IS_WIN32_DISPLAY(display)) dtype=LIVES_DISPLAY_TYPE_WIN32;
+#endif
+  return dtype;
+}
+
+
+LIVES_INLINE uint64_t lives_widget_get_xwinid(LiVESWidget *widget, const gchar *msg) {
+  uint64_t xwin=-1;
+#ifdef GUI_GTK
+#ifdef GDK_WINDOWING_X11
+  if (lives_widget_get_display_type(widget)==LIVES_DISPLAY_TYPE_X11)
+    xwin=(uint64_t)GDK_WINDOW_XID (lives_widget_get_xwindow(widget));
+  else
+#endif
+#ifdef GDK_WINDOWING_WIN32
+    if (lives_widget_get_display_type(widget)==LIVES_DISPLAY_TYPE_WIN32)
+      xwin=(uint64_t)gdk_win32_drawable_get_handle (lives_widget_get_xwindow(widget));
+    else 
+#endif
+#endif
+      if (msg!=NULL) LIVES_WARN(msg);
+
+  return xwin;
+}
+
+
+// compound functions
+
+void lives_painter_set_source_to_bg(lives_painter_t *cr, LiVESWidget *widget) {
+  LiVESWidgetColor color;
+  lives_widget_get_bg_color(widget, &color);
+
+#if LIVES_WIDGET_COLOR_HAS_ALPHA
+  lives_painter_set_source_rgba (cr, 
+				 LIVES_WIDGET_COLOR_SCALE(color.red), 
+				 LIVES_WIDGET_COLOR_SCALE(color.green), 
+				 LIVES_WIDGET_COLOR_SCALE(color.blue), 
+				 LIVES_WIDGET_COLOR_SCALE(color.alpha));
+#else
+    lives_painter_set_source_rgb (cr, 
+				  LIVES_WIDGET_COLOR_SCALE(color.red), 
+				  LIVES_WIDGET_COLOR_SCALE(color.green), 
+				  LIVES_WIDGET_COLOR_SCALE(color.blue));
+#endif
+}
+
+
+
+void lives_tooltips_copy(LiVESWidget *dest, LiVESWidget *source) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,12,0)
+  gchar *text=gtk_widget_get_tooltip_text(source);
+  gtk_widget_set_tooltip_text(dest,text);
+  g_free(text);
+#else
+  GtkTooltipsData *td=gtk_tooltips_data_get(source);
+  if (td==NULL) return;
+  gtk_tooltips_set_tip (td->tooltips, dest, td->tip_text, td->tip_private);
+#endif
+#endif
+}
+
+
+void lives_combo_populate(LiVESCombo *combo, LiVESList *list) {
+  // remove any current list
+#ifdef GUI_GTK
+
+  gtk_combo_box_set_active(combo,-1);
+
+  lives_combo_remove_all_text(combo);
+
+  // add the new list
+  while (list!=NULL) {
+    lives_combo_append_text(LIVES_COMBO(combo),(const char *)list->data);
+    list=list->next;
+  }
+#endif
+}
+
+///// lives compounds
+
+
+LiVESWidget *lives_volume_button_new(LiVESOrientation orientation, LiVESAdjustment *adj, double volume) {
+  LiVESWidget *volume_scale=NULL;
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(2,14,0) 
+  volume_scale=gtk_volume_button_new();
+  gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume_scale),volume);
+  lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(volume_scale),orientation);
+#else
+  if (orientation==LIVES_ORIENTATION_HORIZONTAL)
+    volume_scale=lives_hscale_new(adj);
+  else 
+    volume_scale=lives_vscale_new(adj);
+
+  gtk_scale_set_draw_value(GTK_SCALE(volume_scale),FALSE);
+#endif
+#endif
+  return volume_scale;
+}
+
+
+
+LiVESWidget *lives_standard_label_new(const char *text) {
+  LiVESWidget *label=NULL;
+#ifdef GUI_GTK
+
+  label=gtk_label_new(text);
+
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL);
+  }
+  gtk_label_set_justify (GTK_LABEL (label), widget_opts.justify);
+
+  gtk_label_set_line_wrap (GTK_LABEL (label), widget_opts.line_wrap);
+#endif
+
+  return label;
+}
+
+
+LiVESWidget *lives_standard_label_new_with_mnemonic(const char *text, LiVESWidget *mnemonic_widget) {
+  LiVESWidget *label=NULL;
+#ifdef GUI_GTK
+
+  label=gtk_label_new_with_mnemonic(text);
+
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL);
+  }
+  gtk_label_set_justify (GTK_LABEL (label), widget_opts.justify);
+  gtk_label_set_line_wrap (GTK_LABEL (label), widget_opts.line_wrap);
+
+  if (mnemonic_widget!=NULL) gtk_label_set_mnemonic_widget (GTK_LABEL(label),mnemonic_widget);
+#endif
+
+  return label;
+}
+
+
+LiVESWidget *lives_standard_check_button_new(const char *labeltext, boolean use_mnemonic, LiVESBox *box, 
+					     const char *tooltip) {
+  LiVESWidget *checkbutton=NULL;
+
+  // pack a themed check button into box
+
+
+#ifdef GUI_GTK
+  LiVESWidget *eventbox=NULL;
+  LiVESWidget *label=NULL;
+  LiVESWidget *hbox;
+
+  checkbutton = gtk_check_button_new ();
+  if (tooltip!=NULL) lives_tooltips_set(checkbutton, tooltip);
+
+  widget_opts.last_label=NULL;
+
+  if (labeltext!=NULL) {
+    eventbox=gtk_event_box_new();
+    if (tooltip!=NULL) lives_tooltips_copy(eventbox,checkbutton);
+
+    if (use_mnemonic) {
+      label=lives_standard_label_new_with_mnemonic (labeltext,checkbutton);
+    }
+    else label=lives_standard_label_new (labeltext);
+
+    gtk_container_add(GTK_CONTAINER(eventbox),label);
+
+    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
+		      G_CALLBACK (label_act_toggle),
+		      checkbutton);
+  
+    widget_opts.last_label=label;
+
+    if (widget_opts.apply_theme) {
+      lives_widget_apply_theme(eventbox,LIVES_WIDGET_STATE_NORMAL);
+    }
+  }
+  
+  if (box!=NULL) {
+    if (LIVES_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+    else {
+      hbox = lives_hbox_new (FALSE, 0);
+      if (!widget_opts.no_gui) {
+	gtk_widget_show(hbox);
+      }
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+    }
+    
+    lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
+    
+    
+    if (widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+    
+    gtk_box_pack_start (GTK_BOX (hbox), checkbutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, eventbox==NULL?0:widget_opts.packing_width);
+
+    if (!widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+
+  }
+
+  if (label!=NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_connect_after (GTK_OBJECT (checkbutton), "state_flags_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#else
+    g_signal_connect_after (GTK_OBJECT (checkbutton), "state_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#endif
+  }
+
+#endif
+
+  return checkbutton;
+}
+
+
+
+
+LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup, 
+					     LiVESBox *box, const char *tooltip) {
+  LiVESWidget *radiobutton=NULL;
+
+  // pack a themed check button into box
+
+
+
+#ifdef GUI_GTK
+  LiVESWidget *eventbox=NULL;
+  LiVESWidget *label=NULL;
+  LiVESWidget *hbox;
+
+  radiobutton = gtk_radio_button_new (rbgroup);
+
+  if (tooltip!=NULL) lives_tooltips_set(radiobutton, tooltip);
+
+  widget_opts.last_label=NULL;
+
+  if (labeltext!=NULL) {
+    if (use_mnemonic) {
+      label=lives_standard_label_new_with_mnemonic (labeltext,radiobutton);
+    }
+    else label=lives_standard_label_new (labeltext);
+
+    widget_opts.last_label=label;
+    
+    eventbox=gtk_event_box_new();
+    if (tooltip!=NULL) lives_tooltips_copy(eventbox,radiobutton);
+    gtk_container_add(GTK_CONTAINER(eventbox),label);
+
+    g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
+		      G_CALLBACK (label_act_toggle),
+		      radiobutton);
+    
+    if (widget_opts.apply_theme) {
+      lives_widget_apply_theme(eventbox, LIVES_WIDGET_STATE_NORMAL);
+    }
+  }
+
+
+  if (box!=NULL) {
+    if (LIVES_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+    else {
+      hbox = lives_hbox_new (FALSE, 0);
+      if (!widget_opts.no_gui) {
+	gtk_widget_show(hbox);
+      }
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+    }
+    
+    lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
+    
+    if (widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+
+    gtk_box_pack_start (GTK_BOX (hbox), radiobutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, eventbox==NULL?0:widget_opts.packing_width);
+
+    if (!widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+  }
+
+  if (label!=NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_connect_after (GTK_OBJECT (radiobutton), "state_flags_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#else
+    g_signal_connect_after (GTK_OBJECT (radiobutton), "state_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#endif
+  }
+
+#endif
+
+  return radiobutton;
+}
+
+
+size_t calc_spin_button_width(double min, double max, int dp) {
+  char *txt=g_strdup_printf ("%d",(int)max);
+  size_t maxlen=strlen (txt);
+  g_free (txt);
+  txt=g_strdup_printf ("%d",(int)min);
+  if (strlen (txt)>maxlen) maxlen=strlen (txt);
+  g_free (txt);
+  if (dp>0) maxlen+=3;
+  return maxlen;
+}
+
+
+LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min, 
+					    double max, double step, double page, int dp, LiVESBox *box, 
+					    const char *tooltip) {
+  LiVESWidget *spinbutton=NULL;
+
+  // pack a themed check button into box
+
+
+#ifdef GUI_GTK
+  LiVESWidget *eventbox=NULL;
+  LiVESWidget *label=NULL;
+  LiVESWidget *hbox;
+  LiVESAdjustment *adj;
+
+  boolean expand=FALSE;
+
+  int maxlen;
+
+  adj = lives_adjustment_new (val, min, max, step, page, 0.);
+  spinbutton = gtk_spin_button_new (adj, 1, dp);
+  if (tooltip!=NULL) lives_tooltips_set(spinbutton, tooltip);
+
+  maxlen=calc_spin_button_width(min,max,dp);
+  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton),maxlen);
+
+  gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE);
+  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spinbutton),GTK_UPDATE_ALWAYS);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton),TRUE);
+
+  widget_opts.last_label=NULL;
+
+  if (labeltext!=NULL) {
+    if (use_mnemonic) {
+      label=lives_standard_label_new_with_mnemonic (labeltext,spinbutton);
+    }
+    else label=lives_standard_label_new (labeltext);
+    
+    widget_opts.last_label=label;
+
+    eventbox=gtk_event_box_new();
+    if (tooltip!=NULL) lives_tooltips_copy(eventbox,spinbutton);
+    gtk_container_add(GTK_CONTAINER(eventbox),label);
+    
+    if (widget_opts.apply_theme) {
+      lives_widget_apply_theme(eventbox, LIVES_WIDGET_STATE_NORMAL);
+    }
   }
-  
-  if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
-  else {
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
+
+  if (box!=NULL) {
+    if (LIVES_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+    else {
+      hbox = lives_hbox_new (FALSE, 0);
+      if (!widget_opts.no_gui) {
+	gtk_widget_show(hbox);
+      }
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+      expand=widget_opts.expand!=LIVES_EXPAND_NONE;
+    }
+
+    lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
+
+    if (!widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+    
+    if (expand) add_fill_to_box(LIVES_BOX(hbox));
+
+    gtk_box_pack_start (GTK_BOX (hbox), spinbutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, widget_opts.packing_width);
+    
+    if (expand) add_fill_to_box(LIVES_BOX(hbox));
+
+    if (widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
   }
-  
-  gtk_box_set_homogeneous(GTK_BOX(hbox),FALSE);
-  
-  gtk_box_pack_start (GTK_BOX (hbox), checkbutton, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  GTK_WIDGET_SET_FLAGS (checkbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-#endif
 
-  return checkbutton;
-}
+  if (label!=NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_connect_after (GTK_OBJECT (spinbutton), "state_flags_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#else
+    g_signal_connect_after (GTK_OBJECT (spinbutton), "state_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#endif
+  }
 
+#endif
 
+  return spinbutton;
+}
 
 
 
 
 
-LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup, 
-					     LiVESBox *box, const char *tooltips) {
-  LiVESWidget *radiobutton;
 
-  // pack a themed check button into box
+LiVESWidget *lives_standard_combo_new (const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *box, 
+				       const char *tooltip) {
+  LiVESWidget *combo=NULL;
 
+  // pack a themed combo box into box
 
 
 #ifdef GUI_GTK
-  LiVESWidget *eventbox;
-  LiVESWidget *label;
+  LiVESWidget *eventbox=NULL;
+  LiVESWidget *label=NULL;
   LiVESWidget *hbox;
+  LiVESEntry *entry;
+
+  combo=lives_combo_new();
+  if (tooltip!=NULL) lives_tooltips_set(combo, tooltip);
+
+  entry=(LiVESEntry *)lives_combo_get_entry(LIVES_COMBO(combo));
+
+  widget_opts.last_label=NULL;
+
+  if (labeltext!=NULL) {
+    if (use_mnemonic) {
+      label = lives_standard_label_new_with_mnemonic (labeltext,LIVES_WIDGET(entry));
+    }
+    else label = lives_standard_label_new (labeltext);
+
+    widget_opts.last_label=label;
+    
+    eventbox=gtk_event_box_new();
+    if (tooltip!=NULL) lives_tooltips_copy(eventbox,combo);
+    gtk_container_add(GTK_CONTAINER(eventbox),label);
+    
+    if (widget_opts.apply_theme) {
+      lives_widget_apply_theme(eventbox, LIVES_WIDGET_STATE_NORMAL);
+    }
+  }
 
-  radiobutton = gtk_radio_button_new (rbgroup);
+  if (box!=NULL) {
+    if (LIVES_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+    else {
+      hbox = lives_hbox_new (FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+    }
+
+    lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
+
+    if (widget_opts.expand==LIVES_EXPAND_DEFAULT) {
+      GtkWidget *label=lives_standard_label_new("");
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
+    }
+    
+    if (!widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+    gtk_box_pack_start (GTK_BOX (hbox), combo, widget_opts.expand!=LIVES_EXPAND_NONE, 
+			widget_opts.expand==LIVES_EXPAND_EXTRA, eventbox==NULL?0:widget_opts.packing_width);
+    if (widget_opts.swap_label&&eventbox!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+
+
+    if (widget_opts.expand==LIVES_EXPAND_DEFAULT) {
+      GtkWidget *label=lives_standard_label_new("");
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
+    }
 
-  if (tooltips!=NULL) gtk_widget_set_tooltip_text(radiobutton, tooltips);
 
-  GTK_WIDGET_SET_FLAGS (radiobutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
-  else {
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
   }
 
-  gtk_box_set_homogeneous(GTK_BOX(hbox),FALSE);
+  lives_entry_set_editable (LIVES_ENTRY(entry),FALSE);
+  gtk_entry_set_activates_default(entry,TRUE);
 
-  gtk_box_pack_start (GTK_BOX (hbox), radiobutton, FALSE, FALSE, 10);
-      
-  if (use_mnemonic) {
-    label=gtk_label_new_with_mnemonic (labeltext);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),radiobutton);
+  if (list!=NULL) {
+    lives_combo_populate(LIVES_COMBO(combo),list);
+    if (list!=NULL) gtk_combo_box_set_active(LIVES_COMBO(combo),0);
   }
-  else label=gtk_label_new (labeltext);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-  eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(eventbox,radiobutton);
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  g_signal_connect (GTK_OBJECT (eventbox), "button_press_event",
-		    G_CALLBACK (label_act_toggle),
-		    radiobutton);
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  if (label!=NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_connect_after (GTK_OBJECT (combo), "state_flags_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#else
+    g_signal_connect_after (GTK_OBJECT (combo), "state_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#endif
   }
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
- 
+
 #endif
 
-  return radiobutton;
+  return combo;
 }
 
 
+LiVESWidget *lives_standard_entry_new(const char *labeltext, boolean use_mnemonic, const char *txt, int dispwidth, int maxchars, LiVESBox *box, 
+					     const char *tooltip) {
+
+  LiVESWidget *entry=NULL;
+
+#ifdef GUI_GTK
+  LiVESWidget *label=NULL;
 
+  LiVESWidget *hbox=NULL;
 
+  entry=gtk_entry_new();
 
+  if (tooltip!=NULL) lives_tooltips_set(entry, tooltip);
 
+  if (txt!=NULL)
+    gtk_entry_set_text (GTK_ENTRY (entry),txt);
 
+  if (dispwidth!=-1) gtk_entry_set_width_chars (GTK_ENTRY (entry),dispwidth);
+  if (maxchars!=-1) gtk_entry_set_max_length(GTK_ENTRY (entry),maxchars);
 
+  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 
+  widget_opts.last_label=NULL;
 
+  if (labeltext!=NULL) {
+    if (use_mnemonic) {
+      label = lives_standard_label_new_with_mnemonic (labeltext,entry);
+    }
+    else label = lives_standard_label_new (labeltext);
 
+    widget_opts.last_label=label;
 
-LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min, 
-					    double max, double step, double page, int dp, LiVESBox *box, 
-					    const char *tooltip) {
-  LiVESWidget *spinbutton;
+    if (tooltip!=NULL) lives_tooltips_copy(label,entry);
+  }
+
+
+  if (box!=NULL) {
+    if (LIVES_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+    else {
+      hbox = lives_hbox_new (FALSE, 0);
+      if (!widget_opts.no_gui) {
+	gtk_widget_show(hbox);
+      }
+      gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+    }
+    
+    lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
+
+    if (!widget_opts.swap_label&&label!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+    
+    gtk_box_pack_start (GTK_BOX (hbox), entry, widget_opts.expand!=LIVES_EXPAND_NONE, dispwidth==-1, widget_opts.packing_width);
+    
+    if (widget_opts.swap_label&&label!=NULL)
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+  }
+
+  if (label!=NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+    g_signal_connect_after (GTK_OBJECT (entry), "state_flags_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#else
+    g_signal_connect_after (GTK_OBJECT (entry), "state_changed",
+			    G_CALLBACK (set_label_state),
+			    label);
+#endif
+  }
+
+#endif
+
+  return entry;
+}
 
-  // pack a themed check button into box
 
 
+LiVESWidget *lives_standard_dialog_new(const char *title, boolean add_std_buttons) {
+  LiVESWidget *dialog=NULL;
+
 #ifdef GUI_GTK
-  LiVESWidget *eventbox;
-  LiVESWidget *label;
-  LiVESWidget *hbox;
-  LiVESObject *adj;
 
-  char *txt;
-  size_t maxlen;
+  dialog = gtk_dialog_new ();
 
-  adj = gtk_adjustment_new (val, min, max, step, page, 0.);
-  spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, dp);
-  if (tooltip!=NULL) gtk_widget_set_tooltip_text(spinbutton, tooltip);
-  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton),TRUE);
-  txt=g_strdup_printf ("%d",(int)max);
-  maxlen=strlen (txt);
-  g_free (txt);
-  txt=g_strdup_printf ("%d",(int)min);
-  if (strlen (txt)>maxlen) maxlen=strlen (txt);
-  g_free (txt);
+  if (title!=NULL)
+    gtk_window_set_title (GTK_WINDOW (dialog), title);
 
-  gtk_entry_set_width_chars (GTK_ENTRY (spinbutton),maxlen+dp<4?4:maxlen+dp+1);
-  GTK_WIDGET_SET_FLAGS (spinbutton, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
-  gtk_entry_set_activates_default (GTK_ENTRY ((GtkEntry *)&(GTK_SPIN_BUTTON (spinbutton)->entry)), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spinbutton),GTK_UPDATE_ALWAYS);
-  if (use_mnemonic) {
-    label=gtk_label_new_with_mnemonic (labeltext);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label),spinbutton);
+  gtk_window_set_deletable(GTK_WINDOW(dialog), FALSE);
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+
+  lives_widget_set_hexpand(dialog,TRUE);
+  lives_widget_set_vexpand(dialog,TRUE);
+
+  if (prefs->gui_monitor!=0) {
+    gtk_window_set_screen(GTK_WINDOW(dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
   }
-  else label=gtk_label_new (labeltext);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-  eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(eventbox,spinbutton);
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
+  gtk_container_set_border_width (GTK_CONTAINER (dialog), widget_opts.border_width*2);
+  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme(dialog, LIVES_WIDGET_STATE_NORMAL);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+    lives_dialog_set_has_separator(GTK_DIALOG(dialog),FALSE);
+#endif
   }
 
-  if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
+  if (add_std_buttons) {
+    GtkAccelGroup *accel_group=GTK_ACCEL_GROUP(gtk_accel_group_new ());
+    GtkWidget *cancelbutton = gtk_button_new_from_stock ("gtk-cancel");
+    GtkWidget *okbutton = gtk_button_new_from_stock ("gtk-ok");
 
-  else {
-    hbox = gtk_hbox_new (TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
+    gtk_window_add_accel_group (GTK_WINDOW (dialog), accel_group);
+
+    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), cancelbutton, GTK_RESPONSE_CANCEL);
+
+    gtk_widget_add_accelerator (cancelbutton, "activate", accel_group,
+				LIVES_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0);
+
+    lives_widget_set_can_focus_and_default(cancelbutton);
+
+    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), okbutton, GTK_RESPONSE_OK);
+
+    lives_widget_set_can_focus_and_default(okbutton);
+    gtk_widget_grab_default (okbutton);
   }
 
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 10);
+  g_signal_connect (GTK_OBJECT (dialog), "delete_event",
+                      G_CALLBACK (return_true),
+                      NULL);
+
+  // must do this before setting modal !
+  if (!widget_opts.no_gui) 
+    gtk_widget_show(dialog);
+
+  if (!widget_opts.non_modal)
+    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
 
 #endif
 
-  return spinbutton;
+  return dialog;
+
 }
 
 
 
+LiVESWidget *lives_standard_hruler_new(void) {
+  LiVESWidget *hruler=NULL;
 
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  hruler=gtk_scale_new(GTK_ORIENTATION_HORIZONTAL,NULL);
+  gtk_scale_set_draw_value(GTK_SCALE(hruler),FALSE);
+  gtk_scale_set_has_origin(GTK_SCALE(hruler),FALSE);
+  gtk_scale_set_digits(GTK_SCALE(hruler),8);
+#else
+  hruler=gtk_hruler_new();
+#endif
 
+#endif
+
+  return hruler;
+}
 
-LiVESWidget *lives_standard_combo_new (const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *box, 
-				       const char *tooltip) {
-  LiVESWidget *combo;
 
-  // pack a themed check button into box
 
+LiVESWidget *lives_standard_scrolled_window_new(int width, int height, LiVESWidget *child) {
+  LiVESWidget *scrolledwindow=NULL;
 
 #ifdef GUI_GTK
-  LiVESWidget *eventbox;
-  LiVESWidget *label;
-  LiVESWidget *hbox;
+  LiVESWidget *swchild;
+
+  scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+  if (widget_opts.apply_theme) {
+    lives_widget_set_hexpand(scrolledwindow,TRUE);
+    lives_widget_set_vexpand(scrolledwindow,TRUE);
+    gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), widget_opts.border_width);
+  }
+
+  if (child!=NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+    if (!GTK_IS_SCROLLABLE(child))
+#else
+    if (!GTK_IS_TEXT_VIEW(child))
+#endif 
+      {
+	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), child);
+	gtk_viewport_set_shadow_type (GTK_VIEWPORT (lives_bin_get_child (LIVES_BIN (scrolledwindow))),GTK_SHADOW_IN);
+      }
+    else 
+      gtk_container_add (GTK_CONTAINER (scrolledwindow), child);
+  }
+
+  swchild=lives_bin_get_child(LIVES_BIN(scrolledwindow));
+
+  if (width!=0&&height!=0) {
+#if !GTK_CHECK_VERSION(3,0,0)
+    gtk_widget_set_size_request (scrolledwindow, width, height);
+#else
+    if (height!=-1) gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolledwindow),height);
+    if (width!=-1) gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(scrolledwindow),width);
+#endif
+  }
+
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme(swchild, LIVES_WIDGET_STATE_NORMAL);
+    lives_widget_set_hexpand(swchild,TRUE);
+    lives_widget_set_vexpand(swchild,TRUE);
+    if (GTK_IS_CONTAINER(child)) gtk_container_set_border_width (GTK_CONTAINER (child), widget_opts.border_width>>1);
+  }
+#endif
+  return scrolledwindow;
+}
+
+
 
-  combo = gtk_combo_new ();
+LiVESWidget *lives_standard_expander_new(const char *ltext, boolean use_mnemonic, LiVESBox *parent, LiVESWidget *child) {
+  LiVESWidget *expander=NULL;
 
-  if (tooltip!=NULL) gtk_widget_set_tooltip_text(combo, tooltip);
+#ifdef GUI_GTK
+
+  if (use_mnemonic)
+    expander=gtk_expander_new_with_mnemonic(ltext);
+  else 
+    expander=gtk_expander_new(ltext);
+
+  if (widget_opts.apply_theme) {
+    GtkWidget *label=gtk_expander_get_label_widget(GTK_EXPANDER(expander));
+    lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL);
+    lives_widget_apply_theme(label, LIVES_WIDGET_STATE_PRELIGHT);
+    lives_widget_apply_theme(expander, LIVES_WIDGET_STATE_PRELIGHT);
+    lives_widget_apply_theme(expander, LIVES_WIDGET_STATE_NORMAL);
+  }
   
-  if (use_mnemonic) {
-    label = gtk_label_new_with_mnemonic (labeltext);
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_COMBO(combo)->entry);
+  gtk_container_forall(GTK_CONTAINER(expander),set_child_colour,GINT_TO_POINTER(TRUE));
+
+  gtk_box_pack_start (parent, expander, FALSE, FALSE, widget_opts.packing_height);
+
+  gtk_container_add (GTK_CONTAINER (expander), child);
+#endif
+
+  return expander;
+}
+
+
+LiVESWidget *lives_standard_file_button_new(boolean is_dir, const char *def_dir) {
+  LiVESWidget *fbutton=NULL;
+#ifdef GUI_GTK
+  GtkWidget *image = lives_image_new_from_stock ("gtk-open", LIVES_ICON_SIZE_BUTTON);
+  fbutton = gtk_button_new ();
+  g_object_set_data(G_OBJECT(fbutton),"is_dir",GINT_TO_POINTER(is_dir));
+  if (def_dir!=NULL) g_object_set_data(G_OBJECT(fbutton),"def_dir",(gpointer)def_dir);
+  gtk_container_add (GTK_CONTAINER (fbutton), image);
+#endif
+  return fbutton;
+}
+
+
+// utils
+
+
+LIVES_INLINE void lives_cursor_unref(LiVESXCursor *cursor) {
+#ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  g_object_unref(G_OBJECT(cursor));
+#else
+  gdk_cursor_unref(cursor);
+#endif
+#endif
+}
+
+
+LIVES_INLINE void lives_widget_apply_theme(LiVESWidget *widget, LiVESWidgetState state) {
+  lives_widget_set_fg_color(widget, state, &palette->normal_fore);
+  lives_widget_set_bg_color(widget, state, &palette->normal_back);
+}
+
+
+void lives_widget_get_bg_color(LiVESWidget *widget, LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+  lives_widget_get_bg_state_color(widget,LIVES_WIDGET_STATE_NORMAL,color);
+#endif
+}
+
+void lives_widget_get_fg_color(LiVESWidget *widget, LiVESWidgetColor *color) {
+#ifdef GUI_GTK
+  lives_widget_get_fg_state_color(widget,LIVES_WIDGET_STATE_NORMAL,color);
+#endif
+}
+
+void lives_widget_unparent(LiVESWidget *widget) {
+  lives_container_remove(LIVES_CONTAINER(lives_widget_get_parent(widget)),widget);
+}
+
+boolean label_act_toggle (LiVESWidget *widget, LiVESXEventButton *event, LiVESToggleButton *togglebutton) {
+  if (!lives_widget_is_sensitive(LIVES_WIDGET(togglebutton))) return FALSE;
+  lives_toggle_button_set_active (togglebutton, !lives_toggle_button_get_active(togglebutton));
+  return FALSE;
+}
+
+boolean widget_act_toggle (LiVESWidget *widget, LiVESToggleButton *togglebutton) {
+  if (!lives_widget_is_sensitive(LIVES_WIDGET(togglebutton))) return FALSE;
+  lives_toggle_button_set_active (togglebutton, TRUE);
+  return FALSE;
+}
+
+LIVES_INLINE void toggle_button_toggle (LiVESToggleButton *tbutton) {
+  if (lives_toggle_button_get_active(tbutton)) lives_toggle_button_set_active(tbutton,FALSE);
+  else lives_toggle_button_set_active(tbutton,FALSE);
+}
+
+
+void set_child_colour(LiVESWidget *widget, gpointer set_allx) {
+  boolean set_all=GPOINTER_TO_INT(set_allx);
+
+  if (!set_all&&GTK_IS_BUTTON(widget)) return;
+  if (GTK_IS_CONTAINER(widget)) {
+    gtk_container_forall(LIVES_CONTAINER(widget),set_child_colour,set_allx);
+    return;
+  }
+
+  if (set_all||GTK_IS_LABEL(widget)) {
+    lives_widget_apply_theme(widget, LIVES_WIDGET_STATE_NORMAL);
   }
-  else label = gtk_label_new (labeltext);
+}
+
+
+void set_button_width(LiVESWidget *buttonbox, LiVESWidget *button, int width) {
+#if !GTK_CHECK_VERSION(3,0,0)
+  gtk_button_box_set_child_size (GTK_BUTTON_BOX(buttonbox), width, -1);
+#else
+  gtk_widget_set_size_request(button,width*4,-1);
+#endif
+  gtk_button_box_set_layout (GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_SPREAD);
+}
+
+
+char *text_view_get_text(LiVESTextView *textview) {
+  GtkTextIter siter,eiter;
+  GtkTextBuffer *textbuf=gtk_text_view_get_buffer (textview);
+  gtk_text_buffer_get_start_iter(textbuf,&siter);
+  gtk_text_buffer_get_end_iter(textbuf,&eiter);
+
+  return gtk_text_buffer_get_text(textbuf,&siter,&eiter,FALSE);
+}
+
+
+void text_view_set_text(LiVESTextView *textview, const gchar *text, int len) {
+  GtkTextBuffer *textbuf=gtk_text_view_get_buffer (textview);
+  gtk_text_buffer_set_text(textbuf,text,len);
+}
 
-  eventbox=gtk_event_box_new();
-  gtk_tooltips_copy(eventbox,combo);
-  gtk_container_add(GTK_CONTAINER(eventbox),label);
-  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
 
-  if (palette->style&STYLE_1) {
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_fg(eventbox, GTK_STATE_NORMAL, &palette->normal_fore);
-    gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL, &palette->normal_back);
+int get_box_child_index (LiVESBox *box, LiVESWidget *tchild) {
+  GList *list=gtk_container_get_children(GTK_CONTAINER(box));
+  GtkWidget *child;
+  register int i=0;
+
+  while (list!=NULL) {
+    child=(GtkWidget *)list->data;
+    if (child==tchild) return i;
+    list=list->next;
+    i++;
   }
+  return -1;
+}
 
-  if (GTK_IS_HBOX(box)) hbox=GTK_WIDGET(box);
 
-  else {
-    hbox = gtk_hbox_new (TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 10);
+void lives_spin_button_configure(LiVESSpinButton *spinbutton,
+				 double value,
+				 double lower,
+				 double upper,
+				 double step_increment,
+				 double page_increment) {
+#ifdef GUI_GTK
+  GtkAdjustment *adjustment=gtk_spin_button_get_adjustment(spinbutton);
+#if GTK_CHECK_VERSION(2,14,0)
+  gtk_adjustment_configure(adjustment,value,lower,upper,step_increment,page_increment,0.);
+#else
+  g_object_freeze_notify (G_OBJECT(adjustment));
+  adjustment->upper=upper;
+  adjustment->lower=lower;
+  adjustment->value=value;
+  adjustment->step_increment=step_increment;
+  adjustment->page_increment=page_increment;
+  g_object_thaw_notify (G_OBJECT(adjustment));
+#endif
+#endif
+
+}
+
+
+
+
+///// lives specific functions
+
+void lives_widget_context_update(void) {
+#ifdef GUI_GTK
+  boolean mt_needs_idlefunc=FALSE;
+
+  if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) {
+    g_source_remove(mainw->multitrack->idlefunc);
+    mainw->multitrack->idlefunc=0;
+    mt_needs_idlefunc=TRUE;
   }
 
-  gtk_box_pack_start (GTK_BOX (hbox), eventbox, FALSE, FALSE, 10);
-  gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 10);
-  gtk_editable_set_editable (GTK_EDITABLE((GTK_COMBO (combo))->entry),FALSE);
-  gtk_entry_set_activates_default(GTK_ENTRY((GTK_COMBO(combo))->entry),TRUE);
+  while (!mainw->is_exiting&&g_main_context_iteration(NULL,FALSE));
 
-  combo_set_popdown_strings (GTK_COMBO (combo), list);
+  if (!mainw->is_exiting&&mt_needs_idlefunc) mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
 #endif
+}
 
-  return combo;
+
+
+void lives_set_cursor_style(lives_cursor_t cstyle, LiVESWidget *widget) {
+  LiVESXWindow *window;
+  GdkCursor *cursor=NULL;
+  GdkDisplay *disp;
+  GdkCursorType ctype=GDK_X_CURSOR;
+
+  if (widget==NULL) {
+    if (mainw->multitrack==NULL&&mainw->is_ready) {
+      if (cstyle!=LIVES_CURSOR_NORMAL&&mainw->cursor_style==cstyle) return;
+      window=lives_widget_get_xwindow(mainw->LiVES);
+    }
+    else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
+      if (cstyle!=LIVES_CURSOR_NORMAL&&mainw->multitrack->cursor_style==cstyle) return;
+      window=lives_widget_get_xwindow(mainw->multitrack->window);
+    }
+    else return;
+  }
+  else window=lives_widget_get_xwindow(widget);
+
+  if (!GDK_IS_WINDOW(window)) return;
+
+  switch(cstyle) {
+  case LIVES_CURSOR_NORMAL:
+    break;
+  case LIVES_CURSOR_BUSY:
+    ctype=GDK_WATCH;
+    break;
+  case LIVES_CURSOR_CENTER_PTR:
+    ctype=GDK_CENTER_PTR;
+    break;
+  case LIVES_CURSOR_HAND2:
+    ctype=GDK_HAND2;
+    break;
+  case LIVES_CURSOR_SB_H_DOUBLE_ARROW:
+    ctype=GDK_SB_H_DOUBLE_ARROW;
+    break;
+  case LIVES_CURSOR_CROSSHAIR:
+    ctype=GDK_CROSSHAIR;
+    break;
+  case LIVES_CURSOR_TOP_LEFT_CORNER:
+    ctype=GDK_TOP_LEFT_CORNER;
+    break;
+  case LIVES_CURSOR_BOTTOM_RIGHT_CORNER:
+    ctype=GDK_BOTTOM_RIGHT_CORNER;
+    break;
+  default:
+    return;
+  }
+  if (widget==NULL) {
+    if (mainw->multitrack!=NULL) mainw->multitrack->cursor_style=cstyle;
+    else mainw->cursor_style=cstyle;
+  }
+#if GTK_CHECK_VERSION(2,22,0)
+  cursor=gdk_window_get_cursor(window);
+  if (cursor!=NULL&&gdk_cursor_get_cursor_type(cursor)==ctype) return;
+  cursor=NULL;
+#endif
+  disp=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp;
+  if (cstyle!=LIVES_CURSOR_NORMAL) {
+    cursor=gdk_cursor_new_for_display(disp,ctype);
+    gdk_window_set_cursor (window, cursor);
+  }
+  else gdk_window_set_cursor(window,NULL);
+  if (cursor!=NULL) lives_cursor_unref(cursor);
+}
+
+
+
+
+void hide_cursor(LiVESXWindow *window) {
+  //make the cursor invisible in playback windows
+
+#if GTK_CHECK_VERSION(2,16,0)
+  if (GDK_IS_WINDOW(window)) {
+    GdkCursor *cursor=gdk_cursor_new(GDK_BLANK_CURSOR);
+    gdk_window_set_cursor(window,cursor);
+    lives_cursor_unref(cursor);
+  }
+#else
+  static GdkCursor *hidden_cursor=NULL;
+
+  char cursor_bits[] = {0x00};
+  char cursormask_bits[] = {0x00};
+  GdkPixmap *source, *mask;
+  GdkColor fg = { 0, 0, 0, 0 };
+  GdkColor bg = { 0, 0, 0, 0 };
+
+  if (hidden_cursor==NULL) {
+    source = gdk_bitmap_create_from_data (NULL, cursor_bits,
+					  1, 1);
+    mask = gdk_bitmap_create_from_data (NULL, cursormask_bits,
+					1, 1);
+    hidden_cursor = gdk_cursor_new_from_pixmap (source, mask, &fg, &bg, 0, 0);
+    g_object_unref (source);
+    g_object_unref (mask);
+  }
+  if (GDK_IS_WINDOW(window)) gdk_window_set_cursor (window, hidden_cursor);
+#endif 
+}
+
+
+void unhide_cursor(LiVESXWindow *window) {
+  if (GDK_IS_WINDOW(window)) gdk_window_set_cursor(window,NULL);
+}
+
+
+void get_border_size (LiVESWidget *win, int *bx, int *by) {
+  GdkRectangle rect;
+  gint wx,wy;
+  gdk_window_get_frame_extents (lives_widget_get_xwindow (win),&rect);
+  gdk_window_get_origin (lives_widget_get_xwindow (win), &wx, &wy);
+  *bx=wx-rect.x;
+  *by=wy-rect.y;
+}
+
+
+
+
+/*
+ * Set active string to the combo box
+ */
+void lives_combo_set_active_string(LiVESCombo *combo, const char *active_str) {
+
+#ifdef GUI_GTK
+  gtk_entry_set_text(GTK_ENTRY(lives_bin_get_child(LIVES_BIN(combo))),active_str);
+#endif
+
+}
+
+LiVESWidget *lives_combo_get_entry(LiVESCombo *widget) {
+  return lives_bin_get_child(LIVES_BIN(widget));
+}
+
+
+void lives_widget_set_can_focus_and_default(LiVESWidget *widget) {
+  lives_widget_set_can_focus(widget,TRUE);
+  lives_widget_set_can_default(widget,TRUE);
 }
+
+
+
+void lives_general_button_clicked (LiVESButton *button, LiVESObjectPtr data_to_free) {
+  // destroy the button top-level and free data
+
+#ifdef GUI_GTK
+  gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(button)));
+  lives_widget_context_update();
+
+  if (data_to_free!=NULL) g_free(data_to_free);
+#endif
+}
+
+
+LiVESWidget *add_hsep_to_box (LiVESBox *box) {
+  LiVESWidget *widget=NULL;
+#ifdef GUI_GTK
+  GtkWidget *hseparator = lives_hseparator_new ();
+  gtk_box_pack_start (box, hseparator, FALSE, FALSE, widget_opts.packing_height>>1);
+  if (!widget_opts.no_gui) 
+    gtk_widget_show(hseparator);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme(hseparator, LIVES_WIDGET_STATE_NORMAL);
+  }
+  widget=hseparator;
+#endif
+  return widget;
+}
+
+#ifdef GUI_GTK
+static gchar spaces[W_MAX_FILLER_LEN+1];
+static boolean spaces_inited=FALSE;
+#endif
+
+LiVESWidget *add_fill_to_box (LiVESBox *box) {
+  LiVESWidget *widget=NULL;
+#ifdef GUI_GTK
+  LiVESWidget *blank_label;
+  static gint old_spaces=-1;
+  static gchar *xspaces=NULL;
+
+  if (!spaces_inited) {
+    register int i;
+    for (i=0;i<W_MAX_FILLER_LEN;i++) {
+      g_snprintf(spaces+i,1," ");
+    }
+  }
+
+  if (widget_opts.filler_len>W_MAX_FILLER_LEN||widget_opts.filler_len<0) return NULL;
+
+  if (widget_opts.filler_len!=old_spaces) {
+    if (xspaces!=NULL) g_free(xspaces);
+    xspaces=g_strndup(spaces,widget_opts.filler_len);
+    old_spaces=widget_opts.filler_len;
+  }
+
+  blank_label = lives_standard_label_new (xspaces);
+
+  gtk_box_pack_start (box, blank_label, TRUE, TRUE, 0);
+  lives_widget_set_hexpand(blank_label,TRUE);
+  if (!widget_opts.no_gui) 
+    gtk_widget_show(blank_label);
+  widget=blank_label;
+
+#endif
+  return widget;
+}
+
+
+
+

LiVES-1.6.1.tar.bz2/src/widget-helper.h -> LiVES-2.0.3.tar.bz2/src/widget-helper.h Changed

@@ -1,33 +1,435 @@
 // widget-helper.h
 // LiVES
-// (c) G. Finch 2012 <salsaman@gmail.com>
+// (c) G. Finch 2012 - 2013 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
 #ifndef HAS_LIVES_WIDGET_HELPER_H
 #define HAS_LIVES_WIDGET_HELPER_H
 
+#ifndef M_PI
+#define M_PI 3.1415926536
+#endif
+
+typedef enum {
+  LIVES_DISPLAY_TYPE_UNKNOWN=0,
+  LIVES_DISPLAY_TYPE_X11,
+  LIVES_DISPLAY_TYPE_WIN32
+} lives_display_t;
+
+
+#define W_PACKING_WIDTH  10 // packing width for widgets with labels
+#define W_PACKING_HEIGHT 10 // packing height for widgets
+#define W_BORDER_WIDTH   10 // default border width
+
+
+#ifdef PAINTER_CAIRO
+typedef cairo_t lives_painter_t;
+typedef cairo_surface_t lives_painter_surface_t;
+
+typedef cairo_format_t lives_painter_format_t;
+
+#define LIVES_PAINTER_FORMAT_A1   CAIRO_FORMAT_A1
+#define LIVES_PAINTER_FORMAT_A8   CAIRO_FORMAT_A8
+#define LIVES_PAINTER_FORMAT_ARGB32 CAIRO_FORMAT_ARGB32
+
+
+typedef cairo_content_t lives_painter_content_t; // eg. color, alpha, color+alpha
+
+#define LIVES_PAINTER_CONTENT_COLOR CAIRO_CONTENT_COLOR
+
+
+typedef cairo_operator_t lives_painter_operator_t;
+
+#define LIVES_PAINTER_OPERATOR_UNKNOWN CAIRO_OPERATOR_OVER
+#define LIVES_PAINTER_OPERATOR_DEFAULT CAIRO_OPERATOR_OVER
+
+#define LIVES_PAINTER_OPERATOR_DEST_OUT CAIRO_OPERATOR_DEST_OUT
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
+#define LIVES_PAINTER_OPERATOR_DIFFERENCE CAIRO_OPERATOR_OVER
+#else
+#define LIVES_PAINTER_OPERATOR_DIFFERENCE CAIRO_OPERATOR_DIFFERENCE
+#endif
+
+typedef cairo_fill_rule_t lives_painter_fill_rule_t;
+
+#define LIVES_PAINTER_FILL_RULE_WINDING  CAIRO_FILL_RULE_WINDING 
+#define LIVES_PAINTER_FILL_RULE_EVEN_ODD CAIRO_FILL_RULE_EVEN_ODD 
+
+
+#endif
+
+
 #ifdef GUI_GTK
+
+#ifndef G_ENCODE_VERSION
+#define G_ENCODE_VERSION(major,minor) ((major) << 16 | (minor) << 8)
+#endif
+
+#define return_true gtk_true
+
+typedef GtkJustification LiVESJustification;
+
+#define LIVES_JUSTIFY_LEFT   GTK_JUSTIFY_LEFT
+#define LIVES_JUSTIFY_RIGHT  GTK_JUSTIFY_RIGHT
+#define LIVES_JUSTIFY_CENTER GTK_JUSTIFY_CENTER
+#define LIVES_JUSTIFY_FILL   GTK_JUSTIFY_RIGHT
+
+typedef GtkOrientation LiVESOrientation;
+#define LIVES_ORIENTATION_HORIZONTAL GTK_ORIENTATION_HORIZONTAL
+#define LIVES_ORIENTATION_VERTICAL   GTK_ORIENTATION_VERTICAL
+
+typedef GdkEvent                          LiVESXEvent;
+typedef GdkDisplay                        LiVESXDisplay;
+typedef GdkScreen                         LiVESXScreen;
+typedef GdkDevice                         LiVESXDevice;
+
+#if GTK_CHECK_VERSION(3,0,0)
+typedef GdkDeviceManager                  LiVESXDeviceManager;
+#endif
+
+#if GTK_CHECK_VERSION(3,0,0)
+#define LIVES_WIDGET_EVENT_EXPOSE_EVENT "draw"
+#define GTK_OBJECT(a)                     a
+#else
 typedef GtkObject                         LiVESObject;
+#define LIVES_WIDGET_EVENT_EXPOSE_EVENT "expose_event"
+#endif
 typedef GtkWidget                         LiVESWidget;
+typedef GtkContainer                      LiVESContainer;
+typedef GtkBin                            LiVESBin;
 typedef GtkDialog                         LiVESDialog;
 typedef GtkBox                            LiVESBox;
+typedef GtkComboBox                       LiVESCombo;
+typedef GtkComboBox                       LiVESComboBox;
+typedef GtkButton                         LiVESButton;
+typedef GtkToggleButton                   LiVESToggleButton;
+typedef GtkTextView                       LiVESTextView;
+typedef GtkEntry                          LiVESEntry;
+typedef GtkRadioButton                    LiVESRadioButton;
+typedef GtkSpinButton                     LiVESSpinButton;
+typedef GtkLabel                          LiVESLabel;
+typedef GtkFileChooser                    LiVESFileChooser;
+typedef GtkImageMenuItem                  LiVESImageMenuItem;
+typedef GtkTreeView                       LiVESTreeView;
+typedef GtkTreeModel                      LiVESTreeModel;
+
+#if GTK_CHECK_VERSION(2,14,0)
+typedef GtkScaleButton                    LiVESScaleButton;
+#else
+typedef GtkRange                          LiVESScaleButton;
+#endif
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+#define LIVES_WIDGET_COLOR_HAS_ALPHA (1)
+#define LIVES_WIDGET_COLOR_SCALE(x) (x) ///< macro to get 0. to 1.
+#define LIVES_WIDGET_COLOR_SCALE_255(x) ((double)x/255.) ///< macro to convert 0. - 255. to component
+typedef GdkRGBA                           LiVESWidgetColor;
+typedef GtkStateFlags LiVESWidgetState;
+
+#define LIVES_WIDGET_STATE_NORMAL         GTK_STATE_FLAG_NORMAL
+#define LIVES_WIDGET_STATE_ACTIVE         GTK_STATE_FLAG_ACTIVE
+#define LIVES_WIDGET_STATE_PRELIGHT       GTK_STATE_FLAG_PRELIGHT
+#define LIVES_WIDGET_STATE_SELECTED       GTK_STATE_FLAG_SELECTED
+#define LIVES_WIDGET_STATE_INSENSITIVE    GTK_STATE_FLAG_INSENSITIVE
+#define LIVES_WIDGET_STATE_INCONSISTENT   GTK_STATE_FLAG_INCONSISTENT
+#define LIVES_WIDGET_STATE_FOCUSED        GTK_STATE_FLAG_FOCUSED
+#define LIVES_WIDGET_STATE_BACKDROP       GTK_STATE_FLAG_BACKDROP
+
+#else
+#define LIVES_WIDGET_COLOR_HAS_ALPHA (0)
+#define LIVES_WIDGET_COLOR_SCALE(x) ((double)x/65535.)     ///< macro to get 0. to 1.
+#define LIVES_WIDGET_COLOR_SCALE_255(x) ((int)((double)x*256.+.5))     ///< macro to get 0 - 255
+typedef GdkColor                          LiVESWidgetColor;
+typedef GtkStateType LiVESWidgetState;
+
+#define LIVES_WIDGET_STATE_NORMAL         GTK_STATE_NORMAL
+#define LIVES_WIDGET_STATE_ACTIVE         GTK_STATE_ACTIVE
+#define LIVES_WIDGET_STATE_PRELIGHT       GTK_STATE_PRELIGHT
+#define LIVES_WIDGET_STATE_SELECTED       GTK_STATE_SELECTED
+#define LIVES_WIDGET_STATE_INSENSITIVE    GTK_STATE_INSENSITIVE
+#define LIVES_WIDGET_STATE_INCONSISTENT   GTK_STATE_INSENSITIVE+1
+#define LIVES_WIDGET_STATE_FOCUSED        GTK_STATE_INSENSITIVE+2
+#define LIVES_WIDGET_STATE_BACKDROP       GTK_STATE_INSENSITIVE+3
+#endif
+
+typedef enum {
+  LIVES_FILE_CHOOSER_ACTION_OPEN=GTK_FILE_CHOOSER_ACTION_OPEN,
+  LIVES_FILE_CHOOSER_ACTION_SAVE=GTK_FILE_CHOOSER_ACTION_SAVE,
+  LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER=GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+  LIVES_FILE_CHOOSER_ACTION_CREATE_FOLDER=GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,
+  LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE
+} lives_file_chooser_action_t;
+
+
+typedef enum {
+  LIVES_ICON_SIZE_INVALID=GTK_ICON_SIZE_INVALID,
+  LIVES_ICON_SIZE_MENU=GTK_ICON_SIZE_MENU,
+  LIVES_ICON_SIZE_SMALL_TOOLBAR=GTK_ICON_SIZE_SMALL_TOOLBAR,
+  LIVES_ICON_SIZE_LARGE_TOOLBAR=GTK_ICON_SIZE_LARGE_TOOLBAR,
+  LIVES_ICON_SIZE_BUTTON=GTK_ICON_SIZE_BUTTON,
+  LIVES_ICON_SIZE_DND=GTK_ICON_SIZE_DND,
+  LIVES_ICON_SIZE_DIALOG=GTK_ICON_SIZE_DIALOG
+} lives_icon_size_t;
+
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+typedef GtkScale                          LiVESRuler;
+#else
+typedef GtkRuler                          LiVESRuler;
+#endif
+
+typedef GtkRange                          LiVESRange;
+
+typedef GtkAdjustment                     LiVESAdjustment;
 
 typedef GdkPixbuf                         LiVESPixbuf;
 
+typedef GdkWindow                         LiVESXWindow;
+
+typedef GdkEventButton                    LiVESXEventButton;
+
+typedef GdkCursor                         LiVESXCursor;
+
+typedef GError                            LiVESError;
+
+#ifndef IS_MINGW
 typedef gboolean                          boolean;
+#endif
+
 typedef GList                             LiVESList;
 typedef GSList                            LiVESSList;
 
+typedef GtkAccelGroup                     LiVESAccelGroup;
 
 typedef GdkPixbufDestroyNotify            LiVESPixbufDestroyNotify;
 
 typedef GdkInterpType                     LiVESInterpType;
 
+typedef gpointer                          LiVESObjectPtr;
+
+#define LIVES_WIDGET(widget) GTK_WIDGET(widget)
+#define LIVES_PIXBUF(widget) GDK_PIXBUF(widget)
+#define LIVES_WINDOW(widget) GTK_WINDOW(widget)
+#define LIVES_XWINDOW(widget) GDK_WINDOW(widget)
+#define LIVES_BOX(widget) GTK_BOX(widget)
+#define LIVES_ENTRY(widget) GTK_ENTRY(widget)
+#define LIVES_CONTAINER(widget) GTK_CONTAINER(widget)
+#define LIVES_BIN(widget) GTK_BIN(widget)
+#define LIVES_ADJUSTMENT(widget) GTK_ADJUSTMENT(widget)
+#define LIVES_DIALOG(widget) GTK_DIALOG(widget)
+#define LIVES_COMBO(widget) GTK_COMBO_BOX(widget)
+#define LIVES_COMBO_BOX(widget) GTK_COMBO_BOX(widget)
+#define LIVES_BUTTON(widget) GTK_BUTTON(widget)
+#define LIVES_LABEL(widget) GTK_LABEL(widget)
+#define LIVES_FILES_CHOOSER(widget) GTK_FILE_CHOOSER(widget)
+#define LIVES_RADIO_BUTTON(widget) GTK_RADIO_BUTTON(widget)
+#define LIVES_SPIN_BUTTON(widget) GTK_SPIN_BUTTON(widget)
+#define LIVES_IMAGE_MENU_ITEM(widget) GTK_IMAGE_MENU_ITEM(widget)
+#define LIVES_FILE_CHOOSER(widget) GTK_FILE_CHOOSER(widget)
+
+#if GTK_CHECK_VERSION(2,14,0)
+#define LIVES_SCALE_BUTTON(widget) GTK_SCALE_BUTTON(widget)
+#else
+#define LIVES_SCALE_BUTTON(widget) GTK_RANGE(widget)
+#endif
+
+#define LIVES_TOGGLE_BUTTON(widget) GTK_TOGGLE_BUTTON(widget)
+#define LIVES_TREE_VIEW(widget) GTK_TREE_VIEW(widget)
+#define LIVES_TEXT_VIEW(widget) GTK_TEXT_VIEW(widget)
+
+#if GTK_CHECK_VERSION(3,0,0)
+#define LIVES_RULER(widget) GTK_SCALE(widget)
+#define LIVES_ORIENTABLE(widget) GTK_ORIENTABLE(widget)
+#else
+#define LIVES_RULER(widget) GTK_RULER(widget)
+#endif
+
+#define LIVES_RANGE(widget) GTK_RANGE(widget)
+
+#define LIVES_XEVENT(event) GDK_EVENT(event)
+
+#define LIVES_IS_WIDGET(widget) GTK_IS_WIDGET(widget)
+#if GTK_CHECK_VERSION(3,0,0)
+#define LIVES_IS_HBOX(widget) (GTK_IS_BOX(widget)&&gtk_orientable_get_orientation(GTK_ORIENTABLE(widget))==GTK_ORIENTATION_HORIZONTAL)
+#define LIVES_IS_VBOX(widget) (GTK_IS_BOX(widget)&&gtk_orientable_get_orientation(GTK_ORIENTABLE(widget))==GTK_ORIENTATION_HORIZONTAL)
+#else
+#define LIVES_IS_HBOX(widget) GTK_IS_HBOX(widget)
+#define LIVES_IS_VBOX(widget) GTK_IS_VBOX(widget)
+#endif
+#define LIVES_IS_COMBO(widget) GTK_IS_COMBO_BOX(widget)
+#define LIVES_IS_BUTTON(widget) GTK_IS_BUTTON(widget)
+
 #define LIVES_INTERP_BEST   GDK_INTERP_HYPER
 #define LIVES_INTERP_NORMAL GDK_INTERP_BILINEAR
 #define LIVES_INTERP_FAST   GDK_INTERP_NEAREST
 
+typedef GLogLevelFlags LiVESLogLevelFlags;
+
+#define LIVES_LOG_LEVEL_WARNING G_LOG_LEVEL_WARNING
+#define LIVES_LOG_LEVEL_MASK G_LOG_LEVEL_MASK
+#define LIVES_LOG_LEVEL_CRITICAL G_LOG_LEVEL_CRITICAL
+#define LIVES_LOG_FATAL_MASK G_LOG_FATAL_MASK
+
+typedef GdkModifierType LiVESModifierType;
+
+#define LIVES_CONTROL_MASK GDK_CONTROL_MASK
+#define LIVES_ALT_MASK     GDK_MOD1_MASK
+#define LIVES_SHIFT_MASK   GDK_SHIFT_MASK
+#define LIVES_LOCK_MASK    GDK_LOCK_MASK
+
+#ifdef GDK_KEY_a
+#define LIVES_KEY_Left GDK_KEY_Left
+#define LIVES_KEY_Right GDK_KEY_Right
+#define LIVES_KEY_Up GDK_KEY_Up
+#define LIVES_KEY_Down GDK_KEY_Down
+
+#define LIVES_KEY_Space GDK_KEY_space
+#define LIVES_KEY_BackSpace GDK_KEY_BackSpace
+#define LIVES_KEY_Return GDK_KEY_Return
+#define LIVES_KEY_Tab GDK_KEY_Tab
+#define LIVES_KEY_Home GDK_KEY_Home
+#define LIVES_KEY_End GDK_KEY_End
+#define LIVES_KEY_Slash GDK_KEY_slash
+#define LIVES_KEY_Space GDK_KEY_space
+#define LIVES_KEY_Plus GDK_KEY_plus
+#define LIVES_KEY_Minus GDK_KEY_minus
+#define LIVES_KEY_Equal GDK_KEY_equal
+
+#define LIVES_KEY_1 GDK_KEY_1
+#define LIVES_KEY_2 GDK_KEY_2
+#define LIVES_KEY_3 GDK_KEY_3
+#define LIVES_KEY_4 GDK_KEY_4
+#define LIVES_KEY_5 GDK_KEY_5
+#define LIVES_KEY_6 GDK_KEY_6
+#define LIVES_KEY_7 GDK_KEY_7
+#define LIVES_KEY_8 GDK_KEY_8
+#define LIVES_KEY_9 GDK_KEY_9
+#define LIVES_KEY_0 GDK_KEY_0
+
+#define LIVES_KEY_a GDK_KEY_a
+#define LIVES_KEY_b GDK_KEY_b
+#define LIVES_KEY_c GDK_KEY_c
+#define LIVES_KEY_d GDK_KEY_d
+#define LIVES_KEY_e GDK_KEY_e
+#define LIVES_KEY_f GDK_KEY_f
+#define LIVES_KEY_g GDK_KEY_g
+#define LIVES_KEY_h GDK_KEY_h
+#define LIVES_KEY_i GDK_KEY_i
+#define LIVES_KEY_j GDK_KEY_j
+#define LIVES_KEY_k GDK_KEY_k
+#define LIVES_KEY_l GDK_KEY_l
+#define LIVES_KEY_m GDK_KEY_m
+#define LIVES_KEY_n GDK_KEY_n
+#define LIVES_KEY_o GDK_KEY_o
+#define LIVES_KEY_p GDK_KEY_p
+#define LIVES_KEY_q GDK_KEY_q
+#define LIVES_KEY_r GDK_KEY_r
+#define LIVES_KEY_s GDK_KEY_s
+#define LIVES_KEY_t GDK_KEY_t
+#define LIVES_KEY_u GDK_KEY_u
+#define LIVES_KEY_v GDK_KEY_v
+#define LIVES_KEY_w GDK_KEY_w
+#define LIVES_KEY_x GDK_KEY_x
+#define LIVES_KEY_y GDK_KEY_y
+#define LIVES_KEY_z GDK_KEY_z
+
+#define LIVES_KEY_F1 GDK_KEY_F1
+#define LIVES_KEY_F2 GDK_KEY_F2
+#define LIVES_KEY_F3 GDK_KEY_F3
+#define LIVES_KEY_F4 GDK_KEY_F4
+#define LIVES_KEY_F5 GDK_KEY_F5
+#define LIVES_KEY_F6 GDK_KEY_F6
+#define LIVES_KEY_F7 GDK_KEY_F7
+#define LIVES_KEY_F8 GDK_KEY_F8
+#define LIVES_KEY_F9 GDK_KEY_F9
+#define LIVES_KEY_F10 GDK_KEY_F10
+#define LIVES_KEY_F11 GDK_KEY_F11
+#define LIVES_KEY_F12 GDK_KEY_F12
+
+#define LIVES_KEY_Page_Up GDK_KEY_Page_Up
+#define LIVES_KEY_Page_Down GDK_KEY_Page_Down
+
+#define LIVES_KEY_Escape GDK_KEY_Escape
+
+#else
+#define LIVES_KEY_Left GDK_Left
+#define LIVES_KEY_Right GDK_Right
+#define LIVES_KEY_Up GDK_Up
+#define LIVES_KEY_Down GDK_Down
+
+#define LIVES_KEY_Space GDK_space
+#define LIVES_KEY_BackSpace GDK_BackSpace
+#define LIVES_KEY_Return GDK_Return
+#define LIVES_KEY_Tab GDK_Tab
+#define LIVES_KEY_Home GDK_Home
+#define LIVES_KEY_End GDK_End
+#define LIVES_KEY_Slash GDK_slash
+#define LIVES_KEY_Space GDK_space
+#define LIVES_KEY_Plus GDK_plus
+#define LIVES_KEY_Minus GDK_minus
+#define LIVES_KEY_Equal GDK_equal
+
+#define LIVES_KEY_1 GDK_1
+#define LIVES_KEY_2 GDK_2
+#define LIVES_KEY_3 GDK_3
+#define LIVES_KEY_4 GDK_4
+#define LIVES_KEY_5 GDK_5
+#define LIVES_KEY_6 GDK_6
+#define LIVES_KEY_7 GDK_7
+#define LIVES_KEY_8 GDK_8
+#define LIVES_KEY_9 GDK_9
+#define LIVES_KEY_0 GDK_0
+
+#define LIVES_KEY_a GDK_a
+#define LIVES_KEY_b GDK_b
+#define LIVES_KEY_c GDK_c
+#define LIVES_KEY_d GDK_d
+#define LIVES_KEY_e GDK_e
+#define LIVES_KEY_f GDK_f
+#define LIVES_KEY_g GDK_g
+#define LIVES_KEY_h GDK_h
+#define LIVES_KEY_i GDK_i
+#define LIVES_KEY_j GDK_j
+#define LIVES_KEY_k GDK_k
+#define LIVES_KEY_l GDK_l
+#define LIVES_KEY_m GDK_m
+#define LIVES_KEY_n GDK_n
+#define LIVES_KEY_o GDK_o
+#define LIVES_KEY_p GDK_p
+#define LIVES_KEY_q GDK_q
+#define LIVES_KEY_r GDK_r
+#define LIVES_KEY_s GDK_s
+#define LIVES_KEY_t GDK_t
+#define LIVES_KEY_u GDK_u
+#define LIVES_KEY_v GDK_v
+#define LIVES_KEY_w GDK_w
+#define LIVES_KEY_x GDK_x
+#define LIVES_KEY_y GDK_y
+#define LIVES_KEY_z GDK_z
+
+#define LIVES_KEY_F1 GDK_F1
+#define LIVES_KEY_F2 GDK_F2
+#define LIVES_KEY_F3 GDK_F3
+#define LIVES_KEY_F4 GDK_F4
+#define LIVES_KEY_F5 GDK_F5
+#define LIVES_KEY_F6 GDK_F6
+#define LIVES_KEY_F7 GDK_F7
+#define LIVES_KEY_F8 GDK_F8
+#define LIVES_KEY_F9 GDK_F9
+#define LIVES_KEY_F10 GDK_F10
+#define LIVES_KEY_F11 GDK_F11
+#define LIVES_KEY_F12 GDK_F12
+
+#define LIVES_KEY_Page_Up GDK_Page_Up
+#define LIVES_KEY_Page_Down GDK_Page_Down
+
+#define LIVES_KEY_Escape GDK_Escape
+
+#endif
+
 #endif
 
 
@@ -45,7 +447,7 @@
 
 #define LIVES_INTERP_BEST   Qt::SmoothTransformation
 #define LIVES_INTERP_NORMAL Qt::SmoothTransformation
-#define LIVES_INTERP_BEST   Qt::FastTransformation
+#define LIVES_INTERP_FAST   Qt::FastTransformation
 
 
 #endif
@@ -65,41 +467,380 @@
 
 // basic functions (wrappers for Toolkit functions)
 
+// lives_painter_functions
+
+lives_painter_t *lives_painter_create(lives_painter_surface_t *target);
+lives_painter_t *lives_painter_create_from_widget(LiVESWidget *);
+void lives_painter_set_source_pixbuf (lives_painter_t *, const LiVESPixbuf *, double pixbuf_x, double pixbuf_y);
+void lives_painter_set_source_surface (lives_painter_t *, lives_painter_surface_t *, double x, double y);
+lives_painter_surface_t *lives_painter_image_surface_create(lives_painter_format_t format, int width, int height);
+lives_painter_surface_t *lives_painter_image_surface_create_for_data(uint8_t *data, lives_painter_format_t, 
+								     int width, int height, int stride);
+lives_painter_surface_t *lives_painter_surface_create_from_widget(LiVESWidget *, lives_painter_content_t, 
+								  int width, int height);
+void lives_painter_surface_flush(lives_painter_surface_t *);
+
+void lives_painter_destroy(lives_painter_t *);
+void lives_painter_surface_destroy(lives_painter_surface_t *);
+
+void lives_painter_new_path(lives_painter_t *);
+
+void lives_painter_paint(lives_painter_t *);
+void lives_painter_fill(lives_painter_t *);
+void lives_painter_stroke(lives_painter_t *);
+void lives_painter_clip(lives_painter_t *);
 
-int lives_pixbuf_get_width(const LiVESPixbuf *pixbuf);
-int lives_pixbuf_get_height(const LiVESPixbuf *pixbuf);
-int lives_pixbuf_get_has_alpha(const LiVESPixbuf *pixbuf);
-int lives_pixbuf_get_rowstride(const LiVESPixbuf *pixbuf);
-int lives_pixbuf_get_n_channels(const LiVESPixbuf *pixbuf);
-guchar *lives_pixbuf_get_pixels(const LiVESPixbuf *pixbuf);
-const guchar *lives_pixbuf_get_pixels_readonly(const LiVESPixbuf *pixbuf);
+void lives_painter_set_source_rgb(lives_painter_t *, double red, double green, double blue);
+void lives_painter_set_source_rgba(lives_painter_t *, double red, double green, double blue, double alpha);
+
+void lives_painter_set_line_width(lives_painter_t *, double width);
+
+void lives_painter_translate(lives_painter_t *, double x, double y);
+
+void lives_painter_rectangle(lives_painter_t *, double x, double y, double width, double height);
+void lives_painter_arc(lives_painter_t *, double xc, double yc, double radius, double angle1, double angle2);
+void lives_painter_line_to(lives_painter_t *, double x, double y);
+void lives_painter_move_to(lives_painter_t *, double x, double y);
+
+boolean lives_painter_set_operator(lives_painter_t *, lives_painter_operator_t);
+
+void lives_painter_set_fill_rule(lives_painter_t *, lives_painter_fill_rule_t);
+
+
+lives_painter_surface_t *lives_painter_get_target(lives_painter_t *);
+int lives_painter_format_stride_for_width(lives_painter_format_t, int width);
+
+uint8_t *lives_painter_image_surface_get_data(lives_painter_surface_t *);
+int lives_painter_image_surface_get_width(lives_painter_surface_t *);
+int lives_painter_image_surface_get_height(lives_painter_surface_t *);
+int lives_painter_image_surface_get_stride(lives_painter_surface_t *);
+lives_painter_format_t lives_painter_image_surface_get_format(lives_painter_surface_t *);
+
+
+
+
+// utils
+
+
+// object funcs.
+
+void lives_object_unref(LiVESObjectPtr);
+
+
+// lives_pixbuf functions
+
+int lives_pixbuf_get_width(const LiVESPixbuf *);
+int lives_pixbuf_get_height(const LiVESPixbuf *);
+boolean lives_pixbuf_get_has_alpha(const LiVESPixbuf *);
+int lives_pixbuf_get_rowstride(const LiVESPixbuf *);
+int lives_pixbuf_get_n_channels(const LiVESPixbuf *);
+unsigned char *lives_pixbuf_get_pixels(const LiVESPixbuf *);
+const unsigned char *lives_pixbuf_get_pixels_readonly(const LiVESPixbuf *);
 LiVESPixbuf *lives_pixbuf_new(boolean has_alpha, int width, int height);
 LiVESPixbuf *lives_pixbuf_new_from_data (const unsigned char *buf, boolean has_alpha, int width, int height, 
 					 int rowstride, LiVESPixbufDestroyNotify lives_free_buffer_fn, 
 					 gpointer destroy_fn_data);
 
-LiVESPixbuf *lives_pixbuf_new_from_file(const char *filename, GError **error);
+LiVESPixbuf *lives_pixbuf_new_from_file(const char *filename, LiVESError **error);
 LiVESPixbuf *lives_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, boolean preserve_aspect_ratio,
-						 GError **error);
+						 LiVESError **error);
 
 
 LiVESPixbuf *lives_pixbuf_scale_simple(const LiVESPixbuf *src, int dest_width, int dest_height, 
 				       LiVESInterpType interp_type);
 
+// basic widget fns
+
+void lives_widget_set_bg_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
+void lives_widget_set_fg_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
+void lives_widget_set_text_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
+void lives_widget_set_base_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
+
+void lives_widget_get_fg_state_color(LiVESWidget *, LiVESWidgetState state, LiVESWidgetColor *);
+void lives_widget_get_bg_state_color(LiVESWidget *, LiVESWidgetState state, LiVESWidgetColor *);
+
+boolean lives_color_parse(const char *spec, LiVESWidgetColor *);
+
+LiVESWidgetColor *lives_widget_color_copy(LiVESWidgetColor *c1orNULL, const LiVESWidgetColor *c2);
 
-LiVESWidget *lives_dialog_get_content_area(LiVESDialog *dialog);
+LiVESWidget *lives_image_new_from_stock(const char *stock_id, lives_icon_size_t size);
+
+LiVESWidget *lives_dialog_get_content_area(LiVESDialog *);
+LiVESWidget *lives_dialog_get_action_area(LiVESDialog *);
+
+LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper, 
+						   double step_increment, double page_increment, double page_size);
+
+void lives_box_set_homogeneous(LiVESBox *, boolean homogeneous);
+void lives_box_set_spacing(LiVESBox *, int spacing);
+
+LiVESWidget *lives_hbox_new(boolean homogeneous, int spacing);
+LiVESWidget *lives_vbox_new(boolean homogeneous, int spacing);
+
+LiVESWidget *lives_hseparator_new(void);
+LiVESWidget *lives_vseparator_new(void);
+
+LiVESWidget *lives_hbutton_box_new(void);
+LiVESWidget *lives_vbutton_box_new(void);
+
+LiVESWidget *lives_hscale_new(LiVESAdjustment *);
+LiVESWidget *lives_vscale_new(LiVESAdjustment *);
+
+LiVESWidget *lives_hpaned_new(void);
+LiVESWidget *lives_vpaned_new(void);
+
+LiVESWidget *lives_hscrollbar_new(LiVESAdjustment *);
+LiVESWidget *lives_vscrollbar_new(LiVESAdjustment *);
+
+LiVESWidget *lives_combo_new(void);
+LiVESWidget *lives_combo_new_with_model (LiVESTreeModel *model);
+
+void lives_combo_append_text(LiVESCombo *, const char *text);
+void lives_combo_set_entry_text_column(LiVESCombo *, int column);
+
+char *lives_combo_get_active_text(LiVESCombo *) WARN_UNUSED;
+void lives_combo_set_active_text(LiVESCombo *, const char *text);
+
+void lives_combo_set_active_string(LiVESCombo *, const char *active_str);
+
+LiVESWidget *lives_combo_get_entry(LiVESCombo *);
+
+void lives_combo_populate(LiVESCombo *, LiVESList *list);
+
+boolean lives_toggle_button_get_active(LiVESToggleButton *);
+void lives_toggle_button_set_active(LiVESToggleButton *, boolean active);
+
+void lives_tooltips_set (LiVESWidget *, const char *tip_text);
+
+LiVESSList *lives_radio_button_get_group(LiVESRadioButton *);
+
+LiVESWidget *lives_widget_get_parent(LiVESWidget *);
+
+LiVESXWindow *lives_widget_get_xwindow(LiVESWidget *);
+
+void lives_widget_set_can_focus(LiVESWidget *, boolean state);
+void lives_widget_set_can_default(LiVESWidget *, boolean state);
+
+void lives_container_remove(LiVESContainer *, LiVESWidget *);
+
+double lives_ruler_get_value(LiVESRuler *);
+double lives_ruler_set_value(LiVESRuler *, double value);
+
+void lives_ruler_set_range(LiVESRuler *, double lower, double upper, double position, double max_size);
+double lives_ruler_set_upper(LiVESRuler *, double value);
+double lives_ruler_set_lower(LiVESRuler *, double value);
+
+int lives_widget_get_allocation_x(LiVESWidget *);
+int lives_widget_get_allocation_y(LiVESWidget *);
+int lives_widget_get_allocation_width(LiVESWidget *);
+int lives_widget_get_allocation_height(LiVESWidget *);
+
+void lives_widget_set_state(LiVESWidget *, LiVESWidgetState state);
+LiVESWidgetState lives_widget_get_state(LiVESWidget *widget);
+
+LiVESWidget *lives_bin_get_child(LiVESBin *);
+
+boolean lives_widget_is_sensitive(LiVESWidget *);
+boolean lives_widget_is_visible(LiVESWidget *);
+boolean lives_widget_is_realized(LiVESWidget *);
+
+
+double lives_adjustment_get_upper(LiVESAdjustment *);
+double lives_adjustment_get_lower(LiVESAdjustment *);
+double lives_adjustment_get_page_size(LiVESAdjustment *);
+
+void lives_adjustment_set_upper(LiVESAdjustment *, double upper);
+void lives_adjustment_set_lower(LiVESAdjustment *, double lower);
+void lives_adjustment_set_page_size(LiVESAdjustment *, double page_size);
+
+LiVESAdjustment *lives_tree_view_get_hadjustment(LiVESTreeView *);
+
+const char *lives_label_get_text(LiVESLabel *);
+
+void lives_entry_set_editable(LiVESEntry *, boolean editable);
+
+double lives_scale_button_get_value(LiVESScaleButton *);
+
+void lives_widget_get_pointer(LiVESXDevice *, LiVESWidget *, int *x, int *y);
+LiVESXWindow *lives_display_get_window_at_pointer (LiVESXDevice *, LiVESXDisplay *, int *win_x, int *win_y);
+void lives_display_get_pointer (LiVESXDevice *, LiVESXDisplay *, LiVESXScreen **, int *x, int *y, LiVESModifierType *mask);
+void lives_display_warp_pointer (LiVESXDevice *, LiVESXDisplay *, LiVESXScreen *, int x, int y);
+
+LiVESXDisplay *lives_widget_get_display(LiVESWidget *);
+lives_display_t lives_widget_get_display_type(LiVESWidget *widget);
+
+uint64_t lives_widget_get_xwinid(LiVESWidget *, const gchar *failure_msg);
+
+
+// optional (return TRUE if implemented)
+
+boolean lives_dialog_set_has_separator(LiVESDialog *, boolean has);
+boolean lives_widget_set_hexpand(LiVESWidget *, boolean state);
+boolean lives_widget_set_vexpand(LiVESWidget *, boolean state);
+boolean lives_image_menu_item_set_always_show_image(LiVESImageMenuItem *, boolean show);
+boolean lives_scale_button_set_orientation(LiVESScaleButton *, LiVESOrientation orientation);
 
 // compound functions (composed of basic functions)
 
+void lives_painter_set_source_to_bg(lives_painter_t *, LiVESWidget *);
 
-LiVESWidget *lives_standard_check_button_new(const char *label, boolean use_mnemonic, LiVESBox *box, const char *tooltip);
+LiVESWidget *lives_standard_label_new(const char *text);
+LiVESWidget *lives_standard_label_new_with_mnemonic(const char *text, LiVESWidget *mnemonic_widget);
+
+LiVESWidget *lives_standard_check_button_new(const char *labeltext, boolean use_mnemonic, LiVESBox *box, const char *tooltip);
 LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup, 
-					     LiVESBox *box, const char *tooltips);
+					     LiVESBox *, const char *tooltip);
 LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min, 
-					    double max, double step, double page, int dp, LiVESBox *box, 
+					    double max, double step, double page, int dp, LiVESBox *, 
 					    const char *tooltip);
-LiVESWidget *lives_standard_combo_new (const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *box, 
+LiVESWidget *lives_standard_combo_new (const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *, 
 				       const char *tooltip);
 
+LiVESWidget *lives_standard_entry_new(const char *labeltext, boolean use_mnemonic, const char *txt, int dispwidth, int maxchars, LiVESBox *, 
+				      const char *tooltip);
+
+LiVESWidget *lives_standard_dialog_new(const char *title, boolean add_std_buttons);
+
+LiVESWidget *lives_standard_hruler_new(void);
+
+LiVESWidget *lives_standard_scrolled_window_new(int width, int height, LiVESWidget *child);
+
+LiVESWidget *lives_standard_expander_new(const char *label, boolean use_mnemonic, LiVESBox *parent, LiVESWidget *child);
+
+LiVESWidget *lives_volume_button_new(LiVESOrientation orientation, LiVESAdjustment *, double volume);
+
+LiVESWidget *lives_standard_file_button_new(boolean is_dir, const char *def_dir);
+
+
+// util functions
+
+void lives_widget_apply_theme(LiVESWidget *, LiVESWidgetState state);
+
+void lives_cursor_unref(LiVESXCursor *cursor);
+
+void lives_widget_context_update(void);
+
+void lives_widget_get_fg_color(LiVESWidget *, LiVESWidgetColor *);
+void lives_widget_get_bg_color(LiVESWidget *, LiVESWidgetColor *);
+
+LiVESWidget *lives_entry_new_with_max_length(int max);
+
+void lives_widget_unparent(LiVESWidget *);
+
+void lives_tooltips_copy(LiVESWidget *dest, LiVESWidget *source);
+
+size_t calc_spin_button_width(double min, double max, int dp);
+
+int get_box_child_index (LiVESBox *, LiVESWidget *child);
+
+boolean label_act_toggle (LiVESWidget *, LiVESXEventButton *, LiVESToggleButton *);
+boolean widget_act_toggle (LiVESWidget *, LiVESToggleButton *);
+
+void gtk_tooltips_copy(LiVESWidget *dest, LiVESWidget *source);
+
+void lives_spin_button_configure(LiVESSpinButton *, double value, double lower, double upper, 
+				 double step_increment, double page_increment);
+
+void set_button_width(LiVESWidget *buttonbox, LiVESWidget *button, int width);
+
+char *text_view_get_text(LiVESTextView *);
+void text_view_set_text(LiVESTextView *, const char *text, int len);
+
+void toggle_button_toggle (LiVESToggleButton *);
+
+void set_child_colour(GtkWidget *widget, gpointer set_all);
+
+void unhide_cursor(LiVESXWindow *);
+void hide_cursor(LiVESXWindow *);
+
+void get_border_size (LiVESWidget *win, int *bx, int *by);
+
+void lives_widget_set_can_focus(LiVESWidget *, boolean state);
+void lives_widget_set_can_focus_and_default(LiVESWidget *);
+
+void lives_general_button_clicked (LiVESButton *, LiVESObjectPtr data_to_free);
+
+LiVESWidget *add_hsep_to_box (LiVESBox *);
+
+LiVESWidget *add_fill_to_box (LiVESBox *);
+
+
+#define LIVES_JUSTIFY_DEFAULT (widget_opts.default_justify)
+
+#define W_MAX_FILLER_LEN 65535
+
+
+typedef enum {
+  LIVES_CURSOR_NORMAL=0,  ///< must be zero
+  LIVES_CURSOR_BUSY,
+  LIVES_CURSOR_CENTER_PTR,
+  LIVES_CURSOR_HAND2,
+  LIVES_CURSOR_SB_H_DOUBLE_ARROW,
+  LIVES_CURSOR_CROSSHAIR,
+  LIVES_CURSOR_TOP_LEFT_CORNER,
+  LIVES_CURSOR_BOTTOM_RIGHT_CORNER,
+
+  /// non-standard cursors
+  LIVES_CURSOR_BLOCK,
+  LIVES_CURSOR_AUDIO_BLOCK,
+  LIVES_CURSOR_FX_BLOCK
+} lives_cursor_t;
+
+void lives_set_cursor_style(lives_cursor_t cstyle, LiVESWidget *);
+
+typedef enum {
+  LIVES_EXPAND_DEFAULT,
+  LIVES_EXPAND_NONE,
+  LIVES_EXPAND_EXTRA
+} lives_expand_t;
+
+
+typedef struct {
+  boolean no_gui; // show nothing !
+  boolean swap_label; // swap label/widget position
+  boolean pack_end;
+  boolean line_wrap; // line wrapping for labels
+  boolean non_modal; // non-modal for dialogs
+  boolean expand; // whether spin,check,radio buttons should expand
+  boolean apply_theme; // whether to apply theming to widget
+  double scale; // scale factor for all sizes
+  int packing_width; // default should be W_PACKING_WIDTH
+  int packing_height; // default should be W_PACKING_HEIGHT
+  int border_width; // default should be W_BORDER_WIDTH
+  int filler_len; // length of extra "fill" between widgets
+  LiVESWidget *last_label; // label widget of last standard widget (spin,radio,check,entry,combo) [readonly]
+  LiVESJustification justify; // justify for labels
+  LiVESJustification default_justify;
+} widget_opts_t;
+
+
+widget_opts_t widget_opts;
+
+#ifdef NEED_DEF_WIDGET_OPTS
+
+const widget_opts_t def_widget_opts = {
+    FALSE, // no_gui
+    FALSE, // swap_label
+    FALSE, //pack_end
+    FALSE, // line_wrap
+    FALSE, // non_modal
+    LIVES_EXPAND_DEFAULT, // default expand
+    FALSE, // no themeing
+    1.0, // default scale
+    W_PACKING_WIDTH, // def packing width
+    W_PACKING_HEIGHT, // def packing height
+    W_BORDER_WIDTH, // def border width
+    8, // def fill width (in chars)
+    NULL, // last_label
+    LIVES_JUSTIFY_LEFT, // justify
+    LIVES_JUSTIFY_LEFT // default justify
+};
+
+#else
+
+extern const widget_opts_t def_widget_opts;
+
+#endif
+
 #endif

LiVES-1.6.1.tar.bz2/tools/autolives.pl -> LiVES-2.0.3.tar.bz2/tools/autolives.pl Changed

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+
 # (c) Salsaman 2004 - 2012
 
 # released under the GPL 3 or later
@@ -13,16 +14,19 @@
 
 $DEBUG=1;
 
-$SIG{'HUP'} = 'HUP_handler';
-
-if (&location("sendOSC") eq "") {
-    print "You must have sendOSC installed to run this.\n";
-    exit 1;
+if ($^O eq "MSWin32") {
+    use IO::Socket::INET;
 }
+else {
+    $SIG{'HUP'} = 'HUP_handler';
 
+    if (&location("sendOSC") eq "") {
+	print "You must have sendOSC installed to run this.\n";
+	exit 1;
+    }
 
-use IO::Socket::UNIX;
-
+    use IO::Socket::UNIX;
+}
 
 $remote_host="localhost";
 $remote_port=49999; #command port to app
@@ -40,7 +44,13 @@
     $local_port=$ARGV[2];
 }
 
-$sendOMC="sendOSC -h $remote_host $remote_port";
+if ($^O eq "MSWin32") {
+    $sendOMC="perl sendOSC.pl $remote_host $remote_port";
+}
+else {
+    $sendOMC="sendOSC -h $remote_host $remote_port";
+}
+
 
 
 ###################
@@ -74,7 +84,13 @@
 #################################################################
 # start sending OMC commands
 
-`$sendOMC /lives/open_status_socket,$my_ip_addr,$local_port`;
+if ($^O eq "MSWin32") {
+    `$sendOMC /lives/open_status_socket s $my_ip_addr i $local_port`;
+}
+else {
+    `$sendOMC /lives/open_status_socket,$my_ip_addr,$local_port`;
+}
+
 
 `$sendOMC /lives/ping`;
 my $retmsg=&get_newmsg;
@@ -142,7 +158,11 @@
 	# 1,2,3,4,5
 	# random clip switch
 	$nextclip=int(rand($numclips)+1);
-	`$sendOMC /clip/select,$nextclip`;
+	if ($^O eq "MSWin32") {
+	    `$sendOMC /clip/select i $nextclip`;
+	} else {
+	    `$sendOMC /clip/select,$nextclip`;
+	}
     }
     elsif ($action<15) {
 	# mess with effects
@@ -152,21 +172,40 @@
 	    # 6,7,8,9,10
 	    if ($nexteffectkey!=$key_to_avoid) {
 		`$sendOMC /effect_key/disable,$nexteffectkey`;
+		if ($^O eq "MSWin32") {
+		    `$sendOMC /effect_key/disable i $nexteffectkey`;
+		} else {
+		    `$sendOMC /effect_key/disable,$nexteffectkey`;
+		}
 	    }
 	}
 	elsif ($action<13) {
 	    #11,12
 	    if ($nexteffectkey!=$key_to_avoid) {
-		`$sendOMC /effect_key/enable,$nexteffectkey`;
+		if ($^O eq "MSWin32") {
+		    `$sendOMC /effect_key/enable i $nexteffectkey`;
+		} else {
+		    `$sendOMC /effect_key/enable,$nexteffectkey`;
+		}
 	    }
 	}
 	else {
 	    #13,14,15,16
 	    if ($nexteffectkey!=$key_to_avoid) {
-		`$sendOMC /effect_key/maxmode/get,$nexteffectkey`;
+		if ($^O eq "MSWin32") {
+		    `$sendOMC /effect_key/maxmode/get i $nexteffectkey`;
+		} else {
+		    `$sendOMC /effect_key/maxmode/get,$nexteffectkey`;
+		}
+
 		$maxmode=&get_newmsg;
 		$newmode=int(rand($maxmode))+1;
-		`$sendOMC /effect_key/mode/set,$nexteffectkey,$newmode`;
+
+		if ($^O eq "MSWin32") {
+		    `$sendOMC /effect_key/mode/set i $nexteffectkey i $newmode`;
+		} else {
+		    `$sendOMC /effect_key/mode/set,$nexteffectkey,$newmode`;
+		}
 	    }
 	}
     }
@@ -226,7 +265,11 @@
     my ($i,$j);
     for ($i=1;$i<=$keys;$i++) {
 	for ($j=1;$j<=$modes;$j++) {
-	    `$sendOMC /effect_key/name/get,$i,$j`;
+	    if ($^O eq "MSWin32") {
+		`$sendOMC /effect_key/name/get i $i i $j`;
+	    } else {
+		`$sendOMC /effect_key/name/get,$i,$j`;
+	    }
 	    $name=&get_newmsg;
 	    unless ($name eq "") {
 		print "key $i, mode $j: $name    ";

LiVES-1.6.1.tar.bz2/tools/lives-rte-test.pl -> LiVES-2.0.3.tar.bz2/tools/lives-rte-test.pl Changed

@@ -6,6 +6,8 @@
 # e.g. lives-rte-test.pl localhost 49999 49998
 # or just lives-rte-test.pl to use defaults 
 
+$frei0r_test=1;
+
 if (&location("sendOSC") eq "") {
     print "You must have sendOSC installed to run this.\n";
     exit 1;
@@ -71,11 +73,22 @@
 my $retmsg=&get_newmsg;
 
 unless ($retmsg eq "pong") {
-    print "Could not connect to LiVES; try starting it with: lives -oscstart $remote_port\n";
+    print "\nCould not connect to LiVES; try starting it with: lives -oscstart $remote_port\nor activate OMC from Preferences/Networking.\n\n";
     exit 2;
 }
 
-#print "got $retmsg\n";
+
+# get number of clips, print and exit
+`$sendOMC /clip/count`;
+
+
+$numclips=&get_newmsg;
+
+if ($numclips<2) {
+    print "\nYou need at least 2 clips open to be able to test all effects.\n\n";
+    exit 3;
+}
+
 
 # reset and clear fx map
 `$sendOMC /effect_key/reset`;
@@ -93,6 +106,8 @@
 
 $ready=0;
 
+$totfx=$totparams=0;
+
 for ($j=0;;$j++) {
     # get next fx name
     `$sendOMC /effects/realtime/name/get,$j`;
@@ -102,56 +117,70 @@
 	last;
     }
     else {
-	next unless ($retmsg=~ /^frei0rFrei0r/);
+	if (defined($frei0r_test)) {
+	    next unless ($retmsg=~ /^frei0rFrei0r/);
+	}
 	print "testing $retmsg\n";
 
+	$totfx++;
+
 	# map to key 1 and enable it
 	`$sendOMC /effect_key/map/clear`;
 	`$sendOMC /effect_key/map,1,"$retmsg"`;
 	`$sendOMC /effect_key/enable,1`;
 	
 	#if trans, set bg
-	`$sendOMC /effect_key/inchannels/active/get,1`;
+	`$sendOMC /effect_key/inchannel/active/count,1`;
 	$nchans=&get_newmsg;
 	if ($nchans==2) {
 	    `$sendOMC /clip/background/select,2`;
 	}
 	
-	#print("number of active in channels is $nchans\n");
+	print("number of active in channels is $nchans\n");
 	
 
 	#test each parameter in turn - get value, set to min, max, default
 	`$sendOMC /effect_key/parameter/count,1`;
 	$nparms=&get_newmsg;
 	
-	#print "Effect has $nparms params\n";
+	print "Effect has $nparms params\n";
 	
 	if ($nparms>20) {
 	    $nparms=20;
+	    print "Only testing the first 20\n";
 	}
 	
 #	    &sleep200;
+
+	$totparams+=$nparms;
 	
 	for ($i=0;$i<$nparms;$i++) {
 	    `$sendOMC /effect_key/parameter/name/get,1,$i`;
 	    $pname=&get_newmsg;
-	    print ("Testing param $i, $pname\n");
 	    
+	    print ("Testing param $i, $pname\n");
+
+
 	    `$sendOMC /effect_key/parameter/type/get,1,$i`;
 	    $ptype=&get_newmsg;
 	    if ($ptype==1) {
+		$ptype=1;
 		$ptname="int";
 	    }
-	    if ($ptype==2) {
+	    elsif ($ptype==2) {
+		$ptype=2;
 		$ptname="float";
 	    }
-	    if ($ptype==3) {
+	    elsif ($ptype==3) {
+		$ptype=3;
 		$ptname="bool";
 	    }
-	    if ($ptype==4) {
+	    elsif ($ptype==4) {
+		$ptype=4;
 		$ptname="string";
 	    }
-	    if ($ptype==5) {
+	    elsif ($ptype==5) {
+		$ptype=5;
 		$ptname="colour";
 	    }
 	    
@@ -162,6 +191,7 @@
 	    
 	    print("default value is $pdef\n");
 	    
+
 	    # set to min, max, def; bool on/off; text "LiVES test"
 	    
 	    if ($ptype != 3 && $ptype != 4) {
@@ -175,8 +205,13 @@
 		
 		print("max value is $pmax\n");
 		
+		if ($ptype==3) {
+		    $pmin=0;
+		    $pmax=1;
+		}
+
 		if ($pdef<$pmin || $pdef > $pmax) {
-		    #print ("DEFAULT OUT OF RANGE ($pdef) $retmsg: $pname\n");
+		    print ("DEFAULT OUT OF RANGE ($pdef) $retmsg: $pname\n");
 		}
 		
 		
@@ -187,13 +222,16 @@
 	    }
 	    
 	    #check nvalues in param
-	    `$sendOMC /effect_key/parameter/value/count,1,$i`;
-	    $pnvals=&get_newmsg;
+	    `$sendOMC /effect_key/parameter/value/get,1,$i`;
+	    $value=&get_newmsg;
+
+	    @elems=split(",",$value);
+	    $pnvals=@elems;
+
 	    print("nvalues is $pnvals\n");
 	    
-	    if ($pnvals!=1) {
-		print "not testing ARRAY\n";
-		exit 0;
+	    if ($pnvals!=1&&($ptype!=5&&$pnvals==3)&&$ptype!=4) {
+		print "WARNING: value of $value may be invalid.\n";
 		next;
 		
 	    }
@@ -208,9 +246,9 @@
 		$test=(split/,/,$pmin)[1];
 		
 		if ($test eq "") {
-		    print "min needs expand\n";
+#		    print "min needs expand\n";
 		    
-		    if ($csp==1) {
+		    if ($csp==1||$csp==3) {
 			$pmin="$pmin,$pmin,$pmin";
 		    }
 		    else {
@@ -222,7 +260,7 @@
 		$test=(split/,/,$pmax)[1];
 		
 		if ($test eq "") {
-		    print "max needs expand\n";
+#		    print "max needs expand\n";
 		    
 		    if ($csp==1) {
 			$pmax="$pmax,$pmax,$pmax";
@@ -236,9 +274,9 @@
 		$test=(split/,/,$pdef)[1];
 		
 		if ($test eq "") {
-		    print "def needs expand\n";
+#		    print "def needs expand\n";
 		    
-		    if ($csp==1) {
+		    if ($csp==1||$csp==3) {
 			$pdef="$pdef,$pdef,$pdef";
 		    }
 		    else {
@@ -315,7 +353,7 @@
 
 `$sendOMC /video/stop`;
 
-
+print "/nAll tests complete, tested $totfx effects and $totparams parameters.\n\n";
 
 exit 0;

LiVES-1.6.1.tar.bz2/weed-docs/weedspec.txt -> LiVES-2.0.3.tar.bz2/weed-docs/weedspec.txt Changed

@@ -98,7 +98,7 @@
 Clarified text about plugin data and icon directories.
 
 17/03/11 salsaman
-Switched WEED_FILTER_HINT_IS_POINT_EFFECT to WEED_FILTER_HINT_NO_THREADING
+Switched WEED_FILTER_HINT_IS_POINT_EFFECT to WEED_FILTER_HINT_NO_THREADING **
 
 6/08/11 salsaman
 Corrected spelling error WEED_HINT_INT -> WEED_HINT_INTEGER
@@ -107,13 +107,27 @@
 Add clarifying notes about out parameters.
 
 
-19/01/12
+19/01/12 salsaman
 Add channel flag WEED_CHANNEL_ALPHA_PREMULT. API unchanged.
 
-23/01/12
+23/01/12 salsaman
 Clarified range for AFLOAT.
 
-(C) Gabriel "Salsaman" Finch 2005 - 2012
+29/07/12 salsaman
+** Corrected name of flag and description to WEED_FILTER_HINT_MAY_THREAD
+
+15/11/12 salsaman
+added clarifying remarks for number of values in parameter defaults.
+
+01/03/13 salsaman
+corrected description about static function versions
+
+17/03/13
+added "extra_authors" leaf for plugin_info. Corrected description about static functions for plugins.
+added "rowstride_alignment_hint" for channel templates.
+
+
+(C) Gabriel "Salsaman" Finch 2005 - 2013
 
 With contributions by: Niels Elburg, Dennis "Jaromil" Rojo, Andraz
 Tori, and Oyvind "Pippin" Kolas.
@@ -205,7 +219,12 @@
 == GETTING/SETTING LEAF VALUES ==
 
 
-On calling weed_leaf_set(), the host/plugin programmer does not need to worry about allocating and freeing memory for the data to store. The model (or more precisely the Mediation layer) will take care of that for you. If you store an object the model will make a copy and store that. Later, when you set a new value in this leaf, the model will automatically weed_free() the old value and make a copy of the new value and store the copy. 
+On calling weed_leaf_set(), the host/plugin programmer does not need to 
+worry about allocating and freeing memory for the data to store. 
+The model (or more precisely the Mediation layer) will take care of that for you. 
+If you store an object the model will make a copy and store that. 
+Later, when you set a new value in this leaf, the model will automatically weed_free() 
+the old value and make a copy of the new value and store the copy. 
 
 The exception to this is any seed type of type PTR. If you allocate a
 chunk of data or a complex structure only the pointer value is stored
@@ -216,7 +235,10 @@
 
 The plugin and host programmer can both retrieve and set values by Key.
 
-On weed_leaf_get(), Weed will copy the data stored in the leaf, except for pointer types. For pointer types only the reference to the memory block is copied.
+On weed_leaf_get(), Weed will copy the data stored in the leaf, except for pointer types. 
+For pointer types only the *reference* to the memory block is copied. If you retrieve 
+a string, the copy of the string retrieved should be freed with weed_free() after use.
+
 
 == WEED CORE FUNCTIONS ==
 
@@ -298,29 +320,19 @@
 weed_leaf_set() will return an error WEED_ERROR_WRONG_SEED_TYPE if you try to change the seed_type of a leaf.
 
 
-Function pointers
------------------
-Function pointers should not passed directly via
-weed_leaf_set()/weed_leaf_get(), since for some architectures it is
-not possible to convert between a function pointer and a void
-pointer. Instead, create a function pointer as a variable, allocating memory 
-for it, set it equal to the function pointer in question, and then pass the 
-address of the variable. Similarly, when retrieving the value of a function, 
-the void * returned should be cast to a pointer-to-function-pointer, and then 
-dereferenced to get the actual function pointer. Do not try to pass the address 
-of a function-pointer directly, since functions may be assigned on the heap.
-Generally this can be ignored if the utility functions are used.
-
 
 
 For weed_leaf_set(), num_elems can be 0 and value can then be
 NULL. In this way, just the seed_type of a leaf can be set, without
 setting an explicit value.
 
-weed_leaf_get() will return WEED_ERROR_NOSUCH_LEAF if a leaf does not exist. In this way the existence of a leaf can be determined. To assist with this, weed_leaf_get() can be called with a NULL void * value. The function will then not attempt to copy the value, but will return either WEED_ERROR_NOSUCH_LEAF, WEED_ERROR_NOSUCH_ELEMENT, or WEED_NO_ERROR depending on whether the leaf/element exists or not.
+weed_leaf_get() will return WEED_ERROR_NOSUCH_LEAF if a leaf does not exist.
+In this way the existence of a leaf can be determined. To assist with this, weed_leaf_get() 
+can be called with a NULL void * value. The function will then not attempt to copy the value, 
+but will return either WEED_ERROR_NOSUCH_LEAF, WEED_ERROR_NOSUCH_ELEMENT, or WEED_NO_ERROR 
+depending on whether the leaf/element exists or not.
 
-weed_leaf_set_flags() will return
-WEED_ERROR_NOSUCH_LEAF if the leaf does not exist.
+weed_leaf_set_flags() will return WEED_ERROR_NOSUCH_LEAF if the leaf does not exist.
 
 weed_leaf_delete() will return WEED_ERROR_LEAF_READONLY if the leaf is
 readonly for the host. It will return WEED_ERROR_NOSUCH_LEAF if the
@@ -340,7 +352,7 @@
 semantics as malloc, free(), memset() and memcpy() from libc. Their
 purpose is to allow a host to provide a plugin with the
 application-specific memory managment. 
-Plugins MUST NOT use malloc, free and memset, but have to use weed counterparts. 
+Plugins SHOULD NOT use malloc, free and memset, but instead use the weed counterparts. 
 
 == WEED ERRORS ==
 
@@ -376,25 +388,23 @@
 
 == COMPILING A HOST WITH WEED ==
 
-A host wishing to use Weed should be linked (shared or static) with libweed, and #include
-<weed/weed.h> and <weed/weed-host.h>
-
-If the host makes use of the Weed Utility Library, it should also be *statically*
-linked with libweed-utils, and #include <weed/weed-utils.h>
-
-Static linking is required, because the plugins may also link against
-this library, and they have their own versions of the core functions.
-
-
-
+A host wishing to use the referenc build of Weed should be linked 
+(shared or static) with libweed, and #include
+(at least) <weed/weed.h> and <weed/weed-host.h>
 
+If the host makes use of the Weed Utility Library, it may also be 
+linked (shared or static) with libweed-utils, and #include <weed/weed-utils.h>
 
 If the host wishes to use Weed effects, it should #include
-<weed/weed-effects.h>.
+<weed/weed-effects.h> and probably <weed/weed-palettes.h>.
 
 If the host wishes to use Weed events, it should #include
 <weed/weed-events.h>.
 
+<weed/weed-compat.h> is provided for compatibily with some external libraries.
+
+
+
 Compiling a plugin with Weed is dealt with below.
 
 
@@ -480,36 +490,41 @@
 There is also a Weed Audio Extension, and a Weed Events Extension,
 which are documented separately.
 
+
+
 == COMPILING A PLUGIN WITH WEED ==
 
-An effects plugin wishing to use Weed simply needs to #include <weed/weed.h>,
-<weed/weed-effects.h> and <weed/weed-plugin.h>
+An effects plugin wishing to use the reference build of Weed 
+should #include <weed/weed.h>, <weed/weed-palettes.h>,
+<weed/weed-effects.h> and (optionally) <weed/weed-plugin.h>
+
+<weed/weed-compat.h> is provided for compatibility with some external libraries.
+
+
+Plugins MUST declare their versions of the Weed functions as static. This is because they are set through the API
+from the host. If the functions were not declared static in the plugin then setting them would also set the host's 
+version, which could very well cause problems and crashes in the host.
+
+As a consequence of this, if the plugin wishes to use any of the weed functions (or indirectly, weed-utils or weed-plugin-utils functions), this 
+MUST be done from within the plugin itself. In the Weed SDK this is done by #including the source code for two files:
+weed-utils-code.c and weed-plugin-utils.c. Including these files directly ensures that the static versions of the Weed functions are used.
+
+Plugins should NOT be linked directly with libweed, libweed-utils or any other Weed library which uses the Weed API directly.
+
+Obviously this solution is far from ideal, but it appears to be the only way to override functions in standard C code.
+
+Better solutions may be developed in future.
+
 
-These plugins MUST be linked with their own symbols and functions. If using
-gcc, this is done with the flag -Wl,-Bsymbolic.
 
-If the plugin makes use of the Weed Utility Library, it should be *statically*
-linked with libweed-utils, and #include <weed/weed-utils.h>
 
-If the plugin wishes to use the Weed Plugin Utility Library, it should
-be *statically* linked with libweed-plugin-utils and #include
-<weed/weed-plugin-utils.h>.
 
-Static linking is required because the plugins are provided their own
-versions of the core functions. Shared linking would make the plugins
-use the host's version of the functions.
 
-Plugins should NOT be linked directly with libweed, since the core
-functions are passed from the host, depending on the API version
-agreed by host and plugin. In this way, provided the plugin does not
-use any core functions directly (i.e. by making use of the utility
-libraries), the plugin is guaranteed to be compatible with any future
-version of the Weed library.
 
 == PLANT TYPES ==
 
-We now describe the various plant types for weed effects, and their mandatory
-and optional leaves.
+There now follows a description of the various plant types for weed effects, 
+and their mandatory and optional leaves.
 
 == PLANT TYPE HOST_INFO ==
 
@@ -565,24 +580,28 @@
 
 '''Mandatory leaves''':[[BR]]
 
- * "name"         : WEED_SEED_STRING : the filter name; must be unique in the plugin, 
- * "author"       : WEED_SEED_STRING : the filter author(s)
- * "version"      : WEED_SEED_INT : filter version
- * "process_func" : WEED_SEED_VOIDPTR : pointer to a process_func() pointer
+ * "name"         : WEED_SEED_STRING : the filter name; MUST be unique in the plugin, 
+ * "author"       : WEED_SEED_STRING : the filter author(s) - DO NOT change this unless a new "version" of the plugin is made - instead add to the 
+                      "extra_authors" leaf (see below)
+ * "version"      : WEED_SEED_INT : filter version. Adding more parameters does not require a version update. However, removing parameters, changing 
+   		    their order or type, adding or removing channel templates does require an update. Prior versions of the filter MUST be left in 
+		    plugin, as hosts may be using them.
+ * "process_func" : WEED_SEED_VOIDPTR : pointer to the process_func()
  * "plugin_info"  : WEED_SEED_PLANTPTR : pointer to the PLUGIN_INFO plant containing this FILTER_CLASS
 
 '''Optional leaves''': [[BR]]
 
  * "flags"        : WEED_SEED_INT : bitmap of filter flags
- * "init_func"    : WEED_SEED_VOIDPTR : pointer to an init_func() pointer
+ * "init_func"    : WEED_SEED_VOIDPTR : pointer to the init_func()
                     (can also be NULL)
- * "deinit_func"  : WEED_SEED_VOIDPTR : pointer to a deinit_func() pointer
+ * "deinit_func"  : WEED_SEED_VOIDPTR : pointer to a the deinit_func()
                     (can also be NULL)
  * "in_channel_templates"    : WEED_SEED_PLANTPTR, list of 0 or more elements: array of inp channel templates, '''type''' of the referenced plant MUST be  WEED_PLANT_CHANNEL_TEMPLATE
  * "out_channel_templates"   : WEED_SEED_PLANTPTR, list of 0 or more elements : array of out channel templates, '''type''' of the referenced plant MUST be  WEED_PLANT_CHANNEL_TEMPLATE
  * "in_parameter_templates"  : WEED_SEED_PLANTPTR, list of 0 or more elements : array of in parameter templates, '''type''' of the referenced plant MUST be  WEED_PLANT_PARAMETER_TEMPLATE
- * "out_parameter_templates" : WEED_SEED_PLANTPTR, list of 0 or more elements : array of out parameter templates, '''type''' of the referenced plant MUST be  WEED_PLANT_PARAMETER_TEMPLATE
+ * "out_parameter_templates" : WEED_SEED_PLANTPTR, list of 0 or more elements : array of out parameter templates, '''type''' of the referenced plant MUST be  WEED_PLANT_PARAMETER_TEMPLATE.
 
+ * "extra_authors": WEED_SEED_STRING : list of extra authors which can be altered without changing the plugin "version"
  * "description"  : WEED_SEED_STRING : filter description
  * "url"          : WEED_SEED_STRING : filter URL
  * "license"      : WEED_SEED_STRING : license of filter
@@ -651,6 +670,10 @@
                                        the plugin has set it, or may
                                        ignore it.
 
+ * "rowstride_alignment_hint" : WEED_SEED_INT : this is a *hint* to the host that the plugin prefers rowstrides aligned to a certain byte size. It 
+  			       		     may be ignored by the host.		      
+
+
  * Every plugin can store internal data in leaves
  inside this plant, and host MUST NOT change their values or make them
  READONLY for the plugin. Those internal leaves MUST have keys
@@ -818,8 +841,7 @@
  * "offset" : WEED_SEED_INT : host can achieve multithreading by splitting destination frames into slices, calling the 
    	      		      process_func several times with different "offset"s and reduced height in the 
 			      destination channel. Offset is the number of rows offset of "pixel_data" in the destination 
-			      frame(s). This should never be used for generators, or if the plugin sets 
-			      WEED_FILTER_HINT_NO_THREADING.
+			      frame(s). Will only be used if the plugin sets the filter flag bit WEED_FILTER_HINT_MAY_THREAD.
 
  * "pixel_aspect_ratio"   : WEED_SEED_DOUBLE : physical aspect ratio
                                                of the pixel of the image (pixel aspect ratio 
@@ -864,7 +886,8 @@
  * "default" : default value(s) of the parameter : usually must contain at
                least one element, but may have 0 elements for parameters which have
                the WEED_PARAMETER_VARIABLE_ELEMENTS flag set. [0 elements means the leaf
-	       exists but has no value, since the SEED_TYPE must be known.]
+	       exists but has no value, since the SEED_TYPE must be known.]. Required even for out parameters, as the type
+	       and number of elements must be known.
 
  * "new_default" : required only for in parameters which have the flag WEED_PARAMETER_VARIABLE_ELEMENTS set. 
                    It tells the host the default value of
@@ -885,7 +908,7 @@
  * "interpolate_func" : WEED_SEED_VOIDPTR : pointer to interpolate_func pointer.
    		      	 See below, Plugin Functions. For in parameters only.
 
- * "gui" : WEED_SEED_PLANTPTR : each parameter_template can have a
+ * "gui" : WEED_SEED_PLANTPTR : each parameter_template (for in_parameters) can have a
  "gui" leaf. This leaf points to a plant of type
  GUI. Within the GUI plant can be additional leaves to assist the host
  to display this particular parameter. The plugin can create it, and
@@ -914,8 +937,8 @@
 The "default" leaf can only be of seed type WEED_SEED_INT. "default"
 may have any number of elements.
 
- * "min" : WEED_SEED_INT : minimal value of the parameter, MANDATORY
- * "max" : WEED_SEED_INT : maximal value of the parameter, MANDATORY
+ * "min" : WEED_SEED_INT : minimal value of the parameter, MANDATORY for in parameters (optional for out parameters)
+ * "max" : WEED_SEED_INT : maximal value of the parameter, MANDATORY for in parameters (optional for out parameters)
  * "wrap" : WEED_SEED_BOOLEAN : WEED_TRUE indicates that the "value" should wrap when going below min or above max, OPTIONAL
  * "transition" : WEED_SEED_BOOLEAN : WEED_TRUE Indicates that this
  parameter is a transition, (i.e. at min the effect is fully "off", at
@@ -927,8 +950,8 @@
 WEED_SEED_DOUBLE. "default" may have any number of elements.
 
 Additional leaves that hint causes:
- * "min" : WEED_SEED_DOUBLE : minimal value of the parameter, MANDATORY
- * "max" : WEED_SEED_DOUBLE : maximal value of the parameter, MANDATORY
+ * "min" : WEED_SEED_DOUBLE : minimal value of the parameter, MANDATORY for in parameters (optional for out parameters)
+ * "max" : WEED_SEED_DOUBLE : maximal value of the parameter, MANDATORY for in parameters (optional for out parameters)
  * "wrap" : WEED_SEED_BOOLEAN : WEED_TRUE indicates that the "value"
  should be wrapped when going below min or above max, OPTIONAL
  * "transition" : WEED_SEED_BOOLEAN : WEED_TRUE Indicates that this
@@ -960,27 +983,27 @@
 "default", host knows the seed type of "value".
 
 Additional leaves that hint causes:
- * "min" : WEED_SEED_DOUBLE or WEED_SEED_INT; array of N elements: minimal value of the parameter, MANDATORY
- * "max" : WEED_SEED_DOUBLE or WEED_SEED_INT; array of N elements: maximal value of the parameter, MANDATORY
+ * "min" : WEED_SEED_DOUBLE or WEED_SEED_INT; array of N elements: minimal value of the parameter, MANDATORY for in parameters (optional for out parameters)
+ * "max" : WEED_SEED_DOUBLE or WEED_SEED_INT; array of N elements: maximal value of the parameter, MANDATORY for in parameters (optional for out parameters)
  * "colorspace" : WEED_SEED_INT : colorspace (see below), MANDATORY
 
 ==== Number of elements in the leaves ====
-The "default" leaf must contain at least one value UNLESS the plugin sets the parameter flag
+The "default" leaf must contain at least one value* UNLESS the plugin sets the parameter flag
 WEED_PARAMETER_VARIABLE_ELEMENTS (see below); then the "default" may
 take any number (0 or more) of elements,  [0 elements means the leaf
-exists but has no value, since the SEED_TYPE must be known.] and
+exists but has no value, since the SEED_TYPE must be known], and
 "new_default" must be set.
 
 The number of elements in "value" MUST match the number of elements in
 "default" UNLESS the plugin sets the parameter flag
 WEED_PARAMETER_VARIABLE_ELEMENTS (see below); then the "value" may
-take any number (0 or more) of elements.[0 elements means the leaf
-exists but has no value, since the SEED_TYPE must be known.] and
+take any number (0 or more) of elements, [0 elements means the leaf
+exists but has no value, since the SEED_TYPE must be known], and
 "new_default" must be set.
 
 The only exception is for "COLOR" parameters; there the number of
 elements in "default" and "value" MUST always be a multiple of 3 or 4
-(depending on the "colorspace").
+(depending on the "colorspace") - the multiple must be 1 or higher unless WEED_PARAMETER_VARIABLE_ELEMENTS is set, in which case it may be 0 or higher.
 
 The number of elements in each of "min" and "max" can be either 1, or equal to
 the number of elements in "default". If the plugin sets the flag
@@ -1000,6 +1023,12 @@
 WEED_PARAMETER_VARIABLE_ELEMENTS set.
 
 
+
+* It is highly recommended to use exactly one value (or 3 or 4 values for color type parameters) for "default", 
+  unless WEED_PARAMETER_VARIABLE_ELEMENTS is set.
+
+
+
 == PLANT TYPE PARAMETER ==
 
 Input parameter leaves should only be changed by the host, and
@@ -1413,27 +1442,27 @@
 
 ==== Plant types ====
 
-  * WEED_PLANT_HOST_INFO          
+  * WEED_PLANT_HOST_INFO          255
 
-  * WEED_PLANT_PLUGIN_INFO        
+  * WEED_PLANT_PLUGIN_INFO        1
 
-  * WEED_PLANT_FILTER_CLASS       
+  * WEED_PLANT_FILTER_CLASS       2
 
-  * WEED_PLANT_CHANNEL_TEMPLATE   
+  * WEED_PLANT_FILTER_INSTANCE    3
 
-  * WEED_PLANT_PARAMETER_TEMPLATE 
+  * WEED_PLANT_CHANNEL_TEMPLATE   4
 
-  * WEED_PLANT_FILTER_INSTANCE    
+  * WEED_PLANT_PARAMETER_TEMPLATE 5
 
-  * WEED_PLANT_CHANNEL            
+  * WEED_PLANT_CHANNEL            6
 
-  * WEED_PLANT_PARAMETER          
+  * WEED_PLANT_PARAMETER          7
 
-  * WEED_PLANT_GUI                
+  * WEED_PLANT_GUI                8
 
-  * WEED_PLANT_EVENT              
+  * WEED_PLANT_EVENT              256
 
-  * WEED_PLANT_EVENT_LIST         
+  * WEED_PLANT_EVENT_LIST         257
 
 
 ==== Seed types ====
@@ -1456,29 +1485,29 @@
 
 ==== Weed parameter hints ====
 
- * WEED_HINT_UNSPECIFIED
+ * WEED_HINT_UNSPECIFIED  0
    Parameter is of an unknown type. Plugins should never use this
    directly, it is intended only for wrapper plugins which may need to
    convert unknown parameter types. These parameter types may or may not
    have "min" and "max". They will have at least "name" and "default" leaves.
 
- * WEED_HINT_INTEGER
+ * WEED_HINT_INTEGER  1
 
- * WEED_HINT_FLOAT
+ * WEED_HINT_FLOAT  2
 
- * WEED_HINT_TEXT
+ * WEED_HINT_TEXT  3
 
- * WEED_HINT_SWITCH
+ * WEED_HINT_SWITCH  4
 
- * WEED_HINT_COLOR
+ * WEED_HINT_COLOR  5
 
 Parameter hints >=1024 are reserved for custom parameters.
 
 ==== Weed colorspaces ====
 
- * WEED_COLORSPACE_RGB
+ * WEED_COLORSPACE_RGB  1
 
- * WEED_COLORSPACE_RGBA
+ * WEED_COLORSPACE_RGBA  2
 
 
 Colorspaces >=1024 are reserved for custom color spaces.
@@ -1499,13 +1528,13 @@
 '''RGB Palettes'''
 Palette numbers >0 and <512
 {{{
-WEED_PALETTE_RGB888         WEED_PALETTE_RGB24  :: packed, 8 bits per colour channel, 24 bits per pixel, RGB
-WEED_PALETTE_BGR888         WEED_PALETTE_BGR24  :: packed, 8 bits per colour channel, 24 bits per pixel, BGR
-WEED_PALETTE_RGBA8888       WEED_PALETTE_RGBA32 :: packed, 8 bits per colour channel, 32 bits per pixel, RGBA
-WEED_PALETTE_BGRA8888       WEED_PALETTE_BGRA32 :: packed, 8 bits per colour channel, 32 bits per pixel, BGRA
-WEED_PALETTE_ARGB8888       WEED_PALETTE_ARGB32 :: packed, 8 bits per colour channel, 32 bits per pixel, ARGB
-WEED_PALETTE_RGBFLOAT                           :: packed, 32 bit float per channel RGB (range is 0. to 1.)
-WEED_PALETTE_RGBAFLOAT                          :: packed, 32 bit float per channel RGBA (range is 0. to 1.)
+WEED_PALETTE_RGB888         WEED_PALETTE_RGB24   1  :: packed, 8 bits per colour channel, 24 bits per pixel, RGB
+WEED_PALETTE_BGR888         WEED_PALETTE_BGR24   2  :: packed, 8 bits per colour channel, 24 bits per pixel, BGR
+WEED_PALETTE_RGBA8888       WEED_PALETTE_RGBA32  3  :: packed, 8 bits per colour channel, 32 bits per pixel, RGBA
+WEED_PALETTE_BGRA8888       WEED_PALETTE_BGRA32  7  :: packed, 8 bits per colour channel, 32 bits per pixel, BGRA
+WEED_PALETTE_ARGB8888       WEED_PALETTE_ARGB32  4  :: packed, 8 bits per colour channel, 32 bits per pixel, ARGB
+WEED_PALETTE_RGBFLOAT                            5  :: packed, 32 bit float per channel RGB (range is 0. to 1.)
+WEED_PALETTE_RGBAFLOAT                           6  :: packed, 32 bit float per channel RGBA (range is 0. to 1.)
 
 }}}
 '''YUV Palettes'''
@@ -1520,37 +1549,37 @@
 All channels are assumed to be 8 bit.
 
 {{{
-WEED_PALETTE_YUV422P           WEED_PALETTE_YV16
+WEED_PALETTE_YUV422P           WEED_PALETTE_YV16    513
 [Official name 'YV16', 8 bit Y plane followed by 8
    bit 2x1 subsampled U and V planes. Planar.]
 
 
-WEED_PALETTE_YUV420P           WEED_PALETTE_YV12
+WEED_PALETTE_YUV420P           WEED_PALETTE_YV12    514
 [8 bit Y plane followed by 8 bit 2x2 subsampled U and V planes. Planar.
    (Official name YV12)]
 
-WEED_PALETTE_YVU420P           WEED_PALETTE_I420         WEED_PALETTE_IYUV
+WEED_PALETTE_YVU420P           WEED_PALETTE_I420         WEED_PALETTE_IYUV   515
 [Same as YUV420P , but U and V are swapped. Planar.
       (Official name IYUV)]
 
-WEED_PALETTE_YUV444P
+WEED_PALETTE_YUV444P   516
 [unofficial. 8 bit Y plane followed by 8 bit U and V planes, no
    subsampling. Planar.]
 
-WEED_PALETTE_YUVA4444P
+WEED_PALETTE_YUVA4444P   517
 [Unofficial, like YUV444P but with Alpha. Planar.]
 
-WEED_PALETTE_UYVY8888         WEED_PALETTE_UYVY
+WEED_PALETTE_UYVY8888         WEED_PALETTE_UYVY     519
 [YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second
    pixel horizontally on each line). A macropixel contains 2 pixels in 1
    u_int32. Packed. If the "YUV_subspace" is set to bt709, this
    becomes HDYC.]
 
-WEED_PALETTE_YUYV8888         WEED_PALETTE_YUYV          WEED_PALETTE_YUY2
+WEED_PALETTE_YUYV8888         WEED_PALETTE_YUYV          WEED_PALETTE_YUY2     518
 [Like UYVY but with different component ordering within the
    u_int32 macropixel. Packed. Also known as YUY2]
 
-WEED_PALETTE_YUV411                   WEED_PALETTE_IYU1
+WEED_PALETTE_YUV411                   WEED_PALETTE_IYU1        520
 [IEEE 1394 Digital Camera 1.04 spec. Is packed YUV format
 with a 6 pixel macroblock structure containing 4 pixels.
 Ordering is U2 Y0 Y1 V2 Y2 Y3. Uses same bandwith as YUV420P
@@ -1559,10 +1588,10 @@
 
 }}}
 
-WEED_PALETTE_YUV888                   WEED_PALETTE_IYU2
+WEED_PALETTE_YUV888                   WEED_PALETTE_IYU2      521
 Packed YUV palette, no subsampling. Also known as IYU2
 
-WEED_PALETTE_YUVA8888
+WEED_PALETTE_YUVA8888                                        522
 Packed YUV palette with alpha channel. No subsampling.
 
 
@@ -1572,9 +1601,9 @@
 Alpha palettes are generally used as mask/transparency channels but may be used to store any position dependant data.
 
 {{{
-WEED_PALETTE_A1
-WEED_PALETTE_A8
-WEED_PALETTE_AFLOAT
+WEED_PALETTE_A1       1025
+WEED_PALETTE_A8       1026
+WEED_PALETTE_AFLOAT   1027
 }}}
 
 The range for AFLOAT is 0.0 (fully transparent) to 1.0 (fully opaque) for transparency. 
@@ -1585,12 +1614,12 @@
 
 ==== Filter flags ====
 
- *  WEED_FILTER_NON_REALTIME[[BR]]
+ *  WEED_FILTER_NON_REALTIME  1  [[BR]]
     non-realtime filter: the filter is too slow to use in realtime processing.
     Generally, filters which take more than about 0.1 second to process
     a frame are considered non-realtime.
 
- *  WEED_FILTER_IS_CONVERTER[[BR]]
+ *  WEED_FILTER_IS_CONVERTER  2  [[BR]]
     This flag bit should be set if the plugin does not alter the image
     pixels except for resizing or palette conversion between in
     channel and out channel(s). It should only be set for the
@@ -1605,23 +1634,22 @@
     plugin type. To be useful, such filters may also want to use the
     *_CAN_VARY channel flags below.
 
- * WEED_FILTER_HINT_IS_STATELESS[[BR]]
+ * WEED_FILTER_HINT_IS_STATELESS  4  [[BR]]
    This is optional, if the filter is stateless (i.e. not dependant on
    past calls to process_func() ) then this this flag
    bit can be set. Used for compatibility with other plugin architectures.
 
 
- * WEED_FILTER_HINT_NO_THREADING[BR]]
-   Hosts can achieve threading by splitting the destination frame(s) into 
+ * WEED_FILTER_HINT_MAY_THREAD  32  [BR]]
+   Indicates that hosts can achieve threading by splitting the destination frame(s) into 
    slices, setting "offset" for those channels, and calling process_func 
-   multiple times with the same timestamp. If there is some reason the host 
-   should not do this, eg. the full destination frame is needed then this flag 
-   should be set to WEED_TRUE. Note that the dest. frames will never be split 
-   for generators (filters which have no input video frames), so this flag is 
-   unneccesary in that case.
+   multiple times with the same timestamp. Do not set this if the plugin needs to access the entire 
+   destination frame(s). The original instance should be passed in as the slice with offset 0. 
+   Use this instance if you want to update any "plugin_*" values. Do not use this on filters which 
+   use the channel flag WEED_CHANNEL_SIZE_CAN_VARY.
 
 
- * WEED_FILTER_PROCESS_LAST[[BR]]
+ * WEED_FILTER_PROCESS_LAST  16  [[BR]]
    This flag denotes that the host should process this filter after other filters have been 
    applied. Examples might be a subtitle filter or an audio mixer.
 
@@ -1631,25 +1659,20 @@
 
 ==== Channel template flags ====
 
- *  WEED_CHANNEL_REINIT_ON_SIZE_CHANGE[[BR]]
+ *  WEED_CHANNEL_REINIT_ON_SIZE_CHANGE  1  [[BR]]
     host must reinit the plugin before calling process_func() if the
     channel size (height or width in (macro)pixels) is changed.
 
- *  WEED_CHANNEL_REINIT_ON_ROWSTRIDES_CHANGE[[BR]]
-    host must reinit the plugin before calling process_func() if the
-    any of the rowstrides are changed. Note that	 
-    changing the palette can sometimes affect the rowstrides. [API 130 and higher].
-
- *  WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE[[BR]]
+ *  WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE  2  [[BR]]
     host must reinit the plugin before calling process_func() if the channel palette is changed
 
- *  WEED_CHANNEL_CAN_DO_INPLACE[[BR]]
+ *  WEED_CHANNEL_CAN_DO_INPLACE  4  [[BR]]
     If this flag bit is set, the filter can do inplace operations.
     Hosts can select this mode by setting "pixel_data" of this out channel
     equal to the "pixel_data" of the corresponding (same number; not counting "disabled" channels) 
     in channel. The flag bit is only valid for OUT channels. 
 
- *  WEED_CHANNEL_SIZE_CAN_VARY[[BR]]
+ *  WEED_CHANNEL_SIZE_CAN_VARY  8  [[BR]]
     In Weed, all channels are assumed to have the same size (width and height,
     but not necessarily rowstrides)
     as the first non-disabled in_channel (or first non-disabled
@@ -1660,7 +1683,7 @@
     a "high-performance" resize routine. Otherwise resizing should be
     left to the host.
 
- *  WEED_CHANNEL_PALETTE_CAN_VARY[[BR]]
+ *  WEED_CHANNEL_PALETTE_CAN_VARY  16  [[BR]]
     In Weed, all channels are assumed to have the same "current_palette"
     as the first non-disabled in_channel (or first non-disabled
     out_channel for filters that have no in channels). If this flag
@@ -1670,20 +1693,16 @@
     conversion routine. Otherwise palette conversion should be left to
     the host.
 
-* WEED_CHANNEL_ALPHA_OUT_PREMULT[[BR]]
+ *  WEED_CHANNEL_REINIT_ON_ROWSTRIDES_CHANGE  32  [[BR]]
+    host must reinit the plugin before calling process_func() if the
+    any of the rowstrides are changed. Note that	 
+    changing the palette can sometimes affect the rowstrides. [API 130 and higher].
+
+* WEED_CHANNEL_ALPHA_OUT_PREMULT  64  [[BR]]
     For out channels only (ignored for in channels).
     Indicates that alpha is pre-multiplied with the other channels.
     e.g RGB=0xFFFFFF. We apply an alpha of 0x80 -> we store 0x80808080 (colour vals are stored as C * alpha / 255.)
-    For compatibility with applications. [1]
-
-
-
-
- * WEED_CHANNEL_FOLLOWS_OUTPUT[[BR]]
-   This flag is deprecated and should not be used in newly written code.
-   It will be removed in a future API version.
-   Use WEED_FILTER_PROCESS_LAST instead.
-
+    For compatibility with applications.
 
 
 Flag bits >=30 are reserved for custom flags.
@@ -1693,10 +1712,10 @@
 
 ==== Channel flags =====
 
-* WEED_CHANNEL_ALPHA_PREMULT[[BR]]
+* WEED_CHANNEL_ALPHA_PREMULT  1  [[BR]]
     Indicates that alpha is pre-multiplied with the other channels.
     e.g RGB=0xFFFFFF. We apply an alpha of 0x80 -> we store 0x80808080 (colour vals are stored as C * alpha / 255.)
-    For compatibility with applications. [1]
+    For compatibility with applications.
 
 
 
@@ -1705,7 +1724,7 @@
 
 ==== Parameter template flags ====
 
- * WEED_PARAMETER_REINIT_ON_VALUE_CHANGE[[BR]]
+ * WEED_PARAMETER_REINIT_ON_VALUE_CHANGE  1  [[BR]]
    host must reinit the plugin if the parameter "value" is
    changed. This is to allow the plugin to alter the "gui" settings
    for the parameters and for the instance. The host must temporarily
@@ -1713,7 +1732,7 @@
    Not valid for out parameters.
 
 
- * WEED_PARAMETER_VARIABLE_ELEMENTS[[BR]]
+ * WEED_PARAMETER_VARIABLE_ELEMENTS  2  [[BR]]
    plugin can set this to inform the host that the number of elements in
    the parameter "value" leaf can vary. If not set, then the number of
    elements in "value" is fixed; it must always match the number of elements in
@@ -1729,7 +1748,10 @@
    If this is set for an in parameter, the plugin MUST also set the "new_default" leaf for
    the parameter.
 
- * WEED_PARAMETER_ELEMENT_PER_CHANNEL[[BR]] - API version 110 and higher
+   This flag is assumed for out_parameters.
+
+
+ * WEED_PARAMETER_ELEMENT_PER_CHANNEL  4  [[BR]] - API version 110 and higher
    This flag bit indicates that each element in the parameter "value"
    corresponds to one input channel. If a
    channel template has "max_repeats" set to other than 1, then
@@ -1745,20 +1767,20 @@
 Where chroma subsampling is used, chroma values are assumed to be centered between luma samples, unless
 specified otherwise.
 
- * WEED_YUV_SAMPLING_DEFAULT : Default subsampling.
+ * WEED_YUV_SAMPLING_DEFAULT  0  : Default subsampling.
 
- * WEED_YUV_SAMPLING_JPEG   : Chroma is sampled at half the horizontal
+ * WEED_YUV_SAMPLING_JPEG  0   : Chroma is sampled at half the horizontal
    and half the vertical frequency. (YUV 4:2:0). Chroma samples are
    alternated horizontally between luma samples (like yuyv-yuyv)
 
- * WEED_YUV_SAMPLING_MPEG  : Same as JPEG, but Chroma samples are
+ * WEED_YUV_SAMPLING_MPEG  1  : Same as JPEG, but Chroma samples are
    horizontally aligned. There is notion of fields. Note: only mpeg2 uses this, mpeg1 uses JPEG sampling.
    (YUV 4:2:0 only) (like yuvy-yuvy)
 
- * WEED_YUV_SAMPLING_DVPAL  : Subsampling per field, chroma samples
+ * WEED_YUV_SAMPLING_DVPAL  2  : Subsampling per field, chroma samples
    are located above and below luma samples, and CB and CR samples are located on alternate lines (YUV 4:2:0) 
 
- * WEED_YUV_SAMPLING_DVNTSC  : Chroma is sampled at a reduced
+ * WEED_YUV_SAMPLING_DVNTSC  3  : Chroma is sampled at a reduced
    horizontal frequency but is aligned horizontally with luma samples
    (YUV 4:2:2 / YUV 4:1:1) [similar to mpeg, but vertically aligned]
 
@@ -1767,24 +1789,24 @@
 
 ==== YUV clamping ====
 
- * WEED_YUV_CLAMPING_CLAMPED :: the default if not present (clamped to 16-235,
-   16-240, 16-240) [like mpeg]                                                       [0]
+ * WEED_YUV_CLAMPING_CLAMPED  0  :: the default if not present (clamped to 16-235,
+   16-240, 16-240)                                                 
 
- * WEED_YUV_CLAMPING_UNCLAMPED :: Y, U and V are unclamped (0 - 255 range
-   for each) [used in e.g. in jpeg]                                                  [1]
+ * WEED_YUV_CLAMPING_UNCLAMPED  1  :: Y, U and V are unclamped (0 - 255 range
+   for each) [used in e.g. in jpeg]
 
 clamping types >=512 are reserved for custom clampings.
 
 ==== YUV subspace ====
 
- * WEED_YUV_SUBSPACE_YUV :: Any YUV colourspace may be used, with Y representing the luma 
+ * WEED_YUV_SUBSPACE_YUV  0   :: Any YUV colourspace may be used, with Y representing the luma 
    channel, and U and V as colour offsets. Optional, since this is the default if not specified.
 
- * WEED_YUV_SUBSPACE_YCBCR :: Standard YUV (Y'CbCr 601) using conversion
+ * WEED_YUV_SUBSPACE_YCBCR   1  :: Standard YUV (Y'CbCr 601) using conversion
    factors (Kr=0.299, Kb=0.114, UV offset 128). The plugin should specify this if for example 
    it sends to or receives from external sources.
 
- * WEED_YUV_SUBSPACE_BT709 :: BT.709 high definition TV which uses different
+ * WEED_YUV_SUBSPACE_BT709   2  :: BT.709 high definition TV which uses different
    conversion factors than Y'CbCr digital/ananlog (Kr=0.2125, Kb=0.0721, UV offset 128)
 
 subspace types >=512 are reserved for custom subspaces.
@@ -1808,18 +1830,18 @@
 
 ==== Filter errors ====
 
- *  WEED_ERROR_TOO_MANY_INSTANCES[[BR]]
+ *  WEED_ERROR_TOO_MANY_INSTANCES  6  [[BR]]
     can't create: plugin allows only limited number of filter instances, returned from init_func()
 
- *  WEED_ERROR_HARDWARE[[BR]]
+ *  WEED_ERROR_HARDWARE  7  [[BR]]
     there was a hardware error using the filter; returned
     from init_func() or from process_func(). If returned from
     process_func(), the filter should be deinited/reinited.
 
- *  WEED_ERROR_INIT_ERROR[[BR]]
+ *  WEED_ERROR_INIT_ERROR  8  [[BR]]
     other unspecified error during initialisation
 
- *  WEED_ERROR_PLUGIN_INVALID[[BR]]
+ *  WEED_ERROR_PLUGIN_INVALID  64  [[BR]]
     one or more of the filter_classes is no longer valid. The filter
     instance should be deinitialised and not reused; returned from process_func().